Skip to content

V
vlc-1.1
Commit 5364ae67 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Simplification of Advanced Open 

Control & Playback buttons have the same size
parent 32616498
Expand all Show whitespace changes
Inline Side-by-side
Showing with 593 additions and 937 deletions
modules/gui/qt4/components/open.cpp
View file @ 5364ae67
...@@ -41,9 +41,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -41,9 +41,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
OpenPanel( _parent, _p_intf ) OpenPanel( _parent, _p_intf )
{ {
ui.setupUi( this ); ui.setupUi( this );
ui.audioGroupBox->hide();
BUTTONACT( ui.extraAudioButton, toggleExtraAudio() );
BUTTONACT( ui.fileBrowseButton, browseFile() ); BUTTONACT( ui.fileBrowseButton, browseFile() );
BUTTONACT( ui.subBrowseButton, browseFileSub() ); BUTTONACT( ui.subBrowseButton, browseFileSub() );
BUTTONACT( ui.audioBrowseButton, browseFileAudio() ); BUTTONACT( ui.audioBrowseButton, browseFileAudio() );
...@@ -108,18 +106,6 @@ QString FileOpenPanel::getUpdatedMRL() ...@@ -108,18 +106,6 @@ QString FileOpenPanel::getUpdatedMRL()
return ui.fileInput->currentText(); return ui.fileInput->currentText();
} }
void FileOpenPanel::toggleExtraAudio()
{
if (ui.audioGroupBox->isVisible())
{
ui.audioGroupBox->hide();
}
else
{
ui.audioGroupBox->show();
}
}
void FileOpenPanel::clear() void FileOpenPanel::clear()
{ {
ui.fileInput->setEditText( ""); ui.fileInput->setEditText( "");
......
modules/gui/qt4/components/open.hpp
View file @ 5364ae67
...@@ -62,7 +62,6 @@ private: ...@@ -62,7 +62,6 @@ private:
void updateSubsMRL(); void updateSubsMRL();
public slots: public slots:
virtual void sendUpdate() ; virtual void sendUpdate() ;
void toggleExtraAudio() ;
void updateMRL(); void updateMRL();
void browseFile(); void browseFile();
void browseFileSub(); void browseFileSub();
...@@ -79,7 +78,7 @@ public: ...@@ -79,7 +78,7 @@ public:
virtual ~NetOpenPanel(); virtual ~NetOpenPanel();
virtual QString getUpdatedMRL(); virtual QString getUpdatedMRL();
private: private:
Ui::OpenNet ui; Ui::OpenNetwork ui;
public slots: public slots:
virtual void sendUpdate() ; virtual void sendUpdate() ;
signals: signals:
...@@ -103,6 +102,4 @@ signals: ...@@ -103,6 +102,4 @@ signals:
}; };
#endif #endif
modules/gui/qt4/dialogs/open.cpp
View file @ 5364ae67
...@@ -39,6 +39,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -39,6 +39,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{ {
setWindowTitle( qtr("Open" ) ); setWindowTitle( qtr("Open" ) );
ui.setupUi( this ); ui.setupUi( this );
ui.vboxLayout->setSizeConstraint(QLayout::SetFixedSize);
fileOpenPanel = new FileOpenPanel(this , _p_intf ); fileOpenPanel = new FileOpenPanel(this , _p_intf );
diskOpenPanel = new DiskOpenPanel(this , _p_intf ); diskOpenPanel = new DiskOpenPanel(this , _p_intf );
netOpenPanel = new NetOpenPanel(this , _p_intf ); netOpenPanel = new NetOpenPanel(this , _p_intf );
......
modules/gui/qt4/main_interface.cpp
View file @ 5364ae67
...@@ -164,7 +164,7 @@ void MainInterface::handleMainUi( QSettings *settings ) ...@@ -164,7 +164,7 @@ void MainInterface::handleMainUi( QSettings *settings )
ui.setupUi( centralWidget() ); ui.setupUi( centralWidget() );
slider = new InputSlider( Qt::Horizontal, NULL ); slider = new InputSlider( Qt::Horizontal, NULL );
ui.hboxLayout->insertWidget( 0, slider ); ui.vboxLayout->insertWidget( 0, slider );
ui.discFrame->hide(); ui.discFrame->hide();
BUTTON_SET_IMG( ui.prevSectionButton, "", previous.png, "" ); BUTTON_SET_IMG( ui.prevSectionButton, "", previous.png, "" );
BUTTON_SET_IMG( ui.nextSectionButton, "", next.png, "" ); BUTTON_SET_IMG( ui.nextSectionButton, "", next.png, "" );
......
modules/gui/qt4/ui/main_interface.ui
View file @ 5364ae67
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>819</width> <width>502</width>
<height>384</height> <height>201</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>35</width> <width>45</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>35</width> <width>45</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>35</width> <width>45</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>35</width> <width>45</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
...@@ -193,8 +193,8 @@ ...@@ -193,8 +193,8 @@
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>40</width> <width>80</width>
<height>20</height> <height>27</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -229,6 +229,20 @@ ...@@ -229,6 +229,20 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="playlistButton" > <widget class="QPushButton" name="playlistButton" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>4</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>45</width>
<height>26</height>
</size>
</property>
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
......
modules/gui/qt4/ui/open.ui
View file @ 5364ae67
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>435</width>
<height>339</height> <height>441</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -25,6 +25,20 @@ ...@@ -25,6 +25,20 @@
</property> </property>
<item> <item>
<widget class="QTabWidget" name="Tab" > <widget class="QTabWidget" name="Tab" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>417</width>
<height>290</height>
</size>
</property>
<property name="currentIndex" > <property name="currentIndex" >
<number>-1</number> <number>-1</number>
</property> </property>
......
modules/gui/qt4/ui/open_disk.ui
View file @ 5364ae67
...@@ -6,42 +6,41 @@ ...@@ -6,42 +6,41 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>569</width> <width>448</width>
<height>214</height> <height>232</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QGroupBox" name="diskTypeGroupBox" > <widget class="QGroupBox" name="diskTypeGroupBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>391</width>
<height>121</height>
</rect>
</property>
<property name="title" > <property name="title" >
<string>Disc Type</string> <string>Disc Type</string>
</property> </property>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>159</width>
<height>85</height>
</rect>
</property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item>
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" >
<string>DVD</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" > <property name="margin" >
...@@ -51,20 +50,14 @@ ...@@ -51,20 +50,14 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<spacer> <widget class="QRadioButton" name="dvdRadioButton" >
<property name="orientation" > <property name="text" >
<enum>Qt::Horizontal</enum> <string>DVD</string>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="checked" >
<size> <bool>true</bool>
<width>8</width>
<height>10</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="menuDVDButton" > <widget class="QCheckBox" name="menuDVDButton" >
...@@ -76,19 +69,6 @@ ...@@ -76,19 +69,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
...@@ -105,24 +85,18 @@ ...@@ -105,24 +85,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </widget>
<item>
<widget class="QGroupBox" name="diskOptionGroupBox" > <widget class="QGroupBox" name="diskOptionGroupBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>130</y>
<width>391</width>
<height>69</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>5</hsizetype> <hsizetype>5</hsizetype>
...@@ -132,7 +106,7 @@ ...@@ -132,7 +106,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title" > <property name="title" >
<string>Options</string> <string>Device</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" > <property name="margin" >
...@@ -149,13 +123,6 @@ ...@@ -149,13 +123,6 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item>
<widget class="QLabel" name="pathDiskLabel" >
<property name="text" >
<string>Path:</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QComboBox" name="diskBrowseLine" > <widget class="QComboBox" name="diskBrowseLine" >
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -180,115 +147,8 @@ ...@@ -180,115 +147,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="diskOptionsLabel1" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Entry:&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox1" />
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="diskOptionsLabel2" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Chapter:&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox2" />
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="diskOptionsLabel3" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Subtitles:&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox3" />
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="diskOptionsLabel4" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Audio Channel:&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox4" />
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>
......
modules/gui/qt4/ui/open_file.ui
View file @ 5364ae67
This diff is collapsed.
modules/gui/qt4/ui/open_net.ui
View file @ 5364ae67
This diff is collapsed.
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