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

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

@ -6,7 +6,7 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.0 as UM import UM 1.1 as UM
Column Column
{ {
@ -19,14 +19,29 @@ Column
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer
Component.onCompleted: printer_connection.homeHead() Component.onCompleted: printer_connection.homeHead()
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
Label Label
{ {
text: "" text: catalog.i18nc("@title", "Bed Leveling")
//Component.onCompleted:console.log(UM.Models.settingsModel.getMachineSetting("machine_width")) 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 Button
{ {
text: catalog.i18nc("@action:button","Move to next position"); text: catalog.i18nc("@action:button","Move to Next Position");
onClicked: onClicked:
{ {
if(wizardPage.leveling_state == 0) if(wizardPage.leveling_state == 0)
@ -41,15 +56,18 @@ Column
{ {
printer_connection.moveHead(0, 0 ,0) printer_connection.moveHead(0, 0 ,0)
} }
wizardPage.leveling_state++ wizardPage.leveling_state++
} }
} }
function threePointLeveling(width, height) 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 id: pageTitle
width: parent.width width: parent.width
text: wizardPage.title text: catalog.i18nc("@title", "Select Upgraded Parts")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pointSize: 18 font.pointSize: 18
} }
@ -51,7 +51,7 @@ Item
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@option:check","Heated printer bed (kit)") text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
} }
CheckBox CheckBox
{ {
@ -67,14 +67,7 @@ Item
{ {
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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."); 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");
}
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");
} }
} }
} }

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

@ -34,14 +34,28 @@ Column
} }
Label Label
{ {
text: parent.title text: catalog.i18nc("@title", "Check Printer")
font.pointSize: 18; font.pointSize: 18;
} }
Label Label
{ {
//: Add Printer wizard page description //: 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 Row
@ -102,7 +116,7 @@ Column
} }
Button Button
{ {
text: catalog.i18nc("@action:button","Start heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {
if(printer_connection != null) if(printer_connection != null)
@ -124,7 +138,7 @@ Column
{ {
Label Label
{ {
text: catalog.i18nc("@label","bed temperature check: ") text: catalog.i18nc("@label","bed temperature check:")
} }
Label Label
{ {
@ -132,7 +146,7 @@ Column
} }
Button Button
{ {
text: catalog.i18nc("@action:button","Start heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {
if(printer_connection != null) if(printer_connection != null)

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

@ -6,65 +6,59 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.0 as UM import UM 1.1 as UM
Column Item
{ {
id: wizardPage id: wizardPage
property string title property string title
anchors.fill: parent;
UM.I18nCatalog { id: catalog; name:"cura"}
Label
{
text: parent.title
font.pointSize: 18;
}
SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"}
ScrollView ScrollView
{ {
height: parent.height - 50 height: parent.height
width: parent.width width: parent.width
ListView Column
{ {
id: machineList; width: wizardPage.width
model: UM.USBPrinterManager.connectedPrinterList Label
delegate:Row
{ {
id: derp id: pageTitle
Text width: parent.width
{ text: catalog.i18nc("@title", "Upgrade Firmware")
id: text_area wrapMode: Text.WordWrap
text: model.name font.pointSize: 18
} }
Button Label
{ {
text: catalog.i18nc("@action:button","Update") 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.")
}
onClicked: Label
{ {
if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text)) width: parent.width
{ wrapMode: Text.WordWrap
status_text.text = catalog.i18nc("@info:status","ERROR") 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");
} }
} }
} }
Label ExclusiveGroup { id: printerGroup; }
{
id: status_text
text: ""
}
Item
{
Layout.fillWidth: true;
Layout.fillHeight: true;
}
} }