1 files changed, 39 insertions, 2 deletions

diff --git a/library/menubutton.cpp b/library/menubutton.cpp
index 007761f..4357460 100644
--- a/library/menubutton.cpp
+++ b/library/menubutton.cpp
@@ -54,32 +54,33 @@
 /*!
   \fn void MenuButton::selected(const QString& text)
 
   This signal is emitted when the item with the label \a text is selected.
 */
 
 
 /*!
   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)
 {
     init();
 }
 
@@ -114,45 +115,45 @@ void MenuButton::insertItems( const QStringList& items )
 	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)
@@ -195,22 +196,58 @@ QString MenuButton::currentText() const
     return pop->text(cur);
 }
 
 /*!
   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()
 {
+    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;
+}