From 2c22ccd0d7c0a9efba02ff2f8be8fe308ca742fc Mon Sep 17 00:00:00 2001 From: drbob Date: Sat, 14 Jun 2008 13:24:22 +0000 Subject: [PATCH] Added Start Minimised Option to GUI. Updated Version Number to V0.4.09a git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@601 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/main.cpp | 13 ++++--------- retroshare-gui/src/retroshare.nsi | 2 +- retroshare-gui/src/rsiface/rsiface.h | 2 ++ retroshare-gui/src/util/rsversion.cpp | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 5fb2a023b..c04c9fe23 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) /* RetroShare Core Objects */ RsInit *config = InitRsConfig(); bool okStart = InitRetroShare(argc, argv, config); + bool startMinimised = RsConfigStartMinimised(config); /* Setup The GUI Stuff */ @@ -143,20 +144,14 @@ int main(int argc, char *argv[]) notify->setChannelsDialog(w->channelsDialog); notify->setMessengerWindow(w->messengerWindow); - /* only show window, if not autologin */ -#if defined(Q_OS_WIN) - if (!okStart) + /* only show window, if not startMinimised */ + if (!startMinimised) { w->show(); + //skinWindow->show(); } -#else - - w->show(); - - //skinWindow->show(); -#endif /* Startup a Timer to keep the gui's updated */ QTimer *timer = new QTimer(w); diff --git a/retroshare-gui/src/retroshare.nsi b/retroshare-gui/src/retroshare.nsi index cb4ccddcc..b2e2136a1 100644 --- a/retroshare-gui/src/retroshare.nsi +++ b/retroshare-gui/src/retroshare.nsi @@ -2,7 +2,7 @@ ; Define your application name !define APPNAME "RetroShare" -!define VERSION "0.4.08a" +!define VERSION "0.4.09a" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}" ; Main Install settings diff --git a/retroshare-gui/src/rsiface/rsiface.h b/retroshare-gui/src/rsiface/rsiface.h index 333cedeeb..b555e122e 100644 --- a/retroshare-gui/src/rsiface/rsiface.h +++ b/retroshare-gui/src/rsiface/rsiface.h @@ -47,7 +47,9 @@ extern RsControl *rsicontrol; */ RsInit *InitRsConfig(); +/* extract various options for GUI */ const char *RsConfigDirectory(RsInit *config); +bool RsConfigStartMinimised(RsInit *config); void CleanupRsConfig(RsInit *); diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsversion.cpp index 618740817..afd3d4747 100644 --- a/retroshare-gui/src/util/rsversion.cpp +++ b/retroshare-gui/src/util/rsversion.cpp @@ -23,7 +23,7 @@ //#define USE_SVN_VERSIONS 1 -#define VERSION "0.4.08a" +#define VERSION "0.4.09a" #if USE_SVN_VERSIONS #include "svn_revision.h"