From 959f04e5e0ffe5f915a41ff99795cf721b09c8c5 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 11 Dec 2012 16:58:13 +0000 Subject: [PATCH] removed html from the warning label, and added stylesheet git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5967 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/qss/stylesheet/Standard.qss | 7 ++ retroshare-gui/src/gui/settings/ServerPage.ui | 66 ++++++++++++++----- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 885121f2e..8f66b9ab1 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -394,3 +394,10 @@ ConfCertDialog QPlainTextEdit#plainTextEdit { background: #FFFFD7; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); } + +ServerPage QPlainTextEdit#plainTextEdit { + border: 1px solid #DCDC41; + border-radius: 6px; + background: #FFFFD7; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); +} diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index a0e82daf5..2a02d635c 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -7,7 +7,7 @@ 0 0 573 - 400 + 421 @@ -357,22 +357,50 @@ behind a firewall or a VPN. Turtle router - - - - - <!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:'Ubuntu'; font-size:11pt; font-weight:600;">Warning</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:600;"></p> -<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:'Ubuntu'; font-size:11pt; font-weight:600;"><br /></span></p> -<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:'Ubuntu'; font-size:11pt; font-weight:600;"> </span><span style=" font-family:'Ubuntu'; font-size:11pt;">This tab contains hard-core parameters which are unlikely to need modification. Don't change them unless you really know what you're doing. </span></p></body></html> + + + + + + 24 + 24 + + + + + + + :/images/informations_24x24.png - + + + + + 11 + 75 + true + + + + Warning + + + + + + + + 11 + + + + This tab contains hard-core parameters which are unlikely to need modification. Don't change them unless you really know what you're doing. + + + + @@ -408,7 +436,7 @@ The default value is 20. - + Unchecking this disables all anonymous routing activity, except cache cleaning. Incoming tunnel requests are discarded, and no tunnel requests are sent to anyone. @@ -418,7 +446,7 @@ The default value is 20. - + Qt::Vertical @@ -452,9 +480,11 @@ The default value is 20. totalUploadRate allowIpDeterminationCB IPServersLV - textBrowser + plainTextEdit _max_tr_up_per_sec_SB - + + +