diff options
Diffstat (limited to 'src-qt5/core-utils/lumina-config')
7 files changed, 15 insertions, 14 deletions
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 <LuminaUtils.h> +#include <LUtils.h> 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 <LuminaUtils.h> +#include <LUtils.h> 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 <LuminaUtils.h> +#include <LUtils.h> 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 <QDialog> #include <QPoint> #include <QCursor> +#include <QMenu> //Now the Lumina Library classes #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> +#include <LDesktopUtils.h> #include <LuminaX11.h> #include <LuminaOS.h> #include <LuminaThemes.h> 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 <LuminaOS.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaThemes.h> #include <LuminaSingleApplication.h> #include <LuminaXDG.h> 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()) ); } |