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

This commit is contained in:
Jack Ha 2016-07-20 11:13:55 +02:00
commit be1ea9bffd
2 changed files with 25 additions and 17 deletions

View file

@ -321,23 +321,7 @@ UM.MainWindow
sourceSize.height: height;
}
Button
{
id: viewModeButton
anchors
{
top: toolbar.bottom;
topMargin: UM.Theme.getSize("window_margin").height;
left: parent.left;
}
text: catalog.i18nc("@action:button","View Mode");
iconSource: UM.Theme.getIcon("viewmode");
style: UM.Theme.styles.tool_button;
tooltip: '';
menu: ViewMenu { }
}
Toolbar
{
@ -367,6 +351,24 @@ UM.MainWindow
width: UM.Theme.getSize("sidebar").width;
}
Button
{
id: viewModeButton
anchors
{
top: toolbar.bottom;
topMargin: UM.Theme.getSize("window_margin").height;
left: parent.left;
}
text: catalog.i18nc("@action:button","View Mode");
iconSource: UM.Theme.getIcon("viewmode");
style: UM.Theme.styles.tool_button;
tooltip: '';
menu: ViewMenu { }
}
Rectangle
{
id: viewportOverlay