Converted some classes to load from the resource instead of using inheritence for forms

1 files changed, 14 insertions, 7 deletions

diff --git a/sigmodr/widgets/TypeUI.h b/sigmodr/widgets/TypeUI.h
index 89b83304..bd3e92c3 100644
--- a/sigmodr/widgets/TypeUI.h
+++ b/sigmodr/widgets/TypeUI.h
@@ -18,13 +18,15 @@
 #ifndef SIGMODRWIDGETS_TYPEUI
 #define SIGMODRWIDGETS_TYPEUI
 
-// Form include
-#include "ui_type.h"
-
 // Sigmodr widget includes
 #include "ObjectUI.h"
 
 // Forward declarations
+class KLineEdit;
+namespace Sigcore
+{
+class Fraction;
+}
 namespace Sigmod
 {
 class Type;
@@ -34,20 +36,25 @@ namespace Sigmodr
 {
 namespace Widgets
 {
-class SIGMODRWIDGETS_EXPORT TypeUI : public ObjectUI, private Ui::formType
+class FractionWidget;
+
+class SIGMODRWIDGETS_EXPORT TypeUI : public ObjectUI
 {
     Q_OBJECT
     
     public:
         TypeUI(Sigmod::Type* type, QWidget* parent);
-        ~TypeUI();
     public slots:
         void apply();
         void discard();
     protected slots:
-        void on_varName_textChanged(const QString& name);
-        void on_varSTAB_valueChanged(const Sigcore::Fraction& stab);
+        void nameChanged(const QString& name);
+        void stabChanged(const Sigcore::Fraction& stab);
+    private:
+        KLineEdit* ui_name;
+        FractionWidget* ui_stab;
     private slots:
+        void initGui();
         void setGui();
 };
 }