#include "dialogs/preferences.hpp"
#include "util/qvlcframe.hpp"
+#include "dialogs/errors.hpp"
#include "components/complete_preferences.hpp"
#include "components/simple_preferences.hpp"
+#include "util/searchlineedit.hpp"
+#include "main_interface.hpp"
#include <QHBoxLayout>
#include <QGroupBox>
#include <QPushButton>
#include <QMessageBox>
#include <QDialogButtonBox>
-
-PrefsDialog *PrefsDialog::instance = NULL;
+#include <QStackedWidget>
PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
: QVLCDialog( parent, _p_intf )
{
QGridLayout *main_layout = new QGridLayout( this );
setWindowTitle( qtr( "Preferences" ) );
+ setWindowRole( "vlc-preferences" );
+ setWindowModality( Qt::WindowModal );
/* Whether we want it or not, we need to destroy on close to get
consistency when reset */
setAttribute( Qt::WA_DeleteOnClose );
/* Create Panels */
- tree_panel = new QWidget;
- tree_panel_l = new QHBoxLayout;
- tree_panel->setLayout( tree_panel_l );
- main_panel = new QWidget;
- main_panel_l = new QHBoxLayout;
- main_panel->setLayout( main_panel_l );
+ simple_tree_panel = new QWidget;
+ simple_tree_panel->setLayout( new QVBoxLayout );
+
+ advanced_tree_panel = new QWidget;
+ advanced_tree_panel->setLayout( new QVBoxLayout );
+
+ simple_main_panel = new QWidget;
+ simple_main_panel->setLayout( new QHBoxLayout );
+
+ advanced_main_panel = new QWidget;
+ advanced_main_panel->setLayout( new QHBoxLayout );
/* Choice for types */
types = new QGroupBox( qtr("Show settings") );
/* Tree and panel initialisations */
advanced_tree = NULL;
+ tree_filter = NULL;
simple_tree = NULL;
current_simple_panel = NULL;
advanced_panel = NULL;
buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole );
buttonsBox->addButton( reset, QDialogButtonBox::ResetRole );
+
+ simple_split_widget = new QWidget();
+ simple_split_widget->setLayout( new QHBoxLayout );
+
+ advanced_split_widget = new QWidget();
+ advanced_split_widget->setLayout( new QHBoxLayout );
+
+ stack = new QStackedWidget();
+ stack->insertWidget( SIMPLE, simple_split_widget );
+ stack->insertWidget( ADVANCED, advanced_split_widget );
+
+ simple_split_widget->layout()->addWidget( simple_tree_panel );
+ simple_split_widget->layout()->addWidget( simple_main_panel );
+ simple_split_widget->layout()->setMargin( 0 );
+
+ advanced_split_widget->layout()->addWidget( advanced_tree_panel );
+ advanced_split_widget->layout()->addWidget( advanced_main_panel );
+ advanced_split_widget->layout()->setMargin( 0 );
+
/* Layout */
- main_layout->addWidget( tree_panel, 0, 0, 3, 1 );
+ main_layout->addWidget( stack, 0, 0, 3, 3 );
main_layout->addWidget( types, 3, 0, 2, 1 );
- main_layout->addWidget( main_panel, 0, 1, 4, 2 );
main_layout->addWidget( buttonsBox, 4, 2, 1 ,1 );
-
- main_layout->setColumnMinimumWidth( 0, 150 );
- main_layout->setColumnMinimumWidth( 1, 10 );
- main_layout->setColumnStretch( 0, 1 );
- main_layout->setColumnStretch( 1, 0 );
- main_layout->setColumnStretch( 2, 10 );
-
main_layout->setRowStretch( 2, 4 );
-
main_layout->setMargin( 9 );
setLayout( main_layout );
/* Margins */
- tree_panel_l->setMargin( 1 );
- main_panel_l->setLayoutMargins( 6, 0, 0, 3, 3 );
+ simple_tree_panel->layout()->setMargin( 1 );
+ simple_main_panel->layout()->setContentsMargins( 6, 0, 0, 3 );
b_small = (p_intf->p_sys->i_screenHeight < 750);
- if( b_small ) msg_Dbg( p_intf, "Small");
+ if( b_small ) msg_Dbg( p_intf, "Small Resolution");
setMaximumHeight( p_intf->p_sys->i_screenHeight );
for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL;
- if( config_GetInt( p_intf, "qt-advanced-pref" ) || config_GetInt( p_intf, "advanced" ) )
+ if( var_InheritBool( p_intf, "qt-advanced-pref" )
+ || var_InheritBool( p_intf, "advanced" ) )
setAdvanced();
else
setSmall();
void PrefsDialog::setAdvanced()
{
- /* We already have a simple TREE, and we just want to hide it */
- if( simple_tree )
- if( simple_tree->isVisible() ) simple_tree->hide();
+ if ( !tree_filter )
+ {
+ tree_filter = new SearchLineEdit( simple_tree_panel );
+ tree_filter->setMinimumHeight( 26 );
+
+ CONNECT( tree_filter, textChanged( const QString & ),
+ this, advancedTreeFilterChanged( const QString & ) );
+
+ advanced_tree_panel->layout()->addWidget( tree_filter );
+ }
/* If don't have already and advanced TREE, then create it */
if( !advanced_tree )
{
/* Creation */
- advanced_tree = new PrefsTree( p_intf, tree_panel );
+ advanced_tree = new PrefsTree( p_intf, simple_tree_panel );
/* and connections */
CONNECT( advanced_tree,
currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ),
this, changeAdvPanel( QTreeWidgetItem * ) );
- tree_panel_l->addWidget( advanced_tree );
+ advanced_tree_panel->layout()->addWidget( advanced_tree );
+ advanced_tree_panel->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
}
- /* Show it */
- advanced_tree->show();
-
- /* Remove the simple current panel from the main panels*/
- if( current_simple_panel )
- if( current_simple_panel->isVisible() ) current_simple_panel->hide();
-
/* If no advanced Panel exist, create one, attach it and show it*/
if( !advanced_panel )
{
- advanced_panel = new AdvPrefsPanel( main_panel );
- main_panel_l->addWidget( advanced_panel );
+ advanced_panel = new AdvPrefsPanel( simple_main_panel );
+ advanced_main_panel->layout()->addWidget( advanced_panel );
}
- advanced_panel->show();
/* Select the first Item of the preferences. Maybe you want to select a specified
category... */
advanced_tree->model()->index( 0, 0, QModelIndex() ) );
all->setChecked( true );
+ stack->setCurrentIndex( ADVANCED );
}
void PrefsDialog::setSmall()
{
- /* If an advanced TREE exists, remove and hide it */
- if( advanced_tree )
- if( advanced_tree->isVisible() ) advanced_tree->hide();
-
/* If no simple_tree, create one, connect it */
if( !simple_tree )
{
- simple_tree = new SPrefsCatList( p_intf, tree_panel, b_small );
+ simple_tree = new SPrefsCatList( p_intf, simple_tree_panel, b_small );
CONNECT( simple_tree,
currentItemChanged( int ),
this, changeSimplePanel( int ) );
- tree_panel_l->addWidget( simple_tree );
+ simple_tree_panel->layout()->addWidget( simple_tree );
+ simple_tree_panel->setMinimumSize( QSize( 150, 0 ) );
+ simple_tree_panel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
}
- /*show it */
- simple_tree->show();
-
- /* If an Advanced PANEL exists, remove it */
- if( advanced_panel )
- if( advanced_panel->isVisible() ) advanced_panel->hide();
-
if( !current_simple_panel )
{
current_simple_panel =
- new SPrefsPanel( p_intf, main_panel, SPrefsDefaultCat, b_small );
+ new SPrefsPanel( p_intf, simple_main_panel, SPrefsDefaultCat, b_small );
simple_panels[SPrefsDefaultCat] = current_simple_panel;
- main_panel_l->addWidget( current_simple_panel );
+ simple_main_panel->layout()->addWidget( current_simple_panel );
}
- current_simple_panel->show();
small->setChecked( true );
+ stack->setCurrentIndex( SIMPLE );
}
/* Switching from on simple panel to another */
current_simple_panel = simple_panels[number];
if( !current_simple_panel )
{
- current_simple_panel = new SPrefsPanel( p_intf, main_panel, number, b_small );
+ current_simple_panel = new SPrefsPanel( p_intf, simple_main_panel, number, b_small );
simple_panels[number] = current_simple_panel;
- main_panel_l->addWidget( current_simple_panel );
+ simple_main_panel->layout()->addWidget( current_simple_panel );
}
current_simple_panel->show();
if( !data->panel )
{
- data->panel = new AdvPrefsPanel( p_intf, main_panel , data );
- main_panel_l->addWidget( data->panel );
+ data->panel = new AdvPrefsPanel( p_intf, simple_main_panel , data );
+ advanced_main_panel->layout()->addWidget( data->panel );
}
advanced_panel = data->panel;
}
/* Save to file */
- config_SaveConfigFile( p_intf, NULL );
-
- destroyPanels();
-
- hide();
-}
-
-void PrefsDialog::destroyPanels()
-{
- msg_Dbg( p_intf, "Destroying the Panels" );
- /* Delete the other panel in order to force its reload after clicking
- on apply. In fact, if we don't do that, the preferences from the other
- panels won't be accurate, so we would have to recreate the whole dialog,
- and we don't want that.*/
- if( small->isChecked() && advanced_panel )
+ if( config_SaveConfigFile( p_intf ) != 0 )
{
- /* Deleting only the active panel from the advanced config doesn't work
- because the data records of PrefsItemData contains still a
- reference to it only cleanAll() is sure to remove all Panels! */
- advanced_tree->cleanAll();
- advanced_panel = NULL;
- }
- if( all->isChecked() && current_simple_panel )
- {
- for( int i = 0 ; i< SPrefsMax; i++ )
- {
- if( simple_panels[i] )
- {
- delete simple_panels[i];
- simple_panels[i] = NULL;
- }
- }
- current_simple_panel = NULL;
+ ErrorsDialog::getInstance (p_intf)->addError( qtr( "Cannot save Configuration" ),
+ qtr("Preferences file could not be saved") );
}
-}
+ if( p_intf->p_sys->p_mi )
+ p_intf->p_sys->p_mi->reloadPrefs();
+ accept();
+}
/* Clean the preferences, dunno if it does something really */
void PrefsDialog::cancel()
{
- if( small->isChecked() && simple_tree )
- {
- for( int i = 0 ; i< SPrefsMax; i++ )
- if( simple_panels[i] ) simple_panels[i]->clean();
- }
- else if( all->isChecked() && advanced_tree )
- {
- advanced_tree->cleanAll();
- advanced_panel = NULL;
- }
- hide();
+ reject();
}
/* Reset all the preferences, when you click the button */
if( ret == QMessageBox::Ok )
{
config_ResetAll( p_intf );
- config_SaveConfigFile( p_intf, NULL );
+ config_SaveConfigFile( p_intf );
getSettings()->clear();
- close();
- instance = NULL;
- PrefsDialog::getInstance( p_intf )->show();
+ accept();
}
}
+
+void PrefsDialog::advancedTreeFilterChanged( const QString & text )
+{
+ advanced_tree->filter( text );
+}
projects / vlc / blobdiff