cleanup and config fixes

4 files changed, 12 insertions, 12 deletions

diff --git a/dialog.ui b/dialog.ui
index ba9073de..b37ae562 100644
--- a/dialog.ui
+++ b/dialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Configuration</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 627accb6..5d13c050 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -58,12 +58,12 @@ void MainWindow::config() {
 }
 
 /**
- * @brief MainWindow::on_pushButton_clicked
+ * @brief MainWindow::on_updateButton_clicked
  */
-void MainWindow::on_pushButton_clicked()
+void MainWindow::on_updateButton_clicked()
 {
     if (passExecutable == "") {
-        executeWrapper("git pull");
+        executeWrapper(gitExecutable + " pull");
     } else {
         executePass("git pull");
     }
@@ -78,7 +78,7 @@ void MainWindow::on_treeView_clicked(const QModelIndex &index)
     if (model.fileInfo(index).isFile()){
         QString passFile = model.filePath(index);
         if (passExecutable == "") {
-            executeWrapper("gpg --no-tty -dq " + passFile);
+            executeWrapper(gpgExecutable + " --no-tty -dq " + passFile);
         } else {
             passFile.replace(".gpg", "");
             passFile.replace(passStore, "");
@@ -138,9 +138,9 @@ void MainWindow::setGpgExecutable(QString path) {
 }
 
 /**
- * @brief MainWindow::on_pushButton_2_clicked
+ * @brief MainWindow::on_configButton_clicked
  */
-void MainWindow::on_pushButton_2_clicked()
+void MainWindow::on_configButton_clicked()
 {
     config();
 }
diff --git a/mainwindow.h b/mainwindow.h
index 7f2c458f..13241bec 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -24,10 +24,10 @@ public:
     void checkConfig();
 
 private slots:
-    void on_pushButton_clicked();
+    void on_updateButton_clicked();
     void on_treeView_clicked(const QModelIndex &index);
 
-    void on_pushButton_2_clicked();
+    void on_configButton_clicked();
 
 private:
     Ui::MainWindow *ui;
diff --git a/mainwindow.ui b/mainwindow.ui
index 99273079..a22c7ba0 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -18,16 +18,16 @@
     <item>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="QPushButton" name="pushButton">
+       <widget class="QPushButton" name="updateButton">
         <property name="text">
          <string>Update</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButton_2">
+       <widget class="QPushButton" name="configButton">
         <property name="text">
-         <string>config</string>
+         <string>Config</string>
         </property>
        </widget>
       </item>