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

Merge branch 'master' of github.com:Ultimaker/PluggableCura

Browse Source 
Conflicts:
	plugins/USBPrinting/PrinterConnection.py
	plugins/USBPrinting/USBPrinterManager.py
	plugins/Views/LayerView/LayerView.py
This commit is contained in:
daid 2015-04-24 17:09:28 +02:00
commit b0f413bee2
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qml/Printer.qml
View File

@ -167,6 +167,25 @@ UM.MainWindow {
width: parent.width * 0.333; width: parent.width * 0.333;
height: 250; height: 250;
} }
Loader
{
id: view_panel
//anchors.left: parent.left;
//anchors.right: parent.right;
//anchors.bottom: parent.bottom
anchors.top: viewModeButton.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height;
anchors.right: sidebar.left;
anchors.rightMargin: UM.Theme.sizes.window_margin.width;
//anchors.bottom: buttons.top;
//anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
height: childrenRect.height;
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : "";
}
DescriptionPane { DescriptionPane {
id: descriptionPane; id: descriptionPane;
@ -210,7 +229,7 @@ UM.MainWindow {
right: sidebar.left; right: sidebar.left;
rightMargin: UM.Theme.sizes.window_margin.width; rightMargin: UM.Theme.sizes.window_margin.width;
} }
id: viewModeButton
//: View Mode toolbar button //: View Mode toolbar button
text: qsTr("View Mode"); text: qsTr("View Mode");
iconSource: UM.Theme.icons.viewmode; iconSource: UM.Theme.icons.viewmode;
@ -373,6 +392,8 @@ UM.MainWindow {
UM.MeshFileHandler.writeLocalFile(fileUrl); UM.MeshFileHandler.writeLocalFile(fileUrl);
} }
} }
EngineLog { EngineLog {
id: engineLog; id: engineLog;