From 0bf0b86dc0a509a6fb432bac0d1d89d838f655a6 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sun, 20 Nov 2016 13:21:49 -0500 Subject: Revert "comment out changes made to wrong repo, until method can be fixed" This reverts commit 876173714461d6f9d104636d90e648c9f7009505. --- src-qt5/core-utils/lumina-config/mainWindow.cpp | 6 +++++- src-qt5/core-utils/lumina-config/pages/page_main.cpp | 6 +++--- src-qt5/core-utils/lumina-config/pages/page_main.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index de49f22b..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()){ /* page_main::clearlineEdit(); */ } //since ESC doesnt close any other Lumina Appliction by default, I've commented this out for the time being. + 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/page_main.cpp b/src-qt5/core-utils/lumina-config/pages/page_main.cpp index 22d00d27..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,9 +121,9 @@ void page_main::SaveSettings(){ } -//void page_main::clearlineEdit(){ -// ui->lineEdit->clear(); -//} +void page_main::clearlineEdit(){ + ui->lineEdit->clear(); +} void page_main::LoadSettings(int){ 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 a41f0753..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,7 +20,7 @@ public: ~page_main(); virtual void setPreviousPage(QString id); -// void clearlineEdit(); + void clearlineEdit(); public slots: void SaveSettings(); -- cgit