MOre cleanups to runtime ui loading

1 files changed, 22 insertions, 11 deletions

diff --git a/sigmodr/widgets/SpriteUI.cpp b/sigmodr/widgets/SpriteUI.cpp
index 2ed63444..761d95b6 100644
--- a/sigmodr/widgets/SpriteUI.cpp
+++ b/sigmodr/widgets/SpriteUI.cpp
@@ -25,31 +25,42 @@
 // KDE includes
 #include <KFileDialog>
 #include <KImageFilePreview>
+#include <KLineEdit>
 #include <KMessageBox>
+#include <KPushButton>
 #include <KIO/NetAccess>
 
+// Qt includes
+#include <QtCore/QFile>
+#include <QtGui/QLabel>
+#include <QtUiTools/QUiLoader>
+
 Sigmodr::Widgets::SpriteUI::SpriteUI(Sigmod::Sprite* sprite, QWidget* parent) :
         ObjectUI(parent)
 {
-    setupUi(this);
     setObjects(sprite, new Sigmod::Sprite(*sprite));
 }
 
-Sigmodr::Widgets::SpriteUI::~SpriteUI()
-{
-}
-
 void Sigmodr::Widgets::SpriteUI::initGui()
 {
+    QFile file(":/gui/sprite.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *formWidget = QUiLoader().load(&file, this);
+    file.close();
+    ui_name = formWidget->findChild<KLineEdit*>("varName");
+    ui_sprite = formWidget->findChild<QLabel*>("varSprite");
+    KPushButton* buttonBrowse = formWidget->findChild<KPushButton*>("buttonBrowse");
+    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
+    connect(buttonBrowse, SIGNAL(toggled(bool)), this, SLOT(browse()));
     buttonBrowse->setIcon(KIcon("document-open"));
 }
 
 void Sigmodr::Widgets::SpriteUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::Sprite*>(modified())->name());
+    ui_name->setText(qobject_cast<Sigmod::Sprite*>(modified())->name());
     QPixmap icon;
     icon.loadFromData(qobject_cast<Sigmod::Sprite*>(modified())->sprite());
-    varSprite->setPixmap(icon);
+    ui_sprite->setPixmap(icon);
 }
 
 void Sigmodr::Widgets::SpriteUI::apply()
@@ -65,14 +76,14 @@ void Sigmodr::Widgets::SpriteUI::discard()
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::SpriteUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::SpriteUI::nameChanged(const QString& name)
 {
-    const int cursor = varName->cursorPosition();
+    const int cursor = ui_name->cursorPosition();
     qobject_cast<Sigmod::Sprite*>(modified())->setName(name);
-    varName->setCursorPosition(cursor);
+    ui_name->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::SpriteUI::on_buttonBrowse_pressed()
+void Sigmodr::Widgets::SpriteUI::browse()
 {
     KFileDialog* dialog = new KFileDialog(KUrl("kfiledialog:///image"), "image/png image/jpeg image/tiff image/bmp image/gif", this);
     dialog->setCaption("Use Image File");