From 5cb27c558924da82fe255e0f48c9beaba4362078 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 4 Feb 2016 12:00:20 +0100 Subject: [PATCH 1/2] Updates list of languages in interface CURA-526 --- resources/qml/GeneralPage.qml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml index 67590e0627..c22cd6fef2 100644 --- a/resources/qml/GeneralPage.qml +++ b/resources/qml/GeneralPage.qml @@ -59,16 +59,13 @@ UM.PreferencesPage id: languageList Component.onCompleted: { -// append({ text: catalog.i18nc("@item:inlistbox", "Bulgarian"), code: "bg" }) -// append({ text: catalog.i18nc("@item:inlistbox", "Czech"), code: "cs" }) append({ text: catalog.i18nc("@item:inlistbox", "English"), code: "en" }) append({ text: catalog.i18nc("@item:inlistbox", "Finnish"), code: "fi" }) append({ text: catalog.i18nc("@item:inlistbox", "French"), code: "fr" }) append({ text: catalog.i18nc("@item:inlistbox", "German"), code: "de" }) -// append({ text: catalog.i18nc("@item:inlistbox", "Italian"), code: "it" }) - append({ text: catalog.i18nc("@item:inlistbox", "Polish"), code: "pl" }) -// append({ text: catalog.i18nc("@item:inlistbox", "Russian"), code: "ru" }) -// append({ text: catalog.i18nc("@item:inlistbox", "Spanish"), code: "es" }) + append({ text: catalog.i18nc("@item:inlistbox", "Italian"), code: "it" }) + append({ text: catalog.i18nc("@item:inlistbox", "Dutch"), code: "nl" }) + append({ text: catalog.i18nc("@item:inlistbox", "Spanish"), code: "es" }) } } From 01ecd9357c9f1a2597a58e34ee955f49590c140f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 4 Feb 2016 12:14:59 +0100 Subject: [PATCH 2/2] Max size & value are now set in correct order for layerview CURA-763 --- plugins/LayerView/LayerView.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py index 1d81fe795c..78917e4e18 100644 --- a/plugins/LayerView/LayerView.py +++ b/plugins/LayerView/LayerView.py @@ -167,12 +167,16 @@ class LayerView(View): if new_max_layers > 0 and new_max_layers != self._old_max_layers: self._max_layers = new_max_layers - self.maxLayersChanged.emit() - self._current_layer_num = self._max_layers - # This makes sure we update the current layer - self.setLayer(int(self._max_layers)) - self.currentLayerNumChanged.emit() + # The qt slider has a bit of weird behavior that if the maxvalue needs to be changed first + # if it's the largest value. If we don't do this, we can have a slider block outside of the + # slider. + if new_max_layers > self._current_layer_num: + self.maxLayersChanged.emit() + self.setLayer(int(self._max_layers)) + else: + self.setLayer(int(self._max_layers)) + self.maxLayersChanged.emit() maxLayersChanged = Signal() currentLayerNumChanged = Signal()