[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

make the dialog show the correct combobox values in edit mode.


  M +4 -1      kstplugindialog_i.cpp   1.18
  M +3 -0      pluginxmlparser.cpp   1.10


--- kdeextragear-2/kst/kst/kstplugindialog_i.cpp  #1.17:1.18
@@ -86,6 +86,6 @@ void KstPluginDialogI::show_I(const QStr
   }
 
-  update(new_index);
   updatePluginList();
+  update(new_index);
   show();
   raise();
@@ -154,4 +154,5 @@ void KstPluginDialogI::update(int new_in
   KSharedPtr<KstPlugin> plugin = doc->pluginList.at(Select->currentItem());
   if (plugin.data() != 0L && plugin->isValid()) {
+    kdDebug() << "Found the associated plugin." << endl;
     int newPluginIndex = _pluginList.findIndex(plugin->plugin()->data()._name);
     bool updateCombos = (newPluginIndex != oldPluginIndex);
@@ -177,4 +178,5 @@ void KstPluginDialogI::update(int new_in
           }
         }
+        kdDebug() << "Setting input vector combo to: " << plugin->inputVectors().at(vptr)->tagLabel() << endl;
         cb->setCurrentText(plugin->inputVectors().at(vptr++)->tagLabel());
       } else { // scalar
@@ -185,4 +187,5 @@ void KstPluginDialogI::update(int new_in
           }
         }
+        kdDebug() << "Setting input scalar combo to: " << plugin->inputScalars().at(sptr)->tagLabel() << endl;
         cb->setCurrentText(plugin->inputScalars().at(sptr++)->tagLabel());
       }

--- kdeextragear-2/kst/kst/pluginxmlparser.cpp  #1.9:1.10
@@ -244,4 +244,5 @@ QDomNode n = element.firstChild();
       // Unknown node
       iov._type = Plugin::Data::IOValue::UnknownType;
+      return -1;
     }
 
@@ -266,4 +267,6 @@ QDomNode n = element.firstChild();
           iov._subType != Plugin::Data::IOValue::UnknownSubType) {
         collection.append(iov);
+      } else {
+        return -1;
       }
     }