From 401dac86e9a4e35c26679fb948791182e31d876d Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sat, 1 May 2010 15:17:23 +0000
Subject: [PATCH] improved readability of cert generation dialog. Added
 tooltips, information, and wait cursor

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/GenCertDialog.cpp | 18 +++++++++++++-----
 retroshare-gui/src/gui/GenCertDialog.ui  | 19 ++++++++++++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index fc0e187b2..18c50b2ef 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -24,6 +24,7 @@
 #include "GenCertDialog.h"
 #include "InfoDialog.h"
 #include "gui/settings/rsharesettings.h"
+#include <QAbstractEventDispatcher>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMovie>
@@ -177,7 +178,7 @@ void GenCertDialog::genPerson()
             }
             //generate a new gpg key
             std::string err_string;
-            ui.no_gpg_key_label->setText(tr("Generating new GPG key, please be patient. Fill in your GPG password when asked."));
+            ui.no_gpg_key_label->setText(tr("Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your GPG password when asked, to sign your new key."));
             ui.no_gpg_key_label->show();
 //            QMovie *movie = new QMovie(":/images/loader/progress.gif");
 //            ui.progress_label->setMovie(movie);
@@ -197,12 +198,19 @@ void GenCertDialog::genPerson()
             ui.infopushButton->hide();
             ui.genButton->hide();
             ui.label_location2->hide();
-            QMessageBox::StandardButton info = QMessageBox::information( NULL,
-                            "Generating GPG key",
-                            "This process can take some time, please be patient after pressing the OK button",
-                              QMessageBox::Ok);
+//            QMessageBox::StandardButton info = QMessageBox::information( NULL,
+//                            "Generating GPG key",
+//                            "This process can take some time (approximately one minute), please be patient after pressing the OK button",
+//                              QMessageBox::Ok);
             //info->
+				setCursor(Qt::WaitCursor) ;
+
+				QCoreApplication::processEvents();
+				while(QAbstractEventDispatcher::instance()->processEvents(QEventLoop::AllEvents)) ; 
+
             RsInit::GeneratePGPCertificate(ui.name_input->text().toStdString(), ui.email_input->text().toStdString(), ui.password_input->text().toStdString(), PGPId, err_string);
+
+				setCursor(Qt::ArrowCursor) ;
         }
 
 
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 1f44cfa0e..091d7a01c 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>569</width>
-    <height>493</height>
+    <height>603</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -689,7 +689,11 @@ border: 1px solid #CCCCCC;}</string>
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QLineEdit" name="name_input"/>
+            <widget class="QLineEdit" name="name_input">
+             <property name="toolTip">
+              <string>Enter here your nickname</string>
+             </property>
+            </widget>
            </item>
            <item row="3" column="0">
             <widget class="QLabel" name="email_label">
@@ -699,7 +703,13 @@ border: 1px solid #CCCCCC;}</string>
             </widget>
            </item>
            <item row="3" column="1">
-            <widget class="QLineEdit" name="email_input"/>
+            <widget class="QLineEdit" name="email_input">
+             <property name="toolTip">
+              <string>Be careful: this email will be visible to your friends and friends 
+of your friends. This information is required by GPG, but to stay 
+anonymous, you can use a fake email.</string>
+             </property>
+            </widget>
            </item>
            <item row="4" column="0">
             <widget class="QLabel" name="password_label">
@@ -710,6 +720,9 @@ border: 1px solid #CCCCCC;}</string>
            </item>
            <item row="4" column="1">
             <widget class="QLineEdit" name="password_input">
+             <property name="toolTip">
+              <string>Put a strong password here. This password protects your GPG key.</string>
+             </property>
              <property name="inputMask">
               <string/>
              </property>