Removed unused headers from mainwindow.cpp. Disable UseTrayIcon if it's not available for the OS.

8 files changed, 51 insertions, 58 deletions

diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index b178e5b7..d4e3f220 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -7,6 +7,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QSystemTrayIcon>
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
@@ -35,8 +36,16 @@ ConfigDialog::ConfigDialog(MainWindow *parent)
   ui->checkBoxHidePassword->setChecked(QtPassSettings::isHidePassword());
   ui->checkBoxHideContent->setChecked(QtPassSettings::isHideContent());
   ui->checkBoxAddGPGId->setChecked(QtPassSettings::isAddGPGId(true));
-  ui->checkBoxHideOnClose->setChecked(QtPassSettings::isHideOnClose());
-  ui->checkBoxStartMinimized->setChecked(QtPassSettings::isStartMinimized());
+
+  if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
+    ui->checkBoxHideOnClose->setChecked(QtPassSettings::isHideOnClose());
+    ui->checkBoxStartMinimized->setChecked(QtPassSettings::isStartMinimized());
+  } else {
+    ui->checkBoxUseTrayIcon->setEnabled(false);
+    ui->checkBoxHideOnClose->setEnabled(false);
+    ui->checkBoxStartMinimized->setEnabled(false);
+  }
+
   ui->checkBoxAvoidCapitals->setChecked(QtPassSettings::isAvoidCapitals());
   ui->checkBoxAvoidNumbers->setChecked(QtPassSettings::isAvoidNumbers());
   ui->checkBoxLessRandom->setChecked(QtPassSettings::isLessRandom());
