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

Insert nescessary strings for Addmachine Wizard for string freeze

Browse source 
Contributes to: issue CURA-132
This commit is contained in:
Tamara Hogenhout 2015-09-11 17:41:24 +02:00
parent b816f0b03b
commit cf4bd45f3f
5 changed files with 86 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/WizardPages/AddMachine.qml
View file

@ -206,7 +206,6 @@ Item
// Insert new pages (if any)
for(var i = 0; i < pages.length; i++)
{
console.log(pages[i])
switch(pages[i]) {
case "SelectUpgradedParts":
base.wizard.appendPage(Qt.resolvedUrl("SelectUpgradedParts.qml"), catalog.i18nc("@title", "Select Upgraded Parts"));

32
resources/qml/WizardPages/Bedleveling.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1
import UM 1.0 as UM
import UM 1.1 as UM
Column
{
@ -19,14 +19,29 @@ Column
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer
Component.onCompleted: printer_connection.homeHead()
UM.I18nCatalog { id: catalog; name:"cura"}
Label
{
text: ""
//Component.onCompleted:console.log(UM.Models.settingsModel.getMachineSetting("machine_width"))
text: catalog.i18nc("@title", "Bed Leveling")
font.pointSize: 18;
}
Label
{
id: pageDescription
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.")
}
Label
{
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "For every postition; insert a piece of paper under the nozzle and adjust the print bed height. The print bed height is right when the paper is slightly gripped by the tip of the nozzle.")
}
Button
{
text: catalog.i18nc("@action:button","Move to next position");
text: catalog.i18nc("@action:button","Move to Next Position");
onClicked:
{
if(wizardPage.leveling_state == 0)
@ -41,15 +56,18 @@ Column
{
printer_connection.moveHead(0, 0 ,0)
}
wizardPage.leveling_state++
}
}
Button
{
text: catalog.i18nc("@action:button","Skip Bedleveling");
}
function threePointLeveling(width, height)
{
}
}
}

13
resources/qml/WizardPages/SelectUpgradedParts.qml
View file

@ -26,7 +26,7 @@ Item
{
id: pageTitle
width: parent.width
text: wizardPage.title
text: catalog.i18nc("@title", "Select Upgraded Parts")
wrapMode: Text.WordWrap
font.pointSize: 18
}
@ -51,7 +51,7 @@ Item
}
CheckBox
{
text: catalog.i18nc("@option:check","Heated printer bed (kit)")
text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
}
CheckBox
{
@ -67,14 +67,7 @@ Item
{
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","If you have an Ultimaker bought after october 2012 you will have the Extruder drive upgrade. If you do not have this upgrade, it is highly recommended to improve reliability.");
}
Label
{
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","This upgrade can be bought from the Ultimaker webshop or found on thingiverse as thing:26094");
text: catalog.i18nc("@label","If you bought your Ultimaker after october 2012 you will have the Extruder drive upgrade. If you do not have this upgrade, it is highly recommended to improve reliability. This upgrade can be bought from the Ultimaker webshop or found on thingiverse as thing:26094");
}
}
}

22
resources/qml/WizardPages/UltimakerCheckup.qml
View file

@ -34,14 +34,28 @@ Column
}
Label
{
text: parent.title
text: catalog.i18nc("@title", "Check Printer")
font.pointSize: 18;
}
Label
{
//: Add Printer wizard page description
text: catalog.i18nc("@label","It's a good idea to do a few sanity checks on your Ultimaker. \n You can skip these if you know your machine is functional");
text: catalog.i18nc("@label","It's a good idea to do a few sanity checks on your Ultimaker. You can skip this step if you know your machine is functional");
}
Button
{
text: catalog.i18nc("@action:button","Start Printer Check");
enabled: manager.progress >= 100;
onClicked: base.visible = false;
}
Button
{
text: catalog.i18nc("@action:button","Skip Printer Check");
enabled: manager.progress >= 100;
onClicked: base.visible = false;
}
Row
@ -102,7 +116,7 @@ Column
}
Button
{
text: catalog.i18nc("@action:button","Start heating")
text: catalog.i18nc("@action:button","Start Heating")
onClicked:
{
if(printer_connection != null)
@ -132,7 +146,7 @@ Column
}
Button
{
text: catalog.i18nc("@action:button","Start heating")
text: catalog.i18nc("@action:button","Start Heating")
onClicked:
{
if(printer_connection != null)

106
resources/qml/WizardPages/UpgradeFirmware.qml
View file

@ -6,65 +6,59 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1
import UM 1.0 as UM
Column
{
id: wizardPage
property string title
anchors.fill: parent;
UM.I18nCatalog { id: catalog; name:"cura"}
Label
{
text: parent.title
font.pointSize: 18;
}
ScrollView
{
height: parent.height - 50
width: parent.width
ListView
{
id: machineList;
model: UM.USBPrinterManager.connectedPrinterList
delegate:Row
{
id: derp
Text
{
id: text_area
text: model.name
}
Button
{
text: catalog.i18nc("@action:button","Update")
onClicked:
{
if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text))
{
status_text.text = catalog.i18nc("@info:status","ERROR")
}
}
}
}
}
}
Label
{
id: status_text
text: ""
}
import UM 1.1 as UM
Item
{
Layout.fillWidth: true;
Layout.fillHeight: true;
id: wizardPage
property string title
SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"}
ScrollView
{
height: parent.height
width: parent.width
Column
{
width: wizardPage.width
Label
{
id: pageTitle
width: parent.width
text: catalog.i18nc("@title", "Upgrade Firmware")
wrapMode: Text.WordWrap
font.pointSize: 18
}
Label
{
id: pageDescription
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work.")
}
Label
{
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","The firmware shipping with new Ultimakers works, but upgrades have been made to make better prints, and make calibration easier.");
}
Label
{
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Cura requires these new features and thus your firmware will most likely need to be upgraded. You can do so now.");
}
Button {
text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware");
}
Button {
text: catalog.i18nc("@action:button","Skip Upgrade");
}
}
}
ExclusiveGroup { id: printerGroup; }
}