diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 0e924c30c..6f1a5319f 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -6,8 +6,8 @@ 0 0 - 759 - 557 + 760 + 579 @@ -505,117 +505,232 @@ Qt::DefaultContextMenu - - - - - - 28 - 28 - + + + 0 + + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} - - - 28 - 28 - + + QFrame::StyledPanel - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + QFrame::Raised + + + + 2 + + + + + + 28 + 28 + + + + + 28 + 28 + + + + <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;">New Message</p></body></html> - - - - - - - - - - 24 - 24 - - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + + + + 24 + 24 + + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + <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;">reply to selected message</p></body></html> - - - - - - - - - - 24 - 24 - - + + + + + + + + + + 24 + 24 + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + <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;">remove selected message</p></body></html> + + + + + + + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + Qt::Horizontal + + + + 529 + 20 + + + + + - - - - - 28 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - - - - - Qt::Horizontal - - - - 541 - 20 - - - - - + Qt::Horizontal @@ -1146,96 +1261,6 @@ p, li { white-space: pre-wrap; } - - - - - 28 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - <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;">remove selected message</p></body></html> - - - - - - - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - - 28 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 59a905227..7b967580b 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -18,7 +18,7 @@ 6 - 6 + 9 6 @@ -39,71 +39,15 @@ Network + + 6 + 0 0 - - - - 0 - - - 6 - - - - - - 22 - 22 - - - - - - - :/images/rs1.png - - - true - - - - - - - <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> - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Menu - - - - - @@ -491,6 +435,99 @@ p, li { white-space: pre-wrap; } + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + 1 + + + 6 + + + + + + 22 + 22 + + + + + + + :/images/rs1.png + + + true + + + + + + + <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> + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <!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-weight:600;">Display</span></p></body></html> + + + QPushButton::menu-indicator { +subcontrol-origin: padding; +subcontrol-position: bottom right; +} + + + + + + + + + :/images/looknfeel.png:/images/looknfeel.png + + + false + + + true + + + + + + diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui index e21407a2b..ccd18399a 100644 --- a/retroshare-gui/src/gui/SearchDialog.ui +++ b/retroshare-gui/src/gui/SearchDialog.ui @@ -661,6 +661,9 @@ p, li { white-space: pre-wrap; } + + Start Search + Search @@ -668,6 +671,9 @@ p, li { white-space: pre-wrap; } + + Reset + Reset @@ -680,7 +686,7 @@ p, li { white-space: pre-wrap; } - 88 + 50 20 @@ -688,6 +694,9 @@ p, li { white-space: pre-wrap; } + + Advanced Search + Advanced diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index f54e0bfc0..943c1c25c 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -734,8 +734,12 @@ void SharedFilesDialog::showFrame(bool show) ui.remoteButton->setChecked(false); ui.splittedButton->setChecked(false); + + /* set textcolor for Channel name */ + QString labelStr("%1"); - ui.labeltext->setText(tr("My Shared Files")); + ui.labeltext->setText( labelStr.arg(tr("My Shared Files"))); } } @@ -749,7 +753,11 @@ void SharedFilesDialog::showFrameRemote(bool show) ui.localButton->setChecked(false); ui.splittedButton->setChecked(false); - ui.labeltext->setText(tr("Friends Files")); + /* set textcolor for Channel name */ + QString label1Str("%1"); + + ui.labeltext->setText( label1Str.arg(tr("Friends Files"))); } } @@ -763,7 +771,11 @@ void SharedFilesDialog::showFrameSplitted(bool show) ui.localButton->setChecked(false); ui.remoteButton->setChecked(false); + + /* set textcolor for Channel name */ + QString label2Str("%1"); - ui.labeltext->setText(tr("Files")); + ui.labeltext->setText( label2Str.arg(tr("Files"))); } } diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 758c0a9d7..efe0834f7 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -6,8 +6,8 @@ 0 0 - 672 - 384 + 525 + 297 @@ -488,175 +488,184 @@ Qt::NoContextMenu - - - 6 - - - 0 - - - 6 - - - 6 - - - 6 - + 0 - - - QLayout::SetFixedSize + + + + 0 + 0 + - - 9 + + + 0 + 32 + - - 0 + + + 16777215 + 32 + - - - - - 16777215 - 16 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + 2 + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/fileshare16.png + + + + + + + + 16777215 + 16 + + + + <!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> - - - - - - - - 16 - 16 - - - - - - - :/images/fileshare16.png - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 100 - 20 - - - - - - - - - 24 - 24 - - - - Splitted View - - - - - - - :/images/view_split_top_bottom.png:/images/view_split_top_bottom.png - - - true - - - true - - - true - + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 100 + 20 + + + + + + + + + 24 + 24 + + + + Splitted View + + + + + + + :/images/view_split_top_bottom.png:/images/view_split_top_bottom.png + + + true + + + true + + + true + + + + + + + + 24 + 24 + + + + Friends Folders + + + + + + + :/images/friendsfolder24.png:/images/friendsfolder24.png + + + true + + + false + + + true + + + + + + + + 24 + 24 + + + + My Folders + + + + + + + :/images/folder16.png:/images/folder16.png + + + true + + + false + + + true + + + + - - - - - 24 - 24 - - - - Friends Folders - - - - - - - :/images/friendsfolder24.png:/images/friendsfolder24.png - - - true - - - false - - - true - - - - - - - - 24 - 24 - - - - My Folders - - - - - - - :/images/folder16.png:/images/folder16.png - - - true - - - false - - - true - - - - + Qt::Vertical @@ -751,58 +760,65 @@ p, li { white-space: pre-wrap; } - - - - - 140 - 0 - + + + + 2 - - - 16777215 - 28 - - - - Download selected - - - Download - - - - :/images/download16.png:/images/download16.png - - - - - - - Qt::Horizontal - - - - 391 - 20 - - - - - - - - check files - - - - - - - - - + + + + + 140 + 0 + + + + + 16777215 + 28 + + + + Download selected + + + Download + + + + :/images/download16.png:/images/download16.png + + + + + + + Qt::Horizontal + + + + 391 + 20 + + + + + + + + check files + + + + + + + + + + +