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