code cleanup, settings implemented,

keshavbhatt · Apr 15, 2021 · c400885 · c400885
1 parent 0f7c577
commit c400885
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 21 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1,13 +1,15 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include <QDebug>
+
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
 
+    QMargins m = ui->mainToolBar->layout()->contentsMargins();
+    ui->mainToolBar->setContentsMargins(m.left(),m.top(),m.right(),m.top());
 
     setWindowTitle(QApplication::applicationName());
     setWindowIcon(QIcon(":/icons/app/icon-256.png"));
@@ -21,8 +23,41 @@ MainWindow::MainWindow(QWidget *parent) :
     homeWidget          = new Home(QAudioDeviceInfo::availableDevices(QAudio::AudioInput),this);
     recordingPageWidget = new RecordingPage(this);
 
+    connect(recordingPageWidget,&RecordingPage::showFixKeyError,[=](QString error){
+        QMessageBox msgBox;
+        msgBox.setText(QApplication::applicationName()+" | Incorrect API Token");
+        msgBox.setText(error);
+        msgBox.setInformativeText("Do you want to correct API Token now?");
+
+        QPushButton *settingsButton = msgBox.addButton(tr("Yes, correct API Token"), QMessageBox::ActionRole);
+        QPushButton *abortButton = msgBox.addButton(QMessageBox::No);
+        msgBox.exec();
+        if (msgBox.clickedButton() == settingsButton) {
+          settingsAction->trigger();
+        } else if (msgBox.clickedButton() == abortButton) {
+         msgBox.close();
+        }
+    });
+
+    connect(recordingPageWidget,&RecordingPage::showPutKeyError,[=](QString error){
+        QMessageBox msgBox;
+        msgBox.setText(QApplication::applicationName()+" | Need API Token");
+        msgBox.setText(error);
+        msgBox.setInformativeText("Do you want to set API Token now?");
+
+        QPushButton *settingsButton = msgBox.addButton(tr("Yes, set API Token"), QMessageBox::ActionRole);
+        QPushButton *abortButton = msgBox.addButton(QMessageBox::No);
+        msgBox.exec();
+        if (msgBox.clickedButton() == settingsButton) {
+          settingsAction->trigger();
+        } else if (msgBox.clickedButton() == abortButton) {
+         msgBox.close();
+        }
+    });
+
     connect(recordingPageWidget,&RecordingPage::enableItemActions,[=](bool enable){
        itemDeleteAction->setEnabled(enable);
+       itemInfoAction->setEnabled(enable);
     });
 
     connect(recordingPageWidget,&RecordingPage::back,[=](){
@@ -40,7 +75,10 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->stackedWidget->addWidget(homeWidget);
     ui->stackedWidget->addWidget(recordingPageWidget);
 
+    init_settings();
+
     createActions();
+
 }
 
 MainWindow::~MainWindow()
@@ -58,27 +96,25 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::createActions()
 {
-    aboutAction = new QAction(tr("&About"), this);
-    aboutAction->setIcon(QIcon(":/icons/app/icon-32.png"));
-    aboutAction->setIconText("About");
-
-    backAction = new QAction(tr("&Back"), this);
-    backAction->setIcon(QIcon(":/icons/arrow-left-circle-line.png"));
-    backAction->setIconText("Back");
+    aboutAction      = new QAction(QIcon(":/icons/app/icon-32.png"),tr("&About"), this);
+    backAction       = new QAction(QIcon(":/icons/arrow-left-circle-line.png"),tr("&Back"), this);
+    historyAction    = new QAction(QIcon(":/icons/time-line.png"),tr("&History"), this);
+    itemDeleteAction = new QAction(QIcon(":/icons/delete-bin-5-line.png"),tr("Delete"),this);
+    itemInfoAction   = new QAction(QIcon(":/icons/information-line.png"),tr("Info"),this);
+    settingsAction   = new QAction(QIcon(":/icons/setting-line.png"),tr("Settings"),this);
 
-    historyAction = new QAction(tr("&History"), this);
-    historyAction->setIcon(QIcon(":/icons/time-line.png"));
-    historyAction->setIconText("History");
-
-    itemDeleteAction = new QAction(QIcon(":/icons/delete-bin-5-line.png"),"Delete",this);
+    connect(settingsAction, &QAction::triggered,this,&MainWindow::showSettings);
 
     connect(itemDeleteAction, &QAction::triggered,recordingPageWidget,&RecordingPage::deleteSelected);
 
+    connect(itemInfoAction, &QAction::triggered,recordingPageWidget,&RecordingPage::showItemInfo);
+
     connect(aboutAction, &QAction::triggered, this, &MainWindow::showAbout);
 
     connect(backAction, &QAction::triggered,[=]()
     {
         backAction->setEnabled(false);
+        emit recordingPageWidget->enableItemActions(false);
         recordingPageWidget->clearDebug();
         recordingPageWidget->stopRecording();
         recordingPageWidget->stopAllPlayers();
@@ -99,7 +135,6 @@ void MainWindow::createActions()
 
     ui->mainToolBar->addSeparator();
 
-
     ui->mainToolBar->addAction(historyAction);
     historyAction->setEnabled(true);
 
@@ -108,16 +143,40 @@ void MainWindow::createActions()
     ui->mainToolBar->addAction(itemDeleteAction);
     itemDeleteAction->setEnabled(false);
 
+    ui->mainToolBar->addAction(itemInfoAction);
+    itemInfoAction->setEnabled(false);
+
     QWidget* hSpacer= new QWidget(this);
     hSpacer->setStyleSheet("background-color:transparent");
     hSpacer->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
 
     ui->mainToolBar->addWidget(hSpacer);
 
+    ui->mainToolBar->addAction(settingsAction);
+
     ui->mainToolBar->addAction(aboutAction);
 
 }
 
+void MainWindow::init_settings()
+{
+    settingsWidget = new SettingsWidget(this);
+    settingsWidget->setWindowTitle(QApplication::applicationName()+"| "+tr("Settings"));
+    settingsWidget->setWindowFlag(Qt::Dialog);
+    settingsWidget->setWindowModality(Qt::WindowModal);
+    settingsWidget->restoreGeometry(settings.value("settingsGeometry").toByteArray());
+}
+
+void MainWindow::showSettings()
+{
+    if(!settingsWidget->isVisible()){
+        settingsWidget->show();
+    }else{
+        settingsWidget->raise();
+        settingsWidget->activateWindow();
+    }
+}
+
 void MainWindow::showAbout()
 {
     About *about = new About(this);

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -4,11 +4,15 @@
 #include <QCloseEvent>
 #include <QMainWindow>
 #include <QSettings>
+#include <QDebug>
+#include <QPushButton>
+
 
 #include "about.h"
 
 #include "home.h"
 #include "recordingpage.h"
+#include "settingswidget.h"
 
 namespace Ui {
 class MainWindow;
@@ -28,17 +32,22 @@ private slots:
     void createActions();
     void showAbout();
 
+    void showSettings();
+    void init_settings();
 private:
     Ui::MainWindow *ui;
 
     QAction *aboutAction;
     QAction *backAction;
     QAction *historyAction;
-    QAction *itemDeleteAction;
+    QAction *itemDeleteAction, *itemInfoAction;
+    QAction *settingsAction;
 
     Home *homeWidget = nullptr;
     RecordingPage *recordingPageWidget = nullptr;
     QSettings settings;
+
+    SettingsWidget *settingsWidget = nullptr;
 };
 
 #endif // MAINWINDOW_H
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>528</width>
-    <height>418</height>
+    <width>537</width>
+    <height>331</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,14 +21,14 @@
    </layout>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
-   <property name="allowedAreas">
-    <set>Qt::BottomToolBarArea|Qt::TopToolBarArea</set>
+   <property name="movable">
+    <bool>false</bool>
    </property>
    <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonTextUnderIcon</enum>
+    <enum>Qt::ToolButtonTextBesideIcon</enum>
    </property>
    <property name="floatable">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>