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

Code style: brackets on new line

Browse Source 
Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-09-10 14:52:51 +02:00
parent ef8b9e98d1
commit 0d68381e61
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 71 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
resources/qml/Preferences/ProfilesPage.qml
View File

@ -21,9 +21,11 @@ Item
UM.I18nCatalog { id: catalog; name: "cura"; } UM.I18nCatalog { id: catalog; name: "cura"; }
Label { Label
{
id: titleLabel id: titleLabel
anchors { anchors
{
top: parent.top top: parent.top
left: parent.left left: parent.left
right: parent.right right: parent.right
@ -35,28 +37,33 @@ Item
property var hasCurrentItem: base.currentItem != null property var hasCurrentItem: base.currentItem != null
property var currentItem: { property var currentItem:
{
var current_index = qualityListView.currentIndex; var current_index = qualityListView.currentIndex;
return (current_index == -1) ? null : base.qualityManagementModel.getItem(current_index); return (current_index == -1) ? null : base.qualityManagementModel.getItem(current_index);
} }
property var currentItemName: hasCurrentItem ? base.currentItem.name : "" property var currentItemName: hasCurrentItem ? base.currentItem.name : ""
property var isCurrentItemActivated: { property var isCurrentItemActivated:
if (!base.currentItem) { {
if (!base.currentItem)
{
return false; return false;
} }
return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName; return base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName;
} }
property var canCreateProfile: { property var canCreateProfile:
{
return isCurrentItemActivated && Cura.MachineManager.hasUserSettings; return isCurrentItemActivated && Cura.MachineManager.hasUserSettings;
} }
Row // Button Row Row // Button Row
{ {
id: buttonRow id: buttonRow
anchors { anchors
{
left: parent.left left: parent.left
right: parent.right right: parent.right
top: titleLabel.bottom top: titleLabel.bottom
@ -70,10 +77,14 @@ Item
text: catalog.i18nc("@action:button", "Activate") text: catalog.i18nc("@action:button", "Activate")
iconName: "list-activate" iconName: "list-activate"
enabled: !isCurrentItemActivated enabled: !isCurrentItemActivated
onClicked: { onClicked:
if (base.currentItem.is_read_only) { {
if (base.currentItem.is_read_only)
{
Cura.MachineManager.setQualityGroup(base.currentItem.quality_group); Cura.MachineManager.setQualityGroup(base.currentItem.quality_group);
} else { }
else
{
Cura.MachineManager.setQualityChangesGroup(base.currentItem.quality_changes_group); Cura.MachineManager.setQualityChangesGroup(base.currentItem.quality_changes_group);
} }
} }
@ -88,7 +99,8 @@ Item
enabled: base.canCreateProfile && !Cura.MachineManager.stacksHaveErrors enabled: base.canCreateProfile && !Cura.MachineManager.stacksHaveErrors
visible: base.canCreateProfile visible: base.canCreateProfile
onClicked: { onClicked:
{
createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name); createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name);
createQualityDialog.open(); createQualityDialog.open();
createQualityDialog.selectText(); createQualityDialog.selectText();
@ -104,7 +116,8 @@ Item
enabled: !base.canCreateProfile enabled: !base.canCreateProfile
visible: !base.canCreateProfile visible: !base.canCreateProfile
onClicked: { onClicked:
{
duplicateQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name); duplicateQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name);
duplicateQualityDialog.open(); duplicateQualityDialog.open();
duplicateQualityDialog.selectText(); duplicateQualityDialog.selectText();
@ -118,7 +131,8 @@ Item
text: catalog.i18nc("@action:button", "Remove") text: catalog.i18nc("@action:button", "Remove")
iconName: "list-remove" iconName: "list-remove"
enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated
onClicked: { onClicked:
{
forceActiveFocus(); forceActiveFocus();
confirmRemoveQualityDialog.open(); confirmRemoveQualityDialog.open();
} }
@ -131,7 +145,8 @@ Item
text: catalog.i18nc("@action:button", "Rename") text: catalog.i18nc("@action:button", "Rename")
iconName: "edit-rename" iconName: "edit-rename"
enabled: base.hasCurrentItem && !base.currentItem.is_read_only enabled: base.hasCurrentItem && !base.currentItem.is_read_only
onClicked: { onClicked:
{
renameQualityDialog.object = base.currentItem.name; renameQualityDialog.object = base.currentItem.name;
renameQualityDialog.open(); renameQualityDialog.open();
renameQualityDialog.selectText(); renameQualityDialog.selectText();
@ -144,7 +159,8 @@ Item
id: importMenuButton id: importMenuButton
text: catalog.i18nc("@action:button", "Import") text: catalog.i18nc("@action:button", "Import")
iconName: "document-import" iconName: "document-import"
onClicked: { onClicked:
{
importDialog.open(); importDialog.open();
} }
} }
@ -156,7 +172,8 @@ Item
text: catalog.i18nc("@action:button", "Export") text: catalog.i18nc("@action:button", "Export")
iconName: "document-export" iconName: "document-export"
enabled: base.hasCurrentItem && !base.currentItem.is_read_only enabled: base.hasCurrentItem && !base.currentItem.is_read_only
onClicked: { onClicked:
{
exportDialog.open(); exportDialog.open();
} }
} }
@ -285,13 +302,16 @@ Item
{ {
var result = Cura.ContainerManager.importProfile(fileUrl); var result = Cura.ContainerManager.importProfile(fileUrl);
messageDialog.text = result.message; messageDialog.text = result.message;
if (result.status == "ok") { if (result.status == "ok")
{
messageDialog.icon = StandardIcon.Information; messageDialog.icon = StandardIcon.Information;
} }
else if (result.status == "duplicate") { else if (result.status == "duplicate")
{
messageDialog.icon = StandardIcon.Warning; messageDialog.icon = StandardIcon.Warning;
} }
else { else
{
messageDialog.icon = StandardIcon.Critical; messageDialog.icon = StandardIcon.Critical;
} }
messageDialog.open(); messageDialog.open();
@ -312,7 +332,8 @@ Item
var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group, var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group,
fileUrl, selectedNameFilter); fileUrl, selectedNameFilter);
if (result && result.status == "error") { if (result && result.status == "error")
{
messageDialog.icon = StandardIcon.Critical; messageDialog.icon = StandardIcon.Critical;
messageDialog.text = result.message; messageDialog.text = result.message;
messageDialog.open(); messageDialog.open();
@ -323,10 +344,12 @@ Item
} }
} }
Item { Item
{
id: contentsItem id: contentsItem
anchors { anchors
{
top: titleLabel.bottom top: titleLabel.bottom
left: parent.left left: parent.left
right: parent.right right: parent.right
@ -340,7 +363,8 @@ Item
Item Item
{ {
anchors { anchors
{
top: buttonRow.bottom top: buttonRow.bottom
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
left: parent.left left: parent.left
@ -348,12 +372,16 @@ Item
bottom: parent.bottom bottom: parent.bottom
} }
SystemPalette { id: palette } SystemPalette
{
id: palette
}
Label Label
{ {
id: captionLabel id: captionLabel
anchors { anchors
{
top: parent.top top: parent.top
left: parent.left left: parent.left
} }
@ -366,14 +394,16 @@ Item
ScrollView ScrollView
{ {
id: profileScrollView id: profileScrollView
anchors { anchors
{
top: captionLabel.visible ? captionLabel.bottom : parent.top top: captionLabel.visible ? captionLabel.bottom : parent.top
topMargin: captionLabel.visible ? UM.Theme.getSize("default_margin").height : 0 topMargin: captionLabel.visible ? UM.Theme.getSize("default_margin").height : 0
bottom: parent.bottom bottom: parent.bottom
left: parent.left left: parent.left
} }
Rectangle { Rectangle
{
parent: viewport parent: viewport
anchors.fill: parent anchors.fill: parent
color: palette.light color: palette.light
@ -445,7 +475,8 @@ Item
MouseArea MouseArea
{ {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked:
{
parent.ListView.view.currentIndex = model.index; parent.ListView.view.currentIndex = model.index;
} }
} }
@ -458,7 +489,8 @@ Item
{ {
id: detailsPanel id: detailsPanel
anchors { anchors
{
left: profileScrollView.right left: profileScrollView.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
top: parent.top top: parent.top
@ -478,13 +510,15 @@ Item
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
Label { Label
{
text: base.currentItemName text: base.currentItemName
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("large_bold")
} }
} }
Flow { Flow
{
id: currentSettingsActions id: currentSettingsActions
visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName
anchors.left: parent.left anchors.left: parent.left
@ -507,7 +541,8 @@ Item
} }
} }
Column { Column
{
id: profileNotices id: profileNotices
anchors.top: currentSettingsActions.visible ? currentSettingsActions.bottom : currentSettingsActions.anchors.top anchors.top: currentSettingsActions.visible ? currentSettingsActions.bottom : currentSettingsActions.anchors.top
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
@ -515,14 +550,16 @@ Item
anchors.right: parent.right anchors.right: parent.right
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
Label { Label
{
id: defaultsMessage id: defaultsMessage
visible: false visible: false
text: catalog.i18nc("@action:label", "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below.") text: catalog.i18nc("@action:label", "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
width: parent.width width: parent.width
} }
Label { Label
{
id: noCurrentSettingsMessage id: noCurrentSettingsMessage
visible: base.isCurrentItemActivated && !Cura.MachineManager.hasUserSettings visible: base.isCurrentItemActivated && !Cura.MachineManager.hasUserSettings
text: catalog.i18nc("@action:label", "Your current settings match the selected profile.") text: catalog.i18nc("@action:label", "Your current settings match the selected profile.")