3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove hardcoded sizes from dialogs & popups

Browse source 
Contributes to #6670
This commit is contained in:
Jaime van Kessel 2019-11-19 12:59:39 +01:00
parent 650377c819
commit c6f42766c7
No known key found for this signature in database
GPG key ID: 3710727397403C91
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -13,8 +13,8 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
minimumWidth: 500 * screenScaleFactor minimumWidth: UM.Theme.getSize("popup_dialog").width
minimumHeight: 450 * screenScaleFactor minimumHeight: UM.Theme.getSize("popup_dialog").height
width: minimumWidth width: minimumWidth
height: minimumHeight height: minimumHeight

4
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -20,8 +20,8 @@ Window
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint
width: Math.floor(720 * screenScaleFactor) width: UM.Theme.getSize("large_popup_dialog").width
height: Math.floor(640 * screenScaleFactor) height: UM.Theme.getSize("large_popup_dialog").height
minimumWidth: width minimumWidth: width
maximumWidth: minimumWidth maximumWidth: minimumWidth
minimumHeight: height minimumHeight: height

4
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -18,8 +18,8 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Open project file") title: catalog.i18nc("@title:window", "Open project file")
width: 450 * screenScaleFactor width: UM.Theme.getSize("small_popup_dialog").width
height: 150 * screenScaleFactor height: UM.Theme.getSize("small_popup_dialog").height
maximumHeight: height maximumHeight: height
maximumWidth: width maximumWidth: width

4
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -14,8 +14,8 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Discard or Keep changes") title: catalog.i18nc("@title:window", "Discard or Keep changes")
width: 800 * screenScaleFactor width: UM.Theme.getSize("popup_dialog").width
height: 400 * screenScaleFactor height: UM.Theme.getSize("popup_dialog").height
property var changesModel: Cura.UserChangesModel{ id: userChangesModel} property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
onVisibilityChanged: onVisibilityChanged:
{ {

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

@ -148,8 +148,6 @@ UM.ManagementPage
UM.RenameDialog UM.RenameDialog
{ {
id: renameDialog; id: renameDialog;
width: 300 * screenScaleFactor
height: 150 * screenScaleFactor
object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""; object: base.currentItem && base.currentItem.name ? base.currentItem.name : "";
property var machine_name_validator: Cura.MachineNameValidator { } property var machine_name_validator: Cura.MachineNameValidator { }
validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null; validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null;

3
resources/themes/cura-light/theme.json
View file

@ -441,6 +441,9 @@
"sizes": { "sizes": {
"window_minimum_size": [80, 48], "window_minimum_size": [80, 48],
"large_popup_dialog": [48, 40],
"popup_dialog": [40, 36],
"small_popup_dialog": [36, 12],
"main_window_header": [0.0, 4.0], "main_window_header": [0.0, 4.0],
"main_window_header_button": [8, 2.35], "main_window_header_button": [8, 2.35],