GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

adapts the sizes between buttons etc

Browse Source 
fixes: issue CURA-194
This commit is contained in:
Tamara Hogenhout 2015-09-21 14:31:43 +02:00
parent c352c6f369
commit d6793bc197
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Cura.qml
View File

@ -413,7 +413,7 @@ UM.MainWindow
anchors { anchors {
left: parent.left left: parent.left
top: parent.top top: parent.top
topMargin: UM.Theme.sizes.default_margin.height + UM.Theme.sizes.button.height topMargin: UM.Theme.sizes.window_margin.height + UM.Theme.sizes.button.height
//horizontalCenter: parent.horizontalCenter //horizontalCenter: parent.horizontalCenter
//horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2) //horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
//top: parent.top; //top: parent.top;

2
resources/qml/SaveButton.qml
View File

@ -62,7 +62,7 @@ Rectangle {
Rectangle{ Rectangle{
id: printJobRow id: printJobRow
implicitWidth: base.width; implicitWidth: base.width;
implicitHeight: UM.Theme.sizes.sidebar_header.height implicitHeight: UM.Theme.sizes.save_button_header.height
anchors.top: parent.top anchors.top: parent.top
color: UM.Theme.colors.sidebar_header_bar color: UM.Theme.colors.sidebar_header_bar
Label{ Label{

5
resources/qml/SidebarHeader.qml
View File

@ -39,18 +39,17 @@ Item
Rectangle{ Rectangle{
id: settingsModeSelection id: settingsModeSelection
width: parent.width/100*55 width: parent.width/100*55
height: childrenRect.height - UM.Theme.sizes.default_margin.width; height: UM.Theme.sizes.sidebar_header_mode_toggle.height
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width; anchors.rightMargin: UM.Theme.sizes.default_margin.width;
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Component{ Component{
id: wizardDelegate id: wizardDelegate
Button { Button {
id: simpleModeButton
height: settingsModeSelection.height height: settingsModeSelection.height
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: model.index * (settingsModeSelection.width / 2) anchors.leftMargin: model.index * (settingsModeSelection.width / 2)
anchors.top: parent.top anchors.verticalCenter: parent.verticalCenter
width: parent.width / 2 width: parent.width / 2
text: model.text text: model.text
exclusiveGroup: modeMenuGroup; exclusiveGroup: modeMenuGroup;

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

@ -147,13 +147,14 @@
}, },
"sizes": { "sizes": {
"window_margin": [2.0, 2.0], "window_margin": [1.5, 1.5],
"default_margin": [1.0, 1.0], "default_margin": [1.0, 1.0],
"default_lining": [0.1, 0.1], "default_lining": [0.1, 0.1],
"logo": [9.5, 2.0], "logo": [9.5, 2.0],
"sidebar": [26.0, 10.0], "sidebar": [26.0, 10.0],
"sidebar_header": [0.0, 3.2], "sidebar_header": [0.0, 3.8],
"sidebar_header_mode_toggle": [0.0, 2.4],
"sidebar_setup": [0.0, 2.8], "sidebar_setup": [0.0, 2.8],
"sidebar_subParts": [0.0, 2.4], "sidebar_subParts": [0.0, 2.4],
"sidebar_specs_bar": [0.0, 2.2], "sidebar_specs_bar": [0.0, 2.2],
@ -196,6 +197,7 @@
"tooltip_margins": [1.0, 1.0], "tooltip_margins": [1.0, 1.0],
"save_button_border": [0.06, 0.06], "save_button_border": [0.06, 0.06],
"save_button_header": [0.0, 3.2],
"save_button_text_margin": [0.3, 0.6], "save_button_text_margin": [0.3, 0.6],
"save_button_slicing_bar": [0.0, 2.2], "save_button_slicing_bar": [0.0, 2.2],
"save_button_label_margin": [0.5, 0.5], "save_button_label_margin": [0.5, 0.5],