diff --git a/resources/qml/DescriptionPane.qml b/resources/qml/DescriptionPane.qml deleted file mode 100644 index ab384f4c36..0000000000 --- a/resources/qml/DescriptionPane.qml +++ /dev/null @@ -1,68 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 -import QtQuick.Layouts 1.1 -import QtQuick.Dialogs 1.1 - -import UM 1.0 as UM - -Rectangle { - id: base - - opacity: 0; - - width: 300; - height: label.height + label.anchors.topMargin + label.anchors.bottomMargin; - - border.width: 1; - - Label { - id: label; - - wrapMode: Text.WordWrap; - horizontalAlignment: Text.AlignJustify; - - anchors.left: parent.left; - anchors.leftMargin: 10; - anchors.right: parent.right; - anchors.rightMargin: 10; - anchors.top: parent.top; - anchors.topMargin: closeButton.height; - anchors.bottomMargin: 10; - } - - ToolButton { - id: closeButton; - anchors.right: parent.right; - text: "Close"; - onClicked: closeAnimation.start(); - } - - function show(text, x, y) - { - if(base.opacity > 0) { - base._newText = text; - base._newY = y; - textChangeAnimation.start(); - } else { - label.text = text; - base.y = y; - showAnimation.start(); - } - } - - property string _newText; - property real _newY; - - SequentialAnimation { - id: textChangeAnimation; - - NumberAnimation { target: base; property: "opacity"; to: 0; duration: 100; } - PropertyAction { target: label; property: "text"; value: base._newText; } - PropertyAction { target: base; property: "y"; value: base._newY; } - NumberAnimation { target: base; property: "opacity"; to: 1; duration: 100; } - } - - NumberAnimation { id: showAnimation; target: base; property: "opacity"; to: 1; duration: 100; } - NumberAnimation { id: closeAnimation; target: base; property: "opacity"; to: 0; duration: 100; } -} diff --git a/resources/qml/FilePane.qml b/resources/qml/FilePane.qml deleted file mode 100644 index 83d9c6845e..0000000000 --- a/resources/qml/FilePane.qml +++ /dev/null @@ -1,86 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 - -import UM 1.0 as UM - -Rectangle { - id: base; - - signal requestOpenFile(); - signal openFile(url file); - - function setDirectory(file) - { - UM.Models.directoryListModel.directory = file - } - - MouseArea { - anchors.fill: parent; - acceptedButtons: Qt.AllButtons; - - onWheel: { - wheel.accepted = true; - } - } - - ColumnLayout { - anchors.fill: parent; - anchors.margins: UM.Styles.defaultMargin; - - //: Open file button - Button { text: qsTr("Open File"); iconSource: UM.Resources.getIcon("open.png"); Layout.fillWidth: true; onClicked: base.requestOpenFile(); } - - Rectangle { - Layout.fillWidth: true; - Layout.fillHeight: true; - border.width: 1; - border.color: "#aaa"; - - ScrollView { - anchors.fill: parent; - anchors.margins: 1; - - ListView { - id: listView; - model: UM.Models.directoryListModel; - delegate: listDelegate; - } - } - } - - ToolButton { - anchors.horizontalCenter: parent.horizontalCenter; - iconSource: UM.Resources.getIcon('expand.png'); - } - } - - Component { - id: listDelegate; - Rectangle { - id: item; - - anchors.left: parent.left; - anchors.right: parent.right; - - height: 40; - - color: mouseArea.pressed ? "#f00" : index % 2 ? "#eee" : "#fff"; - - Label { - anchors.verticalCenter: parent.verticalCenter; - anchors.left: parent.left; - anchors.leftMargin: UM.Styles.defaultMargin; - - text: model.name; - } - - MouseArea { - id: mouseArea; - anchors.fill: parent; - - onClicked: base.openFile(model.url); - } - } - } -} diff --git a/resources/qml/Printer.qml b/resources/qml/Printer.qml index 8c87fd5a76..1d7b6e2b1f 100644 --- a/resources/qml/Printer.qml +++ b/resources/qml/Printer.qml @@ -190,11 +190,6 @@ UM.MainWindow { source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""; } - DescriptionPane { - id: descriptionPane; - anchors.right: sidebar.left; - } - PrinterButton { id: openFileButton; diff --git a/resources/qml/SettingsPane.qml b/resources/qml/SettingsPane.qml deleted file mode 100644 index 433e03025c..0000000000 --- a/resources/qml/SettingsPane.qml +++ /dev/null @@ -1,194 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 -import QtQuick.Layouts 1.1 - -import UM 1.0 as UM - -Rectangle { - id: base; - - height: childrenRect.height; - - property real expandedHeight: 500; - - property bool collapsed: true; - - signal showDescription(string text, real x, real y); - - MouseArea { - anchors.left: parent.left; - anchors.right: parent.right; - height: contents.height; - - acceptedButtons: Qt.AllButtons; - - onWheel: { - wheel.accepted = true; - } - } - - Column { - id: contents; - spacing: UM.Styles.defaultMargin; - - anchors { - left: parent.left; - leftMargin: UM.Styles.defaultMargin; - right: parent.right; - rightMargin: UM.Styles.defaultMargin; - } - - //: Print Settings panel title - Label { text: qsTr("Print Settings"); width: parent.width; font.capitalization: Font.AllUppercase; font.pointSize: UM.Styles.smallTextSize; } - - Item { - width: parent.width; - height: 24; - - Row { - anchors.fill: parent; - spacing: UM.Styles.defaultMargin; - - //: Material selection combo box label - Label { text: qsTr("Material"); horizontalAlignment: Text.AlignRight; width: base.width * 0.5; } - ComboBox { - width: parent.width * 0.35; - model: ListModel { - ListElement { text: "PLA"; } - ListElement { text: "ABS"; } - } - style: ComboBoxStyle { } - } - } - } - - Item { - width: parent.width; - height: 24; - - Row { - anchors.fill: parent; - spacing: UM.Styles.defaultMargin; - //: Time display label - Label { text: qsTr("Time"); width: base.width * 0.5; horizontalAlignment: Text.AlignRight; } - Label { text: Qt.formatTime(new Date(timeSlider.value * 60000)); width: base.width * 0.35; horizontalAlignment: Text.AlignLeft; } - } - } - - Rectangle { color: "black"; height: 1; width: parent.width; } - - Item { - id: speedSlider; - - width: parent.width; - height: 60; - - Slider { - id: timeSlider; - anchors.left: parent.left; - anchors.right: parent.right; - height: 20; - - minimumValue: 60; - maximumValue: 600; - stepSize: 10; - - style: SliderStyle { - groove: Rectangle { - height: 1; - color: "black"; - - Rectangle { - anchors.left: parent.left; - anchors.verticalCenter: parent.verticalCenter; - width: 1; - height: control.height; - color: "black"; - } - Rectangle { - anchors.right: parent.right; - anchors.verticalCenter: parent.verticalCenter; - width: 1; - height: control.height; - color: "black"; - } - } - handle: Rectangle { width: 5; height: control.height; color: UM.Styles.primaryColor; } - } - } - - Column { - anchors.left: parent.left; - anchors.bottom: parent.bottom; - - Label { text: Qt.formatTime(new Date(timeSlider.minimumValue * 60000)); } - //: Low quality display label - Label { text: qsTr("Low Quality"); } - } - - Column { - anchors.right: parent.right; - anchors.bottom: parent.bottom; - - Label { text: Qt.formatTime(new Date(timeSlider.maximumValue * 60000)); anchors.right: parent.right; } - //: High quality display label - Label { text: qsTr("High Quality"); } - } - } - - UM.SettingsView { - id: settingsView; - - width: parent.width; - height: 0; - opacity: 0; - visible: false; - - onShowDescription: base.showDescription(text, x, y); - } - - Rectangle { color: "black"; height: 1; width: parent.width; } - - Item { - Layout.columnSpan: 2; - height: childrenRect.height; - width: parent.width; - - ToolButton { - anchors.horizontalCenter: parent.horizontalCenter; - iconSource: UM.Resources.getIcon('expand.png'); - onClicked: base.collapsed = !base.collapsed - } - } - } - - states: [ - State { - name: 'expanded'; - when: !base.collapsed; - - PropertyChanges { target: speedSlider; opacity: 0; height: 0; visible: false; } - PropertyChanges { - target: settingsView; - opacity: 1; - height: Math.min(settingsView.listHeight, base.expandedHeight * 0.6); - visible: true; - } - } - ] - - transitions: [ - Transition { - to: 'expanded'; - reversible: true; - SequentialAnimation { - NumberAnimation { target: speedSlider; property: 'opacity'; duration: 100; } - PropertyAction { target: settingsView; property: 'visible'; } - NumberAnimation { property: 'height'; duration: 200; } - PropertyAction { target: speedSlider; property: 'visible'; } - NumberAnimation { target: settingsView; property: 'opacity'; duration: 100; } - } - } - ] -}