Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-24 17:00:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved font size definitions from ui files to default qss.

Browse Source 
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
This commit is contained in:
thunder2 2014-12-06 22:09:44 +00:00
parent 4cbc6c1cdb
commit 90c3c24412
42 changed files with 379 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/FeedReader/gui/FeedReaderDialog.ui
View File

@ -56,14 +56,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Feeds</string>
</property>
@ -171,6 +164,11 @@
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="FeedReader_images.qrc"/>

4
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View File

@ -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()

29
retroshare-gui/src/gui/ChatLobbyWidget.ui
View File

@ -43,14 +43,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Chat lobbies</string>
</property>
@ -161,11 +154,6 @@
</item>
<item>
<widget class="QTreeWidget" name="lobbyTreeWidget">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="iconSize">
<size>
<width>16</width>
@ -354,15 +342,9 @@
</layout>
</item>
<item>
<widget class="QLabel" name="lobbyinfo_label">
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>12</pointsize>
</font>
</property>
<widget class="QLabel" name="lobbyInfoLabel">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -398,6 +380,11 @@
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="images.qrc"/>

17
retroshare-gui/src/gui/Circles/CirclesDialog.ui
View File

@ -55,14 +55,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Circles</string>
</property>
@ -260,9 +253,15 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

38
retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
View File

@ -43,14 +43,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>File Transfers</string>
</property>
@ -139,17 +132,6 @@
<enum>Qt::Vertical</enum>
</property>
<widget class="QTreeView" name="downloadList">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
@ -226,17 +208,6 @@
</property>
<item row="0" column="0">
<widget class="QTreeView" name="uploadsList">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -256,6 +227,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
</resources>

33
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -40,14 +40,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Network</string>
</property>
@ -144,24 +137,7 @@
<number>1</number>
</property>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="nicknameLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>42</height>
</size>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<widget class="StyledLabel" name="nicknameLabel">
<property name="text">
<string notr="true">Nickname (Location)</string>
</property>
@ -827,6 +803,11 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>

20
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -64,14 +64,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Identities</string>
</property>
@ -567,15 +560,20 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>RSTreeWidget</class>
<extends>QTreeWidget</extends>
<header>gui/common/RSTreeWidget.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>RSTreeWidget</class>
<extends>QTreeWidget</extends>
<header>gui/common/RSTreeWidget.h</header>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>HeaderFrame</class>

4
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -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;
}

35
retroshare-gui/src/gui/MessagesDialog.ui
View File

@ -134,14 +134,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Messages</string>
</property>
@ -542,11 +535,6 @@
<height>130</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -651,11 +639,6 @@
<height>18</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string>Total Inbox:</string>
</property>
@ -751,11 +734,6 @@
<enum>Qt::Vertical</enum>
</property>
<widget class="RSTreeWidget" name="messageTreeWidget">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -868,6 +846,11 @@
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>RSTreeWidget</class>
<extends>QTreeWidget</extends>
<header>gui/common/RSTreeWidget.h</header>
</customwidget>
<customwidget>
<class>RSTabWidget</class>
<extends>QTabWidget</extends>
@ -875,9 +858,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>RSTreeWidget</class>
<extends>QTreeWidget</extends>
<header>gui/common/RSTreeWidget.h</header>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<tabstops>

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

@ -14,14 +14,7 @@
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>Filter:</string>
</property>
@ -99,7 +92,7 @@
</attribute>
<column>
<property name="text">
<string> </string>
<string/>
</property>
</column>
<column>

20
retroshare-gui/src/gui/NewsFeed.ui
View File

@ -46,20 +46,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>News Feed</string>
</property>
@ -125,6 +112,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>RSFeedWidget</class>
<extends>QWidget</extends>

26
retroshare-gui/src/gui/People/PeopleDialog.ui
View File

@ -58,16 +58,9 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;People&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>People</string>
</property>
</widget>
</item>
@ -140,11 +133,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Drag your circles or people to each other.</string>
</property>
@ -214,11 +202,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Drag your circles or people to each other.</string>
</property>
@ -245,6 +228,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>PictureFlow</class>
<extends>QWidget</extends>

38
retroshare-gui/src/gui/Posted/PostedItem.ui
View File

