X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=99b4eefffb7f4aa5f0bbfab22730c50ff699bf1d;hb=8462c96dd88417db77c726c8ed290ef7f745f873;hp=153f0c0b744a4d5d90bb50975498a7a234bd0d17;hpb=745feeb9e15ce81a95dc31324af13ac6958553f0;p=vlc diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 153f0c0b74..99b4eefffb 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -26,7 +26,7 @@ # include "config.h" #endif -#include +#include #include "dialogs/help.hpp" #include @@ -52,10 +52,11 @@ HelpDialog *HelpDialog::instance = NULL; -HelpDialog::HelpDialog( QWidget *parent, intf_thread_t *_p_intf ) - : QVLCDialog( parent, _p_intf ) +HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) + { setWindowTitle( qtr( "Help" ) ); + setMinimumSize( 250, 300 ); QGridLayout *layout = new QGridLayout( this ); QTextBrowser *helpBrowser = new QTextBrowser( this ); @@ -68,19 +69,23 @@ HelpDialog::HelpDialog( QWidget *parent, intf_thread_t *_p_intf ) layout->addWidget( closeButton, 1, 3 ); BUTTONACT( closeButton, close() ); + readSettings( "Help", QSize( 400, 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( QWidget *parent, intf_thread_t *_p_intf) + : QVLCDialog( parent, _p_intf ) { setWindowTitle( qtr( "About" ) ); resize( 600, 500 ); @@ -94,7 +99,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) closeButton->setDefault( true ); QLabel *introduction = new QLabel( - qtr( "VLC media player " VERSION_MESSAGE ) ); + qtr( "VLC media player" " " VERSION_MESSAGE ) ); QLabel *iconVLC = new QLabel; if( QDate::currentDate().dayOfYear() >= 354 ) iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) ); @@ -112,15 +117,16 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) 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" - "Also, VLC works on essentially every popular platform.\n\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() ) + "." + qfu( VLC_CompileDomain() ) + ".\n" + "Compiler: " + qfu( VLC_Compiler() ) + ".\n" - + qtr( "Based on SVN revision: " ) + qfu( VLC_Changeset() ) + ".\n" + + qtr( "Based on Git commit: " ) + qfu( VLC_Changeset() ) + ".\n" + qtr( "You are using the Qt4 Interface.\n\n" ) - + qtr( "Copyright (c) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" ) - + "vlc@videolan.org, http://www.videolan.org" ); + + qtr( "Copyright (C) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" ) + + "vlc@videolan.org, http://www.videolan.org" ); infoLabel->setWordWrap( infoLabel ); QLabel *iconVLC2 = new QLabel; @@ -141,9 +147,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) 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 " + "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 ); @@ -168,9 +174,10 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) AboutDialog::~AboutDialog() { } + void AboutDialog::close() { - this->toggleVisible(); + toggleVisible(); } #ifdef UPDATE_CHECK @@ -179,7 +186,7 @@ void AboutDialog::close() * UpdateDialog *****************************************************************************/ /* callback to get information from the core */ -static void UpdateCallback( void *data, vlc_bool_t b_ret ) +static void UpdateCallback( void *data, bool b_ret ) { UpdateDialog* UDialog = (UpdateDialog *)data; QEvent* event; @@ -196,23 +203,36 @@ UpdateDialog *UpdateDialog::instance = NULL; UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) { - setWindowTitle( qtr( "Update" ) ); - resize( 120, 80 ); + setWindowTitle( qtr( "VLC media player updates" ) ); QGridLayout *layout = new QGridLayout( this ); - QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - updateButton = new QPushButton( qtr( "&Update List" ) ); + 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 ); - updateLabel = new QLabel( qtr( "Checking for the update..." ) ); - updateLabel->setWordWrap( true ); + updateLabelTop = new QLabel( qtr( "Checking for an update..." ) ); + updateLabelTop->setWordWrap( true ); + updateLabelTop->setMargin( 8 ); - layout->addWidget( updateLabel, 0, 0 ); - layout->addWidget( buttonBox, 1, 0 ); + updateLabelDown = new QLabel( qtr( "\nDo you want to download it?\n" ) ); + updateLabelDown->setWordWrap( true ); + updateLabelDown->hide(); + + updateText = new QTextEdit; + 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() ); @@ -221,6 +241,11 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) p_update = update_New( p_intf ); b_checked = false; + setMinimumSize( 300, 100 ); + setMaximumSize( 400, 300 ); + + readSettings( "Update", QSize( 300, 100 ) ); + /* Check for updates */ UpdateOrDownload(); } @@ -228,6 +253,7 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) UpdateDialog::~UpdateDialog() { update_Delete( p_update ); + writeSettings( "Update" ); } void UpdateDialog::close() @@ -241,23 +267,27 @@ void UpdateDialog::UpdateOrDownload() if( !b_checked ) { updateButton->setEnabled( false ); - msg_Dbg( p_intf, "Launching an update Request" ); + updateLabelTop->setText( qtr( "Launching an update request..." ) ); 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 ) ); + qtr( "Select a directory..." ), + qfu( config_GetHomeDir() ) ); if( dest_dir != "" ) { + /*HACK: Qt4 isn't able to change the way OS deals with directories + names. Windows doesn't add an ending separator so we might add it. + */ + #if defined( WIN32 ) || defined( UNDER_CE ) + dest_dir += DIR_SEP; + #endif + msg_Dbg( p_intf, "Downloading to folder: %s", qtu( dest_dir ) ); toggleVisible(); update_Download( p_update, qtu( dest_dir ) ); } - else - updateButton->setEnabled( true ); } } @@ -276,21 +306,37 @@ void UpdateDialog::updateNotify( bool b_result ) /* The update finish without errors */ if( b_result ) { - if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer ) + if( update_NeedUpgrade( p_update ) ) { + update_release_t *p_release = update_GetRelease( p_update ); + assert( p_release ); b_checked = true; - updateButton->setText( "Download" ); - updateLabel->setText( qtr( "There is a new version of vlc :\n" ) - + qfu( p_update->release.psz_desc ) ); + updateButton->setText( "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 - updateLabel->setText( qtr( "You have the latest version of vlc" ) ); + updateLabelTop->setText( + qtr( "You have the latest version of VLC media player." ) ); } else - updateLabel->setText( - qtr( "An error occured while checking for updates" ) ); + updateLabelTop->setText( + qtr( "An error occurred while checking for updates..." ) ); - adjustSize(); updateButton->setEnabled( true ); }