Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move SharedFilesDialog to /gui/FileTransfer/

Browse source 
And remove old DEFINE because very olds files are deleted.
This commit is contained in:
Phenom 2017-09-07 19:37:53 +02:00
parent 54ee6509d1
commit 4336a4ad46
10 changed files with 15 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,10 +29,6 @@
#include <QUrl>
#include <QtDebug>
#ifdef BLOGS
#include "gui/unfinished/blogs/BlogsDialog.h"
#endif
#include <retroshare/rsplugin.h>
#include <retroshare/rsconfig.h>
@ -43,9 +39,9 @@
#include "HomePage.h"
#include "NetworkDialog.h"
#include "gui/FileTransfer/SearchDialog.h"
#include "gui/FileTransfer/SharedFilesDialog.h"
#include "gui/FileTransfer/TransfersDialog.h"
#include "MessagesDialog.h"
#include "SharedFilesDialog.h"
#include "PluginsPage.h"
#include "NewsFeed.h"
#include "ShareManager.h"
@ -379,10 +375,6 @@ void MainWindow::initStackedPage()
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
#endif
#ifdef BLOGS
addPage(blogsFeed = new BlogsDialog(ui->stackPages), grp, NULL);
#endif
std::cerr << "Looking for interfaces in existing plugins:" << std::endl;
for(int i = 0;i<rsPlugins->nbPlugins();++i)
{
@ -915,11 +907,6 @@ void SetForegroundWindowInternal(HWND hWnd)
case Forums:
_instance->ui->stackPages->setCurrentPage( _instance->gxsforumDialog );
return true ;
#ifdef BLOGS
case Blogs:
Page = _instance->blogsFeed;
return true ;
#endif
case Posted:
_instance->ui->stackPages->setCurrentPage( _instance->postedDialog );
return true ;
@ -960,11 +947,6 @@ void SetForegroundWindowInternal(HWND hWnd)
if (page == _instance->messagesDialog) {
return Messages;
}
#ifdef RS_USE_LINKS
if (page == _instance->linksDialog) {
return Links;
}
#endif
#if 0
if (page == _instance->channelFeed) {
return Channels;
@ -973,11 +955,6 @@ void SetForegroundWindowInternal(HWND hWnd)
return Forums;
}
#endif
#ifdef BLOGS
if (page == _instance->blogsFeed) {
return Blogs;
}
#endif
return Network;
}
@ -1009,20 +986,12 @@ void SetForegroundWindowInternal(HWND hWnd)
return _instance->transfersDialog->searchDialog;
case Messages:
return _instance->messagesDialog;
#ifdef RS_USE_LINKS
case Links:
return _instance->linksDialog;
#endif
case Channels:
return _instance->gxschannelDialog;
case Forums:
return _instance->gxsforumDialog;
case Posted:
return _instance->postedDialog;
#ifdef BLOGS
case Blogs:
return _instance->blogsFeed;
#endif
}
return NULL;