From 13eed1c932b1497d69308677988ab02e6a15c272 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 20 Jul 2009 17:03:27 +0000 Subject: [PATCH] redesign SharedFiles, with splitted view for Remote and Local Dirs and added QFrame's for switch to different views. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1392 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/SharedFilesDialog.cpp | 55 +- retroshare-gui/src/gui/SharedFilesDialog.h | 5 +- retroshare-gui/src/gui/SharedFilesDialog.ui | 636 +++++++++++------- retroshare-gui/src/gui/TransfersDialog.ui | 4 +- retroshare-gui/src/gui/images.qrc | 1 + .../src/gui/images/view_split_top_bottom.png | Bin 0 -> 422 bytes 6 files changed, 437 insertions(+), 264 deletions(-) create mode 100644 retroshare-gui/src/gui/images/view_split_top_bottom.png diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index 58108f3a1..0fedc1feb 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -82,7 +82,10 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent) connect(ui.checkButton, SIGNAL(clicked()), this, SLOT(forceCheck())); - //connect(ui.frameButton, SIGNAL(toggled(bool)), this, SLOT(showFrame(bool))); + connect(ui.localButton, SIGNAL(toggled(bool)), this, SLOT(showFrame(bool))); + connect(ui.remoteButton, SIGNAL(toggled(bool)), this, SLOT(showFrameRemote(bool))); + connect(ui.splittedButton, SIGNAL(toggled(bool)), this, SLOT(showFrameSplitted(bool))); + connect( ui.localDirTreeView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( sharedDirTreeWidgetContextMenu( QPoint ) ) ); @@ -687,20 +690,46 @@ SharedFilesDialog::tryToAddNewAssotiation() //============================================================================ /** - Toggles the Lokal TreeView on and off, changes toggle button text + Toggles the Splitted, Remote and Local View on and off*/ void SharedFilesDialog::showFrame(bool show) { if (show) { - ui.frame->setVisible(true); - ui.frameButton->setChecked(true); - ui.frameButton->setToolTip(tr("Hide Lokal Direrectories")); - ui.frameButton->setIcon(QIcon(tr(":images/hide_toolbox_frame.png"))); - } else { - ui.frame->setVisible(false); - ui.frameButton->setChecked(false); - ui.frameButton->setToolTip(tr("Show Lokal Directories")); - ui.frameButton->setIcon(QIcon(tr(":images/show_toolbox_frame.png"))); - } -}*/ + ui.localframe->setVisible(true); + ui.remoteframe->setVisible(false); + + ui.localButton->setChecked(true); + + ui.remoteButton->setChecked(false); + ui.splittedButton->setChecked(false); + } +} + +void SharedFilesDialog::showFrameRemote(bool show) +{ + if (show) { + ui.remoteframe->setVisible(true); + ui.localframe->setVisible(false); + + ui.remoteButton->setChecked(true); + ui.localButton->setChecked(false); + ui.splittedButton->setChecked(false); + + + } +} + +void SharedFilesDialog::showFrameSplitted(bool show) +{ + if (show) { + ui.remoteframe->setVisible(true); + ui.localframe->setVisible(true); + + ui.splittedButton->setChecked(true); + + ui.localButton->setChecked(false); + ui.remoteButton->setChecked(false); + + } +} diff --git a/retroshare-gui/src/gui/SharedFilesDialog.h b/retroshare-gui/src/gui/SharedFilesDialog.h index 06699fbfb..a7af3ea5d 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.h +++ b/retroshare-gui/src/gui/SharedFilesDialog.h @@ -66,7 +66,10 @@ private slots: void sendLinkTo(); void sendremoteLinkTo(); - //void showFrame(bool show); + void showFrame(bool show); + void showFrameRemote(bool show); + void showFrameSplitted(bool show); + // void recommendfile(); diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 7051fbfed..20fed5ada 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -1,170 +1,171 @@ - + + SharedFilesDialog - - + + 0 0 - 578 - 433 + 672 + 384 - - + + 0 0 - + - - - + + + 0 0 0 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 0 0 128 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -173,153 +174,153 @@ - - - + + + 0 0 0 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 192 192 192 - - - + + + 0 0 0 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -328,153 +329,153 @@ - - - + + + 104 104 104 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 104 104 104 - - - + + + 255 255 255 - - - + + + 104 104 104 - - - + + + 240 240 240 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 0 0 128 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -484,127 +485,264 @@ - + Qt::NoContextMenu - - - 3 + + + 6 - - -1 + + 0 - - 3 + + 6 - - - + + 6 + + + 6 + + + 0 + + + + + QLayout::SetFixedSize + + + 9 + + 0 - - - - 0 - 0 - 556 - 355 - + + + + + 16777215 + 16 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; 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;"><span style=" font-size:10pt; font-weight:600;">Files</span></p></body></html> + + + + + + + + 16 + 16 + + + + + + + :/images/fileshare16.png + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 100 + 20 + + + + + + + + + 24 + 24 + + + + Splitted View + + + + + + + :/images/view_split_top_bottom.png:/images/view_split_top_bottom.png + + + true + + + true + + + true + + + + + + + + 24 + 24 + + + + Friends Folders + + + + + + + :/images/friendsfolder24.png:/images/friendsfolder24.png + + + true + + + false + + + true + + + + + + + + 24 + 24 + + + + My Folders + + + + + + + :/images/folder16.png:/images/folder16.png + + + true + + + false + + + true + + + + + + + Qt::Vertical + + + + QFrame::StyledPanel - - Friends Share - - - - :/images/fileshare16.png:/images/fileshare16.png - - - + + QFrame::Raised + + + 0 - - - - + + + + 4 0 - + Qt::CustomContextMenu - + true - + QAbstractItemView::DragOnly - + false - + 0 - + true - + true - - - - 0 - 0 - 556 - 347 - + + + QFrame::StyledPanel - - My Shared Files - - - - :/images/folder16.png:/images/folder16.png - - - + + QFrame::Raised + + + 0 - - 0 - - - - - + + + + 0 0 - + Qt::CustomContextMenu - + false - + true - + QAbstractItemView::DragOnly - + false - + QAbstractItemView::ContiguousSelection - + true @@ -613,38 +751,38 @@ - - - + + + 140 0 - + 16777215 28 - + Download selected - + Download - - + + :/images/download16.png:/images/download16.png - + - + Qt::Horizontal - + 391 20 @@ -652,16 +790,16 @@ - - - + + + check files - - - + + + @@ -669,7 +807,7 @@ - + diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index aabaddfa9..8f9436014 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -507,7 +507,7 @@ 6 - 1 + 6 6 @@ -578,6 +578,7 @@ p, li { white-space: pre-wrap; } + Arial 9 @@ -636,6 +637,7 @@ p, li { white-space: pre-wrap; } + Arial 9 diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 301204c19..2f03b7727 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -352,6 +352,7 @@ images/view_calendar_day.png images/view_calendar_week.png images/view_calendar_month.png + images/view_split_top_bottom.png images/window_fullscreen.png images/window_nofullscreen.png layouts/default.ui diff --git a/retroshare-gui/src/gui/images/view_split_top_bottom.png b/retroshare-gui/src/gui/images/view_split_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..8c0e4db5685e6275d704316c0ac6f81d0bcdd920 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpik#_H=O! zvFKep+0pM%fI!>+N?9qT+fibyO45fkcQkYJFAV=IrZVRs^MyPw0Wpc}-@lHry75lr zc(nb0+P^rHV&S`grqI0s*tsMeR z4DUH_>*{&lGVy&cGU4t!)m5v)t>#LEs&*~%zj%gYq3ZeKUw`esUKT!mwCUwvXO@n4 zkM}V4E&FKF``^%Y(vmG}1$~#@@mVI%r{S=^{Ahti!u_Z3XGoq-tNLC`UD zKU+)_^M`xMY3kl-ZQp;d6Iq}WKIQ2ve@+nv-}RC_Mtye=Dk`#k+QYDKYQ-v^2XlV! z7ZTm@_18{bMH$`9xJNwAO?)A)9yYjjg%{aaE{U5&B%bP9Nmp%Z+ O0)wZkpUXO@geCxsbgHBP literal 0 HcmV?d00001