Cleaned up more classes to load ui files at runtime

1 files changed, 14 insertions, 7 deletions

diff --git a/sigmodr/widgets/GlobalScriptUI.h b/sigmodr/widgets/GlobalScriptUI.h
index 7d2da83a..a69e6718 100644
--- a/sigmodr/widgets/GlobalScriptUI.h
+++ b/sigmodr/widgets/GlobalScriptUI.h
@@ -18,13 +18,15 @@
 #ifndef SIGMODRWIDGETS_GLOBALSCRIPTUI
 #define SIGMODRWIDGETS_GLOBALSCRIPTUI
 
-// Form include
-#include "ui_globalscript.h"
-
 // Sigmodr widget includes
 #include "ObjectUI.h"
 
 // Forward declarations
+class KLineEdit;
+namespace Sigcore
+{
+class Script;
+}
 namespace Sigmod
 {
 class GlobalScript;
@@ -34,20 +36,25 @@ namespace Sigmodr
 {
 namespace Widgets
 {
-class SIGMODRWIDGETS_EXPORT GlobalScriptUI : public ObjectUI, private Ui::formGlobalScript
+class ScriptWidget;
+
+class SIGMODRWIDGETS_EXPORT GlobalScriptUI : public ObjectUI
 {
     Q_OBJECT
     
     public:
         GlobalScriptUI(Sigmod::GlobalScript* globalScript, QWidget* parent);
-        ~GlobalScriptUI();
     public slots:
         void apply();
         void discard();
     protected slots:
-        void on_varName_textChanged(const QString& name);
-        void on_varScript_valueChanged(const Sigcore::Script& script);
+        void nameChanged(const QString& name);
+        void scriptChanged(const Sigcore::Script& script);
+    private:
+        KLineEdit* ui_name;
+        ScriptWidget* ui_script;
     private slots:
+        void initGui();
         void setGui();
 };
 }