GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 19:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify single instance preference

Browse Source 
The Preferences have already been initialized in QTApplication.initialize to get the language to use in the splashscreen.
This commit is contained in:
fieldOfView 2020-05-07 18:13:23 +02:00
parent 1b34449242
commit cdc5c8948c
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cura/CuraApplication.py
View File

@ -304,7 +304,9 @@ class CuraApplication(QtApplication):
super().initialize() super().initialize()
self._checkEarlyPreferences() self._preferences.addPreference("cura/single_instance", False)
self._use_single_instance = self._preferences.getValue("cura/single_instance")
self.__sendCommandToSingleInstance() self.__sendCommandToSingleInstance()
self._initializeSettingDefinitions() self._initializeSettingDefinitions()
self._initializeSettingFunctions() self._initializeSettingFunctions()
@ -315,20 +317,6 @@ class CuraApplication(QtApplication):
self._machine_action_manager = MachineActionManager.MachineActionManager(self) self._machine_action_manager = MachineActionManager.MachineActionManager(self)
self._machine_action_manager.initialize() self._machine_action_manager.initialize()
def _checkEarlyPreferences(self) -> None:
# Check for specific preferences early in the bootstrap process, without spinning up the full Preference singleton yet
if self._use_single_instance:
return
preferences_file = Resources.getPath(Resources.Preferences, "{}.cfg".format(self.getApplicationName()))
if not os.path.exists(preferences_file):
return
with open(preferences_file) as preferences:
if "single_instance = True" in preferences.read():
Logger.log("i", "Preference to use a single instance detected")
self._use_single_instance = True
def __sendCommandToSingleInstance(self): def __sendCommandToSingleInstance(self):
self._single_instance = SingleInstance(self, self._files_to_open) self._single_instance = SingleInstance(self, self._files_to_open)
@ -523,7 +511,7 @@ class CuraApplication(QtApplication):
preferences.setValue("metadata/setting_version", self.SettingVersion) #Don't make it equal to the default so that the setting version always gets written to the file. preferences.setValue("metadata/setting_version", self.SettingVersion) #Don't make it equal to the default so that the setting version always gets written to the file.
preferences.addPreference("cura/active_mode", "simple") preferences.addPreference("cura/active_mode", "simple")
preferences.addPreference("cura/single_instance", False)
preferences.addPreference("cura/categories_expanded", "") preferences.addPreference("cura/categories_expanded", "")
preferences.addPreference("cura/jobname_prefix", True) preferences.addPreference("cura/jobname_prefix", True)
preferences.addPreference("cura/select_models_on_load", False) preferences.addPreference("cura/select_models_on_load", False)