Browse Source

Debug Widget hidden

DebugWidget is now hidden. Can be accessed by pressing <ctrl + Home>.
Felix Turo 4 years ago
parent
commit
71dd494a32
3 changed files with 22 additions and 13 deletions
  1. 7 10
      mainwindow.cpp
  2. 15 2
      mainwindow.h
  3. 0 1
      mainwindow.ui

+ 7 - 10
mainwindow.cpp

@@ -33,7 +33,6 @@ MainWindow::MainWindow(QWidget *parent)
     ui->actionLogbook->setIcon(QIcon(":/icons/ionicon-icons/book-outline.png"));
     ui->actionAircraft->setIcon(QIcon(":/icons/ionicon-icons/airplane-outline.png"));
     ui->actionPilots->setIcon(QIcon(":/icons/ionicon-icons/settings-outline.png"));
-    ui->actionDebug->setIcon(QIcon(":/icons/ionicon-icons/settings-outline.png"));
     ui->actionSettings->setIcon(QIcon(":/icons/ionicon-icons/settings-outline.png"));
     ui->actionQuit->setIcon(QIcon(":/icons/ionicon-icons/power-outline.png"));
     ui->toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
@@ -44,12 +43,11 @@ MainWindow::MainWindow(QWidget *parent)
         button->setMinimumWidth(128);
     }
 
-    // Add spacer
+    // Add spacer in toolbar to separate left and right parts
     auto *spacer = new QWidget();
     spacer->setMinimumWidth(1);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-    spacer->setObjectName("spacer");
-    ui->toolBar->insertWidget(ui->actionDebug, spacer);
+    ui->toolBar->insertWidget(ui->actionSettings, spacer);
 
     // Construct Widgets
     homeWidget = new HomeWidget(this);
@@ -62,15 +60,14 @@ MainWindow::MainWindow(QWidget *parent)
     ui->stackedWidget->addWidget(settingsWidget);
     aircraftWidget = new AircraftWidget(this);
     ui->stackedWidget->addWidget(aircraftWidget);
+    debugWidget = new DebugWidget(this);
+    ui->stackedWidget->addWidget(debugWidget);
 
     connectWidgets();
 
     // Startup Screen (Home Screen)
-    // ui->stackedWidget->setCurrentWidget(homeWidget);
-    // Debup Widget for now
-    debugWidget = new DebugWidget(this);
-    ui->stackedWidget->addWidget(debugWidget);
-    ui->stackedWidget->setCurrentWidget(debugWidget);
+    ui->stackedWidget->setCurrentWidget(homeWidget);
+
 
     // check database version (Debug)
     int db_ver = checkDbVersion();
@@ -136,7 +133,7 @@ void MainWindow::connectWidgets()
     QObject::connect(settingsWidget, &SettingsWidget::viewSelectionChanged,
                      logbookWidget, &LogbookWidget::onLogbookWidget_viewSelectionChanged);
 }
-#include <QFontDatabase>
+
 void MainWindow::readSettings()
 {
     DEB << "Use system font?" << ASettings::read(ASettings::Main::UseSystemFont).toBool();

+ 15 - 2
mainwindow.h

@@ -54,8 +54,6 @@ public:
 
 private slots:
 
-    void nope();
-
     void on_actionQuit_triggered();
 
     void on_actionHome_triggered();
@@ -91,10 +89,25 @@ private:
 
     DebugWidget* debugWidget;
 
+    void nope();
+
     void connectWidgets();
 
     void readSettings();
 
     int checkDbVersion();
+
+protected:
+    /*!
+     * \brief Shows the debug widget by pressing <ctrl + Home>
+     */
+    void keyPressEvent(QKeyEvent* keyEvent) override
+    {
+        if(keyEvent->type() == QKeyEvent::KeyPress) {
+            if(keyEvent->matches(QKeySequence::MoveToStartOfDocument)) {
+                on_actionDebug_triggered();
+            }
+        }
+    }
 };
 #endif // MAINWINDOW_H

+ 0 - 1
mainwindow.ui

@@ -73,7 +73,6 @@
    <addaction name="actionLogbook"/>
    <addaction name="actionAircraft"/>
    <addaction name="actionPilots"/>
-   <addaction name="actionDebug"/>
    <addaction name="actionSettings"/>
    <addaction name="actionQuit"/>
   </widget>