Changeset 156 for smplayer/trunk/src/mpcgui

Timestamp:

Feb 21, 2014, 5:26:03 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.6

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mpcgui/mpcgui.cpp (modified) (7 diffs)

smplayer/trunk/src/mpcgui/mpcgui.cpp

@@ -88 +88 @@
         controlwidget = new QToolBar( this );
         controlwidget->setObjectName("controlwidget");
+        controlwidget->setLayoutDirection(Qt::LeftToRight);
+
         controlwidget->setMovable(false);
         controlwidget->setAllowedAreas(Qt::BottomToolBarArea);
@@ -109 +111 @@
         controlwidget->addAction(volumeslider_action);
 
-    timeslidewidget = new QToolBar( this );
+        timeslidewidget = new QToolBar( this );
         timeslidewidget->setObjectName("timeslidewidget");
+        timeslidewidget->setLayoutDirection(Qt::LeftToRight);
         timeslidewidget->addAction(timeslider_action);
     timeslidewidget->setMovable(false);
@@ -215 +218 @@
                 set->setValue( "pos", pos() );
                 set->setValue( "size", size() );
+                set->setValue( "state", (int) windowState() );
         }
 
@@ -237 +241 @@
                 move(p);
                 resize(s);
+
+                setWindowState( (Qt::WindowStates) set->value("state", 0).toInt() );
 
                 if (!DesktopInfo::isInsideScreen(this)) {
@@ -433 +439 @@
         forward3Act->change( tr("+%1").arg(Helper::timeForJumps(pref->seeking3)) );
 
+        /*
         if (qApp->isLeftToRight()) {
+        */
         rewind1Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(80,0,16,16) );
         rewind2Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(80,0,16,16) );
@@ -441 +449 @@
         forward2Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(96,0,16,16) );
         forward3Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(112,0,16,16) );
-
+        /*
         } else {
         rewind1Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(96,0,16,16) );
@@ -451 +459 @@
         forward3Act->setIcon( QPixmap(":/mpcgui/mpc_toolbar.png").copy(64,0,16,16) );
         }
+        */
 }