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

Moved Forums and Channels to main window. Renamed Friends->Network. Code simplification in MainWindow. Next step: merge Circles and Identities

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-27 14:23:27 +00:00
parent b184bc1809
commit 4569c21cb0
4 changed files with 68 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/MainWindow.h
View file

@ -26,6 +26,7 @@
#include <set>
#include "gui/common/rwindow.h"
#include "ui_MainWindow.h"
namespace Ui {
class MainWindow;
@ -72,7 +73,7 @@ class BlogsDialog;
class ApplicationWindow;
#endif
class MainWindow : public RWindow
class MainWindow : public RWindow, public Ui::MainWindow
{
Q_OBJECT
@ -257,9 +258,6 @@ private:
// idle function
void setIdle(bool Idle);
bool isIdle;
/** Qt Designer generated object */
Ui::MainWindow *ui;
};
#endif