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

CURA-5035 Review changes

Browse source
This commit is contained in:
Ian Paschal 2018-04-20 13:26:23 +02:00
parent 7f622eb300
commit 668a92952c
13 changed files with 52 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -70,7 +70,7 @@ Window
{ {
id: footer id: footer
visible: toolbox.restartRequired visible: toolbox.restartRequired
height: toolbox.restartRequired ? UM.Theme.getSize("base_unit").height * 5 : 0 height: toolbox.restartRequired ? UM.Theme.getSize("toolbox_footer").height : 0
} }
// TODO: Clean this up: // TODO: Clean this up:
Connections Connections

16
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
View file

@ -22,9 +22,9 @@ Item
{ {
left: sidebar.right left: sidebar.right
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("double_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
} }
height: UM.Theme.getSize("base_unit").height * 12 height: UM.Theme.getSize("toolbox_detail_header").height
Image Image
{ {
id: thumbnail id: thumbnail
@ -36,8 +36,8 @@ Item
{ {
top: parent.top top: parent.top
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("double_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
topMargin: UM.Theme.getSize("double_margin").height topMargin: UM.Theme.getSize("wide_margin").height
} }
} }
@ -50,7 +50,7 @@ Item
left: thumbnail.right left: thumbnail.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("double_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
bottomMargin: UM.Theme.getSize("default_margin").height bottomMargin: UM.Theme.getSize("default_margin").height
} }
text: details.name text: details.name
@ -79,7 +79,7 @@ Item
left: description.left left: description.left
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: childrenRect.width width: childrenRect.width
Label Label
{ {
@ -98,8 +98,8 @@ Item
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("default_margin").height/2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: UM.Theme.getSize("base_unit").width * 12 // width: UM.Theme.getSize("base_unit").width * 12
Label Label
{ {
text: text:

4
plugins/Toolbox/resources/qml/ToolboxBackColumn.qml
View file

@ -10,12 +10,12 @@ Item
{ {
id: sidebar id: sidebar
height: parent.height height: parent.height
width: UM.Theme.getSize("base_unit").width * 6 width: UM.Theme.getSize("toolbox_back_column").width
anchors anchors
{ {
top: parent.top top: parent.top
left: parent.left left: parent.left
topMargin: UM.Theme.getSize("double_margin").height topMargin: UM.Theme.getSize("wide_margin").height
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }

4
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View file

@ -19,8 +19,8 @@ Item
anchors anchors
{ {
right: base.right right: base.right
topMargin: UM.Theme.getSize("double_margin").height topMargin: UM.Theme.getSize("wide_margin").height
bottomMargin: UM.Theme.getSize("double_margin").height bottomMargin: UM.Theme.getSize("wide_margin").height
top: parent.top top: parent.top
} }
height: childrenRect.height height: childrenRect.height

22
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View file

@ -23,9 +23,9 @@ Item
{ {
left: sidebar.right left: sidebar.right
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("double_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
} }
height: UM.Theme.getSize("base_unit").height * 12 height: UM.Theme.getSize("toolbox_detail_header").height
Image Image
{ {
id: thumbnail id: thumbnail
@ -37,8 +37,8 @@ Item
{ {
top: parent.top top: parent.top
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("double_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
topMargin: UM.Theme.getSize("double_margin").height topMargin: UM.Theme.getSize("wide_margin").height
} }
} }
@ -51,7 +51,7 @@ Item
left: thumbnail.right left: thumbnail.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("double_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
bottomMargin: UM.Theme.getSize("default_margin").height bottomMargin: UM.Theme.getSize("default_margin").height
} }
text: details.name text: details.name
@ -70,7 +70,7 @@ Item
left: title.left left: title.left
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: childrenRect.width width: childrenRect.width
Label Label
{ {
@ -101,8 +101,8 @@ Item
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("default_margin").height/2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: UM.Theme.getSize("base_unit").width * 12 // width: UM.Theme.getSize("base_unit").width * 12
Label Label
{ {
text: details.version text: details.version
@ -111,7 +111,11 @@ Item
} }
Label Label
{ {
text: Qt.formatDateTime(details.last_updated, "dd MMM yyyy") text:
{
var date = new Date(details.last_updated)
return date.toLocaleString(Qt.locale())
}
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }

4
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

@ -9,8 +9,8 @@ import UM 1.1 as UM
Item Item
{ {
property bool installed: toolbox.isInstalled(model.id) property bool installed: toolbox.isInstalled(model.id)
width: base.width - UM.Theme.getSize("double_margin").width width: base.width - UM.Theme.getSize("wide_margin").width
height: UM.Theme.getSize("base_unit").height * 8 height: UM.Theme.getSize("toolbox_detail_tile").height
Column Column
{ {
anchors anchors

4
plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
View file

@ -23,7 +23,7 @@ Item
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: Math.floor(UM.Theme.getSize("base_unit").width / 2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").width)
Rectangle Rectangle
{ {
id: thumbnail id: thumbnail
@ -44,7 +44,7 @@ Item
Column Column
{ {
width: parent.width - thumbnail.width - parent.spacing width: parent.width - thumbnail.width - parent.spacing
spacing: Math.floor(UM.Theme.getSize("base_unit").width / 2) spacing: Math.floor(UM.Theme.getSize("narrow_margin").width)
Label Label
{ {
id: name id: name

2
plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
View file

@ -18,7 +18,7 @@ ScrollView
{ {
width: base.width width: base.width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
padding: UM.Theme.getSize("double_margin").height padding: UM.Theme.getSize("wide_margin").height
height: childrenRect.height + 2 * padding height: childrenRect.height + 2 * padding
ToolboxDownloadsShowcase ToolboxDownloadsShowcase
{ {

2
plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
View file

@ -14,7 +14,7 @@ Column
{ {
id: base id: base
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("base_unit").height spacing: UM.Theme.getSize("toolbox_showcase_spacing").width
Label Label
{ {
id: heading id: heading

4
plugins/Toolbox/resources/qml/ToolboxFooter.qml
View file

@ -22,7 +22,7 @@ Item
{ {
top: restartButton.top top: restartButton.top
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("double_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
right: restartButton.right right: restartButton.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }
@ -36,7 +36,7 @@ Item
top: parent.top top: parent.top
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("double_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
} }
visible: toolbox.restartRequired visible: toolbox.restartRequired
iconName: "dialog-restart" iconName: "dialog-restart"

6
plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
View file

@ -22,9 +22,9 @@ ScrollView
{ {
right: parent.right right: parent.right
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("double_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
topMargin: UM.Theme.getSize("double_margin").height topMargin: UM.Theme.getSize("wide_margin").height
bottomMargin: UM.Theme.getSize("double_margin").height bottomMargin: UM.Theme.getSize("wide_margin").height
top: parent.top top: parent.top
} }
height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height

4
plugins/Toolbox/resources/qml/ToolboxTabButton.qml
View file

@ -14,8 +14,8 @@ Button
background: Rectangle background: Rectangle
{ {
color: "transparent" color: "transparent"
implicitWidth: UM.Theme.getSize("base_unit").height * 8 implicitWidth: UM.Theme.getSize("toolbox_header_tab").width
implicitHeight: UM.Theme.getSize("base_unit").height * 4 implicitHeight: UM.Theme.getSize("toolbox_header_tab").height
Rectangle Rectangle
{ {
visible: control.active visible: control.active

17
resources/themes/cura-light/theme.json
View file

@ -323,13 +323,16 @@
"sizes": { "sizes": {
"base_unit": [1.0, 1.0], "base_unit": [1.0, 1.0],
"window_minimum_size": [70, 50], "window_minimum_size": [70, 50],
"window_margin": [1.0, 1.0],
"default_margin": [1.0, 1.0],
"double_margin": [2.0, 2.0],
"default_lining": [0.08, 0.08], "default_lining": [0.08, 0.08],
"default_arrow": [0.8, 0.8], "default_arrow": [0.8, 0.8],
"logo": [7.6, 1.6], "logo": [7.6, 1.6],
"default_margin": [1.0, 1.0],
"wide_margin": [2.0, 2.0],
"narrow_margin": [0.5, 0.5],
"window_margin": [1.0, 1.0],
"extruder_button_material_margin": [0.70, 0.9], "extruder_button_material_margin": [0.70, 0.9],
"extruder_button_material": [0.75, 0.75], "extruder_button_material": [0.75, 0.75],
@ -443,6 +446,12 @@
"toolbox_thumbnail_small": [6.0, 6.0], "toolbox_thumbnail_small": [6.0, 6.0],
"toolbox_thumbnail_medium": [8.0, 8.0], "toolbox_thumbnail_medium": [8.0, 8.0],
"toolbox_thumbnail_large": [12.0, 12.0] "toolbox_thumbnail_large": [12.0, 12.0],
"toolbox_footer": [1.0, 5.0],
"toolbox_showcase_spacing": [1.0, 1.0],
"toolbox_header_tab": [8.0, 4.0],
"toolbox_detail_header": [1.0, 12.0],
"toolbox_detail_tile": [1.0, 8.0],
"toolbox_back_column": [6.0, 1.0]
} }
} }