From fc3fe525182f89af09ab74691d457dd54f40d228 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 31 Jan 2009 01:46:49 +0000 Subject: [PATCH] * removed streching for Remote Directories * added icon Label for Messages Toaster * Set userfriendly Column names for Remote/local Directories to Friends Directories and My Directories * removed not needed path show in Rank git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@962 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/SharedFilesDialog.cpp | 15 +- retroshare-gui/src/gui/images.qrc | 2 + .../src/gui/images/folder_inbox64.png | Bin 0 -> 4475 bytes .../src/gui/toaster/MessageToaster.ui | 283 ++++++++---------- .../src/gui/toaster/OnlineToaster.cpp | 42 +-- retroshare-gui/src/rsiface/RemoteDirModel.cpp | 8 +- 6 files changed, 157 insertions(+), 193 deletions(-) create mode 100755 retroshare-gui/src/gui/images/folder_inbox64.png 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 0000000000000000000000000000000000000000..a105a8963e44453b9f32124d082d78020b61c0d9 GIT binary patch literal 4475 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 - + 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: