| -rw-r--r-- | noncore/settings/sysinfo/otabwidget.cpp | 78 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/otabwidget.h | 13 |
2 files changed, 61 insertions, 30 deletions
diff --git a/noncore/settings/sysinfo/otabwidget.cpp b/noncore/settings/sysinfo/otabwidget.cpp index 5154196..9fe6c4b 100644 --- a/noncore/settings/sysinfo/otabwidget.cpp +++ b/noncore/settings/sysinfo/otabwidget.cpp @@ -14,25 +14,24 @@ ** ** 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 ); @@ -74,24 +73,26 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name = 0x0, { tabBarStack->raiseWidget( tabBar ); } else if ( tabBarStyle == TextList || tabBarStyle == IconList ) { tabBarStack->raiseWidget( tabList ); } if ( tabBarPosition == Bottom ) { tabBar->setShape( QTabBar::RoundedBelow ); } + + currentTab= 0x0; } OTabWidget::~OTabWidget() { } void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label ) { QPixmap iconset = loadSmooth( icon ); // Add to tabBar QTab * tab = new QTab(); @@ -99,138 +100,165 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab { 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 ) ); + TabInfo *tabinfo = new TabInfo( tabid, child, icon, label ); + tabs.append( tabinfo ); + selectTab( tabinfo ); + +// setUpLayout(); +} - setUpLayout( FALSE ); +void OTabWidget::setCurrentTab( QWidget *childwidget ) +{ + TabInfo *newtab = tabs.first(); + while ( newtab && newtab->control() != childwidget ) + { + newtab = tabs.next(); + } + if ( newtab && newtab->control() == childwidget ) + { + selectTab( newtab ); + } +} + +void OTabWidget::setCurrentTab( QString tabname ) +{ + TabInfo *newtab = tabs.first(); + while ( newtab && newtab->label() != tabname ) + { + newtab = tabs.next(); + } + if ( newtab && newtab->label() == tabname ) + { + selectTab( newtab ); + } } OTabWidget::TabStyle OTabWidget::tabStyle() const { return tabBarStyle; } void OTabWidget::setTabStyle( TabStyle s ) { tabBarStyle = s; } OTabWidget::TabPosition OTabWidget::tabPosition() const { return tabBarPosition; } 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 ) + TabInfo *newtab = tabs.first(); + while ( newtab && newtab->id() != id ) + { + newtab = tabs.next(); + } + if ( newtab && newtab->id() == id ) { selectTab( newtab ); } } void OTabWidget::slotTabListSelected( int index ) { - TabInfoList::Iterator newtab = tabs.at( index ); - if ( newtab != tabs.end() ) + TabInfo *newtab = tabs.at( index ); + if ( newtab ) { 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 ) +void OTabWidget::selectTab( TabInfo *tab ) { if ( tabBarStyle == IconTab ) { - if ( currentTab != 0x0 ) + if ( currentTab ) { - tabBar->tab( (*currentTab).id() )->label = QString::null; + tabBar->tab( currentTab->id() )->setText( QString::null ); + setUpLayout(); } - tabBar->tab( (*tab).id() )->label = (*tab).label(); + tabBar->tab( tab->id() )->setText( tab->label() ); currentTab = tab; } - tabBar->layoutTabs(); + tabBar->setCurrentTab( tab->id() ); + setUpLayout(); tabBar->update(); - widgetStack->raiseWidget( (*tab).control() ); - - setUpLayout( FALSE ); + widgetStack->raiseWidget( tab->control() ); } -void OTabWidget::setUpLayout( bool onlyCheck ) +void OTabWidget::setUpLayout() { + tabBar->layoutTabs(); 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 ( !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 ); + setUpLayout(); } diff --git a/noncore/settings/sysinfo/otabwidget.h b/noncore/settings/sysinfo/otabwidget.h index 38f4d20..7450d51 100644 --- a/noncore/settings/sysinfo/otabwidget.h +++ b/noncore/settings/sysinfo/otabwidget.h @@ -12,83 +12,86 @@ ** 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 <qwidget.h> +#include <qlist.h> class QComboBox; class QPixmap; class QTabBar; class QWidgetStack; class TabInfo { public: 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 p; } private: int i; QWidget *c; QString p; QString l; }; -typedef QValueList<TabInfo> TabInfoList; +typedef QList<TabInfo> TabInfoList; class OTabWidget : public QWidget { Q_OBJECT public: 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 & ); + void setCurrentTab( QWidget * ); + void setCurrentTab( QString ); QSize sizeHint() const; protected: void resizeEvent( QResizeEvent * ); private: - TabInfoList tabs; - TabInfoList::Iterator currentTab; + TabInfoList tabs; + TabInfo *currentTab; TabStyle tabBarStyle; TabPosition tabBarPosition; QWidgetStack *tabBarStack; QTabBar *tabBar; QComboBox *tabList; QWidgetStack *widgetStack; QPixmap loadSmooth( const QString & ); - void selectTab( TabInfoList::Iterator ); - void setUpLayout( bool ); + void selectTab( TabInfo * ); + void setUpLayout(); private slots: void slotTabBarSelected( int ); void slotTabListSelected( int ); }; #endif |