diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp index b3ad217a1..af7e600ca 100644 --- a/retroshare-gui/src/gui/HomePage.cpp +++ b/retroshare-gui/src/gui/HomePage.cpp @@ -25,6 +25,7 @@ #include "gui/notifyqt.h" #include "gui/msgs/MessageComposer.h" #include "gui/connect/ConnectFriendWizard.h" +#include #include "gui/connect/FriendRecommendDialog.h" #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) @@ -51,7 +52,8 @@ HomePage::HomePage(QWidget *parent) : updateOwnCert(); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend())); - + connect(ui->LoadCertFileButton, SIGNAL(clicked()), this, SLOT(loadCert())); + QAction *CopyAction = new QAction(QIcon(),tr("Copy your Cert to Clipboard"), this); connect(CopyAction, SIGNAL(triggered()), this, SLOT(copyCert())); @@ -60,7 +62,10 @@ HomePage::HomePage(QWidget *parent) : QAction *SendAction = new QAction(QIcon(),tr("Send via Email"), this); connect(SendAction, SIGNAL(triggered()), this, SLOT(runEmailClient())); - + + QAction *WebMailAction = new QAction(QIcon(),tr("Invite via WebMail"), this); + connect(WebMailAction, SIGNAL(triggered()), this, SLOT(webMail())); + QAction *RecAction = new QAction(QIcon(),tr("Recommend friends to each others"), this); connect(RecAction, SIGNAL(triggered()), this, SLOT(recommendFriends())); @@ -68,10 +73,15 @@ HomePage::HomePage(QWidget *parent) : menu->addAction(CopyAction); menu->addAction(SaveAction); menu->addAction(SendAction); + menu->addAction(WebMailAction); menu->addAction(RecAction); ui->shareButton->setMenu(menu); + connect(ui->runStartWizard_PB,SIGNAL(clicked()), this,SLOT(runStartWizard())) ; + connect(ui->openwebhelp,SIGNAL(clicked()), this,SLOT(openWebHelp())) ; + ui->runStartWizard_PB->hide(); // until future rework + int S = QFontMetricsF(font()).height(); QString help_str = tr( "

  Welcome to Retroshare!

