Wizard for adding friends. Almost stable, but code needs cleanup.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1101 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/RetroShare.pro

@@ -246,6 +246,7 @@ HEADERS +=  rshare.h \
             gui/feeds/BlogMsgItem.h \
             gui/feeds/SubFileItem.h \
             gui/feeds/SubDestItem.h \
+            gui/connect/ConnectFriendWizard.h
 
 
 FORMS +=    gui/ChatDialog.ui \
@@ -463,6 +464,7 @@ SOURCES += main.cpp \
             gui/feeds/BlogMsgItem.cpp \
             gui/feeds/SubFileItem.cpp \
             gui/feeds/SubDestItem.cpp \
+            gui/connect/ConnectFriendWizard.cpp
             
 RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc 
 

retroshare-gui/src/gui/MainWindow.cpp

@@ -63,6 +63,7 @@
 
 #include "gui/connect/InviteDialog.h"
 #include "gui/connect/AddFriendDialog.h"
+#include "gui/connect/ConnectFriendWizard.h"
 
 #include <sstream>
 #include <iomanip>
@@ -508,13 +509,20 @@ void MainWindow::addFriend()
     }
     virtual int NeighLoadPEMString(std::string pem, std::string &id)  = 0;
 #else
-
+/*
     static  AddFriendDialog *addDialog = 
     new AddFriendDialog(networkDialog, this);
 
     std::string invite = "";
     addDialog->setInfo(invite);
     addDialog->show();
+  */  
+
+    static ConnectFriendWizard* connwiz = new ConnectFriendWizard(this);
+    connwiz->restart();
+    connwiz->show();
+
+    //delete connwiz;
 #endif
 }
 

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -0,0 +1,639 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2009 The RetroShare Team, Oleksiy Bilyanskyy
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include "ConnectFriendWizard.h"
+
+#include "rsiface/rspeers.h" //for rsPeers variable
+#include "rsiface/rsiface.h"
+
+#include <QLineEdit>
+#include <QTextEdit>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QCheckBox>
+#include <QGroupBox>
+
+#include <QFileDialog>
+
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+
+#include <QMessageBox>
+
+#include <QRegExpValidator>
+#include <QRegExp>
+
+#include <QDebug>
+
+//============================================================================
+//! 
+ConnectFriendWizard::ConnectFriendWizard(QWidget *parent)
+                    : QWizard(parent)
+{
+    setPage(Page_Intro, new IntroPage);
+    setPage(Page_Text, new TextPage);
+    setPage(Page_Cert, new CertificatePage);
+    setPage(Page_ErrorMessage, new ErrorMessagePage);
+    setPage(Page_Conclusion, new ConclusionPage);
+
+    setStartId(Page_Intro);
+
+// this define comes from Qt example. I don't have mac, so it wasn't tested
+#ifndef Q_WS_MAC
+    setWizardStyle(ModernStyle);
+#endif
+
+    setOption(HaveHelpButton, true);
+    connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
+    
+    setPixmap(QWizard::LogoPixmap,
+              QPixmap(":/images/connect/connectFriendLogo.png"));
+//    setPixmap(QWizard::WatermarkPixmap,
+//              QPixmap(":/images/connectFriendWatermark.png"));
+    setPixmap(QWizard::BannerPixmap,
+              QPixmap(":/images/connect/connectFriendBanner.png")) ;
+              
+    setWindowTitle(tr("Connect Friend Wizard"));
+
+ //   setDefaultProperty("QTextEdit", "plainText", "textChanged");
+}
+
+//============================================================================
+//! 
+void ConnectFriendWizard::showHelp()
+{
+//    static QString lastHelpMessage;
+
+    QString message = "Sorry, help wasn't implemented :(";
+/*
+    switch (currentId()) {
+    case Page_Intro:
+        message = tr("The decision you make here will affect which page you "
+                     "get to see next.");
+        break;
+//! [10] //! [11]
+    case Page_Evaluate:
+        message = tr("Make sure to provide a valid email address, such as "
+                     "toni.buddenbrook@example.de.");
+        break;
+    case Page_Register:
+        message = tr("If you don't provide an upgrade key, you will be "
+                     "asked to fill in your details.");
+        break;
+    case Page_Details:
+        message = tr("Make sure to provide a valid email address, such as "
+                     "thomas.gradgrind@example.co.uk.");
+        break;
+    case Page_Conclusion:
+        message = tr("You must accept the terms and conditions of the "
+                     "license to proceed.");
+        break;
+//! [12] //! [13]
+    default:
+        message = tr("This help is likely not to be of any help.");
+    }
+//! [12]
+
+    if (lastHelpMessage == message)
+        message = tr("Sorry, I already gave what help I could. "
+                     "Maybe you should try asking a human?");
+*/
+//! [14]
+    QMessageBox::information(this, tr("Connect Friend Wizard Help"), message);
+//! [14]
+
+//    lastHelpMessage = message;
+//! [15]
+}
+
+//============================================================================
+
+void
+ConnectFriendWizard::accept()
+{
+    if ( hasVisitedPage(Page_Conclusion) )
+    {
+        std::string authId = field("idField").toString().toStdString();
+        std::string authCode = field("authCode").toString().toStdString();
+
+        rsPeers->AuthCertificate(authId, authCode );
+        rsPeers->addFriend(authId);
+        rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_NEIGHBOURS,1) ;
+    }
+
+    QDialog::accept();
+}
+
+//============================================================================
+//============================================================================
+//============================================================================
+//
+IntroPage::IntroPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");
+    setTitle( titleStr.arg( tr("Add a new Friend") ) ) ;
+             
+    setSubTitle(tr("This wizard will help you to connect your friend "
+                   "to RetroShare network. There are  two possible ways "
+                   "to do this:")) ;
+    //topLabel = new QLabel(;
+    //topLabel->setWordWrap(true);
+
+    textRadioButton = new QRadioButton(tr("&Enter the certificate manually"));
+    certRadioButton = new QRadioButton(tr("&Use *.pqi files with "
+                                          "certificates" ));
+    textRadioButton->setChecked(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    //layout->addWidget(topLabel);
+    layout->addWidget(textRadioButton);
+    layout->addWidget(certRadioButton);
+    setLayout(layout);
+}
+//
+//============================================================================
+//
+int IntroPage::nextId() const
+{
+    if (textRadioButton->isChecked()) {
+        return ConnectFriendWizard::Page_Text;
+    } else {
+        return ConnectFriendWizard::Page_Cert;
+    }
+}
+//
+//============================================================================
+//============================================================================
+//============================================================================
+//
+TextPage::TextPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");
+    setTitle( titleStr.arg( tr("Text certificate") ) ) ;
+    
+    setSubTitle(tr("Use text representation of the XPGP certificates."));
+
+    userCertLabel = new QLabel(tr("The text below is your XPGP certificate. "
+                                  "You have to provide it to your friend "));
+
+    userCertEdit = new QTextEdit;
+    std::string invite = rsPeers->GetRetroshareInvite();
+    userCertEdit->setText(QString::fromStdString(invite));
+    userCertEdit->setReadOnly(true);
+
+    userCertHelpButton = new QPushButton;
+    userCertHelpButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    userCertHelpButton->setFixedSize(20,20);
+    userCertHelpButton->setFlat(true);
+    userCertHelpButton->setIcon( QIcon(":images/connect/info16.png") );
+    connect (userCertHelpButton,  SIGNAL( clicked()),
+             this,                SLOT(   showHelpUserCert()) );
+#if defined(Q_OS_WIN)
+    userCertMailButton = new QPushButton;
+    userCertMailButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    userCertMailButton->setFixedSize(20,20);
+    userCertMailButton->setFlat(true);
+    userCertMailButton->setIcon( QIcon(":images/connect/mail_send.png") );
+    userCertMailButton->setToolTip(tr("Run Email program"));
+    connect (userCertMailButton,  SIGNAL( clicked()),
+             this,                SLOT(   runEmailClient()) );
+#endif
+    userCertButtonsLayout = new QVBoxLayout();
+    userCertButtonsLayout->addWidget(userCertHelpButton);
+#if defined(Q_OS_WIN)
+    userCertButtonsLayout->addWidget(userCertMailButton);
+#endif
+    userCertLayout = new QHBoxLayout();
+    userCertLayout->addWidget(userCertEdit);
+    userCertLayout->addLayout(userCertButtonsLayout);
+
+    friendCertLabel = new QLabel(tr("Please, paste your friends XPGP "
+                                    "certificate into the box below" )) ;
+    
+    friendCertEdit = new QTextEdit;
+    registerField("aaabbb", friendCertEdit, "plainText");//, "textChanged");
+
+    //=== add all widgets to one layout
+    textPageLayout = new QVBoxLayout();
+    textPageLayout->addWidget(userCertLabel);
+    textPageLayout->addLayout(userCertLayout);
+    textPageLayout->addWidget(friendCertLabel);
+    textPageLayout->addWidget(friendCertEdit);
+//
+    setLayout(textPageLayout);
+}
+//
+//============================================================================
+//
+#if defined(Q_OS_WIN)
+
+#include <iostream>
+#include <windows.h>
+
+void 
+TextPage::runEmailClient()
+{
+	std::string mailstr = "mailto:";
+    mailstr += "?subject=RetroShare Invite";
+
+	mailstr += "&body=";
+
+	mailstr += (userCertEdit->toPlainText()).toStdString();
+
+	/* search and replace the end of lines with: "%0D%0A" */
+	std::cerr << "MAIL STRING:" << mailstr.c_str() << std::endl;
+	size_t loc;
+	while((loc = mailstr.find("\n")) != mailstr.npos)
+	{
+		/* sdfkasdflkjh */
+		mailstr.replace(loc, 1, "%0D%0A");
+	}
+
+	HINSTANCE hInst = ShellExecuteA(0, "open", mailstr.c_str(), 
+		                            NULL, NULL, SW_SHOW);
+
+    if(reinterpret_cast<int>(hInst) <= 32)
+    {
+	/* error */
+	std::cerr << "ShellExecute Error: " << reinterpret_cast<int>(hInst);
+	std::cerr << std::endl;
+    }
+}
+#endif
+//
+//============================================================================
+//
+void
+TextPage::showHelpUserCert()
+{
+    QMessageBox::information(this,
+                             tr("Connect Friend Help"),
+                             tr("You can copy this text and send it to your "
+                                "friend via email, ICQ or some other way"));
+
+}
+//
+//============================================================================
+//
+int
+TextPage::nextId() const
+{
+    std::string id;
+    std::string certstr;
+    
+    certstr = friendCertEdit->toPlainText().toStdString();
+
+    if ( rsPeers->LoadCertificateFromString(certstr, id) )
+    {
+        wizard()->setField("idField", QString::fromStdString(id));
+        return ConnectFriendWizard::Page_Conclusion ;
+    }
+    else
+    {
+        // error message 
+        wizard()->setField("errorMessage",  tr("Certificate Load Failed") );
+        return ConnectFriendWizard::Page_ErrorMessage;
+    }
+
+    return ConnectFriendWizard::Page_ErrorMessage;
+}
+//
+//============================================================================
+//============================================================================
+//============================================================================
+
+CertificatePage::CertificatePage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");
+    setTitle( titleStr.arg( tr("Certificate files") ) ) ;
+
+    setSubTitle(tr("Use XPGP certificates saved in files."));
+    
+    userFileLabel = new QLabel(tr("You have to generate a file with your "
+                                  "certificate and give it to your friend. "
+                                  "Also, you can use a file generated "
+                                  "before."));
+    userFileLabel->setWordWrap(true);
+                                  
+    userFileCreateButton = new QPushButton;
+    userFileCreateButton->setText("Generate certificate");
+    connect(userFileCreateButton, SIGNAL( clicked() ),
+            this,                 SLOT( generateCertificateCalled()));
+
+    userFileLayout = new QHBoxLayout;
+    userFileLayout->addWidget(userFileLabel);
+    userFileLayout->addWidget(userFileCreateButton);
+
+    userFileFrame = new QGroupBox;
+    userFileFrame->setFlat(true);
+    userFileFrame->setTitle("Generate certificate");
+    userFileFrame->setLayout(userFileLayout);
+
+    friendFileLabel = new QLabel(tr("Specify path to your friend's "
+                                    "certificate in the box below " ) );
+    friendFileNameEdit = new QLineEdit;
+    registerField("friendCertificateFile*", friendFileNameEdit);
+
+    friendFileNameOpenButton= new QPushButton;
+    friendFileNameOpenButton->setText("...");
+    connect(friendFileNameOpenButton, SIGNAL( clicked()),
+            this                   , SLOT( loadFriendCert()));
+    
+    friendFileLayout = new QHBoxLayout;
+    friendFileLayout->addWidget(friendFileNameEdit) ;
+    friendFileLayout->addWidget(friendFileNameOpenButton);
+    
+    certPageLayout = new QVBoxLayout;
+    certPageLayout->addWidget(userFileFrame);
+    certPageLayout->addWidget(friendFileLabel);
+    certPageLayout->addLayout(friendFileLayout);
+
+    setLayout(certPageLayout);
+}
+
+//============================================================================
+
+void
+CertificatePage::loadFriendCert()
+{
+    QString fileName =
+        QFileDialog::getOpenFileName(this, tr("Select Certificate"),
+                                     "", tr("Certificates (*.pqi *.pem)"));
+
+    if (!fileName.isNull())
+    {
+        friendFileNameEdit->setText(fileName);
+        emit completeChanged();
+    }
+}
+
+//============================================================================
+
+void
+CertificatePage::generateCertificateCalled()
+{
+    qDebug() << "  generateCertificateCalled";
+
+    QString qdir = QFileDialog::getSaveFileName(this,
+                                                "Please choose a filename",
+                                                QDir::homePath(),
+                                                "RetroShare Certificate (*.pqi)");
+
+    if ( rsPeers->SaveCertificateToFile(rsPeers->getOwnId(), qdir.toStdString()) )
+    {
+        QMessageBox::information(this, tr("RetroShare"),
+                         tr("Certificate file successfully created"),
+                         QMessageBox::Ok, QMessageBox::Ok);
+    }
+    else
+    {
+        QMessageBox::information(this, tr("RetroShare"),
+                         tr("Sorry, certificate file creation failed"),
+                         QMessageBox::Ok, QMessageBox::Ok);
+    }
+}
+
+//============================================================================
+
+bool
+CertificatePage::isComplete() const
+{
+    return !( (friendFileNameEdit->text()).isEmpty() );              
+}
+
+//============================================================================
+
+int
+CertificatePage::nextId() const
+{
+    std::string id;
+    
+    QString fn = friendFileNameEdit->text();
+    if (QFile::exists(fn))
+    {
+        std::string fnstr = fn.toStdString();
+        if ( rsPeers->LoadCertificateFromFile(fnstr, id) ) 
+        {
+            wizard()->setField("idField", QString::fromStdString(id));
+            
+            return ConnectFriendWizard::Page_Conclusion;
+        }
+        else
+        {
+            wizard()->setField("errorMessage",
+                     QString(tr("Certificate Load Failed:something is wrong with %1 ")).arg(fn) );
+            return ConnectFriendWizard::Page_ErrorMessage;
+        }
+    }
+    else
+    {
+        QString mess =
+            QString(tr("Certificate Load Failed:file %1 not found"))
+                    .arg(fn);
+
+        wizard()->setField("errorMessage", mess);
+
+        return ConnectFriendWizard::Page_ErrorMessage;
+    }    
+}
+//
+//============================================================================
+//============================================================================
+//============================================================================
+
+ErrorMessagePage::ErrorMessagePage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");
+    setTitle( titleStr.arg( tr("Sorry, some error appeared") ) ) ;
+    setSubTitle( tr("Here is the error message: ") );
+
+    messageLabel = new QLabel("zooloo");
+    registerField("errorMessage", messageLabel, "text");
+
+    errMessLayout = new QVBoxLayout;
+    errMessLayout->addWidget(messageLabel);
+    setLayout(errMessLayout);
+}
+
+//============================================================================
+//
+int ErrorMessagePage::nextId() const
+{
+    return -1;
+}
+//
+//============================================================================
+//============================================================================
+//============================================================================
+
+ConclusionPage::ConclusionPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");
+    setTitle( titleStr.arg( tr("Make Friend") ) ) ;
+
+    setSubTitle(tr("Fill details about your friend here"));
+
+    peerDetailsFrame = new QGroupBox;
+    peerDetailsFrame->setTitle( tr("Peer details") );
+
+    peerDetailsLayout =  new QGridLayout();
+    
+    trustLabel = new QLabel( tr("Trust:") );
+    peerDetailsLayout->addWidget(trustLabel, 0,0,1,1);
+    trustEdit = new QLineEdit();
+    peerDetailsLayout->addWidget(trustEdit, 0,1,1,1);
+    nameLabel = new QLabel( tr("Name:") );
+    peerDetailsLayout->addWidget(nameLabel, 1,0,1,1);
+    nameEdit = new QLineEdit();
+    peerDetailsLayout->addWidget(nameEdit, 1,1,1,1);
+    orgLabel = new QLabel( tr("Org:") );
+    peerDetailsLayout->addWidget(orgLabel, 2,0,1,1);
+    orgEdit = new QLineEdit();
+    peerDetailsLayout->addWidget(orgEdit, 2,1,1,1);
+    locLabel = new QLabel( tr("Loc:") );
+    peerDetailsLayout->addWidget(locLabel, 3,0,1,1);
+    locEdit = new QLineEdit();
+    peerDetailsLayout->addWidget(locEdit, 3,1,1,1);
+    countryLabel = new QLabel( tr("Country:") );
+    peerDetailsLayout->addWidget(countryLabel, 4,0,1,1);
+    countryEdit = new QLineEdit();
+    peerDetailsLayout->addWidget(countryEdit, 4,1,1,1);
+    signersLabel = new QLabel( tr("Signers") );
+    peerDetailsLayout->addWidget(signersLabel, 5,0,1,1);
+    signersEdit = new QTextEdit();
+    peerDetailsLayout->addWidget(signersEdit, 5,1,1,1);
+
+    peerDetailsFrame->setLayout(peerDetailsLayout);
+
+    authCodeLabel = new QLabel( tr("AUTH CODE") );
+    authCodeEdit = new QLineEdit();
+    registerField("authCode", authCodeEdit);
+    
+    authCodeLayout = new QHBoxLayout();
+    authCodeLayout->addWidget(authCodeLabel);
+    authCodeLayout->addWidget(authCodeEdit);
+    authCodeLayout->addStretch();
+
+    conclusionPageLayout = new QVBoxLayout();
+    conclusionPageLayout->addWidget(peerDetailsFrame);
+    conclusionPageLayout->addLayout(authCodeLayout);
+
+    setLayout(conclusionPageLayout);
+
+    peerIdEdit = new QLineEdit(this);
+    peerIdEdit->setVisible(false);
+    registerField("idField",peerIdEdit);
+}
+
+//============================================================================
+//
+int ConclusionPage::nextId() const
+{
+    return -1;
+}
+//
+//============================================================================
+//
+void
+ConclusionPage::initializePage()
+{
+    std::string id = field("idField").toString().toStdString();
+
+    RsPeerDetails detail;
+    if (!rsPeers->getPeerDetails(id, detail))
+    {
+            rsiface->unlockData(); /* UnLock Interface */
+            return ;//false;
+    }
+
+    std::string trustString;
+
+    switch(detail.trustLvl)
+    {
+            case RS_TRUST_LVL_GOOD:
+                    trustString = "Good";
+            break;
+            case RS_TRUST_LVL_MARGINAL:
+                    trustString = "Marginal";
+            break;
+            case RS_TRUST_LVL_UNKNOWN:
+            default:
+                    trustString = "No Trust";
+            break;
+    }
+
+//    std::ostringstream out;
+
+//    std::list<std::string>::iterator it;
+//    for(it = detail.signers.begin(); it != detail.signers.end(); it++)
+//    {
+//            out << rsPeers->getPeerName(*it) << " <" << *it << ">";
+//            out << std::endl;
+//    }
+
+    QString ts;
+    std::list<std::string>::iterator it;
+    for(it = detail.signers.begin(); it != detail.signers.end(); it++)
+    {
+            ts.append(QString::fromStdString( rsPeers->getPeerName(*it) ));
+            ts.append( "<" ) ;
+            ts.append( QString::fromStdString(*it) );
+            ts.append( ">" );
+            ts.append( "\n" );
+    }
+
+
+    /* setup the gui */
+//---    setInfo(detail.name, trustString, detail.org,
+//---            detail.location, detail.email, out.str());
+    nameEdit->setText( QString::fromStdString( detail.name ) ) ;
+    trustEdit->setText(QString::fromStdString( trustString ) ) ;
+    orgEdit->setText(QString::fromStdString( detail.org ) );
+    locEdit->setText( QString::fromStdString( detail.location ) );
+    countryEdit->setText( QString::fromStdString( detail.email ) );
+    signersEdit->setPlainText( ts );
+    
+    //setAuthCode(id, detail.authcode);
+    authCodeEdit->setText( QString::fromStdString(detail.authcode) );
+}
+//
+//============================================================================
+//
+
+//
+//============================================================================
+
+
+
+//============================================================================
+

