Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-14 00:55:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- separated SharedFilesDialog into two classes: remote and local, both deriving from a common

Browse source 
SharedFilesDialog class.
 As a side effect the tree view/flat view are both available in local and remote mode, as well
 as the file filter tool.
 The gui is common. Each sub-class hides whatever it does not want to show/use.
- moved local and friends files into tabs of Transfers.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6108 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-02-08 20:35:40 +00:00
parent 8fe75acfaf
commit 174226eb21
9 changed files with 520 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -43,7 +43,7 @@
#include "SearchDialog.h"
#include "TransfersDialog.h"
#include "MessagesDialog.h"
#include "SharedFilesDialog.h"
//#include "SharedFilesDialog.h"
#include "PluginsPage.h"
#include "NewsFeed.h"
#include "ShareManager.h"
@ -255,8 +255,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("Transfers"), grp));
notify.push_back(QPair<MainPage*, QAction*>(transfersDialog, action));
ui->stackPages->add(sharedfilesDialog = new SharedFilesDialog(ui->stackPages),
createPageAction(QIcon(IMAGE_FILES), tr("Files"), grp));
// ui->stackPages->add(sharedfilesDialog = new SharedFilesDialog(ui->stackPages),
// createPageAction(QIcon(IMAGE_FILES), tr("Files"), grp));
ui->stackPages->add(messagesDialog = new MessagesDialog(ui->stackPages),
action = createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp));
@ -800,8 +800,8 @@ void SetForegroundWindowInternal(HWND hWnd)
case Transfers:
Page = _instance->transfersDialog;
break;
case SharedDirectories:
Page = _instance->sharedfilesDialog;
// case SharedDirectories:
// Page = _instance->sharedfilesDialog;
break;
case Messages:
Page = _instance->messagesDialog;
@ -849,9 +849,9 @@ void SetForegroundWindowInternal(HWND hWnd)
if (page == _instance->transfersDialog) {
return Transfers;
}
if (page == _instance->sharedfilesDialog) {
return SharedDirectories;
}
// if (page == _instance->sharedfilesDialog) {
// return SharedDirectories;
// }
if (page == _instance->messagesDialog) {
return Messages;
}
@ -891,8 +891,8 @@ void SetForegroundWindowInternal(HWND hWnd)
// return _instance->searchDialog;
case Transfers:
return _instance->transfersDialog;
case SharedDirectories:
return _instance->sharedfilesDialog;
// case SharedDirectories:
// return _instance->sharedfilesDialog;
case Messages:
return _instance->messagesDialog;
#ifdef RS_USE_LINKS