From 254941f51c444e9edea99bf82ff02e6f05fdfb81 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jun 2016 22:52:39 -0400 Subject: Get the panel interface page all converted over to the new UI. --- src-qt5/core-utils/lumina-config/pages/getPage.h | 4 ++-- src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp | 1 + src-qt5/core-utils/lumina-config/pages/pages.pri | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src-qt5/core-utils/lumina-config') diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index 21830a5c..ad0fea08 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -47,7 +47,7 @@ static QList KnownPages(){ #include "page_fluxbox_keys.h" #include "page_fluxbox_settings.h" #include "page_interface_desktop.h" -//#include "page_interface_panels.h" +#include "page_interface_panels.h" //#include "page_interface_menu.h" static PageWidget* GetNewPage(QString id, QWidget *parent){ @@ -59,7 +59,7 @@ static PageWidget* GetNewPage(QString id, QWidget *parent){ else if(id=="fluxbox-keys"){ return new page_fluxbox_keys(parent); } else if(id=="fluxbox-settings"){ return new page_fluxbox_settings(parent); } else if(id=="interface-desktop"){ return new page_interface_desktop(parent); } -// else if(id=="interface-panel"){ return new page_interface_panels(parent); } + else if(id=="interface-panel"){ return new page_interface_panels(parent); } // else if(id=="interface-menu"){ return new page_interface_menu(parent); } //Return the main control_panel page as the fallback/default return new page_main(parent); 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 bd617464..9c319780 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 @@ -18,6 +18,7 @@ page_interface_desktop::page_interface_desktop(QWidget *parent) : PageWidget(par PINFO = new LPlugins(); connect(ui->tool_desktop_addplugin, SIGNAL(clicked()), this, SLOT(deskplugadded()) ); connect(ui->tool_desktop_rmplugin, SIGNAL(clicked()), this, SLOT(deskplugremoved()) ); + connect(ui->check_desktop_autolaunchers, SIGNAL(clicked()), this, SLOT(settingChanged()) ); updateIcons(); } diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index 8d2f1dec..ebf6f892 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -8,9 +8,9 @@ HEADERS += $${PWD}/getPage.h \ $${PWD}/page_defaultapps.h \ $${PWD}/page_fluxbox_keys.h \ $${PWD}/page_fluxbox_settings.h \ - $${PWD}/page_interface_desktop.h + $${PWD}/page_interface_desktop.h \ # $${PWD}/page_interface_menu.h \ -# $${PWD}/page_interface_panels.h \ + $${PWD}/page_interface_panels.h # $${PWD}/page_session_locale.h \ # $${PWD}/page_session_options.h \ @@ -22,9 +22,9 @@ SOURCES += $${PWD}/page_main.cpp \ $${PWD}/page_defaultapps.cpp \ $${PWD}/page_fluxbox_keys.cpp \ $${PWD}/page_fluxbox_settings.cpp \ - $${PWD}/page_interface_desktop.cpp + $${PWD}/page_interface_desktop.cpp \ # $${PWD}/page_interface_menu.cpp \ -# $${PWD}/page_interface_panels.cpp \ + $${PWD}/page_interface_panels.cpp # $${PWD}/page_session_locale.cpp \ # $${PWD}/page_session_options.cpp \ -- cgit