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
@@ -65,107 +65,137 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
         tabBarStyle = s;
         tabBarPosition = p;
     }
 
     widgetStack = new QWidgetStack( this, "widgetstack" );
     widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
     widgetStack->setLineWidth( style().defaultFrameWidth() );
 
     tabBarStack = new QWidgetStack( this, "tabbarstack" );
 
     tabBar = new OTabBar( tabBarStack, "tabbar" );
     tabBarStack->addWidget( tabBar, 0 );
     connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
 
     tabList = new QComboBox( false, tabBarStack, "tablist" );
     tabBarStack->addWidget( tabList, 1 );
     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 );
     }
 
+    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();
     if ( tabBarStyle == IconTab )
     {
         tab->label = QString::null;
     }
     else
     {
         tab->label = label;
     }
     if ( tabBarStyle == IconTab || tabBarStyle == IconList)
     {
         tab->iconset = new QIconSet( iconset );
     }
     int tabid = tabBar->addTab( tab );
 
     if ( tabBarStyle == IconTab || tabBarStyle == IconList )
     {
         tabList->insertItem( iconset, label, -1 );
     }
     else
     {
         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 );
     }
 }
 
 void OTabWidget::setCurrentTab( const QString &tabname )
 {
     OTabInfo *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 )
@@ -201,64 +231,66 @@ void OTabWidget::slotTabListSelected( int index )
     OTabInfo *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( OTabInfo *tab )
 {
     if ( tabBarStyle == IconTab )
     {
         if ( currentTab )
         {
             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() );
         widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) );
     }
     else
     {
         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 ( 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 * )
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index bacda07..d61fe9e 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -89,64 +89,72 @@ public:
 
 /**
  * @fn OTabWidget( QWidget *parent = 0, const char *name = 0, TabStyle s = Global, TabPosition p = Top )
  * @brief Object constructor.
  *
  * @param parent Pointer to parent of this control.
  * @param name Name of control.
  * @param s Style of widget selection control.
  * @param p Position of the widget selection control.
  *
  * Constructs a new OTabWidget control with parent and name.  The style and position parameters
  * determine how the widget selection control will be displayed.
  */
     OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top );
 
 /**
  * @fn ~OTabWidget()
  * @brief Object destructor.
  */
     ~OTabWidget();
 
 /**
  * @fn addTab( QWidget *child, const QString &icon, const QString &label )
  * @brief Add new widget to control.
  *
  * @param child Widget control.
  * @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;
 
 /**
  * @fn setTabStyle( TabStyle s )
  * @brief Set the current widget selection control style.
  *
  * @param s New style to be used.
  */
     void setTabStyle( TabStyle );
 
 /**
  * @fn tabPosition()
  * @brief Returns current widget selection control position.
  */
     TabPosition tabPosition() const;
 
 /**
  * @fn setTabPosition( TabPosition p )
  * @brief Set the current widget selection control position.
  *
  * @param p New position of widget selection control.
  */
     void setTabPosition( TabPosition );
 
 /**
  * @fn setCurrentTab( QWidget *childwidget )
  * @brief Selects and brings to top the desired widget by using widget pointer.
  *
  * @param childwidget Widget to select.
@@ -182,52 +190,61 @@ private:
 
     TabStyle    tabBarStyle;
     TabPosition tabBarPosition;
 
     QWidgetStack *tabBarStack;
     OTabBar      *tabBar;
     QComboBox    *tabList;
 
     QWidgetStack *widgetStack;
 
 /**
  * @fn loadSmooth( const QString &name )
  * @brief Loads icon for widget.
  *
  * @param name Name of icon image file.
  */
     QPixmap loadSmooth( const QString & );
 
 /**
  * @fn selectTab( OTabInfo *tab )
  * @brief Internal function to select desired widget.
  *
  * @param tab Pointer to data for widget.
  */
     void    selectTab( OTabInfo * );
 
 /**
  * @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.
  *
  * @param id ID of widget selected.
  */
     void slotTabBarSelected( int );
 
 /**
  * @fn slotTabListSelected( int index )
  * @brief Slot which is called when a drop down selection is made.
  *
  * @param id Index of widget selected.
  */
     void slotTabListSelected( int );
 };
 
 #endif