mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-04 09:05:34 -05:00
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
This commit is contained in:
parent
c47c751532
commit
2c22ccd0d7
@ -51,6 +51,7 @@ int main(int argc, char *argv[])
|
|||||||
/* RetroShare Core Objects */
|
/* RetroShare Core Objects */
|
||||||
RsInit *config = InitRsConfig();
|
RsInit *config = InitRsConfig();
|
||||||
bool okStart = InitRetroShare(argc, argv, config);
|
bool okStart = InitRetroShare(argc, argv, config);
|
||||||
|
bool startMinimised = RsConfigStartMinimised(config);
|
||||||
|
|
||||||
|
|
||||||
/* Setup The GUI Stuff */
|
/* Setup The GUI Stuff */
|
||||||
@ -143,20 +144,14 @@ int main(int argc, char *argv[])
|
|||||||
notify->setChannelsDialog(w->channelsDialog);
|
notify->setChannelsDialog(w->channelsDialog);
|
||||||
notify->setMessengerWindow(w->messengerWindow);
|
notify->setMessengerWindow(w->messengerWindow);
|
||||||
|
|
||||||
/* only show window, if not autologin */
|
/* only show window, if not startMinimised */
|
||||||
#if defined(Q_OS_WIN)
|
if (!startMinimised)
|
||||||
if (!okStart)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
w->show();
|
w->show();
|
||||||
|
//skinWindow->show();
|
||||||
|
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
|
|
||||||
w->show();
|
|
||||||
|
|
||||||
//skinWindow->show();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Startup a Timer to keep the gui's updated */
|
/* Startup a Timer to keep the gui's updated */
|
||||||
QTimer *timer = new QTimer(w);
|
QTimer *timer = new QTimer(w);
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
; Define your application name
|
; Define your application name
|
||||||
!define APPNAME "RetroShare"
|
!define APPNAME "RetroShare"
|
||||||
!define VERSION "0.4.08a"
|
!define VERSION "0.4.09a"
|
||||||
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
|
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
|
||||||
|
|
||||||
; Main Install settings
|
; Main Install settings
|
||||||
|
@ -47,7 +47,9 @@ extern RsControl *rsicontrol;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
RsInit *InitRsConfig();
|
RsInit *InitRsConfig();
|
||||||
|
/* extract various options for GUI */
|
||||||
const char *RsConfigDirectory(RsInit *config);
|
const char *RsConfigDirectory(RsInit *config);
|
||||||
|
bool RsConfigStartMinimised(RsInit *config);
|
||||||
void CleanupRsConfig(RsInit *);
|
void CleanupRsConfig(RsInit *);
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
//#define USE_SVN_VERSIONS 1
|
//#define USE_SVN_VERSIONS 1
|
||||||
|
|
||||||
#define VERSION "0.4.08a"
|
#define VERSION "0.4.09a"
|
||||||
|
|
||||||
#if USE_SVN_VERSIONS
|
#if USE_SVN_VERSIONS
|
||||||
#include "svn_revision.h"
|
#include "svn_revision.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user