@@ -141,9 +150,12 @@ void ConfigDialog::on_accepted() {
   QtPassSettings::setHidePassword(ui->checkBoxHidePassword->isChecked());
   QtPassSettings::setHideContent(ui->checkBoxHideContent->isChecked());
   QtPassSettings::setAddGPGId(ui->checkBoxAddGPGId->isChecked());
-  QtPassSettings::setUseTrayIcon(ui->checkBoxUseTrayIcon->isChecked());
-  QtPassSettings::setHideOnClose(hideOnClose());
-  QtPassSettings::setStartMinimized(ui->checkBoxStartMinimized->isChecked());
+  QtPassSettings::setUseTrayIcon(ui->checkBoxUseTrayIcon->isEnabled() &&
+                                 ui->checkBoxUseTrayIcon->isChecked());
+  QtPassSettings::setHideOnClose(ui->checkBoxHideOnClose->isEnabled() &&
+                                 ui->checkBoxHideOnClose->isChecked());
+  QtPassSettings::setStartMinimized(ui->checkBoxStartMinimized->isEnabled() &&
+                                    ui->checkBoxStartMinimized->isChecked());
   QtPassSettings::setProfiles(getProfiles());
   QtPassSettings::setUseGit(ui->checkBoxUseGit->isChecked());
   QtPassSettings::setUseOtp(ui->checkBoxUseOtp->isChecked());
@@ -402,9 +414,9 @@ QHash<QString, QString> ConfigDialog::getProfiles() {
   // Check?
   for (int i = 0; i < ui->profileTable->rowCount(); ++i) {
     QTableWidgetItem *pathItem = ui->profileTable->item(i, 1);
-    if (0 != pathItem) {
+    if (nullptr != pathItem) {
       QTableWidgetItem *item = ui->profileTable->item(i, 0);
-      if (item == 0) {
+      if (item == nullptr) {
 #ifdef QT_DEBUG
         dbg() << "empty name, should fix in frontend";
 #endif
@@ -542,27 +554,20 @@ void ConfigDialog::wizard() {
 }
 
 /**
- * @brief ConfigDialog::hideOnClose return preference for hiding instead of
- * closing (quitting) application.
- * @return
- */
-bool ConfigDialog::hideOnClose() {
-  return ui->checkBoxHideOnClose->isEnabled() &&
-         ui->checkBoxHideOnClose->isChecked();
-}
-
-/**
  * @brief ConfigDialog::useTrayIcon set preference for using trayicon.
  * Enable or disable related checkboxes accordingly.
  * @param useSystray
  */
 void ConfigDialog::useTrayIcon(bool useSystray) {
-  ui->checkBoxUseTrayIcon->setChecked(useSystray);
-  ui->checkBoxHideOnClose->setEnabled(useSystray);
-  ui->checkBoxStartMinimized->setEnabled(useSystray);
-  if (!useSystray) {
-    ui->checkBoxHideOnClose->setChecked(false);
-    ui->checkBoxStartMinimized->setChecked(false);
+  if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
+    ui->checkBoxUseTrayIcon->setChecked(useSystray);
+    ui->checkBoxHideOnClose->setEnabled(useSystray);
+    ui->checkBoxStartMinimized->setEnabled(useSystray);
+
+    if (!useSystray) {
+      ui->checkBoxHideOnClose->setChecked(false);
+      ui->checkBoxStartMinimized->setChecked(false);
+    }
   }
 }
 
diff --git a/src/configdialog.h b/src/configdialog.h
index a7b33dd0..593f301f 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -33,7 +33,6 @@ public:
   QHash<QString, QString> getProfiles();
   void wizard();
   void genKey(QString, QDialog *);
-  bool hideOnClose();
   void useTrayIcon(bool useTrayIdon);
   void useGit(bool useGit);
   void useOtp(bool useOtp);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b0215a35..cabc9b99 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -16,7 +16,6 @@
 #include "ui_mainwindow.h"
 #include "usersdialog.h"
 #include "util.h"
-#include <QClipboard>
 #include <QCloseEvent>
 #include <QDesktopServices>
 #include <QDialog>
@@ -25,9 +24,7 @@
 #include <QLabel>
 #include <QMenu>
 #include <QMessageBox>
-#include <QQueue>
 #include <QShortcut>
-#include <QTextCodec>
 
 /**
  * @brief MainWindow::MainWindow handles all of the main functionality and also
@@ -36,7 +33,8 @@
  * @param parent pointer
  */
 MainWindow::MainWindow(const QString &searchText, QWidget *parent)
-    : QMainWindow(parent), ui(new Ui::MainWindow), keygen(NULL), tray(NULL) {
+    : QMainWindow(parent), ui(new Ui::MainWindow), keygen(nullptr),
+      tray(nullptr) {
 #ifdef __APPLE__
   // extra treatment for mac os
   // see http://doc.qt.io/qt-5/qkeysequence.html#qt_set_sequence_auto_mnemonic
@@ -194,7 +192,7 @@ const QModelIndex MainWindow::getCurrentTreeViewIndex() {
 
 void MainWindow::cleanKeygenDialog() {
   this->keygen->close();
-  this->keygen = 0;
+  this->keygen = nullptr;
 }
 
 void MainWindow::setTextTextBrowser(const QString &text) {
@@ -255,9 +253,9 @@ void MainWindow::config() {
 
       updateGitButtonVisibility();
       updateOtpButtonVisibility();
-      if (QtPassSettings::isUseTrayIcon() && tray == NULL)
+      if (QtPassSettings::isUseTrayIcon() && tray == nullptr)
         initTrayIcon();
-      else if (!QtPassSettings::isUseTrayIcon() && tray != NULL) {
+      else if (!QtPassSettings::isUseTrayIcon() && tray != nullptr) {
         destroyTrayIcon();
       }
     }
@@ -470,7 +468,7 @@ void MainWindow::restoreWindow() {
     show();
   }
 
-  if (QtPassSettings::isUseTrayIcon() && tray == NULL) {
+  if (QtPassSettings::isUseTrayIcon() && tray == nullptr) {
     initTrayIcon();
     if (m_qtPass->isFreshStart() && QtPassSettings::isStartMinimized()) {
       // since we are still in constructor, can't directly hide
@@ -552,8 +550,6 @@ QModelIndex MainWindow::firstFile(QModelIndex parentIndex) {
  */
 void MainWindow::setPassword(QString file, bool isNew) {
   PasswordDialog d(file, isNew, this);
-  connect(QtPassSettings::getPass(), &Pass::finishedShow, &d,
-          &PasswordDialog::setPass);
 
   if (!d.exec()) {
     ui->treeView->setFocus();
@@ -706,10 +702,10 @@ void MainWindow::onUsers() {
   UsersDialog d(this);
   d.setUsers(&users);
   if (!d.exec()) {
-    d.setUsers(NULL);
+    d.setUsers(nullptr);
     return;
   }
-  d.setUsers(NULL);
+  d.setUsers(nullptr);
 
   QtPassSettings::getPass()->Init(dir, users);
 }
@@ -797,7 +793,7 @@ void MainWindow::initTrayIcon() {
   this->tray = new TrayIcon(this);
   // Setup tray icon
 
-  if (tray == NULL) {
+  if (tray == nullptr) {
 #ifdef QT_DEBUG
     dbg() << "Allocating tray icon failed.";
 #endif
@@ -813,7 +809,7 @@ void MainWindow::initTrayIcon() {
  */
 void MainWindow::destroyTrayIcon() {
   delete this->tray;
-  tray = NULL;
+  tray = nullptr;
 }
 
 /**
@@ -834,8 +830,6 @@ void MainWindow::closeEvent(QCloseEvent *event) {
       QtPassSettings::setPos(pos());
       QtPassSettings::setSize(size());
     }
-    //    QtPassSettings::setSplitterLeft(ui->splitter->sizes()[0]);
-    //    QtPassSettings::setSplitterRight(ui->splitter->sizes()[1]);
     event->accept();
   }
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 19f170ac..46b2dc3c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -117,10 +117,8 @@ private:
   StoreModel proxyModel;
   QScopedPointer<QItemSelectionModel> selectionModel;
   QTimer clearPanelTimer;
-  // bool freshStart;
   QDialog *keygen;
   QString currentDir;
-  // bool startupPhase;
   TrayIcon *tray;
 
   void initToolBarButtons();
diff --git a/src/passworddialog.cpp b/src/passworddialog.cpp
index e15ad02d..9691e3ef 100644
--- a/src/passworddialog.cpp
+++ b/src/passworddialog.cpp
@@ -1,5 +1,6 @@
 #include "passworddialog.h"
 #include "filecontent.h"
+#include "pass.h"
 #include "passwordconfiguration.h"
 #include "qtpasssettings.h"
 #include "ui_passworddialog.h"
@@ -26,6 +27,9 @@ PasswordDialog::PasswordDialog(const PasswordConfiguration &passConfig,
   ui->setupUi(this);
   setLength(m_passConfig.length);
   setPasswordCharTemplate(m_passConfig.selected);
+
+  connect(QtPassSettings::getPass(), &Pass::finishedShow, this,
+          &PasswordDialog::setPass);
 }
 
 /**
diff --git a/src/qtpass.cpp b/src/qtpass.cpp
index 0b4c7c16..2239e86d 100644
--- a/src/qtpass.cpp
+++ b/src/qtpass.cpp
@@ -311,7 +311,7 @@ void QtPass::finishedInsert(const QString &p_output, const QString &p_errout) {
 
 void QtPass::onKeyGenerationComplete(const QString &p_output,
                                      const QString &p_errout) {
-  if (0 != m_mainWindow->getKeygenDialog()) {
+  if (nullptr != m_mainWindow->getKeygenDialog()) {
 #ifdef QT_DEBUG
     qDebug() << "Keygen Done";
 #endif
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index 2b031642..a9fe5784 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -13,7 +13,10 @@
  * it (currently) only Quits.
  * @param parent
  */
-TrayIcon::TrayIcon(QMainWindow *parent) {
+TrayIcon::TrayIcon(QMainWindow *parent)
+    : showAction(nullptr), hideAction(nullptr), minimizeAction(nullptr),
+      maximizeAction(nullptr), restoreAction(nullptr), quitAction(nullptr),
+      sysTrayIcon(nullptr), trayIconMenu(nullptr), isAllocated(false) {
   parentwin = parent;
 
   if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
@@ -29,22 +32,12 @@ TrayIcon::TrayIcon(QMainWindow *parent) {
                      &TrayIcon::iconActivated);
 
     isAllocated = true;
-  } else {
+  }
 #ifdef QT_DEBUG
+  else {
     dbg() << "No tray icon for this OS possibly also not show options?";
-#endif
-
-    isAllocated = false;
-
-    showAction = nullptr;
-    hideAction = nullptr;
-    minimizeAction = nullptr;
-    maximizeAction = nullptr;
-    restoreAction = nullptr;
-    quitAction = nullptr;
-    sysTrayIcon = nullptr;
-    trayIconMenu = nullptr;
   }
+#endif
 }
 
 /**
diff --git a/src/usersdialog.cpp b/src/usersdialog.cpp
index b0191a53..00e72a21 100644
--- a/src/usersdialog.cpp
+++ b/src/usersdialog.cpp
@@ -19,7 +19,7 @@ UsersDialog::UsersDialog(QWidget *parent)
   connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
   connect(ui->listWidget, &QListWidget::itemChanged, this,
           &UsersDialog::itemChange);
-  userList = NULL;
+  userList = nullptr;
 
 #if QT_VERSION >= 0x050200
   ui->lineEdit->setClearButtonEnabled(true);