Qt4 - Small modifications on Preferences layout (specially aimed at Windows).

Remove and add comments.

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 254a17af43855a113c989308eac09d58413ec109..75fc4a285f18ad81191de154fdda70142651faba 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -79,15 +79,15 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     layout->addWidget( closeButton, 2, 1, 1, 1 );
 
     /* GPL License */
-    QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" ); 
-    QTextEdit *licenseEdit = new QTextEdit( this ); 
-//    licenseEdit->setText( licenseFile->readAll() ); 
-    licenseEdit->setReadOnly( true ); 
+    QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" );
+    QTextEdit *licenseEdit = new QTextEdit( this );
+    licenseEdit->setText( licenseFile->readAll() );
+    licenseEdit->setReadOnly( true );
 
     /* People who helped */
     QFile *thanksFile = new QFile( "/usr/src/vlc/THANKS" );
     QTextEdit *thanksEdit = new QTextEdit( this );
-//    thanksEdit->setText( thanksFile->readAll() );
+    thanksEdit->setText( thanksFile->readAll() );
     thanksEdit->setReadOnly( true );
 
     /* add the tabs to the Tabwidget */

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index ad216c702345fea11feb9e8c5c7aa95bc47a7eff..9b4211433a32270623620e912f490a4af9cb3d96 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -94,7 +94,7 @@ void MediaInfoDialog::setInput(input_item_t *p_input)
 
 void MediaInfoDialog::update()
 {
-    // Timer runs at 150 ms, dont' update more than 2 times per second
+    /* Timer runs at 150 ms, dont' update more than 2 times per second */
     i_runs++;
     if( i_runs % 3 != 0 ) return;
 

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 13a0f076ba4c000402734ea4a32e62a9a1f99a38..8346a4df90b2c75d765e38e499c01fc682b0ed00 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -50,6 +50,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      setMaximumHeight( 650 );
      setMaximumWidth( 700 );
 
+     /* Create Panels */
      tree_panel = new QWidget( 0 );
      tree_panel_l = new QHBoxLayout;
      tree_panel->setLayout( tree_panel_l );
@@ -57,7 +58,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      main_panel_l = new QHBoxLayout;
      main_panel->setLayout( main_panel_l );
 
-     // Choice for types
+     /* Choice for types */
      types = new QGroupBox( "Show settings" );
      types->setAlignment( Qt::AlignHCenter );
      QHBoxLayout *types_l = new QHBoxLayout(0);
@@ -67,19 +68,20 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      types->setLayout( types_l );
      small->setChecked( true );
 
+     /* Tree and panel initialisations */
      advanced_tree = NULL;
      simple_tree = NULL;
      simple_panel = NULL;
      advanced_panel = NULL;
 
      main_layout->addWidget( tree_panel, 0, 0, 3, 1 );
-     main_layout->addWidget( types, 3, 0, 1, 1 );
+     main_layout->addWidget( types, 3, 0, 2, 1 );
 
      main_layout->addWidget( main_panel, 0, 1, 4, 1 );
 
      main_layout->setColumnMinimumWidth( 0, 150 );
      main_layout->setColumnStretch( 0, 1 );
-     main_layout->setColumnStretch( 1,3 );
+     main_layout->setColumnStretch( 1, 3 );
 
      main_layout->setRowStretch( 2, 4);
 
@@ -94,7 +96,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole );
      buttonsBox->addButton( reset, QDialogButtonBox::ActionRole );
 
-     main_layout->addWidget( buttonsBox, 4, 0, 1 ,3 );
+     main_layout->addWidget( buttonsBox, 4, 1, 1 ,2 );
      setLayout( main_layout );
 
      BUTTONACT( save, save() );

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 12cc1fd77e4a65933fd9560edf270896d7789a3d..5ca2ecd1bb409b99e8972a266705c3b3d24805ed 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -30,7 +30,7 @@
 SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) :
                                                 QVLCDialog( parent,  _p_intf )
 {
-    //setWindowTitle( qtr( "Stream output") );
+    setWindowTitle( qtr( "Stream output") );
     setModal( true );
     /* UI stuff */
     ui.setupUi( this );