Changeset 165 for smplayer/trunk/src/prefplaylist.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefplaylist.cpp (modified) (6 diffs)

smplayer/trunk/src/prefplaylist.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
@@ -26 +26 @@
         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();
 }
@@ -48 +54 @@
 void PrefPlaylist::setData(Preferences * pref) {
         setAutoAddFilesToPlaylist( pref->auto_add_to_playlist );
-        setAddConsecutiveFiles( pref->add_to_playlist_consecutive_files );
+        setMediaToAdd( pref->media_to_add_to_playlist );
 }
 
@@ -55 +61 @@
 
         pref->auto_add_to_playlist = autoAddFilesToPlaylist();
-        pref->add_to_playlist_consecutive_files = addConsecutiveFiles();
+        pref->media_to_add_to_playlist = (Preferences::AutoAddToPlaylistFilter) mediaToAdd();
 }
 
@@ -66 +72 @@
 }
 
-void PrefPlaylist::setAddConsecutiveFiles(bool b) {
-        add_consecutive_files_check->setChecked(b);
+void PrefPlaylist::setMediaToAdd(int type) {
+        int i = media_to_add_combo->findData(type);
+        if (i < 0) i = 0;
+        media_to_add_combo->setCurrentIndex(i);
 }
 
-bool PrefPlaylist::addConsecutiveFiles() {
-        return add_consecutive_files_check->isChecked();
+int PrefPlaylist::mediaToAdd() {
+        return media_to_add_combo->itemData( media_to_add_combo->currentIndex() ).toInt();
 }
 
@@ -115 +123 @@
            "to the playlist.") );
 
-        setWhatsThis(add_consecutive_files_check, tr("Add consecutive files"),
-                tr("If this option is enabled, SMPlayer will look for consecutive "
-           "files (e.g. video_1.avi, video_2.avi...) and if found, they'll be "
-           "added to the playlist.") );
+        setWhatsThis(media_to_add_combo, tr("Add files from folder"),
+                tr("This option allows to add files automatically to the playlist:") +"<br>"+
+                tr("<b>None</b>: no files will be added") +"<br>"+
+                tr("<b>Video files</b>: all video files found in the folder will be added") +"<br>"+
+                tr("<b>Audio files</b>: all audio files found in the folder will be added") +"<br>"+
+                tr("<b>Video and audio files</b>: all video and audio files found in the folder will be added") +"<br>"+
+                tr("<b>Consecutive files</b>: consecutive files (like video_1.avi, video_2.avi) will be added") );
 
         setWhatsThis(play_from_start_check, tr("Play files from start"),