[vlc-commits] Qt, sprefs: add play-and-pause

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 16 21:06:56 2011 +0100| [3889a42f5e7e879a9b88569c79c419c317ce1790] | committer: Jean-Baptiste Kempf

Qt, sprefs: add play-and-pause

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3889a42f5e7e879a9b88569c79c419c317ce1790
---

 modules/gui/qt4/components/simple_preferences.cpp |    1 +
 modules/gui/qt4/ui/sprefs_interface.ui            |   33 ++++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index d79fedc..a2c9b91 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -602,6 +602,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
             CONFIG_BOOL( "qt-pause-minimized", pauseMinimizedBox );
             CONFIG_BOOL( "playlist-tree", treePlaylist );
+            CONFIG_BOOL( "play-and-pause", playPauseBox );
             CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
                                  ui.fileSkin, ui.skinBrowse );
 
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index ce83ca0..268734d 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -231,17 +231,21 @@
      <property name="title">
       <string>Playlist</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <property name="bottomMargin">
-       <number>9</number>
-      </property>
-      <item row="0" column="0" colspan="3">
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
        <widget class="QCheckBox" name="treePlaylist">
         <property name="text">
          <string>Display playlist tree</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="2" colspan="2">
+       <widget class="QCheckBox" name="playPauseBox">
+        <property name="text">
+         <string>Pause on the last frame of a video</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="assocLabel">
         <property name="sizePolicy">
@@ -258,6 +262,19 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="1" column="2">
        <widget class="QPushButton" name="assoButton">
         <property name="sizePolicy">
@@ -277,14 +294,14 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <spacer name="horizontalSpacer_6">
+      <item row="1" column="3">
+       <spacer name="horizontalSpacer_8">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
+          <width>135</width>
           <height>20</height>
          </size>
         </property>