Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector

This commit is contained in:
Diego Prado Gesto 2018-11-26 17:53:24 +01:00
commit 6a2bbca7ce
7 changed files with 30 additions and 404 deletions

View file

@ -6,7 +6,7 @@ import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
import UM 1.0 as UM
import UM 1.4 as UM
import Cura 1.0 as Cura
Item
@ -55,11 +55,16 @@ Item
}
Button
UM.SimpleButton
{
id: playButton
iconSource: !is_simulation_playing ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg"
style: UM.Theme.styles.small_tool_button
width: UM.Theme.getSize("small_button").width
height: UM.Theme.getSize("small_button").height
hoverBackgroundColor: UM.Theme.getColor("small_button_hover")
hoverColor: UM.Theme.getColor("small_button_text_hover")
color: UM.Theme.getColor("small_button_text")
iconMargin: 0.5 * UM.Theme.getSize("wide_lining").width
visible: !UM.SimulationView.compatibilityMode
Connections