X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=9a56d0e59981ab607d6f9296a47fcd91aabd3a8f;hb=544625f19e2bcff397f6b591759f486d0a325075;hp=16c8221ef091a24202926f85b11cee5c5f6061e8;hpb=1595a7ef89f45c936857d3e12aff5f66cb2b0880;p=vlc diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 16c8221ef0..9a56d0e599 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -26,22 +26,18 @@ # include "config.h" #endif -#include - #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 @@ -49,19 +45,19 @@ #include #include - -HelpDialog *HelpDialog::instance = NULL; +#include HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) { setWindowTitle( qtr( "Help" ) ); - setMinimumSize( 250, 300 ); + 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 ); @@ -69,7 +65,7 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) layout->addWidget( closeButton, 1, 3 ); BUTTONACT( closeButton, close() ); - readSettings( "Help", QSize( 400, 450 ) ); + readSettings( "Help", QSize( 500, 450 ) ); } HelpDialog::~HelpDialog() @@ -82,14 +78,14 @@ void HelpDialog::close() toggleVisible(); } -AboutDialog *AboutDialog::instance = NULL; - -AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) - : QVLCDialog( parent, _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 ); @@ -99,12 +95,12 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) closeButton->setDefault( true ); QLabel *introduction = new QLabel( - qtr( "VLC media player" " " VERSION_MESSAGE ) ); + qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) ); QLabel *iconVLC = new QLabel; if( QDate::currentDate().dayOfYear() >= 354 ) - iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) ); + iconVLC->setPixmap( QPixmap( ":/logo/vlc48-christmas.png" ) ); else - iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); + 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 ); @@ -120,20 +116,20 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) "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 Git commit: " ) + qfu( VLC_Changeset() ) + ".\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 " by the VideoLAN Team.\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; if( QDate::currentDate().dayOfYear() >= 354 ) - iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); + iconVLC2->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) ); else - iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); + iconVLC2->setPixmap( QPixmap( ":/logo/vlc128.png" ) ); infoLayout->addWidget( iconVLC2 ); infoLayout->addWidget( infoLabel ); @@ -199,26 +195,39 @@ static void UpdateCallback( void *data, bool b_ret ) QApplication::postEvent( UDialog, event ); } -UpdateDialog *UpdateDialog::instance = NULL; - UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) { - setWindowTitle( qtr( "Update" ) ); + setWindowTitle( qtr( "VLC media player updates" ) ); + setWindowRole( "vlc-update" ); 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 an update..." ) ); - updateLabel->setWordWrap( true ); + 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(); - layout->addWidget( updateLabel, 0, 0 ); - layout->addWidget( buttonBox, 1, 0 ); + 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() ); @@ -227,7 +236,10 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) p_update = update_New( p_intf ); b_checked = false; - readSettings( "Update", QSize( 120, 80 ) ); + setMinimumSize( 300, 300 ); + setMaximumSize( 400, 300 ); + + readSettings( "Update", QSize( 300, 250 ) ); /* Check for updates */ UpdateOrDownload(); @@ -250,27 +262,22 @@ 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( config_GetHomeDir() ) ); + qtr( I_OP_SEL_DIR ), + QVLCUserDir( VLC_DOWNLOAD_DIR ) ); - if( dest_dir != "" ) + if( !dest_dir.isEmpty() ) { - #if defined( WIN32 ) || defined( UNDER_CE ) - dest_dir += DIR_SEP; - #endif - msg_Dbg( p_intf, "Downloading to folder: %s", dest_dir ); + 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 ) ); } - else - updateButton->setEnabled( true ); } } @@ -294,21 +301,32 @@ void UpdateDialog::updateNotify( bool b_result ) 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_release->psz_desc ) ); + 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 - 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 occurred while checking for updates" ) ); + updateLabelTop->setText( + qtr( "An error occurred while checking for updates..." ) ); - adjustSize(); updateButton->setEnabled( true ); }