|
 |
4090bef |
diff --git a/Cura/util/pluginInfo.py b/Cura/util/pluginInfo.py
|
|
|
45bbe1c |
index 9cc05f0..a3d1938 100644
|
|
|
4090bef |
--- a/Cura/util/pluginInfo.py
|
|
|
4090bef |
+++ b/Cura/util/pluginInfo.py
|
|
|
45bbe1c |
@@ -83,14 +83,7 @@ def overridePostProcessPluginConfig(config):
|
|
|
45bbe1c |
profile.setTempOverride('plugin_config', pickle.dumps(config))
|
|
|
4090bef |
|
|
|
4090bef |
def getPluginBasePaths():
|
|
|
4090bef |
- ret = []
|
|
|
4090bef |
- if platform.system() != "Windows":
|
|
|
4090bef |
- ret.append(os.path.expanduser('~/.cura/plugins/'))
|
|
|
4090bef |
- if platform.system() == "Darwin" and hasattr(sys, 'frozen'):
|
|
|
4090bef |
- ret.append(os.path.normpath(os.path.join(resources.resourceBasePath, "plugins")))
|
|
|
4090bef |
- else:
|
|
|
4090bef |
- ret.append(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'plugins')))
|
|
|
4090bef |
- return ret
|
|
|
4090bef |
+ return [os.path.expanduser('~/.cura-lulzbot/plugins/'), '/usr/share/cura-lulzbot/plugins']
|
|
|
4090bef |
|
|
|
4090bef |
def getPluginList(pluginType):
|
|
|
4090bef |
global _pluginList
|
|
|
4090bef |
diff --git a/Cura/util/profile.py b/Cura/util/profile.py
|
|
|
e904ee3 |
index e71018f..4cc6801 100644
|
|
|
4090bef |
--- a/Cura/util/profile.py
|
|
|
4090bef |
+++ b/Cura/util/profile.py
|
|
|
e904ee3 |
@@ -647,11 +647,11 @@ def getBasePath():
|
|
|
4090bef |
:return: The path in which the current configuration files are stored. This depends on the used OS.
|
|
|
4090bef |
"""
|
|
|
4090bef |
if platform.system() == "Windows":
|
|
|
4090bef |
- basePath = os.path.normpath(os.path.expanduser('~/.cura/%s' % version.getVersion(False)))
|
|
|
4090bef |
+ basePath = os.path.normpath(os.path.expanduser('~/.cura-lulzbot/%s' % version.getVersion(False)))
|
|
|
4090bef |
elif platform.system() == "Darwin":
|
|
|
4090bef |
basePath = os.path.expanduser('~/Library/Application Support/Cura/%s' % version.getVersion(False))
|
|
|
4090bef |
else:
|
|
|
4090bef |
- basePath = os.path.expanduser('~/.cura/%s' % version.getVersion(False))
|
|
|
4090bef |
+ basePath = os.path.expanduser('~/.cura-lulzbot/%s' % version.getVersion(False))
|
|
|
4090bef |
if not os.path.isdir(basePath):
|
|
|
4090bef |
try:
|
|
|
4090bef |
os.makedirs(basePath)
|
|
|
4090bef |
diff --git a/Cura/util/resources.py b/Cura/util/resources.py
|
|
|
e904ee3 |
index 1f9526c..45de5e9 100644
|
|
|
4090bef |
--- a/Cura/util/resources.py
|
|
|
4090bef |
+++ b/Cura/util/resources.py
|
|
|
e904ee3 |
@@ -31,7 +31,7 @@ if sys.platform.startswith('darwin'):
|
|
|
4090bef |
else:
|
|
|
4090bef |
resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources")
|
|
|
4090bef |
else:
|
|
|
4090bef |
- resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources")
|
|
|
4090bef |
+ resourceBasePath = "/usr/share/cura-lulzbot"
|
|
|
4090bef |
|
|
|
4090bef |
def getPathForResource(dir, subdir, resource_name):
|
|
|
4090bef |
assert os.path.isdir(dir), "{p} is not a directory".format(p=dir)
|
|
|
e904ee3 |
@@ -73,7 +73,7 @@ def setupLocalization(selectedLanguage = None):
|
|
|
45bbe1c |
languages = [item[0]]
|
|
|
4090bef |
|
|
|
4090bef |
locale_path = os.path.normpath(os.path.join(resourceBasePath, 'locale'))
|
|
|
4090bef |
- translation = gettext.translation('Cura', locale_path, languages, fallback=True)
|
|
|
4090bef |
+ translation = gettext.translation('CuraLulzbot', locale_path, languages, fallback=True)
|
|
|
4090bef |
#translation.ugettext = lambda message: u'#' + message
|
|
|
4090bef |
translation.install(unicode=True)
|
|
|
4090bef |
|