Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 16:09:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added patch from Henry

Browse Source 
Removed hardcoded fonts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-10-14 12:25:12 +00:00
parent 70dbbaf537
commit bc41be1f9a
17 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/LinksCloud/LinksDialog.ui
View File

@ -522,7 +522,6 @@ background: white;}</string>
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>

6
retroshare-gui/src/gui/ChannelFeed.ui
View File

@ -65,7 +65,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -206,10 +205,7 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Microsoft Sans Serif</family> <pointsize>21</pointsize>
<pointsize>22</pointsize>
<weight>50</weight>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="text"> <property name="text">

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

@ -40,7 +40,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>

2
retroshare-gui/src/gui/ForumsDialog.ui
View File

@ -74,7 +74,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -583,7 +582,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>MS Shell Dlg 2</family>
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">

2
retroshare-gui/src/gui/ForumsV2Dialog.ui
View File

@ -77,7 +77,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -597,7 +596,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>MS Shell Dlg 2</family>
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">

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

@ -50,7 +50,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>

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

@ -114,7 +114,6 @@
#include "bwctrl/BwCtrlWindow.h" #include "bwctrl/BwCtrlWindow.h"
#endif #endif
#define FONT QFont("Arial", 9)
/* Images for toolbar icons */ /* Images for toolbar icons */
#define IMAGE_NETWORK2 ":/images/rs1.png" #define IMAGE_NETWORK2 ":/images/rs1.png"
@ -659,9 +658,12 @@ void MainWindow::postModDirectories(bool update_local)
/** Creates a new action associated with a config page. */ /** Creates a new action associated with a config page. */
QAction *MainWindow::createPageAction(const QIcon &icon, const QString &text, QActionGroup *group) QAction *MainWindow::createPageAction(const QIcon &icon, const QString &text, QActionGroup *group)
{ {
QFont font;
QAction *action = new QAction(icon, text, group); QAction *action = new QAction(icon, text, group);
font = action->font();
font.setPointSize(9);
action->setCheckable(true); action->setCheckable(true);
action->setFont(FONT); action->setFont(font);
return action; return action;
} }
@ -669,7 +671,10 @@ QAction *MainWindow::createPageAction(const QIcon &icon, const QString &text, QA
* the specified slot (if given). */ * the specified slot (if given). */
void MainWindow::addAction(QAction *action, const char *slot) void MainWindow::addAction(QAction *action, const char *slot)
{ {
action->setFont(FONT); QFont font;
font = action->font();
font.setPointSize(9);
action->setFont(font);
ui.toolBar->addAction(action); ui.toolBar->addAction(action);
connect(action, SIGNAL(triggered()), this, slot); connect(action, SIGNAL(triggered()), this, slot);
} }

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

@ -160,7 +160,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -205,7 +204,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>MS Shell Dlg 2</family>
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">

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

@ -234,7 +234,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -299,7 +298,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>MS Shell Dlg 2</family>
</font> </font>
</property> </property>
<property name="focusPolicy"> <property name="focusPolicy">
@ -333,7 +331,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>MS Shell Dlg 2</family>
</font> </font>
</property> </property>
<property name="focusPolicy"> <property name="focusPolicy">

3
retroshare-gui/src/gui/TransfersDialog.ui
View File

@ -25,7 +25,6 @@
<widget class="QTreeView" name="downloadList"> <widget class="QTreeView" name="downloadList">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
</font> </font>
</property> </property>
@ -111,7 +110,6 @@
<widget class="QLabel" name="titleBarLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
@ -189,7 +187,6 @@
<widget class="QTreeView" name="uploadsList"> <widget class="QTreeView" name="uploadsList">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
</font> </font>
</property> </property>

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

@ -38,11 +38,9 @@
<widget class="QLabel" name="titleLabel"> <widget class="QLabel" name="titleLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family> <pointsize>11</pointsize>
<pointsize>13</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
<kerning>true</kerning>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
@ -54,7 +52,6 @@
<widget class="QLabel" name="statusMessageLabel"> <widget class="QLabel" name="statusMessageLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
</font> </font>
</property> </property>

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

@ -18,7 +18,6 @@
<widget class="QTreeWidget" name="peerTreeWidget"> <widget class="QTreeWidget" name="peerTreeWidget">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<stylestrategy>PreferAntialias</stylestrategy> <stylestrategy>PreferAntialias</stylestrategy>
<kerning>true</kerning> <kerning>true</kerning>

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

@ -203,10 +203,11 @@ void GroupTreeWidget::currentItemChanged(QTreeWidgetItem *current, QTreeWidgetIt
QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIcon &icon, bool expand) QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIcon &icon, bool expand)
{ {
QFont font = QFont("ARIAL", 10); QFont font;
font.setBold(true);
QTreeWidgetItem *item = new QTreeWidgetItem(); QTreeWidgetItem *item = new QTreeWidgetItem();
font = item->font(COLUMN_NAME);
font.setBold(true);
font.setPointSize(10);
item->setText(COLUMN_NAME, name); item->setText(COLUMN_NAME, name);
item->setData(COLUMN_DATA, ROLE_NAME, name); item->setData(COLUMN_DATA, ROLE_NAME, name);
item->setFont(COLUMN_NAME, font); item->setFont(COLUMN_NAME, font);

1
retroshare-gui/src/gui/layouts/default.ui
View File

@ -480,7 +480,6 @@
</property> </property>
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>

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

@ -92,9 +92,6 @@
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="text">
<string/>
</property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -110,13 +107,9 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Sans Serif</family>
<pointsize>11</pointsize> <pointsize>11</pointsize>
<weight>75</weight> <weight>75</weight>
<italic>false</italic>
<bold>true</bold> <bold>true</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font> </font>
</property> </property>
<property name="text"> <property name="text">

3
retroshare-gui/src/gui/unfinished/ExampleDialog.ui
View File

@ -480,7 +480,6 @@
</property> </property>
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -543,7 +542,7 @@
<property name="text" > <property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> &lt;/style>&lt;/head>&lt;body style=" font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:9pt; font-weight:600;">Friends&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:9pt; font-weight:600;">Friends&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>

7
retroshare-gui/src/gui/unfinished/StatisticDialog.ui
View File

@ -480,7 +480,6 @@
</property> </property>
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -902,7 +901,6 @@
</property> </property>
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -1004,7 +1002,6 @@
<widget class="QCheckBox" name="chkReceiveRate" > <widget class="QCheckBox" name="chkReceiveRate" >
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -1034,7 +1031,6 @@
<widget class="QCheckBox" name="chkSendRate" > <widget class="QCheckBox" name="chkSendRate" >
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -1064,7 +1060,6 @@
<widget class="QCheckBox" name="chkAlwaysOnTop" > <widget class="QCheckBox" name="chkAlwaysOnTop" >
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -1135,7 +1130,6 @@
</property> </property>
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
@ -1159,7 +1153,6 @@
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="font" > <property name="font" >
<font> <font>
<family>Arial</family>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>