From 846cbe79a346a24cfba1acbd5546eba0e24de9e5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 30 Jul 2019 17:35:40 +0200 Subject: [PATCH] Rename Orthogonal to Orthographic everywhere --- plugins/SliceInfoPlugin/SliceInfo.py | 2 ++ .../VersionUpgrade42to43/VersionUpgrade42to43.py | 11 +++++++++++ .../VersionUpgrade/VersionUpgrade42to43/__init__.py | 5 +++++ resources/qml/Menus/ViewMenu.qml | 6 +++--- resources/qml/Preferences/GeneralPage.qml | 6 +++--- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 843bacdc59..9308719227 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -127,6 +127,8 @@ class SliceInfo(QObject, Extension): data["active_mode"] = "custom" data["camera_view"] = application.getPreferences().getValue("general/camera_perspective_mode") + if data["camera_view"] == "orthographic": + data["camera_view"] = "orthogonal" #The database still only recognises the old name "orthogonal". definition_changes = global_stack.definitionChanges machine_settings_changed_by_user = False diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py index a14ee60639..207e73fdbd 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py @@ -39,6 +39,17 @@ class VersionUpgrade42to43(VersionUpgrade): setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) return format_version * 1000000 + setting_version + def upgradePreferences(self, serialized: str, filename: str): + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + if "camera_perspective_mode" in parser["general"] and parser["general"]["camera_perspective_mode"] == "orthogonal": + parser["general"]["camera_perspective_mode"] = "orthographic" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + ## Upgrades instance containers to have the new version # number. # diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py b/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py index d29f8e7833..7400bbb989 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py @@ -14,6 +14,7 @@ def getMetaData() -> Dict[str, Any]: return { "version_upgrade": { # From To Upgrade function + ("preferences", 6000008): ("preferences", 6000009, upgrade.upgradePreferences), ("machine_stack", 4000008): ("machine_stack", 4000009, upgrade.upgradeStack), ("extruder_train", 4000008): ("extruder_train", 4000009, upgrade.upgradeStack), ("definition_changes", 4000008): ("definition_changes", 4000009, upgrade.upgradeInstanceContainer), @@ -22,6 +23,10 @@ def getMetaData() -> Dict[str, Any]: ("user", 4000008): ("user", 4000009, upgrade.upgradeInstanceContainer), }, "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, "machine_stack": { "get_version": upgrade.getCfgVersion, "location": {"./machine_instances"} diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml index 4e5545223f..a4ded0980c 100644 --- a/resources/qml/Menus/ViewMenu.qml +++ b/resources/qml/Menus/ViewMenu.qml @@ -58,11 +58,11 @@ Menu { text: catalog.i18nc("@action:inmenu menubar:view", "Orthographic") checkable: true - checked: cameraViewMenu.cameraMode == "orthogonal" + checked: cameraViewMenu.cameraMode == "orthographic" onTriggered: { - UM.Preferences.setValue("general/camera_perspective_mode", "orthogonal") - checked = cameraViewMenu.cameraMode == "orthogonal" + UM.Preferences.setValue("general/camera_perspective_mode", "orthographic") + checked = cameraViewMenu.cameraMode == "orthographic" } exclusiveGroup: group } diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 13b386af58..4adb3e72d2 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -368,7 +368,7 @@ UM.PreferencesPage { width: childrenRect.width; height: childrenRect.height; - text: zoomToMouseCheckbox.enabled ? catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") : catalog.i18nc("@info:tooltip", "Zooming towards the mouse is not supported in the orthogonal perspective.") + text: zoomToMouseCheckbox.enabled ? catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") : catalog.i18nc("@info:tooltip", "Zooming towards the mouse is not supported in the orthographic perspective.") CheckBox { @@ -389,7 +389,7 @@ UM.PreferencesPage { return; } - zoomToMouseCheckbox.enabled = UM.Preferences.getValue("general/camera_perspective_mode") !== "orthogonal"; + zoomToMouseCheckbox.enabled = UM.Preferences.getValue("general/camera_perspective_mode") !== "orthographic"; zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) && zoomToMouseCheckbox.enabled; } } @@ -481,7 +481,7 @@ UM.PreferencesPage Component.onCompleted: { append({ text: catalog.i18n("Perspective"), code: "perspective" }) - append({ text: catalog.i18n("Orthogonal"), code: "orthogonal" }) + append({ text: catalog.i18n("Orthographic"), code: "orthographic" }) } }