X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=e37a37215dac3ba1eb0286274898810b566e26f2;hb=00dc86ba39fe6862a4598be7f322769469eb9f74;hp=9943ba1d75b848b62eaee2df99b0475be5247f60;hpb=3defa30c23e15a5576ddce8b01b1528085841848;p=vlc diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 9943ba1d75..e37a37215d 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -5,6 +5,7 @@ * $Id$ * * Authors: Jean-Baptiste Kempf + * 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 @@ -21,30 +22,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "dialogs/help.hpp" -#include "vlc_about.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "dialogs_provider.hpp" +#include "dialogs/help.hpp" +#include "util/qt_dirs.hpp" +#include #include +#ifdef UPDATE_CHECK +# include +#endif + #include #include -#include #include #include +#include +#include +#include +#include + +#include -HelpDialog *HelpDialog::instance = NULL; +HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) -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 ); QTextBrowser *helpBrowser = new QTextBrowser( this ); helpBrowser->setOpenExternalLinks( true ); - helpBrowser->setHtml( I_LONGHELP ); + helpBrowser->setHtml( qtr(I_LONGHELP) ); QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); closeButton->setDefault( true ); @@ -52,22 +65,27 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) layout->addWidget( closeButton, 1, 3 ); BUTTONACT( closeButton, 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 ) { 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 ); @@ -77,9 +95,12 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) closeButton->setDefault( true ); QLabel *introduction = new QLabel( - qtr( "Information about VLC media player." ) ); + qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) ); QLabel *iconVLC = new QLabel; - iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); + if( QDate::currentDate().dayOfYear() >= 354 ) + iconVLC->setPixmap( QPixmap( ":/logo/vlc48-christmas.png" ) ); + else + iconVLC->setPixmap( QPixmap( ":/logo/vlc48.png" ) ); layout->addWidget( iconVLC, 0, 0, 1, 1 ); layout->addWidget( introduction, 0, 1, 1, 7 ); layout->addWidget( tab, 1, 0, 1, 8 ); @@ -88,27 +109,26 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) /* 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") ; + QLabel *infoLabel = new QLabel( + 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() )+ "@" + qfu( VLC_CompileHost() ) + ".\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" ); infoLabel->setWordWrap( infoLabel ); QLabel *iconVLC2 = new QLabel; - iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); + if( QDate::currentDate().dayOfYear() >= 354 ) + iconVLC2->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) ); + else + iconVLC2->setPixmap( QPixmap( ":/logo/vlc128.png" ) ); infoLayout->addWidget( iconVLC2 ); infoLayout->addWidget( infoLabel ); @@ -121,10 +141,10 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) QWidget *thanksWidget = new QWidget( this ); QVBoxLayout *thanksLayout = new QVBoxLayout( thanksWidget ); - QLabel *thanksLabel = new QLabel( qtr("We would like to thanks the whole " - "community, the testers, our users and the following people " + QLabel *thanksLabel = new QLabel( qtr( "We would like to thank the whole " + "VLC community, the testers, our users and the following people " "(and the missing ones...) for their collaboration to " - "provide the best software." ) ); + "create the best free software." ) ); thanksLabel->setWordWrap( true ); thanksLayout->addWidget( thanksLabel ); QTextEdit *thanksEdit = new QTextEdit( this ); @@ -138,10 +158,10 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) authorsEdit->setReadOnly( true ); /* add the tabs to the Tabwidget */ - tab->addTab( infoWidget, qtr( "General Info" ) ); + tab->addTab( infoWidget, qtr( "About" ) ); tab->addTab( authorsEdit, qtr( "Authors" ) ); tab->addTab( thanksWidget, qtr("Thanks") ); - tab->addTab( licenseEdit, qtr("Distribution License") ); + tab->addTab( licenseEdit, qtr("License") ); BUTTONACT( closeButton, close() ); } @@ -149,7 +169,165 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) AboutDialog::~AboutDialog() { } + void AboutDialog::close() { - this->toggleVisible(); + toggleVisible(); +} + +#ifdef UPDATE_CHECK + +/***************************************************************************** + * UpdateDialog + *****************************************************************************/ +/* callback to get information from the core */ +static void UpdateCallback( void *data, bool b_ret ) +{ + UpdateDialog* UDialog = (UpdateDialog *)data; + QEvent* event; + + if( b_ret ) + event = new QEvent( (QEvent::Type)UDOkEvent ); + else + event = new QEvent( (QEvent::Type)UDErrorEvent ); + + QApplication::postEvent( UDialog, event ); +} + +UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) +{ + setWindowTitle( qtr( "VLC media player updates" ) ); + setWindowRole( "vlc-update" ); + + QGridLayout *layout = new QGridLayout( this ); + + QPushButton *closeButton = new QPushButton( qtr( "&Cancel" ) ); + updateButton = new QPushButton( qtr( "&Recheck version" ) ); + updateButton->setDefault( true ); + + QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal ); + buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole ); + buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole ); + + updateLabelTop = new QLabel( qtr( "Checking for an update..." ) ); + updateLabelTop->setWordWrap( true ); + updateLabelTop->setMargin( 8 ); + + updateLabelDown = new QLabel( qtr( "\nDo you want to download it?\n" ) ); + updateLabelDown->setWordWrap( true ); + updateLabelDown->hide(); + + updateText = new QTextEdit( this ); + updateText->setAcceptRichText(false); + updateText->setTextInteractionFlags( Qt::TextSelectableByKeyboard| + Qt::TextSelectableByMouse); + updateText->setEnabled( false ); + + layout->addWidget( updateLabelTop, 0, 0 ); + layout->addWidget( updateText, 1, 0 ); + layout->addWidget( updateLabelDown, 2, 0 ); + layout->addWidget( buttonBox, 3, 0 ); + + BUTTONACT( updateButton, UpdateOrDownload() ); + BUTTONACT( closeButton, close() ); + + /* 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() +{ + toggleVisible(); } + +/* Check for updates */ +void UpdateDialog::UpdateOrDownload() +{ + if( !b_checked ) + { + updateButton->setEnabled( false ); + updateLabelTop->setText( qtr( "Launching an update request..." ) ); + update_Check( p_update, UpdateCallback, this ); + } + else + { + QString dest_dir = QFileDialog::getExistingDirectory( this, + qtr( "Select a directory..." ), + QVLCUserDir( VLC_DOWNLOAD_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 ) ); + } + } +} + +/* Handle the events */ +void UpdateDialog::customEvent( QEvent *event ) +{ + if( event->type() == UDOkEvent ) + updateNotify( true ); + else + updateNotify( false ); +} + +/* Notify the end of the update_Check */ +void UpdateDialog::updateNotify( bool b_result ) +{ + /* The update finish without errors */ + if( b_result ) + { + if( update_NeedUpgrade( p_update ) ) + { + update_release_t *p_release = update_GetRelease( p_update ); + assert( p_release ); + b_checked = true; + updateButton->setText( qtr( "&Yes" ) ); + QString message = qtr( "A new version of VLC(" ) + + QString::number( p_release->i_major ) + "." + + QString::number( p_release->i_minor ) + "." + + QString::number( p_release->i_revision ); + if( p_release->extra ) + message += p_release->extra; + message += qtr( ") is available."); + updateLabelTop->setText( message ); + + updateText->setText( qfu( p_release->psz_desc ) ); + updateText->setEnabled( true ); + + updateLabelDown->show(); + + /* Force the dialog to be shown */ + this->show(); + } + else + updateLabelTop->setText( + qtr( "You have the latest version of VLC media player." ) ); + } + else + updateLabelTop->setText( + qtr( "An error occurred while checking for updates..." ) ); + + updateButton->setEnabled( true ); +} + +#endif +