From e21a6ed62a0e6018c717c5ce0e331c9496d5a85b Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 24 Jan 2017 16:52:47 +0100 Subject: [PATCH] Cleanup --- plugins/LayerView/LayerView.py | 4 ---- resources/qml/Preferences/GeneralPage.qml | 18 ++---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py index 21854fb295..0d38e89026 100644 --- a/plugins/LayerView/LayerView.py +++ b/plugins/LayerView/LayerView.py @@ -77,9 +77,6 @@ class LayerView(View): self._solid_layers = int(Preferences.getInstance().getValue("view/top_layer_count")) self._only_show_top_layers = bool(Preferences.getInstance().getValue("view/only_show_top_layers")) self._compatibility_mode = True # for safety - #self._compatibility_mode = bool(Preferences.getInstance().getValue("view/compatibility_mode")) - #self._compatibility_mode = not self.getRenderer().getSupportsGeometryShader() - #Logger.log("d", "OpenGL Compatibility mode: %s" % self._compatibility_mode) self._wireprint_warning_message = Message(catalog.i18nc("@info:status", "Cura does not accurately display layers when Wire Printing is enabled")) @@ -348,7 +345,6 @@ class LayerView(View): self._solid_layers = int(Preferences.getInstance().getValue("view/top_layer_count")) self._only_show_top_layers = bool(Preferences.getInstance().getValue("view/only_show_top_layers")) - # self._compatibility_mode = bool(Preferences.getInstance().getValue("view/compatibility_mode")) self._startUpdateTopLayers() diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index db0b372fd9..57a35943d9 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -213,20 +213,6 @@ UM.PreferencesPage } } - UM.TooltipArea { - width: childrenRect.width - height: childrenRect.height - text: catalog.i18nc("@info:tooltip", "Compatibility mode in layerview?") - - CheckBox - { - id: topLayerViewCompatibilityCheckbox - text: catalog.i18nc("@option:check", "Layer view compatibility mode (for OpenGL <= 4.0, restart required)") - checked: boolCheck(UM.Preferences.getValue("view/compatibility_mode")) - onCheckedChanged: UM.Preferences.setValue("view/compatibility_mode", checked) - } - } - UM.TooltipArea { width: childrenRect.width; height: childrenRect.height; @@ -235,7 +221,7 @@ UM.PreferencesPage CheckBox { id: topLayerCountCheckbox - text: catalog.i18nc("@action:button","Display five top layers in layer view (only for compatibility mode)"); + text: catalog.i18nc("@action:button","Display five top layers in layer view compatibility mode"); checked: UM.Preferences.getValue("view/top_layer_count") == 5 onClicked: { @@ -259,7 +245,7 @@ UM.PreferencesPage CheckBox { id: topLayersOnlyCheckbox - text: catalog.i18nc("@option:check", "Only display top layer(s) in layer view (only for compatibility mode)") + text: catalog.i18nc("@option:check", "Only display top layer(s) in layer view compatibility mode") checked: boolCheck(UM.Preferences.getValue("view/only_show_top_layers")) onCheckedChanged: UM.Preferences.setValue("view/only_show_top_layers", checked) }