| -rw-r--r-- | libopie/otabwidget.cpp | 90 |
1 files changed, 61 insertions, 29 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index 1fee919..bee3f35 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp @@ -47,6 +47,6 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi config.setGroup( "Appearance" ); - tabBarStyle = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab ); - if ( tabBarStyle <= Global || tabBarStyle > IconList) + s = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab ); + if ( s <= Global || s > IconList) { - tabBarStyle = IconTab; + s = IconTab; } @@ -55,3 +55,3 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi { - tabBarPosition = Bottom; + p = Bottom; } @@ -59,10 +59,5 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi { - tabBarPosition = Top; + p = Top; } } - else - { - tabBarStyle = s; - tabBarPosition = p; - } @@ -82,17 +77,5 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi - if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) - { - tabBarStack->raiseWidget( tabBar ); - } - else if ( tabBarStyle == TextList || tabBarStyle == IconList ) - { - tabBarStack->raiseWidget( tabList ); - } - - if ( tabBarPosition == Bottom ) - { - tabBar->setShape( QTabBar::RoundedBelow ); - } + setTabStyle( s ); + setTabPosition( p ); - //tabs.setAutoDelete( TRUE ); currentTab= 0x0; @@ -224,2 +207,41 @@ void OTabWidget::setTabStyle( TabStyle s ) tabBarStyle = s; + if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) + { + QTab *currtab; + for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) + { + currtab = tabBar->tab( tabinfo->id() ); + if ( tabBarStyle == IconTab ) + { + currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); + if ( tabinfo == currentTab ) + currtab->setText( tabinfo->label() ); + else + currtab->setText( QString::null ); + } + else + { + currtab->iconset = 0x0; + currtab->setText( tabinfo->label() ); + } + } + tabBarStack->raiseWidget( tabBar ); + } + else if ( tabBarStyle == TextList || tabBarStyle == IconList ) + { + tabList->clear(); + for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) + { + if ( tabBarStyle == IconList ) + { + tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() ); + } + else + { + tabList->insertItem( tabinfo->label() ); + } + } + tabBarStack->raiseWidget( tabList ); + } + setUpLayout(); } @@ -234,2 +256,11 @@ void OTabWidget::setTabPosition( TabPosition p ) tabBarPosition = p; + if ( tabBarPosition == Top ) + { + tabBar->setShape( QTabBar::RoundedAbove ); + } + else + { + tabBar->setShape( QTabBar::RoundedBelow ); + } + setUpLayout(); } @@ -272,3 +303,3 @@ void OTabWidget::selectTab( OTabInfo *tab ) { - tabBar->tab( currentTab->id() )->setText( "" ); + tabBar->tab( currentTab->id() )->setText( QString::null ); setUpLayout(); @@ -333,7 +364,8 @@ void OTabWidget::resizeEvent( QResizeEvent * ) -int OTabWidget::getCurrentTab() { +int OTabWidget::getCurrentTab() +{ if ( currentTab ) - { - return currentTab->id(); - } + { + return currentTab->id(); + } return -1; |