From 8f5e91727eb9bcec7f0c49a4f176a6cc5d58280e Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 23 Oct 2008 15:22:35 +0000 Subject: [PATCH] * created MessengerWindow new, old one was corrupt, stylesheets does not more worked. * add a QFrame for can use Stylesheet of Top of the MessengerWindow Background, later to can hide it. * added stylesheets for QFrame#messengerframetop git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@762 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessengerWindow.ui | 915 +++++------------- retroshare-gui/src/release/qss/black.qss | 7 + retroshare-gui/src/release/qss/blue.qss | 6 + retroshare-gui/src/release/qss/default.qss | 12 +- retroshare-gui/src/release/qss/ed2k.qss | 5 + .../src/release/qss/orangesurfer.qss | 10 +- retroshare-gui/src/release/qss/over.qss | 5 + retroshare-gui/src/release/qss/red.qss | 8 + retroshare-gui/src/release/qss/silver.qss | 9 + retroshare-gui/src/release/qss/silvergrey.qss | 6 + retroshare-gui/src/release/qss/skin2.qss | 4 + retroshare-gui/src/release/qss/uus.qss | 8 + retroshare-gui/src/release/qss/wx.qss | 7 + retroshare-gui/src/release/qss/yaba.qss | 8 + retroshare-gui/src/release/qss/yeah.qss | 10 +- 15 files changed, 342 insertions(+), 678 deletions(-) diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui index 9ab392cc9..51b85b86b 100644 --- a/retroshare-gui/src/gui/MessengerWindow.ui +++ b/retroshare-gui/src/gui/MessengerWindow.ui @@ -1,702 +1,275 @@ MessengerWindow - + 0 0 - 262 - 482 + 282 + 534 - - - - - - - 0 - 0 - 0 - - - - - - - 244 - 244 - 244 - - - - - - - 244 - 244 - 244 - - - - - - - 241 - 239 - 226 - - - - - - - 140 - 140 - 140 - - - - - - - 163 - 163 - 163 - - - - - - - 0 - 0 - 0 - - - - - - - 244 - 244 - 244 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 236 - 243 - 246 - - - - - - - 106 - 106 - 106 - - - - - - - 197 - 231 - 246 - - - - - - - 0 - 0 - 0 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 244 - 244 - 244 - - - - - - - 244 - 244 - 244 - - - - - - - 241 - 239 - 226 - - - - - - - 140 - 140 - 140 - - - - - - - 163 - 163 - 163 - - - - - - - 0 - 0 - 0 - - - - - - - 244 - 244 - 244 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 236 - 243 - 246 - - - - - - - 106 - 106 - 106 - - - - - - - 244 - 244 - 244 - - - - - - - 0 - 0 - 0 - - - - - - - 232 - 232 - 232 - - - - - - - - - 122 - 122 - 122 - - - - - - - 244 - 244 - 244 - - - - - - - 244 - 244 - 244 - - - - - - - 244 - 244 - 244 - - - - - - - 140 - 140 - 140 - - - - - - - 163 - 163 - 163 - - - - - - - 122 - 122 - 122 - - - - - - - 244 - 244 - 244 - - - - - - - 122 - 122 - 122 - - - - - - - 244 - 244 - 244 - - - - - - - 236 - 243 - 246 - - - - - - - 0 - 0 - 0 - - - - - - - 197 - 231 - 246 - - - - - - - 0 - 0 - 0 - - - - - - - 232 - 232 - 232 - - - - - - - - - - - Qt::NoContextMenu + + RetroShare Messenger - :/images/rstray3.png + + :/images/rstray3.png:/images/rstray3.png - - - - - - - 0 + + + + 0 + 23 + 282 + 511 + - - 0 - - - 0 - - - 0 - - - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + 0 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + + + 4 + + + 6 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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;">Click to change your avatar</p></body></html> - - - :/images/retrosharelogo1.png - - - - 70 - 70 - - - - true - - - - - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 6 - - - - - false - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + :/images/retrosharelogo1.png:/images/retrosharelogo1.png + + + + 70 + 70 + + + + true + + + + + + + 4 + + + 6 + + + + + false + + + <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;">Change your Status and your display</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">picture here.</p></body></html> - - - QComboBox::NoInsert - - - true - - - 0 - - - - Online - - - :/images/donline.png - - - - - Busy - - - :/images/dbusy.png - - - - - Be right Back - - - :/images/dbrb.png - - - - - Away - - - :/images/daway.png - - - - - In a Call - - - :/images/dphone.png - - - - - Out of lunch - - - :/images/dlunch.png - - - - - Apear Offline - - - :/images/dhidden.png - - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + QComboBox::NoInsert + + + true + + + 0 + + + + Online + + + + :/images/donline.png:/images/donline.png + + + + + Busy + + + + :/images/dbusy.png:/images/dbusy.png + + + + + Be right Back + + + + :/images/dbrb.png:/images/dbrb.png + + + + + Away + + + + :/images/daway.png:/images/daway.png + + + + + In a Call + + + + :/images/dphone.png:/images/dphone.png + + + + + Out of lunch + + + + :/images/dlunch.png:/images/dlunch.png + + + + + Apear Offline + + + + :/images/dhidden.png:/images/dhidden.png + + + + + + + + <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;">Share a personal message with your contacts</p></body></html> - - - true - - + + + true + + + + + + - - - - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - Qt::CustomContextMenu - - - - 18 - 18 - - - - 0 - - - - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + 9 + + + 6 + + + + + Qt::CustomContextMenu + + + + 18 + 18 + + + + 0 + + + + + + + + + + <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;">Add a Friend</p></body></html> - - - - - - :/images/dadd.png - - - - 22 - 22 - - - - Qt::ToolButtonTextBesideIcon - - - true - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - + + + + + + + :/images/dadd.png:/images/dadd.png + + + + 22 + 22 + + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + + + + + 0 + 0 + 282 + 23 + + + - - statuscomboBox - messagecomboBox - searchlineEdit - addIMAccountButton - messengertreeWidget - avatarButton - diff --git a/retroshare-gui/src/release/qss/black.qss b/retroshare-gui/src/release/qss/black.qss index 1dc553faa..0e05093b9 100644 --- a/retroshare-gui/src/release/qss/black.qss +++ b/retroshare-gui/src/release/qss/black.qss @@ -223,3 +223,10 @@ QTreeWidget::item:selected { /* when user selects item using mouse or keyboard * background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #848D9B, stop:1 #394152); } + +QFrame#messengerframetop{ + + 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 1b061de3e..155141a08 100644 --- a/retroshare-gui/src/release/qss/blue.qss +++ b/retroshare-gui/src/release/qss/blue.qss @@ -59,4 +59,10 @@ QStatusBar{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E3EFFF, stop: 1 #87ADE4); +} + +QFrame#messengerframetop{ + + 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 4ec2942a4..317f622ed 100644 --- a/retroshare-gui/src/release/qss/default.qss +++ b/retroshare-gui/src/release/qss/default.qss @@ -1,5 +1,6 @@ .QWidget { background-color: #ECF3F6; + } /* Customize the toolbar. */ @@ -8,11 +9,6 @@ QToolBar { } -/* Customize the Menu Bar. */ -QMenuBar { - border-image: url(:/qss/default/retrotoolbar.png); - -} QPushButton#okButton { @@ -45,3 +41,9 @@ QPushButton#cancelButton { min-width: 77px; max-width: 77px; } + +QFrame#messengerframetop{ + + border-image: url(qss/default/rsdefault.png); + +} \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/ed2k.qss b/retroshare-gui/src/release/qss/ed2k.qss index f106d02eb..cfc3b3cc5 100644 --- a/retroshare-gui/src/release/qss/ed2k.qss +++ b/retroshare-gui/src/release/qss/ed2k.qss @@ -121,3 +121,8 @@ QPushButton#nviewsettingsButton min-width: 75px; } +QFrame#messengerframetop{ + + border-image: url(qss/ed2k/backed2k.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 d4afa9fa9..2593791bd 100644 --- a/retroshare-gui/src/release/qss/orangesurfer.qss +++ b/retroshare-gui/src/release/qss/orangesurfer.qss @@ -113,4 +113,12 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ border-image: url(qss/orangesurfer/border.png); -} \ No newline at end of file +} + +QFrame#messengerframetop{ + + border-image: url(qss/orangesurfer/main.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} diff --git a/retroshare-gui/src/release/qss/over.qss b/retroshare-gui/src/release/qss/over.qss index 9341c0621..b2fdebf42 100644 --- a/retroshare-gui/src/release/qss/over.qss +++ b/retroshare-gui/src/release/qss/over.qss @@ -123,3 +123,8 @@ background-color: #66ff33; } +QFrame#messengerframetop{ + + border-image: url(qss/over/backover.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 821eca740..57bd2d7f0 100644 --- a/retroshare-gui/src/release/qss/red.qss +++ b/retroshare-gui/src/release/qss/red.qss @@ -131,4 +131,12 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 red, stop: 1 darkred); +} + +QFrame#messengerframetop{ + + border-image: url(qss/red/red.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ } \ 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 1f3ceb760..1d6ec6c68 100644 --- a/retroshare-gui/src/release/qss/silver.qss +++ b/retroshare-gui/src/release/qss/silver.qss @@ -53,4 +53,13 @@ QStatusBar{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F9F9FF, stop: 1 #9F9DB9); +} + +QFrame#messengerframetop{ + + border-image: url(qss/silver/silver.png); + + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ } \ No newline at end of file diff --git a/retroshare-gui/src/release/qss/silvergrey.qss b/retroshare-gui/src/release/qss/silvergrey.qss index 5b3660dbf..4f00a9bff 100644 --- a/retroshare-gui/src/release/qss/silvergrey.qss +++ b/retroshare-gui/src/release/qss/silvergrey.qss @@ -97,3 +97,9 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ stop:0 #6F6F6F, stop:1 #979797); } + +QFrame#messengerframetop{ + + 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 dacce6572..9d59392a9 100644 --- a/retroshare-gui/src/release/qss/skin2.qss +++ b/retroshare-gui/src/release/qss/skin2.qss @@ -30,3 +30,7 @@ QPushButton#applyButton { max-height: 25px; min-width: 75px; } +QFrame#messengerframetop{ + + 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 4942f884a..656f4b525 100644 --- a/retroshare-gui/src/release/qss/uus.qss +++ b/retroshare-gui/src/release/qss/uus.qss @@ -154,4 +154,12 @@ 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); +} + +QFrame#messengerframetop{ + + border-image: url(qss/uus/uus.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ } \ 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 7dc7990a3..c7fdd4017 100644 --- a/retroshare-gui/src/release/qss/wx.qss +++ b/retroshare-gui/src/release/qss/wx.qss @@ -31,3 +31,10 @@ QPushButton#applyButton { } +QFrame#messengerframetop{ + + border-image: url(qss/wx/wx.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ +} \ 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 b8c1964b0..139e5e5fa 100644 --- a/retroshare-gui/src/release/qss/yaba.qss +++ b/retroshare-gui/src/release/qss/yaba.qss @@ -97,4 +97,12 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FBC957, stop: 1 #D79704); +} + +QFrame#messengerframetop{ + + border-image: url(qss/yaba/yaba.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ } \ 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 27ead364c..92b91a60a 100644 --- a/retroshare-gui/src/release/qss/yeah.qss +++ b/retroshare-gui/src/release/qss/yeah.qss @@ -91,9 +91,17 @@ QTreeWidget::item:selected { /* when user selects item using mouse or keyboard * stop:0 #FBC957, stop:1 #D79704); } -TreeView::item:selected { /* when user selects item using mouse or keyboard */ +QTreeView::item:selected { /* when user selects item using mouse or keyboard */ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FBC957, stop: 1 #D79704); +} + +QFrame#messengerframetop{ + + border-image: url(qss/yeah/yeah.png); + + /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #F7B552, stop: 1 #FF5E07);*/ } \ No newline at end of file