[Kst] extragear/graphics/kst/kst

[Andrew Walker]

SVN commit 479307 by arwalker:

Add KstComboBox to the Qt designer

 M  +1 -0      Makefile.am  
 M  +6 -1      kstwidgets.cpp  


--- trunk/extragear/graphics/kst/kst/Makefile.am #479306:479307
@@ -102,6 +102,7 @@
 	curveappearancewidget.ui \
 	fftoptionswidget.ui \
 	plotlistbox.cpp \
+	kstcombobox.cpp \
 	datarangewidget.ui
 
 libkstwidgets_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
--- trunk/extragear/graphics/kst/kst/kstwidgets.cpp #479306:479307
@@ -19,6 +19,7 @@
 #include "kst_export.h"
 #include "matrixselector.h"
 #include "plotlistbox.h"
+#include "kstcombobox.h"
 #include "scalarselector.h"
 #include "stringselector.h"
 #include "vectorselector.h"
@@ -51,6 +52,7 @@
 		rc += "ScalarSelector";
 		rc += "StringSelector";
 		rc += "VectorSelector";
+		rc += "KstComboBox";
 		return rc;
 	}
 
@@ -89,6 +91,8 @@
 			return "datarangewidget.h";
 		if (key == QString::fromLatin1("PlotListBox"))
 			return "plotlistbox.h";
+		if (key == QString::fromLatin1("KstComboBox"))
+			return "kstcombobox.h";
 		return QString::null;
 	}
 
@@ -122,7 +126,8 @@
 		return new KstDataRange(parent, name);
 	if (key == QString::fromLatin1("PlotListBox"))
 		return new PlotListBox(parent, name);
-
+	if (key == QString::fromLatin1("KstComboBox"))
+		return new KstComboBox(parent, name);
 	return 0L;
 }