3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Rename Theme to Styles to allow for the introduction of a proper Theme object

Browse source
This commit is contained in:
Arjen Hiemstra 2015-03-25 13:36:40 +01:00
parent 4a8f6beb26
commit 89a035bab4
6 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

20
qml/Printer.qml
View file

@ -135,15 +135,15 @@ UM.MainWindow {
id: files;
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.windowLeftMargin;
anchors.leftMargin: UM.Styles.windowLeftMargin;
anchors.top: toolbar.bottom;
anchors.topMargin: -1;
border.width: 1;
border.color: UM.Theme.borderColor;
border.color: UM.Styles.borderColor;
width: UM.Theme.panelWidth;
height: base.height / 2 - UM.Theme.toolbarHeight;
width: UM.Styles.panelWidth;
height: base.height / 2 - UM.Styles.toolbarHeight;
onRequestOpenFile: actions.open.trigger();
onOpenFile: UM.Controller.addMesh(file);
@ -153,14 +153,14 @@ UM.MainWindow {
id: settings;
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.windowRightMargin;
anchors.rightMargin: UM.Styles.windowRightMargin;
anchors.top: toolbar.bottom;
anchors.topMargin: -1;
border.width: 1;
border.color: UM.Theme.borderColor;
border.color: UM.Styles.borderColor;
width: UM.Theme.panelWidth;
width: UM.Styles.panelWidth;
expandedHeight: base.height;
@ -171,12 +171,12 @@ UM.MainWindow {
OutputGCodeButton {
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.windowRightMargin;
anchors.rightMargin: UM.Styles.windowRightMargin;
anchors.bottom: parent.bottom;
anchors.bottomMargin: -1;
width: UM.Theme.panelWidth;
width: UM.Styles.panelWidth;
height: 40;
onSaveRequested: actions.save.trigger();
@ -331,4 +331,6 @@ UM.MainWindow {
target: Printer
onRequestAddPrinter: addMachine.visible = true;
}
Component.onCompleted: UM.Theme.load(UM.Resources.getPath(UM.Resources.ThemesLocation, "cura"))
}