diff options
| -rwxr-xr-x | mkport.sh | 2 | ||||
| -rw-r--r-- | src-qt5/core/libLumina/LDesktopUtils.cpp | 2 | ||||
| -rw-r--r-- | src-qt5/core/libLumina/LDesktopUtils.pri | 1 | ||||
| -rw-r--r-- | src-qt5/core/lumina-theme-engine/lthemeengine.pri | 2 | ||||
| -rw-r--r-- | src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp | 5 |
5 files changed, 8 insertions, 4 deletions
@@ -4,7 +4,7 @@ # Set the port dfile="lumina" -VERSION="1.3.3" +VERSION="1.4.0" massage_subdir() { cd "$1" diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index f1b3de17..69d4ba52 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -16,7 +16,7 @@ static QStringList fav; QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.3.3"; + QString ver = "1.4.0"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif diff --git a/src-qt5/core/libLumina/LDesktopUtils.pri b/src-qt5/core/libLumina/LDesktopUtils.pri index fcacc586..ebfa89f4 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.pri +++ b/src-qt5/core/libLumina/LDesktopUtils.pri @@ -6,3 +6,4 @@ INCLUDEPATH *= ${PWD} #Now the other dependendies of it include(LUtils.pri) include(LuminaThemes.pri) +include(LuminaXDG.pri) diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri index 40202045..781527c1 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pri +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri @@ -3,7 +3,7 @@ QT *= core gui widgets x11extras network error("Use Qt 5.4.0 or higher.") } include(../../OS-detect.pri) - +include(../libLumina/LDesktopUtils.pri) CONFIG *= c++11 #Install paths diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp index 28a5e558..6db249fe 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp @@ -13,6 +13,8 @@ #include "qsspage.h" #include "ui_mainwindow.h" +#include <LDesktopUtils.h> + MainWindow::MainWindow(QWidget *parent) : QWidget(parent), m_ui(new Ui::MainWindow){ m_ui->setupUi(this); bgroup = new QButtonGroup(this); @@ -35,7 +37,8 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent), m_ui(new Ui::MainWind QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("SettingsWindow/geometry").toByteArray()); setWindowIcon(QIcon::fromTheme("preferences-desktop-theme")); - m_ui->versionLabel->setText(tr("Version: %1").arg(LTHEMEENGINE_VERSION_STR)); + this->setWindowTitle(tr("Theme Settings")); + m_ui->versionLabel->setText(tr("Version: %1").arg(LDesktopUtils::LuminaDesktopVersion())); } MainWindow::~MainWindow(){ |