[uim-commit] r578 - trunk/qt

[kzk at freedesktop.org]

Author: kzk
Date: 2005-02-06 11:33:48 -0800 (Sun, 06 Feb 2005)
New Revision: 578

Modified:
   trunk/qt/toolbar-common-uimstateindicator.cpp
Log:
* qt/toolbar-common-uimstateindicator.cpp
  - (propListUpdate): handle popup menu correctly.
    This is reported by UTUMI-san. Thank you!


Modified: trunk/qt/toolbar-common-uimstateindicator.cpp
===================================================================
--- trunk/qt/toolbar-common-uimstateindicator.cpp	2005-02-06 18:57:48 UTC (rev 577)
+++ trunk/qt/toolbar-common-uimstateindicator.cpp	2005-02-06 19:33:48 UTC (rev 578)
@@ -105,7 +105,6 @@
     if ( !buttons.isEmpty() )
         buttons.clear();
 
-    QHelperToolbarButton *button = NULL;
     QHelperPopupMenu *popupMenu = NULL;
 
     QStringList::ConstIterator it = lines.begin();
@@ -124,15 +123,15 @@
                     fallbackButton = NULL;
                 }
                 // create popup
-                popupMenu = new QHelperPopupMenu( button );
+                popupMenu = new QHelperPopupMenu( 0 );
                 popupMenu->setCheckable( true );
 
                 // create button
-                button = new QHelperToolbarButton( this );
+                QHelperToolbarButton *button = new QHelperToolbarButton( this );
                 button->setText( fields[ 1 ] );
                 QToolTip::add( button, fields[ 2 ] );
                 button->setPopup( popupMenu );
-                button->setPopupDelay( 1 );
+                button->setPopupDelay( 50 );
                 button->show();
 
                 buttons.append( button );
@@ -220,7 +219,7 @@
 /**/
 
 QHelperPopupMenu::QHelperPopupMenu( QWidget *parent, const char *name )
-        : QPopupMenu( parent, name )
+    : QPopupMenu( parent, name )
 {
     msgDict.setAutoDelete( true );
     msgDict.clear();