summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp90
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
@@ -46,24 +46,19 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
Config config( "qpe" );
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;
}
QString pos = config.readEntry( "TabPosition", "Top");
if ( pos == "Bottom" )
{
- tabBarPosition = Bottom;
+ p = Bottom;
}
else
{
- tabBarPosition = Top;
+ p = Top;
}
}
- else
- {
- tabBarStyle = s;
- tabBarPosition = p;
- }
widgetStack = new QWidgetStack( this, "widgetstack" );
@@ -81,19 +76,7 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
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 );
- }
+ setTabStyle( s );
+ setTabPosition( p );
- //tabs.setAutoDelete( TRUE );
currentTab= 0x0;
}
@@ -223,4 +206,43 @@ 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();
}
@@ -233,4 +255,13 @@ void OTabWidget::setTabPosition( TabPosition p )
{
tabBarPosition = p;
+ if ( tabBarPosition == Top )
+ {
+ tabBar->setShape( QTabBar::RoundedAbove );
+ }
+ else
+ {
+ tabBar->setShape( QTabBar::RoundedBelow );
+ }
+ setUpLayout();
}
@@ -271,5 +302,5 @@ void OTabWidget::selectTab( OTabInfo *tab )
if ( currentTab )
{
- tabBar->tab( currentTab->id() )->setText( "" );
+ tabBar->tab( currentTab->id() )->setText( QString::null );
setUpLayout();
}
@@ -332,9 +363,10 @@ void OTabWidget::resizeEvent( QResizeEvent * )
}
-int OTabWidget::getCurrentTab() {
+int OTabWidget::getCurrentTab()
+{
if ( currentTab )
- {
- return currentTab->id();
- }
+ {
+ return currentTab->id();
+ }
return -1;
}