From 90c3c2441228d04420f98091b6bfbd0a96f6946a Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 6 Dec 2014 22:09:44 +0000 Subject: [PATCH] Moved font size definitions from ui files to default qss. Added new base class StyledLabel to emulate the missing font-size by factor in qss. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/FeedReader/gui/FeedReaderDialog.ui | 14 +-- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 4 +- retroshare-gui/src/gui/ChatLobbyWidget.ui | 29 ++--- .../src/gui/Circles/CirclesDialog.ui | 17 ++- .../src/gui/FileTransfer/TransfersDialog.ui | 38 ++---- retroshare-gui/src/gui/FriendsDialog.ui | 33 ++---- retroshare-gui/src/gui/Identity/IdDialog.ui | 20 ++-- retroshare-gui/src/gui/MainWindow.cpp | 4 - retroshare-gui/src/gui/MessagesDialog.ui | 35 ++---- retroshare-gui/src/gui/NetworkDialog.ui | 11 +- retroshare-gui/src/gui/NewsFeed.ui | 20 +--- retroshare-gui/src/gui/People/PeopleDialog.ui | 112 ++++++++---------- retroshare-gui/src/gui/Posted/PostedItem.ui | 38 ++---- retroshare-gui/src/gui/SharedFilesDialog.ui | 22 ++-- .../src/gui/bwgraph/BandwidthGraphWindow.ui | 30 ----- retroshare-gui/src/gui/chat/ChatWidget.cpp | 8 +- retroshare-gui/src/gui/chat/ChatWidget.ui | 61 +++++----- retroshare-gui/src/gui/common/FriendList.ui | 7 -- .../src/gui/common/GroupTreeWidget.cpp | 1 - .../src/gui/common/GroupTreeWidget.ui | 5 - retroshare-gui/src/gui/common/StyledLabel.cpp | 38 ++++++ retroshare-gui/src/gui/common/StyledLabel.h | 39 ++++++ .../src/gui/connect/ConfCertDialog.ui | 35 +++--- retroshare-gui/src/gui/feeds/ChatMsgItem.ui | 13 +- .../src/gui/feeds/GxsChannelPostItem.ui | 12 +- .../src/gui/feeds/GxsForumMsgItem.ui | 3 - retroshare-gui/src/gui/feeds/PeerItem.ui | 14 +-- .../src/gui/gxs/GxsCommentContainer.ui | 14 +-- .../src/gui/gxs/GxsGroupFrameDialog.ui | 26 ++-- retroshare-gui/src/gui/msgs/MessageWidget.ui | 75 ------------ .../src/gui/qss/stylesheet/qss.default | 63 ++++++++++ retroshare-gui/src/gui/settings/PluginItem.ui | 15 +-- retroshare-gui/src/gui/settings/settings.ui | 10 +- .../src/gui/statistics/BwCtrlWindow.ui | 5 - .../src/gui/toaster/ChatLobbyToaster.ui | 7 -- retroshare-gui/src/gui/toaster/ChatToaster.ui | 7 -- .../src/gui/toaster/DownloadToaster.ui | 7 -- .../src/gui/toaster/FriendRequestToaster.ui | 7 -- .../src/gui/toaster/GroupChatToaster.ui | 7 -- .../src/gui/toaster/MessageToaster.ui | 7 -- .../src/gui/toaster/OnlineToaster.ui | 7 -- retroshare-gui/src/retroshare-gui.pro | 2 + 42 files changed, 379 insertions(+), 543 deletions(-) create mode 100644 retroshare-gui/src/gui/common/StyledLabel.cpp create mode 100644 retroshare-gui/src/gui/common/StyledLabel.h diff --git a/plugins/FeedReader/gui/FeedReaderDialog.ui b/plugins/FeedReader/gui/FeedReaderDialog.ui index 3870c6cb3..58b0a26a9 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.ui +++ b/plugins/FeedReader/gui/FeedReaderDialog.ui @@ -56,14 +56,7 @@ - - - - 10 - 75 - true - - + Feeds @@ -171,6 +164,11 @@
gui/common/RSTabWidget.h
1 + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 307861e62..2c8c5d97f 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -612,7 +612,7 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) ui.lobbytype_lineEdit->setText( (( (*it).lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE)?tr("Private"):tr("Public")) ); ui.lobbypeers_lineEdit->setText( QString::number((*it).total_number_of_peers) ); - ui.lobbyinfo_label->setText(tr("You're not subscribed to this lobby; Double click-it to enter and chat.") ); + ui.lobbyInfoLabel->setText(tr("You're not subscribed to this lobby; Double click-it to enter and chat.") ); return ; } @@ -623,7 +623,7 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) ui.lobbypeers_lineEdit->clear(); QString text = tr("No lobby selected. \nSelect lobbies at left to show details.\nDouble click lobbies to enter and chat.") ; - ui.lobbyinfo_label->setText(text) ; + ui.lobbyInfoLabel->setText(text) ; } void ChatLobbyWidget::subscribeItem() diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index 7c0936679..87c65ee15 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -43,14 +43,7 @@
- - - - 10 - 75 - true - - + Chat lobbies @@ -161,11 +154,6 @@ - - - 9 - - 16 @@ -354,15 +342,9 @@ - - - - Tahoma - 12 - - + - TextLabel + TextLabel true @@ -398,6 +380,11 @@ QLineEdit
gui/common/LineEditClear.h
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.ui b/retroshare-gui/src/gui/Circles/CirclesDialog.ui index bfddd5d91..fe3c83a7b 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.ui +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.ui @@ -55,14 +55,7 @@
- - - - 10 - 75 - true - - + Circles @@ -260,9 +253,15 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
- diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index 1f633cf17..28a3570bb 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -43,14 +43,7 @@ - - - - 10 - 75 - true - - + File Transfers @@ -139,17 +132,6 @@ Qt::Vertical - - - 0 - 0 - - - - - 9 - - true @@ -226,17 +208,6 @@ - - - 0 - 0 - - - - - 9 - - Qt::CustomContextMenu @@ -256,6 +227,13 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 135f4d76b..c0a317b84 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -40,14 +40,7 @@
- - - - 10 - 75 - true - - + Network @@ -144,24 +137,7 @@ 1 - - - - 0 - 32 - - - - - 16777215 - 42 - - - - - 16 - - + Nickname (Location) @@ -827,6 +803,11 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
RSTextBrowser QTextBrowser diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 6d0393c5a..3cff84288 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -64,14 +64,7 @@
- - - - 10 - 75 - true - - + Identities @@ -567,15 +560,20 @@ + + RSTreeWidget + QTreeWidget +
gui/common/RSTreeWidget.h
+
LineEditClear QLineEdit
gui/common/LineEditClear.h
- RSTreeWidget - QTreeWidget -
gui/common/RSTreeWidget.h
+ StyledLabel + QLabel +
gui/common/StyledLabel.h
HeaderFrame diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 47e4b86de..2752438e6 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -513,12 +513,8 @@ void MainWindow::initStackedPage() /** Creates a new action associated with a config page. */ QAction *MainWindow::createPageAction(const QIcon &icon, const QString &text, QActionGroup *group) { - QFont font; QAction *action = new QAction(icon, text, group); - font = action->font(); - font.setPointSize(9); action->setCheckable(true); - action->setFont(font); return action; } diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 7e3305630..7faab465b 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -134,14 +134,7 @@
- - - - 10 - 75 - true - - + Messages @@ -542,11 +535,6 @@ 130 - - - 9 - - Qt::CustomContextMenu @@ -651,11 +639,6 @@ 18 - - - 9 - - Total Inbox: @@ -751,11 +734,6 @@ Qt::Vertical - - - 9 - - Qt::CustomContextMenu @@ -868,6 +846,11 @@ QLineEdit
gui/common/LineEditClear.h
+ + RSTreeWidget + QTreeWidget +
gui/common/RSTreeWidget.h
+
RSTabWidget QTabWidget @@ -875,9 +858,9 @@ 1 - RSTreeWidget - QTreeWidget -
gui/common/RSTreeWidget.h
+ StyledLabel + QLabel +
gui/common/StyledLabel.h
diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 5762ff3a6..e13990be9 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -14,14 +14,7 @@ - - - - 10 - 75 - true - - + Filter: @@ -99,7 +92,7 @@ - + diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui index 8ee8c3597..7fca54b47 100644 --- a/retroshare-gui/src/gui/NewsFeed.ui +++ b/retroshare-gui/src/gui/NewsFeed.ui @@ -46,20 +46,7 @@ - - - - 0 - 0 - - - - - 9 - 75 - true - - + News Feed @@ -125,6 +112,11 @@
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
RSFeedWidget QWidget diff --git a/retroshare-gui/src/gui/People/PeopleDialog.ui b/retroshare-gui/src/gui/People/PeopleDialog.ui index d2f1b5447..86ffe1bb3 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.ui +++ b/retroshare-gui/src/gui/People/PeopleDialog.ui @@ -58,16 +58,9 @@
- - - - 10 - 75 - true - - + - <html><head/><body><p>People</p></body></html> + People @@ -105,62 +98,57 @@ - - Qt::Vertical - + + Qt::Vertical + - - - 0 - 250 - - - - true - + + + 0 + 250 + + + + true + - - - 0 - 0 + + + 0 + 0 685 - 248 - - - - - + 248 + + + + +
- + - - - 0 - 0 - - - - - 11 - - - + + + 0 + 0 + + + Drag your circles or people to each other. - - - Qt::AlignCenter - - - - + + + Qt::AlignCenter + + +
+ - - true - - - - + + true + + + + @@ -214,11 +202,6 @@ 0 - - - 11 - - Drag your circles or people to each other. @@ -245,6 +228,11 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
PictureFlow QWidget diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index 4a96d21bd..8b328dd01 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -10,11 +10,6 @@ 156 - - - 9 - - @@ -73,7 +68,6 @@ - 9 75 true @@ -91,11 +85,6 @@ 0 - - - 9 - - You eyes only @@ -130,12 +119,7 @@ - - - - 20 - - + 0 @@ -176,7 +160,6 @@ - 9 75 true @@ -208,11 +191,6 @@ 0 - - - 9 - - Signed by @@ -229,11 +207,6 @@ 0 - - - 9 - - Signed by @@ -281,7 +254,6 @@ - 9 75 true @@ -325,7 +297,7 @@ - + 0 @@ -334,7 +306,6 @@ - 12 75 true @@ -387,6 +358,11 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
GxsIdLabel QLabel diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 4d028ecaa..04eb69fc8 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -52,20 +52,7 @@
- - - - 16777215 - 16 - - - - - 10 - 75 - true - - + Files @@ -350,6 +337,13 @@ border-image: url(:/images/closepressed.png) + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/bwgraph/BandwidthGraphWindow.ui b/retroshare-gui/src/gui/bwgraph/BandwidthGraphWindow.ui index 4f6cf02fd..de0fddd3a 100644 --- a/retroshare-gui/src/gui/bwgraph/BandwidthGraphWindow.ui +++ b/retroshare-gui/src/gui/bwgraph/BandwidthGraphWindow.ui @@ -105,11 +105,6 @@ - - - 10 - - Qt::NoContextMenu @@ -129,11 +124,6 @@ - - - 10 - - Qt::NoContextMenu @@ -207,11 +197,6 @@ - - - 10 - - Style @@ -338,11 +323,6 @@ 0 - - - 10 - - Qt::NoContextMenu @@ -356,11 +336,6 @@ - - - 10 - - Qt::NoContextMenu @@ -450,11 +425,6 @@ 80 - - - 10 - - Qt::NoContextMenu diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index badd90503..97f8c74d1 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -819,7 +819,7 @@ void ChatWidget::chatCharFormatChanged() void ChatWidget::resetStatusBar() { - ui->statusLabel->clear(); + ui->typingLabel->clear(); ui->typingpixmapLabel->clear(); typing = false; @@ -1325,8 +1325,8 @@ void ChatWidget::updateStatus(const QString &peer_id, int status) break; } - QString statusString("%1"); - ui->titleLabel->setText(peerName + " (" + statusString.arg(StatusDefs::name(status)) + ")") ; + ui->titleLabel->setText(peerName); + ui->statusLabel->setText(QString("(%1)").arg(StatusDefs::name(status))); peerStatus = status; @@ -1377,7 +1377,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString) { - ui->statusLabel->setText(QString(statusMask).arg(tr(statusString.toLatin1()))); // displays info for 5 secs. + ui->typingLabel->setText(QString(statusMask).arg(tr(statusString.toLatin1()))); // displays info for 5 secs. ui->typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") ); if (statusString == "is typing...") { diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index 90a6bd2ba..74bc4c2ab 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -52,28 +52,33 @@ 3 - - - - 11 - 75 - true - - - - Title - - + + + + + + 75 + true + + + + Title + + + + + + + (Status) + + + + - - - 9 - - - Status + Status message @@ -441,10 +446,7 @@ border-image: url(:/images/closepressed.png) - - - - + 0 @@ -824,6 +826,16 @@ border-image: url(:/images/closepressed.png) + + LineEditClear + QLineEdit +
gui/common/LineEditClear.h
+
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
RSTextBrowser QTextBrowser @@ -840,11 +852,6 @@ border-image: url(:/images/closepressed.png) QTextEdit
gui/common/MimeTextEdit.h
- - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
-
diff --git a/retroshare-gui/src/gui/common/FriendList.ui b/retroshare-gui/src/gui/common/FriendList.ui index a9503f12c..47483844b 100644 --- a/retroshare-gui/src/gui/common/FriendList.ui +++ b/retroshare-gui/src/gui/common/FriendList.ui @@ -90,13 +90,6 @@
- - - 9 - PreferAntialias - true - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp index 3ac3b6796..a92438cec 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp @@ -275,7 +275,6 @@ QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIc QTreeWidgetItem *item = new QTreeWidgetItem(); font = item->font(COLUMN_NAME); font.setBold(true); - font.setPointSize(10); item->setText(COLUMN_NAME, name); item->setData(COLUMN_DATA, ROLE_NAME, name); item->setFont(COLUMN_NAME, font); diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui index fb5c92316..9b6739c72 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui @@ -78,11 +78,6 @@ 0 - - - 9 - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/common/StyledLabel.cpp b/retroshare-gui/src/gui/common/StyledLabel.cpp new file mode 100644 index 000000000..b025d385a --- /dev/null +++ b/retroshare-gui/src/gui/common/StyledLabel.cpp @@ -0,0 +1,38 @@ +/**************************************************************** + * This file is distributed under the following license: + * + * Copyright (c) 2014, RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#include + +#include "StyledLabel.h" + +/** Constructor */ +StyledLabel::StyledLabel(QWidget *parent) + : QLabel(parent) +{ +} + +void StyledLabel::setFontSizeFactor(int factor) +{ + QFont f = font(); + qreal fontSize = factor * f.pointSizeF() / 100; + f.setPointSizeF(fontSize); + setFont(f); +} diff --git a/retroshare-gui/src/gui/common/StyledLabel.h b/retroshare-gui/src/gui/common/StyledLabel.h new file mode 100644 index 000000000..6a89a8d14 --- /dev/null +++ b/retroshare-gui/src/gui/common/StyledLabel.h @@ -0,0 +1,39 @@ +/**************************************************************** + * This file is distributed under the following license: + * + * Copyright (c) 2014, RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#ifndef _STYLEDLABEL_H +#define _STYLEDLABEL_H + +#include +#include + +class StyledLabel : public QLabel +{ + Q_OBJECT + Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor) + +public: + StyledLabel(QWidget *parent = NULL); + + void setFontSizeFactor(int factor); +}; + +#endif diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index e0ef65fd2..c4293493a 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -38,7 +38,7 @@ - + QFrame::StyledPanel @@ -830,10 +830,9 @@ p, li { white-space: pre-wrap; } - + - 11 75 true @@ -844,12 +843,7 @@ p, li { white-space: pre-wrap; } - - - - 11 - - + true @@ -939,18 +933,23 @@ Some services (Discovery, anonymous routing) can be switched off globally, which - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 -
AvatarWidget QLabel
gui/common/AvatarWidget.h
1
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+ + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 +
RSTextBrowser QTextBrowser @@ -959,12 +958,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
- - - - - - diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui index 73180a5f3..924028ef3 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui @@ -142,12 +142,7 @@
- - - - 14 - - + Peer Name @@ -179,7 +174,6 @@ - 10 75 true @@ -418,6 +412,11 @@
gui/common/AvatarWidget.h
1
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index 9910927ff..a364d78d4 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -73,7 +73,7 @@ - + 0 @@ -82,11 +82,9 @@ - 11 75 true true - PreferAntialias @@ -233,7 +231,6 @@ Tahoma - 10 75 true @@ -518,6 +515,13 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui index 5562d340f..938d44947 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui @@ -241,9 +241,7 @@ - 9 75 - false true @@ -282,7 +280,6 @@ - 9 75 true diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index 486390a46..49eb48937 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -100,7 +100,7 @@ 0 - + 0 @@ -130,12 +130,7 @@ - - - - 14 - - + Peer Name @@ -542,6 +537,11 @@
gui/common/AvatarWidget.h
1 + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentContainer.ui b/retroshare-gui/src/gui/gxs/GxsCommentContainer.ui index 1b1d95687..bad001d4f 100644 --- a/retroshare-gui/src/gui/gxs/GxsCommentContainer.ui +++ b/retroshare-gui/src/gui/gxs/GxsCommentContainer.ui @@ -46,14 +46,7 @@
- - - - 10 - 75 - true - - + Comment Container @@ -94,6 +87,11 @@
gui/common/RSTabWidget.h
1 + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui index 4e7dfa515..679211d7b 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui @@ -49,14 +49,7 @@
- - - - 10 - 75 - true - - + Name @@ -148,18 +141,23 @@ - - GroupTreeWidget - QWidget -
gui/common/GroupTreeWidget.h
- 1 -
RSTabWidget QTabWidget
gui/common/RSTabWidget.h
1
+ + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+ + GroupTreeWidget + QWidget +
gui/common/GroupTreeWidget.h
+ 1 +
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui index 4e3db31e2..ca7f4f7a3 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.ui +++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui @@ -67,13 +67,6 @@ 0
- - - 9 - 50 - false - - Subject: @@ -90,13 +83,6 @@ 0 - - - 9 - 50 - false - - From: @@ -125,11 +111,6 @@ 16777215 - - - 9 - - true @@ -146,13 +127,6 @@ 0 - - - 9 - 50 - false - - To: @@ -179,13 +153,6 @@ 0 - - - 9 - 50 - false - - Cc: @@ -205,13 +172,6 @@ 0 - - - 9 - 50 - false - - Bcc: @@ -248,13 +208,6 @@ 0 - - - 9 - 50 - false - - Tags: @@ -276,11 +229,6 @@ 0 - - - 9 - - true @@ -297,11 +245,6 @@ 0 - - - 9 - - Qt::LeftToRight @@ -387,13 +330,6 @@
- - - 10 - 50 - false - - Recommended Files @@ -401,12 +337,6 @@ - - - 10 - false - - @@ -450,11 +380,6 @@
- - - 9 - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index a39cec0b4..17e33f506 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -11,6 +11,69 @@ AvatarWidget[frameState="ONLINE"]{border-image:url(:/images/avatarstatus-bg-onli AvatarWidget[frameState="AWAY"]{border-image:url(:/images/avatarstatus-bg-away-116.png);} AvatarWidget[frameState="BUSY"]{border-image:url(:/images/avatarstatus-bg-busy-116.png);} +/* Font */ + +QLabel#titleBarLabel +{ + font-weight: bold; + qproperty-fontSizeFactor: 115; +} + +QLabel#toasterLabel +{ + font-weight: bold; +} + +ChatWidget QFrame#titleBarFrame > QLabel#titleLabel, ChatWidget QFrame#titleBarFrame > QLabel#statusLabel +{ + qproperty-fontSizeFactor: 125; +} + +FriendsDialog QFrame#headFrame > QLabel#nicknameLabel +{ + qproperty-fontSizeFactor: 200; +} + +ChatMsgItem QFrame#frame > QLabel#peerNameLabel +{ + qproperty-fontSizeFactor: 175; +} + +PeerItem QFrame#frame QFrame#peerFrame > QLabel#peerNameLabel +{ + qproperty-fontSizeFactor: 175; +} + +PostedItem QFrame#frame > QLabel#titleLabel +{ + qproperty-fontSizeFactor: 150; +} + +PostedItem QFrame#frame > QLabel#scoreLabel +{ + qproperty-fontSizeFactor: 250; +} + +GxsChannelPostItem QFrame#frame > QLabel#titleLabel +{ + qproperty-fontSizeFactor: 125; +} + +PluginItem QFrame#frame > QLabel#subjectLabel +{ + qproperty-fontSizeFactor: 125; +} + +RSettingsWin > QLabel#pageName +{ + qproperty-fontSizeFactor: 125; +} + +ConfCertDialog QFrame#frame QTabWidget QWidget > QLabel#servicePermissionsLabel +{ + qproperty-fontSizeFactor: 125; +} + /* Color definitions */ ForumsDialog, GxsForumThreadWidget diff --git a/retroshare-gui/src/gui/settings/PluginItem.ui b/retroshare-gui/src/gui/settings/PluginItem.ui index 5b101a325..063c27377 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.ui +++ b/retroshare-gui/src/gui/settings/PluginItem.ui @@ -76,18 +76,13 @@ - - - 10 - - TextLabel - + 0 @@ -96,7 +91,6 @@ - 11 75 true @@ -291,6 +285,13 @@ p, li { white-space: pre-wrap; } + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui index 8028a7b76..f72d35634 100755 --- a/retroshare-gui/src/gui/settings/settings.ui +++ b/retroshare-gui/src/gui/settings/settings.ui @@ -38,7 +38,7 @@ - + 0 @@ -47,7 +47,6 @@ - 11 75 true @@ -202,6 +201,13 @@ + + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+
+
diff --git a/retroshare-gui/src/gui/statistics/BwCtrlWindow.ui b/retroshare-gui/src/gui/statistics/BwCtrlWindow.ui index d4d26b9cc..725e95e41 100644 --- a/retroshare-gui/src/gui/statistics/BwCtrlWindow.ui +++ b/retroshare-gui/src/gui/statistics/BwCtrlWindow.ui @@ -96,11 +96,6 @@ 80 - - - 10 - - Qt::NoContextMenu diff --git a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui index 17c25818a..b6408ed93 100644 --- a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui +++ b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui @@ -79,13 +79,6 @@
- - - 9 - 75 - true - - Name diff --git a/retroshare-gui/src/gui/toaster/ChatToaster.ui b/retroshare-gui/src/gui/toaster/ChatToaster.ui index 4215cf176..8b517684b 100644 --- a/retroshare-gui/src/gui/toaster/ChatToaster.ui +++ b/retroshare-gui/src/gui/toaster/ChatToaster.ui @@ -79,13 +79,6 @@ - - - 9 - 75 - true - - Name diff --git a/retroshare-gui/src/gui/toaster/DownloadToaster.ui b/retroshare-gui/src/gui/toaster/DownloadToaster.ui index 8dcc08d8d..de68906b7 100644 --- a/retroshare-gui/src/gui/toaster/DownloadToaster.ui +++ b/retroshare-gui/src/gui/toaster/DownloadToaster.ui @@ -82,13 +82,6 @@ - - - 9 - 75 - true - - Download completed diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui index 6a8bcbd8a..ae203707a 100644 --- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui +++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui @@ -79,13 +79,6 @@ - - - 9 - 75 - true - - Friend Request diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.ui b/retroshare-gui/src/gui/toaster/GroupChatToaster.ui index 97dcb59e9..83ffdfd9a 100644 --- a/retroshare-gui/src/gui/toaster/GroupChatToaster.ui +++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.ui @@ -79,13 +79,6 @@ - - - 9 - 75 - true - - Name diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui index b6cc1dee9..89dcb79a4 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.ui +++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui @@ -79,13 +79,6 @@ - - - 9 - 75 - true - - 1 new Message from diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.ui b/retroshare-gui/src/gui/toaster/OnlineToaster.ui index d10407618..a40f9f80c 100644 --- a/retroshare-gui/src/gui/toaster/OnlineToaster.ui +++ b/retroshare-gui/src/gui/toaster/OnlineToaster.ui @@ -79,13 +79,6 @@ - - - 9 - 75 - true - - RetroShare diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 1265878aa..2bd6b089c 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -478,6 +478,7 @@ HEADERS += rshare.h \ gui/common/SubscribeToolButton.h \ gui/common/FlowLayout.h \ gui/common/PictureFlow.h \ + gui/common/StyledLabel.h \ gui/style/RSStyle.h \ gui/style/StyleDialog.h \ gui/MessagesDialog.h \ @@ -774,6 +775,7 @@ SOURCES += main.cpp \ gui/common/SubscribeToolButton.cpp \ gui/common/FlowLayout.cpp \ gui/common/PictureFlow.cpp \ + gui/common/StyledLabel.cpp \ gui/style/RSStyle.cpp \ gui/style/StyleDialog.cpp \ gui/settings/rsharesettings.cpp \