From b1f727d080e29ccfe68bbc6514e66aaaaf30369a Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 23 Oct 2008 23:37:15 +0000 Subject: [PATCH] * added a QFrame for the Background of the PushButtons in ChatWindow * some updates for stylesheets git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@766 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/chat/PopupChatDialog.ui | 651 +++++++++--------- retroshare-gui/src/release/qss/black.qss | 13 +- retroshare-gui/src/release/qss/blue.qss | 6 + retroshare-gui/src/release/qss/default.qss | 6 + .../src/release/qss/orangesurfer.qss | 6 + retroshare-gui/src/release/qss/qlive.qss | 6 + retroshare-gui/src/release/qss/red.qss | 14 +- retroshare-gui/src/release/qss/silver.qss | 8 +- retroshare-gui/src/release/qss/silvergrey.qss | 6 + retroshare-gui/src/release/qss/skin2.qss | 6 + retroshare-gui/src/release/qss/uus.qss | 23 +- retroshare-gui/src/release/qss/wx.qss | 6 + retroshare-gui/src/release/qss/yaba.qss | 6 + retroshare-gui/src/release/qss/yeah.qss | 6 + 14 files changed, 437 insertions(+), 326 deletions(-) diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index 4378997e6..e3e4186a8 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -5,322 +5,55 @@ 0 0 - 573 - 410 + 484 + 401 MainWindow - + + + 0 + 12 + 484 + 368 + + + 0 + + 0 + + + 0 + - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - 16777215 - 42 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - - - Qt::Horizontal - - - - 291 - 24 - - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Bold - - - - - - C:/Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Underline - - - - - - C:/Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Italic - - - - - - C:/Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Set Font - - - - - - C:/Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Text Color - - - - - - - - - - - 0 - 0 - - - - - 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:'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;">Set Chat Window Style</p></body></html> - - - - - - - 24 - 24 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - Qt::Horizontal - - - - 351 - 20 - - - - - - - - Send - - - - - - + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + - + QFrame::StyledPanel @@ -356,7 +89,7 @@ p, li { white-space: pre-wrap; } - QLabel{ + QLabel{ border-image: url(:/images/mystatus_bg.png); } @@ -374,7 +107,7 @@ border-image: url(:/images/mystatus_bg.png); Qt::Vertical - + 61 141 @@ -397,7 +130,7 @@ border-image: url(:/images/mystatus_bg.png); - QLabel{ + QLabel{ border-image: url(:/images/mystatus_bg.png); } @@ -418,7 +151,7 @@ border-image: url(:/images/mystatus_bg.png); QSizePolicy::Fixed - + 61 41 @@ -429,7 +162,7 @@ border-image: url(:/images/mystatus_bg.png); - + @@ -464,7 +197,7 @@ border-image: url(:/images/mystatus_bg.png); Qt::Vertical - + 14 321 @@ -474,10 +207,304 @@ border-image: url(:/images/mystatus_bg.png); + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 6 + + + + + Qt::Horizontal + + + + 190 + 25 + + + + + + + + + 0 + 0 + + + + + 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:'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;">Set Chat Window Style</p></body></html> + + + + + + + 24 + 24 + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Bold + + + + + + + C:/Dokumente und Einstellungen/Linux/.designer/backupC:/Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Underline + + + + + + + C:/Dokumente und Einstellungen/Linux/.designer/backupC:/Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Italic + + + + + + + C:/Dokumente und Einstellungen/Linux/.designer/backupC:/Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Set Font + + + + + + + C:/Dokumente und Einstellungen/Linux/.designer/backupC:/Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Text Color + + + + + + + + + + + + + + 0 + 0 + + + + + + + + 0 + + + 2 + + + 2 + + + 6 + + + + + Qt::Horizontal + + + + 351 + 20 + + + + + + + + Send + + + + + - + + + + 0 + 380 + 484 + 21 + + + + + + 0 + 0 + 484 + 12 + + toolBar diff --git a/retroshare-gui/src/release/qss/black.qss b/retroshare-gui/src/release/qss/black.qss index 0e05093b9..b7f8d080a 100644 --- a/retroshare-gui/src/release/qss/black.qss +++ b/retroshare-gui/src/release/qss/black.qss @@ -133,9 +133,13 @@ border-image: url(qss/black/button_hover.png); QPushButton:pressed { -border-image: url(qss/black/button_pressed.png) ; +border-image: url(qss/black/button_pressedAndHover.png) ; } +QPushButton:checked +{ +border-image: url(qss/black/button_pressed.png) ; +} QSplitter { @@ -229,4 +233,9 @@ QFrame#messengerframetop{ border-image: url(qss/black/backgroundblack.png); } - \ No newline at end of file + +QFrame#Chatbuttonframe{ + + border-image: url(qss/black/backgroundblack.png); + +} \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/blue.qss b/retroshare-gui/src/release/qss/blue.qss index 155141a08..9b6ae2a40 100644 --- a/retroshare-gui/src/release/qss/blue.qss +++ b/retroshare-gui/src/release/qss/blue.qss @@ -65,4 +65,10 @@ QFrame#messengerframetop{ border-image: url(qss/blue/blue.png); +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/blue/blue.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/default.qss b/retroshare-gui/src/release/qss/default.qss index 454fc75f3..64a1436c9 100644 --- a/retroshare-gui/src/release/qss/default.qss +++ b/retroshare-gui/src/release/qss/default.qss @@ -14,4 +14,10 @@ QFrame#messengerframetop{ border-image: url(qss/default/rsdefault.png); +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/default/rsdefault.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/orangesurfer.qss b/retroshare-gui/src/release/qss/orangesurfer.qss index 2593791bd..19e9ac1de 100644 --- a/retroshare-gui/src/release/qss/orangesurfer.qss +++ b/retroshare-gui/src/release/qss/orangesurfer.qss @@ -122,3 +122,9 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ } + +QFrame#Chatbuttonframe{ + + border-image: url(qss/orangesurfer/main.png); + +} \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/qlive.qss b/retroshare-gui/src/release/qss/qlive.qss index 2ac01a167..685164807 100644 --- a/retroshare-gui/src/release/qss/qlive.qss +++ b/retroshare-gui/src/release/qss/qlive.qss @@ -42,4 +42,10 @@ QFrame#messengerframetop{ border-image: url(qss/qlive/qb.png); +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/qlive/qb.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/red.qss b/retroshare-gui/src/release/qss/red.qss index 57bd2d7f0..115b69986 100644 --- a/retroshare-gui/src/release/qss/red.qss +++ b/retroshare-gui/src/release/qss/red.qss @@ -26,8 +26,8 @@ QToolButton::pressed { } QPushButton { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 red, stop: 1 darkred); + /* background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 red, stop: 1 darkred);*/ } QPushButton#okButton { @@ -99,6 +99,10 @@ QStatusBar{ } +QToolTip{ + background-color: #3E1716; +} + QMenu { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 red, stop: 1 darkred); @@ -139,4 +143,10 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/red/red.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/silver.qss b/retroshare-gui/src/release/qss/silver.qss index 1d6ec6c68..a706f8665 100644 --- a/retroshare-gui/src/release/qss/silver.qss +++ b/retroshare-gui/src/release/qss/silver.qss @@ -62,4 +62,10 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ -} \ No newline at end of file +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/silver/silver.png); + +} diff --git a/retroshare-gui/src/release/qss/silvergrey.qss b/retroshare-gui/src/release/qss/silvergrey.qss index 4f00a9bff..ebc003903 100644 --- a/retroshare-gui/src/release/qss/silvergrey.qss +++ b/retroshare-gui/src/release/qss/silvergrey.qss @@ -100,6 +100,12 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ QFrame#messengerframetop{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #6F6F6F, stop:1 #979797); +} + +QFrame#Chatbuttonframe{ + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #6F6F6F, stop:1 #979797); } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/skin2.qss b/retroshare-gui/src/release/qss/skin2.qss index 9d59392a9..19ba567d5 100644 --- a/retroshare-gui/src/release/qss/skin2.qss +++ b/retroshare-gui/src/release/qss/skin2.qss @@ -33,4 +33,10 @@ QPushButton#applyButton { QFrame#messengerframetop{ border-image: url(qss/skin2/background.png); +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/skin2/background.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/uus.qss b/retroshare-gui/src/release/qss/uus.qss index 656f4b525..a800a86af 100644 --- a/retroshare-gui/src/release/qss/uus.qss +++ b/retroshare-gui/src/release/qss/uus.qss @@ -93,25 +93,24 @@ QPushButton#applyButton { } QPushButton { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BDDF7D, stop: 1 #49881F); border: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #BDDF7D, stop: 1 #49881F); + stop: 0 #BDDF7D, stop: 1 #49881F);*/ } QPushButton::hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #F0F8CB, stop: 1 #F0F8CD); + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F0F8CB, stop: 1 #F0F8CD);*/ } QPushButton::pressed { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #F5FFBC, stop: 1 #609C08); + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F5FFBC, stop: 1 #609C08);*/ } - QLabel { color: white; @@ -152,8 +151,7 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ } QToolTip{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #376D85, stop: 0.4 #185772); + background-color: black; } QFrame#messengerframetop{ @@ -162,4 +160,11 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} + +QFrame#Chatbuttonframe{ + + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #BDDF7D, stop: 1 #49881F); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/wx.qss b/retroshare-gui/src/release/qss/wx.qss index c7fdd4017..5efd295c2 100644 --- a/retroshare-gui/src/release/qss/wx.qss +++ b/retroshare-gui/src/release/qss/wx.qss @@ -37,4 +37,10 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/wx/wx.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/yaba.qss b/retroshare-gui/src/release/qss/yaba.qss index 139e5e5fa..f9622435b 100644 --- a/retroshare-gui/src/release/qss/yaba.qss +++ b/retroshare-gui/src/release/qss/yaba.qss @@ -105,4 +105,10 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/yaba/yaba.png); + } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/yeah.qss b/retroshare-gui/src/release/qss/yeah.qss index 92b91a60a..f8ac3f484 100644 --- a/retroshare-gui/src/release/qss/yeah.qss +++ b/retroshare-gui/src/release/qss/yeah.qss @@ -104,4 +104,10 @@ QFrame#messengerframetop{ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} + +QFrame#Chatbuttonframe{ + + border-image: url(qss/yeah/yeah.png); + } \ No newline at end of file