retroshare-gui/src/gui/connect/ConnectFriendWizard.h

@@ -0,0 +1,186 @@
+#ifndef __ConnectFriendWizard__
+#define __ConnectFriendWizard__
+
+#include <QWizard>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QLabel;
+class QTextEdit;
+class QLineEdit;
+class QRadioButton;
+class QVBoxLayout;
+class QHBoxLayout;
+class QGroupBox;
+class QGridLayout;
+QT_END_NAMESPACE
+
+//============================================================================
+// 
+class ConnectFriendWizard : public QWizard
+{
+// 
+    Q_OBJECT
+
+public:
+
+    enum { Page_Intro, Page_Text, Page_Cert, Page_ErrorMessage,
+           Page_Conclusion };
+
+    ConnectFriendWizard(QWidget *parent = 0);
+
+    void accept();
+
+private slots:
+    void showHelp();
+//! 
+};
+
+//============================================================================
+//! 
+class IntroPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    IntroPage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *topLabel;
+    QRadioButton *textRadioButton;
+    QRadioButton *certRadioButton;
+};
+
+//============================================================================
+//! 
+class TextPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    TextPage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel*      userCertLabel;
+    QTextEdit*   userCertEdit;
+    QHBoxLayout* userCertLayout;
+    QVBoxLayout* userCertButtonsLayout;
+    QPushButton* userCertHelpButton;
+    #if defined(Q_OS_WIN)
+    QPushButton* userCertMailButton;//! on Windows, click on this button
+                                   //! launches default email client
+    #endif
+    QLabel*      friendCertLabel;
+    QTextEdit*   friendCertEdit;
+    
+    QVBoxLayout* textPageLayout;
+
+private slots:
+    void showHelpUserCert();
+    
+    #if defined(Q_OS_WIN)
+    //! launches default email client (on windows)
+    
+    //! Tested on Vista, it work normally... But a bit slowly.
+    void runEmailClient();
+    #endif
+};
+
+//============================================================================
+//! 
+class CertificatePage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    CertificatePage(QWidget *parent = 0);
+
+    int nextId() const;
+    bool isComplete() const ;
+
+private:
+    QGroupBox* userFileFrame;
+    QLabel *userFileLabel;
+    QPushButton* userFileCreateButton;
+    QHBoxLayout* userFileLayout;
+    
+    QLabel* friendFileLabel;
+    QLineEdit *friendFileNameEdit;
+    QPushButton* friendFileNameOpenButton;
+    QHBoxLayout* friendFileLayout;
+
+    QVBoxLayout* certPageLayout;    
+
+private slots:
+    void generateCertificateCalled();
+    void loadFriendCert();
+};
+
+//============================================================================
+
+class ErrorMessagePage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    ErrorMessagePage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *messageLabel;
+    QVBoxLayout* errMessLayout;
+};
+
+//============================================================================
+//! 
+class ConclusionPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    ConclusionPage(QWidget *parent = 0);
+
+    void initializePage();
+    int nextId() const;
+ //   void setVisible(bool visible);
+
+private slots:
+//    void printButtonClicked();
+
+private:
+    QGroupBox* peerDetailsFrame;
+    QLabel* trustLabel;
+    QLineEdit* trustEdit;
+    QLabel* nameLabel;
+    QLineEdit* nameEdit;
+    QLabel* orgLabel;
+    QLineEdit* orgEdit;
+    QLabel* locLabel;
+    QLineEdit* locEdit;
+    QLabel* countryLabel;
+    QLineEdit* countryEdit;
+    QLabel* signersLabel;
+    QTextEdit* signersEdit;
+    QGridLayout* peerDetailsLayout;
+    
+    QLabel* authCodeLabel;
+    QLineEdit* authCodeEdit;
+    QHBoxLayout* authCodeLayout;
+
+    QVBoxLayout* conclusionPageLayout;
+
+    //! peer id
+
+    //! It's a hack; This widget is used only to register "id" field in the
+    //! wizard. Really the widget isn't displayed.
+    QLineEdit* peerIdEdit;
+};
+
+//============================================================================
+
+#endif

retroshare-gui/src/gui/images.qrc

@@ -393,5 +393,12 @@
 		  <file>smileys/wink.png</file>
 		  <file>smileys/wondering.png</file>
 		  <file>smileys/emotes.acs</file>
+
+        <file>images/connect/connectFriendWatermark.png</file>
+        <file>images/connect/connectFriendLogo.png</file>
+        <file>images/connect/connectFriendBanner.png</file>
+        <file>images/connect/info16.png</file>
+        <file>images/connect/mail_send.png</file>
+
 	  </qresource>
 </RCC>