Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Home page ui improvements

Browse Source 
* some ui improvements
* Fixed the help link
This commit is contained in:
defnax 2021-02-04 21:50:30 +01:00
parent 104facdfe2
commit af55623ecf
3 changed files with 317 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ HomePage::HomePage(QWidget *parent) :
updateCertificate(); updateCertificate();
connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend())); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend()));
connect(ui->copyIDButton, SIGNAL(clicked()), this, SLOT(copyId()));
QAction *WebMailAction = new QAction(QIcon(),tr("Invite via WebMail"), this); QAction *WebMailAction = new QAction(QIcon(),tr("Invite via WebMail"), this);
connect(WebMailAction, SIGNAL(triggered()), this, SLOT(webMail())); connect(WebMailAction, SIGNAL(triggered()), this, SLOT(webMail()));
@ -343,7 +344,7 @@ void HomePage::webMail()
void HomePage::openWebHelp() void HomePage::openWebHelp()
{ {
QDesktopServices::openUrl(QUrl(QString("https://retroshare.readthedocs.io"))); QDesktopServices::openUrl(QUrl(QString("https://retroshare.readthedocs.io/en/latest/")));
} }
void HomePage::toggleUseOldFormat() void HomePage::toggleUseOldFormat()

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

@ -14,25 +14,6 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/logo/logo_web_nobackground.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="font"> <property name="font">
@ -50,23 +31,7 @@ private and secure decentralized communication platform.
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" rowspan="4"> <item row="2" column="2" rowspan="6">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>94</width>
<height>408</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2" rowspan="4">
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -82,73 +47,57 @@ private and secure decentralized communication platform.
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0" rowspan="6">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>94</width>
<height>408</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QFrame" name="addframe"> <widget class="QLabel" name="label_3">
<property name="sizePolicy"> <property name="font">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <font>
<horstretch>0</horstretch> <pointsize>11</pointsize>
<verstretch>0</verstretch> </font>
</sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <property name="text">
<item> <string>Did you receive a Retroshare id from a friend?</string>
<widget class="QLabel" name="label_3"> </property>
<property name="font"> <property name="alignment">
<font> <set>Qt::AlignCenter</set>
<pointsize>11</pointsize> </property>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Did you receive a Retroshare id from a friend?</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="addButton">
<property name="text">
<string>Add friend</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> </widget>
</item> </item>
<item row="4" column="1"> <item row="6" column="1">
<widget class="QFrame" name="helpframe"> <widget class="QFrame" name="helpframe">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -160,24 +109,12 @@ private and secure decentralized communication platform.
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Do you need help with Retroshare?</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="openwebhelp"> <widget class="QToolButton" name="openwebhelp">
<property name="text"> <property name="text">
@ -201,131 +138,263 @@ private and secure decentralized communication platform.
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/logo/logo_web_nobackground.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QFrame" name="addframe">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="addButton">
<property name="text">
<string>Add friend</string>
</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>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<spacer name="verticalSpacer"> <widget class="QLabel" name="label_4">
<property name="orientation"> <property name="font">
<enum>Qt::Vertical</enum> <font>
<pointsize>11</pointsize>
</font>
</property> </property>
<property name="sizeType"> <property name="text">
<enum>QSizePolicy::Expanding</enum> <string>Do you need help with Retroshare?</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="alignment">
<size> <set>Qt::AlignCenter</set>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<layout class="QGridLayout" name="gridLayout"> <widget class="QFrame" name="">
<property name="horizontalSpacing"> <layout class="QGridLayout" name="gridLayout">
<number>6</number> <property name="leftMargin">
</property> <number>0</number>
<property name="verticalSpacing"> </property>
<number>0</number> <property name="topMargin">
</property> <number>0</number>
<item row="2" column="0"> </property>
<widget class="QLabel" name="retroshareid"> <property name="rightMargin">
<property name="sizePolicy"> <number>0</number>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="bottomMargin">
<verstretch>0</verstretch> <number>6</number>
</sizepolicy> </property>
</property> <property name="horizontalSpacing">
<property name="font"> <number>6</number>
<font> </property>
<family>Courier New</family> <property name="verticalSpacing">
<pointsize>10</pointsize> <number>0</number>
<weight>75</weight> </property>
<bold>true</bold> <item row="1" column="5" rowspan="2">
</font> <spacer name="horizontalSpacer_5">
</property> <property name="orientation">
<property name="contextMenuPolicy"> <enum>Qt::Horizontal</enum>
<enum>Qt::DefaultContextMenu</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="text"> <size>
<string/> <width>40</width>
</property> <height>20</height>
<property name="wordWrap"> </size>
<bool>false</bool> </property>
</property> </spacer>
<property name="textInteractionFlags"> </item>
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <item row="2" column="3">
</property> <widget class="QToolButton" name="shareButton">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<item row="0" column="2"> <horstretch>0</horstretch>
<widget class="QToolButton" name="shareButton"> <verstretch>0</verstretch>
<property name="sizePolicy"> </sizepolicy>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> <property name="focusPolicy">
<verstretch>0</verstretch> <enum>Qt::NoFocus</enum>
</sizepolicy> </property>
</property> <property name="toolTip">
<property name="focusPolicy"> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<enum>Qt::NoFocus</enum> </property>
</property> <property name="icon">
<property name="toolTip"> <iconset resource="icons.qrc">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <normaloff>:/icons/svg/share.svg</normaloff>:/icons/svg/share.svg</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="icons.qrc"> <size>
<normaloff>:/icons/svg/share.svg</normaloff>:/icons/svg/share.svg</iconset> <width>24</width>
</property> <height>24</height>
<property name="iconSize"> </size>
<size> </property>
<width>24</width> <property name="popupMode">
<height>24</height> <enum>QToolButton::InstantPopup</enum>
</size> </property>
</property> <property name="autoRaise">
<property name="popupMode"> <bool>true</bool>
<enum>QToolButton::InstantPopup</enum> </property>
</property> </widget>
<property name="autoRaise"> </item>
<bool>true</bool> <item row="0" column="2" rowspan="2">
</property> <widget class="QLabel" name="userCertLabel">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<item row="0" column="0" colspan="2"> <horstretch>0</horstretch>
<widget class="QLabel" name="userCertLabel"> <verstretch>0</verstretch>
<property name="sizePolicy"> </sizepolicy>
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="font">
<verstretch>0</verstretch> <font>
</sizepolicy> <pointsize>11</pointsize>
</property> </font>
<property name="font"> </property>
<font> <property name="text">
<pointsize>11</pointsize> <string>This is your Retroshare ID. Copy and share with your friends!</string>
</font> </property>
</property> <property name="alignment">
<property name="text"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<string>This is your Retroshare ID. Copy and share with your friends!</string> </property>
</property> </widget>
<property name="alignment"> </item>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <item row="2" column="1">
</property> <widget class="QToolButton" name="copyIDButton">
</widget> <property name="text">
</item> <string>...</string>
<item row="0" column="3"> </property>
<widget class="QToolButton" name="helpButton"> <property name="icon">
<property name="text"> <iconset resource="icons.qrc">
<string>...</string> <normaloff>:/icons/png/copy.png</normaloff>:/icons/png/copy.png</iconset>
</property> </property>
<property name="icon"> </widget>
<iconset resource="icons.qrc"> </item>
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset> <item row="2" column="2">
</property> <widget class="QLabel" name="retroshareid">
<property name="checkable"> <property name="sizePolicy">
<bool>true</bool> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</property> <horstretch>0</horstretch>
<property name="autoRaise"> <verstretch>0</verstretch>
<bool>true</bool> </sizepolicy>
</property> </property>
</widget> <property name="font">
</item> <font>
</layout> <family>Courier New</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>67</width>
<height>68</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="4">
<widget class="QToolButton" name="helpButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

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

@ -802,24 +802,12 @@ HomePage QPlainTextEdit#userCertEdit {
background: transparent; background: transparent;
} }
HomePage QFrame#addframe{
border: 2px solid #0099cc;
border-radius: 6px;
background: white;
}
ConnectFriendWizard QFrame#friendFrame { ConnectFriendWizard QFrame#friendFrame {
border: 2px solid #0099cc; border: 2px solid #0099cc;
border-radius: 6px; border-radius: 6px;
background: white; background: white;
} }
HomePage QFrame#helpframe{
border: 2px solid #009933;
border-radius: 6px;
background: white;
}
StartDialog QPushButton#loadButton { StartDialog QPushButton#loadButton {
border-image: url(:/images/btn_blue.png) 4; border-image: url(:/images/btn_blue.png) 4;
border-width: 4; border-width: 4;
@ -1191,3 +1179,20 @@ BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel {
font: bold; font: bold;
} }
HomePage QToolButton#addButton {
font: bold;
font-size: 15pt;
color: white;
background: #0099cc;
border-radius: 4px;
max-height: 27px;
min-width: 4em;
padding: 2px;
}
HomePage QToolButton#addButton:hover {
background: #03b1f3;
border-radius: 4px;
min-width: 4em;
padding: 2px;
}