GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into replace_controls_1_for_controls_2

Browse Source
This commit is contained in:
Ghostkeeper 2022-01-19 16:37:08 +01:00
commit 8f87b7c4bb
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -10,6 +10,8 @@ resources/i18n/en_7S
resources/i18n/x-test resources/i18n/x-test
resources/firmware resources/firmware
resources/materials resources/materials
resources/images/whats_new
resources/texts/whats_new
CuraEngine.exe CuraEngine.exe
LC_MESSAGES LC_MESSAGES
.cache .cache
@ -37,6 +39,7 @@ cura.desktop
#Externally located plug-ins commonly installed by our devs. #Externally located plug-ins commonly installed by our devs.
plugins/cura-big-flame-graph plugins/cura-big-flame-graph
plugins/cura-camera-position
plugins/cura-god-mode-plugin plugins/cura-god-mode-plugin
plugins/cura-siemensnx-plugin plugins/cura-siemensnx-plugin
plugins/CuraBlenderPlugin plugins/CuraBlenderPlugin

BIN
resources/images/whats_new/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 872 KiB

23
resources/qml/Preferences/GeneralPage.qml
View File

@ -166,13 +166,11 @@ UM.PreferencesPage
append({ text: "Čeština", code: "cs_CZ" }) append({ text: "Čeština", code: "cs_CZ" })
append({ text: "Deutsch", code: "de_DE" }) append({ text: "Deutsch", code: "de_DE" })
append({ text: "Español", code: "es_ES" }) 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: "Français", code: "fr_FR" })
append({ text: "Italiano", code: "it_IT" }) append({ text: "Italiano", code: "it_IT" })
append({ text: "日本語", code: "ja_JP" }) append({ text: "日本語", code: "ja_JP" })
append({ text: "한국어", code: "ko_KR" }) append({ text: "한국어", code: "ko_KR" })
append({ text: "Nederlands", code: "nl_NL" }) 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 do Brasil", code: "pt_BR" })
append({ text: "Português", code: "pt_PT" }) append({ text: "Português", code: "pt_PT" })
append({ text: "Русский", code: "ru_RU" }) append({ text: "Русский", code: "ru_RU" })
@ -185,6 +183,12 @@ UM.PreferencesPage
{ {
append({ text: "Pirate", code: "en_7S" }) 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 model: languageList
Layout.fillWidth: true Layout.fillWidth: true
currentIndex: function setCurrentIndex() {
{
var code = UM.Preferences.getValue("general/language"); var code = UM.Preferences.getValue("general/language");
for(var i = 0; i < languageList.count; ++i) 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 Label