@ -10,11 +10,6 @@
<height>156</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="windowTitle">
<string notr="true"/>
</property>
@ -73,7 +68,6 @@
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -91,11 +85,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string notr="true">You eyes only</string>
</property>
@ -130,12 +119,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="scoreLabel">
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<widget class="StyledLabel" name="scoreLabel">
<property name="text">
<string>0</string>
</property>
@ -176,7 +160,6 @@
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -208,11 +191,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string notr="true">Signed by</string>
</property>
@ -229,11 +207,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string notr="true">Signed by</string>
</property>
@ -281,7 +254,6 @@
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -325,7 +297,7 @@
</widget>
</item>
<item row="0" column="1" colspan="12">
<widget class="QLabel" name="titleLabel">
<widget class="StyledLabel" name="titleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -334,7 +306,6 @@
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -387,6 +358,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>GxsIdLabel</class>
<extends>QLabel</extends>

22
retroshare-gui/src/gui/SharedFilesDialog.ui
View File

@ -52,20 +52,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Files</string>
</property>
@ -350,6 +337,13 @@ border-image: url(:/images/closepressed.png)
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="images.qrc"/>
</resources>

30
retroshare-gui/src/gui/bwgraph/BandwidthGraphWindow.ui
View File

@ -105,11 +105,6 @@
</property>
<item>
<widget class="QCheckBox" name="chkReceiveRate">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@ -129,11 +124,6 @@
</item>
<item>
<widget class="QCheckBox" name="chkSendRate">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@ -207,11 +197,6 @@
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Style</string>
</property>
@ -338,11 +323,6 @@
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@ -356,11 +336,6 @@
</item>
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@ -450,11 +425,6 @@
<height>80</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>

8
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -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("<span style=\"font-size:11pt; font-weight:500;""\">%1</span>");
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...") {

43
retroshare-gui/src/gui/chat/ChatWidget.ui
View File

@ -52,10 +52,11 @@
<number>3</number>
</property>
<item>
<widget class="QLabel" name="titleLabel">
<layout class="QHBoxLayout" name="nameLayout">
<item>
<widget class="StyledLabel" name="titleLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -66,14 +67,18 @@
</widget>
</item>
<item>
<widget class="QLabel" name="statusMessageLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<widget class="StyledLabel" name="statusLabel">
<property name="text">
<string notr="true">Status</string>
<string>(Status)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="statusMessageLabel">
<property name="text">
<string notr="true">Status message</string>
</property>
</widget>
</item>
@ -441,10 +446,7 @@ border-image: url(:/images/closepressed.png)
</widget>
</item>
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string/>
</property>
<widget class="QLabel" name="typingLabel">
<property name="margin">
<number>0</number>
</property>
@ -824,6 +826,16 @@ border-image: url(:/images/closepressed.png)
</action>
</widget>
<customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
@ -840,11 +852,6 @@ border-image: url(:/images/closepressed.png)
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

7
retroshare-gui/src/gui/common/FriendList.ui
View File

@ -90,13 +90,6 @@
</item>
<item>
<widget class="QTreeWidget" name="peerTreeWidget">
<property name="font">
<font>
<pointsize>9</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
<kerning>true</kerning>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

1
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View File

@ -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);

5
retroshare-gui/src/gui/common/GroupTreeWidget.ui
View File

@ -78,11 +78,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

38
retroshare-gui/src/gui/common/StyledLabel.cpp Normal file
View File

@ -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 <QFont>
#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);
}

39
retroshare-gui/src/gui/common/StyledLabel.h Normal file
View File

@ -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 <QLabel>
#include <retroshare/rsidentity.h>
class StyledLabel : public QLabel
{
Q_OBJECT
Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor)
public:
StyledLabel(QWidget *parent = NULL);
void setFontSizeFactor(int factor);
};
#endif

35
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View File

@ -38,7 +38,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@ -830,10 +830,9 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_6">
<widget class="StyledLabel" name="servicePermissionsLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -844,12 +843,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="plainTextEdit">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<widget class="QPlainTextEdit" name="servicePermissionsInfoLabel">
<property name="readOnly">
<bool>true</bool>
</property>
@ -939,18 +933,23 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
</layout>
</widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>AvatarWidget</class>
<extends>QLabel</extends>
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
@ -959,12 +958,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

