Loading UI files at runtime rather than compiling in (make it easier to make sigmodrwidgets into a library)

2 files changed, 43 insertions, 42 deletions

diff --git a/sigmodr/widgets/CMakeLists.txt b/sigmodr/widgets/CMakeLists.txt
index d103ddbc..ba33fbf9 100644
--- a/sigmodr/widgets/CMakeLists.txt
+++ b/sigmodr/widgets/CMakeLists.txt
@@ -1,47 +1,9 @@
 project(sigmodrwidgets)
 
-include_directories(
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_BINARY_DIR}
+set(sigmodrwidgets_RESOURCES
+    gui/widgetsui.qrc
 )
-
-set(sigmodrwidgets_FORMS
-    gui/ability.ui
-    gui/author.ui
-    gui/badge.ui
-    gui/coinlist.ui
-    gui/coinlistitem.ui
-    gui/egggroup.ui
-    gui/fraction.ui
-    gui/globalscript.ui
-    gui/item.ui
-    gui/itemtype.ui
-    gui/map.ui
-    gui/mapeffect.ui
-    gui/maptrainer.ui
-    gui/maptrainerteammember.ui
-    gui/mapwarp.ui
-    gui/mapwildlist.ui
-    gui/mapwildlistencounter.ui
-    gui/move.ui
-    gui/nature.ui
-    gui/rules.ui
-    gui/script.ui
-    gui/sigmod.ui
-    gui/skin.ui
-    gui/sound.ui
-    gui/species.ui
-    gui/speciesmove.ui
-    gui/sprite.ui
-    gui/status.ui
-    gui/store.ui
-    gui/tile.ui
-    gui/time.ui
-    gui/trainer.ui
-    gui/type.ui
-    gui/weather.ui
-)
-kde4_add_ui_files(sigmodrwidgets_UI_HEADERS ${sigmodrwidgets_FORMS})
+qt4_add_resources(sigmodrwidgets_RESOURCE_SRCS ${sigmodrwidgets_RESOURCES})
 set(sigmodrwidgets_HEADERS
     AbilityUI.h
     AuthorUI.h
@@ -121,9 +83,10 @@ set(sigmodrwidgets_SRCS
     ValidationDialog.cpp
     WeatherUI.cpp
 )
+
 kde4_add_library(sigmodrwidgets
     SHARED
-    ${sigmodrwidgets_UI_HEADERS}
+    ${sigmodrwidgets_RESOURCE_SRCS}
     ${sigmodrwidgets_SRCS}
 )
 set_target_properties(sigmodrwidgets
diff --git a/sigmodr/widgets/gui/widgetsui.qrc b/sigmodr/widgets/gui/widgetsui.qrc
new file mode 100644
index 00000000..7fa91c2e
--- /dev/null
+++ b/sigmodr/widgets/gui/widgetsui.qrc
@@ -0,0 +1,38 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource prefix="/gui">
+  <file>ability.ui</file>
+  <file>author.ui</file>
+  <file>badge.ui</file>
+  <file>coinlist.ui</file>
+  <file>egggroup.ui</file>
+  <file>fraction.ui</file>
+  <file>globalscript.ui</file>
+  <file>item.ui</file>
+  <file>itemtype.ui</file>
+  <file>map.ui</file>
+  <file>mapeffect.ui</file>
+  <file>maptrainer.ui</file>
+  <file>maptrainerteammember.ui</file>
+  <file>mapwarp.ui</file>
+  <file>mapwildlist.ui</file>
+  <file>mapwildlistencounter.ui</file>
+  <file>move.ui</file>
+  <file>nature.ui</file>
+  <file>rules.ui</file>
+  <file>script.ui</file>
+  <file>sigmod.ui</file>
+  <file>skin.ui</file>
+  <file>sound.ui</file>
+  <file>species.ui</file>
+  <file>speciesmove.ui</file>
+  <file>sprite.ui</file>
+  <file>status.ui</file>
+  <file>store.ui</file>
+  <file>tile.ui</file>
+  <file>time.ui</file>
+  <file>trainer.ui</file>
+  <file>type.ui</file>
+  <file>weather.ui</file>
+ </qresource>
+</RCC>