diff --git a/.gitignore b/.gitignore index 7fed42af69..51b98e330e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ resources/i18n/en_7S resources/i18n/x-test resources/firmware resources/materials +resources/images/whats_new +resources/texts/whats_new CuraEngine.exe LC_MESSAGES .cache @@ -37,6 +39,7 @@ cura.desktop #Externally located plug-ins commonly installed by our devs. plugins/cura-big-flame-graph +plugins/cura-camera-position plugins/cura-god-mode-plugin plugins/cura-siemensnx-plugin plugins/CuraBlenderPlugin diff --git a/resources/images/whats_new/1.png b/resources/images/whats_new/1.png deleted file mode 100644 index f1213a6b5a..0000000000 Binary files a/resources/images/whats_new/1.png and /dev/null differ diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 7b025f889d..c012acdd07 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -166,13 +166,11 @@ UM.PreferencesPage append({ text: "Čeština", code: "cs_CZ" }) append({ text: "Deutsch", code: "de_DE" }) append({ text: "Español", code: "es_ES" }) - //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" }) append({ text: "Français", code: "fr_FR" }) append({ text: "Italiano", code: "it_IT" }) append({ text: "日本語", code: "ja_JP" }) append({ text: "한국어", code: "ko_KR" }) append({ text: "Nederlands", code: "nl_NL" }) - //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) append({ text: "Português do Brasil", code: "pt_BR" }) append({ text: "Português", code: "pt_PT" }) append({ text: "Русский", code: "ru_RU" }) @@ -185,6 +183,12 @@ UM.PreferencesPage { append({ text: "Pirate", code: "en_7S" }) } + + // incomplete and/or abandoned + append({ text: catalog.i18nc("@heading", "-- incomplete --"), code: "" }) + append({ text: "Magyar", code: "hu_HU" }) + append({ text: "Suomi", code: "fi_FI" }) + append({ text: "Polski", code: "pl_PL" }) } } @@ -196,8 +200,7 @@ UM.PreferencesPage model: languageList Layout.fillWidth: true - currentIndex: - { + function setCurrentIndex() { var code = UM.Preferences.getValue("general/language"); for(var i = 0; i < languageList.count; ++i) { @@ -207,7 +210,17 @@ UM.PreferencesPage } } } - onActivated: UM.Preferences.setValue("general/language", model.get(index).code) + + currentIndex: setCurrentIndex() + + onActivated: if (model.get(index).code != "") + { + UM.Preferences.setValue("general/language", model.get(index).code); + } + else + { + currentIndex = setCurrentIndex(); + } } Label