Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2297 from defnax/ui-fixes-v8

Browse source 
Look and feel fixes for notify page & home page update info description
This commit is contained in:
defnax 2021-02-07 11:33:50 +01:00 • committed by GitHub
commit 0068e69ad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 110 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/HomePage.cpp
View file

@ -108,9 +108,9 @@ HomePage::HomePage(QWidget *parent) :
<div align=center>\ <div align=center>\
<IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \ <IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \
</div>\ </div>\
<p>To do so, copy your certificate on this page and send it to friends, and add your friends' certificate.</p> \ <p>To do so, copy your Retroshare ID on this page and send it to friends, and add your friends' Retroshare ID.</p> \
<p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \ <p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \
certificates with a dedicated Retroshare node, through which\ Retroshare ID with a dedicated Retroshare node, through which\
you will be able to anonymously meet other people.</p> ").arg(QString::number(2*S)).arg(width()*0.5); you will be able to anonymously meet other people.</p> ").arg(QString::number(2*S)).arg(width()*0.5);
registerHelpButton(ui->helpButton,help_str,"HomePage") ; registerHelpButton(ui->helpButton,help_str,"HomePage") ;

196
retroshare-gui/src/gui/settings/NotifyPage.ui
View file

@ -267,13 +267,6 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="testToasterVLayout"> <layout class="QVBoxLayout" name="testToasterVLayout">
<item>
<widget class="QPushButton" name="testToasterButton">
<property name="text">
<string>Test</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="testToasterVSpacer"> <spacer name="testToasterVSpacer">
<property name="orientation"> <property name="orientation">
@ -292,83 +285,114 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="positionGLayout"> <widget class="QGroupBox" name="groupBox">
<item row="1" column="0"> <property name="title">
<widget class="QLabel" name="labelToasterPosition"> <string>Toaster position</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <layout class="QGridLayout" name="positionGLayout">
<horstretch>0</horstretch> <property name="leftMargin">
<verstretch>0</verstretch> <number>9</number>
</sizepolicy> </property>
</property> <property name="topMargin">
<property name="text"> <number>9</number>
<string>Position</string> </property>
</property> <property name="rightMargin">
</widget> <number>9</number>
</item> </property>
<item row="1" column="1" colspan="3"> <property name="bottomMargin">
<widget class="QComboBox" name="comboBoxToasterPosition"> <number>9</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <item row="1" column="5">
<horstretch>0</horstretch> <spacer name="horizontalSpacer">
<verstretch>0</verstretch> <property name="orientation">
</sizepolicy> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="2" column="0"> <width>40</width>
<widget class="QLabel" name="labelToasterXMargin"> <height>20</height>
<property name="sizePolicy"> </size>
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> </spacer>
<verstretch>0</verstretch> </item>
</sizepolicy> <item row="1" column="0">
</property> <widget class="QLabel" name="labelToasterPosition">
<property name="text"> <property name="text">
<string>X Margin</string> <string>Position</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="0">
<widget class="QSpinBox" name="spinBoxToasterXMargin"> <widget class="QLabel" name="labelToasterXMargin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximum"> <property name="text">
<number>20</number> <string>X Margin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="3" column="0">
<widget class="QLabel" name="labelToasterYMargin"> <widget class="QLabel" name="labelToasterYMargin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Y Margin</string> <string>Y Margin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="2" column="1" colspan="2">
<widget class="QSpinBox" name="spinBoxToasterYMargin"> <widget class="QSpinBox" name="spinBoxToasterXMargin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>20</number> <number>20</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="3" column="1" colspan="2">
<widget class="QSpinBox" name="spinBoxToasterYMargin">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>20</number>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="testToasterButton">
<property name="text">
<string>Test</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3">
<widget class="QComboBox" name="comboBoxToasterPosition">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<spacer name="tabToastersVSpacer"> <spacer name="tabToastersVSpacer">
@ -448,7 +472,6 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>notify_Peers</tabstop> <tabstop>notify_Peers</tabstop>
<tabstop>notify_Channels</tabstop> <tabstop>notify_Channels</tabstop>
<tabstop>notify_Forums</tabstop> <tabstop>notify_Forums</tabstop>
@ -467,10 +490,7 @@
<tabstop>popup_GroupChat</tabstop> <tabstop>popup_GroupChat</tabstop>
<tabstop>popup_ChatLobby</tabstop> <tabstop>popup_ChatLobby</tabstop>
<tabstop>popup_ConnectAttempt</tabstop> <tabstop>popup_ConnectAttempt</tabstop>
<tabstop>testToasterButton</tabstop>
<tabstop>comboBoxToasterPosition</tabstop>
<tabstop>spinBoxToasterXMargin</tabstop> <tabstop>spinBoxToasterXMargin</tabstop>
<tabstop>spinBoxToasterYMargin</tabstop>
<tabstop>systray_GroupChat</tabstop> <tabstop>systray_GroupChat</tabstop>
<tabstop>systray_ChatLobby</tabstop> <tabstop>systray_ChatLobby</tabstop>
<tabstop>pushButtonDisableAll</tabstop> <tabstop>pushButtonDisableAll</tabstop>