\ @@ -169,3 +179,29 @@ void HomePage::addFriend() connwiz.setStartId(ConnectFriendWizard::Page_Text); connwiz.exec (); } + +void HomePage::webMail() +{ + ConnectFriendWizard connwiz (this); + + connwiz.setStartId(ConnectFriendWizard::Page_WebMail); + connwiz.exec (); +} + +void HomePage::loadCert() +{ + ConnectFriendWizard connwiz (this); + + connwiz.setStartId(ConnectFriendWizard::Page_Cert); + connwiz.exec (); +} + +void HomePage::runStartWizard() +{ + QuickStartWizard(this).exec(); +} + +void HomePage::openWebHelp() +{ + QDesktopServices::openUrl(QUrl(QString("https://retroshare.readthedocs.io"))); +} diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h index a11980ac7..22937f821 100644 --- a/retroshare-gui/src/gui/HomePage.h +++ b/retroshare-gui/src/gui/HomePage.h @@ -46,15 +46,18 @@ public: virtual QIcon iconPixmap() const { return QPixmap(":/icons/svg/profile.svg") ; } //MainPage virtual QString pageName() const { return tr("Home") ; } //MainPage virtual QString helpText() const { return ""; } //MainPage - private slots: void updateOwnCert(); void runEmailClient(); void copyCert(); void saveCert(); + void addFriend(); + void webMail(); + void loadCert(); + void runStartWizard() ; + void openWebHelp() ; void recommendFriends(); - void addFriend(); private: Ui::HomePage *ui; diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 2acbae9ff..d2aba3dfc 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -59,22 +59,49 @@ - + - ... + Add certificate file - :/icons/help_64.png:/icons/help_64.png + :/icons/svg/folders1.svg:/icons/svg/folders1.svg - - true + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + false + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + @@ -86,7 +113,7 @@ 2 - + @@ -113,28 +140,7 @@ - - - - - 0 - 0 - - - - - 11 - - - - The text below is your own Retroshare certificate. Send it to your friends - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - + @@ -166,26 +172,43 @@ + + + + ... + + + + :/icons/help_64.png:/icons/help_64.png + + + true + + + + + + + + 0 + 0 + + + + + 11 + + + + The text below is your own Retroshare certificate. Send it to your friends + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - @@ -195,7 +218,7 @@ Open Source cross-platform, -private and secure decentralized communication platform. +private and secure decentralized communication platform. @@ -222,11 +245,35 @@ private and secure decentralized communication platform. + + + + Launch startup wizard + + + + :/images/tools_wizard.png:/images/tools_wizard.png + + + + + + + Open Web Help + + + + :/icons/settings/webinterface.svg:/icons/settings/webinterface.svg + + + label addFrame label_2 addframe + runStartWizard_PB + openwebhelp diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index e0b4b08a9..b652debaf 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -81,6 +81,8 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : // (csoler) I'm hiding this, since it is not needed anymore with the new Home page. ui->userFrame->hide(); + + ui->userFileFrame->hide(); // in homepage dropmenu now // this define comes from Qt example. I don't have mac, so it wasn't tested #ifndef Q_OS_MAC @@ -133,12 +135,8 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) : else { ui->userFrame->hide(); // certificates page - top half with own cert and it's functions - ui->horizontalLayout_13->hide(); // Advanced options - key sign, whitelist, direct source ... AdvancedVisible=false; - - ui->emailLabel->hide(); // is it ever used? - ui->emailEdit->hide(); ui->trustLabel->hide(); ui->trustEdit->hide(); } @@ -557,6 +555,14 @@ void ConnectFriendWizard::initializePage(int id) ui->ipLabel->setPixmap(QPixmap(":/images/anonymous_128_blue.png").scaledToHeight(S*2,Qt::SmoothTransformation)); ui->ipLabel->setToolTip("This is a Hidden node - you need tor/i2p proxy to connect"); } + + if(peerDetails.email.empty()) + { + ui->emailLabel->hide(); // is it ever used? + ui->emailEdit->hide(); + } + ui->ipEdit->setTextInteractionFlags(Qt::TextSelectableByMouse); + } break; case Page_FriendRequest: diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index 5d8a8e21b..26e21bf3d 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -30,7 +30,6 @@ #include #include #include "rsharesettings.h" -#include /** Constructor */ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : @@ -39,7 +38,6 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - /* Hide platform specific features */ #ifdef Q_OS_WIN @@ -91,7 +89,7 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : connect(ui.autoLogin, SIGNAL(toggled(bool)), this,SLOT(updateAutoLogin())) ; connect(ui.chkRunRetroshareAtSystemStartup, SIGNAL(toggled(bool)), this,SLOT(updateRunRSOnBoot())) ; connect(ui.chkRunRetroshareAtSystemStartupMinimized, SIGNAL(toggled(bool)), this,SLOT(updateRunRSOnBoot())) ; - connect(ui.runStartWizard_PB, SIGNAL(clicked()), this,SLOT(runStartWizard())) ; + //connect(ui.runStartWizard_PB, SIGNAL(clicked()), this,SLOT(runStartWizard())) ; connect(ui.checkAdvanced, SIGNAL(toggled(bool)), this,SLOT(updateAdvancedMode())) ; connect(ui.registerRetroShareProtocol, SIGNAL(toggled(bool)), this,SLOT(updateRegisterRSProtocol())) ; } @@ -100,10 +98,6 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : GeneralPage::~GeneralPage() { } -void GeneralPage::runStartWizard() -{ - QuickStartWizard(this).exec(); -} void GeneralPage::updateAdvancedMode() { diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index d28146915..7fcc1adf0 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -45,7 +45,7 @@ public: virtual QString helpText() const { return ""; } public slots: - void runStartWizard() ; + //void runStartWizard() ; void updateAdvancedMode(); void updateUseLocalServer() ; void updateMaxTimeBeforeIdle(); diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui index c7f6aebff..f5be1e386 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.ui +++ b/retroshare-gui/src/gui/settings/GeneralPage.ui @@ -217,17 +217,6 @@ - - - - Launch startup wizard - - - - :/images/tools_wizard.png:/images/tools_wizard.png - - -