From 2f43e4152cf2c4cde1d84dc0f33d791fc71704ab Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2010 01:34:14 +0000 Subject: [PATCH] little design fixes git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2308 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/ForumsDialog.ui | 10 ++++++-- retroshare-gui/src/gui/NetworkDialog.ui | 25 +++++++++++++++++--- retroshare-gui/src/gui/PeersDialog.ui | 13 +++++++--- retroshare-gui/src/gui/SearchDialog.ui | 8 ++++--- retroshare-gui/src/gui/SharedFilesDialog.cpp | 14 +++-------- retroshare-gui/src/gui/SharedFilesDialog.ui | 10 ++++++-- retroshare-gui/src/gui/TransfersDialog.ui | 16 +++++++++---- 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index 89686c73d..9f65fd6d0 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -608,12 +608,18 @@ border: 1px solid #CCCCCC;} + + + Arial + 10 + + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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;"><span style=" font-family:'Arial'; font-size:9pt; font-weight:600;">Forums</span></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; 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;"><span style=" font-family:'Arial'; font-weight:600;">Forums</span></p></body></html> diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 4893a7ec5..3dec6d84e 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -124,6 +124,18 @@ + + + 0 + 32 + + + + + 16777215 + 32 + + QFrame#frame{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, @@ -159,11 +171,18 @@ border: 1px solid #CCCCCC;} + + + Arial + 10 + + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!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:'Arial'; font-size:10pt; 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;">Network:</span></p></body></html> +</style></head><body style=" font-family:'Arial'; 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;"><span style=" font-weight:600;">Network:</span></p></body></html> diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index bbef58bbb..c51b48926 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -534,11 +534,18 @@ border: 1px solid #CCCCCC;} + + + Arial + 10 + + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!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:'Arial'; 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> +</style></head><body style=" font-family:'Arial'; 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;"><span style=" font-weight:600;">Friends</span></p></body></html> diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui index e439ffb9a..bc7a7aeb5 100644 --- a/retroshare-gui/src/gui/SearchDialog.ui +++ b/retroshare-gui/src/gui/SearchDialog.ui @@ -550,7 +550,7 @@ border-image: url(:/images/btn_26_pressed.png) 4; 16777215 - 38 + 32 @@ -784,8 +784,8 @@ border-image: url(:/images/btn3.png) 4; - 24 - 24 + 22 + 22 @@ -803,6 +803,8 @@ border-image: url(:/images/btn3.png) 4; + Arial + 10 75 true diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index 6ff5f69d2..1b74ec1d3 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -800,7 +800,7 @@ void SharedFilesDialog::showFrame(bool show) ui.splittedButton->setChecked(false); /* set textcolor for Channel name */ - QString labelStr("%1"); ui.labeltext->setText( labelStr.arg(tr("My Shared Files"))); @@ -817,11 +817,7 @@ void SharedFilesDialog::showFrameRemote(bool show) ui.localButton->setChecked(false); ui.splittedButton->setChecked(false); - /* set textcolor for Channel name */ - QString label1Str("%1"); - - ui.labeltext->setText( label1Str.arg(tr("Friends Files"))); + ui.labeltext->setText( tr("Friends Files")); } } @@ -836,11 +832,7 @@ void SharedFilesDialog::showFrameSplitted(bool show) ui.localButton->setChecked(false); ui.remoteButton->setChecked(false); - /* set textcolor for Channel name */ - QString label2Str("%1"); - - ui.labeltext->setText( label2Str.arg(tr("Files"))); + ui.labeltext->setText( tr("Files")); } } diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index cea51a1e3..fa04dc45f 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -553,12 +553,18 @@ border: 1px solid #CCCCCC;} 16 + + + Arial + 10 + + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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;"><span style=" font-size:10pt; font-weight:600;">Files</span></p></body></html> +</style></head><body style=" font-family:'Arial'; font-size:11pt; 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;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">Files</span></p></body></html> diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index 299d000ea..6f68a1a42 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -549,11 +549,17 @@ + + + 10 + + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!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:'Arial'; 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;">Downloads:</span></p></body></html> +</style></head><body style=" font-family:'Arial'; 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;"><span style=" font-weight:600;">Downloads:</span></p></body></html> @@ -681,8 +687,8 @@ p, li { white-space: pre-wrap; } 0 0 - 596 - 104 + 100 + 30