From 79de5eebb71f151f2dca310a4392a2c3e0405af3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 11:33:02 +0100 Subject: [PATCH 1/6] CURA-3221 Use "default" theme for description text --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 26c343ad5c..1f47709303 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -54,7 +54,7 @@ UM.Dialog { text: "You have customized some profile settings.\nWould you like to keep or discard those settings?" anchors.margins: UM.Theme.getSize("default_margin").width - font: UM.Theme.getFont("default_bold") + font: UM.Theme.getFont("default") wrapMode: Text.WordWrap } } From 9c5404401acfd71e349be9ff4b5caf8aaf683497 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 11:57:07 +0100 Subject: [PATCH 2/6] CURA-3221 Remove star image --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 1f47709303..01d9d7a8c0 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -42,13 +42,6 @@ UM.Dialog anchors.left: parent.left anchors.right: parent.right spacing: UM.Theme.getSize("default_margin").width - UM.RecolorImage - { - source: UM.Theme.getIcon("star") - width : 30 - height: width - color: UM.Theme.getColor("setting_control_button") - } Label { From d2c03b3554e8a5b8d3948f0d6c7f3ce522285e37 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 12:05:10 +0100 Subject: [PATCH 3/6] CURA-3221 Larger window size for override profile dialog --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 01d9d7a8c0..8ce09d7a4e 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -13,8 +13,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Discard or Keep changes") - width: 500 - height: 300 + width: 800 + height: 400 property var changesModel: Cura.UserChangesModel{ id: userChangesModel} onVisibilityChanged: { From 85bc79bde27f3e188bf02bf4a0b399ab392fc29e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 12:05:57 +0100 Subject: [PATCH 4/6] CURA-3221 Smaller settings column width for override profile dialog --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 8ce09d7a4e..278f0dda2f 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -96,21 +96,21 @@ UM.Dialog role: "label" title: catalog.i18nc("@title:column", "Profile settings") delegate: labelDelegate - width: tableView.width * 0.5 + width: tableView.width * 0.4 } TableViewColumn { role: "original_value" title: "Default" - width: tableView.width * 0.25 + width: tableView.width * 0.3 delegate: defaultDelegate } TableViewColumn { role: "user_value" title: catalog.i18nc("@title:column", "Customized") - width: tableView.width * 0.25 - 1 + width: tableView.width * 0.3 - 1 } section.property: "category" section.delegate: Label From adb37de51c38d827172c6c15dd04e2ca1854e210 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 12:06:30 +0100 Subject: [PATCH 5/6] Code style fixes --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 278f0dda2f..a1c6a8210f 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -32,7 +32,7 @@ UM.Dialog UM.I18nCatalog { id: catalog; - name:"cura" + name: "cura" } Row @@ -71,7 +71,7 @@ UM.Dialog text: { var result = styleData.value - if (extruder_name!= "") + if (extruder_name != "") { result += " (" + extruder_name + ")" } From 897791b0d28100d97c55d5f47cbfbfd0eb29ab25 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 Mar 2017 12:52:48 +0100 Subject: [PATCH 6/6] CURA-3221 Use "system" font so texts fit in rows --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index a1c6a8210f..94bc3efa8a 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -67,7 +67,7 @@ UM.Dialog property var extruder_name: userChangesModel.getItem(styleData.row).extruder anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - font: UM.Theme.getFont("default") + font: UM.Theme.getFont("system") text: { var result = styleData.value @@ -86,7 +86,7 @@ UM.Dialog Label { text: styleData.value - font: UM.Theme.getFont("default") + font: UM.Theme.getFont("system") color: UM.Theme.getColor("setting_control_disabled_text") } }