Diffstat (limited to 'noncore/settings/appearance2/appearance.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 43ff24c..8cd54a2 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp @@ -146,13 +146,13 @@ void Appearance::loadStyles ( QListBox *list ) #endif } void Appearance::loadDecos ( QListBox *list ) { - list-> insertItem ( new DecoListItem ( tr( "Default" ))); + list-> insertItem ( new DecoListItem ( "QPE" )); { QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { @@ -205,13 +205,20 @@ QWidget *Appearance::createStyleTab ( QWidget *parent ) connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( ))); vertLayout-> addWidget ( m_style_settings ); loadStyles ( m_style_list ); QString s = config. readEntry ( "Style", "Light" ); - m_style_list-> setCurrentItem ( m_style_list-> findItem ( s )); + + for ( uint i = 0; i < m_style_list-> count ( ); i++ ) { + if (((StyleListItem *) m_style_list-> item ( i ))-> key ( ) == s ) { + m_style_list-> setCurrentItem ( i ); + break; + } + } + m_original_style = m_style_list-> currentItem ( ); styleClicked ( m_original_style ); connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) ); return tab; @@ -228,13 +235,20 @@ QWidget *Appearance::createDecoTab ( QWidget *parent ) m_deco_list = new QListBox( tab, "m_deco_list" ); vertLayout->addWidget( m_deco_list ); loadDecos ( m_deco_list ); QString s = config. readEntry ( "Decoration" ); - m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s )); + + for ( uint i = 0; i < m_deco_list-> count ( ); i++ ) { + if (((DecoListItem *) m_deco_list-> item ( i ))-> key ( ) == s ) { + m_deco_list-> setCurrentItem ( i ); + break; + } + } + m_original_deco = m_deco_list-> currentItem ( ); if ( m_deco_list-> currentItem ( ) < 0 ) m_deco_list-> setCurrentItem ( 0 ); decoClicked ( m_original_deco ); connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); @@ -384,12 +398,18 @@ void Appearance::accept ( ) if ( m_style_changed ) { StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); if ( item ) config.writeEntry( "Style", item-> key ( )); } + if ( m_deco_changed ) { + DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( )); + if ( item ) + config.writeEntry( "Decoration", item-> key ( )); + } + if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos )) { config. writeEntry ( "TabStyle", newtabstyle + 1 ); config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" ); } if ( m_font_changed ) { @@ -466,12 +486,13 @@ void Appearance::decoClicked ( int index ) if ( m_sample ) { if ( dli && dli-> interface ( )) m_sample-> setDecoration ( dli-> interface ( )); else m_sample-> setDecoration ( new DefaultWindowDecoration ( )); + m_sample-> repaint ( ); } m_deco_changed |= ( index != m_original_deco ); } void Appearance::fontClicked ( const QFont &f ) { |