From c4e97fd9c9ece45fd6904201cfe1d22608a45e8f Mon Sep 17 00:00:00 2001
From: chris <chris>
Date: Wed, 18 Dec 2002 23:10:29 +0000
Subject: [PATCH] grmpf

---
 ExportKey_UI.ui  |  70 +++++++++++++++----------------
 MainWindow_UI.ui |  20 +--------
 ReqDetail.ui     | 106 +++++++++++++++++++++++------------------------
 3 files changed, 89 insertions(+), 107 deletions(-)

diff --git a/ExportKey_UI.ui b/ExportKey_UI.ui
index b99ff311..0a77e514 100644
--- a/ExportKey_UI.ui
+++ b/ExportKey_UI.ui
@@ -4,7 +4,7 @@
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstd::string>ExportKey_UI</cstd::string>
+        <cstring>ExportKey_UI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
@@ -17,7 +17,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <std::string>Key export</std::string>
+        <string>Key export</string>
     </property>
     <vbox>
         <property stdset="1">
@@ -32,7 +32,7 @@
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Layout9</cstd::string>
+                <cstring>Layout9</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -47,7 +47,7 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel12</cstd::string>
+                        <cstring>TextLabel12</cstring>
                     </property>
                     <property stdset="1">
                         <name>font</name>
@@ -59,13 +59,13 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Key export</std::string>
+                        <string>Key export</string>
                     </property>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
-                        <cstd::string>Spacer6</cstd::string>
+                        <cstring>Spacer6</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
@@ -87,7 +87,7 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>image</cstd::string>
+                        <cstring>image</cstring>
                     </property>
                     <property stdset="1">
                         <name>minimumSize</name>
@@ -114,11 +114,11 @@
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>TextLabel13</cstd::string>
+                <cstring>TextLabel13</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <std::string>Please enter the filename for the key.</std::string>
+                <string>Please enter the filename for the key.</string>
             </property>
             <property stdset="1">
                 <name>alignment</name>
@@ -132,7 +132,7 @@
             <class>QFrame</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Frame5_2</cstd::string>
+                <cstring>Frame5_2</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
@@ -155,25 +155,25 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel14</cstd::string>
+                        <cstring>TextLabel14</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Filename:</std::string>
+                        <string>Filename:</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>filename</cstd::string>
+                        <cstring>filename</cstring>
                     </property>
                 </widget>
                 <widget>
                     <class>QToolButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>ToolButton1</cstd::string>
+                        <cstring>ToolButton1</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -184,7 +184,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>...</std::string>
+                        <string>...</string>
                     </property>
                 </widget>
             </hbox>
@@ -193,13 +193,13 @@
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>TextLabel3</cstd::string>
+                <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <std::string>DER is a binary format of the key without encryption
+                <string>DER is a binary format of the key without encryption
 PEM is a base64 encoded key with optional encryption
-PKCS#8 is an encrypted official Key-exchange format</std::string>
+PKCS#8 is an encrypted official Key-exchange format</string>
             </property>
             <property stdset="1">
                 <name>alignment</name>
@@ -213,7 +213,7 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
             <class>QFrame</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Frame4</cstd::string>
+                <cstring>Frame4</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
@@ -236,18 +236,18 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel1</cstd::string>
+                        <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Export Format:</std::string>
+                        <string>Export Format:</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QComboBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>exportFormat</cstd::string>
+                        <cstring>exportFormat</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -263,11 +263,11 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>TextLabel2</cstd::string>
+                <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <std::string>When exporting the private key it should be encrypted.</std::string>
+                <string>When exporting the private key it should be encrypted.</string>
             </property>
             <property stdset="1">
                 <name>alignment</name>
@@ -281,7 +281,7 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
             <class>QFrame</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>privFrame</cstd::string>
