2 files changed, 60 insertions, 17 deletions

diff --git a/library/menubutton.cpp b/library/menubutton.cpp
index 007761f..4357460 100644
--- a/library/menubutton.cpp
+++ b/library/menubutton.cpp
@@ -58,24 +58,25 @@
 */
 
 
 /*!
   Constructs a MenuButton. A menu item is created (see insertItem()
   and insertItems()) for each string in the \a items string list. The
   standard \a parent an \a name arguments are passed to the base
   class.
 */
 MenuButton::MenuButton( const QStringList& items, QWidget* parent, const char* name) :
     QPushButton(parent,name)
 {
+    useLabel = true;
     init();
     insertItems(items);
 }
 
 /*!
   Constructs an empty MenuButton.
   The standard \a parent an \a name arguments are passed to the base class.
 
   \sa insertItem() insertItems()
 */
 MenuButton::MenuButton( QWidget* parent, const char* name) :
     QPushButton(parent,name)
@@ -89,101 +90,101 @@ void MenuButton::init()
     pop = new QPopupMenu(this);
     nitems=0;
     connect(pop, SIGNAL(activated(int)), this, SLOT(select(int)));
     setPopup(pop);
     //setPopupDelay(0);
 }
 
 /*!
   Removes all the menu items from the button and menu.
 */
 void MenuButton::clear()
 {
-    delete pop;
-    init();
+   delete pop;
+   init();
 }
 
 /*!
   A menu item is created (see insertItem()) for each string in the \a
   items string list. If any string is "--" a separator (see
   insertSeparator()) is inserted in its place.
 */
 void MenuButton::insertItems( const QStringList& items )
 {
     QStringList::ConstIterator it=items.begin();
     for (; it!=items.end(); ++it) {
-	if ( (*it) == "--" )
-	    insertSeparator();
-	else
-	    insertItem(*it);
+  if ( (*it) == "--" )
+      insertSeparator();
+  else
+      insertItem(*it);
     }
 }
 
 /*!
   Inserts a menu item with the icon \a icon and label \a text into
   the menu.
 
   \sa insertItems()
 */
 void MenuButton::insertItem( const QIconSet& icon, const QString& text )
 {
     pop->insertItem(icon, text, nitems++);
-    if ( nitems==1 ) select(0);
+//    if ( nitems==1 ) select(0);
 }
 
 /*!
   \overload
   Inserts a menu item with the label \a text into the menu.
 
   \sa insertItems()
 */
 void MenuButton::insertItem( const QString& text )
 {
     pop->insertItem(text, nitems++);
-    if ( nitems==1 ) select(0);
+//    if ( nitems==1 ) select(0);
 }
 
 /*!
   Inserts a separator into the menu.
 
   \sa insertItems()
 */
 void MenuButton::insertSeparator()
 {
     pop->insertSeparator();
 }
 
 /*!
   Selects the items with label text \a s.
 */
 void MenuButton::select(const QString& s)
 {
     for (int i=0; i<nitems; i++) {
-	if ( pop->text(i) == s ) {
-	    select(i);
-	    break;
-	}
+  if ( pop->text(i) == s ) {
+      select(i);
+      break;
+  }
     }
 }
 
 /*!
   \overload
   Selects the item at index position \a s.
 */
 void MenuButton::select(int s)
 {
     cur = s;
     updateLabel();
     if ( pop->iconSet(cur) )
-	setIconSet(*pop->iconSet(cur));
+  setIconSet(*pop->iconSet(cur));
     emit selected(cur);
     emit selected(currentText());
 }
 
 /*!
   Returns the index position of the current item.
 */
 int MenuButton::currentItem() const
 {
     return cur;
 }
 
@@ -199,18 +200,54 @@ QString MenuButton::currentText() const
   Sets the menubutton's label. If \a label is empty, the
   current item text is displayed, otherwise \a label should contain
   "%1", which will be replaced by the current item text.
 */
 void MenuButton::setLabel(const QString& label)
 {
     lab = label;
     updateLabel();
 }
 
 void MenuButton::updateLabel()
 {
-    QString t = pop->text(cur);
-    if ( !lab.isEmpty() )
-	t = lab.arg(t);
-    setText(t);
+    if(useLabel)
+      {
+          QString t = pop->text(cur);
+          if ( !lab.isEmpty() )
+              t = lab.arg(t);
+          setText(t);
+      }
 }
 
+
+/*!
+  remove item at id
+ */
+void MenuButton::remove(int id)
+{
+     pop->removeItem(id);
+     nitems--;
+}
+
+/*!
+  return count of items in menu
+ */
+int MenuButton::count()
+{
+     return nitems;
+}
+
+/*!
+  returns text of item id
+ */
+QString MenuButton::text(int id)
+{
+    return pop->text(id);
+}
+
+/*!
+  sets true or false the use of label
+ */
+void MenuButton::setUseLabel(bool b)
+{
+    useLabel = b;
+}
diff --git a/library/menubutton.h b/library/menubutton.h
index 6582b1e..ee5dcf1 100644
--- a/library/menubutton.h
+++ b/library/menubutton.h
@@ -22,42 +22,48 @@
 
 #include <qpushbutton.h>
 #include <qstringlist.h>
 
 class MenuButton : public QPushButton {
     Q_OBJECT
 public:
     MenuButton( QWidget* parent, const char* name=0);
     MenuButton( const QStringList& items, QWidget* parent, const char* name=0);
 
     void clear();
 
+    
     int currentItem() const;
     QString currentText() const;
 
     void insertItems( const QStringList& items );
     void insertItem( const QIconSet& icon, const QString& text=QString::null );
     void insertItem( const QString& text );
     void insertSeparator();
 
     void setLabel(const QString& label);
+    int count();
+    void remove(int id);
+    QString text(int id);
+    void setUseLabel(bool b);
 
 signals:
     void selected(int);
     void selected(const QString&);
 
 public slots:
     void select(int);
     void select(const QString&);
 
 private:
+    bool useLabel;
     void init();
     QStringList txts;
     QPopupMenu* pop;
     int nitems;
     int cur;
     QString lab;
     void updateLabel();
 };
 
 #endif