# include "config.h"
#endif
-#include <vlc_common.h>
-
#include "dialogs/help.hpp"
+#include "util/qt_dirs.hpp"
+
#include <vlc_about.h>
+#include <vlc_intf_strings.h>
#ifdef UPDATE_CHECK
-#include <vlc_update.h>
+# include <vlc_update.h>
#endif
-#include "dialogs_provider.hpp"
-
-#include <vlc_intf_strings.h>
-
#include <QTextBrowser>
#include <QTabWidget>
-#include <QFile>
#include <QLabel>
#include <QString>
#include <QDialogButtonBox>
#include <QFileDialog>
#include <QDate>
-
-HelpDialog *HelpDialog::instance = NULL;
+#include <assert.h>
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 );
layout->addWidget( closeButton, 1, 3 );
BUTTONACT( closeButton, close() );
- readSettings( "Help", QSize( 400, 450 ) );
+ readSettings( "Help", QSize( 500, 450 ) );
}
HelpDialog::~HelpDialog()
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 );
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 );
"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() )+ "@" + qfu( VLC_CompileHost() ) + ".\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 );
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( "&Cancel" ) );
- updateButton = new QPushButton( qtr( "&Update List" ) );
+ 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() );
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();
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
{
QString dest_dir = QFileDialog::getExistingDirectory( this,
qtr( "Select a directory..." ),
- qfu( config_GetHomeDir() ) );
+ QVLCUserDir( VLC_DOWNLOAD_DIR ) );
- if( dest_dir != "" )
+ if( !dest_dir.isEmpty() )
{
- /*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
+ 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 ) );
update_release_t *p_release = update_GetRelease( p_update );
assert( p_release );
b_checked = true;
- updateButton->setText( "Ok" );
+ 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.\nDo you want to download it?\n" ) + qfu( p_release->psz_desc );
+ message += qtr( ") is available.");
+ updateLabelTop->setText( message );
+
+ updateText->setText( qfu( p_release->psz_desc ) );
+ updateText->setEnabled( true );
- updateLabel->setText( message );
+ 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 );
}
projects / vlc / blobdiff