summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/otabwidget.cpp193
-rw-r--r--noncore/settings/sysinfo/otabwidget.h54
-rw-r--r--noncore/settings/sysinfo/sysinfo.cpp14
3 files changed, 234 insertions, 27 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
@@ -1,71 +1,236 @@
/**********************************************************************
** OTabWidget
**
** Modified tab widget control
**
** Copyright (C) 2002, Dan Williams
** williamsdr@acm.org
** http://draknor.net
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#include "otabwidget.h"
+#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 = 0x0,
+ TabStyle s = Global, TabPosition p = Top )
+ : QWidget( parent, name )
+{
+ 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 ) ) );
-OTabWidget::OTabWidget( QWidget *parent, const char *name )
- : QTabWidget( parent, name )
+ 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 )
{
- connect( this, SIGNAL( currentChanged( QWidget * ) ),
- this, SLOT( tabChangedSlot( QWidget * ) ) );
+ tabBarStack->raiseWidget( tabList );
+ }
+
+ if ( tabBarPosition == Bottom )
+ {
+ tabBar->setShape( QTabBar::RoundedBelow );
+ }
}
OTabWidget::~OTabWidget()
{
}
void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
{
- 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::tabChangedSlot( QWidget *child )
+void OTabWidget::setTabStyle( TabStyle s )
{
- TabInfoList::Iterator it;
+ tabBarStyle = s;
+}
+
+OTabWidget::TabPosition OTabWidget::tabPosition() const
+{
+ return tabBarPosition;
+}
- if ( CurrentTab != 0x0 )
+void OTabWidget::setTabPosition( TabPosition p )
{
- changeTab( (*CurrentTab).control(), loadSmooth( (*CurrentTab).icon() ), QString::null );
+ tabBarPosition = p;
}
- for ( it = Tabs.begin(); it != Tabs.end(); ++it )
+void OTabWidget::slotTabBarSelected( int id )
{
- if ( (*it).control() == child )
+
+ TabInfoList::Iterator newtab = tabs.begin();
+ while ( newtab != tabs.end() && (*newtab).id() != id )
+ newtab++;
+ if ( (*newtab).id() == id )
{
- CurrentTab = it;
- changeTab( (*CurrentTab).control(), loadSmooth( (*CurrentTab).icon() ), (*CurrentTab).label() );
+ selectTab( newtab );
+ }
}
+
+void OTabWidget::slotTabListSelected( int index )
+{
+ TabInfoList::Iterator newtab = tabs.at( index );
+ if ( newtab != tabs.end() )
+ {
+ selectTab( newtab );
}
}
QPixmap OTabWidget::loadSmooth( const QString &name )
{
QImage image = Resource::loadImage( name );
QPixmap pixmap;
pixmap.convertFromImage( image.smoothScale( 16, 16 ) );
return pixmap;
}
+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
@@ -1,62 +1,94 @@
/**********************************************************************
** OTabWidget
**
** Modified tab widget control
**
** Copyright (C) 2002, Dan Williams
** williamsdr@acm.org
** http://draknor.net
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#ifndef OTABWIDGET_H
#define OTABWIDGET_H
-#include <qtabwidget.h>
+#include <qwidget.h>
+
+class QComboBox;
+class QPixmap;
+class QTabBar;
+class QWidgetStack;
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;
};
typedef QValueList<TabInfo> TabInfoList;
-class OTabWidget : public QTabWidget
+class OTabWidget : public QWidget
{
Q_OBJECT
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();
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 );
};
#endif
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
@@ -1,55 +1,65 @@
/**********************************************************************
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "memory.h"
#include "load.h"
#include "storage.h"
#include "processinfo.h"
#include "modulesinfo.h"
#include "versioninfo.h"
#include "sysinfo.h"
#include "otabwidget.h"
+#include <qpe/config.h>
#include <qpe/resource.h>
#include <qlayout.h>
SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f )
: QWidget( parent, name, f )
{
setIcon( Resource::loadPixmap( "system_icon" ) );
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 );
tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon.png", tr("Memory") );
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
tab->addTab( new StorageInfo( tab ), "sysinfo/storagetabicon.png", tr("Storage") );
#endif
tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon.png", tr("CPU") );
+ 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 );
}