Cleanup mainwindow startup code

This commit is contained in:
Christophe Dumez 2011-01-17 17:29:25 +00:00
parent 8fd7b86f45
commit 9b6b357c9e
2 changed files with 6 additions and 9 deletions

View file

@ -302,8 +302,6 @@ int main(int argc, char *argv[]){
#ifndef DISABLE_GUI
MainWindow window(0, torrentCmdLine);
if(!no_splash)
window.raise();
QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
&window, SLOT(processParams(const QString&)));
app.setActivationWindow(&window);

View file

@ -233,8 +233,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
if(!autoShutdownGroup->checkedAction())
actionAutoShutdown_Disabled->setChecked(true);
show();
// Load Window state and sizes
readSettings();
properties->readSettings();
@ -242,13 +240,14 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
// Limit status filters list height
transferListFilters->getStatusFilters()->updateHeight();
if(ui_locked) {
hide();
} else {
if(!ui_locked) {
if(pref.startMinimized())
showMinimized();
else
setFocus();
else {
show();
activateWindow();
raise();
}
}
// Start watching the executable for updates