Skip to content

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

Qt4: Change the UI to allow startime in double.

parent 3cac0a48
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 120 deletions
modules/gui/qt4/dialogs/open.cpp
View file @ e6825471
...@@ -164,7 +164,7 @@ OpenDialog::OpenDialog( QWidget *parent, ...@@ -164,7 +164,7 @@ OpenDialog::OpenDialog( QWidget *parent,
CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() ); CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() );
CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() ); CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() );
CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() ); CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() );
CONNECT( ui.startTimeSpinBox, valueChanged( int ), this, updateMRL() ); CONNECT( ui.startTimeDoubleSpinBox, valueChanged( double ), this, updateMRL() );
BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() ); BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );
BUTTONACT( ui.slaveBrowseButton, browseInputSlave() ); BUTTONACT( ui.slaveBrowseButton, browseInputSlave() );
...@@ -417,9 +417,8 @@ void OpenDialog::updateMRL() { ...@@ -417,9 +417,8 @@ void OpenDialog::updateMRL() {
mrl += QString( " :%1=%2" ).arg( storedMethod ). mrl += QString( " :%1=%2" ).arg( storedMethod ).
arg( ui.cacheSpinBox->value() ); arg( ui.cacheSpinBox->value() );
} }
if( ui.startTimeSpinBox->value() ) { if( ui.startTimeDoubleSpinBox->value() ) {
mrl += " :start-time=" + QString( "%1" ). mrl += " :start-time=" + QString::number( ui.startTimeDoubleSpinBox->value() );
arg( ui.startTimeSpinBox->value() );
} }
ui.advancedLineInput->setText( mrl ); ui.advancedLineInput->setText( mrl );
ui.mrlLine->setText( itemsMRL.join( " " ) ); ui.mrlLine->setText( itemsMRL.join( " " ) );
......
modules/gui/qt4/ui/open.ui
View file @ e6825471
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Jean-Baptiste Kempf</author> <author>Jean-Baptiste Kempf</author>
<class>Open</class> <class>Open</class>
<widget class="QWidget" name="Open" > <widget class="QWidget" name="Open">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
...@@ -13,70 +14,70 @@ ...@@ -13,70 +14,70 @@
<height>387</height> <height>387</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>400</width> <width>400</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4" > <item row="0" column="0" colspan="4">
<widget class="QTabWidget" name="Tab" /> <widget class="QTabWidget" name="Tab"/>
</item> </item>
<item row="1" column="0" colspan="4" > <item row="1" column="0" colspan="4">
<widget class="QCheckBox" name="advancedCheckBox" > <widget class="QCheckBox" name="advancedCheckBox">
<property name="toolTip" > <property name="toolTip">
<string>Show extended options</string> <string>Show extended options</string>
</property> </property>
<property name="text" > <property name="text">
<string>Show &amp;more options</string> <string>Show &amp;more options</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="4" > <item row="2" column="0" colspan="4">
<widget class="QGroupBox" name="advancedFrame" > <widget class="QGroupBox" name="advancedFrame">
<layout class="QGridLayout" name="gridLayout_2" > <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="cacheLabel" > <widget class="QLabel" name="cacheLabel">
<property name="text" > <property name="text">
<string>Caching</string> <string>Caching</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>cacheSpinBox</cstring> <cstring>cacheSpinBox</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QSpinBox" name="cacheSpinBox" > <widget class="QSpinBox" name="cacheSpinBox">
<property name="toolTip" > <property name="toolTip">
<string>Change the caching for the media</string> <string>Change the caching for the media</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignRight</set> <set>Qt::AlignRight</set>
</property> </property>
<property name="suffix" > <property name="suffix">
<string> ms</string> <string> ms</string>
</property> </property>
<property name="maximum" > <property name="maximum">
<number>65535</number> <number>65535</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3" > <item row="0" column="3">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
...@@ -84,38 +85,22 @@ ...@@ -84,38 +85,22 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="4" > <item row="0" column="4">
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>Start Time</string> <string>Start Time</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>startTimeSpinBox</cstring> <cstring>startTimeDoubleSpinBox</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5" colspan="2" > <item row="0" column="7">
<widget class="QSpinBox" name="startTimeSpinBox" >
<property name="toolTip" >
<string>Change the start time for the media</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="suffix" >
<string> s</string>
</property>
<property name="maximum" >
<number>65535</number>
</property>
</widget>
</item>
<item row="0" column="7" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
...@@ -123,82 +108,98 @@ ...@@ -123,82 +108,98 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2" colspan="6" > <item row="1" column="2" colspan="6">
<widget class="Line" name="line" /> <widget class="Line" name="line"/>
</item> </item>
<item row="2" column="0" colspan="8" > <item row="2" column="0" colspan="8">
<widget class="QCheckBox" name="slaveCheckbox" > <widget class="QCheckBox" name="slaveCheckbox">
<property name="text" > <property name="text">
<string>Play another media synchronously (extra audio file, ...)</string> <string>Play another media synchronously (extra audio file, ...)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QLabel" name="slaveLabel" > <widget class="QLabel" name="slaveLabel">
<property name="text" > <property name="text">
<string>Extra media</string> <string>Extra media</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>slaveText</cstring> <cstring>slaveText</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="4" > <item row="3" column="2" colspan="4">
<widget class="QLineEdit" name="slaveText" /> <widget class="QLineEdit" name="slaveText"/>
</item> </item>
<item row="3" column="6" colspan="2" > <item row="3" column="6" colspan="2">
<widget class="QPushButton" name="slaveBrowseButton" > <widget class="QPushButton" name="slaveBrowseButton">
<property name="toolTip" > <property name="toolTip">
<string>Select the file</string> <string>Select the file</string>
</property> </property>
<property name="text" > <property name="text">
<string>Browse...</string> <string>Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" colspan="6" > <item row="4" column="2" colspan="6">
<widget class="Line" name="line" /> <widget class="Line" name="line"/>
</item> </item>
<item row="5" column="0" > <item row="5" column="0">
<widget class="QLabel" name="advancedLabel" > <widget class="QLabel" name="advancedLabel">
<property name="text" > <property name="text">
<string>MRL</string> <string>MRL</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>advancedLineInput</cstring> <cstring>advancedLineInput</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2" colspan="6" > <item row="5" column="2" colspan="6">
<widget class="QLineEdit" name="mrlLine" > <widget class="QLineEdit" name="mrlLine">
<property name="readOnly" > <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2" colspan="6" > <item row="6" column="2" colspan="6">
<widget class="QLineEdit" name="advancedLineInput" > <widget class="QLineEdit" name="advancedLineInput">
<property name="toolTip" > <property name="toolTip">
<string>Complete MRL for VLC internal</string> <string>Complete MRL for VLC internal</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" > <item row="6" column="0">
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>Edit Options</string> <string>Edit Options</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5" colspan="2">
<widget class="QDoubleSpinBox" name="startTimeDoubleSpinBox">
<property name="toolTip">
<string>Change the start time for the media</string>
</property>
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
<property name="suffix">
<string>s</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
...@@ -206,65 +207,65 @@ ...@@ -206,65 +207,65 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="1" > <item row="3" column="1">
<widget class="QToolButton" name="menuButton" > <widget class="QToolButton" name="menuButton">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Minimum" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="focusPolicy" > <property name="focusPolicy">
<enum>Qt::ClickFocus</enum> <enum>Qt::ClickFocus</enum>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Select play mode</string> <string>Select play mode</string>
</property> </property>
<property name="popupMode" > <property name="popupMode">
<enum>QToolButton::InstantPopup</enum> <enum>QToolButton::InstantPopup</enum>
</property> </property>
<property name="arrowType" > <property name="arrowType">
<enum>Qt::NoArrow</enum> <enum>Qt::NoArrow</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" > <item row="3" column="2">
<widget class="QPushButton" name="playButton" > <widget class="QPushButton" name="playButton">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" > <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text" > <property name="text">
<string>Play</string> <string>Play</string>
</property> </property>
<property name="default" > <property name="default">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3" > <item row="3" column="3">
<widget class="QDialogButtonBox" name="buttonsBox" > <widget class="QDialogButtonBox" name="buttonsBox">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" > <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::NoButton</set> <set>QDialogButtonBox::NoButton</set>
</property> </property>
</widget> </widget>
...@@ -275,7 +276,7 @@ ...@@ -275,7 +276,7 @@
<tabstop>Tab</tabstop> <tabstop>Tab</tabstop>
<tabstop>advancedCheckBox</tabstop> <tabstop>advancedCheckBox</tabstop>
<tabstop>cacheSpinBox</tabstop> <tabstop>cacheSpinBox</tabstop>
<tabstop>startTimeSpinBox</tabstop> <tabstop>startTimeDoubleSpinBox</tabstop>
<tabstop>slaveCheckbox</tabstop> <tabstop>slaveCheckbox</tabstop>
<tabstop>slaveText</tabstop> <tabstop>slaveText</tabstop>
<tabstop>slaveBrowseButton</tabstop> <tabstop>slaveBrowseButton</tabstop>
...@@ -291,11 +292,11 @@ ...@@ -291,11 +292,11 @@
<receiver>slaveLabel</receiver> <receiver>slaveLabel</receiver>
<slot>setVisible(bool)</slot> <slot>setVisible(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>54</x> <x>54</x>
<y>384</y> <y>384</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>63</x> <x>63</x>
<y>410</y> <y>410</y>
</hint> </hint>
...@@ -307,11 +308,11 @@ ...@@ -307,11 +308,11 @@
<receiver>slaveText</receiver> <receiver>slaveText</receiver>
<slot>setVisible(bool)</slot> <slot>setVisible(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>127</x> <x>127</x>
<y>387</y> <y>387</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>136</x> <x>136</x>
<y>406</y> <y>406</y>
</hint> </hint>
...@@ -323,11 +324,11 @@ ...@@ -323,11 +324,11 @@
<receiver>slaveBrowseButton</receiver> <receiver>slaveBrowseButton</receiver>
<slot>setVisible(bool)</slot> <slot>setVisible(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>219</x> <x>219</x>
<y>102</y> <y>102</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>386</x> <x>386</x>
<y>131</y> <y>131</y>
</hint> </hint>
......
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