3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge master

Browse source
This commit is contained in:
Lipu Fei 2019-05-28 10:43:51 +02:00
commit 0bc8a67a37
49 changed files with 3016 additions and 3035 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/ObjectSelector.qml
View file

@ -13,6 +13,13 @@ Item
width: UM.Theme.getSize("objects_menu_size").width
property bool opened: UM.Preferences.getValue("cura/show_list_of_objects")
// Eat up all the mouse events (we don't want the scene to react or have the scene context menu showing up)
MouseArea
{
anchors.fill: parent
acceptedButtons: Qt.AllButtons
}
Button
{
id: openCloseButton

2
resources/qml/Preferences/GeneralPage.qml
View file

@ -158,7 +158,7 @@ UM.PreferencesPage
append({ text: "日本語", code: "ja_JP" })
append({ text: "한국어", code: "ko_KR" })
append({ text: "Nederlands", code: "nl_NL" })
append({ text: "Polski", code: "pl_PL" })
//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" })