Changeset 163 for smplayer/vendor/current/src/prefsubtitles.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

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

smplayer/vendor/current/src/prefsubtitles.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -40 +40 @@
         connect( style_border_style_combo, SIGNAL(currentIndexChanged(int)),
              this, SLOT(checkBorderStyleCombo(int)) );
+
+#ifndef Q_OS_WIN
+        windowsfontdir_check->hide();
+#endif
 
         retranslateStrings();
@@ -156 +160 @@
         setForceAssStyles(pref->force_ass_styles);
         setCustomizedAssStyle(pref->user_forced_ass_style);
+
+#ifdef Q_OS_WIN
+        windowsfontdir_check->setChecked(pref->use_windowsfontdir);
+        if (!windowsfontdir_check->isChecked()) on_windowsfontdir_check_toggled(false);
+#endif
 }
 
@@ -199 +208 @@
         TEST_AND_SET(pref->force_ass_styles, forceAssStyles());
         TEST_AND_SET(pref->user_forced_ass_style, customizedAssStyle());
+
+#ifdef Q_OS_WIN
+        pref->use_windowsfontdir = windowsfontdir_check->isChecked();
+#endif
 }
 
@@ -406 +419 @@
 }
 
+void PrefSubtitles::on_windowsfontdir_check_toggled(bool b) {
+        qDebug("PrefSubtitles::on_windowsfontdir_check_toggled: %d", b);
+
+#ifdef Q_OS_WIN
+        if (b) {
+                style_font_combo->setFontsFromDir(QString::null);
+        } else {
+                QString fontdir = Paths::fontPath();
+                //QString fontdir = "/tmp/fonts/";
+                style_font_combo->setFontsFromDir(fontdir);
+        }
+#endif
+}
+
 void PrefSubtitles::createHelp() {
         clearHelp();
@@ -445 +472 @@
            "<b>Disabling this option could make that subtitles won't work "
            "at all!</b>") );
+
+#ifdef Q_OS_WIN
+        setWhatsThis(windowsfontdir_check, tr("Enable Windows fonts"), 
+                tr("If this option is enabled the Windows system fonts will be "
+           "available for subtitles. There's an inconvenience: a font cache have "
+           "to be created which can take some time.") +"<br>"+
+                tr("If this option is not checked then only a few fonts bundled with SMPlayer "
+           "can be used, but this is faster.") );
+#endif
 
         addSectionTitle(tr("Font"));