Switched old frame to QToolBar

7 files changed, 319 insertions, 390 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a2791c9f..716cc743 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -65,6 +65,7 @@ MainWindow::MainWindow(QWidget *parent)
           SLOT(endReencryptPath()));
 
   ui->setupUi(this);
+
   enableUiElements(true);
   ui->statusBar->showMessage(tr("Welcome to QtPass %1").arg(VERSION), 2000);
 
@@ -88,7 +89,7 @@ MainWindow::MainWindow(QWidget *parent)
   clippedText = "";
   QTimer::singleShot(10, this, SLOT(focusInput()));
 
-  initAddButton();
+  initToolBarButtons();
 
   qsrand(static_cast<uint>(QTime::currentTime().msec()));
 
@@ -461,9 +462,9 @@ void MainWindow::config() {
 }
 
 /**
- * @brief MainWindow::on_updateButton_clicked do a git pull
+ * @brief MainWindow::onUpdate do a git pull
  */
-void MainWindow::on_updateButton_clicked(bool block) {
+void MainWindow::onUpdate(bool block) {
   ui->statusBar->showMessage(tr("Updating password-store"), 2000);
   if (block)
     QtPassSettings::getPass()->GitPull_b();
@@ -472,9 +473,9 @@ void MainWindow::on_updateButton_clicked(bool block) {
 }
 
 /**
- * @brief MainWindow::on_pushButton_clicked do a git push
+ * @brief MainWindow::onPush do a git push
  */
-void MainWindow::on_pushButton_clicked() {
+void MainWindow::onPush() {
   if (QtPassSettings::isUseGit()) {
     ui->statusBar->showMessage(tr("Updating password-store"), 2000);
     QtPassSettings::getPass()->GitPush();
@@ -516,8 +517,8 @@ void MainWindow::on_treeView_clicked(const QModelIndex &index) {
     QtPassSettings::getPass()->Show(file);
   } else {
     clearPanel(false);
-    ui->editButton->setEnabled(false);
-    ui->deleteButton->setEnabled(true);
+    ui->actionEdit->setEnabled(false);
+    ui->actionDelete->setEnabled(true);
   }
 }
 
@@ -573,20 +574,16 @@ void MainWindow::keyGenerationComplete(const QString &p_output,
   processFinished(p_output, p_errout);
 }
 
-void MainWindow::initAddButton() {
-  // Add a Actions to the Add-Button
-  QIcon addFileIcon = QIcon::fromTheme("file_new");
-  QIcon addFolderIcon = QIcon::fromTheme("folder_new");
-  QAction *actionAddPassword =
-      new QAction(addFileIcon, tr("Add Password"), this);
-  QAction *actionAddFolder = new QAction(addFolderIcon, tr("Add Folder"), this);
-
-  ui->addButton->addAction(actionAddPassword);
-  ui->addButton->addAction(actionAddFolder);
-
-  connect(actionAddPassword, SIGNAL(triggered()), this,
-          SLOT(on_addButton_clicked()));
-  connect(actionAddFolder, SIGNAL(triggered()), this, SLOT(addFolder()));
+void MainWindow::initToolBarButtons() {
+  connect(ui->actionAddPassword, SIGNAL(triggered()), this,
+          SLOT(addPassword()));
+  connect(ui->actionAddFolder, SIGNAL(triggered()), this, SLOT(addFolder()));
+  connect(ui->actionEdit, SIGNAL(triggered()), this, SLOT(onEdit()));
+  connect(ui->actionDelete, SIGNAL(triggered()), this, SLOT(onDelete()));
+  connect(ui->actionPush, SIGNAL(triggered()), this, SLOT(onPush()));
+  connect(ui->actionUpdate, SIGNAL(triggered()), this, SLOT(onUpdate()));
+  connect(ui->actionUsers, SIGNAL(triggered()), this, SLOT(onUsers()));
+  connect(ui->actionConfig, SIGNAL(triggered()), this, SLOT(onConfig()));
 }
 
 void MainWindow::passShowHandler(const QString &p_output) {
@@ -646,7 +643,7 @@ void MainWindow::passStoreChanged(const QString &p_out, const QString &p_err) {
 
 void MainWindow::doGitPush() {
   if (QtPassSettings::isAutoPush())
-    on_pushButton_clicked();
+    onPush();
 }
 
 void MainWindow::finishedInsert(const QString &p_output,
@@ -759,18 +756,18 @@ void MainWindow::processFinished(const QString &p_output,
  * @param state
  */
 void MainWindow::enableUiElements(bool state) {
-  ui->updateButton->setEnabled(state);
   ui->treeView->setEnabled(state);
   ui->lineEdit->setEnabled(state);
   ui->lineEdit->installEventFilter(this);
-  ui->addButton->setEnabled(state);
-  ui->usersButton->setEnabled(state);
-  ui->configButton->setEnabled(state);
+  ui->actionAddPassword->setEnabled(state);
+  ui->actionAddFolder->setEnabled(state);
+  ui->actionUsers->setEnabled(state);
+  ui->actionConfig->setEnabled(state);
   // is a file selected?
   state &= ui->treeView->currentIndex().isValid();
-  ui->deleteButton->setEnabled(state);
-  ui->editButton->setEnabled(state);
-  ui->pushButton->setEnabled(state);
+  ui->actionDelete->setEnabled(state);
+  ui->actionEdit->setEnabled(state);
+  updateGitButtonVisibility();
 }
 
 void MainWindow::restoreWindow() {
@@ -782,14 +779,14 @@ void MainWindow::restoreWindow() {
   move(position);
   QSize newSize = QtPassSettings::getSize(size());
   resize(newSize);
-  QList<int> splitter = ui->splitter->sizes();
-  int left = QtPassSettings::getSplitterLeft(splitter[0]);
-  int right = QtPassSettings::getSplitterRight(splitter[1]);
-  if (left > 0 || right > 0) {
-    splitter[0] = left;
-    splitter[1] = right;
-    ui->splitter->setSizes(splitter);
-  }
+  //  QList<int> splitter = ui->splitter->sizes();
+  //  int left = QtPassSettings::getSplitterLeft(splitter[0]);
+  //  int right = QtPassSettings::getSplitterRight(splitter[1]);
+  //  if (left > 0 || right > 0) {
+  //    splitter[0] = left;
+  //    splitter[1] = right;
+  //    ui->splitter->setSizes(splitter);
+  //  }
   if (QtPassSettings::isMaximized(isMaximized())) {
     showMaximized();
   }
@@ -830,7 +827,7 @@ void MainWindow::processError(QProcess::ProcessError error) {
 /**
  * @brief MainWindow::on_configButton_clicked run Mainwindow::config
  */
-void MainWindow::on_configButton_clicked() { config(); }
+void MainWindow::onConfig() { config(); }
 
 /**
  * @brief Executes when the string in the search box changes, collapses the
@@ -895,8 +892,7 @@ QModelIndex MainWindow::firstFile(QModelIndex parentIndex) {
  * @param isNew insert (not update)
  */
 void MainWindow::setPassword(QString file, bool isNew) {
-  PasswordDialog d(QtPassSettings::getPasswordConfiguration(), file, isNew,
-                   this);
+  PasswordDialog d(file, isNew, this);
   connect(QtPassSettings::getPass(), &Pass::finishedShow, &d,
           &PasswordDialog::setPass);
 
@@ -904,10 +900,10 @@ void MainWindow::setPassword(QString file, bool isNew) {
 }
 
 /**
- * @brief MainWindow::on_addButton_clicked add a new password by showing a
+ * @brief MainWindow::addPassword add a new password by showing a
  * number of dialogs.
  */
-void MainWindow::on_addButton_clicked() {
+void MainWindow::addPassword() {
   bool ok;
   QString dir =
       Util::getDir(ui->treeView->currentIndex(), true, model, proxyModel);
@@ -925,10 +921,10 @@ void MainWindow::on_addButton_clicked() {
 }
 
 /**
- * @brief MainWindow::on_deleteButton_clicked remove password, if you are
+ * @brief MainWindow::onDelete remove password, if you are
  * sure.
  */
-void MainWindow::on_deleteButton_clicked() {
+void MainWindow::onDelete() {
   QFileInfo fileOrFolder =
       model.fileInfo(proxyModel.mapToSource(ui->treeView->currentIndex()));
   QString file = "";
@@ -971,29 +967,29 @@ void MainWindow::on_deleteButton_clicked() {
 }
 
 /**
- * @brief MainWindow::on_editButton_clicked try and edit (selected) password.
+ * @brief MainWindow::onEdit try and edit (selected) password.
  */
-void MainWindow::on_editButton_clicked() {
+void MainWindow::onEdit() {
   QString file = getFile(ui->treeView->currentIndex(), true);
   editPassword(file);
 }
 
 /**
- * @brief MainWindow::userDialog see MainWindow::on_usersButton_clicked()
+ * @brief MainWindow::userDialog see MainWindow::onUsers()
  * @param dir folder to edit users for.
  */
 void MainWindow::userDialog(QString dir) {
   if (!dir.isEmpty())
     currentDir = dir;
-  on_usersButton_clicked();
+  onUsers();
 }
 
 /**
- * @brief MainWindow::on_usersButton_clicked edit users for the current
+ * @brief MainWindow::onUsers edit users for the current
  * folder,
  * gets lists and opens UserDialog.
  */
-void MainWindow::on_usersButton_clicked() {
+void MainWindow::onUsers() {
   QList<UserInfo> users = QtPassSettings::getPass()->listKeys();
   if (users.size() == 0) {
     QMessageBox::critical(this, tr("Can not get key list"),
@@ -1201,8 +1197,8 @@ void MainWindow::closeEvent(QCloseEvent *event) {
       QtPassSettings::setPos(pos());
       QtPassSettings::setSize(size());
     }
-    QtPassSettings::setSplitterLeft(ui->splitter->sizes()[0]);
-    QtPassSettings::setSplitterRight(ui->splitter->sizes()[1]);
+    //    QtPassSettings::setSplitterLeft(ui->splitter->sizes()[0]);
+    //    QtPassSettings::setSplitterRight(ui->splitter->sizes()[1]);
     event->accept();
   }
 }
@@ -1231,7 +1227,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
 void MainWindow::keyPressEvent(QKeyEvent *event) {
   switch (event->key()) {
   case Qt::Key_Delete:
-    on_deleteButton_clicked();
+    onDelete();
     break;
   case Qt::Key_Return:
   case Qt::Key_Enter:
@@ -1255,8 +1251,8 @@ void MainWindow::showContextMenu(const QPoint &pos) {
   bool selected = true;
   if (!index.isValid()) {
     ui->treeView->clearSelection();
-    ui->deleteButton->setEnabled(false);
-    ui->editButton->setEnabled(false);
+    ui->actionDelete->setEnabled(false);
+    ui->actionEdit->setEnabled(false);
     currentDir = "";
     selected = false;
   }
@@ -1277,12 +1273,11 @@ void MainWindow::showContextMenu(const QPoint &pos) {
     QAction *users = contextMenu.addAction(tr("Users"));
     connect(openFolder, SIGNAL(triggered()), this, SLOT(openFolder()));
     connect(addFolder, SIGNAL(triggered()), this, SLOT(addFolder()));
-    connect(addPassword, SIGNAL(triggered()), this,
-            SLOT(on_addButton_clicked()));
-    connect(users, SIGNAL(triggered()), this, SLOT(on_usersButton_clicked()));
+    connect(addPassword, SIGNAL(triggered()), this, SLOT(addPassword()));
+    connect(users, SIGNAL(triggered()), this, SLOT(onUsers()));
   } else if (fileOrFolder.isFile()) {
     QAction *edit = contextMenu.addAction(tr("Edit"));
-    connect(edit, SIGNAL(triggered()), this, SLOT(on_editButton_clicked()));
+    connect(edit, SIGNAL(triggered()), this, SLOT(onEdit()));
   }
   if (selected) {
     // if (useClipboard != CLIPBOARD_NEVER) {
@@ -1294,8 +1289,7 @@ void MainWindow::showContextMenu(const QPoint &pos) {
     // }
     contextMenu.addSeparator();
     QAction *deleteItem = contextMenu.addAction(tr("Delete"));
-    connect(deleteItem, SIGNAL(triggered()), this,
-            SLOT(on_deleteButton_clicked()));
+    connect(deleteItem, SIGNAL(triggered()), this, SLOT(onDelete()));
   }
   contextMenu.exec(globalPos);
 }
@@ -1346,12 +1340,12 @@ void MainWindow::addFolder() {
 
 /**
  * @brief MainWindow::editPassword read password and open edit window via
- * MainWindow::on_editButton_clicked()
+ * MainWindow::onEdit()
  */
 void MainWindow::editPassword(const QString &file) {
   if (!file.isEmpty()) {
     if (QtPassSettings::isUseGit() && QtPassSettings::isAutoPull())
-      on_updateButton_clicked(true);
+      onUpdate(true);
     setPassword(file, false);
   }
 }
@@ -1504,22 +1498,14 @@ void MainWindow::updateGitButtonVisibility() {
   if (!QtPassSettings::isUseGit() ||
       (QtPassSettings::getGitExecutable().isEmpty() &&
        QtPassSettings::getPassExecutable().isEmpty())) {
-    hideGitButtons();
+    enableGitButtons(false);
   } else {
-    showGitButtons();
+    enableGitButtons(true);
   }
 }
 
-void MainWindow::hideGitButtons() {
-  ui->pushButton->hide();
-  ui->updateButton->hide();
-  ui->horizontalSpacer->changeSize(0, 20, QSizePolicy::Maximum,
-                                   QSizePolicy::Minimum);
-}
-
-void MainWindow::showGitButtons() {
-  ui->pushButton->show();
-  ui->updateButton->show();
-  ui->horizontalSpacer->changeSize(24, 24, QSizePolicy::Minimum,
-                                   QSizePolicy::Minimum);
+void MainWindow::enableGitButtons(const bool &state) {
+  // Following GNOME guidelines is preferable disable buttons instead of hide
+  ui->actionPush->setEnabled(state);
+  ui->actionUpdate->setEnabled(state);
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index ebe0154c..3da4aeb4 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -60,26 +60,26 @@ public slots:
   void deselect();
 
 private slots:
-  void on_updateButton_clicked(bool block = false);
-  void on_pushButton_clicked();
+  void onUpdate(bool block = false);
+  void onPush();
   void on_treeView_clicked(const QModelIndex &index);
   void on_treeView_doubleClicked(const QModelIndex &index);
-  void on_configButton_clicked();
+  void onConfig();
   void processFinished(const QString &, const QString &);
   void processError(QProcess::ProcessError);
   void clearClipboard();
   void clearPanel(bool notify = true);
   void on_lineEdit_textChanged(const QString &arg1);
   void on_lineEdit_returnPressed();
-  void on_addButton_clicked();
-  void on_deleteButton_clicked();
-  void on_editButton_clicked();
-  void on_usersButton_clicked();
+  void onDelete();
+  void onEdit();
+  void onUsers();
   void messageAvailable(QString message);
   void on_profileBox_currentIndexChanged(QString);
   void showContextMenu(const QPoint &pos);
   void showBrowserContextMenu(const QPoint &pos);
   void openFolder();
+  void addPassword();
   void addFolder();
   void editPassword(const QString &);
   void focusInput();
@@ -116,7 +116,7 @@ private:
   bool startupPhase;
   TrayIcon *tray;
 
-  void initAddButton();
+  void initToolBarButtons();
   void updateText();
   void enableUiElements(bool state);
   void restoreWindow();
@@ -138,8 +138,7 @@ private:
   void connectPassSignalHandlers(Pass *pass);
 
   void updateGitButtonVisibility();
-  void hideGitButtons();
-  void showGitButtons();
+  void enableGitButtons(const bool &);
 };
 
 #endif // MAINWINDOW_H_
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 3527db4b..8b58c91a 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -14,8 +14,8 @@
    <string>QtPass</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout_7">
-    <item>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0" rowspan="2" colspan="2">
      <widget class="QFrame" name="frame">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -36,233 +36,46 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item>
-        <widget class="QToolButton" name="addButton">
-         <property name="acceptDrops">
-          <bool>false</bool>
-         </property>
-         <property name="toolTip">
-          <string>Add</string>
-         </property>
-         <property name="text">
-          <string>Add</string>
-         </property>
-         <property name="icon">
-          <iconset theme="document-new">
-           <normalon>:/icons/document-new.svg</normalon>
-          </iconset>
-         </property>
-         <property name="popupMode">
-          <enum>QToolButton::MenuButtonPopup</enum>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-         <property name="autoRaise">
-          <bool>false</bool>
-         </property>
-         <property name="arrowType">
-          <enum>Qt::NoArrow</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="editButton">
-         <property name="toolTip">
-          <string>Edit</string>
-         </property>
-         <property name="text">
-          <string>Edit</string>
-         </property>
-         <property name="icon">
-          <iconset theme="document-properties">
-           <normalon>:/icons/document-properties.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="deleteButton">
-         <property name="toolTip">
-          <string>Delete</string>
-         </property>
-         <property name="text">
-          <string>Delete</string>
-         </property>
-         <property name="icon">
-          <iconset theme="edit-delete">
-           <normalon>:/icons/edit-delete.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Maximum</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QToolButton" name="pushButton">
-         <property name="toolTip">
-          <string>git push</string>
-         </property>
-         <property name="text">
-          <string>Push</string>
-         </property>
-         <property name="icon">
-          <iconset theme="go-top">
-           <normalon>:/icons/go-top.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="updateButton">
-         <property name="toolTip">
-          <string>git pull</string>
-         </property>
-         <property name="text">
-          <string>Update</string>
-         </property>
-         <property name="icon">
-          <iconset theme="go-bottom">
-           <normalon>:/icons/go-bottom.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Maximum</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QToolButton" name="usersButton">
-         <property name="toolTip">
-          <string>Manage who can read password in folder</string>
-         </property>
-         <property name="text">
-          <string>Users</string>
-         </property>
-         <property name="icon">
-          <iconset theme="x-office-address-book">
-           <normalon>:/icons/x-office-address-book.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="configButton">
-         <property name="toolTip">
-          <string>Configuration</string>
-         </property>
-         <property name="text">
-          <string>Config</string>
-         </property>
-         <property name="icon">
-          <iconset theme="applications-system">
-           <normalon>:/icons/applications-system.svg</normalon>
-          </iconset>
-         </property>
-         <property name="toolButtonStyle">
-          <enum>Qt::ToolButtonTextBesideIcon</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::MinimumExpanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QComboBox" name="profileBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>26</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>100000</width>
-           <height>16777215</height>
-          </size>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </item>
-    <item>
-     <widget class="QSplitter" name="splitter">
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <widget class="QWidget" name="layoutWidget">
-       <layout class="QVBoxLayout" name="verticalLayoutTree">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="topMargin">
-         <number>5</number>
-        </property>
+    <item row="1" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Select profile</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="profileBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>26</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>100000</width>
+              <height>16777215</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QLineEdit" name="lineEdit">
           <property name="minimumSize">
@@ -281,6 +94,12 @@
         </item>
         <item>
          <widget class="DeselectableTreeView" name="treeView">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="acceptDrops">
            <bool>true</bool>
           </property>
@@ -293,8 +112,8 @@
          </widget>
         </item>
        </layout>
-      </widget>
-      <widget class="QWidget" name="verticalLayoutWidget">
+      </item>
+      <item>
        <layout class="QVBoxLayout" name="verticalLayoutPassword">
         <property name="spacing">
          <number>0</number>
@@ -441,15 +260,143 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
        </layout>
-      </widget>
-     </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
-  <action name="actionQtpass">
+  <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
+   <property name="acceptDrops">
+    <bool>false</bool>
+   </property>
+   <property name="windowTitle">
+    <string/>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonFollowStyle</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionAddPassword"/>
+   <addaction name="actionAddFolder"/>
+   <addaction name="separator"/>
+   <addaction name="actionEdit"/>
+   <addaction name="actionDelete"/>
+   <addaction name="separator"/>
+   <addaction name="actionPush"/>
+   <addaction name="actionUpdate"/>
+   <addaction name="separator"/>
+   <addaction name="actionUsers"/>
+   <addaction name="actionConfig"/>
+  </widget>
+  <action name="actionAddPassword">
+   <property name="icon">
+    <iconset theme="document-new">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Add password</string>
+   </property>
+   <property name="toolTip">
+    <string>Add password</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="actionAddFolder">
+   <property name="icon">
+    <iconset theme="folder-new">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Add folder</string>
+   </property>
+   <property name="toolTip">
+    <string>Add folder</string>
+   </property>
+  </action>
+  <action name="actionEdit">
+   <property name="icon">
+    <iconset theme="edit">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Edit</string>
+   </property>
+   <property name="toolTip">
+    <string>Edit</string>
+   </property>
+  </action>
+  <action name="actionDelete">
+   <property name="icon">
+    <iconset theme="remove">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
-    <string>qtpass</string>
+    <string>Delete</string>
+   </property>
+   <property name="toolTip">
+    <string>Delete</string>
+   </property>
+  </action>
+  <action name="actionPush">
+   <property name="icon">
+    <iconset theme="go-up">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Push</string>
+   </property>
+   <property name="toolTip">
+    <string>git push</string>
+   </property>
+  </action>
+  <action name="actionUpdate">
+   <property name="icon">
+    <iconset theme="go-down">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Update</string>
+   </property>
+   <property name="toolTip">
+    <string>git pull</string>
+   </property>
+  </action>
+  <action name="actionUsers">
+   <property name="icon">
+    <iconset theme="x-office-address-book">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Users</string>
+   </property>
+   <property name="toolTip">
+    <string>Manage who can read password in folder</string>
+   </property>
+  </action>
+  <action name="actionConfig">
+   <property name="icon">
+    <iconset theme="settings">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Config</string>
+   </property>
+   <property name="toolTip">
+    <string>Configuration</string>
    </property>
   </action>
  </widget>
@@ -466,14 +413,6 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <tabstops>
   <tabstop>textBrowser</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>editButton</tabstop>
-  <tabstop>deleteButton</tabstop>
-  <tabstop>pushButton</tabstop>
-  <tabstop>updateButton</tabstop>
-  <tabstop>usersButton</tabstop>
-  <tabstop>configButton</tabstop>
-  <tabstop>profileBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/passworddialog.cpp b/src/passworddialog.cpp
index 0258b774..921e1e51 100644
--- a/src/passworddialog.cpp
+++ b/src/passworddialog.cpp
@@ -13,13 +13,15 @@
  * @param passConfig configuration constant
  * @param parent
  */
-PasswordDialog::PasswordDialog(const PasswordConfiguration &passConfig, QWidget *parent) : QDialog(parent), ui(new Ui::PasswordDialog), m_passConfig(passConfig) {
-    m_templating = false;
-    m_allFields = false;
+PasswordDialog::PasswordDialog(const PasswordConfiguration &passConfig,
+                               QWidget *parent)
+    : QDialog(parent), ui(new Ui::PasswordDialog), m_passConfig(passConfig) {
+  m_templating = false;
+  m_allFields = false;
 
-    ui->setupUi(this);
-    setLength(m_passConfig.length);
-    setPasswordCharTemplate(m_passConfig.selected);
+  ui->setupUi(this);
+  setLength(m_passConfig.length);
+  setPasswordCharTemplate(m_passConfig.selected);
 }
 
 /**
@@ -29,28 +31,27 @@ PasswordDialog::PasswordDialog(const PasswordConfiguration &passConfig, QWidget
  * @param isNew
  * @param parent
  */
-PasswordDialog::PasswordDialog(const PasswordConfiguration &passConfig,
-                               const QString &file,
-                               const bool &isNew,
+PasswordDialog::PasswordDialog(const QString &file, const bool &isNew,
                                QWidget *parent)
-    : QDialog(parent), ui(new Ui::PasswordDialog), m_passConfig(passConfig), m_file(file), m_isNew(isNew) {
+    : QDialog(parent), ui(new Ui::PasswordDialog), m_file(file),
+      m_isNew(isNew) {
 
-    QtPassSettings::getPass()->Show(m_file);
+  QtPassSettings::getPass()->Show(m_file);
 
-    setWindowTitle(this->windowTitle() + " " + m_file);
-    usePwgen(QtPassSettings::isUsePwgen());
-    setTemplate(QtPassSettings::getPassTemplate(),
-                  QtPassSettings::isUseTemplate());
-    templateAll(QtPassSettings::isTemplateAllFields());
+  ui->setupUi(this);
 
-    ui->setupUi(this);
-    setLength(m_passConfig.length);
-    setPasswordCharTemplate(m_passConfig.selected);
+  setWindowTitle(this->windowTitle() + " " + m_file);
+  m_passConfig = QtPassSettings::getPasswordConfiguration();
+  usePwgen(QtPassSettings::isUsePwgen());
+  setTemplate(QtPassSettings::getPassTemplate(),
+              QtPassSettings::isUseTemplate());
+  templateAll(QtPassSettings::isTemplateAllFields());
 
-    connect(this, &PasswordDialog::accepted,
-            this, &PasswordDialog::on_accepted);
-    connect(this, &PasswordDialog::rejected,
-            this, &PasswordDialog::on_rejected);
+  setLength(m_passConfig.length);
+  setPasswordCharTemplate(m_passConfig.selected);
+
+  connect(this, &PasswordDialog::accepted, this, &PasswordDialog::on_accepted);
+  connect(this, &PasswordDialog::rejected, this, &PasswordDialog::on_rejected);
 }
 
 /**
@@ -89,14 +90,14 @@ void PasswordDialog::on_createPasswordButton_clicked() {
  * @brief PasswordDialog::on_accepted handle Ok click for QDialog
  */
 void PasswordDialog::on_accepted() {
-    QString newValue = getPassword();
-    if (newValue.isEmpty())
-      return;
+  QString newValue = getPassword();
+  if (newValue.isEmpty())
+    return;