From 5364ae678b8ee94b65921ea51ab8b3b1e181191e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Fri, 1 Dec 2006 09:45:24 +0000 Subject: [PATCH] Simplification of Advanced Open Control & Playback buttons have the same size --- modules/gui/qt4/components/open.cpp | 14 - modules/gui/qt4/components/open.hpp | 5 +- modules/gui/qt4/dialogs/open.cpp | 1 + modules/gui/qt4/main_interface.cpp | 2 +- modules/gui/qt4/ui/main_interface.ui | 30 +- modules/gui/qt4/ui/open.ui | 16 +- modules/gui/qt4/ui/open_disk.ui | 378 +++++---------- modules/gui/qt4/ui/open_file.ui | 659 +++++++++++---------------- modules/gui/qt4/ui/open_net.ui | 425 +++++++---------- 9 files changed, 593 insertions(+), 937 deletions(-) diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp index 0120f02db2..245b1c5fe5 100644 --- a/modules/gui/qt4/components/open.cpp +++ b/modules/gui/qt4/components/open.cpp @@ -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( ""); diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp index 0b46478379..60dbe420ff 100644 --- a/modules/gui/qt4/components/open.hpp +++ b/modules/gui/qt4/components/open.hpp @@ -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 diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp index 11aac01fd5..89e89e7d97 100644 --- a/modules/gui/qt4/dialogs/open.cpp +++ b/modules/gui/qt4/dialogs/open.cpp @@ -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 ); diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index f795c9aa07..c17f4b7258 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -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, "" ); diff --git a/modules/gui/qt4/ui/main_interface.ui b/modules/gui/qt4/ui/main_interface.ui index f39856bc4d..3b9b299d3d 100644 --- a/modules/gui/qt4/ui/main_interface.ui +++ b/modules/gui/qt4/ui/main_interface.ui @@ -5,8 +5,8 @@ 0 0 - 819 - 384 + 502 + 201 @@ -93,7 +93,7 @@ - 35 + 45 26 @@ -117,7 +117,7 @@ - 35 + 45 26 @@ -144,7 +144,7 @@ - 35 + 45 26 @@ -171,7 +171,7 @@ - 35 + 45 26 @@ -193,8 +193,8 @@ - 40 - 20 + 80 + 27 @@ -229,6 +229,20 @@ + + + 4 + 0 + 0 + 0 + + + + + 45 + 26 + + diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui index 095a09ffc8..24cbe2603f 100644 --- a/modules/gui/qt4/ui/open.ui +++ b/modules/gui/qt4/ui/open.ui @@ -10,7 +10,7 @@ 0 0 435 - 339 + 441 @@ -25,6 +25,20 @@ + + + 0 + 0 + 0 + 0 + + + + + 417 + 290 + + -1 diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui index 4e3a93823f..16fb2ad478 100644 --- a/modules/gui/qt4/ui/open_disk.ui +++ b/modules/gui/qt4/ui/open_disk.ui @@ -6,289 +6,149 @@ 0 0 - 569 - 214 + 448 + 232 Form - - - 9 + + + + 10 + 10 + 391 + 121 + - - 6 + + Disc Type - - - - Disc Type + + + + 10 + 20 + 159 + 85 + + + + + 0 - + + 6 + + + + + 0 + + + 6 + + + + + DVD + + + true + + + + + + + Show Menus + + + true + + + + + + + + + SVCD/VCD + + + + + + + Audio CD + + + + + + + + + + 10 + 130 + 391 + 69 + + + + + 5 + 5 + 1 + 0 + + + + Device + + + + 9 + + + 6 + + + - 9 + 0 6 - - - DVD - - + + + + 5 + 0 + 1 + 0 + + + true - - - 0 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 8 - 10 - - - - - - - - Show Menus - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - SVCD/VCD - - - - - + - Audio CD + Browse - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 5 - 5 - 1 - 0 - - - - Options - - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - Path: - - - - - - - - 5 - 0 - 1 - 0 - - - - true - - - - - - - Browse - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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:</p></body></html> - - - - - - - - - - - - 0 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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:</p></body></html> - - - - - - - - - - - - 0 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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:</p></body></html> - - - - - - - - - - - - 0 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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:</p></body></html> - - - - - - - - - - - + + + diff --git a/modules/gui/qt4/ui/open_file.ui b/modules/gui/qt4/ui/open_file.ui index e2af5cdb62..8198d577e4 100644 --- a/modules/gui/qt4/ui/open_file.ui +++ b/modules/gui/qt4/ui/open_file.ui @@ -6,317 +6,144 @@ 0 0 - 433 - 421 + 415 + 305 + + + 3 + 3 + 0 + 0 + + Form - - - 9 + + + + 9 + 9 + 397 + 67 + - - 6 + + Media File - - - - Media File + + + + 11 + 28 + 371 + 29 + + + + + 0 - - - 9 - - - 6 - - - - - - 5 - 1 - 0 - 0 - - - - Open: - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 16 - 51 - - - - - - - - - 7 - 0 - 0 - 0 - - - - true - - - 7 - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 16 - 51 - - - - - - - - Browse - - - - - - - - - - Subtitles + + 6 - - true + + + + + 7 + 0 + 0 + 0 + + + + true + + + 7 + + + + + + + Browse + + + + + + + + + + 10 + 80 + 397 + 103 + + + + Subtitles + + + true + + + false + + + + + 10 + 20 + 371 + 29 + + + + + 0 - - false + + 6 - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - Open: - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 16 - 51 - - - - - - - - - 7 - 0 - 0 - 0 - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 16 - 51 - - - - - - - - Browse - - - - - - - - - 0 - - - 6 - - - - - Size: - - - - - - - - Very Small - - - - - Small - - - - - Normal - - - - - Big - - - - - Very Big - - - - - - - - Qt::Horizontal - - - - 16 - 28 - - - - - - - - Alignment: - - - alignSubLabel - - - - - - - 0 - - - QComboBox::NoInsert - - - 0 - - - - Left - - - - - Center - - - - - Right - - - - - - - - Qt::Horizontal - - - - 16 - 28 - - - - - - - - Options - - - - - - - - - + + + + + 7 + 0 + 0 + 0 + + + + true + + + + + + + Browse + + + + + + + + + 10 + 60 + 371 + 28 + + 0 @@ -325,12 +152,47 @@ 6 - + - Extra Audio... + Size: + + + + + 100 + 0 + + + + + Very Small + + + + + Small + + + + + Normal + + + + + Big + + + + + Very Big + + + + @@ -344,107 +206,112 @@ - - - - - - true - - - Extra Audio File - - - true - - - false - - - - 9 - - - 6 - - - + + + + Alignment: + + + alignSubLabel + + + + + + + + 80 + 0 + + + + 0 + + + QComboBox::NoInsert + + + 0 + + - Open: - - - - - - - Qt::Horizontal + Left - - QSizePolicy::Minimum - - - - 16 - 51 - - - - - - - - - 7 - 0 - 0 - 0 - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 16 - 51 - + + + + Center - - - - + + - Browse + Right - - - - - - - - - Qt::Vertical + + + + + + + + + + 10 + 190 + 397 + 61 + + + + Extra Audio File + + + true + + + false + + + + + 10 + 20 + 371 + 29 + + + + + 0 - - - 20 - 40 - + + 6 - - - + + + + + 7 + 0 + 0 + 0 + + + + true + + + + + + + Browse + + + + + + diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui index 7801108fe1..dc27c4b4a8 100644 --- a/modules/gui/qt4/ui/open_net.ui +++ b/modules/gui/qt4/ui/open_net.ui @@ -1,285 +1,202 @@ Jean-Baptiste Kempf - OpenNet + OpenNetwork 0 0 - 600 + 418 350 Form - + 10 - 10 - 572 - 328 + 90 + 391 + 61 - + + Options + + + + + 10 + 20 + 361 + 33 + + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + + 7 + 5 + 0 + 0 + + + + _("Port") : + + + + + + + + 80 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + force IPv6 + + + + + + + localhost + + + + + + + + + + 10 + 0 + 101 + 23 + + + + UDP/RTP + + + true + + + + + + 60 + 160 + 154 + 23 + + + + HTTP/HTTPS/FTP/MMS + + + + + + 10 + 160 + 45 + 23 + + + + RTP + + + + + + 10 + 180 + 391 + 69 + + + + _("URL") + + - 0 + 9 6 - - - - UDP/RTP - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 10 - 20 - - - - - - - - HTTP/HTTPS/FTP/MMS - - - - - - - 0 - - - 6 - - - - - _("URL") : - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - Qt::Horizontal - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - - _("URL") : - - - - - - - - - Qt::Horizontal - - - - - - - 0 - - - 6 - - - - - localhost - - - - - - - _("Port") : - - - - - - - - - - - - - force IPv6 - - - - - - - _("Address") : - - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - RTP - - + + - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - + + + + + + 10 + 20 + 391 + 69 + + + + _("Address") + + + + 9 + + + 6 + + + - -- 2.39.5