diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
| commit | 45ee5ac6dc2159352596ce8e8ec744e0c864d492 (patch) | |
| tree | 55ca90fd4a0d5c0eae188c5919510b6b0d2e3c5d /src/smplayer.cpp | |
| parent | a35c74c509f107094fd81cee8df109b652063969 (diff) | |
Imported Upstream version 14.9.0.6690~ds0
Diffstat (limited to 'src/smplayer.cpp')
| -rw-r--r-- | src/smplayer.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/smplayer.cpp b/src/smplayer.cpp index cb77ca0..9db8b72 100644 --- a/src/smplayer.cpp +++ b/src/smplayer.cpp @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net> + Copyright (C) 2006-2015 Ricardo Villalba <rvm@users.sourceforge.net> 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 @@ -27,7 +27,6 @@ #include "clhelp.h" #include "cleanconfig.h" #include "myapplication.h" -#include "images.h" #ifdef MPCGUI #include "mpcgui.h" @@ -120,22 +119,10 @@ BaseGui * SMPlayer::gui() { QString theme_dir = Paths::themesPath() + "/" + theme; qDebug("SMPlayer::gui: user_theme_dir: %s", user_theme_dir.toUtf8().constData()); qDebug("SMPlayer::gui: theme_dir: %s", theme_dir.toUtf8().constData()); - #ifdef USE_RESOURCES - QString user_theme_resource = user_theme_dir +"/"+ theme +".rcc"; - QString theme_resource = theme_dir +"/"+ theme +".rcc"; - qDebug("SMPlayer::gui: user_theme_resource: %s", user_theme_resource.toUtf8().constData()); - qDebug("SMPlayer::gui: theme_resource: %s", theme_resource.toUtf8().constData()); - if ((QFile::exists(user_theme_resource)) || (QFile::exists(theme_resource))) { - #else if ((QDir(theme_dir).exists()) || (QDir(user_theme_dir).exists())) { - #endif if (pref->iconset.isEmpty()) pref->iconset = theme; } else { - #ifdef USE_RESOURCES - qDebug("SMPlayer::gui: skin resource file doesn't exist. Falling back to default gui."); - #else qDebug("SMPlayer::gui: skin folder doesn't exist. Falling back to default gui."); - #endif gui_to_use = "DefaultGUI"; pref->iconset = ""; pref->gui = gui_to_use; @@ -517,6 +504,9 @@ void SMPlayer::showInfo() { #if QT_VERSION >= 0x040803 case QSysInfo::WV_WINDOWS8: win_ver = "Windows 8/Server 2012"; break; #endif + #if ((QT_VERSION >= 0x040806 && QT_VERSION < 0x050000) || (QT_VERSION >= 0x050200)) + case QSysInfo::WV_WINDOWS8_1: win_ver = "Windows 8.1/Server 2012 R2"; break; + #endif case QSysInfo::WV_NT_based: win_ver = "NT-based Windows"; break; default: win_ver = QString("Unknown/Unsupported Windows OS"); break; } |