diff options
Diffstat (limited to 'src-qt5/core-utils/lumina-config/mainWindow.cpp')
-rw-r--r-- | src-qt5/core-utils/lumina-config/mainWindow.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index 5f465199..595d69f6 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -9,12 +9,15 @@ #include "globals.h" #include "pages/getPage.h" +#include "pages/page_main.h" //============= // PUBLIC //============= mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){ ui->setupUi(this); + APPSLIST = new XDGDesktopList(this, true); //keep this up to date while the app is open + QTimer::singleShot(100, APPSLIST, SLOT(updateList())); //don't let this hold up the initial application loading cpage = "somerandomjunktostartwith"; //Need to insert a spacer action in the toolbar QWidget *tmp = new QWidget(this); @@ -24,7 +27,7 @@ mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){ connect(backShortcut, SIGNAL(activated()), this, SLOT(on_actionBack_triggered()) ); setupIcons(); loadMonitors(); - changePage(""); //load the default main page + //changePage(""); //load the default main page } mainWindow::~mainWindow(){ @@ -34,7 +37,14 @@ mainWindow::~mainWindow(){ //============== // PUBLIC SLOTS //============== -void mainWindow::slotSingleInstance(){ +void mainWindow::slotSingleInstance(QStringList args){ + for(int i=0; i<args.length(); i++){ + if(args[i]=="--page" && i<args.length()-1){ + i++; + changePage(args[i]); + } + } + if(cpage == "somerandomjunktostartwith"){ changePage(""); } this->showNormal(); //just in case it is hidden/minimized } @@ -131,7 +141,7 @@ 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). } |