From b14f3d98bce1d52b15e7f3ab918faaaee6ada745 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Thu, 13 Aug 2015 10:48:33 +0200 Subject: [PATCH] Adds the styling and wizardPages (more directly) to the generic wizard contributes to #143 --- resources/qml/AddMachineWizard.qml | 14 ++++++++++++-- resources/themes/cura/theme.json | 13 ++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/resources/qml/AddMachineWizard.qml b/resources/qml/AddMachineWizard.qml index 5d6608a7da..8a9070818a 100644 --- a/resources/qml/AddMachineWizard.qml +++ b/resources/qml/AddMachineWizard.qml @@ -9,8 +9,18 @@ import QtQuick.Window 2.1 import UM 1.0 as UM 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 - file: "ultimaker2.json" firstRun: printer ? false : true + + //: Add Printer dialog title + wizardTitle: qsTr("Add Printer") + + wizardPages: [ + { + title: "Add Printer", + page: "AddMachine.qml" + } + ] } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 5b247045b8..011b60983c 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -22,6 +22,11 @@ "size": 0.5, "family": "Roboto" }, + "caption": { + "size": 0.75, + "italic": true, + "family": "Roboto" + }, "sidebar_header": { "size": 0.75, "capitalize": true, @@ -120,7 +125,7 @@ "save_button_printtime_text": [12, 169, 227, 255], "save_button_background": [249, 249, 249, 255], - "message": [205, 202, 201, 255], + "message": [160, 163, 171, 255], "message_text": [35, 35, 35, 255], "tool_panel_background": [255, 255, 255, 255] @@ -144,6 +149,9 @@ "setting_unit_margin": [0.5, 0.5], "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_icon": [2.9, 2.9], @@ -171,6 +179,9 @@ "save_button_label_margin": [0.5, 0.5], "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_close": [1.25, 1.25] }