From 00be2262fe99ce24fb6649c0056d2d5c7f862f79 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Tue, 1 Sep 2015 15:11:37 +0200
Subject: Verbessere und vervollständige graphische Oberfläche
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CryptLog.pro        |  9 +++--
 mainwindow.ui       | 53 +++++++++++++++++++----------
 publickeyimport.cpp | 14 ++++++++
 publickeyimport.h   | 22 ++++++++++++
 publickeyimport.ui  | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 175 insertions(+), 20 deletions(-)
 create mode 100644 publickeyimport.cpp
 create mode 100644 publickeyimport.h
 create mode 100644 publickeyimport.ui

diff --git a/CryptLog.pro b/CryptLog.pro
index 4171de1..158f480 100644
--- a/CryptLog.pro
+++ b/CryptLog.pro
@@ -14,10 +14,13 @@ TEMPLATE = app
 
 SOURCES += main.cpp\
         mainwindow.cpp \
-    passworddialog.cpp
+    passworddialog.cpp \
+    publickeyimport.cpp
 
 HEADERS  += mainwindow.h \
-    passworddialog.h
+    passworddialog.h \
+    publickeyimport.h
 
 FORMS    += mainwindow.ui \
-    passworddialog.ui
+    passworddialog.ui \
+    publickeyimport.ui
diff --git a/mainwindow.ui b/mainwindow.ui
index 66a5011..16715e0 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>590</width>
+    <height>549</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,14 +35,14 @@
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <widget class="QLineEdit" name="lineEditRedeData">
+        <widget class="QLineEdit" name="lineEditClearFile">
          <property name="echoMode">
           <enum>QLineEdit::Normal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="pushButtonRedeData">
+        <widget class="QPushButton" name="pushButtonOpenFileClear">
          <property name="text">
           <string>Datei auswählen</string>
          </property>
@@ -51,6 +51,13 @@
       </layout>
      </widget>
     </item>
+    <item>
+     <widget class="QTextEdit" name="textEditPreview">
+      <property name="readOnly">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
     <item>
      <spacer name="verticalSpacer">
       <property name="orientation">
@@ -58,18 +65,18 @@
       </property>
       <property name="sizeHint" stdset="0">
        <size>
-        <width>20</width>
-        <height>40</height>
+        <width>365</width>
+        <height>54</height>
        </size>
       </property>
      </spacer>
     </item>
     <item>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="QPushButton" name="pushButtonCrypt">
+       <widget class="QPushButton" name="pushButtonDecrypt">
         <property name="text">
-         <string>Verschlüsseln</string>
+         <string>Entschlüsseln</string>
         </property>
        </widget>
       </item>
@@ -87,9 +94,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButtonDecrypt">
+       <widget class="QPushButton" name="pushButtonEncrypt">
         <property name="text">
-         <string>Entschlüsseln</string>
+         <string>Verschlüsseln</string>
         </property>
        </widget>
       </item>
@@ -102,7 +109,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>400</width>
+     <width>590</width>
      <height>29</height>
     </rect>
    </property>
@@ -114,10 +121,12 @@
    </widget>
    <widget class="QMenu" name="menuSchl_ssel">
     <property name="title">
-     <string>S&amp;chlüssel</string>
+     <string>Eige&amp;nen Schlüssel verwalten</string>
     </property>
+    <addaction name="actionErzeuge_Schl_sselpaar"/>
     <addaction name="actionImport"/>
-    <addaction name="actionExport"/>
+    <addaction name="actionMein_privater_Schl_ssel"/>
+    <addaction name="actionMein_ffentlicher_Schl_ssel"/>
    </widget>
    <addaction name="menuDatei"/>
    <addaction name="menuSchl_ssel"/>
@@ -129,12 +138,22 @@
   </action>
   <action name="actionImport">
    <property name="text">
-    <string>&amp;Import</string>
+    <string>&amp;Importiere Schlüsselpaar</string>
+   </property>
+  </action>
+  <action name="actionMein_ffentlicher_Schl_ssel">
+   <property name="text">
+    <string>Exportiere &amp;öffentlichen Schlüssel</string>
+   </property>
+  </action>
+  <action name="actionMein_privater_Schl_ssel">
+   <property name="text">
+    <string>Exportiere &amp;Schlüsselpaar</string>
    </property>
   </action>
-  <action name="actionExport">
+  <action name="actionErzeuge_Schl_sselpaar">
    <property name="text">
-    <string>&amp;Export</string>
+    <string>&amp;Erzeuge Schlüsselpaar</string>
    </property>
   </action>
  </widget>
diff --git a/publickeyimport.cpp b/publickeyimport.cpp
new file mode 100644
index 0000000..19b0438
--- /dev/null
+++ b/publickeyimport.cpp
@@ -0,0 +1,14 @@
+#include "publickeyimport.h"
+#include "ui_publickeyimport.h"
+
+PublicKeyImport::PublicKeyImport(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::PublicKeyImport)
+{
+    ui->setupUi(this);
+}
+
+PublicKeyImport::~PublicKeyImport()
+{
+    delete ui;
+}
diff --git a/publickeyimport.h b/publickeyimport.h
new file mode 100644
index 0000000..ecc64c1
--- /dev/null
+++ b/publickeyimport.h
@@ -0,0 +1,22 @@
+#ifndef PUBLICKEYIMPORT_H
+#define PUBLICKEYIMPORT_H
+
+#include <QWidget>
+
+namespace Ui {
+class PublicKeyImport;
+}
+
+class PublicKeyImport : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PublicKeyImport(QWidget *parent = 0);
+    ~PublicKeyImport();
+
+private:
+    Ui::PublicKeyImport *ui;
+};
+
+#endif // PUBLICKEYIMPORT_H
diff --git a/publickeyimport.ui b/publickeyimport.ui
new file mode 100644
index 0000000..29960ba
--- /dev/null
+++ b/publickeyimport.ui
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PublicKeyImport</class>
+ <widget class="QWidget" name="PublicKeyImport">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTreeWidget" name="treeWidget">
+     <attribute name="headerStretchLastSection">
+      <bool>true</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>ID</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>E-Mail</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="text">
+        <string>Hinzufügen</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>Löschen</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Reset|QDialogButtonBox::Save</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
-- 
cgit v1.2.3-70-g09d2