13
retroshare-gui/src/gui/feeds/ChatMsgItem.ui
View File

@ -142,12 +142,7 @@
</layout>
</item>
<item row="0" column="1">
<widget class="QLabel" name="peerNameLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<widget class="StyledLabel" name="peerNameLabel">
<property name="text">
<string notr="true">Peer Name</string>
</property>
@ -179,7 +174,6 @@
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -418,6 +412,11 @@
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

12
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View File

@ -73,7 +73,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="titleLabel">
<widget class="StyledLabel" name="titleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -82,11 +82,9 @@
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="text">
@ -233,7 +231,6 @@
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -518,6 +515,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
</resources>

3
retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
View File

@ -241,9 +241,7 @@
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
@ -282,7 +280,6 @@
<widget class="QLabel" name="timestamplabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>

14
retroshare-gui/src/gui/feeds/PeerItem.ui
View File

@ -100,7 +100,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="peerFrame">
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
@ -130,12 +130,7 @@
<item row="0" column="1">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="peerNameLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<widget class="StyledLabel" name="peerNameLabel">
<property name="text">
<string notr="true">Peer Name</string>
</property>
@ -542,6 +537,11 @@
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

14
retroshare-gui/src/gui/gxs/GxsCommentContainer.ui
View File

@ -46,14 +46,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Comment Container</string>
</property>
@ -94,6 +87,11 @@
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../Posted/Posted_images.qrc"/>

26
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui
View File

@ -49,14 +49,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string notr="true">Name</string>
</property>
@ -148,18 +141,23 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>GroupTreeWidget</class>
<extends>QWidget</extends>
<header>gui/common/GroupTreeWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RSTabWidget</class>
<extends>QTabWidget</extends>
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>GroupTreeWidget</class>
<extends>QWidget</extends>
<header>gui/common/GroupTreeWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

75
retroshare-gui/src/gui/msgs/MessageWidget.ui
View File

@ -67,13 +67,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Subject:</string>
</property>
@ -90,13 +83,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>From:</string>
</property>
@ -125,11 +111,6 @@
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
@ -146,13 +127,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>To:</string>
</property>
@ -179,13 +153,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Cc:</string>
</property>
@ -205,13 +172,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Bcc:</string>
</property>
@ -248,13 +208,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Tags:</string>
</property>
@ -276,11 +229,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
@ -297,11 +245,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
@ -387,13 +330,6 @@
</item>
<item row="0" column="4">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Recommended Files</string>
</property>
@ -401,12 +337,6 @@
</item>
<item row="0" column="3">
<widget class="QLabel" name="filesText">
<property name="font">
<font>
<pointsize>10</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string/>
</property>
@ -450,11 +380,6 @@
</widget>
</widget>
<widget class="QTreeWidget" name="msgList">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

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

@ -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

15
retroshare-gui/src/gui/settings/PluginItem.ui
View File

@ -76,18 +76,13 @@
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="infoLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="subjectLabel">
<widget class="StyledLabel" name="subjectLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -96,7 +91,6 @@
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -291,6 +285,13 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

10
retroshare-gui/src/gui/settings/settings.ui
View File

@ -38,7 +38,7 @@
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QLabel" name="pageName">
<widget class="StyledLabel" name="pageName">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
<horstretch>0</horstretch>
@ -47,7 +47,6 @@
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -202,6 +201,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
</resources>

5
retroshare-gui/src/gui/statistics/BwCtrlWindow.ui
View File

@ -96,11 +96,6 @@
<height>80</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>

7
retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Name</string>
</property>

7
retroshare-gui/src/gui/toaster/ChatToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Name</string>
</property>

7
retroshare-gui/src/gui/toaster/DownloadToaster.ui
View File

@ -82,13 +82,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Download completed</string>
</property>

7
retroshare-gui/src/gui/toaster/FriendRequestToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Friend Request</string>
</property>

7
retroshare-gui/src/gui/toaster/GroupChatToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Name</string>
</property>

7
retroshare-gui/src/gui/toaster/MessageToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">1 new Message from</string>
</property>

7
retroshare-gui/src/gui/toaster/OnlineToaster.ui
View File

@ -79,13 +79,6 @@
</item>
<item>
<widget class="QLabel" name="toasterLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">RetroShare</string>
</property>

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -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 \