diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.cpp b/retroshare-gui/src/gui/msgs/MessageWindow.cpp
index 0dc9e8ef4..17355143f 100644
--- a/retroshare-gui/src/gui/msgs/MessageWindow.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWindow.cpp
@@ -55,19 +55,13 @@ MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags)
msgWidget = NULL;
- // create tag menu
+ // create tag menu
TagsMenu *menu = new TagsMenu (tr("Tags"), this);
connect(menu, SIGNAL(aboutToShow()), this, SLOT(tagAboutToShow()));
connect(menu, SIGNAL(tagSet(int, bool)), this, SLOT(tagSet(int, bool)));
connect(menu, SIGNAL(tagRemoveAll()), this, SLOT(tagRemoveAll()));
ui.tagButton->setMenu(menu);
-
- // create print menu
- QMenu *printmenu = new QMenu();
- printmenu->addAction(ui.actionPrint);
- printmenu->addAction(ui.actionPrint_Preview);
- ui.printButton->setMenu(printmenu);
// create view menu
QMenu *viewmenu = new QMenu();
@@ -92,7 +86,7 @@ void MessageWindow::processSettings(bool load)
// load settings
/* toolbar button style */
- Qt::ToolButtonStyle style = (Qt::ToolButtonStyle) Settings->value("ToolButon_Stlye", Qt::ToolButtonIconOnly).toInt();
+ Qt::ToolButtonStyle style = (Qt::ToolButtonStyle) Settings->value("ToolButon_Stlye", Qt::ToolButtonTextBesideIcon).toInt();
setToolbarButtonStyle(style);
} else {
// save settings
@@ -115,11 +109,6 @@ void MessageWindow::addWidget(MessageWidget *widget)
ui.msgLayout->addWidget(msgWidget);
setWindowTitle(msgWidget->subject(true));
- msgWidget->connectAction(MessageWidget::ACTION_REMOVE, ui.removemessageButton);
- msgWidget->connectAction(MessageWidget::ACTION_REPLY, ui.replymessageButton);
- msgWidget->connectAction(MessageWidget::ACTION_REPLY_ALL, ui.replyallmessageButton);
- msgWidget->connectAction(MessageWidget::ACTION_FORWARD, ui.forwardmessageButton);
- msgWidget->connectAction(MessageWidget::ACTION_PRINT, ui.printButton);
msgWidget->connectAction(MessageWidget::ACTION_PRINT, ui.actionPrint);
msgWidget->connectAction(MessageWidget::ACTION_PRINT, actionPrint);
msgWidget->connectAction(MessageWidget::ACTION_PRINT_PREVIEW, ui.actionPrint_Preview);
@@ -210,13 +199,7 @@ void MessageWindow::setupFileActions()
void MessageWindow::setToolbarButtonStyle(Qt::ToolButtonStyle style)
{
ui.newmessageButton->setToolButtonStyle(style);
- ui.removemessageButton->setToolButtonStyle(style);
- ui.replymessageButton->setToolButtonStyle(style);
- ui.replyallmessageButton->setToolButtonStyle(style);
- ui.forwardmessageButton->setToolButtonStyle(style);
ui.tagButton->setToolButtonStyle(style);
- ui.printButton->setToolButtonStyle(style);
- ui.viewtoolButton->setToolButtonStyle(style);
}
void MessageWindow::buttonStyle()
diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.ui b/retroshare-gui/src/gui/msgs/MessageWindow.ui
index 7c5689dd7..d15d5447d 100644
--- a/retroshare-gui/src/gui/msgs/MessageWindow.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWindow.ui
@@ -81,8 +81,8 @@
Compose
-
- :/images/folder-draft24.png:/images/folder-draft24.png
+
+ :/icons/mail/compose.png:/icons/mail/compose.png
@@ -91,7 +91,7 @@
- Qt::ToolButtonIconOnly
+ Qt::ToolButtonTextBesideIcon
true
@@ -105,174 +105,20 @@
- -
-
-
- Qt::NoFocus
+
-
+
+
+ Qt::Horizontal
-
- Reply to selected message
-
-
- Reply
-
-
-
- :/images/replymail-pressed.png:/images/replymail-pressed.png
-
-
+
- 24
- 24
+ 40
+ 20
-
- Qt::ToolButtonIconOnly
-
-
- true
-
-
+
-
-
-
- Qt::NoFocus
-
-
- Reply all to selected message
-
-
- Reply all
-
-
-
- :/images/replymailall24-hover.png:/images/replymailall24-hover.png
-
-
-
- 24
- 24
-
-
-
- Qt::ToolButtonIconOnly
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777
- 16777
-
-
-
- Qt::NoFocus
-
-
- Forward selected message
-
-
- Forward
-
-
-
- :/images/mailforward24-hover.png:/images/mailforward24-hover.png
-
-
-
- 24
- 24
-
-
-
- Qt::ToolButtonIconOnly
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Qt::NoFocus
-
-
- Remove selected message
-
-
- Delete
-
-
-
- :/images/deletemail24.png:/images/deletemail24.png
-
-
-
- 24
- 24
-
-
-
- Qt::ToolButtonIconOnly
-
-
- true
-
-
-
- -
-
-
- Qt::NoFocus
-
-
- Print selected message
-
-
- Print
-
-
-
- :/images/print24.png:/images/print24.png
-
-
-
- 24
- 24
-
-
-
- QToolButton::MenuButtonPopup
-
-
- Qt::ToolButtonIconOnly
-
-
- true
-
-
-
- -
Qt::NoFocus
@@ -291,27 +137,14 @@
- QToolButton::MenuButtonPopup
+ QToolButton::InstantPopup
true
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
+
-
Qt::NoFocus
@@ -323,8 +156,8 @@
Tags
-
- :/images/tag24.png:/images/tag24.png
+
+ :/icons/mail/tags.png:/icons/mail/tags.png
@@ -333,7 +166,10 @@
- QToolButton::MenuButtonPopup
+ QToolButton::InstantPopup
+
+
+ Qt::ToolButtonTextBesideIcon
true
@@ -355,7 +191,7 @@
0
0
698
- 20
+ 21
@@ -396,6 +232,7 @@
+
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 21e81ec92..f63132d48 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -732,6 +732,10 @@ GxsForumThreadWidget QToolButton#subscribeToolButton:hover {
border-radius: 4px;
}
+GxsForumMsgItem QFrame#frame{
+ background-color: white;
+}
+
GxsChannelPostsWidget QFrame#infoFrame
{
@@ -787,6 +791,10 @@ PostedItem QFrame#frame_notes {
background: white;
}
+PostedItem QFrame#mainFrame {
+ background-color: white;
+}
+
PostedItem QLabel#notes {
}
@@ -832,6 +840,11 @@ PostedCardView QFrame#voteFrame {
background: #f8f9fa;
}
+PostedCardView QFrame#mainFrame {
+ background: white;
+}
+
+
GxsCommentDialog QComboBox#sortBox {
font: bold;
color: #0099cc;
@@ -873,3 +886,7 @@ WireGroupItem QWidget:hover
WireDialog QFrame#frame{
background-color: white;
}
+
+WireDialog QWidget#scrollAreaWidgetContents_groups{
+ background-color: white;
+}