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

Fix various UX issues.

Browse Source 
- Remove donkey: We where showing our donkey due to an unfortunate abbreviation/truncation of 'Colorblind Assist'. Now that should already not show in for a default install, which was fixed in the previous commit, but also just give the box some more space.
- Revert most of the rest of the preferences/general page back to the old controls (except for the combo-boxes, which needed to be upgraded in order to work on MacOS 11), pending a _proper_ redesign to the newer style of this page.

CURA-8161
This commit is contained in:
Remco Burema 2021-04-09 15:30:09 +02:00
parent 8ee0e13394
commit ed7439f9cd
No known key found for this signature in database
GPG Key ID: 215C49431D43F98C
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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:
{ {
@ -231,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:
{ {
@ -506,7 +511,7 @@ UM.PreferencesPage
} }
} }
ComboBox NewControls.ComboBox
{ {
id: cameraComboBox id: cameraComboBox
@ -647,7 +652,7 @@ 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: 200 * screenScaleFactor
@ -714,7 +719,7 @@ 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: 200 * screenScaleFactor