GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tweak JobSpecs

Browse Source 
Tweak fonts-sizes
Replace splash
This commit is contained in:
fieldOfView 2015-11-17 13:30:04 +01:00
parent d41db89254
commit e293501e37
3 changed files with 32 additions and 49 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: 20 KiB

70
resources/qml/JobSpecs.qml
View File

@ -28,8 +28,8 @@ Rectangle {
property variant printDuration: PrintInformation.currentPrintTime; property variant printDuration: PrintInformation.currentPrintTime;
property real printMaterialAmount: PrintInformation.materialAmount; property real printMaterialAmount: PrintInformation.materialAmount;
width: 240 width: 200
height: 50 height: 55
color: "transparent" color: "transparent"
function createFileName(){ function createFileName(){
@ -76,7 +76,6 @@ Rectangle {
TextField { TextField {
id: printJobTextfield id: printJobTextfield
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width;
height: UM.Theme.sizes.sidebar_inputFields.height height: UM.Theme.sizes.sidebar_inputFields.height
width: base.width width: base.width
property int unremovableSpacing: 5 property int unremovableSpacing: 5
@ -101,68 +100,61 @@ Rectangle {
} }
} }
Label{
id: boundingSpec
anchors.top: printJobTextfield.bottom
anchors.right: parent.right
font: UM.Theme.fonts.small
color: UM.Theme.colors.text_subtext
text: "0.0 x 0.0 x 0.0 mm"
}
Rectangle { Rectangle {
id: specsRow id: specsRow
implicitWidth: base.width anchors.top: boundingSpec.bottom
implicitHeight: UM.Theme.sizes.sidebar_specs_bar.height anchors.right: parent.right
anchors.top: printJobTextfield.bottom
color: "transparent" color: "transparent"
visible: base.progress > 0.99 && base.activity == true //visible: base.progress > 0.99 && base.activity == true
Item{ Item{
id: time width: parent.width
width: childrenRect.width;
height: parent.height height: parent.height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width
anchors.top: parent.top
visible: base.printMaterialAmount > 0 ? true : false
UM.RecolorImage { UM.RecolorImage {
id: timeIcon id: timeIcon
anchors.verticalCenter: parent.verticalCenter anchors.right: timeSpec.left
anchors.left: parent.left anchors.rightMargin: UM.Theme.sizes.default_margin.width/2
width: UM.Theme.sizes.save_button_specs_icons.width width: UM.Theme.sizes.save_button_specs_icons.width
height: UM.Theme.sizes.save_button_specs_icons.height height: UM.Theme.sizes.save_button_specs_icons.height
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.colors.text_hover color: UM.Theme.colors.text_subtext
source: UM.Theme.icons.print_time; source: UM.Theme.icons.print_time;
} }
Label{ Label{
id: timeSpec id: timeSpec
anchors.verticalCenter: parent.verticalCenter anchors.right: lengthIcon.left
anchors.left: timeIcon.right anchors.rightMargin: UM.Theme.sizes.default_margin.width
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 font: UM.Theme.fonts.small
font: UM.Theme.fonts.default color: UM.Theme.colors.text_subtext
color: UM.Theme.colors.text text: (!base.printDuration || !base.printDuration.valid) ? "00h 00min" : base.printDuration.getDisplayString(UM.DurationFormat.Short)
text: (!base.printDuration || !base.printDuration.valid) ? "" : base.printDuration.getDisplayString(UM.DurationFormat.Short)
} }
}
Item{
width: parent.width / 100 * 55
height: parent.height
anchors.left: time.right
anchors.leftMargin: UM.Theme.sizes.default_margin.width;
anchors.top: parent.top
visible: base.printMaterialAmount > 0 ? true : false
UM.RecolorImage { UM.RecolorImage {
id: lengthIcon id: lengthIcon
anchors.verticalCenter: parent.verticalCenter anchors.right: lengthSpec.left
anchors.left: parent.left anchors.rightMargin: UM.Theme.sizes.default_margin.width/2
width: UM.Theme.sizes.save_button_specs_icons.width width: UM.Theme.sizes.save_button_specs_icons.width
height: UM.Theme.sizes.save_button_specs_icons.height height: UM.Theme.sizes.save_button_specs_icons.height
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.colors.text_hover color: UM.Theme.colors.text_subtext
source: UM.Theme.icons.category_material; source: UM.Theme.icons.category_material;
} }
Label{ Label{
id: lengthSpec id: lengthSpec
anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right
anchors.left: lengthIcon.right font: UM.Theme.fonts.small
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 color: UM.Theme.colors.text_subtext
font: UM.Theme.fonts.default text: base.printMaterialAmount <= 0 ? "0.0 m" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount)
color: UM.Theme.colors.text
text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount)
} }
} }
} }

11
resources/themes/cura/theme.json
View File

@ -9,17 +9,8 @@
"size": 1.15, "size": 1.15,
"family": "Proxima Nova Rg" "family": "Proxima Nova Rg"
}, },
"default_allcaps": {
"size": 1,
"capitalize": true,
"family": "Proxima Nova Rg"
},
"small": { "small": {
"size": 0.75, "size": 1.0,
"family": "Proxima Nova Rg"
},
"tiny": {
"size": 0.5,
"family": "Proxima Nova Rg" "family": "Proxima Nova Rg"
}, },
"caption": { "caption": {