+                <cstring>privFrame</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
@@ -304,18 +304,18 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>exportPrivate</cstd::string>
+                        <cstring>exportPrivate</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Export the private part of the Key too</std::string>
+                        <string>Export the private part of the Key too</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>encryptKey</cstd::string>
+                        <cstring>encryptKey</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
@@ -323,7 +323,7 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Encrypt the Key with a password</std::string>
+                        <string>Encrypt the Key with a password</string>
                     </property>
                 </widget>
             </vbox>
@@ -332,7 +332,7 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Layout6</cstd::string>
+                <cstring>Layout6</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -347,17 +347,17 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>PushButton9</cstd::string>
+                        <cstring>PushButton9</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Cancel</std::string>
+                        <string>Cancel</string>
                     </property>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
-                        <cstd::string>Spacer7</cstd::string>
+                        <cstring>Spacer7</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
@@ -379,11 +379,11 @@ PKCS#8 is an encrypted official Key-exchange format</std::string>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>PushButton7</cstd::string>
+                        <cstring>PushButton7</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>OK</std::string>
+                        <string>OK</string>
                     </property>
                 </widget>
             </hbox>
diff --git a/MainWindow_UI.ui b/MainWindow_UI.ui
index fd37e2b6..38264d0f 100644
--- a/MainWindow_UI.ui
+++ b/MainWindow_UI.ui
@@ -12,7 +12,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>756</width>
+            <width>764</width>
             <height>604</height>
         </rect>
     </property>
@@ -534,17 +534,6 @@
                                     <string>Import PKCS#12</string>
                                 </property>
                             </widget>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>PushButton18_2</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Import from PKCS#7</string>
-                                </property>
-                            </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
@@ -1171,12 +1160,6 @@
         <receiver>MainWindow_UI</receiver>
         <slot>alterTemp()</slot>
     </connection>
-    <connection>
-        <sender>PushButton18_2</sender>
-        <signal>clicked()</signal>
-        <receiver>MainWindow_UI</receiver>
-        <slot>loadPKCS7()</slot>
-    </connection>
     <slot access="public">alterTemp()</slot>
     <slot access="public">crashApp()</slot>
     <slot access="public">deleteCert()</slot>
@@ -1194,7 +1177,6 @@
     <slot access="public">newKey()</slot>
     <slot access="public">newReq()</slot>
     <slot access="public">newSerTemp()</slot>
-    <slot access="public">loadPKCS7()</slot>
     <slot access="public">showDetailsCert()</slot>
     <slot access="public">showDetailsCert(QListViewItem *)</slot>
     <slot access="public">showDetailsKey()</slot>
diff --git a/ReqDetail.ui b/ReqDetail.ui
index 8ce82349..f94532cc 100644
--- a/ReqDetail.ui
+++ b/ReqDetail.ui
@@ -4,7 +4,7 @@
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstd::string>ReqDetail_UI</cstd::string>
+        <cstring>ReqDetail_UI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
@@ -17,7 +17,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <std::string>Details of the request</std::string>
+        <string>Details of the request</string>
     </property>
     <vbox>
         <property stdset="1">
@@ -32,7 +32,7 @@
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Layout12</cstd::string>
+                <cstring>Layout12</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -47,7 +47,7 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel1</cstd::string>
+                        <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
                         <name>font</name>
@@ -59,13 +59,13 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Details of the certificate signing request</std::string>
+                        <string>Details of the certificate signing request</string>
                     </property>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
-                        <cstd::string>Spacer5</cstd::string>
+                        <cstring>Spacer5</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
@@ -87,7 +87,7 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>image</cstd::string>
+                        <cstring>image</cstring>
                     </property>
                     <property stdset="1">
                         <name>minimumSize</name>
@@ -113,7 +113,7 @@
         <spacer>
             <property>
                 <name>name</name>
-                <cstd::string>Spacer7</cstd::string>
+                <cstring>Spacer7</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
@@ -135,7 +135,7 @@
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>GroupBox1</cstd::string>
+                <cstring>GroupBox1</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
@@ -147,7 +147,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <std::string>Standards</std::string>
+                <string>Standards</string>
             </property>
             <grid>
                 <property stdset="1">
