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

Fix merge conflicts from master

Browse source 
CURA-4213
This commit is contained in:
Lipu Fei 2017-09-05 08:41:44 +02:00
commit 77adfe345d
129 changed files with 2061 additions and 1482 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Topbar.qml
View file

@ -59,7 +59,7 @@ Rectangle
onClicked: base.stopMonitoringPrint()
property color overlayColor: "transparent"
property string overlayIconSource: ""
text: catalog.i18nc("@title:tab","Prepare")
text: catalog.i18nc("@title:tab", "Prepare")
checkable: true
checked: !base.monitoringPrint
exclusiveGroup: sidebarHeaderBarGroup
@ -227,13 +227,13 @@ Rectangle
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: width
color: UM.Theme.getColor("text_reversed")
color: UM.Theme.getColor("text_emphasis")
source: UM.Theme.getIcon("arrow_bottom")
}
Label
{
id: sidebarComboBoxLabel
color: UM.Theme.getColor("text_reversed")
color: UM.Theme.getColor("sidebar_header_text_active")
text: control.text;
elide: Text.ElideRight;
anchors.left: parent.left;