From c4cdfec855dab226e4204a42dad4dfa1fc39a4fb Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Thu, 7 May 2015 17:38:24 -0300
Subject: [PATCH] Arch: moved some ui files to resource

---
 src/Mod/Arch/ArchMaterial.py                    | 2 +-
 src/Mod/Arch/ArchSchedule.py                    | 2 +-
 src/Mod/Arch/Resources/Arch.qrc                 | 2 ++
 src/Mod/Arch/{ => Resources/ui}/ArchMaterial.ui | 0
 src/Mod/Arch/{ => Resources/ui}/ArchSchedule.ui | 0
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename src/Mod/Arch/{ => Resources/ui}/ArchMaterial.ui (100%)
 rename src/Mod/Arch/{ => Resources/ui}/ArchSchedule.ui (100%)

diff --git a/src/Mod/Arch/ArchMaterial.py b/src/Mod/Arch/ArchMaterial.py
index c385e2c9d9..9b7cad354d 100644
--- a/src/Mod/Arch/ArchMaterial.py
+++ b/src/Mod/Arch/ArchMaterial.py
@@ -168,7 +168,7 @@ class _ArchMaterialTaskPanel:
     def __init__(self,obj=None):
         self.cards = None
         self.obj = obj
-        self.form = FreeCADGui.PySideUic.loadUi(os.path.splitext(__file__)[0]+".ui")
+        self.form = FreeCADGui.PySideUic.loadUi(":/ui/ArchMaterial.ui")
         self.color = QtGui.QColor(128,128,128)
         colorPix = QtGui.QPixmap(16,16)
         colorPix.fill(self.color)
diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py
index a8501ac615..ab74bcdcda 100644
--- a/src/Mod/Arch/ArchSchedule.py
+++ b/src/Mod/Arch/ArchSchedule.py
@@ -54,7 +54,7 @@ class _CommandArchSchedule:
 class _ArchScheduleTaskPanel:
     '''The editmode TaskPanel for MechanicalMaterial objects'''
     def __init__(self):
-        self.form = FreeCADGui.PySideUic.loadUi(os.path.splitext(__file__)[0]+".ui")
+        self.form = FreeCADGui.PySideUic.loadUi(":/ui/ArchSchedule.ui")
         QtCore.QObject.connect(self.form.ComboType, QtCore.SIGNAL("currentIndexChanged(int)"), self.changeType)
 
     def changeType(self,idx):
diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc
index 5ea5c82fe9..df6883670a 100644
--- a/src/Mod/Arch/Resources/Arch.qrc
+++ b/src/Mod/Arch/Resources/Arch.qrc
@@ -61,6 +61,8 @@
         <file>ui/preferences-archdefaults.ui</file>
         <file>ui/preferences-ifc.ui</file>
         <file>ui/preferences-dae.ui</file>
+        <file>ui/ArchMaterial.ui</file>
+        <file>ui/ArchSchedule.ui</file>
         <file>ui/ParametersWindowDouble.svg</file>
         <file>ui/ParametersWindowSimple.svg</file>
         <file>ui/ParametersWindowFixed.svg</file>
diff --git a/src/Mod/Arch/ArchMaterial.ui b/src/Mod/Arch/Resources/ui/ArchMaterial.ui
similarity index 100%
rename from src/Mod/Arch/ArchMaterial.ui
rename to src/Mod/Arch/Resources/ui/ArchMaterial.ui
diff --git a/src/Mod/Arch/ArchSchedule.ui b/src/Mod/Arch/Resources/ui/ArchSchedule.ui
similarity index 100%
rename from src/Mod/Arch/ArchSchedule.ui
rename to src/Mod/Arch/Resources/ui/ArchSchedule.ui