diff options
| -rw-r--r-- | src/app/main.cpp | 10 | ||||
| -rw-r--r-- | src/app/qmmpstarter.cpp | 10 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index e3abae563..b649ee35d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> #include <qmmp/qmmp.h> -#include "lxdesupport.h" #include "qmmpapplication.h" #include "qmmpstarter.h" @@ -36,13 +35,6 @@ int main(int argc, char *argv[]) a.setApplicationName("qmmp"); a.setWindowIcon(QIcon(":/32x32/qmmp.png")); - LXDESupport::load(); //load lxde icons - -#ifdef Q_OS_WIN - QIcon::setThemeSearchPaths(QStringList() << qApp->applicationDirPath() + "/themes/"); - QIcon::setThemeName("oxygen"); -#endif - QTranslator translator; QString locale = Qmmp::systemLanguageID(); translator.load(QString(":/qmmp_") + locale); diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 4e740c493..af6d6b188 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -36,6 +36,7 @@ #include <qmmpui/uiloader.h> #include <qmmpui/qmmpuisettings.h> #include "qmmpstarter.h" +#include "lxdesupport.h" #include "builtincommandlineoption.h" #ifdef Q_OS_WIN @@ -160,6 +161,13 @@ void QMMPStarter::startPlayer() connect(m_server, SIGNAL(newConnection()), SLOT(readCommand())); QStringList args = argString.split("\n", QString::SkipEmptyParts); + //load lxde icons + LXDESupport::load(); +#ifdef Q_OS_WIN + QIcon::setThemeSearchPaths(QStringList() << qApp->applicationDirPath() + "/themes/"); + QIcon::setThemeName("oxygen"); +#endif + //prepare libqmmp and libqmmpui libraries for usage m_player = new MediaPlayer(this); m_core = SoundCore::instance(); diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index e8f5169dc..ffbcc4cf8 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -84,7 +84,7 @@ QString Qmmp::systemLanguageID() if(m_langID.isEmpty()) { m_langID = uiLanguageID(); - qDebug("Qmmp: setting ui language to '%s'", qPrintable(m_langID)); + //qDebug("Qmmp: setting ui language to '%s'", qPrintable(m_langID)); } if(m_langID != "auto") |