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

Major rewrite of New Cache Interface from the GUI side:

Browse source 
- Basics of Wiki, Photo, Id are working with Local Test interface.
	- Duplicated existing Forum : ForumV2Dialog + forumv2/*
	- Modified ForumV2Dialog to use Request / Response Data retrieval.
	- Switched Id to use TokenQueue request system.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-14 00:36:25 +00:00
parent 4ba7130884
commit a8676302ce
31 changed files with 6222 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View file

@ -36,6 +36,7 @@
#include "gui/WikiPoos/WikiDialog.h"
#include "gui/TheWire/WireDialog.h"
#include "gui/Identity/IdDialog.h"
#include "gui/ForumsV2Dialog.h"
//#include "GamesDialog.h"
//#include "CalDialog.h"
@ -55,7 +56,7 @@
#define IMAGE_CALENDAR ":/images/calendar.png"
#define IMAGE_LIBRARY ":/images/library.png"
#define IMAGE_PLUGINS ":/images/extension_32.png"
#define IMAGE_FORUMSV2 ":/images/konversation.png"
/** Constructor */
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
@ -91,7 +92,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
//ui.stackPages->add(calDialog = new CalDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp));
IdDialog *idDialog = NULL;
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
@ -108,6 +108,10 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp));
ForumsV2Dialog *forumsV2Dialog = NULL;
ui.stackPages->add(forumsV2Dialog = new ForumsV2Dialog(ui.stackPages),
createPageAction(QIcon(IMAGE_FORUMSV2), tr("ForumsV2"), grp));
/* Create the toolbar */
ui.toolBar->addActions(grp->actions());
ui.toolBar->addSeparator();
@ -142,7 +146,7 @@ void ApplicationWindow::show()
QMainWindow::show();
} else {
QMainWindow::activateWindow();
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
setWindowState(windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
QMainWindow::raise();
}
}