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

Adds the styling and wizardPages (more directly) to the generic wizard

Browse source 
contributes to #143
This commit is contained in:
Tamara Hogenhout 2015-08-13 10:48:33 +02:00
parent 2ef951ba0b
commit b14f3d98bc
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/AddMachineWizard.qml
View file

@ -9,8 +9,18 @@ import QtQuick.Window 2.1
import UM 1.0 as UM import UM 1.0 as UM
UM.Wizard{ UM.Wizard{
id: base // This part checks whether there is a printer -> if not some of the functions (delete for example) are disabled
// This part is optional
property bool printer: true property bool printer: true
file: "ultimaker2.json"
firstRun: printer ? false : true firstRun: printer ? false : true
//: Add Printer dialog title
wizardTitle: qsTr("Add Printer")
wizardPages: [
{
title: "Add Printer",
page: "AddMachine.qml"
}
]
} }

13
resources/themes/cura/theme.json
View file

@ -22,6 +22,11 @@
"size": 0.5, "size": 0.5,
"family": "Roboto" "family": "Roboto"
}, },
"caption": {
"size": 0.75,
"italic": true,
"family": "Roboto"
},
"sidebar_header": { "sidebar_header": {
"size": 0.75, "size": 0.75,
"capitalize": true, "capitalize": true,
@ -120,7 +125,7 @@
"save_button_printtime_text": [12, 169, 227, 255], "save_button_printtime_text": [12, 169, 227, 255],
"save_button_background": [249, 249, 249, 255], "save_button_background": [249, 249, 249, 255],
"message": [205, 202, 201, 255], "message": [160, 163, 171, 255],
"message_text": [35, 35, 35, 255], "message_text": [35, 35, 35, 255],
"tool_panel_background": [255, 255, 255, 255] "tool_panel_background": [255, 255, 255, 255]
@ -144,6 +149,9 @@
"setting_unit_margin": [0.5, 0.5], "setting_unit_margin": [0.5, 0.5],
"setting_text_maxwidth": [40.0, 0.0], "setting_text_maxwidth": [40.0, 0.0],
"standard_list_lineheight": [1.5, 1.5],
"standard_list_input": [20.0, 25.0],
"button": [4.25, 4.25], "button": [4.25, 4.25],
"button_icon": [2.9, 2.9], "button_icon": [2.9, 2.9],
@ -171,6 +179,9 @@
"save_button_label_margin": [0.5, 0.5], "save_button_label_margin": [0.5, 0.5],
"save_button_save_to_button": [0.3, 2.7], "save_button_save_to_button": [0.3, 2.7],
"modal_window_minimum": [30.0, 30.0],
"wizard_progress": [10.0, 0.0],
"message": [30.0, 5.0], "message": [30.0, 5.0],
"message_close": [1.25, 1.25] "message_close": [1.25, 1.25]
} }