diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index 8f8e8f29d..e0c2182c4 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -73,7 +73,6 @@ - 12 75 true @@ -191,11 +190,6 @@ - - - 11 - - 16 @@ -464,7 +458,7 @@ LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
RSTreeWidget diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index a8e8217fc..02408e382 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -102,7 +102,7 @@ Qt::NoFocus
- + :/icons/help_64.png:/icons/help_64.png @@ -132,10 +132,10 @@ - QFrame::StyledPanel + QFrame::Box - QFrame::Raised + QFrame::Sunken @@ -401,8 +401,8 @@ - + diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 5de0fa6fe..e716577b8 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -43,7 +43,6 @@ Courier New - 10 75 true @@ -88,7 +87,6 @@ - 11 75 true @@ -107,7 +105,7 @@ ... - + :/icons/help_64.png:/icons/help_64.png @@ -233,11 +231,6 @@
- - - 12 - - Open Source cross-platform, private and secure decentralized communication platform. @@ -317,11 +310,6 @@ private and secure decentralized communication platform. - - - 11 - - @@ -405,11 +393,6 @@ private and secure decentralized communication platform. - - - 11 - - Do you need help with Retroshare? @@ -424,8 +407,8 @@ private and secure decentralized communication platform. - + diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index ee28522e3..edf3e8bcf 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -91,7 +91,6 @@ - 12 75 true @@ -218,11 +217,6 @@ 0 - - - 11 - - Qt::CustomContextMenu @@ -301,8 +295,8 @@ 0 0 - 505 - 703 + 513 + 764
@@ -1018,11 +1012,6 @@ border-image: url(:/images/closepressed.png) - - - 11 - - Qt::CustomContextMenu @@ -1083,7 +1072,12 @@ border-image: url(:/images/closepressed.png) LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
+
+ + RSComboBox + QComboBox +
gui/common/RSComboBox.h
RSTreeWidget @@ -1094,11 +1088,7 @@ border-image: url(:/images/closepressed.png) ElidedLabel QLabel
gui/common/ElidedLabel.h
-
- - RSComboBox - QComboBox -
gui/common/RSComboBox.h
+ 1
RSTextBrowser diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui index 55a7145e0..796593dfd 100644 --- a/retroshare-gui/src/gui/MainWindow.ui +++ b/retroshare-gui/src/gui/MainWindow.ui @@ -33,11 +33,6 @@ 0 - - - 12 - - QFrame::NoFrame @@ -157,7 +152,7 @@ - + :/images/kcmsystem24.png:/images/kcmsystem24.png diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui index 32a679a74..d6ae3aaa4 100644 --- a/retroshare-gui/src/gui/NewsFeed.ui +++ b/retroshare-gui/src/gui/NewsFeed.ui @@ -70,7 +70,6 @@ - 12 75 true diff --git a/retroshare-gui/src/gui/Posted/PhotoView.ui b/retroshare-gui/src/gui/Posted/PhotoView.ui index e1e7a21e5..31db767c9 100644 --- a/retroshare-gui/src/gui/Posted/PhotoView.ui +++ b/retroshare-gui/src/gui/Posted/PhotoView.ui @@ -22,7 +22,6 @@ MS Sans Serif - 11 75 true true @@ -103,7 +102,6 @@ MS Sans Serif - 9 50 false @@ -114,7 +112,7 @@
- + 24 @@ -134,7 +132,6 @@ MS Sans Serif - 11 75 true true @@ -150,7 +147,6 @@ MS Sans Serif - 9 @@ -163,7 +159,6 @@ MS Sans Serif - 9 @@ -209,17 +204,17 @@
+ + AvatarWidget + QLabel +
gui/common/AvatarWidget.h
+ 1 +
GxsIdLabel QLabel
gui/gxs/GxsIdLabel.h
- - AvatarWidget - QWidget -
gui/common/AvatarWidget.h
- 1 -
AspectRatioPixmapLabel QLabel diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index 24d570b16..cbf5ae7f4 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -262,7 +262,6 @@ - 11 75 true true @@ -726,17 +725,17 @@ - - GxsIdLabel - QLabel -
gui/gxs/GxsIdLabel.h
-
ElidedLabel QLabel
gui/common/ElidedLabel.h
1
+ + GxsIdLabel + QLabel +
gui/gxs/GxsIdLabel.h
+
ZoomableLabel QLabel @@ -744,9 +743,9 @@
- - + + diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index 8c491caeb..dd037adf4 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -345,8 +345,8 @@ The current identities/locations will not be affected. <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">New Profile/Node</span></a></p></body></html> +</style></head><body style=" font-family:'Sans'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#0000ff;">New Profile/Node</span></a></p></body></html>
@@ -370,8 +370,8 @@ p, li { white-space: pre-wrap; }
- + diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui index 065c9013b..a9bc8b407 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui @@ -38,11 +38,6 @@ 0 - - - 11 - - Qt::CustomContextMenu @@ -71,7 +66,7 @@ LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
RSTreeWidget diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui index 029d71fb9..10b5eb48b 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui @@ -70,11 +70,6 @@ 0 - - - 11 - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/common/NewFriendList.ui b/retroshare-gui/src/gui/common/NewFriendList.ui index 4bd4dfdc6..286cf4304 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.ui +++ b/retroshare-gui/src/gui/common/NewFriendList.ui @@ -58,11 +58,6 @@ - - - 12 - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui index de580d7e5..cd4a7c401 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.ui +++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui @@ -6,7 +6,7 @@ 0 0 - 698 + 738 539 @@ -59,11 +59,6 @@ 0 - - - 9 - - Qt::LeftToRight @@ -211,11 +206,6 @@ 0 - - - 9 - - Tags: @@ -232,11 +222,6 @@ 0 - - - 9 - - Subject: @@ -253,11 +238,6 @@ 0 - - - 9 - - Cc: @@ -277,11 +257,6 @@ 0 - - - 9 - - Bcc: @@ -298,11 +273,6 @@ 0 - - - 9 - - To: @@ -321,7 +291,6 @@ - 9 75 true @@ -373,11 +342,6 @@ 16777215 - - - 9 - - true @@ -416,11 +380,6 @@ 0 - - - 9 - - From: @@ -860,8 +819,8 @@ - + diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui index 5f1d83eca..516511265 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui @@ -139,11 +139,6 @@ 0 - - - 11 - - Qt::CustomContextMenu @@ -253,11 +248,6 @@ 0 - - - 11 - - @@ -375,11 +365,6 @@ Qt::Vertical - - - 10 - - Qt::CustomContextMenu @@ -466,7 +451,7 @@ LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
RSTabWidget diff --git a/retroshare-gui/src/gui/settings/settingsw.ui b/retroshare-gui/src/gui/settings/settingsw.ui index d1cbd3caf..605e8558e 100644 --- a/retroshare-gui/src/gui/settings/settingsw.ui +++ b/retroshare-gui/src/gui/settings/settingsw.ui @@ -35,11 +35,6 @@ 16777215 - - - 11 - - Qt::IgnoreAction @@ -100,7 +95,6 @@ - 12 75 true @@ -135,8 +129,8 @@ 0 0 - 1313 - 849 + 1264 + 845 diff --git a/retroshare-gui/src/util/RichTextEdit.ui b/retroshare-gui/src/util/RichTextEdit.ui index 63e624b5e..5bb57a792 100644 --- a/retroshare-gui/src/util/RichTextEdit.ui +++ b/retroshare-gui/src/util/RichTextEdit.ui @@ -6,7 +6,7 @@ 0 0 - 703 + 784 312 @@ -566,7 +566,6 @@ MS Sans Serif - 9 @@ -590,16 +589,16 @@
- - MimeTextEdit - QTextEdit -
gui/common/MimeTextEdit.h
-
RSComboBox QComboBox
gui/common/RSComboBox.h
+ + MimeTextEdit + QTextEdit +
gui/common/MimeTextEdit.h
+
f_textedit @@ -608,7 +607,6 @@ f_menu -