@@ -162,47 +162,47 @@
                     <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>descr</cstd::string>
+                        <cstring>descr</cstring>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel2</cstd::string>
+                        <cstring>TextLabel2</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Certificate name</std::string>
+                        <string>Certificate name</string>
                     </property>
                 </widget>
                 <widget row="1"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel4</cstd::string>
+                        <cstring>TextLabel4</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Signature</std::string>
+                        <string>Signature</string>
                     </property>
                 </widget>
                 <widget row="2"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel6</cstd::string>
+                        <cstring>TextLabel6</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Key</std::string>
+                        <string>Key</string>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>verify</cstd::string>
+                        <cstring>verify</cstring>
                     </property>
                     <property stdset="1">
                         <name>palette</name>
@@ -441,7 +441,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>OK</std::string>
+                        <string>OK</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
@@ -455,7 +455,7 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>privKey</cstd::string>
+                        <cstring>privKey</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
@@ -698,7 +698,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>not available</std::string>
+                        <string>not available</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
@@ -714,11 +714,11 @@
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>GroupBox3</cstd::string>
+                <cstring>GroupBox3</cstring>
             </property>
             <property stdset="1">
                 <name>title</name>
-                <std::string>Subject</std::string>
+                <string>Subject</string>
             </property>
             <grid>
                 <property stdset="1">
@@ -733,62 +733,62 @@
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel6_2</cstd::string>
+                        <cstring>TextLabel6_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>name / DNS</std::string>
+                        <string>name / DNS</string>
                     </property>
                 </widget>
                 <widget row="1"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel4_2</cstd::string>
+                        <cstring>TextLabel4_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Province</std::string>
+                        <string>Province</string>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel3</cstd::string>
+                        <cstring>TextLabel3</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Country</std::string>
+                        <string>Country</string>
                     </property>
                 </widget>
                 <widget row="1"  column="2" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel5</cstd::string>
+                        <cstring>TextLabel5</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Org. Unit</std::string>
+                        <string>Org. Unit</string>
                     </property>
                 </widget>
                 <widget row="2"  column="2" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel7_2</cstd::string>
+                        <cstring>TextLabel7_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>E-Mail</std::string>
+                        <string>E-Mail</string>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnC</cstd::string>
+                        <cstring>dnC</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -807,14 +807,14 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="0"  column="3" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnO</cstd::string>
+                        <cstring>dnO</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -833,14 +833,14 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="1"  column="3" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnOU</cstd::string>
+                        <cstring>dnOU</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -859,14 +859,14 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="2"  column="3" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnEmail</cstd::string>
+                        <cstring>dnEmail</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -885,14 +885,14 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="2"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnCN</cstd::string>
+                        <cstring>dnCN</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -911,14 +911,14 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>dnL</cstd::string>
+                        <cstring>dnL</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
@@ -937,18 +937,18 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string></std::string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget row="0"  column="2" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>TextLabel4_2_2</cstd::string>
+                        <cstring>TextLabel4_2_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Organisation</std::string>
+                        <string>Organisation</string>
                     </property>
                 </widget>
             </grid>
@@ -957,7 +957,7 @@
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstd::string>Layout18</cstd::string>
+                <cstring>Layout18</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -972,17 +972,17 @@
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>PushButton11</cstd::string>
+                        <cstring>PushButton11</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>Cancel</std::string>
+                        <string>Cancel</string>
                     </property>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
-                        <cstd::string>Spacer6</cstd::string>
+                        <cstring>Spacer6</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
@@ -1004,11 +1004,11 @@
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstd::string>PushButton10</cstd::string>
+                        <cstring>PushButton10</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <std::string>OK</std::string>
+                        <string>OK</string>
                     </property>
                 </widget>
             </hbox>