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

Moved font size definitions from ui files to default qss.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-08 00:08:35 +00:00
parent b7e94fce99
commit 24567d3d90
7 changed files with 145 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/CreateMsgLinkDialog.ui
View File

@ -32,12 +32,6 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QFrame" name="_new_link_F"> <widget class="QFrame" name="_new_link_F">
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>9</pointsize>
</font>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -47,11 +41,6 @@
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QLabel" name="distantchatinfo_label"> <widget class="QLabel" name="distantchatinfo_label">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;To create a private chat invite for a non-friend person, select his key below and a validity time for your invite, then press &amp;quot;Create&amp;quot;. The invite will contain the information required to open a tunnel to chat with you. &lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;The invite is encrypted, and does not reveal your identity. Only the selected peer can decrypt the link, and use it to contact you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;To create a private chat invite for a non-friend person, select his key below and a validity time for your invite, then press &amp;quot;Create&amp;quot;. The invite will contain the information required to open a tunnel to chat with you. &lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;The invite is encrypted, and does not reveal your identity. Only the selected peer can decrypt the link, and use it to contact you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>

13
retroshare-gui/src/gui/ShareManager.ui
View File

@ -208,7 +208,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="5"> <item row="0" column="0" colspan="5">
<widget class="QLabel" name="labelInstructions"> <widget class="StyledLabel" name="labelInstructions">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
@ -273,12 +273,6 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>11</pointsize>
</font>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -302,6 +296,11 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>HeaderFrame</class> <class>HeaderFrame</class>
<extends>QFrame</extends> <extends>QFrame</extends>

14
retroshare-gui/src/gui/common/HeaderFrame.ui
View File

@ -67,12 +67,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="headerLabel"> <widget class="StyledLabel" name="headerLabel">
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string notr="true">Header text</string> <string notr="true">Header text</string>
</property> </property>
@ -93,6 +88,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

153
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -30,13 +30,6 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QRadioButton" name="textRadioButton"> <widget class="QRadioButton" name="textRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>&amp;Enter the certificate manually</string> <string>&amp;Enter the certificate manually</string>
</property> </property>
@ -44,11 +37,6 @@
</item> </item>
<item> <item>
<widget class="QRadioButton" name="certRadioButton"> <widget class="QRadioButton" name="certRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>&amp;You get a certificate file from your friend</string> <string>&amp;You get a certificate file from your friend</string>
</property> </property>
@ -56,11 +44,6 @@
</item> </item>
<item> <item>
<widget class="QRadioButton" name="foffRadioButton"> <widget class="QRadioButton" name="foffRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>&amp;Make friend with selected friends of my friends</string> <string>&amp;Make friend with selected friends of my friends</string>
</property> </property>
@ -68,11 +51,6 @@
</item> </item>
<item> <item>
<widget class="QRadioButton" name="rsidRadioButton"> <widget class="QRadioButton" name="rsidRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>&amp;Enter RetroShare ID manually</string> <string>&amp;Enter RetroShare ID manually</string>
</property> </property>
@ -80,11 +58,6 @@
</item> </item>
<item> <item>
<widget class="QRadioButton" name="emailRadioButton"> <widget class="QRadioButton" name="emailRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>&amp;Send an Invitation by Email <string>&amp;Send an Invitation by Email
(She/He receives an email with instructions how to to download RetroShare)</string> (She/He receives an email with instructions how to to download RetroShare)</string>
@ -93,11 +66,6 @@
</item> </item>
<item> <item>
<widget class="QRadioButton" name="friendRecommendationsRadioButton"> <widget class="QRadioButton" name="friendRecommendationsRadioButton">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Recommend many friends to each others</string> <string>Recommend many friends to each others</string>
</property> </property>
@ -118,11 +86,6 @@
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QLabel" name="userCertLabel"> <widget class="QLabel" name="userCertLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>The text below is your PGP certificate. You have to provide it to your friend</string> <string>The text below is your PGP certificate. You have to provide it to your friend</string>
</property> </property>
@ -135,7 +98,6 @@
<property name="font"> <property name="font">
<font> <font>
<family>Courier New</family> <family>Courier New</family>
<pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="lineWrapMode"> <property name="lineWrapMode">
@ -290,11 +252,6 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="friendCertLabel"> <widget class="QLabel" name="friendCertLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Please, paste your friends PGP certificate into the box below</string> <string>Please, paste your friends PGP certificate into the box below</string>
</property> </property>
@ -307,7 +264,6 @@
<property name="font"> <property name="font">
<font> <font>
<family>Courier New</family> <family>Courier New</family>
<pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="lineWrapMode"> <property name="lineWrapMode">
@ -586,12 +542,7 @@
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
<item> <item>
<widget class="QLabel" name="fr_label"> <widget class="StyledLabel" name="fr_label">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string notr="true">You have a friend request from</string> <string notr="true">You have a friend request from</string>
</property> </property>
@ -766,12 +717,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="requestinfolabel"> <widget class="StyledLabel" name="requestinfolabel">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>To accept the Friend Request, click the Finish button.</string> <string>To accept the Friend Request, click the Finish button.</string>
</property> </property>
@ -824,12 +770,76 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_18"> <layout class="QVBoxLayout" name="verticalLayout_18">
<item> <item>
<widget class="QLabel" name="makefriend_infolabel"> <widget class="StyledLabel" name="makefriend_infolabel">
<property name="font"> <property name="palette">
<font> <palette>
<family>Tahoma</family> <active>
<pointsize>11</pointsize> <colorrole role="Base">
</font> <brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add to many friends. You can add as many friends as you like, but more than 40 will probably require too much resources.</string> <string>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add to many friends. You can add as many friends as you like, but more than 40 will probably require too much resources.</string>
@ -1091,12 +1101,23 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>AvatarWidget</class> <class>AvatarWidget</class>
<extends>QLabel</extends> <extends>QLabel</extends>
<header>gui/common/AvatarWidget.h</header> <header>gui/common/AvatarWidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendSelectionWidget.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>DropLineEdit</class> <class>DropLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
@ -1108,17 +1129,9 @@
<header>gui/connect/ConnectFriendWizard.h</header> <header>gui/connect/ConnectFriendWizard.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendSelectionWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

