From 7ab900e41f5f15adccd573d459a80fe60cf6a044 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 7 Nov 2016 13:52:20 -0500 Subject: LARGE UPDATE: 1) Dismantle the Lumina library completely. 2) Setup lots of small subproject files (.pri) for the individual classes within the old library. 3) Move all the Lumina binaries to use the new subproject files 4) Split up the LuminaUtils class/files into LUtils and LDesktopUtils (generic utilities, and desktop-specific utilities) --- src-qt5/core-utils/lumina-config/ColorDialog.cpp | 2 +- src-qt5/core-utils/lumina-config/LPlugins.cpp | 2 +- src-qt5/core-utils/lumina-config/ThemeDialog.cpp | 2 +- src-qt5/core-utils/lumina-config/globals.h | 4 +++- src-qt5/core-utils/lumina-config/lumina-config.pro | 13 ++++++------- src-qt5/core-utils/lumina-config/main.cpp | 2 +- .../core-utils/lumina-config/pages/page_session_options.cpp | 4 ++-- src-qt5/core-utils/lumina-search/Worker.cpp | 2 +- src-qt5/core-utils/lumina-search/lumina-search.pro | 10 ++++++---- src-qt5/core-utils/lumina-search/main.cpp | 2 +- src-qt5/core-utils/lumina-xconfig/MainUI.cpp | 2 +- src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp | 2 +- src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro | 12 ++++++------ src-qt5/core-utils/lumina-xconfig/main.cpp | 2 +- 14 files changed, 32 insertions(+), 29 deletions(-) (limited to 'src-qt5/core-utils') diff --git a/src-qt5/core-utils/lumina-config/ColorDialog.cpp b/src-qt5/core-utils/lumina-config/ColorDialog.cpp index 860f6069..9dfcc641 100644 --- a/src-qt5/core-utils/lumina-config/ColorDialog.cpp +++ b/src-qt5/core-utils/lumina-config/ColorDialog.cpp @@ -1,7 +1,7 @@ #include "ColorDialog.h" #include "ui_ColorDialog.h" -#include +#include ColorDialog::ColorDialog(QWidget *parent, LPlugins *plugs, QString colorFilePath) : QDialog(parent), ui(new Ui::ColorDialog){ ui->setupUi(this); //load the designer file diff --git a/src-qt5/core-utils/lumina-config/LPlugins.cpp b/src-qt5/core-utils/lumina-config/LPlugins.cpp index cc19f8e8..e48910c7 100644 --- a/src-qt5/core-utils/lumina-config/LPlugins.cpp +++ b/src-qt5/core-utils/lumina-config/LPlugins.cpp @@ -6,7 +6,7 @@ //=========================================== #include "LPlugins.h" -#include +#include LPlugins::LPlugins(){ LoadPanelPlugins(); diff --git a/src-qt5/core-utils/lumina-config/ThemeDialog.cpp b/src-qt5/core-utils/lumina-config/ThemeDialog.cpp index de17a3d8..75645448 100644 --- a/src-qt5/core-utils/lumina-config/ThemeDialog.cpp +++ b/src-qt5/core-utils/lumina-config/ThemeDialog.cpp @@ -1,7 +1,7 @@ #include "ThemeDialog.h" #include "ui_ThemeDialog.h" -#include +#include ThemeDialog::ThemeDialog(QWidget *parent, LPlugins *plugs, QString themeFilePath) : QDialog(parent), ui(new Ui::ThemeDialog){ ui->setupUi(this); //load the designer file diff --git a/src-qt5/core-utils/lumina-config/globals.h b/src-qt5/core-utils/lumina-config/globals.h index 2a863bda..0f94785c 100644 --- a/src-qt5/core-utils/lumina-config/globals.h +++ b/src-qt5/core-utils/lumina-config/globals.h @@ -25,10 +25,12 @@ #include #include #include +#include //Now the Lumina Library classes #include -#include +#include +#include #include #include #include diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro index 5d6e8db9..fe5494de 100644 --- a/src-qt5/core-utils/lumina-config/lumina-config.pro +++ b/src-qt5/core-utils/lumina-config/lumina-config.pro @@ -10,6 +10,12 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../../core/libLumina/LDesktopUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ mainWindow.cpp \ LPlugins.cpp \ @@ -38,13 +44,6 @@ FORMS += mainWindow.ui \ include("pages/pages.pri") -# RESOURCES+= lumina-config.qrc - -LIBS += -lLuminaUtils - - -DEPENDPATH += ../../core/libLumina - TRANSLATIONS = i18n/lumina-config_af.ts \ i18n/lumina-config_ar.ts \ i18n/lumina-config_az.ts \ diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 8df7db48..b958c10e 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -7,7 +7,7 @@ #include "mainWindow.h" #include -#include +#include #include #include #include diff --git a/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp b/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp index 91f3a0d0..333f9da8 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp @@ -122,12 +122,12 @@ void page_session_options::sessionChangeUserIcon(){ } void page_session_options::sessionResetSys(){ - LUtils::LoadSystemDefaults(); + LDesktopUtils::LoadSystemDefaults(); QTimer::singleShot(500,this, SLOT(LoadSettings()) ); } void page_session_options::sessionResetLumina(){ - LUtils::LoadSystemDefaults(true); //skip OS customizations + LDesktopUtils::LoadSystemDefaults(true); //skip OS customizations QTimer::singleShot(500,this, SLOT(LoadSettings()) ); } diff --git a/src-qt5/core-utils/lumina-search/Worker.cpp b/src-qt5/core-utils/lumina-search/Worker.cpp index 0d50d4b8..677d2b4b 100644 --- a/src-qt5/core-utils/lumina-search/Worker.cpp +++ b/src-qt5/core-utils/lumina-search/Worker.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include Worker::Worker(QObject *parent) : QObject(parent){ //Get the list of all applications and save them in an easily-searchable form diff --git a/src-qt5/core-utils/lumina-search/lumina-search.pro b/src-qt5/core-utils/lumina-search/lumina-search.pro index e42142c6..c0186ce4 100644 --- a/src-qt5/core-utils/lumina-search/lumina-search.pro +++ b/src-qt5/core-utils/lumina-search/lumina-search.pro @@ -10,6 +10,12 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ MainUI.cpp \ Worker.cpp \ @@ -22,10 +28,6 @@ HEADERS += MainUI.h \ FORMS += MainUI.ui \ ConfigUI.ui -LIBS += -lLuminaUtils - -DEPENDPATH += ../libLumina - TRANSLATIONS = i18n/lumina-search_af.ts \ i18n/lumina-search_ar.ts \ i18n/lumina-search_az.ts \ diff --git a/src-qt5/core-utils/lumina-search/main.cpp b/src-qt5/core-utils/lumina-search/main.cpp index 5b2b0479..5eee7c32 100644 --- a/src-qt5/core-utils/lumina-search/main.cpp +++ b/src-qt5/core-utils/lumina-search/main.cpp @@ -6,7 +6,7 @@ #include "MainUI.h" #include #include -#include +#include //==== INPUT FORMAT ==== // lumina-search [-no-excludes] [-dir [directory]] [-search ] diff --git a/src-qt5/core-utils/lumina-xconfig/MainUI.cpp b/src-qt5/core-utils/lumina-xconfig/MainUI.cpp index 2aed4d30..169302ca 100644 --- a/src-qt5/core-utils/lumina-xconfig/MainUI.cpp +++ b/src-qt5/core-utils/lumina-xconfig/MainUI.cpp @@ -8,7 +8,7 @@ #include "ui_MainUI.h" #include -#include +#include #include diff --git a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp index 43584a1c..91e1f498 100644 --- a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp +++ b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp @@ -5,7 +5,7 @@ // See the LICENSE file for full details //=========================================== #include "ScreenSettings.h" -#include +#include #include #include diff --git a/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro b/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro index a7a34fe9..2fb792d6 100644 --- a/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro +++ b/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro @@ -8,6 +8,12 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ mainUI.cpp \ ScreenSettings.cpp @@ -17,12 +23,6 @@ HEADERS += mainUI.h \ FORMS += mainUI.ui -# RESOURCES+= lumina-config.qrc - - -LIBS += -lLuminaUtils - -DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-xconfig_af.ts \ i18n/lumina-xconfig_ar.ts \ diff --git a/src-qt5/core-utils/lumina-xconfig/main.cpp b/src-qt5/core-utils/lumina-xconfig/main.cpp index f30486f4..2596bf7a 100644 --- a/src-qt5/core-utils/lumina-xconfig/main.cpp +++ b/src-qt5/core-utils/lumina-xconfig/main.cpp @@ -6,7 +6,7 @@ #include "MainUI.h" #include #include -#include +#include #include #include "ScreenSettings.h" -- cgit