mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-05 15:45:04 -04:00
-added Log feature for QT .
-fixed Prefences and General Dialog -disabled show function from main.cpp it will not allow to start minimized, it blocks minimize gui function. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
8b9e64f9f6
commit
cb891ff08a
29 changed files with 961 additions and 1063 deletions
|
@ -25,6 +25,7 @@
|
|||
#include <gui/MainWindow.h>
|
||||
#include <gui/StartDialog.h>
|
||||
#include <gui/GenCertDialog.h>
|
||||
#include <Gui/Preferences/Rsharesettings.h>
|
||||
|
||||
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
|
||||
#include <gui/qskinobject/qskinobject.h>
|
||||
|
@ -144,22 +145,24 @@ int main(int argc, char *argv[])
|
|||
notify->setChannelsDialog(w->channelsDialog);
|
||||
notify->setMessengerWindow(w->messengerWindow);
|
||||
|
||||
/* only show window, if not startMinimised */
|
||||
if (!startMinimised)
|
||||
/* only show window, if not startMinimized */
|
||||
/*if (!startMinimised)
|
||||
{
|
||||
|
||||
w->show();
|
||||
//skinWindow->show();
|
||||
|
||||
}
|
||||
}*/
|
||||
/* Run Retroshare */
|
||||
int ret = rshare.run();
|
||||
|
||||
/* Startup a Timer to keep the gui's updated */
|
||||
QTimer *timer = new QTimer(w);
|
||||
timer -> connect(timer, SIGNAL(timeout()), notify, SLOT(UpdateGUI()));
|
||||
timer->start(1000);
|
||||
|
||||
/* dive into the endless loop */
|
||||
return rshare.exec();
|
||||
/* dive into the endless loop */
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue