3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects

Browse source
This commit is contained in:
Ghostkeeper 2017-01-26 10:56:10 +01:00
commit b377fdd2a6
10 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/ImageReader/ConfigUI.qml
View file

@ -156,11 +156,10 @@ UM.Dialog
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
Rectangle { Item {
width: 180 width: 180
height: 20 height: 20
Layout.fillWidth:true Layout.fillWidth: true
color: "transparent"
Slider { Slider {
id: smoothing id: smoothing

5
plugins/LayerView/LayerView.qml
View file

@ -41,8 +41,9 @@ Item
width: valueLabel.width + UM.Theme.getSize("default_margin").width width: valueLabel.width + UM.Theme.getSize("default_margin").width
Behavior on height { NumberAnimation { duration: 50; } } Behavior on height { NumberAnimation { duration: 50; } }
border.width: UM.Theme.getSize("default_lining").width; border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("slider_groove_border"); border.color: UM.Theme.getColor("slider_groove_border")
color: UM.Theme.getColor("tool_panel_background")
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false

4
resources/qml/AddMachineDialog.qml
View file

@ -74,10 +74,8 @@ UM.Dialog
width: machineList.width width: machineList.width
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Item
{ {
border.width: 0
color: "transparent";
height: UM.Theme.getSize("standard_list_lineheight").height height: UM.Theme.getSize("standard_list_lineheight").height
width: machineList.width 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 UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Rectangle { Item {
id: base id: base
property bool activity: Printer.getPlatformActivity property bool activity: Printer.getPlatformActivity
@ -29,7 +29,6 @@ Rectangle {
property variant printMaterialCosts: PrintInformation.materialCosts property variant printMaterialCosts: PrintInformation.materialCosts
height: childrenRect.height height: childrenRect.height
color: "transparent"
Connections Connections
{ {
@ -84,9 +83,8 @@ Rectangle {
} }
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Item
{ {
color: "transparent"
UM.RecolorImage UM.RecolorImage
{ {
width: UM.Theme.getSize("save_button_specs_icons").width; 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 UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Rectangle { Item {
id: base id: base
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
color: "transparent"
Connections Connections
{ {

3
resources/qml/MonitorButton.qml
View file

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

8
resources/qml/SaveButton.qml
View file

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

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

@ -145,8 +145,6 @@ Item {
height: parent.height; height: parent.height;
width: height; width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control")
color: UM.Theme.getColor("setting_control_button") color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button")
@ -173,8 +171,6 @@ Item {
height: parent.height; height: parent.height;
width: height; width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
color: UM.Theme.getColor("setting_control_button") color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover") 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") color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover") hoverColor: UM.Theme.getColor("setting_control_button_hover")

2
resources/qml/SidebarHeader.qml
View file

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

6
resources/qml/SidebarSimple.qml
View file

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