pwgen hookup

6 files changed, 84 insertions, 52 deletions

diff --git a/dialog.cpp b/dialog.cpp
index 754018d4..cbde8540 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -368,7 +368,7 @@ void Dialog::addGPGId(bool addGPGId)
  */
 void Dialog::genKey(QString batch, QDialog *dialog)
 {
-    mainWindow->genKey(batch, dialog);
+    mainWindow->generateKeyPair(batch, dialog);
 }
 
 /**
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 004f0481..497c7753 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1220,7 +1220,7 @@ QStringList MainWindow::getSecretKeys()
  * @brief Dialog::genKey
  * @param QString batch
  */
-void MainWindow::genKey(QString batch, QDialog *keygenWindow)
+void MainWindow::generateKeyPair(QString batch, QDialog *keygenWindow)
 {
     keygen = keygenWindow;
     ui->statusBar->showMessage(tr("Generating GPG key pair"), 60000);
@@ -1436,3 +1436,11 @@ void MainWindow::editPassword()
         }
     }
 }
+
+/**
+ * @brief MainWindow::generatePassword
+ * @return
+ */
+QString MainWindow::generatePassword() {
+    return "test";
+}
diff --git a/mainwindow.h b/mainwindow.h
index c8f0b88f..17ef3b9c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -44,8 +44,9 @@ public:
     void setApp(SingleApplication* app);
     void setText(QString);
     QStringList getSecretKeys();
-    void genKey(QString, QDialog *);
+    void generateKeyPair(QString, QDialog *);
     void userDialog(QString = "");
+    QString generatePassword();
 
 protected:
     void closeEvent(QCloseEvent *event);
diff --git a/passworddialog.cpp b/passworddialog.cpp
index a105c824..06ca8b77 100644
--- a/passworddialog.cpp
+++ b/passworddialog.cpp
@@ -1,10 +1,11 @@
 #include "passworddialog.h"
 #include "ui_passworddialog.h"
 
-PasswordDialog::PasswordDialog(QWidget *parent) :
+PasswordDialog::PasswordDialog(MainWindow *parent) :
     QDialog(parent),
     ui(new Ui::PasswordDialog)
 {
+    mainWindow = parent;
     ui->setupUi(this);
 }
 
@@ -24,8 +25,9 @@ void PasswordDialog::on_checkBoxShow_stateChanged(int arg1)
 
 void PasswordDialog::on_createPasswordButton_clicked()
 {
-    // TODO
-    ui->lineEditPassword->setText("generated");
+    ui->widget->setEnabled(false);
+    ui->lineEditPassword->setText(mainWindow->generatePassword());
+    ui->widget->setEnabled(true);
 }
 
 void PasswordDialog::setPassword(QString password)
diff --git a/passworddialog.h b/passworddialog.h
index 07ef2c7a..9d94ab8d 100644
--- a/passworddialog.h
+++ b/passworddialog.h
@@ -2,6 +2,7 @@
 #define PASSWORDDIALOG_H
 
 #include <QDialog>
+#include "mainwindow.h"
 
 namespace Ui {
 class PasswordDialog;
@@ -12,7 +13,7 @@ class PasswordDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit PasswordDialog(QWidget *parent = 0);
+    explicit PasswordDialog(MainWindow *parent = 0);
     ~PasswordDialog();
     void setPassword(QString);
     QString getPassword();
@@ -23,6 +24,8 @@ private slots:
 
 private:
     Ui::PasswordDialog *ui;
+    MainWindow *mainWindow;
+
 };
 
 #endif // PASSWORDDIALOG_H
diff --git a/passworddialog.ui b/passworddialog.ui
index ca0f2d5c..1a15f81b 100644
--- a/passworddialog.ui
+++ b/passworddialog.ui
@@ -6,65 +6,83 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>266</width>
-    <height>184</height>
+    <width>251</width>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Password</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="topMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="rightMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="bottomMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLineEdit" name="lineEditPassword">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="createPasswordButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Generate</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBoxShow">
-     <property name="text">
-      <string>Show password</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPlainTextEdit" name="plainTextEdit"/>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLineEdit" name="lineEditPassword">
+          <property name="echoMode">
+           <enum>QLineEdit::Password</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="createPasswordButton">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string>Generate</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxShow">
+        <property name="text">
+         <string>Show password</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPlainTextEdit" name="plainTextEdit"/>
+      </item>
+      <item>
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>