- added new status menu to tray menu

- moved internal status functions from MessengerWindow to MainWindow
- cleaned some includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-07-17 23:19:43 +00:00
parent d92e1911eb
commit 8f5fe8bae2
6 changed files with 252 additions and 158 deletions

View file

@ -19,7 +19,6 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QtGui>
#include <QObject>
#include <rshare.h>
#include "gui/MainWindow.h"
@ -34,6 +33,7 @@
#include "gui/GenCertDialog.h"
#include "gui/settings/rsharesettings.h"
#include "gui/connect/ConfCertDialog.h"
#include "idle/idle.h"
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
#include <gui/qskinobject/qskinobject.h>
@ -194,12 +194,9 @@ int main(int argc, char *argv[])
w->installGroupChatNotifier();
QObject::connect(w->idle, SIGNAL(secondsIdle(int)), w->messengerWindow, SLOT(checkAndSetIdle(int)));
/* only show window, if not startMinimized */
if(!Settings->value(QString::fromUtf8("StartMinimized"), false).toBool())
{
w->show();
}