Changeset 175 for smplayer/vendor/current/src/prefplaylist.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

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

smplayer/vendor/current/src/prefplaylist.cpp ¶

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 {
         setupUi(this);
-
-        media_to_add_combo->addItem(tr("None"), Preferences::NoFiles);
-        media_to_add_combo->addItem(tr("Video files"), Preferences::VideoFiles);
-        media_to_add_combo->addItem(tr("Audio files"), Preferences::AudioFiles);
-        media_to_add_combo->addItem(tr("Video and audio files"), Preferences::MultimediaFiles);
-        media_to_add_combo->addItem(tr("Consecutive files"), Preferences::ConsecutiveFiles);
-
-        createHelp();
+        retranslateStrings();
 }
 
@@ -49 +42 @@
 void PrefPlaylist::retranslateStrings() {
         retranslateUi(this);
+
+        int index = media_to_add_combo->currentIndex();
+        media_to_add_combo->clear();
+        media_to_add_combo->addItem(tr("None"), Preferences::NoFiles);
+        media_to_add_combo->addItem(tr("Video files"), Preferences::VideoFiles);
+        media_to_add_combo->addItem(tr("Audio files"), Preferences::AudioFiles);
+        media_to_add_combo->addItem(tr("Video and audio files"), Preferences::MultimediaFiles);
+        media_to_add_combo->addItem(tr("Consecutive files"), Preferences::ConsecutiveFiles);
+        media_to_add_combo->setCurrentIndex(index);
+
         createHelp();
 }
@@ -114 +117 @@
 }
 
+void PrefPlaylist::setIgnorePlayerErrors(bool b) {
+        ignore_errors_check->setChecked(b);
+}
+
+bool PrefPlaylist::ignorePlayerErrors() {
+        return ignore_errors_check->isChecked();
+}
+
 void PrefPlaylist::createHelp() {
         clearHelp();
@@ -152 +163 @@
            "in the smplayer configuration when smplayer is closed, and it will "
            "reloaded automatically when smplayer is run again."));
+
+        setWhatsThis(ignore_errors_check, tr("Play next file even if the previous file failed"),
+                tr("If this option is enabled, the playlist will ignore playback errors from a previous file "
+           "and will play the next file in the list.") );
 }