aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core-utils/lumina-config/mainWindow.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-06-07 10:28:26 -0400
committerKen Moore <ken@ixsystems.com>2017-06-07 10:28:26 -0400
commitfa170a25575cf15c766f44820c422d90ec5a9735 (patch)
tree473ce0835fce2062fc72bd790037c500dc113445 /src-qt5/core-utils/lumina-config/mainWindow.cpp
parentGet the auto-extract functionality cleaned up with the signal/slots a bit. (diff)
downloadlumina-fa170a25575cf15c766f44820c422d90ec5a9735.tar.gz
lumina-fa170a25575cf15c766f44820c422d90ec5a9735.tar.bz2
lumina-fa170a25575cf15c766f44820c422d90ec5a9735.zip
Deactivate the auto-resize functionality (for now) with a comment about the Fluxbox issue.
This can get reactivated when Fluxbox is deactivated with Lumina 2.0. Instead, just increase the default size of the main window a bit.
Diffstat (limited to 'src-qt5/core-utils/lumina-config/mainWindow.cpp')
-rw-r--r--src-qt5/core-utils/lumina-config/mainWindow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp
index 8b021d35..3e843354 100644
--- a/src-qt5/core-utils/lumina-config/mainWindow.cpp
+++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp
@@ -26,7 +26,7 @@ mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){
backShortcut = new QShortcut(Qt::Key_Escape, this);
connect(backShortcut, SIGNAL(activated()), this, SLOT(on_actionBack_triggered()) );
quitShortcut = new QShortcut(Qt::CTRL + Qt::Key_Q, this);
- connect(quitShortcut, SIGNAL(activated()), this, SLOT(on_quitShortcut_Triggered()) );
+ connect(quitShortcut, SIGNAL(activated()), this, SLOT(quitShortcut_Triggered()) );
setupIcons();
loadMonitors();
//changePage(""); //load the default main page
@@ -109,7 +109,6 @@ void mainWindow::changePage(QString id){
page->setPreviousPage(oldpage);
//Now update this UI a bit based on page settings
ui->actionMonitor->setVisible( page->needsScreenSelector() && ui->actionMonitor->menu()->actions().length()>1 );
-
this->showNormal();
}
//================
@@ -147,7 +146,7 @@ void mainWindow::on_actionBack_triggered(){
else{ page_change(""); } //Use the interactive wrapper (check for save state, etc).
}
-void mainWindow::on_quitShortcut_Triggered(){
+void mainWindow::quitShortcut_Triggered(){
QApplication::quit();
}
bgstack15