From b717d601f4b25937d492a824cdb6b7a6b875a59c Mon Sep 17 00:00:00 2001
From: defnax <defnator@gmail.com>
Date: Sun, 25 Oct 2015 00:54:22 +0200
Subject: [PATCH] Added default Email Client Button to Web Mail Page

---
 .../src/gui/connect/ConnectFriendWizard.cpp     |  9 ++++++++-
 .../src/gui/connect/ConnectFriendWizard.h       |  1 +
 .../src/gui/connect/ConnectFriendWizard.ui      | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index b8974268a..7990b92c4 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -105,11 +105,13 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
     connect(ui->acceptNoSignGPGCheckBox,SIGNAL(toggled(bool)), ui->_options_GB,SLOT(setEnabled(bool))) ;
     connect(ui->addKeyToKeyring_CB,SIGNAL(toggled(bool)), ui->acceptNoSignGPGCheckBox,SLOT(setChecked(bool))) ;
 	
-	connect(ui->gmailButton, SIGNAL(clicked()), this, SLOT(inviteGmail()));
+    connect(ui->gmailButton, SIGNAL(clicked()), this, SLOT(inviteGmail()));
     connect(ui->yahooButton, SIGNAL(clicked()), this, SLOT(inviteYahoo()));
     connect(ui->outlookButton, SIGNAL(clicked()), this, SLOT(inviteOutlook()));
     connect(ui->aolButton, SIGNAL(clicked()), this, SLOT(inviteAol()));
     connect(ui->yandexButton, SIGNAL(clicked()), this, SLOT(inviteYandex()));
+    connect(ui->emailButton, SIGNAL(clicked()), this, SLOT(runEmailClient2()));
+
     
     subject = tr("RetroShare Invitation");
     body = GetStartedDialog::GetInviteText();
@@ -1256,3 +1258,8 @@ void ConnectFriendWizard::inviteYandex()
 {
     QDesktopServices::openUrl(QUrl("https://mail.yandex.com/neo2/#compose/subject=" + subject + "&body=" + body, QUrl::TolerantMode));
 }
+
+void ConnectFriendWizard::runEmailClient2()
+{
+	sendMail("", subject, body );
+}
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
index b91fb317c..54eb71062 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
@@ -62,6 +62,7 @@ private slots:
 	void toggleSignatureState(bool doUpdate = true);
 	void toggleFormatState(bool doUpdate = true);
 	void runEmailClient();
+	void runEmailClient2();
 	void showHelpUserCert();
 	void copyCert();
 	void pasteCert();
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index cb1a1a7fc..df15425a5 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -652,6 +652,23 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="emailButton">
+        <property name="text">
+         <string>Email</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/mail_128.png</normaloff>:/icons/mail_128.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">