diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 5f907c645..2609e0e39 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -1274,18 +1274,28 @@ void MessagesDialog::insertMessages()
switch (listrow) {
case ROW_INBOX:
msgbox = RS_MSG_INBOX;
+ ui.tabWidget->setTabIcon ( 0, QIcon(":/images/folder-inbox.png") );
+ ui.tabWidget->setTabText ( 0, tr ("Inbox") );
break;
case ROW_OUTBOX:
msgbox = RS_MSG_OUTBOX;
+ ui.tabWidget->setTabIcon ( 0, QIcon(":/images/folder-outbox.png") );
+ ui.tabWidget->setTabText ( 0, tr ("Outbox") );
break;
case ROW_DRAFTBOX:
msgbox = RS_MSG_DRAFTBOX;
+ ui.tabWidget->setTabIcon ( 0, QIcon(":/images/folder-draft.png") );
+ ui.tabWidget->setTabText ( 0, tr ("Drafts") );
break;
case ROW_SENTBOX:
msgbox = RS_MSG_SENTBOX;
+ ui.tabWidget->setTabIcon ( 0, QIcon(":/images/folder-sent.png") );
+ ui.tabWidget->setTabText ( 0, tr ("Sent") );
break;
case ROW_TRASHBOX:
bTrash = true;
+ ui.tabWidget->setTabIcon ( 0, QIcon(":/images/folder-trash.png") );
+ ui.tabWidget->setTabText ( 0, tr ("Trash") );
break;
default:
bFill = false;
diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui
index abe267209..670825c55 100644
--- a/retroshare-gui/src/gui/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/MessagesDialog.ui
@@ -505,7 +505,10 @@
Qt::DefaultContextMenu
-
+
+
+ 1
+
-
@@ -981,687 +984,707 @@ border-image: url(:/images/closepressed.png)
-
-
-
- Qt::Horizontal
+
+
+ 0
-
-
-
- 140
- 16777215
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 6
-
-
- 0
-
+
+
+ Main Tab
+
+
0
-
-
-
-
-
- 0
- 0
-
-
-
-
- 140
- 16777215
-
-
-
-
- 0
- 0
-
-
-
-
- 9
-
-
-
-
-
-
- 1
-
-
- 0
-
-
- false
-
-
- QListView::Fixed
-
-
- 0
-
-
-
- 100
- 18
-
-
-
- 0
-
-
- false
-
-
- false
-
-
-
-
- Inbox
-
-
-
- :/images/folder-inbox.png:/images/folder-inbox.png
-
-
- -
-
- Outbox
-
-
-
- :/images/folder-outbox.png:/images/folder-outbox.png
-
-
- -
-
- Draft
-
-
-
- :/images/folder-draft.png:/images/folder-draft.png
-
-
- -
-
- Sent
-
-
-
- :/images/folder-sent.png:/images/folder-sent.png
-
-
- -
-
- Trash
-
-
-
- :/images/folder-trash.png:/images/folder-trash.png
-
-
-
-
- -
-
-
-
- 140
- 16777215
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
-
- 0
- 21
-
-
-
-
- 140
- 16777215
-
-
-
- Qt::LeftToRight
-
-
- QToolButton#Folders_Button{
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-stop:0 #FEFEFE, stop:1 #E8E8E8);
-
-border: 1px solid #CCCCCC;}
-
-
- Folders
-
-
-
- :/images/foldermail.png:/images/foldermail.png
-
-
- false
-
-
- false
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- true
-
-
- Qt::NoArrow
-
-
-
- -
-
-
-
- 0
- 21
-
-
-
-
- 140
- 16777215
-
-
-
- QToolButton#Tags_Button{
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-stop:0 #FEFEFE, stop:1 #E8E8E8);
-
-border: 1px solid #CCCCCC;}
-
-
- Tags
-
-
-
- :/images/tag24.png:/images/tag24.png
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- Qt::NoArrow
-
-
-
- -
-
-
-
- 0
- 18
-
-
-
-
- 9
-
-
-
- Total Inbox:
-
-
-
- -
-
-
-
- 0
- 18
-
-
-
-
- 9
-
-
-
- Total Sent:
-
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- Qt::Vertical
+
+ 0
-
-
-
- 9
-
-
-
- Qt::CustomContextMenu
-
-
- QAbstractItemView::ExtendedSelection
-
-
- true
-
-
-
-
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Qt::Horizontal
+
+
+
+
+ 140
+ 16777215
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ 6
-
- true
+
+ 0
-
-
- -
-
-
-
-
-
- 0
-
-
- 6
-
-
-
-
-
-
-
-
- :/images/attachment.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;"><span style=" font-size:10pt; font-weight:600;">Recommended Files</span></p></body></html>
-
-
-
- -
-
-
-
- 10
- true
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- :/images/edit_remove24.png:/images/edit_remove24.png
-
-
- true
-
-
- true
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
+
+ 0
+
+
-
+
+
- 351
- 20
+ 0
+ 0
-
+
+
+ 140
+ 16777215
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+
+
+
+ 1
+
+
+ 0
+
+
+ false
+
+
+ QListView::Fixed
+
+
+ 0
+
+
+
+ 100
+ 18
+
+
+
+ 0
+
+
+ false
+
+
+ false
+
+ -
+
+ Inbox
+
+
+
+ :/images/folder-inbox.png:/images/folder-inbox.png
+
+
+ -
+
+ Outbox
+
+
+
+ :/images/folder-outbox.png:/images/folder-outbox.png
+
+
+ -
+
+ Draft
+
+
+
+ :/images/folder-draft.png:/images/folder-draft.png
+
+
+ -
+
+ Sent
+
+
+
+ :/images/folder-sent.png:/images/folder-sent.png
+
+
+ -
+
+ Trash
+
+
+
+ :/images/folder-trash.png:/images/folder-trash.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;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Download all Recommended Files</p></body></html>
+
-
+
+
+
+ 140
+ 16777215
+
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 21
+
+
+
+
+ 140
+ 16777215
+
+
+
+ Qt::LeftToRight
+
+
+ QToolButton#Folders_Button{
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+stop:0 #FEFEFE, stop:1 #E8E8E8);
+
+border: 1px solid #CCCCCC;}
-
+ Folders
- :/images/down.png:/images/down.png
+ :/images/foldermail.png:/images/foldermail.png
+
+
+ false
+
+
+ false
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ true
+
+
+ Qt::NoArrow
+
+
+
+ -
+
+
+
+ 0
+ 21
+
+
+
+
+ 140
+ 16777215
+
+
+
+ QToolButton#Tags_Button{
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+stop:0 #FEFEFE, stop:1 #E8E8E8);
+
+border: 1px solid #CCCCCC;}
+
+
+ Favorite Tags
+
+
+
+ :/images/tag24.png:/images/tag24.png
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ Qt::NoArrow
+
+
+
+ -
+
+
+
+ 0
+ 18
+
+
+
+
+ 9
+
+
+
+ Total Inbox:
+
+
+
+ -
+
+
+
+ 0
+ 18
+
+
+
+
+ 9
+
+
+
+ Total Sent:
-
- -
-
-
- 6
+
+
+
+ Qt::Vertical
+
+
+
+ Qt::Vertical
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
-
-
- Qt::Vertical
-
-
- QSizePolicy::Preferred
-
-
-
- 2
- 40
-
-
-
-
-
-
- -
-
-
- 0
-
-
- 3
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 60
- 12
-
-
-
-
- 16777215
- 10
-
-
-
-
- 10
- 75
- true
-
-
-
- Subject:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
- 9
-
-
-
-
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
-
+
+
+
+ 9
+
+
+
+ Qt::CustomContextMenu
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ true
+
+
+
+
-
-
+
-
+
0
0
-
-
- 60
- 12
-
-
-
-
- 16777215
- 10
-
-
-
-
- 10
- 75
- true
-
-
-
- From:
-
-
-
- -
-
-
-
- 2
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
- 9
-
-
-
-
-
-
+
true
-
-
-
-
- 0
- 0
-
-
-
-
- 60
- 12
-
-
-
-
- 16777215
- 10
-
-
-
-
- 10
- 75
- true
-
-
-
- To:
-
-
+
+
-
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+
+
+
+ :/images/attachment.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;"><span style=" font-size:10pt; font-weight:600;">Recommended Files</span></p></body></html>
+
+
+
+ -
+
+
+
+ 10
+ true
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ :/images/edit_remove24.png:/images/edit_remove24.png
+
+
+ true
+
+
+ true
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 351
+ 20
+
+
+
+
+ -
+
+
+ <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;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Download all Recommended Files</p></body></html>
+
+
+
+
+
+
+ :/images/down.png:/images/down.png
+
+
+
+
- -
-
-
-
- 9
-
+
-
+
+
+ 6
-
- Qt::RightToLeft
+
+ 0
-
-
+
+ 0
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
+
+ 0
-
-
- -
-
-
-
-
-
+
-
+
+
-
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 2
+ 40
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
+ 3
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 12
+
+
+
+
+ 16777215
+ 10
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ Subject:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 9
+
+
+
+
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 12
+
+
+
+
+ 16777215
+ 10
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ From:
+
+
+
+ -
+
+
+
+ 2
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 9
+
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 12
+
+
+
+
+ 16777215
+ 10
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ To:
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Qt::RightToLeft
+
+
+
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- 9
-
-
-
- Qt::CustomContextMenu
-
-
-
-
-
- true
-
-
-
- File Name
-
-
-
-
- Size
-
-
-
-
- Sources
-
-
-
-
- Hash
-
-
-
+
+
+
+
+
+ 9
+
+
+
+ Qt::CustomContextMenu
+
+
+
+
+
+ true
+
+
+
+ File Name
+
+
+
+
+ Size
+
+
+
+
+ Sources
+
+
+
+
+ Hash
+
+
+
+
+
+
+