author | harlekin <harlekin> | 2003-03-08 21:18:44 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-08 21:18:44 (UTC) |
commit | e0ee59855dfd924d33b4fcd98d5fa74a95437e71 (patch) (side-by-side diff) | |
tree | 6a7094b8cd634958242cb767bf1bcb7a30dfd68d | |
parent | 803d651da2d61409029b12b378ea815a16109ce7 (diff) | |
download | opie-e0ee59855dfd924d33b4fcd98d5fa74a95437e71.zip opie-e0ee59855dfd924d33b4fcd98d5fa74a95437e71.tar.gz opie-e0ee59855dfd924d33b4fcd98d5fa74a95437e71.tar.bz2 |
use the wrench from inline
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 72 | ||||
-rw-r--r-- | pics/appearance/advanced.png | bin | 584 -> 0 bytes |
2 files changed, 36 insertions, 36 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 2b35119..8dc70ee 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp @@ -419,16 +419,16 @@ Appearance::Appearance( QWidget* parent, const char* name, WFlags ) QWhatsThis::add( m_sample, tr( "This is a preview window. Look here to see your new appearance as options are changed." ) ); OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); QWidget *styletab; - + m_color_list = 0; - + tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" )); tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" )); tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) ); tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) ); - tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "appearance/advanced", tr( "Advanced" ) ); + tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) ); top-> addWidget ( tw, 10 ); top-> addWidget ( m_sample, 1 ); @@ -529,15 +529,15 @@ void Appearance::done ( int r ) void Appearance::styleClicked ( int index ) { StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index ); m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false ); - + if ( m_sample && sli && sli-> style ( )) { int ci = m_color_list ? m_color_list-> currentItem ( ) : -1; - - m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( )); + + m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( )); } - + m_style_changed |= ( index != m_original_style ); } void Appearance::styleSettingsClicked ( ) @@ -567,12 +567,12 @@ void Appearance::styleSettingsClicked ( ) void Appearance::decoClicked ( int index ) { DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index ); - + if ( m_sample ) { if ( dli && dli-> interface ( )) - m_sample-> setDecoration ( dli-> interface ( )); + m_sample-> setDecoration ( dli-> interface ( )); else m_sample-> setDecoration ( new DefaultWindowDecoration ( )); m_sample-> repaint ( ); } @@ -580,9 +580,9 @@ void Appearance::decoClicked ( int index ) } void Appearance::fontClicked ( const QFont &f ) { - m_font_changed |= ( f != m_sample-> font ( )); + m_font_changed |= ( f != m_sample-> font ( )); m_sample-> setFont ( f ); } void Appearance::colorClicked ( int index ) @@ -602,16 +602,16 @@ void Appearance::editSchemeClicked ( ) int cnt = 0; QString labels [QColorGroup::NColorRoles]; QColor colors [QColorGroup::NColorRoles]; - + for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { QColor col = item-> color ( role ); - + if ( col. isValid ( )) { labels [cnt] = item-> label ( role ); colors [cnt] = col; - + cnt++; } } @@ -619,19 +619,19 @@ void Appearance::editSchemeClicked ( ) editdlg-> showMaximized ( ); if ( editdlg-> exec ( ) == QDialog::Accepted ) { ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 ); cnt = 0; - + for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { if ( item-> color ( role ). isValid ( )) { citem-> setColor ( role, colors [cnt] ); cnt++; } } - + m_color_list-> setCurrentItem ( 0 ); colorClicked ( 0 ); - + m_color_changed = true; } delete editdlg; } @@ -657,18 +657,18 @@ void Appearance::saveSchemeClicked() filestr.append( schemename ); filestr.append( ".scheme" ); QFile file ( filestr ); if ( !file. exists ( )) - { + { QPalette p = item-> palette ( ); - + Config config ( file.name(), Config::File ); config. setGroup( "Colors" ); item-> save ( config ); - + config. write ( ); // need to flush the config info first - + m_color_list-> insertItem ( new ColorListItem ( schemename, config )); } else { @@ -721,56 +721,56 @@ void Appearance::delExcept ( ) void Appearance::upExcept ( ) { ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); - + if ( it && it-> itemAbove ( )) it-> itemAbove ( )-> moveItem ( it ); } void Appearance::downExcept ( ) { ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); - + if ( it && it-> itemBelow ( )) it-> moveItem ( it-> itemBelow ( )); } class ExEdit : public QLineEdit { public: - ExEdit ( ExceptListItem *item ) + ExEdit ( ExceptListItem *item ) : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item ) - { + { setFrame ( false ); - + QRect r = it-> listView ( )-> itemRect ( it ); - + int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1; int y = r. y ( ); int w = it-> listView ( )-> viewport ( )-> width ( ) - x; int h = r. height ( ); // + 2; - - setText ( it-> pattern ( )); + + setText ( it-> pattern ( )); setGeometry ( x, y, w, h ); - - qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h); - + + qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h); + m_out = true; - + show ( ); setFocus ( ); selectAll ( ); end ( true ); } - - virtual void focusOutEvent ( QFocusEvent * ) + + virtual void focusOutEvent ( QFocusEvent * ) { hide ( ); if ( m_out ) it-> setPattern ( text ( )); delete this; } - + virtual void keyPressEvent ( QKeyEvent *e ) { if ( e-> key ( ) == Key_Return ) it-> listView ( )-> setFocus ( ); @@ -780,9 +780,9 @@ public: } else QLineEdit::keyPressEvent ( e ); } - + private: ExceptListItem *it; bool m_out; }; diff --git a/pics/appearance/advanced.png b/pics/appearance/advanced.png Binary files differdeleted file mode 100644 index 184fb3a..0000000 --- a/pics/appearance/advanced.png +++ b/dev/null |