Skip to content

V
vlc-2-2
Commit cdf00df2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: add the minimize-on-pause option in the SPrefs...

parent 588c2528
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 103 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ cdf00df2
......@@ -596,6 +596,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT( ui.systrayBox, toggled( bool ), ui.sysPop, setEnabled( bool ) );
ui.sysPop->setEnabled( ui.systrayBox->isChecked() );
CONFIG_BOOL( "qt-pause-minimized", pauseMinimizedBox );
CONFIG_BOOL( "playlist-tree", treePlaylist );
CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
ui.fileSkin, ui.skinBrowse );
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ cdf00df2
......@@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>697</width>
<height>594</height>
<width>699</width>
<height>627</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -319,6 +319,52 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_4">
<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="0" column="2">
<widget class="QRadioButton" name="qt4">
<property name="toolTip">
<string>This is VLC's default interface, with a native look and feel.</string>
</property>
<property name="text">
<string>Use native style</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer_5">
<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" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0" rowspan="6" colspan="7">
<widget class="QStackedWidget" name="styleStackedWidget">
<property name="currentIndex">
......@@ -369,67 +415,56 @@
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>0</number>
</property>
<item row="7" column="0">
<widget class="QCheckBox" name="systrayBox">
<property name="text">
<string>Show systray icon</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="sysPop">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="fsController">
<property name="text">
<string>Systray popup when minimized</string>
<string>Show controls in full screen mode</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="fsController">
<widget class="QCheckBox" name="minimalviewBox">
<property name="text">
<string>Show controls in full screen mode</string>
<string>Start in minimal view mode</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="minimalviewBox">
<item row="1" column="1" colspan="2">
<widget class="QCheckBox" name="pauseMinimizedBox">
<property name="text">
<string>Start in minimal view mode</string>
<string>Pause playback when minimized</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="2" column="0">
<widget class="QCheckBox" name="embedVideo">
<property name="text">
<string>Integrate video in interface</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="resizingBox">
<property name="text">
<string>Resize interface to video size</string>
</property>
</widget>
</item>
<item row="8" column="0" rowspan="2" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="3" column="0" rowspan="2">
<widget class="QCheckBox" name="systrayBox">
<property name="text">
<string>Show systray icon</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</widget>
</item>
<item row="3" column="1" rowspan="2" colspan="2">
<widget class="QCheckBox" name="sysPop">
<property name="text">
<string>Systray popup when minimized</string>
</property>
</spacer>
</widget>
</item>
<item>
<item row="5" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
......@@ -445,12 +480,10 @@
</property>
</widget>
</item>
<item>
<item row="5" column="1" colspan="2">
<widget class="QComboBox" name="stylesCombo"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
......@@ -577,52 +610,6 @@
</widget>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_4">
<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="0" column="2">
<widget class="QRadioButton" name="qt4">
<property name="toolTip">
<string>This is VLC's default interface, with a native look and feel.</string>
</property>
<property name="text">
<string>Use native style</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer_5">
<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" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......@@ -641,6 +628,7 @@
<tabstop>skins</tabstop>
<tabstop>fsController</tabstop>
<tabstop>minimalviewBox</tabstop>
<tabstop>pauseMinimizedBox</tabstop>
<tabstop>embedVideo</tabstop>
<tabstop>resizingBox</tabstop>
<tabstop>systrayBox</tabstop>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment