Commit a210fb14 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

Remove and add comments. 
parent 7fe7324d
...@@ -81,13 +81,13 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) ...@@ -81,13 +81,13 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
/* GPL License */ /* GPL License */
QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" ); QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" );
QTextEdit *licenseEdit = new QTextEdit( this ); QTextEdit *licenseEdit = new QTextEdit( this );
// licenseEdit->setText( licenseFile->readAll() ); licenseEdit->setText( licenseFile->readAll() );
licenseEdit->setReadOnly( true ); licenseEdit->setReadOnly( true );
/* People who helped */ /* People who helped */
QFile *thanksFile = new QFile( "/usr/src/vlc/THANKS" ); QFile *thanksFile = new QFile( "/usr/src/vlc/THANKS" );
QTextEdit *thanksEdit = new QTextEdit( this ); QTextEdit *thanksEdit = new QTextEdit( this );
// thanksEdit->setText( thanksFile->readAll() ); thanksEdit->setText( thanksFile->readAll() );
thanksEdit->setReadOnly( true ); thanksEdit->setReadOnly( true );
/* add the tabs to the Tabwidget */ /* add the tabs to the Tabwidget */
......
...@@ -94,7 +94,7 @@ void MediaInfoDialog::setInput(input_item_t *p_input) ...@@ -94,7 +94,7 @@ void MediaInfoDialog::setInput(input_item_t *p_input)
void MediaInfoDialog::update() 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++; i_runs++;
if( i_runs % 3 != 0 ) return; if( i_runs % 3 != 0 ) return;
......
...@@ -50,6 +50,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -50,6 +50,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
setMaximumHeight( 650 ); setMaximumHeight( 650 );
setMaximumWidth( 700 ); setMaximumWidth( 700 );
/* Create Panels */
tree_panel = new QWidget( 0 ); tree_panel = new QWidget( 0 );
tree_panel_l = new QHBoxLayout; tree_panel_l = new QHBoxLayout;
tree_panel->setLayout( tree_panel_l ); tree_panel->setLayout( tree_panel_l );
...@@ -57,7 +58,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -57,7 +58,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
main_panel_l = new QHBoxLayout; main_panel_l = new QHBoxLayout;
main_panel->setLayout( main_panel_l ); main_panel->setLayout( main_panel_l );
// Choice for types /* Choice for types */
types = new QGroupBox( "Show settings" ); types = new QGroupBox( "Show settings" );
types->setAlignment( Qt::AlignHCenter ); types->setAlignment( Qt::AlignHCenter );
QHBoxLayout *types_l = new QHBoxLayout(0); QHBoxLayout *types_l = new QHBoxLayout(0);
...@@ -67,19 +68,20 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -67,19 +68,20 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
types->setLayout( types_l ); types->setLayout( types_l );
small->setChecked( true ); small->setChecked( true );
/* Tree and panel initialisations */
advanced_tree = NULL; advanced_tree = NULL;
simple_tree = NULL; simple_tree = NULL;
simple_panel = NULL; simple_panel = NULL;
advanced_panel = NULL; advanced_panel = NULL;
main_layout->addWidget( tree_panel, 0, 0, 3, 1 ); 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->addWidget( main_panel, 0, 1, 4, 1 );
main_layout->setColumnMinimumWidth( 0, 150 ); main_layout->setColumnMinimumWidth( 0, 150 );
main_layout->setColumnStretch( 0, 1 ); main_layout->setColumnStretch( 0, 1 );
main_layout->setColumnStretch( 1,3 ); main_layout->setColumnStretch( 1, 3 );
main_layout->setRowStretch( 2, 4); main_layout->setRowStretch( 2, 4);
...@@ -94,7 +96,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -94,7 +96,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole ); buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole );
buttonsBox->addButton( reset, QDialogButtonBox::ActionRole ); buttonsBox->addButton( reset, QDialogButtonBox::ActionRole );
main_layout->addWidget( buttonsBox, 4, 0, 1 ,3 ); main_layout->addWidget( buttonsBox, 4, 1, 1 ,2 );
setLayout( main_layout ); setLayout( main_layout );
BUTTONACT( save, save() ); BUTTONACT( save, save() );
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) : SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) :
QVLCDialog( parent, _p_intf ) QVLCDialog( parent, _p_intf )
{ {
//setWindowTitle( qtr( "Stream output") ); setWindowTitle( qtr( "Stream output") );
setModal( true ); setModal( true );
/* UI stuff */ /* UI stuff */
ui.setupUi( this ); ui.setupUi( this );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment