[uim-commit] r496 - trunk/qt

[kzk at freedesktop.org]

Author: kzk
Date: 2005-02-02 16:40:58 -0800 (Wed, 02 Feb 2005)
New Revision: 496

Modified:
   trunk/qt/pref-qt.cpp
   trunk/qt/pref-qt.h
Log:
* qt/pref-qt.h
* qt/pref-qt.cpp
  - simplify the code for default QVGroupBox handling
  - addCustomTypeKey is broken in some readon.
    I don't know why... So, commented out.


Modified: trunk/qt/pref-qt.cpp
===================================================================
--- trunk/qt/pref-qt.cpp	2005-02-03 00:38:11 UTC (rev 495)
+++ trunk/qt/pref-qt.cpp	2005-02-03 00:40:58 UTC (rev 496)
@@ -293,6 +293,9 @@
     KSeparator *separator = new KSeparator( this );
     vLayout->addWidget( separator );
 
+    /* default QVGroupBox */
+    QVGroupBox *defaultGroupVBox = new QVGroupBox( this );
+
     /* subgroup data */
     SubgroupData *sd = new SubgroupData( this, group_name );
 
@@ -303,8 +306,18 @@
         for( char **custom_sym = custom_syms; *custom_sym; custom_sym++ )
         {
             QVGroupBox *vbox = sd->searchGroupVBoxByCustomSym( *custom_sym );
+            if( vbox == NULL )
+            {
+                /* 2004-02-02 Kazuki Ohta <mover at hct.zaq.ne.jp>
+                 *
+                 * If no QVGroup box is found, let's use DefaultVBox!
+                 */
+                vbox = defaultGroupVBox;
+            }
+            
             UimCustomItemIface *iface = addCustom( vbox, *custom_sym );
-            m_customIfaceList.append( iface );
+            if( iface )
+                m_customIfaceList.append( iface );
         }
 
         uim_custom_symbol_list_free( custom_syms );
@@ -315,10 +328,9 @@
      * This is very adhoc hack!!
      * if "main" subgroup's gvbox dosn't have child, hides it!
      */
-    QVGroupBox *mainSubgroupGroupVBox = sd->getMainSubgroupGroupVBox();
-    if( mainSubgroupGroupVBox && !mainSubgroupGroupVBox->children()->isEmpty() )
+    if( defaultGroupVBox && !defaultGroupVBox->children()->isEmpty() )
     {
-        mainSubgroupGroupVBox->hide();
+        defaultGroupVBox->hide();
     }
 
     /* free */
@@ -459,17 +471,21 @@
 
 UimCustomItemIface *GroupPageWidget::addCustomTypeKey( QVGroupBox *vbox, struct uim_custom *custom )
 {
-    // FIXME: not implemented yet
+    // Crash. Why?
+    /*
     QHBox *hbox = new QHBox( vbox );
     hbox->setSpacing( 6 );
     QLabel *label = new QLabel( _FU8(custom->label), hbox );
-    CustomKeyEdit *keyEditBox = new CustomKeyEdit( custom, hbox );
+    CustomKeyEdit *keyEditBox = new CustomKeyEdit( custom, vbox );
+    CustomChoiceCombo *c = new CustomChoiceCombo( custom, vbox );
     label->setBuddy( keyEditBox );
-
     QObject::connect( keyEditBox, SIGNAL(customValueChanged()),
                       this, SLOT(slotCustomValueChanged()) );
+    */
+    
+    
 
-    return keyEditBox;
+    return NULL;
 }
 
 void GroupPageWidget::setDefault()
@@ -485,7 +501,6 @@
 //-----------------------------------------------------------------------------------
 SubgroupData::SubgroupData( QWidget*parentWidget, const char *parent_group_name )
 {
-    // QVGroupBox for other subgroups
     char **sub_groups = uim_custom_group_subgroups( parent_group_name );
     char **sgrp;
     for( sgrp = sub_groups; *sgrp; sgrp++ )
@@ -499,9 +514,6 @@
          */
         if( QString::compare( *sgrp, "main" ) == 0 )
         {
-            // QVGroupBox for "main" subgroup
-            m_defaultGVBox = new QVGroupBox( "main", parentWidget );
-            parentWidget->layout()->add( m_defaultGVBox );
             uim_custom_group_free( sgroup_custom );
             continue;
         }
@@ -532,11 +544,7 @@
 
 QVGroupBox * SubgroupData::searchGroupVBoxByCustomSym( const char *custom_sym ) const
 {
-    QVGroupBox *b = gvboxMap[QString(custom_sym)];
-    if( b == NULL )
-        return m_defaultGVBox;        
-
-    return b;
+    return gvboxMap[QString(custom_sym)];
 }
 
 //--------------------------------------------------------------------------------------

Modified: trunk/qt/pref-qt.h
===================================================================
--- trunk/qt/pref-qt.h	2005-02-03 00:38:11 UTC (rev 495)
+++ trunk/qt/pref-qt.h	2005-02-03 00:40:58 UTC (rev 496)
@@ -131,11 +131,9 @@
     SubgroupData( QWidget *parentWidget, const char *parent_group_name );
     ~SubgroupData();
 
-    QVGroupBox *getMainSubgroupGroupVBox() const{ return m_defaultGVBox; }
     QVGroupBox *searchGroupVBoxByCustomSym( const char *custom_sym ) const;
 
 protected:
-    QVGroupBox *m_defaultGVBox;
     QMap<QString, QVGroupBox*> gvboxMap;
 };