* $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.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "dialogs/help.hpp"
#include <vlc_about.h>
HelpDialog *HelpDialog::instance = NULL;
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;
if( QDate::currentDate().dayOfYear() >= 354 )
iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
/* Main Introduction */
QWidget *infoWidget = new QWidget( this );
QHBoxLayout *infoLayout = new QHBoxLayout( infoWidget );
- QLabel *infoLabel = new QLabel( "VLC media player " VERSION_MESSAGE "\n\n"
- "(c) " COPYRIGHT_YEARS " - 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" );
+ + 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;
/* GPL License */
QTextEdit *licenseEdit = new QTextEdit( this );
- licenseEdit->setFontFamily( "Monospace" );
licenseEdit->setText( qfu( psz_license ) );
licenseEdit->setReadOnly( true );
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 );
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 )
+static void UpdateCallback( void *data, bool b_ret )
{
UpdateDialog* UDialog = (UpdateDialog *)data;
- QEvent *event = new QEvent( QEvent::User );
+ 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( "Update" ) );
- resize( 120, 80 );
QGridLayout *layout = new QGridLayout( this );
buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole );
buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
- updateLabel = new QLabel( qtr( "Checking for the update..." ) );
+ updateLabel = new QLabel( qtr( "Checking for an update..." ) );
updateLabel->setWordWrap( true );
layout->addWidget( updateLabel, 0, 0 );
BUTTONACT( updateButton, UpdateOrDownload() );
BUTTONACT( closeButton, close() );
- /* create the update structure and the callback */
- p_update = update_New( _p_intf );
+ /* Create the update structure */
+ p_update = update_New( p_intf );
b_checked = false;
+
+ readSettings( "Update", QSize( 120, 80 ) );
+
+ /* Check for updates */
+ UpdateOrDownload();
}
UpdateDialog::~UpdateDialog()
{
update_Delete( p_update );
+ writeSettings( "Update" );
}
void UpdateDialog::close()
if( !b_checked )
{
updateButton->setEnabled( false );
+ msg_Dbg( p_intf, "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 ) );
+ QString dest_dir = QFileDialog::getExistingDirectory( this,
+ qtr( "Select a directory..." ),
+ qfu( config_GetHomeDir() ) );
if( dest_dir != "" )
{
/* Handle the events */
void UpdateDialog::customEvent( QEvent *event )
{
- updateNotify();
+ if( event->type() == UDOkEvent )
+ updateNotify( true );
+ else
+ updateNotify( false );
}
/* Notify the end of the update_Check */
-void UpdateDialog::updateNotify()
+void UpdateDialog::updateNotify( bool b_result )
{
- if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer )
+ /* The update finish without errors */
+ if( b_result )
{
- b_checked = true;
- updateButton->setText( "Download" );
- updateLabel->setText( qtr( "There is a new version of vlc :\n" ) + qfu( p_update->release.psz_desc ) );
+ 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_release->psz_desc ) );
+
+ /* Force the dialog to be shown */
+ this->show();
+ }
+ else
+ updateLabel->setText( qtr( "You have the latest version of VLC" ) );
}
else
- {
- updateLabel->setText( qtr( "You have the latest version of vlc" ) );
- }
+ updateLabel->setText(
+ qtr( "An error occurred while checking for updates" ) );
+
adjustSize();
updateButton->setEnabled( true );
}
-
#endif
+
projects / vlc / blobdiff