making otabwidget more simular to qtabwidget - drw

2 files changed, 49 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
@@ -91,12 +91,13 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
 
     if ( tabBarPosition == Bottom )
     {
         tabBar->setShape( QTabBar::RoundedBelow );
     }
 
+    tabs.setAutoDelete( TRUE );
     currentTab= 0x0;
 }
 
 OTabWidget::~OTabWidget()
 {
 }
@@ -134,12 +135,41 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
 
     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();
@@ -227,12 +257,14 @@ void OTabWidget::selectTab( OTabInfo *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() );
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index bacda07..d61fe9e 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -115,12 +115,20 @@ public:
  * @param icon Path to icon.
  * @param label Text label.
  */
     void addTab( QWidget *, const QString &, const QString & );
 
 /**
+ * @fn removePage( QWidget *widget )
+ * @brief Remove widget from control.  Does not delete widget.
+ *
+ * @param widget Widget control to be removed.
+ */
+    void removePage( QWidget * );
+
+/**
  * @fn tabStyle()
  * @brief Returns current widget selection control style.
  */
     TabStyle tabStyle() const;
 
 /**
@@ -208,12 +216,21 @@ private:
 /**
  * @fn setUpLayout()
  * @brief Internal function to adjust layout.
  */
     void    setUpLayout();
 
+signals:
+/**
+ * @fn currentChanegd( QWidget *widget )
+ * @brief This signal is emitted whenever the widget has changed.
+ *
+ * @param widget Pointer to new current widget.
+ */
+    void currentChanged( QWidget * );
+
 private slots:
 
 /**
  * @fn slotTabBarSelected( int id )
  * @brief Slot which is called when a tab is selected.
  *