Blob Blame History Raw
diff -up cura-lulzbot-3.2.17/CMakeLists.txt.system cura-lulzbot-3.2.17/CMakeLists.txt
--- cura-lulzbot-3.2.17/CMakeLists.txt.system	2018-04-13 10:47:37.000000000 -0400
+++ cura-lulzbot-3.2.17/CMakeLists.txt	2018-04-16 15:22:03.679259807 -0400
@@ -1,4 +1,4 @@
-project(cura NONE)
+project(cura-lulzbot NONE)
 cmake_minimum_required(VERSION 2.8.12)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/
@@ -34,7 +34,7 @@ if(NOT ${URANIUM_DIR} STREQUAL "")
 endif()
 if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "")
     list(APPEND CMAKE_MODULE_PATH ${URANIUM_DIR}/cmake)
-    include(UraniumTranslationTools)
+    include(LulzbotUraniumTranslationTools)
     # Extract Strings
     add_custom_target(extract-messages ${URANIUM_SCRIPTS_DIR}/extract-messages ${CMAKE_SOURCE_DIR} cura)
     # Build Translations
@@ -53,13 +53,13 @@ if(NOT PYTHON_SITE_PACKAGES_DIR)
 		set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
 			CACHE STRING "Directory to install Python bindings to")
 	endif()
-	set(CURA_INSTALL_PLUGINS_PATH lib/cura)
+	set(CURA_INSTALL_PLUGINS_PATH lib/cura-lulzbot)
 else()
-	set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura)
+	set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura-lulzbot)
 endif()
 
 install(DIRECTORY resources
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cura-lulzbot)
 install(DIRECTORY plugins
         DESTINATION ${CURA_INSTALL_PLUGINS_PATH})
 
@@ -80,10 +80,10 @@ if(NOT APPLE AND NOT WIN32)
   endif()
 
   install(DIRECTORY cura
-    DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+    DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot
     FILES_MATCHING PATTERN *.py)
   install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-    DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+    DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot/cura)
   install(FILES ${CMAKE_BINARY_DIR}/cura-lulzbot.desktop
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
   install(FILES cura.appdata.xml
@@ -100,10 +100,10 @@ else()
             DESTINATION ${CMAKE_INSTALL_BINDIR}
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
     install(DIRECTORY cura
-            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot
             FILES_MATCHING PATTERN *.py)
     install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot/cura)
 endif()
 
 include(CPackConfig.cmake)
diff -up cura-lulzbot-3.2.17/cura_app.py.system cura-lulzbot-3.2.17/cura_app.py
--- cura-lulzbot-3.2.17/cura_app.py.system	2018-04-16 15:18:58.881412683 -0400
+++ cura-lulzbot-3.2.17/cura_app.py	2018-04-16 15:23:44.886985413 -0400
@@ -6,6 +6,9 @@
 import argparse
 import os
 import sys
+from distutils.sysconfig import get_python_lib
+
+sys.path.insert(0, os.path.join(get_python_lib(), 'CuraLulzbot'))
 
 from UM.Platform import Platform
 
diff -up cura-lulzbot-3.2.17/cura/CuraApplication.py.system cura-lulzbot-3.2.17/cura/CuraApplication.py
--- cura-lulzbot-3.2.17/cura/CuraApplication.py.system	2018-04-13 10:47:37.000000000 -0400
+++ cura-lulzbot-3.2.17/cura/CuraApplication.py	2018-04-16 15:24:50.063520730 -0400
@@ -148,7 +148,7 @@ class CuraApplication(QtApplication):
         for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
             Resources.addExpectedDirNameInData(dir_name)
 
-        Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources"))
+        Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura-lulzbot", "resources"))
         if not hasattr(sys, "frozen"):
             Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources"))
 
@@ -594,7 +594,7 @@ class CuraApplication(QtApplication):
     def _loadPlugins(self):
         self._plugin_registry.addType("profile_reader", self._addProfileReader)
         self._plugin_registry.addType("profile_writer", self._addProfileWriter)
-        self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura"))
+        self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura-lulzbot"))
         if hasattr(sys, "frozen"):
             # This what works for MacOS currently
             self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "Resources", "cura", "plugins"))