diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp
index c2d145890..b734442ed 100644
--- a/retroshare-gui/src/gui/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp
@@ -110,28 +110,25 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
l_header->setResizeMode (2, QHeaderView::Interactive);
l_header->setResizeMode (3, QHeaderView::Interactive);
- l_header->resizeSection ( 0, 210 );
+ l_header->resizeSection ( 0, 490 );
l_header->resizeSection ( 1, 70 );
- l_header->resizeSection ( 2, 100 );
+ l_header->resizeSection ( 2, 60 );
l_header->resizeSection ( 3, 100 );
/* Set header resize modes and initial section sizes */
QHeaderView * r_header = ui.remoteDirTreeView->header () ;
- #if defined(Q_OS_WIN32)
+
r_header->setResizeMode (0, QHeaderView::Interactive);
- r_header->setStretchLastSection(true);
- #else
- r_header->setResizeMode (0, QHeaderView::Stretch);
r_header->setStretchLastSection(false);
- #endif
+
r_header->setResizeMode (1, QHeaderView::Fixed);
r_header->setResizeMode (2, QHeaderView::Fixed);
r_header->setResizeMode (3, QHeaderView::Fixed);
- r_header->resizeSection ( 0, 250 );
+ r_header->resizeSection ( 0, 490 );
r_header->resizeSection ( 1, 70 );
- r_header->resizeSection ( 2, 100 );
+ r_header->resizeSection ( 2, 60 );
r_header->resizeSection ( 3, 100 );
l_header->setHighlightSections(false);
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index d7b09d9d0..14080d9ba 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -95,6 +95,7 @@
images/edit-underline.png
images/edit_remove24.png
images/encrypted16.png
+ images/encrypted22.png
images/encrypted48.png
images/evolution.png
images/exit_24x24.png
@@ -138,6 +139,7 @@
images/folder-draft24-hover.png
images/folder-draft24-pressed.png
images/folder-draft24.png
+ images/folder_inbox64.png
images/folder-inbox.png
images/folder-inbox-new.png
images/folder-outbox.png
diff --git a/retroshare-gui/src/gui/images/folder_inbox64.png b/retroshare-gui/src/gui/images/folder_inbox64.png
new file mode 100755
index 000000000..a105a8963
Binary files /dev/null and b/retroshare-gui/src/gui/images/folder_inbox64.png differ
diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui
index 7cfb135df..fbd4c9576 100644
--- a/retroshare-gui/src/gui/toaster/MessageToaster.ui
+++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui
@@ -10,22 +10,10 @@
-
+
0
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -37,152 +25,12 @@
QFrame::Raised
-
+
0
-
+
0
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 18
- 18
-
-
-
-
- 18
- 18
-
-
-
- :/images/close-down.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 225
- 22
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 6
-
-
- 6
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 119
- 56
-
-
-
-
- -
-
-
- New Message
-
-
- :/images/folder-inbox.png
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 119
- 56
-
-
-
-
-
-
-
-
@@ -190,7 +38,7 @@
Qt::Horizontal
-
+
111
21
@@ -210,7 +58,7 @@
Qt::Horizontal
-
+
111
20
@@ -225,7 +73,7 @@
Qt::Vertical
-
+
366
91
@@ -233,7 +81,124 @@
+ -
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 18
+ 18
+
+
+
+
+ 18
+ 18
+
+
+
+
+ :/images/close-down.png:/images/close-down.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 225
+ 22
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+
+ 88
+ 0
+
+
+
+ font: bold;
+
+
+
+
+ New Message
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 119
+ 56
+
+
+
+
+ -
+
+
+
+
+
+ :/images/folder_inbox64.png
+
+
+ Qt::AlignCenter
+
+
+ 6
+
+
+
+
+
+
diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.cpp b/retroshare-gui/src/gui/toaster/OnlineToaster.cpp
index 315402668..e7d7a7704 100644
--- a/retroshare-gui/src/gui/toaster/OnlineToaster.cpp
+++ b/retroshare-gui/src/gui/toaster/OnlineToaster.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 "OnlineToaster.h"
#include "ui_OnlineToaster.h"
@@ -24,30 +24,30 @@
#include "QtToaster.h"
#include
-
+
OnlineToaster::OnlineToaster()
: QObject(NULL) {
_onlineToasterWidget = new QWidget(NULL);
-
- _ui = new Ui::OnlineToaster();
- _ui->setupUi(_onlineToasterWidget);
-
+
+ _ui = new Ui::OnlineToaster();
+ _ui->setupUi(_onlineToasterWidget);
+
connect(_ui->messageButton, SIGNAL(clicked()), SLOT(chatButtonSlot()));
connect(_ui->closeButton, SIGNAL(clicked()), SLOT(close()));
_toaster = new QtToaster(_onlineToasterWidget, _ui->windowFrame);
- _toaster->setTimeOnTop(5000);
-}
+ _toaster->setTimeOnTop(5000);
+}
OnlineToaster::~OnlineToaster() {
delete _ui;
}
-
-void OnlineToaster::setMessage(const QString & message) {
- _ui->messageLabel->setText(message);
-}
+
+void OnlineToaster::setMessage(const QString & message) {
+ _ui->messageLabel->setText(message);
+}
void OnlineToaster::setPixmap(const QPixmap & pixmap) {
_ui->pixmaplabel->setPixmap(pixmap);
@@ -56,12 +56,12 @@ void OnlineToaster::setPixmap(const QPixmap & pixmap) {
void OnlineToaster::show() {
_toaster->show();
}
-
-void OnlineToaster::close() {
- _toaster->close();
-}
-
-void OnlineToaster::chatButtonSlot() {
- chatButtonClicked();
- close();
-}
+
+void OnlineToaster::close() {
+ _toaster->close();
+}
+
+void OnlineToaster::chatButtonSlot() {
+ chatButtonClicked();
+ close();
+}
diff --git a/retroshare-gui/src/rsiface/RemoteDirModel.cpp b/retroshare-gui/src/rsiface/RemoteDirModel.cpp
index 889bbd196..bf4ee9762 100644
--- a/retroshare-gui/src/rsiface/RemoteDirModel.cpp
+++ b/retroshare-gui/src/rsiface/RemoteDirModel.cpp
@@ -429,8 +429,8 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
}
break;
case 2:
- //return QString("");
- return QString::fromStdString(details.path);
+ return QString("");
+ //return QString::fromStdString(details.path);
break;
default:
@@ -479,11 +479,11 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
case 0:
if (RemoteMode)
{
- return QString("Remote Directories");
+ return QString("Friends Directories");
}
else
{
- return QString("Local Directories");
+ return QString("My Directories");
}
break;
case 1: