Changeset 137 for smplayer/vendor/current/src/smplayer.cpp

Timestamp:

Dec 3, 2012, 5:29:00 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated vendor to 0.8.2

File:

• smplayer/vendor/current/src/smplayer.cpp (modified) (5 diffs)

smplayer/vendor/current/src/smplayer.cpp

@@ -29 +29 @@
 #include "myapplication.h"
 
+#ifdef SKINS
+#include "skingui.h"
+#endif
+
 #include <QDir>
 #include <QUrl>
@@ -39 +43 @@
 #include "winfileassoc.h"       //required for Uninstall
 #endif
+#endif
+
+#ifdef FONTCACHE_DIALOG
+#include "fontcache.h"
+#include "version.h"
 #endif
 
@@ -109 +118 @@
         BaseGui * gui = 0;
 
+#ifdef SKINS
+        if (gui_name.toLower() == "skingui")
+                gui = new SkinGui(0);
+        else
+#endif
         if (gui_name.toLower() == "minigui") 
                 gui = new MiniGui(0);
@@ -354 +368 @@
 
 void SMPlayer::start() {
+#ifdef FONTCACHE_DIALOG
+#ifndef PORTABLE_APP
+        if (smplayerVersion() != pref->smplayer_version) {
+                FontCacheDialog d(0);
+                d.run(pref->mplayer_bin, "sample.avi");
+                pref->smplayer_version = smplayerVersion();
+        }
+#endif
+#endif
+
         if (!gui()->startHidden() || !files_to_play.isEmpty() ) gui()->show();
         if (!files_to_play.isEmpty()) {
@@ -394 +418 @@
                 case QSysInfo::WV_2000: win_ver = "Windows 2000"; break;
                 case QSysInfo::WV_XP: win_ver = "Windows XP"; break;
-                case QSysInfo::WV_2003: win_ver = "Windows Server 2003"; break;
-                case QSysInfo::WV_VISTA: win_ver = "Windows Vista"; break;
+                case QSysInfo::WV_2003: win_ver = "Windows XP Professional x64/Server 2003"; break;
+                case QSysInfo::WV_VISTA: win_ver = "Windows Vista/Server 2008"; break;
                 #if QT_VERSION >= 0x040501
-                case QSysInfo::WV_WINDOWS7: win_ver = "Windows 7"; break;
+                case QSysInfo::WV_WINDOWS7: win_ver = "Windows 7/Server 2008 R2"; break;
                 #endif
                 #if QT_VERSION >= 0x040803
-                case QSysInfo::WV_WINDOWS8: win_ver = "Windows 8"; break;
+                case QSysInfo::WV_WINDOWS8: win_ver = "Windows 8/Server 2012"; break;
                 #endif
-                default: win_ver = QString("other: %1").arg(QSysInfo::WindowsVersion);
+                case QSysInfo::WV_NT_based: win_ver = "NT-based Windows"; break;
+                default: win_ver = QString("Unknown/Unsupported Windows OS"); break;
         }
 #endif