GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 14:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding style

Browse Source 
CURA-4147
This commit is contained in:
Lipu Fei 2017-08-18 13:38:12 +02:00
parent bab61b7f47
commit 662e3b9cd1
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/Sidebar.qml
View File

@ -244,7 +244,7 @@ Rectangle
} }
return result; return result;
} }
enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1 enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
@ -252,7 +252,7 @@ Rectangle
tooltip: Cura.MachineManager.activeQualityName tooltip: Cura.MachineManager.activeQualityName
style: UM.Theme.styles.sidebar_header_button style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true; activeFocusOnPress: true;
property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported property var valueWarning: !Cura.MachineManager.isActiveQualitySupported
menu: ProfileMenu { } menu: ProfileMenu { }
UM.SimpleButton UM.SimpleButton
@ -278,7 +278,7 @@ Rectangle
onEntered: onEntered:
{ {
var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.") var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
base.showTooltip(globalProfileRow, Qt.point(- UM.Theme.getSize("default_margin").width, 0), content) base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("default_margin").width, 0), content)
} }
onExited: base.hideTooltip() onExited: base.hideTooltip()
} }

28
resources/qml/SidebarHeader.qml
View File

@ -160,7 +160,7 @@ Column
visible: !extruderSelectionRow.visible visible: !extruderSelectionRow.visible
} }
//Print core row // Print core row
Item Item
{ {
id: printCoreRow id: printCoreRow
@ -199,7 +199,8 @@ Column
menu: NozzleMenu { extruderIndex: base.currentExtruderIndex } menu: NozzleMenu { extruderIndex: base.currentExtruderIndex }
} }
} }
//Material Row
// Material Row
Item Item
{ {
id: materialRow id: materialRow
@ -254,7 +255,8 @@ Column
menu: MaterialMenu { extruderIndex: base.currentExtruderIndex } menu: MaterialMenu { extruderIndex: base.currentExtruderIndex }
} }
} }
//Material info row
// Material info row
Item Item
{ {
id: materialInfoRow id: materialInfoRow
@ -286,10 +288,14 @@ Column
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: color:
{ {
if (! Cura.MachineManager.isActiveQualitySupported) if (!Cura.MachineManager.isActiveQualitySupported)
{
UM.Theme.getColor("setting_validation_error"); UM.Theme.getColor("setting_validation_error");
}
else else
{
UM.Theme.getColor("text"); UM.Theme.getColor("text");
}
} }
MouseArea MouseArea
@ -309,13 +315,13 @@ Column
{ {
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com."); var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
base.showTooltip( base.showTooltip(
materialInfoRow, materialInfoRow,
Qt.point(- UM.Theme.getSize("default_margin").width,0), Qt.point(-UM.Theme.getSize("default_margin").width, 0),
catalog.i18nc("@tooltip", content) catalog.i18nc("@tooltip", content)
); );
} }
onExited:base.hideTooltip(); onExited: base.hideTooltip();
} }
} }
@ -331,7 +337,7 @@ Column
//sourceSize.height: width + 5 //sourceSize.height: width + 5
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
visible: ! Cura.MachineManager.isActiveQualitySupported visible: !Cura.MachineManager.isActiveQualitySupported
} }
} }
} }