3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite

Browse source
This commit is contained in:
Jaime van Kessel 2017-12-06 13:33:20 +01:00
commit aba8bd89c3
129 changed files with 15629 additions and 3612 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/Topbar.qml
View file

@ -249,7 +249,7 @@ Rectangle
Button
{
iconSource: UM.Theme.getIcon("view_3d")
style: UM.Theme.styles.orientation_button
style: UM.Theme.styles.small_tool_button
anchors.verticalCenter: viewOrientationControl.verticalCenter
onClicked:{
UM.Controller.rotateView("3d", 0);
@ -261,7 +261,7 @@ Rectangle
Button
{
iconSource: UM.Theme.getIcon("view_front")
style: UM.Theme.styles.orientation_button
style: UM.Theme.styles.small_tool_button
anchors.verticalCenter: viewOrientationControl.verticalCenter
onClicked:{
UM.Controller.rotateView("home", 0);
@ -273,7 +273,7 @@ Rectangle
Button
{
iconSource: UM.Theme.getIcon("view_top")
style: UM.Theme.styles.orientation_button
style: UM.Theme.styles.small_tool_button
anchors.verticalCenter: viewOrientationControl.verticalCenter
onClicked:{
UM.Controller.rotateView("y", 90);
@ -285,7 +285,7 @@ Rectangle
Button
{
iconSource: UM.Theme.getIcon("view_left")
style: UM.Theme.styles.orientation_button
style: UM.Theme.styles.small_tool_button
anchors.verticalCenter: viewOrientationControl.verticalCenter
onClicked:{
UM.Controller.rotateView("x", 90);
@ -297,7 +297,7 @@ Rectangle
Button
{
iconSource: UM.Theme.getIcon("view_right")
style: UM.Theme.styles.orientation_button
style: UM.Theme.styles.small_tool_button
anchors.verticalCenter: viewOrientationControl.verticalCenter
onClicked:{
UM.Controller.rotateView("x", -90);