From bbb523a3b6b204e4f127f45dc151165086eb970c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 24 Jun 2016 21:50:04 -0400 Subject: Switch back to the old UI for now (new one still not finished yet). Also have the monitor selection on the new UI hidden if there is only one monitor available. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- src-qt5/core-utils/lumina-config/mainWindow.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 20d517b2..a63e0fbe 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - //MainUI w; - mainWindow w; + MainUI w; + //mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index 95a420e8..9121d295 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -85,7 +85,7 @@ void mainWindow::changePage(QString id){ //Now load the new page page->LoadSettings(ui->actionMonitor->whatsThis().toInt()); //need to make this show the current screen as needed //Now update this UI a bit based on page settings - ui->actionMonitor->setVisible( page->needsScreenSelector() );// && ui->actionMonitor->menu()->actions().length()>1 ); + ui->actionMonitor->setVisible( page->needsScreenSelector() && ui->actionMonitor->menu()->actions().length()>1 ); this->showNormal(); } -- cgit