diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index 7c3693320..081b6e044 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -1101,7 +1101,7 @@ void p3ConnectMgr::tickMonitors() if (notify) { notify->AddPopupMessage(RS_POPUP_CONNECT, - peer.id, "Peer Online: "); + peer.id, "Online: "); notify->AddFeedItem(RS_FEED_ITEM_PEER_CONNECT, peer.id, "", ""); diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc index 4e4f2395f..5a8dedc58 100644 --- a/libretroshare/src/services/p3msgservice.cc +++ b/libretroshare/src/services/p3msgservice.cc @@ -148,7 +148,7 @@ int p3MsgService::incomingMsgs() if (notify) { notify->AddPopupMessage(RS_POPUP_MSG, mi->PeerId(), - "New Message from: "); + "from: "); std::ostringstream out; out << mi->msgId; diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index f7cbbbe55..3b43fdf80 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -504,7 +504,7 @@ Qt::DefaultContextMenu - + @@ -526,7 +526,7 @@ p, li { white-space: pre-wrap; } <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> - + @@ -563,7 +563,7 @@ p, li { white-space: pre-wrap; } <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> - + @@ -597,7 +597,7 @@ p, li { white-space: pre-wrap; } <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> - + @@ -646,7 +646,7 @@ p, li { white-space: pre-wrap; } Qt::Horizontal - + 602 24 @@ -698,8 +698,7 @@ p, li { white-space: pre-wrap; } Inbox - - :/images/folder-inbox.png:/images/folder-inbox.png + :/images/folder-inbox.png @@ -707,8 +706,7 @@ p, li { white-space: pre-wrap; } Outbox - - :/images/folder-outbox.png:/images/folder-outbox.png + :/images/folder-outbox.png @@ -716,8 +714,7 @@ p, li { white-space: pre-wrap; } Draft - - :/images/folder-draft.png:/images/folder-draft.png + :/images/folder-draft.png @@ -725,8 +722,7 @@ p, li { white-space: pre-wrap; } Sent - - :/images/folder-sent.png:/images/folder-sent.png + :/images/folder-sent.png @@ -758,8 +754,7 @@ p, li { white-space: pre-wrap; } - - :/images/attachment.png:/images/attachment.png + :/images/attachment.png @@ -782,6 +777,18 @@ p, li { white-space: pre-wrap; } + + 6 + + + 0 + + + 0 + + + 0 + @@ -792,7 +799,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Preferred - + 20 40 @@ -804,8 +811,14 @@ p, li { white-space: pre-wrap; } + + 0 + + + 3 + - + 0 @@ -815,7 +828,7 @@ p, li { white-space: pre-wrap; } 60 - 10 + 12 @@ -847,7 +860,7 @@ p, li { white-space: pre-wrap; } 0 - 10 + 12 @@ -862,7 +875,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -872,7 +885,7 @@ p, li { white-space: pre-wrap; } 60 - 10 + 12 @@ -904,7 +917,7 @@ p, li { white-space: pre-wrap; } 0 - 10 + 12 @@ -919,7 +932,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -929,7 +942,7 @@ p, li { white-space: pre-wrap; } 60 - 10 + 12 @@ -961,7 +974,7 @@ p, li { white-space: pre-wrap; } 0 - 10 + 12 @@ -976,7 +989,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -986,7 +999,7 @@ p, li { white-space: pre-wrap; } 60 - 10 + 12 @@ -1018,7 +1031,7 @@ p, li { white-space: pre-wrap; } 0 - 10 + 12 @@ -1050,10 +1063,22 @@ p, li { white-space: pre-wrap; } - + 0 - + + 0 + + + 0 + + + 0 + + + 6 + + 6 @@ -1095,8 +1120,7 @@ p, li { white-space: pre-wrap; } - - :/images/edit_remove24.png:/images/edit_remove24.png + :/images/edit_remove24.png @@ -1107,7 +1131,7 @@ p, li { white-space: pre-wrap; } Qt::Horizontal - + 351 20 @@ -1127,8 +1151,7 @@ p, li { white-space: pre-wrap; } - - :/images/down.png:/images/down.png + :/images/down.png diff --git a/retroshare-gui/src/gui/qss/black.qss b/retroshare-gui/src/gui/qss/black.qss index 0e05093b9..310ff00a2 100644 --- a/retroshare-gui/src/gui/qss/black.qss +++ b/retroshare-gui/src/gui/qss/black.qss @@ -4,7 +4,7 @@ /* Customize the toolbar. */ QToolBar { - border-image: url(qss/black/backgroundblack.png); + border-image: url(:qss/black/backgroundblack.png); } @@ -123,17 +123,17 @@ QPushButton#nviewsettingsButton QPushButton { -border-image: url(qss/black/button.png) ; +border-image: url(:qss/black/button.png) ; } QPushButton:hover { -border-image: url(qss/black/button_hover.png); +border-image: url(:qss/black/button_hover.png); } QPushButton:pressed { -border-image: url(qss/black/button_pressed.png) ; +border-image: url(:qss/black/button_pressed.png) ; } @@ -144,7 +144,7 @@ background-color: #F9F9F9; QLineEdit { -border-image: url(qss/black/border.png) 4; +border-image: url(:qss/black/border.png) 4; border-width: 3; } @@ -162,39 +162,39 @@ font: bold; QRadioButton::indicator::unchecked { - image: url(qss/black/checkBox.png); + image: url(:qss/black/checkBox.png); } QRadioButton::indicator:unchecked:hover { - image: url(qss/black/checkBox_hover.png); + image: url(:qss/black/checkBox_hover.png); } QRadioButton::indicator::checked { - image: url(qss/black/checkBox_selected.png); + image: url(:qss/black/checkBox_selected.png); } QRadioButton::indicator:checked:hover { - image: url(qss/black/checkBox_hoverAndSelected.png); + image: url(:qss/black/checkBox_hoverAndSelected.png); } QCheckBox::indicator:unchecked { - image: url(qss/black/checkBox.png); + image: url(:qss/black/checkBox.png); } QCheckBox::indicator:unchecked:hover { - image: url(qss/black/checkBox_hover.png); + image: url(:qss/black/checkBox_hover.png); } QCheckBox::indicator:checked { - image: url(qss/black/checkBox_selected.png); + image: url(:qss/black/checkBox_selected.png); } QCheckBox::indicator:checked:hover { - image: url(qss/black/checkBox_hoverAndSelected.png); + image: url(:qss/black/checkBox_hoverAndSelected.png); } QMenu { @@ -225,8 +225,8 @@ QTreeWidget::item:selected { /* when user selects item using mouse or keyboard * } QFrame#messengerframetop{ - - border-image: url(qss/black/backgroundblack.png); + + border-image: url(:qss/black/backgroundblack.png); } \ No newline at end of file diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.cpp b/retroshare-gui/src/gui/toaster/MessageToaster.cpp index 9771bae06..b8239e04c 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.cpp +++ b/retroshare-gui/src/gui/toaster/MessageToaster.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + #include "MessageToaster.h" #include "ui_MessageToaster.h" @@ -24,30 +24,30 @@ #include "QtToaster.h" #include - + MessageToaster::MessageToaster() : QObject(NULL) { _messageToasterWidget = new QWidget(NULL); - - _ui = new Ui::MessageToaster(); - _ui->setupUi(_messageToasterWidget); - + + _ui = new Ui::MessageToaster(); + _ui->setupUi(_messageToasterWidget); + connect(_ui->messageButton, SIGNAL(clicked()), SLOT(chatButtonSlot())); connect(_ui->closeButton, SIGNAL(clicked()), SLOT(close())); _toaster = new QtToaster(_messageToasterWidget, _ui->windowFrame); - _toaster->setTimeOnTop(5000); -} + _toaster->setTimeOnTop(5000); +} MessageToaster::~MessageToaster() { delete _ui; } - -void MessageToaster::setMessage(const QString & message) { - _ui->messageButton->setText(message); -} + +void MessageToaster::setMessage(const QString & message) { + _ui->messagelabel2->setText(message); +} void MessageToaster::setPixmap(const QPixmap & pixmap) { _ui->pixmaplabel->setPixmap(pixmap); @@ -56,12 +56,12 @@ void MessageToaster::setPixmap(const QPixmap & pixmap) { void MessageToaster::show() { _toaster->show(); } - -void MessageToaster::close() { - _toaster->close(); -} - -void MessageToaster::chatButtonSlot() { - chatButtonClicked(); - close(); -} + +void MessageToaster::close() { + _toaster->close(); +} + +void MessageToaster::chatButtonSlot() { + chatButtonClicked(); + close(); +} diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui index 5e1fb4837..7cfb135df 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.ui +++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui @@ -10,10 +10,22 @@ - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -25,87 +37,42 @@ QFrame::Raised - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 - - - - Qt::Vertical - - - - 398 - 201 - - - - - - - - 0 - - - 6 - - - - - message - - - :/images/folder-inbox.png - - - - - - - Qt::Horizontal - - - - 124 - 56 - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 124 - 56 - - - - - - - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -149,8 +116,123 @@ + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Qt::Horizontal + + + + 119 + 56 + + + + + + + + New Message + + + :/images/folder-inbox.png + + + + + + + Qt::Horizontal + + + + 119 + 56 + + + + + + + + + + + + Qt::Horizontal + + + + 111 + 21 + + + + + + + + + + + + + + + Qt::Horizontal + + + + 111 + 20 + + + + + + + + + + Qt::Vertical + + + + 366 + 91 + + + + diff --git a/retroshare-gui/src/qss/black.qss b/retroshare-gui/src/qss/black.qss index b7f8d080a..a46f994d6 100644 --- a/retroshare-gui/src/qss/black.qss +++ b/retroshare-gui/src/qss/black.qss @@ -238,4 +238,36 @@ QFrame#Chatbuttonframe{ border-image: url(qss/black/backgroundblack.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} + \ No newline at end of file diff --git a/retroshare-gui/src/qss/blue.qss b/retroshare-gui/src/qss/blue.qss index 9b6ae2a40..a9bf79c84 100644 --- a/retroshare-gui/src/qss/blue.qss +++ b/retroshare-gui/src/qss/blue.qss @@ -71,4 +71,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/blue/blue.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/default.qss b/retroshare-gui/src/qss/default.qss index 64a1436c9..599f3017e 100644 --- a/retroshare-gui/src/qss/default.qss +++ b/retroshare-gui/src/qss/default.qss @@ -20,4 +20,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/default/rsdefault.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/ed2k.qss b/retroshare-gui/src/qss/ed2k.qss index cfc3b3cc5..2057ababa 100644 --- a/retroshare-gui/src/qss/ed2k.qss +++ b/retroshare-gui/src/qss/ed2k.qss @@ -125,4 +125,35 @@ QFrame#messengerframetop{ border-image: url(qss/ed2k/backed2k.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/noskin.qss b/retroshare-gui/src/qss/noskin.qss index a92a2fc9f..0ce4cd324 100644 --- a/retroshare-gui/src/qss/noskin.qss +++ b/retroshare-gui/src/qss/noskin.qss @@ -31,3 +31,34 @@ QPushButton#cancelButton { max-width: 77px; } +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} + diff --git a/retroshare-gui/src/qss/orangesurfer.qss b/retroshare-gui/src/qss/orangesurfer.qss index 19e9ac1de..a31b9d9f7 100644 --- a/retroshare-gui/src/qss/orangesurfer.qss +++ b/retroshare-gui/src/qss/orangesurfer.qss @@ -127,4 +127,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/orangesurfer/main.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/over.qss b/retroshare-gui/src/qss/over.qss index b2fdebf42..ea51952e7 100644 --- a/retroshare-gui/src/qss/over.qss +++ b/retroshare-gui/src/qss/over.qss @@ -127,4 +127,35 @@ QFrame#messengerframetop{ border-image: url(qss/over/backover.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/qlive.qss b/retroshare-gui/src/qss/qlive.qss index 685164807..7b49f0f0e 100644 --- a/retroshare-gui/src/qss/qlive.qss +++ b/retroshare-gui/src/qss/qlive.qss @@ -48,4 +48,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/qlive/qb.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/redscorpion.qss b/retroshare-gui/src/qss/redscorpion.qss index 44f99f97e..337cdb8b8 100644 --- a/retroshare-gui/src/qss/redscorpion.qss +++ b/retroshare-gui/src/qss/redscorpion.qss @@ -149,4 +149,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/redscorpion/red.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/silver.qss b/retroshare-gui/src/qss/silver.qss index a706f8665..f66edc3a5 100644 --- a/retroshare-gui/src/qss/silver.qss +++ b/retroshare-gui/src/qss/silver.qss @@ -69,3 +69,34 @@ QFrame#Chatbuttonframe{ border-image: url(qss/silver/silver.png); } + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/silvergrey.qss b/retroshare-gui/src/qss/silvergrey.qss index ebc003903..5b36afd6d 100644 --- a/retroshare-gui/src/qss/silvergrey.qss +++ b/retroshare-gui/src/qss/silvergrey.qss @@ -108,4 +108,35 @@ 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 +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/skin2.qss b/retroshare-gui/src/qss/skin2.qss index 19ba567d5..a19b9376c 100644 --- a/retroshare-gui/src/qss/skin2.qss +++ b/retroshare-gui/src/qss/skin2.qss @@ -39,4 +39,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/skin2/background.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/uus.qss b/retroshare-gui/src/qss/uus.qss index a800a86af..cf2b07848 100644 --- a/retroshare-gui/src/qss/uus.qss +++ b/retroshare-gui/src/qss/uus.qss @@ -167,4 +167,35 @@ QFrame#Chatbuttonframe{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BDDF7D, stop: 1 #49881F); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/wx.qss b/retroshare-gui/src/qss/wx.qss index 5efd295c2..f14cd31a2 100644 --- a/retroshare-gui/src/qss/wx.qss +++ b/retroshare-gui/src/qss/wx.qss @@ -43,4 +43,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/wx/wx.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/yaba.qss b/retroshare-gui/src/qss/yaba.qss index f9622435b..398d33414 100644 --- a/retroshare-gui/src/qss/yaba.qss +++ b/retroshare-gui/src/qss/yaba.qss @@ -111,4 +111,35 @@ QFrame#Chatbuttonframe{ border-image: url(qss/yaba/yaba.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} + +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/qss/yeah.qss b/retroshare-gui/src/qss/yeah.qss index f8ac3f484..7affe0983 100644 --- a/retroshare-gui/src/qss/yeah.qss +++ b/retroshare-gui/src/qss/yeah.qss @@ -110,4 +110,34 @@ QFrame#Chatbuttonframe{ border-image: url(qss/yeah/yeah.png); -} \ No newline at end of file +} + +QLabel#subjectText{ + font: bold 12px; + +} + +QLabel#subjectlabel{ + font: bold 12px; + +} + +QLabel#fromlabel{ + font: bold 12px; + +} + +QLabel#datelabel{ + font: bold 12px; + +} + +QLabel#tolabel{ + font: bold 12px; + +} +QLabel#fromText{ + font: bold ; + color: blue; + +} diff --git a/retroshare-gui/src/release/qss/orangesurfer.qss b/retroshare-gui/src/release/qss/orangesurfer.qss index 19e9ac1de..0e6f98a72 100644 --- a/retroshare-gui/src/release/qss/orangesurfer.qss +++ b/retroshare-gui/src/release/qss/orangesurfer.qss @@ -8,7 +8,7 @@ /* Customize the toolbar. */ QToolBar { - border-image: url(qss/orangesurfer/main.png); + border-image: url(:qss/orangesurfer/main.png); } diff --git a/retroshare-gui/src/release/qss/qlive.qss b/retroshare-gui/src/release/qss/qlive.qss index 685164807..b754ca9ea 100644 --- a/retroshare-gui/src/release/qss/qlive.qss +++ b/retroshare-gui/src/release/qss/qlive.qss @@ -1,11 +1,12 @@ .QWidget{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #77AEF1, stop: 0.4 #86BBF7); } /* Customize the toolbar. */ QToolBar { - border-image: url(qss/qlive/qb.png); + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #77AEF1, stop: 0.4 #86BBF7); } QMenu { diff --git a/retroshare-gui/src/rsiface/notifyqt.cpp b/retroshare-gui/src/rsiface/notifyqt.cpp index 170d06a22..d6e26220d 100644 --- a/retroshare-gui/src/rsiface/notifyqt.cpp +++ b/retroshare-gui/src/rsiface/notifyqt.cpp @@ -187,7 +187,7 @@ static time_t lastTs = 0; { /* id the name */ std::string name = rsPeers->getPeerName(id); - std::string realmsg = msg + name; + std::string realmsg = msg + "" + name + ""; switch(type) { case RS_POPUP_MSG: