3 files changed, 239 insertions, 32 deletions

diff --git a/noncore/settings/sysinfo/otabwidget.cpp b/noncore/settings/sysinfo/otabwidget.cpp
index 5d5b3e6..5154196 100644
--- a/noncore/settings/sysinfo/otabwidget.cpp
+++ b/noncore/settings/sysinfo/otabwidget.cpp
@@ -21,13 +21,66 @@
 
+#include <qpe/config.h>
 #include <qpe/resource.h>
 
+#include <qcombobox.h>
 #include <qlist.h>
 #include <qtabbar.h>
+#include <qwidgetstack.h>
 
-
-OTabWidget::OTabWidget( QWidget *parent, const char *name )
-    : QTabWidget( parent, name )
+OTabWidget::OTabWidget( QWidget *parent, const char *name = 0x0,
+                        TabStyle s = Global, TabPosition p = Top )
+    : QWidget( parent, name )
 {
-    connect( this, SIGNAL( currentChanged( QWidget * ) ),
-             this, SLOT( tabChangedSlot( QWidget * ) ) );
+    if ( s == Global )
+    {
+        Config config( "qpe" );
+        config.setGroup( "Appearance" );
+        tabBarStyle = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
+        if ( tabBarStyle <= Global || tabBarStyle > IconList)
+        {
+            tabBarStyle = IconTab;
+        }
+        QString pos = config.readEntry( "TabPosition", "Top");
+        if ( pos == "Top" )
+        {
+            tabBarPosition = Top;
+        }
+        else
+        {
+            tabBarPosition = Bottom;
+        }
+    }
+    else
+    {
+        tabBarStyle = s;
+        tabBarPosition = p;
+    }
+
+    widgetStack = new QWidgetStack( this, "widgetstack" );
+    widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
+    widgetStack->setLineWidth( style().defaultFrameWidth() );
+
+    tabBarStack = new QWidgetStack( this, "tabbarstack" );
+
+    tabBar = new QTabBar( tabBarStack, "tabbar" );
+    tabBarStack->addWidget( tabBar, 0 );
+    connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
+
+    tabList = new QComboBox( false, tabBarStack, "tablist" );
+    tabBarStack->addWidget( tabList, 1 );
+    connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
+
+    if ( tabBarStyle == TextTab || tabBarStyle == IconTab )
+    {
+        tabBarStack->raiseWidget( tabBar );
+    }
+    else if ( tabBarStyle == TextList || tabBarStyle == IconList )
+    {
+        tabBarStack->raiseWidget( tabList );
+    }
+
+    if ( tabBarPosition == Bottom )
+    {
+        tabBar->setShape( QTabBar::RoundedBelow );
+    }
 }
@@ -40,22 +93,81 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
 {
-    Tabs.append( TabInfo( child, icon, label ) );
-    QTabWidget::addTab( child, loadSmooth( icon ), QString::null );
+    QPixmap iconset = loadSmooth( icon );
+
+    // Add to tabBar
+    QTab * tab = new QTab();
+    if ( tabBarStyle == IconTab )
+    {
+        tab->label = QString::null;
+    }
+    else
+    {
+        tab->label = label;
+    }
+    if ( tabBarStyle == IconTab || tabBarStyle == IconList)
+    {
+        tab->iconset = new QIconSet( iconset );
+    }
+    int tabid = tabBar->addTab( tab );
+    tabBar->setCurrentTab( tab );
+
+    // Add to tabList
+
+    if ( tabBarStyle == IconTab || tabBarStyle == IconList )
+    {
+        tabList->insertItem( iconset, label, -1 );
+    }
+    else
+    {
+        tabList->insertItem( label );
+    }
+    tabList->setCurrentItem( tabList->count()-1 );
+
+    // Add child to widget list
+    widgetStack->addWidget( child, tabid );
+    widgetStack->raiseWidget( child );
+
+    // Save tab information
+    tabs.append( TabInfo( tabid, child, icon, label ) );
+
+    setUpLayout( FALSE );
+}
+
+OTabWidget::TabStyle OTabWidget::tabStyle() const
+{
+    return tabBarStyle;
+}
+
+void OTabWidget::setTabStyle( TabStyle s )
+{
+    tabBarStyle = s;
 }
 
-void OTabWidget::tabChangedSlot( QWidget *child )
+OTabWidget::TabPosition OTabWidget::tabPosition() const
 {
-    TabInfoList::Iterator it;
+    return tabBarPosition;
+}
 
-    if ( CurrentTab != 0x0 )
+void OTabWidget::setTabPosition( TabPosition p )
+{
+    tabBarPosition = p;
+}
+
+void OTabWidget::slotTabBarSelected( int id )
+{
+
+    TabInfoList::Iterator newtab = tabs.begin();
+    while ( newtab != tabs.end() && (*newtab).id() != id )
+        newtab++;
+    if ( (*newtab).id() == id )
     {
-        changeTab( (*CurrentTab).control(), loadSmooth( (*CurrentTab).icon() ), QString::null );
+        selectTab( newtab );
     }
+}
 
-    for ( it = Tabs.begin(); it != Tabs.end(); ++it )
+void OTabWidget::slotTabListSelected( int index )
+{
+    TabInfoList::Iterator newtab = tabs.at( index );
+    if ( newtab != tabs.end() )
     {
-        if ( (*it).control() == child )
-        {
-            CurrentTab = it;
-            changeTab( (*CurrentTab).control(), loadSmooth( (*CurrentTab).icon() ), (*CurrentTab).label() );
-        }
+        selectTab( newtab );
     }
@@ -71 +183,54 @@ QPixmap OTabWidget::loadSmooth( const QString &name )
 
+void OTabWidget::selectTab( TabInfoList::Iterator tab )
+{
+    if ( tabBarStyle == IconTab )
+    {
+        if ( currentTab != 0x0 )
+        {
+            tabBar->tab( (*currentTab).id() )->label = QString::null;
+        }
+        tabBar->tab( (*tab).id() )->label = (*tab).label();
+        currentTab = tab;
+    }
+    tabBar->layoutTabs();
+    tabBar->update();
+
+    widgetStack->raiseWidget( (*tab).control() );
+
+    setUpLayout( FALSE );
+}
+
+void OTabWidget::setUpLayout( bool onlyCheck )
+{
+    QSize t( tabBarStack->sizeHint() );
+    if ( t.width() > width() )
+        t.setWidth( width() );
+    int lw = widgetStack->lineWidth();
+    if ( tabBarPosition == Bottom )
+    {
+        tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() );
+        widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) );
+    }
+    else
+    { // Top
+        tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() );
+        widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2));
+    }
+
+    if ( !onlyCheck )
+        update();
+    if ( autoMask() )
+        updateMask();
+}
+
+QSize OTabWidget::sizeHint() const
+{
+    QSize s( widgetStack->sizeHint() );
+    QSize t( tabBarStack->sizeHint() );
+    return QSize( QMAX( s.width(), t.width()), s.height() + t.height() );
+}
+
+void OTabWidget::resizeEvent( QResizeEvent * )
+{
+    setUpLayout( FALSE );
+}
diff --git a/noncore/settings/sysinfo/otabwidget.h b/noncore/settings/sysinfo/otabwidget.h
index 4588cb9..38f4d20 100644
--- a/noncore/settings/sysinfo/otabwidget.h
+++ b/noncore/settings/sysinfo/otabwidget.h
@@ -22,3 +22,8 @@
 
-#include <qtabwidget.h>
+#include <qwidget.h>
+
+class QComboBox;
+class QPixmap;
+class QTabBar;
+class QWidgetStack;
 
@@ -27,12 +32,14 @@ class TabInfo
 public:
-    TabInfo() : c( 0 ), i( 0 ), l( QString::null ) {}
-    TabInfo( QWidget *control, const QString &icon, const QString &label )
-        : c( control ), i( icon ), l( label ) {}
+    TabInfo() : i( -1 ), c( 0 ), p( 0 ), l( QString::null ) {}
+    TabInfo( int id, QWidget *control, const QString &icon, const QString &label )
+        : i( id ), c( control ), p( icon ), l( label ) {}
+    int      id()      const { return i; }
     QString  label()   const { return l; }
     QWidget *control() const { return c; }
-    QString  icon()    const { return i; }
+    QString  icon()    const { return p; }
 
 private:
+    int      i;
     QWidget *c;
-    QString  i;
+    QString  p;
     QString  l;
@@ -42,3 +49,3 @@ typedef QValueList<TabInfo> TabInfoList;
 
-class OTabWidget : public QTabWidget
+class OTabWidget : public QWidget
 {
@@ -46,3 +53,11 @@ class OTabWidget : public QTabWidget
 public:
-    OTabWidget( QWidget *, const char * );
+    enum TabStyle { Global, TextTab, IconTab, TextList, IconList };
+    TabStyle tabStyle() const;
+    void setTabStyle( TabStyle );
+
+    enum TabPosition { Top, Bottom };
+    TabPosition tabPosition() const;
+    void setTabPosition( TabPosition );
+
+    OTabWidget( QWidget *, const char *, TabStyle, TabPosition );
     ~OTabWidget();
@@ -50,11 +65,28 @@ public:
     void addTab( QWidget *, const QString &, const QString & );
+    QSize sizeHint() const;
+
+
+protected:
+    void resizeEvent( QResizeEvent * );
 
 private:
-    TabInfoList Tabs;
-    TabInfoList::Iterator CurrentTab;
+    TabInfoList tabs;
+    TabInfoList::Iterator currentTab;
+
+    TabStyle    tabBarStyle;
+    TabPosition tabBarPosition;
+
+    QWidgetStack *tabBarStack;
+    QTabBar      *tabBar;
+    QComboBox    *tabList;
+
+    QWidgetStack *widgetStack;
 
     QPixmap loadSmooth( const QString & );
+    void    selectTab( TabInfoList::Iterator );
+    void    setUpLayout( bool );
 
 private slots:
-    void tabChangedSlot( QWidget * );
+    void slotTabBarSelected( int );
+    void slotTabListSelected( int );
 };
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index 56ac488..ca08ae2 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -30,2 +30,3 @@
 
+#include <qpe/config.h>
 #include <qpe/resource.h>
@@ -39,4 +40,11 @@ SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f )
     setCaption( tr("System Info") );
+
+    resize( 220, 180 );
+
+    Config config( "qpe" );
+    config.setGroup( "Appearance" );
+    bool advanced = config.readBoolEntry( "Advanced", TRUE );
+
     QVBoxLayout *lay = new QVBoxLayout( this );
-    OTabWidget *tab = new OTabWidget( this, "tabwidget" );
+    OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     lay->addWidget( tab );
@@ -47,7 +55,9 @@ SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f )
     tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon.png", tr("CPU") );
-    tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon.png", tr("Process") );
-    tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon.png", tr("Modules") );
+    if ( advanced )
+    {
+        tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon.png", tr("Process") );
+        tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon.png", tr("Modules") );
+    }
     tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon.png", tr("Version") );
 
-    resize( 220, 180 );
 }