3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 23:31:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'master' into layer_view3_cleanup

Browse source
This commit is contained in:
Jack Ha 2017-01-30 11:25:55 +01:00
commit 2f9618f2ad
60 changed files with 30062 additions and 10918 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/AddMachineDialog.qml
View file

@ -74,10 +74,8 @@ UM.Dialog
width: machineList.width
style: ButtonStyle
{
background: Rectangle
background: Item
{
border.width: 0
color: "transparent";
height: UM.Theme.getSize("standard_list_lineheight").height
width: machineList.width
}

6
resources/qml/JobSpecs.qml
View file

@ -9,7 +9,7 @@ import QtQuick.Layouts 1.1
import UM 1.1 as UM
import Cura 1.0 as Cura
Rectangle {
Item {
id: base
property bool activity: Printer.getPlatformActivity
@ -29,7 +29,6 @@ Rectangle {
property variant printMaterialCosts: PrintInformation.materialCosts
height: childrenRect.height
color: "transparent"
Connections
{
@ -84,9 +83,8 @@ Rectangle {
}
style: ButtonStyle
{
background: Rectangle
background: Item
{
color: "transparent"
UM.RecolorImage
{
width: UM.Theme.getSize("save_button_specs_icons").width;

3
resources/qml/Legend.qml
View file

@ -9,14 +9,13 @@ import QtQuick.Layouts 1.1
import UM 1.1 as UM
import Cura 1.0 as Cura
Rectangle {
Item {
id: base
UM.I18nCatalog { id: catalog; name:"cura"}
width: childrenRect.width
height: childrenRect.height
color: "transparent"
Connections
{

3
resources/qml/MonitorButton.qml
View file

@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1
import UM 1.1 as UM
import Cura 1.0 as Cura
Rectangle
Item
{
id: base;
UM.I18nCatalog { id: catalog; name:"cura"}
@ -20,7 +20,6 @@ Rectangle
property real progress: printerConnected ? Cura.MachineManager.printerOutputDevices[0].progress : 0
property int backendState: UM.Backend.state
property bool showProgress: {
// determine if we need to show the progress bar + percentage
if(!printerConnected || !printerAcceptsCommands) {

1
resources/qml/Preferences/GeneralPage.qml
View file

@ -97,6 +97,7 @@ UM.PreferencesPage
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" })
}

8
resources/qml/SaveButton.qml
View file

@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1
import UM 1.1 as UM
Rectangle {
Item {
id: base;
UM.I18nCatalog { id: catalog; name:"cura"}
@ -53,7 +53,7 @@ Rectangle {
text: statusText;
}
Rectangle{
Rectangle {
id: progressBar
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("progressbar").height
@ -64,7 +64,7 @@ Rectangle {
radius: UM.Theme.getSize("progressbar_radius").width
color: UM.Theme.getColor("progressbar_background")
Rectangle{
Rectangle {
width: Math.max(parent.width * base.progress)
height: parent.height
color: UM.Theme.getColor("progressbar_control")
@ -73,7 +73,7 @@ Rectangle {
}
}
Rectangle{
Item {
id: saveRow
width: base.width
height: saveToButton.height

6
resources/qml/Settings/SettingItem.qml
View file

@ -145,8 +145,6 @@ Item {
height: parent.height;
width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button")
@ -173,8 +171,6 @@ Item {
height: parent.height;
width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
@ -278,8 +274,6 @@ Item {
}
}
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")

68
resources/qml/Sidebar.qml
View file

@ -175,6 +175,9 @@ Rectangle
height: UM.Theme.getSize("sidebar_header").height
onClicked: monitoringPrint = false
iconSource: UM.Theme.getIcon("tab_settings");
property color overlayColor: "transparent"
property string overlayIconSource: ""
checkable: true
checked: !monitoringPrint
exclusiveGroup: sidebarHeaderBarGroup
@ -203,15 +206,53 @@ Rectangle
width: height
height: UM.Theme.getSize("sidebar_header").height
onClicked: monitoringPrint = true
iconSource: {
if(!printerConnected)
return UM.Theme.getIcon("tab_monitor");
else if(!printerAcceptsCommands)
return UM.Theme.getIcon("tab_monitor_unknown");
iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
property color overlayColor:
{
if(!printerAcceptsCommands)
{
return UM.Theme.getColor("status_unknown");
}
if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
{
return UM.Theme.getIcon("tab_monitor_busy");
return UM.Theme.getColor("status_busy");
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "printing":
case "pre_print":
case "wait_cleanup":
case "pausing":
case "resuming":
return UM.Theme.getColor("status_busy");
case "ready":
case "":
return UM.Theme.getColor("status_ready");
case "paused":
return UM.Theme.getColor("status_paused");
case "error":
return UM.Theme.getColor("status_stopped");
case "offline":
return UM.Theme.getColor("status_offline");
default:
return UM.Theme.getColor("text_reversed");
}
}
property string overlayIconSource:
{
if(!printerConnected)
{
return "";
}
else if(!printerAcceptsCommands)
{
return UM.Theme.getIcon("tab_status_unknown");
}
if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
{
return UM.Theme.getIcon("tab_status_busy");
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
@ -219,20 +260,23 @@ Rectangle
case "printing":
case "pre_print":
case "wait_cleanup":
return UM.Theme.getIcon("tab_monitor_busy");
case "pausing":
case "resuming":
return UM.Theme.getIcon("tab_status_busy");
case "ready":
case "":
return UM.Theme.getIcon("tab_monitor_connected")
return UM.Theme.getIcon("tab_status_connected")
case "paused":
return UM.Theme.getIcon("tab_monitor_paused")
return UM.Theme.getIcon("tab_status_paused")
case "error":
return UM.Theme.getIcon("tab_monitor_stopped")
return UM.Theme.getIcon("tab_status_stopped")
case "offline":
return UM.Theme.getIcon("tab_monitor_offline")
return UM.Theme.getIcon("tab_status_offline")
default:
return UM.Theme.getIcon("tab_monitor")
return ""
}
}
checkable: true
checked: monitoringPrint
exclusiveGroup: sidebarHeaderBarGroup

2
resources/qml/SidebarHeader.qml
View file

@ -201,7 +201,7 @@ Column
color: UM.Theme.getColor("text");
}
Rectangle
Item
{
anchors.verticalCenter: parent.verticalCenter

6
resources/qml/SidebarSimple.qml
View file

@ -25,7 +25,7 @@ Item
Component.onDestruction: PrintInformation.enabled = false
UM.I18nCatalog { id: catalog; name:"cura"}
Rectangle
Item
{
id: infillCellLeft
anchors.top: parent.top
@ -216,7 +216,7 @@ Item
}
}
Rectangle
Item
{
id: helpersCell
anchors.top: infillCellRight.bottom
@ -461,7 +461,7 @@ Item
supportExtruderCombobox.updateCurrentColor();
}
Rectangle
Item
{
id: tipsCell
anchors.top: helpersCell.bottom