OTHER: Make 'Quit server on close' option work
This commit is contained in:
parent
ef687a9375
commit
5e8d83ca8e
8 changed files with 102 additions and 37 deletions
70
src/main.cpp
70
src/main.cpp
|
@ -1,70 +0,0 @@
|
|||
/**
|
||||
* This file is a part of Promoe, an XMMS2 Client.
|
||||
*
|
||||
* Copyright (C) 2005-2008 XMMS2 Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include "XMMSHandler.h"
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include "Skin.h"
|
||||
|
||||
#ifdef HAVE_SERVERBROWSER
|
||||
#include "Serverbrowser.h"
|
||||
#endif
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
QApplication app(argc, argv);
|
||||
|
||||
QCoreApplication::setOrganizationName("xmms2");
|
||||
QCoreApplication::setOrganizationDomain("xmms.org");
|
||||
QCoreApplication::setApplicationName("Promoe");
|
||||
|
||||
//TODO: Change to XClient sometime later
|
||||
XMMSHandler &client = XMMSHandler::getInstance ();
|
||||
|
||||
QSettings settings;
|
||||
|
||||
#ifdef Q_OS_MACX
|
||||
/** This is soooo wrong, there must exsist a flag for
|
||||
* static plugins
|
||||
Q_IMPORT_PLUGIN(QJpegPlugin);
|
||||
*/
|
||||
#endif
|
||||
|
||||
MainWindow *mw = new MainWindow (NULL);
|
||||
|
||||
/*
|
||||
* Now that everything is initialized
|
||||
* open the skin and send the
|
||||
* SkinChanged signal that will cause
|
||||
* all widgets to get their pixmaps
|
||||
*/
|
||||
if (!settings.contains ("skin/path")) {
|
||||
settings.setValue ("skin/path", ":CleanAMP/");
|
||||
}
|
||||
|
||||
Skin::getInstance()->setSkin (settings.value("skin/path").toString ());
|
||||
|
||||
mw->show ();
|
||||
|
||||
#ifdef HAVE_SERVERBROWSER
|
||||
ServerBrowserWindow *browser = new ServerBrowserWindow (mw);
|
||||
browser->show ();
|
||||
#endif
|
||||
|
||||
return app.exec();
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue