3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Adds an inactive states

Browse source 
contributes to: issue CURA-184
This commit is contained in:
Tamara Hogenhout 2015-09-22 15:32:01 +02:00
parent 8680d00ee1
commit c3036101f4
6 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Cura.qml
View file

@ -373,6 +373,9 @@ UM.MainWindow
{
id: viewModeButton
property bool verticalTooltip: true
property bool activity: Printer.getPlatformActivity;
enabled: viewModeButton.activity
anchors
{
top: parent.top;
@ -389,12 +392,13 @@ UM.MainWindow
id: viewMenu;
Instantiator
{
id: viewMenuInstantiator
model: UM.ViewModel { }
MenuItem
{
text: model.name;
text: model.name
checkable: true;
checked: model.active;
checked: model.active
exclusiveGroup: viewMenuGroup;
onTriggered: UM.Controller.setActiveView(model.id);
}

3
resources/qml/ProfileSetup.qml
View file

@ -19,7 +19,8 @@ Item{
anchors.top: base.top
width: base.width
height: UM.Theme.sizes.sidebar_setup.height
visible: UM.MachineManager.hasVariants;
//visible: UM.MachineManager.hasVariants;
visible: true
Label{
id: variantLabel

17
resources/qml/SaveButton.qml
View file

@ -110,6 +110,7 @@ Rectangle {
implicitWidth: base.width
implicitHeight: UM.Theme.sizes.sidebar_specs_bar.height
anchors.top: printJobRow.bottom
visible: base.progress > 0.99 && base.activity == true
Item{
id: time
width: childrenRect.width;
@ -193,7 +194,15 @@ Rectangle {
style: ButtonStyle {
background: Rectangle {
color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button
opacity: control.enabled ? 1.0 : 0.5
//Behavior on opacity { NumberAnimation { duration: 50; } }
color: {
if(control.enabled && control.hovered) {
return UM.Theme.colors.load_save_button_hover
} else {
return UM.Theme.colors.load_save_button
}
}
Behavior on color { ColorAnimation { duration: 50; } }
width: {
var w = 0;
@ -205,17 +214,17 @@ Rectangle {
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 {
id: actualLabel
opacity: control.enabled ? 1.0 : 0.5
//Behavior on opacity { NumberAnimation { duration: 50; } }
anchors.centerIn: parent
color: UM.Theme.colors.load_save_button_text
color: UM.Theme.colors.load_save_button_text
font: UM.Theme.fonts.default
text: control.text;
}

9
resources/qml/Toolbar.qml
View file

@ -14,6 +14,7 @@ Item {
width: buttons.width;
height: buttons.height
property int activeY
property bool activity: Printer.getPlatformActivity;
ColumnLayout {
id: buttons;
@ -33,6 +34,7 @@ Item {
checkable: true;
checked: model.active;
enabled: base.activity
style: UM.Theme.styles.tool_button;
@ -41,9 +43,10 @@ Item {
MouseArea {
anchors.fill: parent;
onClicked: {
parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
base.activeY = parent.y
if (base.activity){
parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
base.activeY = parent.y
}
}
}
}

8
resources/themes/cura/styles.qml
View file

@ -139,13 +139,10 @@ QtObject {
id: buttonFace;
anchors.fill: parent;
property bool down: control.pressed || (control.checkable && control.checked);
color: {
if(!control.enabled) {
return UM.Theme.colors.button_disabled;
} else if(control.checkable && control.checked && control.hovered) {
if(control.checkable && control.checked && control.hovered) {
return UM.Theme.colors.button_active_hover;
} else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.button_active;
@ -159,6 +156,7 @@ QtObject {
Label {
id: tool_button_arrow
opacity: !control.enabled ? 0.6 : 1.0
anchors.right: parent.right;
anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2
anchors.verticalCenter: parent.verticalCenter;
@ -173,7 +171,7 @@ QtObject {
label: Item {
Image {
anchors.centerIn: parent;
opacity: !control.enabled ? 0.6 : 1.0
source: control.iconSource;
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;

15
resources/themes/cura/theme.json
View file

@ -71,7 +71,7 @@
"button_active": [32, 166, 219, 255],
"button_active_hover": [77, 184, 226, 255],
"button_text": [255, 255, 255, 255],
"button_disabled": [245, 245, 245, 255],
"button_disabled": [0, 0, 0, 255],
"button_tooltip_text": [35, 35, 35, 255],
"toggle_active": [255, 255, 255, 255],
@ -82,7 +82,8 @@
"load_save_button": [0, 0, 0, 255],
"load_save_button_text": [255, 255, 255, 255],
"load_save_button_hover": [43, 45, 46, 255],
"load_save_button_active": [43, 45, 46, 255],
"load_save_button_inactive": [176, 184, 191, 255],
"load_save_button_inactive_text": [209, 214, 219, 255],
"scrollbar_background": [245, 245, 245, 255],
"scrollbar_handle": [12, 159, 227, 255],
@ -127,16 +128,6 @@
"tooltip": [255, 225, 146, 255],
"save_button_border": [205, 202, 201, 255],
"save_button_inactive": [205, 202, 201, 255],
"save_button_active": [12, 159, 227, 255],
"save_button_active_hover": [34, 150, 190, 255],
"save_button_safe_to_text": [255, 255, 255, 255],
"save_button_estimated_text": [140, 144, 154, 255],
"save_button_estimated_text_background": [255, 255, 255, 255],
"save_button_printtime_text": [12, 169, 227, 255],
"save_button_background": [249, 249, 249, 255],
"message_background": [255, 255, 255, 255],
"message_text": [32, 166, 219, 255],
"message_dismiss": [139, 143, 153, 255],