From 828752af30b9b06a93b2d80eac11d8db8389d92a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 27 Jan 2016 16:39:03 +0100 Subject: [PATCH] Remove dialogs that were moved to Uranium --- resources/qml/AddProfileDialog.qml | 36 ---------------- resources/qml/Cura.qml | 12 +----- resources/qml/LoadProfileDialog.qml | 64 ----------------------------- 3 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 resources/qml/AddProfileDialog.qml delete mode 100644 resources/qml/LoadProfileDialog.qml diff --git a/resources/qml/AddProfileDialog.qml b/resources/qml/AddProfileDialog.qml deleted file mode 100644 index 17e7790a1d..0000000000 --- a/resources/qml/AddProfileDialog.qml +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the AGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Window 2.1 - -import UM 1.1 as UM - -UM.Dialog -{ - id: base - - //: About dialog title - title: catalog.i18nc("@title:window","Add profile") - width: 400 - height: childrenRect.height - - rightButtons: Row - { - spacing: UM.Theme.sizes.default_margin.width - - Button - { - text: catalog.i18nc("@action:button","Add"); - isDefault: true - } - Button - { - text: catalog.i18nc("@action:button","Cancel"); - - onClicked: base.visible = false; - } - } -} - diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 7e8cb30fe9..d8f2b4d4ad 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -580,7 +580,7 @@ UM.MainWindow reloadAll.onTriggered: Printer.reloadAll() addMachine.onTriggered: addMachineWizard.visible = true; - addProfile.onTriggered: addProfileDialog.visible = true; + addProfile.onTriggered: { UM.MachineManager.createProfile(); preferences.visible = true; preferences.setPage(4); } preferences.onTriggered: { preferences.visible = true; preferences.setPage(0); } configureMachines.onTriggered: { preferences.visible = true; preferences.setPage(3); } @@ -673,16 +673,6 @@ UM.MainWindow id: addMachineWizard } - AddProfileDialog - { - id: addProfileDialog - } - - LoadProfileDialog - { - id: loadProfileDialog - } - AboutDialog { id: aboutDialog diff --git a/resources/qml/LoadProfileDialog.qml b/resources/qml/LoadProfileDialog.qml deleted file mode 100644 index ab92f02b99..0000000000 --- a/resources/qml/LoadProfileDialog.qml +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the AGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Window 2.1 - -import UM 1.1 as UM - -UM.Dialog -{ - id: base - - //: About dialog title - title: catalog.i18nc("@title:window","Load profile") - width: 400 - height: childrenRect.height - - Label - { - id: body - - //: About dialog application description - text: catalog.i18nc("@label","Selecting this profile overwrites some of your customised settings. Do you want to merge the new settings into your current profile or do you want to load a clean copy of the profile?") - wrapMode: Text.WordWrap - width: parent.width - anchors.top: parent.top - anchors.margins: UM.Theme.sizes.default_margin.height - - UM.I18nCatalog { id: catalog; name: "cura"; } - } - - Label - { - id: show_details - - //: About dialog application author note - text: catalog.i18nc("@label","Show details.") - wrapMode: Text.WordWrap - anchors.top: body.bottom - anchors.topMargin: UM.Theme.sizes.default_margin.height - } - - rightButtons: Row - { - spacing: UM.Theme.sizes.default_margin.width - - Button - { - text: catalog.i18nc("@action:button","Merge settings"); - } - Button - { - text: catalog.i18nc("@action:button","Reset profile"); - } - Button - { - text: catalog.i18nc("@action:button","Cancel"); - - onClicked: base.visible = false; - } - } -} -