Qt: do "normal->loopall->loop1->normal" instead of "normal->loop1->loopall->normal"

And fix logic

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 9ee711796e6498bfde5d30eee694abb584d7929a..095d87524cbf0a04b1df6fe2581de0c93d7f2e11 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -258,6 +258,6 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
 void LoopButton::updateIcons( int value )
 {
     setChecked( value != NORMAL );
-    setIcon( ( value == REPEAT_ALL ) ? QIcon( ":/buttons/playlist/repeat_all" )
-                                     : QIcon( ":/buttons/playlist/repeat_one" ) );
+    setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
+                                     : QIcon( ":/buttons/playlist/repeat_all" ) );
 }

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index b589564765165969d2765a3981c975d7de22e6bc..c7222c243e8358010371e6eb3cee574f9447e0b1 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1103,8 +1103,8 @@ void MainInputManager::toggleRandom()
 
 void MainInputManager::notifyRepeatLoop()
 {
-    int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ONE
-              + var_GetBool( THEPL, "repeat" ) * REPEAT_ALL;
+    int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ALL
+              + var_GetBool( THEPL, "repeat" ) * REPEAT_ONE;
 
     emit repeatLoopChanged( i_value );
 }