GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 11:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9545 from Ultimaker/CURA-8161_remove_donkey_and_other_UX_adventures

Browse Source 
[CURA-8161] Remove donkey and other UX adventures
This commit is contained in:
Konstantinos Karmas 2021-04-09 16:32:19 +02:00 committed by GitHub
commit ce5db5e12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,12 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQuick.Controls 2.3 as NewControls
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -139,6 +141,7 @@ UM.PreferencesPage
{ {
id: interfaceGrid id: interfaceGrid
columns: 4 columns: 4
width: parent.width
Label Label
{ {
@ -178,12 +181,13 @@ UM.PreferencesPage
} }
} }
ComboBox NewControls.ComboBox
{ {
id: languageComboBox id: languageComboBox
textRole: "text" textRole: "text"
model: languageList model: languageList
Layout.fillWidth: true
currentIndex: currentIndex:
{ {
@ -197,20 +201,6 @@ UM.PreferencesPage
} }
} }
onActivated: UM.Preferences.setValue("general/language", model.get(index).code) onActivated: UM.Preferences.setValue("general/language", model.get(index).code)
Component.onCompleted:
{
// Because ListModel is stupid and does not allow using qsTr() for values.
for(var i = 0; i < languageList.count; ++i)
{
languageList.setProperty(i, "text", catalog.i18n(languageList.get(i).text));
}
// Glorious hack time. ComboBox does not update the text properly after changing the
// model. So change the indices around to force it to update.
currentIndex += 1;
currentIndex -= 1;
}
} }
Label Label
@ -245,12 +235,13 @@ UM.PreferencesPage
} }
} }
ComboBox NewControls.ComboBox
{ {
id: themeComboBox id: themeComboBox
model: themeList model: themeList
textRole: "text" textRole: "text"
Layout.fillWidth: true
currentIndex: currentIndex:
{ {
@ -265,21 +256,6 @@ UM.PreferencesPage
return 0; return 0;
} }
onActivated: UM.Preferences.setValue("general/theme", model.get(index).code) onActivated: UM.Preferences.setValue("general/theme", model.get(index).code)
Component.onCompleted:
{
// Because ListModel is stupid and does not allow using qsTr() for values.
for(var i = 0; i < themeList.count; ++i)
{
themeList.setProperty(i, "text", catalog.i18n(themeList.get(i).text));
}
// Glorious hack time. ComboBox does not update the text properly after changing the
// model. So change the indices around to force it to update.
currentIndex += 1;
currentIndex -= 1;
}
} }
} }
@ -535,7 +511,7 @@ UM.PreferencesPage
} }
} }
ComboBox NewControls.ComboBox
{ {
id: cameraComboBox id: cameraComboBox
@ -676,10 +652,10 @@ UM.PreferencesPage
text: catalog.i18nc("@window:text", "Default behavior when opening a project file: ") text: catalog.i18nc("@window:text", "Default behavior when opening a project file: ")
} }
ComboBox NewControls.ComboBox
{ {
id: choiceOnOpenProjectDropDownButton id: choiceOnOpenProjectDropDownButton
width: 200 * screenScaleFactor width: Math.round(250 * screenScaleFactor)
model: ListModel model: ListModel
{ {
@ -743,11 +719,11 @@ UM.PreferencesPage
text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ") text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ")
} }
ComboBox NewControls.ComboBox
{ {
id: choiceOnProfileOverrideDropDownButton id: choiceOnProfileOverrideDropDownButton
width: 200 * screenScaleFactor width: Math.round(250 * screenScaleFactor)
popup.width: Math.round(350 * screenScaleFactor)
model: ListModel model: ListModel
{ {
id: discardOrKeepProfileListModel id: discardOrKeepProfileListModel