Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added "Add friends Certificate" Button for Home View, for call easy the Text Page for Paste friends Cert faster.

Browse Source
This commit is contained in:
defnax 2016-12-14 15:20:03 +01:00
parent f3c4de2d3c
commit 96b6cd3d34
4 changed files with 108 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/HomePage.cpp
View File

@ -24,6 +24,7 @@
#include "gui/notifyqt.h" #include "gui/notifyqt.h"
#include "gui/msgs/MessageComposer.h" #include "gui/msgs/MessageComposer.h"
#include "gui/connect/ConnectFriendWizard.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QUrlQuery> #include <QUrlQuery>
@ -48,6 +49,8 @@ HomePage::HomePage(QWidget *parent) :
updateOwnCert(); updateOwnCert();
connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend()));
QAction *CopyAction = new QAction(QIcon(),tr("Copy your Cert to Clipboard"), this); QAction *CopyAction = new QAction(QIcon(),tr("Copy your Cert to Clipboard"), this);
connect(CopyAction, SIGNAL(triggered()), this, SLOT(copyCert())); connect(CopyAction, SIGNAL(triggered()), this, SLOT(copyCert()));
@ -135,3 +138,11 @@ void HomePage::saveCert()
ts << ui->userCertEdit->document()->toPlainText(); ts << ui->userCertEdit->document()->toPlainText();
} }
/** Add a Friends Text Certificate */
void HomePage::addFriend()
{
ConnectFriendWizard connwiz (this);
connwiz.setStartId(ConnectFriendWizard::Page_Text);
connwiz.exec ();
}

2
retroshare-gui/src/gui/HomePage.h
View File

@ -53,7 +53,7 @@ private slots:
void runEmailClient(); void runEmailClient();
void copyCert(); void copyCert();
void saveCert(); void saveCert();
void addFriend();
private: private:
Ui::HomePage *ui; Ui::HomePage *ui;

158
retroshare-gui/src/gui/HomePage.ui
View File

@ -6,49 +6,34 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>771</width> <width>886</width>
<height>560</height> <height>584</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="1"> <item row="0" column="0" colspan="4">
<widget class="QFrame" name="addFrame"> <widget class="QLabel" name="label">
<layout class="QGridLayout" name="gridLayout_3"> <property name="sizePolicy">
<property name="leftMargin"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<number>0</number> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="topMargin"> </sizepolicy>
<number>0</number> </property>
</property> <property name="text">
<property name="rightMargin"> <string/>
<number>0</number> </property>
</property> <property name="pixmap">
<property name="bottomMargin"> <pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
<number>0</number> </property>
</property> <property name="alignment">
</layout> <set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" rowspan="2"> <item row="3" column="1" colspan="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>268</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="topMargin"> <property name="topMargin">
<number>9</number> <number>9</number>
@ -59,7 +44,7 @@
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>2</number> <number>2</number>
</property> </property>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="userCertLabel"> <widget class="QLabel" name="userCertLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -80,7 +65,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QToolButton" name="shareButton"> <widget class="QToolButton" name="shareButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -112,7 +97,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QPlainTextEdit" name="userCertEdit"> <widget class="QPlainTextEdit" name="userCertEdit">
<property name="font"> <property name="font">
<font> <font>
@ -122,6 +107,9 @@
<property name="whatsThis"> <property name="whatsThis">
<string/> <string/>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="lineWrapMode"> <property name="lineWrapMode">
<enum>QPlainTextEdit::NoWrap</enum> <enum>QPlainTextEdit::NoWrap</enum>
</property> </property>
@ -138,36 +126,25 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="2" rowspan="2"> <item row="4" column="1">
<spacer name="horizontalSpacer_2"> <widget class="QFrame" name="addFrame">
<property name="orientation"> <layout class="QGridLayout" name="gridLayout_3">
<enum>Qt::Horizontal</enum> <property name="leftMargin">
</property> <number>0</number>
<property name="sizeType"> </property>
<enum>QSizePolicy::Expanding</enum> <property name="topMargin">
</property> <number>0</number>
<property name="sizeHint" stdset="0"> </property>
<size> <property name="rightMargin">
<width>20</width> <number>0</number>
<height>288</height> </property>
</size> <property name="bottomMargin">
</property> <number>0</number>
</spacer> </property>
</item> </layout>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="1" colspan="2">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="font"> <property name="font">
<font> <font>
@ -184,6 +161,53 @@ private and secure decentralized commmunication platform.
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2">
<widget class="QFrame" name="addframe">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>You get certificate from your friend?</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="addButton">
<property name="text">
<string>Add friends certificate</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/png/invite.png</normaloff>:/icons/png/invite.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

5
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -681,3 +681,8 @@ HomePage QPlainTextEdit#friendCertEdit {
background: white; background: white;
} }
HomePage QFrame#addframe{
border: 2px solid #0099cc;
border-radius: 6px;
background: white;
}