diff options
5 files changed, 18 insertions, 8 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index d6ada8f5..ecaf2990 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -9,6 +9,7 @@ #include "globals.h" #include "pages/getPage.h" +#include "pages/page_main.h" //============= // PUBLIC @@ -133,7 +134,10 @@ void mainWindow::on_actionSave_triggered(){ } void mainWindow::on_actionBack_triggered(){ - if(cpage.isEmpty()){ this->close(); } //main menu - go ahead and close it + if(cpage.isEmpty()){ page_main::clearlineEdit(); } //since ESC doesnt close any other Lumina Appliction by default, I've +commented this out for +the +time being. else{ page_change(""); } //Use the interactive wrapper (check for save state, etc). } diff --git a/src-qt5/core-utils/lumina-config/pages/PageWidget.h b/src-qt5/core-utils/lumina-config/pages/PageWidget.h index 2d663e71..8cd23db7 100644 --- a/src-qt5/core-utils/lumina-config/pages/PageWidget.h +++ b/src-qt5/core-utils/lumina-config/pages/PageWidget.h @@ -52,7 +52,7 @@ public slots: //Simplification function for widget connections virtual void settingChanged(){ - emit HasPendingChanges(true); + emit HasPendingChanges(true); } }; 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 0003c9c8..5f7cd190 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp @@ -12,10 +12,10 @@ // PUBLIC //========== page_compton::page_compton(QWidget *parent) : PageWidget(parent), ui(new Ui::page_compton()){ - ui->setupUi(this); - connect(ui->text_file, SIGNAL(textChanged()), this, SLOT(settingChanged()) ); - connect(ui->check_disablecompton, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) ); - updateIcons(); + ui->setupUi(this); + connect(ui->text_file, SIGNAL(textChanged()), this, SLOT(settingChanged()) ); + connect(ui->check_disablecompton, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) ); + updateIcons(); } page_compton::~page_compton(){ @@ -34,17 +34,17 @@ void page_compton::SaveSettings(){ } void page_compton::LoadSettings(int){ - emit HasPendingChanges(false); emit ChangePageTitle( tr("Compositor Settings") ); QSettings settings("lumina-desktop","sessionsettings"); ui->check_disablecompton->setChecked( !settings.value("enableCompositing", true).toBool() ); QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf"; qDebug() << "Load Compton settings:" << set; ui->text_file->setPlainText( LUtils::readFile(set).join("\n") ); + emit HasPendingChanges(false); } void page_compton::updateIcons(){ - +emit HasPendingChanges(false); } //================= 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 69b32c09..e60606f3 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_main.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_main.cpp @@ -121,6 +121,11 @@ void page_main::SaveSettings(){ } +void page_main::clearlineEdit(){ + ui->lineEdit->clear(); +} + + void page_main::LoadSettings(int){ emit HasPendingChanges(false); emit ChangePageTitle( tr("Desktop Settings") ); diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.h b/src-qt5/core-utils/lumina-config/pages/page_main.h index e4bfeafd..095815e9 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_main.h +++ b/src-qt5/core-utils/lumina-config/pages/page_main.h @@ -20,6 +20,7 @@ public: ~page_main(); virtual void setPreviousPage(QString id); + void clearlineEdit(); public slots: void SaveSettings(); |