3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 05:11:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'ui_rework_4_0' into place_print_info_back

Browse source
This commit is contained in:
Diego Prado Gesto 2018-12-07 13:19:19 +01:00
commit 46fa33fda5
52 changed files with 2296 additions and 2087 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/Cura.qml
View file

@ -88,7 +88,7 @@ UM.MainWindow
window: base
}
Rectangle
Item
{
id: headerBackground
anchors
@ -192,13 +192,6 @@ UM.MainWindow
}
}
Connections
{
target: stageMenu.item
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
}
Toolbar
{
// The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
@ -300,8 +293,6 @@ UM.MainWindow
// Every time the stage is changed.
property var printSetupSelector: Cura.PrintSetupSelector
{
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
width: UM.Theme.getSize("print_setup_widget").width
height: UM.Theme.getSize("stage_menu").height
headerCornerSide: RoundedRectangle.Direction.Right
@ -320,7 +311,7 @@ UM.MainWindow
}
}
SidebarTooltip
PrintSetupTooltip
{
id: tooltip
}