3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-02 14:16:18 +02:00
commit 0885d1a8e2
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CuraApplication.py
View file

@ -308,6 +308,9 @@ class CuraApplication(QtApplication):
super().initialize() super().initialize()
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()

18
resources/qml/Preferences/GeneralPage.qml
View file

@ -72,6 +72,9 @@ UM.PreferencesPage
var defaultTheme = UM.Preferences.getValue("general/theme") var defaultTheme = UM.Preferences.getValue("general/theme")
setDefaultTheme(defaultTheme) setDefaultTheme(defaultTheme)
UM.Preferences.resetPreference("cura/single_instance")
scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/single_instance"))
UM.Preferences.resetPreference("physics/automatic_push_free") UM.Preferences.resetPreference("physics/automatic_push_free")
pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free")) pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
UM.Preferences.resetPreference("physics/automatic_drop_down") UM.Preferences.resetPreference("physics/automatic_drop_down")
@ -560,6 +563,21 @@ UM.PreferencesPage
text: catalog.i18nc("@label","Opening and saving files") text: catalog.i18nc("@label","Opening and saving files")
} }
UM.TooltipArea
{
width: childrenRect.width
height: childrenRect.height
text: catalog.i18nc("@info:tooltip","Should opening files from the desktop or external applications open in the same instance of Cura?")
CheckBox
{
id: singleInstanceCheckbox
text: catalog.i18nc("@option:check","Use a single instance of Cura")
checked: boolCheck(UM.Preferences.getValue("cura/single_instance"))
onCheckedChanged: UM.Preferences.setValue("cura/single_instance", checked)
}
}
UM.TooltipArea UM.TooltipArea
{ {
width: childrenRect.width width: childrenRect.width