Commit 5364ae67 authored by Rafaël Carré's avatar Rafaël Carré

Simplification of Advanced Open

Control & Playback buttons have the same size
parent 32616498
......@@ -41,9 +41,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
OpenPanel( _parent, _p_intf )
{
ui.setupUi( this );
ui.audioGroupBox->hide();
BUTTONACT( ui.extraAudioButton, toggleExtraAudio() );
BUTTONACT( ui.fileBrowseButton, browseFile() );
BUTTONACT( ui.subBrowseButton, browseFileSub() );
BUTTONACT( ui.audioBrowseButton, browseFileAudio() );
......@@ -108,18 +106,6 @@ QString FileOpenPanel::getUpdatedMRL()
return ui.fileInput->currentText();
}
void FileOpenPanel::toggleExtraAudio()
{
if (ui.audioGroupBox->isVisible())
{
ui.audioGroupBox->hide();
}
else
{
ui.audioGroupBox->show();
}
}
void FileOpenPanel::clear()
{
ui.fileInput->setEditText( "");
......
......@@ -62,7 +62,6 @@ private:
void updateSubsMRL();
public slots:
virtual void sendUpdate() ;
void toggleExtraAudio() ;
void updateMRL();
void browseFile();
void browseFileSub();
......@@ -79,7 +78,7 @@ public:
virtual ~NetOpenPanel();
virtual QString getUpdatedMRL();
private:
Ui::OpenNet ui;
Ui::OpenNetwork ui;
public slots:
virtual void sendUpdate() ;
signals:
......@@ -103,6 +102,4 @@ signals:
};
#endif
......@@ -39,6 +39,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{
setWindowTitle( qtr("Open" ) );
ui.setupUi( this );
ui.vboxLayout->setSizeConstraint(QLayout::SetFixedSize);
fileOpenPanel = new FileOpenPanel(this , _p_intf );
diskOpenPanel = new DiskOpenPanel(this , _p_intf );
netOpenPanel = new NetOpenPanel(this , _p_intf );
......
......@@ -164,7 +164,7 @@ void MainInterface::handleMainUi( QSettings *settings )
ui.setupUi( centralWidget() );
slider = new InputSlider( Qt::Horizontal, NULL );
ui.hboxLayout->insertWidget( 0, slider );
ui.vboxLayout->insertWidget( 0, slider );
ui.discFrame->hide();
BUTTON_SET_IMG( ui.prevSectionButton, "", previous.png, "" );
BUTTON_SET_IMG( ui.nextSectionButton, "", next.png, "" );
......
......@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>819</width>
<height>384</height>
<width>502</width>
<height>201</height>
</rect>
</property>
<property name="sizePolicy" >
......@@ -93,7 +93,7 @@
</property>
<property name="maximumSize" >
<size>
<width>35</width>
<width>45</width>
<height>26</height>
</size>
</property>
......@@ -117,7 +117,7 @@
</property>
<property name="maximumSize" >
<size>
<width>35</width>
<width>45</width>
<height>26</height>
</size>
</property>
......@@ -144,7 +144,7 @@
</property>
<property name="maximumSize" >
<size>
<width>35</width>
<width>45</width>
<height>26</height>
</size>
</property>
......@@ -171,7 +171,7 @@
</property>
<property name="maximumSize" >
<size>
<width>35</width>
<width>45</width>
<height>26</height>
</size>
</property>
......@@ -193,8 +193,8 @@
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
<width>80</width>
<height>27</height>
</size>
</property>
</spacer>
......@@ -229,6 +229,20 @@
</item>
<item>
<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" >
<string/>
</property>
......
......@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>435</width>
<height>339</height>
<height>441</height>
</rect>
</property>
<property name="windowTitle" >
......@@ -25,6 +25,20 @@
</property>
<item>
<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" >
<number>-1</number>
</property>
......
This diff is collapsed.
This diff is collapsed.
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