Changeset 175 for smplayer/vendor/current/src/prefinput.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/prefinput.cpp (modified) (7 diffs)

smplayer/vendor/current/src/prefinput.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
@@ -80 +80 @@
         left_click_combo->addItem( tr("Preferences"), "show_preferences" );
         left_click_combo->addItem( tr("Double size"), "toggle_double_size" );
+        left_click_combo->addItem( tr("Next chapter"), "next_chapter" );
+        left_click_combo->addItem( tr("Previous chapter"), "prev_chapter" );
         left_click_combo->addItem( tr("Show video equalizer"), "video_equalizer" );
         left_click_combo->addItem( tr("Show audio equalizer"), "audio_equalizer" );
@@ -152 +154 @@
         wheel_function_speed->setText( tr("&Change speed") );
 
+        int drag_function = drag_function_combo->currentIndex();
+        drag_function_combo->clear();
+        drag_function_combo->addItem( tr("None"), Preferences::DragDisabled);
+        drag_function_combo->addItem( tr("Move window"), Preferences::MoveWindow);
+#ifdef MOUSE_GESTURES
+        drag_function_combo->addItem( tr("Seek and volume"), Preferences::Gestures);
+#endif
+        drag_function_combo->setCurrentIndex(drag_function);
+
 #if !USE_SHORTCUTGETTER
         actioneditor_desc->setText( 
@@ -174 +185 @@
         setWheelFunctionSeekingReverse(pref->wheel_function_seeking_reverse);
         delay_left_check->setChecked(pref->delay_left_click);
+
+        setDragFunction(pref->drag_function);
 }
 
@@ -189 +202 @@
         pref->wheel_function_seeking_reverse = wheelFunctionSeekingReverse();
         pref->delay_left_click = delay_left_check->isChecked();
+
+        pref->drag_function = dragFunction();
 }
 
@@ -304 +319 @@
 }
 
+void PrefInput::setDragFunction(int function) {
+        int d = drag_function_combo->findData(function);
+        if (d < 0) d = 0;
+        drag_function_combo->setCurrentIndex( d );
+}
+
+int PrefInput::dragFunction() {
+        return drag_function_combo->itemData(drag_function_combo->currentIndex()).toInt();
+}
+
 void PrefInput::createHelp() {
         clearHelp();
@@ -340 +365 @@
                 tr("Select the action for the mouse wheel.") );
 
+        setWhatsThis(drag_function_combo, tr("Drag function"),
+                tr("This option controls what to do when the mouse is moved while pressing the left button.") + "<br>" +
+                "<b>" + tr("Move window") + "</b>:" + tr("the main window is moved") + "<br>"
+#ifdef MOUSE_GESTURES
+                + "<b>" + tr("Seek and volume") + "</b>:" +
+                tr("a horizontal movement changes the time position while a vertical movement changes the volume")
+#endif
+        );
+
         setWhatsThis(delay_left_check, tr("Don't trigger the left click function with a double click"),
                 tr("If this option is enabled when you double click on the "