qt4 - Subtitles Sprefs icon change and About dialog modification... But the file...

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index d9861ae6c370816eec4eef26dbb9fbd9f6e2d752..9e4d2c611395f0b55b8fe0f8d924bdcbcdc14f8d 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -29,13 +29,16 @@
 
 #include <QTextBrowser>
 #include <QTabWidget>
+#include <QFile>
+#include <QTextBrowser>
+#include <QLabel>
 
 HelpDialog *HelpDialog::instance = NULL;
 
 HelpDialog::HelpDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 {
     setWindowTitle( qtr( "Help" ) );
-    resize(450, 500);
+    resize(600, 500);
 
     QGridLayout *layout = new QGridLayout(this);
     QTextBrowser *helpBrowser = new QTextBrowser(this);
@@ -60,14 +63,27 @@ AboutDialog *AboutDialog::instance = NULL;
 AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 {
     setWindowTitle( qtr( "About" ) );
-    resize( 450, 250 );
+    resize( 600, 500 );
 
     QGridLayout *layout = new QGridLayout( this );
     QTabWidget *tab = new QTabWidget( this );
+
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
-    
-    layout->addWidget( tab, 0, 0); 
-    layout->addWidget( closeButton, 1, 3 );
+    closeButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
+
+    QLabel *introduction = new QLabel( qtr( "Infos about VLC media player" ) );
+
+    layout->addWidget( introduction, 0, 0, 1, 2 );
+    layout->addWidget( tab, 1, 0, 1, 2 );
+    layout->addWidget( closeButton, 2, 1, 1, 1 );
+
+    QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" );
+    QTextEdit *licenseEdit = new QTextEdit( this );
+    licenseEdit->setText( licenseFile->readAll() );
+    licenseEdit->setReadOnly( true );
+
+    tab->addTab( licenseEdit, _("Distribution License") );
+
     BUTTONACT( closeButton, close() );
 }
 

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 9ae4d5ecb60e516cea42aab1f10e0db758f430c3..71030d9b1cfdbd4ae84da7567fff2fd4acb907ac 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -42,6 +42,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     setModal( modal );
     ui.setupUi( this );
     setWindowTitle( qtr("Open" ) );
+
     fileOpenPanel = new FileOpenPanel( this , p_intf );
     diskOpenPanel = new DiskOpenPanel( this , p_intf );
     netOpenPanel = new NetOpenPanel( this , p_intf );

diff --git a/modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png b/modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png
index e59f10b5d64e282b5074ab6ed4ec79286fd45c95..ea34e2e462d22305d415da38979b7ad77bd7c6bb 100644 (file)
Binary files a/modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png and b/modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png differ