diff --git a/retroshare-gui/src/gui/CreateMsgLinkDialog.ui b/retroshare-gui/src/gui/CreateMsgLinkDialog.ui index e7322cb79..efbfeaba8 100644 --- a/retroshare-gui/src/gui/CreateMsgLinkDialog.ui +++ b/retroshare-gui/src/gui/CreateMsgLinkDialog.ui @@ -32,12 +32,6 @@ - - - Tahoma - 9 - - QFrame::StyledPanel @@ -47,11 +41,6 @@ - - - 10 - - <html><head/><body><p align="justify">To create a private chat invite for a non-friend person, select his key below and a validity time for your invite, then press &quot;Create&quot;. The invite will contain the information required to open a tunnel to chat with you. </p><p align="justify">The invite is encrypted, and does not reveal your identity. Only the selected peer can decrypt the link, and use it to contact you.</p></body></html> diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui index 7ef0ec270..5bb73fd18 100644 --- a/retroshare-gui/src/gui/ShareManager.ui +++ b/retroshare-gui/src/gui/ShareManager.ui @@ -208,7 +208,7 @@ - + @@ -273,12 +273,6 @@ - - - Tahoma - 11 - - true @@ -302,6 +296,11 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
HeaderFrame QFrame diff --git a/retroshare-gui/src/gui/common/HeaderFrame.ui b/retroshare-gui/src/gui/common/HeaderFrame.ui index 2257060cd..7418e6ae6 100644 --- a/retroshare-gui/src/gui/common/HeaderFrame.ui +++ b/retroshare-gui/src/gui/common/HeaderFrame.ui @@ -67,12 +67,7 @@
- - - - 18 - - + Header text @@ -93,6 +88,13 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index 8a5643fac..c7b6c4c78 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -30,13 +30,6 @@ - - - 12 - 50 - false - - &Enter the certificate manually @@ -44,11 +37,6 @@ - - - 12 - - &You get a certificate file from your friend @@ -56,11 +44,6 @@ - - - 12 - - &Make friend with selected friends of my friends @@ -68,11 +51,6 @@ - - - 12 - - &Enter RetroShare ID manually @@ -80,11 +58,6 @@ - - - 12 - - &Send an Invitation by Email (She/He receives an email with instructions how to to download RetroShare) @@ -93,11 +66,6 @@ - - - 12 - - Recommend many friends to each others @@ -118,11 +86,6 @@ - - - 9 - - The text below is your PGP certificate. You have to provide it to your friend @@ -135,7 +98,6 @@ Courier New - 10 @@ -290,11 +252,6 @@ - - - 9 - - Please, paste your friends PGP certificate into the box below @@ -307,7 +264,6 @@ Courier New - 10 @@ -586,12 +542,7 @@ - - - - 12 - - + You have a friend request from @@ -766,12 +717,7 @@ - - - - 12 - - + To accept the Friend Request, click the Finish button. @@ -824,12 +770,76 @@ - - - - Tahoma - 11 - + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 178 + + + + + + + 255 + 255 + 178 + + + + + + + + true + + + QFrame::Box 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. @@ -1091,12 +1101,23 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
AvatarWidget QLabel
gui/common/AvatarWidget.h
1
+ + FriendSelectionWidget + QWidget +
gui/common/FriendSelectionWidget.h
+ 1 +
DropLineEdit QLineEdit @@ -1108,17 +1129,9 @@
gui/connect/ConnectFriendWizard.h
1
- - FriendSelectionWidget - QWidget -
gui/common/FriendSelectionWidget.h
- 1 -
- - diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 564ce27f1..14aef61cb 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -809,7 +809,6 @@
- 10 75 true diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index cf3aca435..a98129c38 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -24,47 +24,47 @@ QLabel#toasterLabel font-weight: bold; } -ChatWidget QFrame#titleBarFrame QLabel#titleLabel, ChatWidget QFrame#titleBarFrame QLabel#statusLabel +ChatWidget QLabel#titleLabel, ChatWidget QLabel#statusLabel { qproperty-fontSizeFactor: 125; } -FriendsDialog QFrame#headFrame QLabel#nicknameLabel +FriendsDialog QLabel#nicknameLabel { qproperty-fontSizeFactor: 200; } -ChatMsgItem QFrame#frame QLabel#peerNameLabel +ChatMsgItem QLabel#peerNameLabel { qproperty-fontSizeFactor: 175; } -PeerItem QFrame#frame QFrame#peerFrame QLabel#peerNameLabel +PeerItem QLabel#peerNameLabel { 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; } -PostedItem QFrame#frame QLabel#titleLabel +PostedItem QLabel#titleLabel { qproperty-fontSizeFactor: 150; } -PostedItem QFrame#frame QLabel#scoreLabel +PostedItem QLabel#scoreLabel { qproperty-fontSizeFactor: 250; } -GxsChannelPostItem QFrame#frame QLabel#titleLabel +GxsChannelPostItem QLabel#titleLabel { qproperty-fontSizeFactor: 125; } -PluginItem QFrame#frame QLabel#subjectLabel +PluginItem QLabel#subjectLabel { qproperty-fontSizeFactor: 125; } @@ -74,21 +74,46 @@ RSettingsWin QLabel#pageName qproperty-fontSizeFactor: 125; } -ConfCertDialog QFrame#frame QTabWidget QWidget QLabel#servicePermissionsLabel +ConfCertDialog QLabel#servicePermissionsLabel { qproperty-fontSizeFactor: 125; } -GxsChannelPostsWidget QFrame#headFrame QLabel#nameLabel +GxsChannelPostsWidget QLabel#nameLabel { qproperty-fontSizeFactor: 250; } -CreateLobbyDialog QFrame#frame QLabel#lobbyInfoLabel +CreateLobbyDialog QLabel#lobbyInfoLabel { 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 */ ForumsDialog, GxsForumThreadWidget diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 406b5c466..51f9d3677 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -33,7 +33,7 @@ - + 16 @@ -46,10 +46,9 @@ - + - 11 75 true @@ -365,7 +364,7 @@ - + 16 @@ -381,10 +380,9 @@ - + - 11 75 true @@ -511,9 +509,15 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
-