3 files changed, 68 insertions, 6 deletions

diff --git a/libopie/otabinfo.h b/libopie/otabinfo.h
index 8dbbcc2..6589638 100644
--- a/libopie/otabinfo.h
+++ b/libopie/otabinfo.h
@@ -84,27 +84,43 @@ public:
 
 /**
  * @fn label()
  * @brief Returns text label for widget.
  */
     const QString &label()   const { return l; }
 
 /**
+ * @fn setLabel( const QString &label )
+ * @brief Set label for tab.
+ *
+ * @param label QString text label for OTabWidget selection control.
+ */
+    void setLabel( const QString &label ) { l = label; }
+
+/**
  * @fn control()
  * @brief Returns pointer to widget.
  */
     QWidget       *control() const { return c; }
 
 /**
  * @fn icon()
  * @brief Returns name of icon file.
  */
     const QString &icon()    const { return p; }
 
+/**
+ * @fn setIcon( const QString &icon )
+ * @brief Set icon for tab.
+ *
+ * @param icon QString name of icon file.
+ */
+    void setIcon( const QString &icon ) { p = icon; }
+
 private:
     int      i;
     QWidget *c;
     QString  p;
     QString  l;
 };
 
 /**
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index bee3f35..99bf067 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -93,17 +93,17 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
     if ( tabBarStyle == IconTab )
     {
         tab->label = QString::null;
     }
     else
     {
         tab->label = label;
     }
-    if ( tabBarStyle == IconTab || tabBarStyle == IconList)
+    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 );
@@ -153,26 +153,62 @@ void OTabWidget::removePage( QWidget *childwidget )
                 widgetStack->setFrameStyle( QFrame::NoFrame );
             }
 
             setUpLayout();
         }
     }
 }
 
+void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label)
+{
+    OTabInfo *currtab = tabs.first();
+    while ( currtab && currtab->control() != widget )
+    {
+        currtab = tabs.next();
+    }
+    if ( currtab && currtab->control() == widget )
+    {
+        QTab *tab = tabBar->tab( currtab->id() );
+        QPixmap icon( loadSmooth( iconset ) );
+        tab->setText( label );
+        if ( tabBarStyle == IconTab )
+            tab->setIconSet( icon );
+        int i = 0;
+        while ( i < tabList->count() && tabList->text( i ) != currtab->label() )
+        {
+            i++;
+        }
+        if ( i < tabList->count() && tabList->text( i ) == currtab->label() )
+        {
+            if ( tabBarStyle == IconTab || tabBarStyle == IconList )
+            {
+                tabList->changeItem( icon, label, i );
+            }
+            else
+            {
+                tabList->changeItem( label, i );
+            }
+        }
+        currtab->setLabel( label );
+        currtab->setIcon( iconset );
+    }
+    setUpLayout();
+}
+
 void OTabWidget::setCurrentTab( QWidget *childwidget )
 {
-    OTabInfo *newtab = tabs.first();
-    while ( newtab && newtab->control() != childwidget )
+    OTabInfo *currtab = tabs.first();
+    while ( currtab && currtab->control() != childwidget )
     {
-        newtab = tabs.next();
+        currtab = tabs.next();
     }
-    if ( newtab && newtab->control() == childwidget )
+    if ( currtab && currtab->control() == childwidget )
     {
-        selectTab( newtab );
+        selectTab( currtab );
     }
 }
 
 void OTabWidget::setCurrentTab( const QString &tabname )
 {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->label() != tabname )
     {
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 74d683b..0aa9bb8 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -121,16 +121,26 @@ public:
  * @fn removePage( QWidget *widget )
  * @brief Remove widget from control.  Does not delete widget.
  *
  * @param widget Widget control to be removed.
  */
     void removePage( QWidget * );
 
 /**
+ * @fn changeTab( QWidget *widget, const QIconSet &icon, const QString &label )
+ * @brief Change text and/or icon for existing tab
+ *
+ * @param child Widget control.
+ * @param icon Path to icon.
+ * @param label Text label.
+ */
+    void changeTab( QWidget *, const QString &, const QString & );
+
+/**
  * @fn tabStyle()
  * @brief Returns current widget selection control style.
  */
     TabStyle tabStyle() const;
 
 /**
  * @fn setTabStyle( TabStyle s )
  * @brief Set the current widget selection control style.