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

Fix error in SidebarSimple

Browse Source 
Tweak SaveButton
Change splash to Developer Version
This commit is contained in:
fieldOfView 2015-11-12 11:23:49 +01:00
parent 211b45d9fb
commit 5cc75398c2
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/cura.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

17
resources/qml/SaveButton.qml
View File

@ -191,7 +191,7 @@ Rectangle {
Button { Button {
id: saveToButton id: saveToButton
property int resizedWidth property int resizedWidth
x: base.width - saveToButton.resizedWidth - UM.Theme.sizes.default_margin.width - UM.Theme.sizes.save_button_save_to_button.height x: base.width - saveToButton.resizedWidth - UM.Theme.sizes.default_margin.width - UM.Theme.sizes.save_button_save_to_button.height + 2
tooltip: UM.OutputDeviceManager.activeDeviceDescription; tooltip: UM.OutputDeviceManager.activeDeviceDescription;
enabled: base.progress > 0.99 && base.activity == true enabled: base.progress > 0.99 && base.activity == true
height: UM.Theme.sizes.save_button_save_to_button.height height: UM.Theme.sizes.save_button_save_to_button.height
@ -215,19 +215,8 @@ Rectangle {
control.hovered ? UM.Theme.colors.action_button_hovered : UM.Theme.colors.action_button control.hovered ? UM.Theme.colors.action_button_hovered : UM.Theme.colors.action_button
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
width: { width: {
var w = 0; saveToButton.resizedWidth = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)
if (base.width*0.55 > actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)){ return saveToButton.resizedWidth
saveToButton.resizedWidth = base.width*0.55
w = base.width*0.55
}
else {
saveToButton.resizedWidth = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)
w = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)
}
if(w < base.width * 0.55) {
w = base.width * 0.55;
}
return w;
} }
Label { Label {
id: actualLabel id: actualLabel

1
resources/qml/SidebarSimple.qml
View File

@ -63,7 +63,6 @@ Item
anchors.rightMargin: UM.Theme.sizes.default_margin.width - (UM.Theme.sizes.default_margin.width/4) anchors.rightMargin: UM.Theme.sizes.default_margin.width - (UM.Theme.sizes.default_margin.width/4)
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.sizes.default_margin.height anchors.topMargin: UM.Theme.sizes.default_margin.height
anchors.fill: width
Repeater { Repeater {
id: infillListView id: infillListView