1
retroshare-gui/src/gui/msgs/MessageComposer.ui
View File

@ -809,7 +809,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>

49
retroshare-gui/src/gui/qss/stylesheet/qss.default
View File

@ -24,47 +24,47 @@ QLabel#toasterLabel
font-weight: bold; font-weight: bold;
} }
ChatWidget QFrame#titleBarFrame QLabel#titleLabel, ChatWidget QFrame#titleBarFrame QLabel#statusLabel ChatWidget QLabel#titleLabel, ChatWidget QLabel#statusLabel
{ {
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
FriendsDialog QFrame#headFrame QLabel#nicknameLabel FriendsDialog QLabel#nicknameLabel
{ {
qproperty-fontSizeFactor: 200; qproperty-fontSizeFactor: 200;
} }
ChatMsgItem QFrame#frame QLabel#peerNameLabel ChatMsgItem QLabel#peerNameLabel
{ {
qproperty-fontSizeFactor: 175; qproperty-fontSizeFactor: 175;
} }
PeerItem QFrame#frame QFrame#peerFrame QLabel#peerNameLabel PeerItem QLabel#peerNameLabel
{ {
qproperty-fontSizeFactor: 175; qproperty-fontSizeFactor: 175;
} }
SecurityItem QFrame#frame QFrame#headFrame QLabel#peerNameLabel, SecurityItem QFrame#frame QFrame#headFrame QLabel#requestLabel SecurityItem QLabel#peerNameLabel, SecurityItem QLabel#requestLabel
{ {
qproperty-fontSizeFactor: 175; qproperty-fontSizeFactor: 175;
} }
PostedItem QFrame#frame QLabel#titleLabel PostedItem QLabel#titleLabel
{ {
qproperty-fontSizeFactor: 150; qproperty-fontSizeFactor: 150;
} }
PostedItem QFrame#frame QLabel#scoreLabel PostedItem QLabel#scoreLabel
{ {
qproperty-fontSizeFactor: 250; qproperty-fontSizeFactor: 250;
} }
GxsChannelPostItem QFrame#frame QLabel#titleLabel GxsChannelPostItem QLabel#titleLabel
{ {
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
PluginItem QFrame#frame QLabel#subjectLabel PluginItem QLabel#subjectLabel
{ {
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
@ -74,21 +74,46 @@ RSettingsWin QLabel#pageName
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
ConfCertDialog QFrame#frame QTabWidget QWidget QLabel#servicePermissionsLabel ConfCertDialog QLabel#servicePermissionsLabel
{ {
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
GxsChannelPostsWidget QFrame#headFrame QLabel#nameLabel GxsChannelPostsWidget QLabel#nameLabel
{ {
qproperty-fontSizeFactor: 250; qproperty-fontSizeFactor: 250;
} }
CreateLobbyDialog QFrame#frame QLabel#lobbyInfoLabel CreateLobbyDialog QLabel#lobbyInfoLabel
{ {
qproperty-fontSizeFactor: 150; qproperty-fontSizeFactor: 150;
} }
HeaderFrame QLabel#headerLabel
{
qproperty-fontSizeFactor: 225;
}
ConnectFrientWizard QLabel#fr_label, ConnectFrientWizard QLabel#requestinfolabel
{
qproperty-fontSizeFactor: 150;
}
ConnectFriendWizard QLabel#makefriend_infolabel
{
qproperty-fontSizeFactor: 125;
}
ShareManager QLabel#labelInstructions
{
qproperty-fontSizeFactor: 125;
}
CryptoPage QLabel#publicLabel, CryptoPage QLabel#otherLabel
{
qproperty-fontSizeFactor: 125;
}
/* Color definitions */ /* Color definitions */
ForumsDialog, GxsForumThreadWidget ForumsDialog, GxsForumThreadWidget

18
retroshare-gui/src/gui/settings/CryptoPage.ui
View File

@ -33,7 +33,7 @@
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="publicIcon">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
@ -46,10 +46,9 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_5"> <widget class="StyledLabel" name="publicLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>11</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
@ -365,7 +364,7 @@
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="otherIcon">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
@ -381,10 +380,9 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_13"> <widget class="StyledLabel" name="otherLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>11</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
@ -511,9 +509,15 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>