making otabwidget more simular to qtabwidget - drw

1 files changed, 32 insertions, 0 deletions

diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index d5b963b..1f3fbb0 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -85,24 +85,25 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
         tabBarStack->raiseWidget( tabBar );
     }
     else if ( tabBarStyle == TextList || tabBarStyle == IconList )
     {
         tabBarStack->raiseWidget( tabList );
     }
 
     if ( tabBarPosition == Bottom )
     {
         tabBar->setShape( QTabBar::RoundedBelow );
     }
 
+    tabs.setAutoDelete( TRUE );
     currentTab= 0x0;
 }
 
 OTabWidget::~OTabWidget()
 {
 }
 
 void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
 {
     QPixmap iconset = loadSmooth( icon );
 
     QTab * tab = new QTab();
@@ -128,24 +129,53 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
     {
         tabList->insertItem( label );
     }
 
     widgetStack->addWidget( child, tabid );
     widgetStack->raiseWidget( child );
 
     OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label );
     tabs.append( tabinfo );
     selectTab( tabinfo );
 }
 
+void OTabWidget::removePage( QWidget *childwidget )
+{
+    if ( childwidget )
+    {
+        OTabInfo *tab = tabs.first();
+        while ( tab && tab->control() != childwidget )
+        {
+            tab = tabs.next();
+        }
+        if ( tab && tab->control() == childwidget )
+        {
+            tabBar->setTabEnabled( tab->id(), FALSE );
+            tabBar->removeTab( tabBar->tab( tab->id() ) );
+            int i = 0;
+            while ( i < tabList->count() && tabList->text( i ) != tab->label() )
+            {
+                i++;
+            }
+            if ( tabList->text( i ) == tab->label() )
+            {
+                tabList->removeItem( i );
+            }
+            widgetStack->removeWidget( childwidget );
+            tabs.remove( tab );
+            setUpLayout();
+        }
+    }
+}
+
 void OTabWidget::setCurrentTab( QWidget *childwidget )
 {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->control() != childwidget )
     {
         newtab = tabs.next();
     }
     if ( newtab && newtab->control() == childwidget )
     {
         selectTab( newtab );
     }
 }
@@ -221,24 +251,26 @@ void OTabWidget::selectTab( OTabInfo *tab )
         {
             tabBar->tab( currentTab->id() )->setText( QString::null );
             setUpLayout();
         }
         tabBar->tab( tab->id() )->setText( tab->label() );
         currentTab = tab;
     }
     tabBar->setCurrentTab( tab->id() );
     setUpLayout();
     tabBar->update();
 
     widgetStack->raiseWidget( tab->control() );
+
+    emit currentChanged( tab->control() );
 }
 
 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() );