Appearance: libopie->libopie2/libqtaux

5 files changed, 12 insertions, 9 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index ba12e55..b39203b 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -1,890 +1,889 @@
 /*
                              This file is part of the OPIE Project
                              Copyright (c)  2002 Trolltech AS <info@trolltech.com>
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "appearance.h"
 #include "editScheme.h"
 #include "stylelistitem.h"
 #include "decolistitem.h"
 #include "colorlistitem.h"
 #include "exceptlistitem.h"
 #include "sample.h"
 
 /* OPIE */
-#include <opie/ofontselector.h>
-#include <opie/odevice.h>
-#include <opie/ofiledialog.h>
-#include <opie/otabwidget.h>
+#include <opie2/odevice.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/otabwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/lightstyle.h>
 #include <qpe/styleinterface.h>
 
 /* QT */
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #endif
 #include <qtoolbutton.h>
 #include <qwindowsstyle.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 
 using namespace Opie;
 
 
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
     QString name() const
     {
         return "Default";
     }
     QPixmap icon() const
     {
         return QPixmap();
     }
     QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface )
     {
         *iface = 0;
         if ( uuid == IID_QUnknown )
             *iface = this;
         else if ( uuid == IID_WindowDecoration )
             *iface = this;
 
         if ( *iface )
             (*iface)->addRef();
         return QS_OK;
     }
     Q_REFCOUNT
 
 private:
     ulong ref;
 };
 
 
 
 
 
 
 
 QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
 {
     QWidget* tab = new QWidget( parent, "StyleTab" );
     QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
 
     m_style_list = new QListBox( tab, "m_style_list" );
     vertLayout->addWidget( m_style_list );
     QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
 
     m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
     connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( )));
     vertLayout-> addWidget ( m_style_settings );
     QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
 
     QString s = cfg. readEntry ( "Style", "Light" );
 
 
 #if QT_VERSION >= 300
     m_style_list->insertStringList(QStyleFactory::styles());
 #else
     m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( )));
 #endif
 
     {
         QString path = QPEApplication::qpeDir ( );
         path.append( "/plugins/styles/" );
         QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
         for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
         {
             QString libstr = path;
             libstr.append( "/" );
             libstr.append( *it );
             QLibrary *lib = new QLibrary ( libstr );
             StyleInterface *iface;
 
             if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
             {
                 StyleListItem *slit = new StyleListItem ( lib, iface );
                 m_style_list-> insertItem ( slit );
 
                 if ( slit-> key ( ) == s )
                     m_style_list-> setCurrentItem ( slit );
             }
             else
                 delete lib;
         }
     }
 
     m_original_style = m_style_list-> currentItem ( );
     styleClicked ( m_original_style );
 
     connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) );
 
     return tab;
 }
 
 QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
 {
     QWidget* tab = new QWidget( parent, "DecoTab" );
     QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
 
     m_deco_list = new QListBox( tab, "m_deco_list" );
     vertLayout->addWidget( m_deco_list );
     QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
 
     QString s = cfg. readEntry ( "Decoration", "libflat.so" );
 
     m_deco_list-> insertItem ( new DecoListItem ( "QPE" ));
 
     {
         QString path = QPEApplication::qpeDir();
         path.append( "/plugins/decorations/" );
         QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
         for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
         {
             QString libstr = path;
             libstr.append( "/" );
             libstr.append( *it );
             QLibrary *lib = new QLibrary ( libstr );
             WindowDecorationInterface *iface;
 
             if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
             {
                 DecoListItem *dlit = new DecoListItem ( lib, iface );
                 m_deco_list-> insertItem ( dlit );
 
                 if ( dlit-> key ( ) == s )
                     m_deco_list-> setCurrentItem ( dlit );
             }
             else
                 delete lib;
         }
     }
 
     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 ) ) );
 
     return tab;
 }
 
 QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
 {
     QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
     QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
     int size = cfg. readNumEntry ( "FontSize", 10 );
 
     m_fontselect = new OFontSelector ( false, parent, "FontTab" );
     m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
     QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
 
     connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
              this, SLOT( fontClicked ( const QFont & )));
 
     return m_fontselect;
 }
 
 QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
 {
     QWidget *tab = new QWidget( parent, "ColorTab" );
     QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 3, 3 );
     gridLayout->setRowStretch ( 3, 10 );
 
     m_color_list = new QListBox ( tab );
     gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 );
     connect( m_color_list, SIGNAL( highlighted( int ) ), this, SLOT( colorClicked( int ) ) );
     QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
 
     m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
 
     QString path = QPEApplication::qpeDir ( );
     path.append( "/etc/colors/" );
     QStringList sl = QDir ( path ). entryList ( "*.scheme" );
 
     for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
     {
         QString name = (*it). left ((*it). find ( ".scheme" ));
         QString pathstr = path;
         pathstr.append( *it );
         Config config ( pathstr, Config::File );
         config. setGroup ( "Colors" );
 
         m_color_list-> insertItem ( new ColorListItem ( name, config ));
     }
 
     m_color_list-> setCurrentItem ( 0 );
 
     QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
     tempButton->setText( tr( "Edit..." ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 0, 1 );
     QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
 
     tempButton = new QPushButton( tab, "deleteSchemeButton" );
     tempButton->setText( tr( "Delete" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 1, 1 );
     QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
 
     tempButton = new QPushButton( tab, "saveSchemeButton" );
     tempButton->setText( tr( "Save" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 2, 1 );
     QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
 
     return tab;
 }
 
 QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 {
     QWidget *tab = new QWidget ( parent );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
 
     QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
     m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
     m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
     lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
     QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
 
     QLabel *l = new QLabel ( tab );
     l-> setText ( QString ( "<p>%1</p>" ). arg ( tr( "Disable styling for these applications ( <b>*</b> can be used as a wildcard):" )));
     lay-> addMultiCellWidget ( l, 1, 1, 0, 1 );
     QWhatsThis::add( l, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
 
     m_except = new QListView ( tab );
     m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
     m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
     m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
     m_except-> addColumn ( tr( "Binary file(s)" ));
     m_except-> setColumnAlignment ( 0, AlignCenter );
     m_except-> setColumnAlignment ( 1, AlignCenter );
     m_except-> setColumnAlignment ( 2, AlignCenter );
     m_except-> setAllColumnsShowFocus ( true );
     m_except-> setMinimumHeight ( 30 );
     m_except-> header ( )-> setClickEnabled ( false );
     m_except-> header ( )-> setResizeEnabled ( false );
     m_except-> header ( )-> setMovingEnabled ( false );
     m_except-> setSorting ( -1 );
     lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
     QWhatsThis::add( m_except, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
 
     connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
 
     QToolButton *tb = new QToolButton ( tab );
     tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
     tb-> setFocusPolicy ( QWidget::StrongFocus );
     lay-> addWidget ( tb, 2, 1 );
     connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
     QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
 
     tb = new QToolButton ( tab );
     tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
     tb-> setFocusPolicy ( QWidget::StrongFocus );
     lay-> addWidget ( tb, 3, 1 );
     connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
     QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
 
     tb = new QToolButton ( tab );
     tb-> setIconSet ( Resource::loadIconSet ( "up" ));
     tb-> setFocusPolicy ( QWidget::StrongFocus );
     lay-> addWidget ( tb, 4, 1 );
     connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
     QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
 
     tb = new QToolButton ( tab );
     tb-> setIconSet ( Resource::loadIconSet ( "down" ));
     tb-> setFocusPolicy ( QWidget::StrongFocus );
     lay-> addWidget ( tb, 5, 1 );
     connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
     QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
 
     lay-> setRowStretch ( 6, 10 );
     lay-> setColStretch ( 0, 10 );
 
     QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
     QListViewItem *lvit = 0;
     for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
     {
         int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
 
         lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
     }
 
 
     vertLayout-> addSpacing ( 3 );
     QFrame *f = new QFrame ( tab );
     f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
     vertLayout-> addWidget ( f );
     vertLayout-> addSpacing ( 3 );
 
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
     int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
     bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
 
     QLabel* label = new QLabel( tr( "Tab style:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
     btngrp-> hide ( );
     btngrp-> setExclusive ( true );
 
     m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
     m_tabstyle_list-> insertItem ( tr( "Tabs" ));
     m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
     m_tabstyle_list-> setCurrentItem ( style );
     gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
     QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
     btngrp-> insert ( m_tabstyle_top );
     gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
     QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
 
     m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
     btngrp-> insert ( m_tabstyle_bottom );
     gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
     QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
 
     m_tabstyle_top-> setChecked ( tabtop );
     m_tabstyle_bottom-> setChecked ( !tabtop );
 
     m_original_tabstyle = style;
     m_original_tabpos = tabtop;
 
     vertLayout-> addSpacing ( 3 );
     QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
 
     QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
     m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
     QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
     m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
     QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
     QPixmap ccw1;
     m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
     QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
     QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
 
     rotbtngrp-> hide ( );
     rotbtngrp-> setExclusive ( true );
     rotbtngrp-> insert ( m_rotdir_cw );
     rotbtngrp-> insert ( m_rotdir_ccw );
     rotbtngrp-> insert ( m_rotdir_flip );
 
     ccw1. convertFromImage( ccwImage );
     m_rotdir_cw-> setPixmap( cw1 );
     m_rotdir_ccw-> setPixmap( ccw1 );
     m_rotdir_flip-> setPixmap( flip1 );
 
     rotLay-> addWidget ( rotlabel, 0 );
     rotLay-> addWidget ( m_rotdir_cw, 0 );
     rotLay-> addWidget ( m_rotdir_ccw, 0 );
     rotLay-> addWidget ( m_rotdir_flip, 0 );
 
     int rotDirection = cfg.readNumEntry( "rotatedir" );
     ODirection rot = CW;
 
     if (rotDirection == -1)
     {
         rot = ODevice::inst ( )-> direction ( );
     }
     else
     {
         rot = (ODirection)rotDirection;
     }
 
     m_rotdir_cw-> setChecked ( rot == CW );
     m_rotdir_ccw-> setChecked ( rot == CCW );
     m_rotdir_flip-> setChecked ( rot == Flip );
 
     return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
         : QDialog ( parent, name, true, WStyle_ContextHelp )
 {
     setCaption( tr( "Appearance Settings" ) );
 
     Config config( "qpe" );
     config.setGroup( "Appearance" );
 
     QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
 
     m_sample = new SampleWindow ( this );
 
     m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
     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", tr( "Style" ));
     tw-> addTab ( createFontTab ( tw, config ), "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 ), "SettingsIcon", tr( "Advanced" ) );
 
     top-> addWidget ( tw, 10 );
     top-> addWidget ( m_sample, 1 );
 
     tw-> setCurrentTab ( styletab );
     connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
 
     m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
 }
 
 Appearance::~Appearance()
 {}
 
 void Appearance::tabChanged ( QWidget *w )
 {
     if ( w == m_advtab )
     {
         m_sample-> hide ( );
         updateGeometry ( ); // shouldn't be necessary ...
     }
     else
         m_sample-> show ( );
 }
 
 void Appearance::accept ( )
 {
     bool newtabpos = m_tabstyle_top-> isChecked ( );
     int newtabstyle = m_tabstyle_list-> currentItem ( );
 
     Config config ( "qpe" );
     config. setGroup ( "Appearance" );
 
     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 )
     {
         config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
         config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
         config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
     }
 
 
     if ( m_color_changed )
     {
         ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
         if ( item )
             item-> save ( config );
     }
 
     ODirection rot;
     if (m_rotdir_ccw-> isChecked ( ))
     {
         rot = CCW;
     }
     else if (m_rotdir_cw-> isChecked ( ))
     {
         rot = CW;
     }
     else
     {
         rot = Flip;
     }
     config. writeEntry ( "rotatedir", (int)rot );
 
     m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
 
     QStringList sl;
     QString exceptstr;
     for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( ))
     {
         int fl = 0;
         fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
         fl |= ( it-> noFont ( ) ? 0x02 : 0 );
         fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
         exceptstr = QString::number ( fl, 32 );
         exceptstr.append( it-> pattern ( ));
         sl << exceptstr;
     }
     config. writeEntry ( "NoStyle", sl, ';' );
     config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
 
     config. write ( ); // need to flush the config info first
     Global::applyStyle ( );
 
     QDialog::accept ( );
 }
 
 void Appearance::done ( int r )
 {
     QDialog::done ( r );
     close ( );
 }
 
 
 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_style_changed |= ( index != m_original_style );
 }
 
 void Appearance::styleSettingsClicked ( )
 {
     StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
 
     if ( item && item-> hasSettings ( ))
     {
         QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
         QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
 
         QWidget *w = item-> settings ( d );
 
         if ( w )
         {
             vbox-> addWidget ( w );
 
             d-> setCaption ( w-> caption ( ));
 
             bool accepted = ( QPEApplication::execDialog ( d ) == QDialog::Accepted );
 
             if ( item-> setSettings ( accepted ))
                 m_style_changed = true;
         }
         delete d;
     }
 }
 
 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 ( ));
         else
             m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
         m_sample-> repaint ( );
     }
     m_deco_changed |= ( index != m_original_deco );
 }
 
 void Appearance::fontClicked ( const QFont &f )
 {
     m_font_changed |= ( f != m_sample-> font ( ));
     m_sample-> setFont ( f );
 }
 
 void Appearance::colorClicked ( int index )
 {
     ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
 
     if ( item )
         m_sample-> setPalette ( item-> palette ( ));
 
     m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
 }
 
 
 void Appearance::editSchemeClicked ( )
 {
     ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
     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++;
         }
     }
 
     EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
     if ( QPEApplication::execDialog( editdlg ) == 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;
 }
 
 
 void Appearance::saveSchemeClicked()
 {
     ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
     if ( !item )
         return;
 
     QDialog *d = new QDialog ( this, 0, true );
     d-> setCaption ( tr( "Save Scheme" ));
     QLineEdit *ed = new QLineEdit ( d );
     ( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
     ed-> setFocus ( );
 
     if ( d-> exec ( ) == QDialog::Accepted )
     {
         QString schemename = ed-> text ( );
         QString filestr = QPEApplication::qpeDir();
         filestr.append( "/etc/colors/" );
         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
         {
             QMessageBox::information ( this, tr( "Save scheme" ), tr( "Scheme does already exist." ));
         }
     }
     delete d;
 }
 
 void Appearance::deleteSchemeClicked()
 {
     ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
     if ( !item )
         return;
 
     if ( m_color_list-> currentItem ( ) > 0 )
     {
         if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
         {
             QString filestr = QPEApplication::qpeDir ( );
             filestr.append( "/etc/colors/" );
             filestr.append( item-> text ( ) );
             filestr.append( ".scheme" );
             QFile::remove ( filestr );
             delete item;
         }
     }
     else
     {
         QMessageBox::information( this, tr( "Delete scheme" ), tr( "Unable to delete current scheme." ));
     }
 }
 
 
 void Appearance::addExcept ( )
 {
     ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
     m_except-> ensureItemVisible ( it );
     m_except-> setSelected ( it, true );
 }
 
 void Appearance::delExcept ( )
 {
     if ( m_except-> selectedItem ( ))
     {
         m_except-> setFocus ( );
         delete m_except-> selectedItem ( );
     }
 }
 
 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 )
             : 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 ( ));
         setGeometry ( 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 * )
     {
         hide ( );
         if ( m_out )
             it-> setPattern ( text ( ));
         delete this;
     }
 
     virtual void keyPressEvent ( QKeyEvent *e )
     {
         if ( e-> key ( ) == Key_Return )
             it-> listView ( )-> setFocus ( );
         else if ( e-> key ( ) == Key_Escape )
         {
             m_out = false;
             it-> listView ( )-> setFocus ( );
         }
         else
             QLineEdit::keyPressEvent ( e );
     }
 
 private:
     ExceptListItem *it;
     bool m_out;
 };
 
 void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
 {
     if ( !item || c < 0 || c > 3 )
         return;
 
     ExceptListItem *it = (ExceptListItem *) item;
 
     if ( c == 0 )
         it-> setNoStyle ( !it-> noStyle ( ));
     else if ( c == 1 )
         it-> setNoFont ( !it-> noFont ( ));
     else if ( c == 2 )
         it-> setNoDeco ( !it-> noDeco ( ));
     else if ( c == 3 )
     {
         m_except-> ensureItemVisible ( it );
         new ExEdit ( it );
     }
 }
 
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 51e9636..f45f549 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -1,128 +1,132 @@
 /*
                              This file is part of the OPIE Project
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:       
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef APPEARANCESETTINGS_H
 #define APPEARANCESETTINGS_H
 
+#include <opie2/ofontselector.h>
+
 #include <qpe/fontdatabase.h>
 
 #include <qdialog.h>
 
+using Opie::OFontSelector;
+
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListBox;
 class QMultiLineEdit;
 class QPushButton;
 class QRadioButton;
 class QToolButton;
 class SampleWindow;
 class OFontSelector;
 class QListView;
 class QListViewItem;
 class Config;
 
 class Appearance : public QDialog
 {
     Q_OBJECT
 
 public:
     Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Appearance();
     static QString appName() { return QString::fromLatin1("appearance"); }
 
 protected:
 	virtual void accept ( );
 	virtual void done ( int r );
 	
 protected slots:
     void styleClicked ( int );
     void styleSettingsClicked ( );
     void decoClicked ( int );
     void fontClicked ( const QFont & );
     void colorClicked ( int );
 
     void editSchemeClicked();
     void saveSchemeClicked();
     void deleteSchemeClicked();
     
     void tabChanged ( QWidget * );
     
     void addExcept ( );
     void delExcept ( );
     void upExcept ( );
     void downExcept ( );
     void clickedExcept ( QListViewItem *, const QPoint &, int );
 
 private:
     void changeText();
 	
 	QWidget *createStyleTab ( QWidget *parent, Config &cfg );
 	QWidget *createDecoTab ( QWidget *parent, Config &cfg );
 	QWidget *createFontTab ( QWidget *parent, Config &cfg );
 	QWidget *createColorTab ( QWidget *parent, Config &cfg );
 	QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
 
 private:
     bool m_style_changed;
     bool m_font_changed;
     bool m_scheme_changed;
     bool m_deco_changed;
     bool m_color_changed;
 
     int  m_original_style;
     int  m_original_deco;
     int  m_original_tabstyle;
     bool m_original_tabpos;
     
     QListBox *    m_style_list;
     QPushButton * m_style_settings;
 
     QListBox *    m_deco_list;
 
     QListBox *    m_color_list;
 
 	OFontSelector *m_fontselect;
 
 	SampleWindow *m_sample;
     
     QComboBox *   m_tabstyle_list;
     QRadioButton *m_tabstyle_top;
     QRadioButton *m_tabstyle_bottom;
 
     QRadioButton *m_rotdir_cw;
     QRadioButton *m_rotdir_ccw;
     QRadioButton *m_rotdir_flip;
 
 	QWidget *     m_advtab;
     QListView *   m_except;
     QCheckBox *   m_force;
 };
 
 #endif
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index ca5a4ec..e2d73c2 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,12 +1,10 @@
 CONFIG    = qt warn_on release quick-app
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH  += ../$(OPIEDIR)/include
-LIBS            += -lqpe -lopie
-INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 
 TARGET 		= appearance
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index 7e5225f..0f3702f 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -1,75 +1,73 @@
 /*
                              This file is part of the OPIE Project
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "editScheme.h"
 
-#include <opie/ocolorbutton.h>
-
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags )
 	: QDialog ( parent, name, modal, WStyle_ContextHelp )
 {
 	setCaption ( tr( "Edit scheme" ) );
 	QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     m_count = cnt;
     m_buttons = new OColorButton * [cnt];
     m_colors = colors;
 
     for ( int i = 0; i < cnt; i++ )
     {
         QLabel *l = new QLabel ( labels [i], this );
         layout-> addWidget ( l, i, 0 );
 		QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
 
         m_buttons [i] = new OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
 		QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
     }
 }
 
 EditScheme::~EditScheme ( )
 {
 	delete [] m_buttons;
 }
 
 void EditScheme::accept ( )
 {
 	for ( int i = 0; i < m_count; i++ ) 
 		m_colors [i] = m_buttons [i]-> color ( );
 		
 	QDialog::accept ( );
 }
 
diff --git a/noncore/settings/appearance2/editScheme.h b/noncore/settings/appearance2/editScheme.h
index 93dc50d..c7539cb 100644
--- a/noncore/settings/appearance2/editScheme.h
+++ b/noncore/settings/appearance2/editScheme.h
@@ -1,53 +1,57 @@
 /*
                              This file is part of the OPIE Project
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:       
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef EDITSCHEME_H
 #define EDITSCHEME_H
 
+#include <opie2/ocolorbutton.h>
+
 #include <qdialog.h>
 
+using Opie::OColorButton;
+
 class QColor;
 class OColorButton;
 
 class EditScheme : public QDialog {
 	Q_OBJECT
 
 public:
 	EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	virtual ~EditScheme ( );
 
 protected slots:
 	virtual void accept ( );
 
 private:
 	int m_count;
 	QColor *m_colors;
 	OColorButton **m_buttons;
 };
 
 #endif