X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=3fef481ff20cf6f472cd49e01b3f276406abcc22;hb=3de7f18a4cc4f264a571384437373bc255da0632;hp=4e8784d09d78d10816ddb52d80aef73dc653b550;hpb=107b78a957c386f36923338a7273ea4fd82f631a;p=vlc diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 4e8784d09d..3fef481ff2 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -5,7 +5,7 @@ * $Id$ * * Authors: Jean-Baptiste Kempf - * Rémi Duraffort + * Rémi Duraffort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,155 +22,123 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "dialogs/help.hpp" +#include "util/qt_dirs.hpp" + #include +#include #ifdef UPDATE_CHECK -#include +# include #endif -#include "dialogs_provider.hpp" - -#include - #include #include -#include #include #include #include #include #include #include +#include - -HelpDialog *HelpDialog::instance = NULL; +#include HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) + { setWindowTitle( qtr( "Help" ) ); - resize( 600, 560 ); + setWindowRole( "vlc-help" ); + setMinimumSize( 350, 300 ); - QGridLayout *layout = new QGridLayout( this ); + QVBoxLayout *layout = new QVBoxLayout( this ); QTextBrowser *helpBrowser = new QTextBrowser( this ); helpBrowser->setOpenExternalLinks( true ); - helpBrowser->setHtml( I_LONGHELP ); - QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - closeButton->setDefault( true ); + helpBrowser->setHtml( qtr(I_LONGHELP) ); + QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this ); + closeButtonBox->addButton( + new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); + closeButtonBox->setFocus(); - layout->addWidget( helpBrowser, 0, 0, 1, 0 ); - layout->addWidget( closeButton, 1, 3 ); + layout->addWidget( helpBrowser ); + layout->addWidget( closeButtonBox ); - BUTTONACT( closeButton, close() ); + CONNECT( closeButtonBox, rejected(), this, close() ); + readSettings( "Help", QSize( 500, 450 ) ); } HelpDialog::~HelpDialog() { + writeSettings( "Help" ); } + void HelpDialog::close() { - this->toggleVisible(); + toggleVisible(); } -AboutDialog *AboutDialog::instance = NULL; - -AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) +AboutDialog::AboutDialog( intf_thread_t *_p_intf) + : QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ) { + /* Build UI */ + ui.setupUi( this ); + ui.closeButtonBox->addButton( + new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole ); + setWindowTitle( qtr( "About" ) ); + setWindowRole( "vlc-about" ); resize( 600, 500 ); + setMinimumSize( 600, 500 ); + setWindowModality( Qt::WindowModal ); - QGridLayout *layout = new QGridLayout( this ); - QTabWidget *tab = new QTabWidget( this ); + CONNECT( ui.closeButtonBox, rejected(), this, close() ); + ui.closeButtonBox->setFocus(); - QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - closeButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); - closeButton->setDefault( true ); + ui.introduction->setText( + qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) ); - QLabel *introduction = new QLabel( - qtr( "Information about VLC media player." ) ); - QLabel *iconVLC = new QLabel; if( QDate::currentDate().dayOfYear() >= 354 ) - iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) ); + ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) ); else - iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); - layout->addWidget( iconVLC, 0, 0, 1, 1 ); - layout->addWidget( introduction, 0, 1, 1, 7 ); - layout->addWidget( tab, 1, 0, 1, 8 ); - layout->addWidget( closeButton, 2, 6, 1, 2 ); + ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128.png" ) ); /* Main Introduction */ - QWidget *infoWidget = new QWidget( this ); - QHBoxLayout *infoLayout = new QHBoxLayout( infoWidget ); - QLabel *infoLabel = new QLabel( "VLC media player " PACKAGE_VERSION "\n\n" - "(c) 1996-2007 - the VideoLAN Team\n\n" + - qtr( "VLC media player is a free media player, made by the " - "VideoLAN Team.\nIt is a standalone multimedia player, " - "encoder and streamer, that can read from many supports " - "(files, CDs, DVDs, networks, capture cards...) and that " - "works on many platforms.\n\n" ) - + qtr( "You are using the new Qt4 Interface.\n" ) - + qtr( "Compiled by " ) + qfu( VLC_CompileBy() )+ "@" - + qfu( VLC_CompileDomain() ) + ".\n" - + "Compiler: " + qfu( VLC_Compiler() ) + ".\n" - + qtr( "Based on SVN revision: " ) + qfu( VLC_Changeset() ) - + ".\n\n" - + qtr( "This program comes with NO WARRANTY, to the extent " - "permitted by the law; read the distribution tab.\n\n" ) - + "The VideoLAN team \n" - "http://www.videolan.org/\n" ); - infoLabel->setWordWrap( infoLabel ); - - QLabel *iconVLC2 = new QLabel; - if( QDate::currentDate().dayOfYear() >= 354 ) - iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); - else - iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); - infoLayout->addWidget( iconVLC2 ); - infoLayout->addWidget( infoLabel ); + ui.infoLabel->setText( + qtr( "VLC media player is a free media player, " + "encoder and streamer that can read from files, " + "CDs, DVDs, network streams, capture cards and even more!\n" + "VLC uses its internal codecs and works on essentially every " + "popular platform.\n\n" ) + + qtr( "This version of VLC was compiled by:\n " ) + + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + + + " ("__DATE__" "__TIME__").\n" + + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" + + qtr( "You are using the Qt4 Interface.\n\n" ) + + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS + + qtr( " by the VideoLAN Team.\n" ) + + "vlc@videolan.org, http://www.videolan.org" ); /* GPL License */ - QTextEdit *licenseEdit = new QTextEdit( this ); - licenseEdit->setFontFamily( "Monospace" ); - licenseEdit->setText( qfu( psz_license ) ); - licenseEdit->setReadOnly( true ); + ui.licenseEdit->setText( qfu( psz_license ) ); /* People who helped */ - QWidget *thanksWidget = new QWidget( this ); - QVBoxLayout *thanksLayout = new QVBoxLayout( thanksWidget ); - - QLabel *thanksLabel = new QLabel( qtr( "We would like to thank the whole " - "community, the testers, our users and the following people " - "(and the missing ones...) for their collaboration to " - "provide the best software." ) ); - thanksLabel->setWordWrap( true ); - thanksLayout->addWidget( thanksLabel ); - QTextEdit *thanksEdit = new QTextEdit( this ); - thanksEdit->setText( qfu( psz_thanks ) ); - thanksEdit->setReadOnly( true ); - thanksLayout->addWidget( thanksEdit ); + ui.thanksEdit->setText( qfu( psz_thanks ) ); /* People who wrote the software */ - QTextEdit *authorsEdit = new QTextEdit( this ); - authorsEdit->setText( qfu( psz_authors ) ); - authorsEdit->setReadOnly( true ); - - /* add the tabs to the Tabwidget */ - tab->addTab( infoWidget, qtr( "General Info" ) ); - tab->addTab( authorsEdit, qtr( "Authors" ) ); - tab->addTab( thanksWidget, qtr("Thanks") ); - tab->addTab( licenseEdit, qtr("Distribution License") ); - - BUTTONACT( closeButton, close() ); + ui.authorsEdit->setText( qfu( psz_authors ) ); } AboutDialog::~AboutDialog() { } + void AboutDialog::close() { - this->toggleVisible(); + toggleVisible(); } #ifdef UPDATE_CHECK @@ -179,46 +147,59 @@ void AboutDialog::close() * UpdateDialog *****************************************************************************/ /* callback to get information from the core */ -static void UpdateCallback( void *data ) +static void UpdateCallback( void *data, bool b_ret ) { UpdateDialog* UDialog = (UpdateDialog *)data; - QEvent *event = new QEvent( QEvent::User ); + QEvent* event; + + if( b_ret ) + event = new QEvent( (QEvent::Type)UDOkEvent ); + else + event = new QEvent( (QEvent::Type)UDErrorEvent ); + QApplication::postEvent( UDialog, event ); } -UpdateDialog *UpdateDialog::instance = NULL; - UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) { - setWindowTitle( qtr( "Update" ) ); - resize( 120, 80 ); - - QGridLayout *layout = new QGridLayout( this ); + /* 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 ); - QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - updateButton = new QPushButton( qtr( "&Update List" ) ); - updateButton->setDefault( true ); - QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal ); - buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole ); - buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole ); + ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&Yes"), this ), + QDialogButtonBox::AcceptRole ); + ui.updateNotifyButtonBox->addButton( new QPushButton( qtr("&No"), this ), + QDialogButtonBox::RejectRole ); - updateLabel = new QLabel( qtr( "Checking for the update..." ) ); - updateLabel->setWordWrap( true ); + setWindowTitle( qtr( "VLC media player updates" ) ); + setWindowRole( "vlc-update" ); - layout->addWidget( updateLabel, 0, 0 ); - layout->addWidget( buttonBox, 1, 0 ); + BUTTONACT( recheckButton, UpdateOrDownload() ); + CONNECT( ui.updateDialogButtonBox, rejected(), this, close() ); - BUTTONACT( updateButton, UpdateOrDownload() ); - BUTTONACT( closeButton, close() ); + CONNECT( ui.updateNotifyButtonBox, accepted(), this, UpdateOrDownload() ); + CONNECT( ui.updateNotifyButtonBox, rejected(), this, close() ); - /* create the update structure and the callback */ - p_update = update_New( _p_intf ); + /* Create the update structure */ + p_update = update_New( p_intf ); b_checked = false; + + setMinimumSize( 300, 300 ); + setMaximumSize( 400, 300 ); + + readSettings( "Update", QSize( 300, 250 ) ); + + /* Check for updates */ + UpdateOrDownload(); } UpdateDialog::~UpdateDialog() { update_Delete( p_update ); + writeSettings( "Update" ); } void UpdateDialog::close() @@ -231,47 +212,74 @@ void UpdateDialog::UpdateOrDownload() { if( !b_checked ) { - updateButton->setEnabled( false ); + ui.stackedWidget->setCurrentWidget( ui.updateRequestPage ); update_Check( p_update, UpdateCallback, this ); } else { - updateButton->setEnabled( false ); - QString dest_dir = QFileDialog::getExistingDirectory( this, qtr( "Select a directory ..." ), - qfu( p_update->p_libvlc->psz_homedir ) ); + QString dest_dir = QFileDialog::getExistingDirectory( this, + qtr( I_OP_SEL_DIR ), + QVLCUserDir( VLC_DOWNLOAD_DIR ) ); - if( dest_dir != "" ) + if( !dest_dir.isEmpty() ) { + dest_dir = toNativeSepNoSlash( dest_dir ) + DIR_SEP; + msg_Dbg( p_intf, "Downloading to folder: %s", qtu( dest_dir ) ); toggleVisible(); update_Download( p_update, qtu( dest_dir ) ); + /* FIXME: We should trigger a change to another dialog here ! */ } - else - updateButton->setEnabled( true ); } } /* Handle the events */ void UpdateDialog::customEvent( QEvent *event ) { - updateNotify(); + if( event->type() == UDOkEvent ) + updateNotify( true ); + else + updateNotify( false ); } /* Notify the end of the update_Check */ -void UpdateDialog::updateNotify() +void UpdateDialog::updateNotify( bool b_result ) { - if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer ) + /* The update finish without errors */ + if( b_result ) { - b_checked = true; - updateButton->setText( "Download" ); - updateLabel->setText( qtr( "There is a new version of vlc :\n" ) + qfu( p_update->release.psz_desc ) ); + if( update_NeedUpgrade( p_update ) ) + { + ui.stackedWidget->setCurrentWidget( ui.updateNotifyPage ); + update_release_t *p_release = update_GetRelease( p_update ); + assert( p_release ); + b_checked = true; + QString message = QString( + qtr( "A new version of VLC (%1.%2.%3%4) is available." ) ) + .arg( QString::number( p_release->i_major ) ) + .arg( QString::number( p_release->i_minor ) ) + .arg( QString::number( p_release->i_revision ) ) + .arg( ( p_release->extra )?QString( p_release->extra ):"" ); + + ui.updateNotifyLabel->setText( message ); + ui.updateNotifyTextEdit->setText( qfu( p_release->psz_desc ) ); + + /* Force the dialog to be shown */ + this->show(); + } + else + { + ui.stackedWidget->setCurrentWidget( ui.updateDialogPage ); + ui.updateDialogLabel->setText( + qtr( "You have the latest version of VLC media player." ) ); + } } else { - updateLabel->setText( qtr( "You have the latest version of vlc" ) ); + ui.stackedWidget->setCurrentWidget( ui.updateDialogPage ); + ui.updateDialogLabel->setText( + qtr( "An error occurred while checking for updates..." ) ); } - adjustSize(); - updateButton->setEnabled( true ); } - #endif +