UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{
- setWindowTitle( qtr( "Update" ) );
+ 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 an update..." ) );
updateLabel->setWordWrap( true );
- layout->addWidget( updateLabel, 0, 0 );
+ layout->addWidget( updateLabel, 0, 0, Qt::AlignTop );
layout->addWidget( buttonBox, 1, 0 );
BUTTONACT( updateButton, UpdateOrDownload() );
p_update = update_New( p_intf );
b_checked = false;
- readSettings( "Update", QSize( 120, 80 ) );
+ setMinimumSize( 200, 100 );
+ readSettings( "Update", QSize( 200, 100 ) );
/* Check for updates */
UpdateOrDownload();
if( !b_checked )
{
updateButton->setEnabled( false );
- msg_Dbg( p_intf, "Launching an update request" );
+ updateLabel->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() ) );
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", dest_dir );
+ msg_Dbg( p_intf, "Downloading to folder: %s", qtu( dest_dir ) );
toggleVisible();
update_Download( p_update, qtu( dest_dir ) );
}
- else
- updateButton->setEnabled( true );
}
}
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( "Ok" );
+ 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.\nDo you want to download it?\n" )
+ + qfu( p_release->psz_desc );
+
+ updateLabel->setText( message );
/* Force the dialog to be shown */
this->show();
}
else
- updateLabel->setText( qtr( "You have the latest version of VLC" ) );
+ updateLabel->setText(
+ qtr( "You have the latest version of VLC media player." ) );
}
else
updateLabel->setText(
- qtr( "An error occurred while checking for updates" ) );
+ qtr( "An error occurred while checking for updates..." ) );
adjustSize();
updateButton->setEnabled( true );