diff --git a/plugins/LinksCloud/LinksDialog.ui b/plugins/LinksCloud/LinksDialog.ui index e6bd1ff70..d711a187b 100644 --- a/plugins/LinksCloud/LinksDialog.ui +++ b/plugins/LinksCloud/LinksDialog.ui @@ -522,7 +522,6 @@ background: white;} - Arial 10 75 true diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index 1a0a30acf..d62176704 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -65,7 +65,6 @@ - Arial 10 75 true @@ -206,10 +205,7 @@ - Microsoft Sans Serif - 22 - 50 - false + 21 diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index 99748d999..1000a58b4 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -40,7 +40,6 @@ - Arial 10 75 true diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index cc96a0dc6..12ba0d555 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -74,7 +74,6 @@ - Arial 10 75 true @@ -583,7 +582,6 @@ - MS Shell Dlg 2 diff --git a/retroshare-gui/src/gui/ForumsV2Dialog.ui b/retroshare-gui/src/gui/ForumsV2Dialog.ui index e07a7acbe..af9688232 100644 --- a/retroshare-gui/src/gui/ForumsV2Dialog.ui +++ b/retroshare-gui/src/gui/ForumsV2Dialog.ui @@ -77,7 +77,6 @@ - Arial 10 75 true @@ -597,7 +596,6 @@ - MS Shell Dlg 2 diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index c6f9854c4..09028003b 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -50,7 +50,6 @@ - Arial 10 75 true diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index c96939e2f..96198319c 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -114,7 +114,6 @@ #include "bwctrl/BwCtrlWindow.h" #endif -#define FONT QFont("Arial", 9) /* Images for toolbar icons */ #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. */ 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); + action->setFont(font); return action; } @@ -669,7 +671,10 @@ QAction *MainWindow::createPageAction(const QIcon &icon, const QString &text, QA * the specified slot (if given). */ 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); connect(action, SIGNAL(triggered()), this, slot); } diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index e91e8755e..4e67c5232 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -160,7 +160,6 @@ - Arial 10 75 true @@ -205,7 +204,6 @@ - MS Shell Dlg 2 diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 3a568d80e..ec0e3e49c 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -234,7 +234,6 @@ - Arial 10 75 true @@ -299,7 +298,6 @@ - MS Shell Dlg 2 @@ -333,7 +331,6 @@ - MS Shell Dlg 2 diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index 00af8ab1a..e51962ff2 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -25,7 +25,6 @@ - Arial 9 @@ -111,7 +110,6 @@ - Arial 10 75 true @@ -189,7 +187,6 @@ - Arial 9 diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index cfb99c205..6812bd05e 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -38,11 +38,9 @@ - Arial - 13 + 11 75 true - true @@ -54,7 +52,6 @@ - Arial 9 diff --git a/retroshare-gui/src/gui/common/FriendList.ui b/retroshare-gui/src/gui/common/FriendList.ui index f5ab5aa8c..12004813c 100644 --- a/retroshare-gui/src/gui/common/FriendList.ui +++ b/retroshare-gui/src/gui/common/FriendList.ui @@ -18,7 +18,6 @@ - Arial 9 PreferAntialias true diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp index 60e721d36..d7d9c2aee 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp @@ -203,10 +203,11 @@ void GroupTreeWidget::currentItemChanged(QTreeWidgetItem *current, QTreeWidgetIt QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIcon &icon, bool expand) { - QFont font = QFont("ARIAL", 10); - font.setBold(true); - + QFont font; 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/layouts/default.ui b/retroshare-gui/src/gui/layouts/default.ui index 9667e9929..cdba6c54d 100644 --- a/retroshare-gui/src/gui/layouts/default.ui +++ b/retroshare-gui/src/gui/layouts/default.ui @@ -480,7 +480,6 @@ - Arial 10 50 false diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui index d9332d216..15d1b6509 100755 --- a/retroshare-gui/src/gui/settings/settings.ui +++ b/retroshare-gui/src/gui/settings/settings.ui @@ -92,9 +92,6 @@ 24 - - - true @@ -110,13 +107,9 @@ - Sans Serif 11 75 - false true - false - false diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.ui b/retroshare-gui/src/gui/unfinished/ExampleDialog.ui index 9ca825404..696392215 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.ui +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.ui @@ -480,7 +480,6 @@ - Arial 8 50 false @@ -543,7 +542,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +</style></head><body style=" font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Friends</span></p></body></html> diff --git a/retroshare-gui/src/gui/unfinished/StatisticDialog.ui b/retroshare-gui/src/gui/unfinished/StatisticDialog.ui index 26f11ca42..695a660b2 100644 --- a/retroshare-gui/src/gui/unfinished/StatisticDialog.ui +++ b/retroshare-gui/src/gui/unfinished/StatisticDialog.ui @@ -480,7 +480,6 @@ - Arial 8 50 false @@ -902,7 +901,6 @@ - Arial 10 50 false @@ -1004,7 +1002,6 @@ - Arial 10 50 false @@ -1034,7 +1031,6 @@ - Arial 10 50 false @@ -1064,7 +1060,6 @@ - Arial 10 50 false @@ -1135,7 +1130,6 @@ - Arial 10 50 false @@ -1159,7 +1153,6 @@ - Arial 10 50 false