diff options
Diffstat (limited to 'src-qt5')
20 files changed, 94 insertions, 94 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index ebce647f..8b021d35 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -86,7 +86,7 @@ void mainWindow::changePage(QString id){ PageWidget *page = 0; QString oldpage = this->centralWidget()->whatsThis(); if(id!=cpage || cpage!=oldpage){ - page = GetNewPage(id, this); + page = Pages::GetNewPage(id, this); if(page==0){ return; } qDebug() << "Changing page:" << id; cpage = id; diff --git a/src-qt5/core-utils/lumina-config/mainWindow.h b/src-qt5/core-utils/lumina-config/mainWindow.h index 4c6bad39..2873ecdb 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.h +++ b/src-qt5/core-utils/lumina-config/mainWindow.h @@ -7,6 +7,7 @@ #ifndef _LUMINA_CONFIG_MAIN_WINDOW_H #define _LUMINA_CONFIG_MAIN_WINDOW_H #include "globals.h" +//#include "pages/getPage.h" namespace Ui{ class mainWindow; diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.cpp b/src-qt5/core-utils/lumina-config/pages/getPage.cpp new file mode 100644 index 00000000..79eb18f6 --- /dev/null +++ b/src-qt5/core-utils/lumina-config/pages/getPage.cpp @@ -0,0 +1,82 @@ +//=========================================== +// Lumina Desktop Source Code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "getPage.h" + +//Add any sub-pages here +#include "page_main.h" +#include "page_wallpaper.h" +#include "page_theme.h" +#include "page_autostart.h" +#include "page_defaultapps.h" +#include "page_fluxbox_keys.h" +#include "page_fluxbox_settings.h" +#include "page_interface_desktop.h" +#include "page_interface_panels.h" +#include "page_interface_menu.h" +#include "page_session_locale.h" +#include "page_session_options.h" +#include "page_compton.h" + +// #include "page_mouse_trueos.h" +// #include "page_bluetooth_trueos.h" + +//Simplification function for creating a PAGEINFO structure +PAGEINFO Pages::PageInfo(QString ID, QString i_name, QString i_title, QString i_icon, QString i_comment, QString i_cat, QStringList i_sys, QStringList i_tags){ + PAGEINFO page; + page.id = ID; page.name = i_name; page.title = i_title; page.icon = i_icon; + page.comment = i_comment; page.category = i_cat; page.req_systems = i_sys; + page.search_tags = i_tags; + return page; +} + +//List all the known pages +// **** Add new page entries here **** +QList<PAGEINFO> Pages::KnownPages(){ + // Valid Groups: ["appearance", "interface", "session", "user"] + QList<PAGEINFO> list; + //Reminder: <ID>, <name>, <title>, <icon>, <comment>, <category>, <server subsytem list>, <search tags> + list << Pages::PageInfo("wallpaper", QObject::tr("Wallpaper"), QObject::tr("Wallpaper Settings"), "preferences-desktop-wallpaper",QObject::tr("Change background image(s)"), "appearance", QStringList(), QStringList() << "background" << "wallpaper" << "color" << "image"); + list << Pages::PageInfo("theme", QObject::tr("Theme"), QObject::tr("Theme Settings"), "preferences-desktop-theme",QObject::tr("Change interface fonts and colors"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "theme" << "plugins"); + list << Pages::PageInfo("compton", QObject::tr("Window Effects"), QObject::tr("Window Effects"), "window-duplicate",QObject::tr("Adjust transparency levels and window effects"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "transparency" << "windows" << "compositing"); + list << Pages::PageInfo("autostart", QObject::tr("Autostart"), QObject::tr("Startup Settings"), "preferences-system-session-services",QObject::tr("Automatically start applications or services"), "session", QStringList(), QStringList() << "apps" << "autostart" << "services" << "xdg" << "startup" << "session"); + list << Pages::PageInfo("defaultapps", QObject::tr("Applications"), QObject::tr("Mimetype Settings"), "preferences-desktop-default-applications",QObject::tr("Change default applications"), "session", QStringList(), QStringList() << "apps" << "default" << "services" << "xdg" << "session"); + list << Pages::PageInfo("fluxbox-keys", QObject::tr("Keyboard Shortcuts"), QObject::tr("Keyboard Shortcuts"), "preferences-desktop-keyboard",QObject::tr("Change keyboard shortcuts"), "session", QStringList(), QStringList() << "apps" << "fluxbox" << "keys" << "keyboard" << "session" << "launch"); + list << Pages::PageInfo("fluxbox-settings", QObject::tr("Window Manager"), QObject::tr("Window Settings"), "preferences-system-windows-actions",QObject::tr("Change window settings and appearances"), "appearance", QStringList(), QStringList() << "window" << "frame" << "border" << "workspace" << "theme" << "fluxbox" << "session"); + list << Pages::PageInfo("interface-desktop", QObject::tr("Desktop"), QObject::tr("Desktop Plugins"), "preferences-desktop-icons",QObject::tr("Change what icons or tools are embedded on the desktop"), "interface", QStringList(), QStringList() << "desktop" << "plugins" << "embed" << "icons" << "utilities"); + list << Pages::PageInfo("interface-panel", QObject::tr("Panels"), QObject::tr("Panels and Plugins"), "configure-toolbars",QObject::tr("Change any floating panels and what they show"), "interface", QStringList(), QStringList() << "desktop" << "toolbar" << "panel" << "floating" << "plugins"); + list << Pages::PageInfo("interface-menu", QObject::tr("Menu"), QObject::tr("Menu Plugins"), "format-list-unordered",QObject::tr("Change what options are shown on the desktop context menu"), "interface", QStringList(), QStringList() << "desktop" << "menu" << "plugins" << "shortcuts"); + list << Pages::PageInfo("session-locale", QObject::tr("Localization"), QObject::tr("Locale Settings"), "preferences-desktop-locale",QObject::tr("Change the default locale settings for this user"), "user", QStringList(), QStringList() << "user"<<"locale"<<"language"<<"translations"); + list << Pages::PageInfo("session-options", QObject::tr("General Options"), QObject::tr("User Settings"), "configure",QObject::tr("Change basic user settings such as time/date formats"), "user", QStringList(), QStringList() << "user"<<"settings"<<"time"<<"date"<<"icon"<<"reset"<<"numlock"<<"clock"); + // list << Pages::PageInfo("mouse-settings", QObject::tr("TrueOS Mouse Settings"), QObject::tr("TrueOS Mouse Settings"), "preferences-desktop-mouse",QObject::tr("Adjust mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse"); + // list << Pages::PageInfo("bluetooth-settings", QObject::tr("TrueOS Bluetooth Settings"), QObject::tr("TrueOS Bluetooth Settings"), "preferences-desktop-bluetooth",QObject::tr("Setup Bluetooth devices"), "user", QStringList(), QStringList() << "user"<<"bluetooth"<<"audio"); + + return list; +} + +PageWidget* Pages::GetNewPage(QString id, QWidget *parent){ + //Find the page that matches this "id" + PageWidget* page = 0; + if(id=="wallpaper"){ page = new page_wallpaper(parent); } + else if(id=="theme"){ page = new page_theme(parent); } + else if(id=="autostart"){ page = new page_autostart(parent); } + else if(id=="defaultapps"){ page = new page_defaultapps(parent); } + else if(id=="fluxbox-keys"){ page = new page_fluxbox_keys(parent); } + else if(id=="fluxbox-settings"){ page = new page_fluxbox_settings(parent); } + else if(id=="interface-desktop"){ page = new page_interface_desktop(parent); } + else if(id=="interface-panel"){ page = new page_interface_panels(parent); } + else if(id=="interface-menu"){ page = new page_interface_menu(parent); } + else if(id=="session-locale"){ page = new page_session_locale(parent); } + else if(id=="session-options"){ page = new page_session_options(parent); } + else if(id=="compton"){ page = new page_compton(parent); } + + // else if(id=="mouse-settings"){ page = new page_mouse_trueos(parent); } + // else if(id=="bluetooth-settings"){ page = new page_bluetooth_trueos(parent); } + //Return the main control_panel page as the fallback/default + if(page==0){ id.clear(); page = new page_main(parent); } + page->setWhatsThis(id); + return page; +} diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index 59dbcd2b..3c2831e4 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -10,80 +10,11 @@ #include "../globals.h" #include "PageWidget.h" - -//Simplification function for creating a PAGEINFO structure -static PAGEINFO PageInfo(QString ID, QString i_name, QString i_title, QString i_icon, QString i_comment, QString i_cat, QStringList i_sys, QStringList i_tags){ - PAGEINFO page; - page.id = ID; page.name = i_name; page.title = i_title; page.icon = i_icon; - page.comment = i_comment; page.category = i_cat; page.req_systems = i_sys; - page.search_tags = i_tags; - return page; -} - -//List all the known pages -// **** Add new page entries here **** -static QList<PAGEINFO> KnownPages(){ - // Valid Groups: ["appearance", "interface", "session", "user"] - QList<PAGEINFO> list; - //Reminder: <ID>, <name>, <title>, <icon>, <comment>, <category>, <server subsytem list>, <search tags> - list << PageInfo("wallpaper", QObject::tr("Wallpaper"), QObject::tr("Wallpaper Settings"), "preferences-desktop-wallpaper",QObject::tr("Change background image(s)"), "appearance", QStringList(), QStringList() << "background" << "wallpaper" << "color" << "image"); - list << PageInfo("theme", QObject::tr("Theme"), QObject::tr("Theme Settings"), "preferences-desktop-theme",QObject::tr("Change interface fonts and colors"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "theme" << "plugins"); - list << PageInfo("compton", QObject::tr("Window Effects"), QObject::tr("Window Effects"), "window-duplicate",QObject::tr("Adjust transparency levels and window effects"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "transparency" << "windows" << "compositing"); - list << PageInfo("autostart", QObject::tr("Autostart"), QObject::tr("Startup Settings"), "preferences-system-session-services",QObject::tr("Automatically start applications or services"), "session", QStringList(), QStringList() << "apps" << "autostart" << "services" << "xdg" << "startup" << "session"); - list << PageInfo("defaultapps", QObject::tr("Applications"), QObject::tr("Mimetype Settings"), "preferences-desktop-default-applications",QObject::tr("Change default applications"), "session", QStringList(), QStringList() << "apps" << "default" << "services" << "xdg" << "session"); - list << PageInfo("fluxbox-keys", QObject::tr("Keyboard Shortcuts"), QObject::tr("Keyboard Shortcuts"), "preferences-desktop-keyboard",QObject::tr("Change keyboard shortcuts"), "session", QStringList(), QStringList() << "apps" << "fluxbox" << "keys" << "keyboard" << "session" << "launch"); - list << PageInfo("fluxbox-settings", QObject::tr("Window Manager"), QObject::tr("Window Settings"), "preferences-system-windows-actions",QObject::tr("Change window settings and appearances"), "appearance", QStringList(), QStringList() << "window" << "frame" << "border" << "workspace" << "theme" << "fluxbox" << "session"); - list << PageInfo("interface-desktop", QObject::tr("Desktop"), QObject::tr("Desktop Plugins"), "preferences-desktop-icons",QObject::tr("Change what icons or tools are embedded on the desktop"), "interface", QStringList(), QStringList() << "desktop" << "plugins" << "embed" << "icons" << "utilities"); - list << PageInfo("interface-panel", QObject::tr("Panels"), QObject::tr("Panels and Plugins"), "configure-toolbars",QObject::tr("Change any floating panels and what they show"), "interface", QStringList(), QStringList() << "desktop" << "toolbar" << "panel" << "floating" << "plugins"); - list << PageInfo("interface-menu", QObject::tr("Menu"), QObject::tr("Menu Plugins"), "format-list-unordered",QObject::tr("Change what options are shown on the desktop context menu"), "interface", QStringList(), QStringList() << "desktop" << "menu" << "plugins" << "shortcuts"); - list << PageInfo("session-locale", QObject::tr("Localization"), QObject::tr("Locale Settings"), "preferences-desktop-locale",QObject::tr("Change the default locale settings for this user"), "user", QStringList(), QStringList() << "user"<<"locale"<<"language"<<"translations"); - list << PageInfo("session-options", QObject::tr("General Options"), QObject::tr("User Settings"), "configure",QObject::tr("Change basic user settings such as time/date formats"), "user", QStringList(), QStringList() << "user"<<"settings"<<"time"<<"date"<<"icon"<<"reset"<<"numlock"<<"clock"); - // list << PageInfo("mouse-settings", QObject::tr("TrueOS Mouse Settings"), QObject::tr("TrueOS Mouse Settings"), "preferences-desktop-mouse",QObject::tr("Adjust mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse"); - // list << PageInfo("bluetooth-settings", QObject::tr("TrueOS Bluetooth Settings"), QObject::tr("TrueOS Bluetooth Settings"), "preferences-desktop-bluetooth",QObject::tr("Setup Bluetooth devices"), "user", QStringList(), QStringList() << "user"<<"bluetooth"<<"audio"); - - return list; -} - -//Add any sub-pages here -#include "page_main.h" -#include "page_wallpaper.h" -#include "page_theme.h" -#include "page_autostart.h" -#include "page_defaultapps.h" -#include "page_fluxbox_keys.h" -#include "page_fluxbox_settings.h" -#include "page_interface_desktop.h" -#include "page_interface_panels.h" -#include "page_interface_menu.h" -#include "page_session_locale.h" -#include "page_session_options.h" -#include "page_compton.h" - -// #include "page_mouse_trueos.h" -// #include "page_bluetooth_trueos.h" - -static PageWidget* GetNewPage(QString id, QWidget *parent){ - //Find the page that matches this "id" - PageWidget* page = 0; - if(id=="wallpaper"){ page = new page_wallpaper(parent); } - else if(id=="theme"){ page = new page_theme(parent); } - else if(id=="autostart"){ page = new page_autostart(parent); } - else if(id=="defaultapps"){ page = new page_defaultapps(parent); } - else if(id=="fluxbox-keys"){ page = new page_fluxbox_keys(parent); } - else if(id=="fluxbox-settings"){ page = new page_fluxbox_settings(parent); } - else if(id=="interface-desktop"){ page = new page_interface_desktop(parent); } - else if(id=="interface-panel"){ page = new page_interface_panels(parent); } - else if(id=="interface-menu"){ page = new page_interface_menu(parent); } - else if(id=="session-locale"){ page = new page_session_locale(parent); } - else if(id=="session-options"){ page = new page_session_options(parent); } - else if(id=="compton"){ page = new page_compton(parent); } - - // else if(id=="mouse-settings"){ page = new page_mouse_trueos(parent); } - // else if(id=="bluetooth-settings"){ page = new page_bluetooth_trueos(parent); } - //Return the main control_panel page as the fallback/default - if(page==0){ id.clear(); page = new page_main(parent); } - page->setWhatsThis(id); - return page; -} +class Pages{ +public: + static PAGEINFO PageInfo(QString, QString, QString, QString, QString, QString, QStringList, QStringList); + static QList<PAGEINFO> KnownPages(); + static PageWidget* GetNewPage(QString id, QWidget *parent); +}; #endif diff --git a/src-qt5/core-utils/lumina-config/pages/page_autostart.cpp b/src-qt5/core-utils/lumina-config/pages/page_autostart.cpp index 0159d8f5..e0cbe9d3 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_autostart.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_autostart.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_autostart.h" #include "ui_page_autostart.h" -#include "getPage.h" #include "../AppDialog.h" //========== diff --git a/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp index 3e3451fc..e6e81189 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_bluetooth_trueos.h" #include "ui_page_bluetooth_trueos.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp index bb4dad21..4f7b90ae 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_compton.h" #include "ui_page_compton.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp index a21653c9..ce39958f 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_defaultapps.h" #include "ui_page_defaultapps.h" -#include "getPage.h" #include "../AppDialog.h" //========== diff --git a/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp b/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp index 18bc09e6..e0fd0c62 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_fluxbox_keys.h" #include "ui_page_fluxbox_keys.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp b/src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp index 20dc4a22..50b5c7e2 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_fluxbox_settings.h" #include "ui_page_fluxbox_settings.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp index f467db36..66fdb9f7 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_interface_desktop.h" #include "ui_page_interface_desktop.h" -#include "getPage.h" #include "../GetPluginDialog.h" #include "../AppDialog.h" diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_menu.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_menu.cpp index 370980d2..20110960 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_interface_menu.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_interface_menu.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_interface_menu.h" #include "ui_page_interface_menu.h" -#include "getPage.h" #include "../AppDialog.h" #include "../GetPluginDialog.h" #include "../ScriptDialog.h" diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp index 3c355aa7..45fd8913 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_interface_panels.h" #include "ui_page_interface_panels.h" -#include "getPage.h" #include "../GetPluginDialog.h" #include "../AppDialog.h" diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.cpp b/src-qt5/core-utils/lumina-config/pages/page_main.cpp index 6d9177f7..45c03ef9 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_main.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_main.cpp @@ -144,13 +144,13 @@ void page_main::LoadSettings(int){ emit HasPendingChanges(false); emit ChangePageTitle( tr("Desktop Settings") ); INFO.clear(); - INFO = KnownPages(); + INFO = Pages::KnownPages(); //Also add known system setting applications to the INFO list QList<XDGDesktop*> apps = APPSLIST->apps(false,false); //only valid, non-hidden files qDebug() << "Found Apps:" << apps.length(); for(int i=0; i<apps.length(); i++){ if( !apps[i]->catList.contains("Settings") || apps[i]->filePath.endsWith("lumina-config.desktop") ){ continue; } - INFO << PageInfo(apps[i]->filePath, apps[i]->name, apps[i]->genericName, apps[i]->icon, apps[i]->comment, "system", QStringList(), apps[i]->keyList); + INFO << Pages::PageInfo(apps[i]->filePath, apps[i]->name, apps[i]->genericName, apps[i]->icon, apps[i]->comment, "system", QStringList(), apps[i]->keyList); } //Now sort the items according to the translated name QStringList names; diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp index edfe1cb7..77e63f57 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_mouse_trueos.h" #include "ui_page_mouse_trueos.h" -#include "getPage.h" #include <QDebug> #include <QProcess> @@ -107,4 +106,3 @@ void page_mouse_trueos::updateMoused(){ QProcess *moused = new QProcess(this); moused->start(program, mousedargs); } - diff --git a/src-qt5/core-utils/lumina-config/pages/page_sample.cpp b/src-qt5/core-utils/lumina-config/pages/page_sample.cpp index b613bd95..6e9edb34 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_sample.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_sample.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_sample.h" #include "ui_page_sample.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_session_locale.cpp b/src-qt5/core-utils/lumina-config/pages/page_session_locale.cpp index ad5aa7f7..f31a7e0a 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_session_locale.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_session_locale.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_session_locale.h" #include "ui_page_session_locale.h" -#include "getPage.h" //========== // PUBLIC 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 4390867e..3aba502f 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 @@ -6,7 +6,6 @@ //=========================================== #include "page_session_options.h" #include "ui_page_session_options.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/page_wallpaper.cpp b/src-qt5/core-utils/lumina-config/pages/page_wallpaper.cpp index b711d587..6842dce4 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_wallpaper.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_wallpaper.cpp @@ -6,7 +6,6 @@ //=========================================== #include "page_wallpaper.h" #include "ui_page_wallpaper.h" -#include "getPage.h" //========== // PUBLIC diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index 89b9b010..136a8613 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -18,7 +18,8 @@ HEADERS += $${PWD}/getPage.h \ # $${PWD}/page_mouse_trueos.h -SOURCES += $${PWD}/page_main.cpp \ +SOURCES += $${PWD}/getPage.cpp \ + $${PWD}/page_main.cpp \ $${PWD}/page_wallpaper.cpp \ $${PWD}/page_theme.cpp \ $${PWD}/page_autostart.cpp \ |