* $Id$
*
* Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
- * Rémi Duraffort <ivoire (at) via.ecp.fr>
+ * Rémi Duraffort <ivoire (at) via.ecp.fr>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+
#include "dialogs/help.hpp"
#include <vlc_about.h>
+
+#ifdef UPDATE_CHECK
#include <vlc_update.h>
+#endif
#include "dialogs_provider.hpp"
#include <QFile>
#include <QLabel>
#include <QString>
-#include <QCheckBox>
-#include <QGroupBox>
#include <QDialogButtonBox>
+#include <QEvent>
#include <QFileDialog>
+#include <QDate>
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 );
+ setMinimumSize( 250, 300 );
QGridLayout *layout = new QGridLayout( this );
QTextBrowser *helpBrowser = new QTextBrowser( this );
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 );
+ setMinimumSize( 600, 500 );
QGridLayout *layout = new QGridLayout( this );
QTabWidget *tab = new QTabWidget( this );
closeButton->setDefault( true );
QLabel *introduction = new QLabel(
- qtr( "Information about VLC media player." ) );
+ qtr( "VLC media player" " " VERSION_MESSAGE ) );
QLabel *iconVLC = new QLabel;
- iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) );
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ iconVLC->setPixmap( QPixmap( ":/vlc48-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 );
/* 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() )+ "@"
+ 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() ) + "."
+ 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 <videolan@videolan.org> \n"
- "http://www.videolan.org/\n") ;
+ + "Compiler: " + qfu( VLC_Compiler() ) + ".\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" );
infoLabel->setWordWrap( infoLabel );
QLabel *iconVLC2 = new QLabel;
- iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) );
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ else
+ iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) );
infoLayout->addWidget( iconVLC2 );
infoLayout->addWidget( infoLabel );
/* GPL License */
QTextEdit *licenseEdit = new QTextEdit( this );
- licenseEdit->setFontFamily( "Monospace" );
licenseEdit->setText( qfu( psz_license ) );
licenseEdit->setReadOnly( true );
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 "
+ 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 );
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() );
}
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::instance = NULL;
-UpdateDialog::UpdateDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
+UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{
- setWindowTitle( qtr( "Update" ) );
- resize( 230, 180 );
+ 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);
+
+ QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal );
buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole );
buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
- QGroupBox *checkGroup = new QGroupBox( qtr( "Select Package" ) );
- QGridLayout *checkLayout = new QGridLayout( checkGroup );
- checkInfo = new QCheckBox( qtr( "Information" ) );
- checkSource = new QCheckBox( qtr( "Sources" ) );
- checkBinary = new QCheckBox( qtr( "Binary" ) );
- checkPlugin = new QCheckBox( qtr( "Plugin" ) );
+ updateLabelTop = new QLabel( qtr( "Checking for an update..." ) );
+ updateLabelTop->setWordWrap( true );
+ updateLabelTop->setMargin( 8 );
- checkInfo->setDisabled( true );
- checkSource->setDisabled( true );
- checkBinary->setDisabled( true );
- checkPlugin->setDisabled( true );
+ updateLabelDown = new QLabel( qtr( "\nDo you want to download it?\n" ) );
+ updateLabelDown->setWordWrap( true );
+ updateLabelDown->hide();
- checkLayout->addWidget( checkInfo, 0, 0 );
- checkLayout->addWidget( checkSource, 1, 0 );
- checkLayout->addWidget( checkBinary, 2, 0 );
- checkLayout->addWidget( checkPlugin, 3, 0 );
+ updateText = new QTextEdit;
+ updateText->setAcceptRichText(false);
+ updateText->setTextInteractionFlags( Qt::TextSelectableByKeyboard|
+ Qt::TextSelectableByMouse);
+ updateText->setEnabled( false );
- layout->addWidget( checkGroup, 0, 0 );
- layout->addWidget( buttonBox, 1, 0 );
+ layout->addWidget( updateLabelTop, 0, 0 );
+ layout->addWidget( updateText, 1, 0 );
+ layout->addWidget( updateLabelDown, 2, 0 );
+ layout->addWidget( buttonBox, 3, 0 );
- BUTTONACT( updateButton, updateOrUpload() );
+ BUTTONACT( updateButton, UpdateOrDownload() );
BUTTONACT( closeButton, close() );
- p_update = update_New( _p_intf );
- b_updated = false;
+ /* Create the update structure */
+ p_update = update_New( p_intf );
+ b_checked = false;
+
+ setMinimumSize( 300, 100 );
+ setMaximumSize( 400, 300 );
+
+ readSettings( "Update", QSize( 300, 100 ) );
+
+ /* Check for updates */
+ UpdateOrDownload();
}
UpdateDialog::~UpdateDialog()
{
update_Delete( p_update );
+ writeSettings( "Update" );
}
void UpdateDialog::close()
toggleVisible();
}
-void UpdateDialog::updateOrUpload()
+/* Check for updates */
+void UpdateDialog::UpdateOrDownload()
{
- if( !p_update ) return;
- if( !b_updated )
+ if( !b_checked )
{
- update_Check( p_update, VLC_FALSE );
- update_iterator_t *p_updateit = update_iterator_New( p_update );
- bool b_download = false;
- if( p_updateit )
- {
- p_updateit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
- p_updateit->i_t = UPDATE_FILE_TYPE_ALL;
- update_iterator_Action( p_updateit, UPDATE_MIRROR );
- while( update_iterator_Action( p_updateit, UPDATE_FILE ) != UPDATE_FAIL )
- {
- switch( p_updateit->file.i_type )
- {
- case UPDATE_FILE_TYPE_INFO:
- checkInfo->setText( qtr( "Information" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
- checkInfo->setDisabled( false );
- checkInfo->setCheckState( Qt::Checked );
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_SOURCE:
- checkSource->setText( qtr( "Source" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
- checkSource->setDisabled( false );
- checkSource->setCheckState( Qt::Checked );
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_BINARY:
- checkBinary->setText( qtr( "Binary" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
- checkBinary->setDisabled( false );
- checkBinary->setCheckState( Qt::Checked );
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_PLUGIN:
- checkPlugin->setText( qtr( "Plugin" ) + " (" + qfu( p_updateit->release.psz_version ) + ")");
- checkPlugin->setDisabled( false );
- checkPlugin->setCheckState( Qt::Checked );
- b_download = true;
- break;
- default:
- break;
- }
- }
- }
- if( b_download )
+ 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..." ),
+ qfu( config_GetHomeDir() ) );
+
+ if( dest_dir != "" )
{
- updateButton->setText(qtr( "Download" ) );
- b_updated = true;
+ /*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 ) );
}
- update_iterator_Delete( p_updateit );
}
+}
+
+/* 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 )
{
- update_iterator_t *p_updateit = update_iterator_New( p_update );
- bool b_download = false;
- if( p_updateit )
+ if( update_NeedUpgrade( p_update ) )
{
- QString saveDir = QFileDialog::getExistingDirectory( this, qtr( "Choose a directory..." ),
- qfu( p_intf->p_libvlc->psz_homedir ) );
-
- p_updateit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
- p_updateit->i_t = UPDATE_FILE_TYPE_ALL;
- update_iterator_Action( p_updateit, UPDATE_MIRROR );
-
- while( update_iterator_Action( p_updateit, UPDATE_FILE ) != UPDATE_FAIL )
- {
- b_download = false;
- switch( p_updateit->file.i_type )
- {
- case UPDATE_FILE_TYPE_INFO:
- if( checkInfo->isChecked() )
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_SOURCE:
- if( checkSource->isChecked() )
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_BINARY:
- if( checkBinary->isChecked() )
- b_download = true;
- break;
- case UPDATE_FILE_TYPE_PLUGIN:
- if( checkPlugin->isChecked() )
- b_download = true;
- break;
- default:
- break;
- }
- if( b_download )
- {
- QString strFileName = p_updateit->file.psz_url;
- strFileName.remove( 0, strFileName.lastIndexOf( "/" ) + 1 );
- update_download( p_updateit, qtu( ( saveDir + strFileName ) ) );
- }
- }
+ update_release_t *p_release = update_GetRelease( p_update );
+ assert( p_release );
+ b_checked = true;
+ 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
+ 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
+
projects / vlc / blobdiff