From: Steinar H. Gunderson Date: Mon, 27 Sep 2010 21:55:39 +0000 (+0200) Subject: Merge branch 'master' of git://git.videolan.org/vlc X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=9cc1540b8c973407d32c013489e2e1277141ef1e;hp=794142d331d9a04420fd7e010fb63d13ac43cfb3 Merge branch 'master' of git://git.videolan.org/vlc --- diff --git a/NEWS b/NEWS index 4fab873c7f..f61d59bb0c 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ Access Codecs * You can now use ffmpeg-mt in conjunction with vlc + * Important fixes for RealVideo 3.0 and 4.0 playback Demuxers: * id3tag plugin is removed (superseded by taglib). @@ -25,8 +26,9 @@ Demuxers: Interfaces * The telnet interface has been removed in the favour of the lua one - * Skins2 / Qt: misc improvements - * Qt: port to Mac platform + * Skins2 / Qt: misc improvements and usability fixes + * Qt: effects dialogs reordering + * Qt: port to MacOS X platform Video Output: * New video output based on Direct2D for Windows 7 and Vista (with Platform Update) @@ -50,14 +52,32 @@ Stream output: index-url=http://url-to-iphonestreamfile-###.ts},mux=ts{use-key-frames}, dst=public_html/iphonestreamfile-###.ts}" -Translations: - * New Armenian translation - libVLC: * New capabilities for libVLC: ** libvlc_media_player_navigate for DVD navigation +Changes between 1.1.4 and 1.1.4.1: +---------------------------------- + +Mac OS X: + * Fixed video output on PowerPC-based Macs for videos with widths divisible + by 16 + * Fixed an issue with the Equalizer's 170Hz slider + +Demuxer: + * Fix crash when closing rtsp streams + +Qt interface: + * Fix Windows 7 jumplists with Unicode files + * Various fixes for Windows + +Translations: + * New Armenian translation + * Update translations for Dutch, Estonian, Lithuanian, Japanese, Nynorsk, + Brazillian Portuguese, Armenian, Wallon + + Changes between 1.1.3 and 1.1.4: -------------------------------- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 8e33f8570b..2e80d5a8d1 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1068,6 +1068,7 @@ FFMPEGCONF += \ --disable-debug \ --enable-gpl \ --enable-postproc \ + --disable-ffprobe \ --disable-ffserver \ --disable-ffmpeg \ --disable-ffplay \ diff --git a/modules/gui/qt4/dialogs/errors.cpp b/modules/gui/qt4/dialogs/errors.cpp index 797a67e14b..698c4c7d91 100644 --- a/modules/gui/qt4/dialogs/errors.cpp +++ b/modules/gui/qt4/dialogs/errors.cpp @@ -43,10 +43,10 @@ ErrorsDialog::ErrorsDialog( intf_thread_t *_p_intf ) QGridLayout *layout = new QGridLayout( this ); - QDialogButtonBox *buttonBox = - new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); - QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) ); + QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal, this ); + QPushButton *clearButton = new QPushButton( qtr( "Cl&ear" ), this ); buttonBox->addButton( clearButton, QDialogButtonBox::ActionRole ); + buttonBox->addButton( new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); messages = new QTextEdit(); messages->setReadOnly( true ); diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp index b527b4a254..11342f15e7 100644 --- a/modules/gui/qt4/dialogs/extended.cpp +++ b/modules/gui/qt4/dialogs/extended.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) @@ -87,8 +88,9 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) layout->addWidget( mainTabW ); - QDialogButtonBox *closeButtonBox = - new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); + QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this ); + closeButtonBox->addButton( + new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); layout->addWidget( closeButtonBox ); CONNECT( closeButtonBox, rejected(), this, close() ); diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index fce2509c3e..3fef481ff2 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -59,8 +59,9 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) QTextBrowser *helpBrowser = new QTextBrowser( this ); helpBrowser->setOpenExternalLinks( true ); helpBrowser->setHtml( qtr(I_LONGHELP) ); - QDialogButtonBox *closeButtonBox = - new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); + QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this ); + closeButtonBox->addButton( + new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); closeButtonBox->setFocus(); layout->addWidget( helpBrowser ); @@ -85,6 +86,8 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) { /* Build UI */ ui.setupUi( this ); + ui.closeButtonBox->addButton( + new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); setWindowTitle( qtr( "About" ) ); setWindowRole( "vlc-about" ); @@ -161,23 +164,20 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) { /* build Ui */ ui.setupUi( this ); + ui.updateDialogButtonBox->addButton( new QPushButton( qtr("&Close"), this ), + QDialogButtonBox::RejectRole ); + QPushButton *recheckButton = new QPushButton( qtr("&Recheck version"), this ); + ui.updateDialogButtonBox->addButton( recheckButton, QDialogButtonBox::ActionRole ); + + ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&Yes"), this ), + QDialogButtonBox::AcceptRole ); + ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&No"), this ), + QDialogButtonBox::RejectRole ); + setWindowTitle( qtr( "VLC media player updates" ) ); setWindowRole( "vlc-update" ); - QList buttonsList = ui.updateDialogButtonBox->buttons(); - QAbstractButton *currentButton; - for ( int i = 0; i < buttonsList.size() ; ++i ) - { - currentButton = buttonsList.at( i ); - if ( ui.updateDialogButtonBox->standardButton( currentButton ) - == QDialogButtonBox::Retry ) - { - currentButton->setText( qtr( "&Recheck version" ) ); - qobject_cast(currentButton)->setDefault( true ); - } - } - - CONNECT( ui.updateDialogButtonBox, accepted(), this, UpdateOrDownload() ); + BUTTONACT( recheckButton, UpdateOrDownload() ); CONNECT( ui.updateDialogButtonBox, rejected(), this, close() ); CONNECT( ui.updateNotifyButtonBox, accepted(), this, UpdateOrDownload() ); diff --git a/modules/gui/qt4/dialogs/toolbar.cpp b/modules/gui/qt4/dialogs/toolbar.cpp index 17ec24da8f..72cf40776d 100644 --- a/modules/gui/qt4/dialogs/toolbar.cpp +++ b/modules/gui/qt4/dialogs/toolbar.cpp @@ -672,6 +672,11 @@ void DroppingController::dropEvent( QDropEvent *event ) { int i = getParentPosInLayout( event->pos() ); + /* Workaround: do not let the item move to its current + position + 1 as it breaks the widgetList */ + if ( i - 1 == i_dragIndex ) + --i; + QByteArray data = event->mimeData()->data( "vlc/button-bar" ); QDataStream dataStream(&data, QIODevice::ReadOnly); @@ -727,6 +732,8 @@ bool DroppingController::eventFilter( QObject *obj, QEvent *event ) } if( i == -1 ) return true; + i_dragIndex = i; + doubleInt *dI = widgetList.at( i ); int i_type = dI->i_type; diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp index 6a436d806c..52f4241eff 100644 --- a/modules/gui/qt4/dialogs/toolbar.hpp +++ b/modules/gui/qt4/dialogs/toolbar.hpp @@ -112,6 +112,7 @@ private: }; QRubberBand *rubberband; QList widgetList; + int i_dragIndex; int getParentPosInLayout( QPoint point); diff --git a/modules/gui/qt4/ui/about.ui b/modules/gui/qt4/ui/about.ui index 6b6d990ad7..109853b061 100644 --- a/modules/gui/qt4/ui/about.ui +++ b/modules/gui/qt4/ui/about.ui @@ -149,6 +149,7 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"></p></td></tr></table></body></html> @@ -167,7 +168,7 @@ p, li { white-space: pre-wrap; } - QDialogButtonBox::Close + QDialogButtonBox::NoButton diff --git a/modules/gui/qt4/ui/update.ui b/modules/gui/qt4/ui/update.ui index 2401173691..ecfa28a483 100644 --- a/modules/gui/qt4/ui/update.ui +++ b/modules/gui/qt4/ui/update.ui @@ -34,7 +34,7 @@ - QDialogButtonBox::Close|QDialogButtonBox::Retry + QDialogButtonBox::NoButton @@ -122,7 +122,7 @@ - QDialogButtonBox::No|QDialogButtonBox::Yes + QDialogButtonBox::NoButton