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

Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

Browse Source
This commit is contained in:
Jaime van Kessel 2015-09-10 11:07:41 +02:00
commit 9c873c7d34
8 changed files with 68 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/__init__.py
View File

@ -17,7 +17,7 @@ def getMetaData():
}, },
"mesh_reader": { "mesh_reader": {
"extension": "3mf", "extension": "3mf",
"description": catalog.i18nc("@item:inlistbox", "3MF File") "description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "3MF File")
} }
} }

2
plugins/GCodeWriter/__init__.py
View File

@ -19,7 +19,7 @@ def getMetaData():
"mesh_writer": { "mesh_writer": {
"output": [{ "output": [{
"extension": "gcode", "extension": "gcode",
"description": catalog.i18nc("@item:inlistbox", "GCode File"), "description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "GCode File"),
"mime_type": "text/x-gcode", "mime_type": "text/x-gcode",
"mode": GCodeWriter.GCodeWriter.OutputMode.TextMode "mode": GCodeWriter.GCodeWriter.OutputMode.TextMode
}] }]

4
plugins/USBPrinting/USBPrinterManager.py
View File

@ -43,10 +43,6 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
self._firmware_view = None self._firmware_view = None
## Add menu item to top menu of the application. ## Add menu item to top menu of the application.
#self.setMenuName(self._i18n_catalog.i18n("@title:menu", "Firmware"))
#self.addMenuItem(self._i18n_catalog.i18n("@item:inmenu", "Update Firmware"), self.updateAllFirmware)
#self.setMenuName("Firmware")
self.setMenuName(i18n_catalog.i18nc("@title:menu","Firmware")) self.setMenuName(i18n_catalog.i18nc("@title:menu","Firmware"))
self.addMenuItem(i18n_catalog.i18nc("@item:inmenu", "Update Firmware"), self.updateAllFirmware) self.addMenuItem(i18n_catalog.i18nc("@item:inmenu", "Update Firmware"), self.updateAllFirmware)

34
resources/machines/fdmprinter.json
View File

@ -221,8 +221,8 @@
"enabled": "support_enable" "enabled": "support_enable"
}, },
"support_roof_line_width": { "support_roof_line_width": {
"label": "Support Hammock line width", "label": "Support Roof line width",
"description": "Width of a single hammock line, used to fill the roof of the support.", "description": "Width of a single support roof line, used to fill the top of the support.",
"unit": "mm", "unit": "mm",
"default": 0.4, "default": 0.4,
"type": "float", "type": "float",
@ -391,10 +391,10 @@
"visible": false "visible": false
}, },
"skin_no_small_gaps_heuristic": { "skin_no_small_gaps_heuristic": {
"label": "Model has small Z gaps", "label": "Ingore small Z gaps",
"description": "When the model has small vertical gaps about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces.", "description": "When the model has small vertical gaps about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such a case set this setting to false.",
"type": "boolean", "type": "boolean",
"default": false, "default": true,
"visible": false "visible": false
}, },
"skin_alternate_rotation": { "skin_alternate_rotation": {
@ -749,8 +749,8 @@
"enabled": "support_roof_enable" "enabled": "support_roof_enable"
}, },
"speed_support_roof": { "speed_support_roof": {
"label": "Support Hammock Speed", "label": "Support Roof Speed",
"description": "The speed at which the roofs of exterior support are printed. Printing the hammock at lower speeds can improve on overhang quality. ", "description": "The speed at which the roofs of exterior support are printed. Printing the support roof at lower speeds can improve on overhang quality. ",
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default": 40, "default": 40,
@ -1185,15 +1185,15 @@
"enabled": "support_enable" "enabled": "support_enable"
}, },
"support_roof_enable": { "support_roof_enable": {
"label": "Enable Hammock", "label": "Enable Support Roof",
"description": "Generate a solid support roof on which the model sits.", "description": "Generate a dense top skin at the top of the support on which the model sits.",
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"visible": true, "visible": true,
"enabled": "support_enable" "enabled": "support_enable"
}, },
"support_roof_height": { "support_roof_height": {
"label": "Hammock Thickness", "label": "Support Roof Thickness",
"description": "The height of the support roofs. ", "description": "The height of the support roofs. ",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
@ -1202,15 +1202,15 @@
"enabled": "support_enable" "enabled": "support_enable"
}, },
"support_roof_density": { "support_roof_density": {
"label": "Hammock Density", "label": "Support Roof Density",
"description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, which are more difficult to remove.", "description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, which are more difficult to remove.",
"unit": "%", "unit": "%",
"type": "float", "type": "float",
"default": 100, "default": 100,
"children": { "children": {
"support_roof_line_distance": { "support_roof_line_distance": {
"label": "Hammock Line Distance", "label": "Support Roof Line Distance",
"description": "Distance between the printed hammock lines.", "description": "Distance between the printed support roof lines.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default": 0.4, "default": 0.4,
@ -1220,8 +1220,8 @@
} }
}, },
"support_roof_pattern": { "support_roof_pattern": {
"label": "Hammock Pattern", "label": "Support Roof Pattern",
"description": "The pattern with which the hammock is printed.", "description": "The pattern with which the top of the support is printed.",
"type": "enum", "type": "enum",
"visible": false, "visible": false,
"options": { "options": {
@ -1231,7 +1231,7 @@
"concentric": "Concentric", "concentric": "Concentric",
"zigzag": "Zig Zag" "zigzag": "Zig Zag"
}, },
"default": "Concentric" "default": "concentric"
}, },
"support_use_towers": { "support_use_towers": {
"label": "Use towers.", "label": "Use towers.",
@ -1688,7 +1688,7 @@
"enabled": "magic_fuzzy_skin_enabled", "enabled": "magic_fuzzy_skin_enabled",
"children": { "children": {
"magic_fuzzy_skin_point_dist": { "magic_fuzzy_skin_point_dist": {
"label": "Fuzzy Skin Density", "label": "Fuzzy Skin Point Distance",
"description": "The average distance between the random points introduced on each line segment. Note that the original points of the polygon are discarded, so a high smoothness results in a reduction of the resolution. This value must be higher than half the Fuzzy Skin Thickness.", "description": "The average distance between the random points introduced on each line segment. Note that the original points of the polygon are discarded, so a high smoothness results in a reduction of the resolution. This value must be higher than half the Fuzzy Skin Thickness.",
"type": "float", "type": "float",
"unit": "mm", "unit": "mm",

23
resources/qml/Actions.qml
View File

@ -50,12 +50,12 @@ Item
{ {
id:toggleFullScreenAction id:toggleFullScreenAction
shortcut: StandardKey.FullScreen; shortcut: StandardKey.FullScreen;
text: catalog.i18nc("@action","Toggle Full Screen");
} }
Action Action
{ {
id: undoAction; id: undoAction;
//: Undo action
text: catalog.i18nc("@action","Undo"); text: catalog.i18nc("@action","Undo");
iconName: "edit-undo"; iconName: "edit-undo";
shortcut: StandardKey.Undo; shortcut: StandardKey.Undo;
@ -64,7 +64,6 @@ Item
Action Action
{ {
id: redoAction; id: redoAction;
//: Redo action
text: catalog.i18nc("@action","Redo"); text: catalog.i18nc("@action","Redo");
iconName: "edit-redo"; iconName: "edit-redo";
shortcut: StandardKey.Redo; shortcut: StandardKey.Redo;
@ -73,7 +72,6 @@ Item
Action Action
{ {
id: quitAction; id: quitAction;
//: Quit action
text: catalog.i18nc("@action","Quit"); text: catalog.i18nc("@action","Quit");
iconName: "application-exit"; iconName: "application-exit";
shortcut: StandardKey.Quit; shortcut: StandardKey.Quit;
@ -82,7 +80,6 @@ Item
Action Action
{ {
id: preferencesAction; id: preferencesAction;
//: Preferences action
text: catalog.i18nc("@action","Preferences..."); text: catalog.i18nc("@action","Preferences...");
iconName: "configure"; iconName: "configure";
} }
@ -90,14 +87,12 @@ Item
Action Action
{ {
id: addMachineAction; id: addMachineAction;
//: Add Printer action
text: catalog.i18nc("@action","Add Printer..."); text: catalog.i18nc("@action","Add Printer...");
} }
Action Action
{ {
id: settingsAction; id: settingsAction;
//: Configure Printers action
text: catalog.i18nc("@action","Configure Printers"); text: catalog.i18nc("@action","Configure Printers");
iconName: "configure"; iconName: "configure";
} }
@ -105,14 +100,12 @@ Item
Action Action
{ {
id: manageProfilesAction; id: manageProfilesAction;
//: manage profiles action
text: catalog.i18nc("@action","Manage Profiles"); text: catalog.i18nc("@action","Manage Profiles");
} }
Action Action
{ {
id: documentationAction; id: documentationAction;
//: Show Online Documentation action
text: catalog.i18nc("@action","Show Online &Documentation"); text: catalog.i18nc("@action","Show Online &Documentation");
iconName: "help-contents"; iconName: "help-contents";
shortcut: StandardKey.Help; shortcut: StandardKey.Help;
@ -120,7 +113,6 @@ Item
Action { Action {
id: reportBugAction; id: reportBugAction;
//: Report a Bug Action
text: catalog.i18nc("@action","Report a &Bug"); text: catalog.i18nc("@action","Report a &Bug");
iconName: "tools-report-bug"; iconName: "tools-report-bug";
} }
@ -128,7 +120,6 @@ Item
Action Action
{ {
id: aboutAction; id: aboutAction;
//: About action
text: catalog.i18nc("@action","About..."); text: catalog.i18nc("@action","About...");
iconName: "help-about"; iconName: "help-about";
} }
@ -136,7 +127,6 @@ Item
Action Action
{ {
id: deleteSelectionAction; id: deleteSelectionAction;
//: Delete selection action
text: catalog.i18nc("@action","Delete Selection"); text: catalog.i18nc("@action","Delete Selection");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Delete; shortcut: StandardKey.Delete;
@ -145,7 +135,6 @@ Item
Action Action
{ {
id: deleteObjectAction; id: deleteObjectAction;
//: Delete object action
text: catalog.i18nc("@action","Delete Object"); text: catalog.i18nc("@action","Delete Object");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Backspace; shortcut: StandardKey.Backspace;
@ -154,7 +143,6 @@ Item
Action Action
{ {
id: centerObjectAction; id: centerObjectAction;
//: Center object action
text: catalog.i18nc("@action","Center Object on Platform"); text: catalog.i18nc("@action","Center Object on Platform");
} }
@ -182,14 +170,12 @@ Item
Action Action
{ {
id: multiplyObjectAction; id: multiplyObjectAction;
//: Duplicate object action
text: catalog.i18nc("@action","Duplicate Object"); text: catalog.i18nc("@action","Duplicate Object");
} }
Action Action
{ {
id: splitObjectAction; id: splitObjectAction;
//: Split object action
text: catalog.i18nc("@action","Split Object into Parts"); text: catalog.i18nc("@action","Split Object into Parts");
enabled: false; enabled: false;
} }
@ -197,7 +183,6 @@ Item
Action Action
{ {
id: deleteAllAction; id: deleteAllAction;
//: Clear build platform action
text: catalog.i18nc("@action","Clear Build Platform"); text: catalog.i18nc("@action","Clear Build Platform");
iconName: "edit-clear"; iconName: "edit-clear";
} }
@ -205,28 +190,24 @@ Item
Action Action
{ {
id: reloadAllAction; id: reloadAllAction;
//: Reload all objects action
text: catalog.i18nc("@action","Reload All Objects"); text: catalog.i18nc("@action","Reload All Objects");
} }
Action Action
{ {
id: resetAllTranslationAction; id: resetAllTranslationAction;
//: Reset all positions action
text: catalog.i18nc("@action","Reset All Object Positions"); text: catalog.i18nc("@action","Reset All Object Positions");
} }
Action Action
{ {
id: resetAllAction; id: resetAllAction;
//: Reset all positions action
text: catalog.i18nc("@action","Reset All Object Transformations"); text: catalog.i18nc("@action","Reset All Object Transformations");
} }
Action Action
{ {
id: openAction; id: openAction;
//: Open file action
text: catalog.i18nc("@action","Load file"); text: catalog.i18nc("@action","Load file");
iconName: "document-open"; iconName: "document-open";
shortcut: StandardKey.Open; shortcut: StandardKey.Open;
@ -235,7 +216,6 @@ Item
Action Action
{ {
id: saveAction; id: saveAction;
//: Save file action
text: catalog.i18nc("@action","Save..."); text: catalog.i18nc("@action","Save...");
iconName: "document-save"; iconName: "document-save";
shortcut: StandardKey.Save; shortcut: StandardKey.Save;
@ -244,7 +224,6 @@ Item
Action Action
{ {
id: showEngineLogAction; id: showEngineLogAction;
//: Show engine log action
text: catalog.i18nc("@action","Show engine &log..."); text: catalog.i18nc("@action","Show engine &log...");
iconName: "view-list-text"; iconName: "view-list-text";
} }

7
resources/qml/GeneralPage.qml
View File

@ -80,8 +80,7 @@ UM.PreferencesPage
// Because ListModel is stupid and does not allow using qsTr() for values. // Because ListModel is stupid and does not allow using qsTr() for values.
for(var i = 0; i < languageList.count; ++i) for(var i = 0; i < languageList.count; ++i)
{ {
//languageList.setProperty(i, "text", catalog.i18nc("@action:menu",languageList.get(i).text)); languageList.setProperty(i, "text", catalog.i18nc("@action:inmenu",languageList.get(i).text));
languageList.setProperty(i, "text", languageList.get(i).text);
} }
// Glorious hack time. ComboBox does not update the text properly after changing the // Glorious hack time. ComboBox does not update the text properly after changing the
@ -113,11 +112,11 @@ UM.PreferencesPage
id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
//: Display Overhang preference checkbox //: Display Overhang preference checkbox
text: catalog.i18nc("@option:check","Automatic push free"); text: catalog.i18nc("@option:check","Automatically arrange the distancing between objects");
onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked
//: Display Overhang preference tooltip //: Display Overhang preference tooltip
tooltip: catalog.i18nc("@info:tooltip","Are objects on the platform automatically moved so they no longer intersect") tooltip: catalog.i18nc("@info:tooltip","Are objects on the platform automatically moved so that they no longer intersect")
style: ButtonStyle style: ButtonStyle
{ {

88
resources/qml/SaveButton.qml
View File

@ -48,7 +48,7 @@ Rectangle {
} }
} }
} }
//printJobTextfield.text = abbrMachine + '_' + base.fileBaseName printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
} }
Connections { Connections {
@ -62,49 +62,47 @@ Rectangle {
Rectangle{ Rectangle{
id: printJobRow id: printJobRow
implicitWidth: base.width; implicitWidth: base.width;
//implicitHeight: UM.Theme.sizes.sidebar_header.height /////////////remove this TODO implicitHeight: UM.Theme.sizes.sidebar_header.height
implicitHeight: 1
anchors.top: parent.top anchors.top: parent.top
//color: UM.Theme.colors.sidebar_header_bar color: UM.Theme.colors.sidebar_header_bar
color: UM.Theme.colors.setting_control_border Label{
// Label{ id: printJobTextfieldLabel
// id: printJobTextfieldLabel text: catalog.i18nc("@label:textbox", "Printjob name");
// text: catalog.i18nc("@label","Printjob name"); anchors.left: parent.left
// anchors.left: parent.left anchors.leftMargin: UM.Theme.sizes.default_margin.width;
// anchors.leftMargin: UM.Theme.sizes.default_margin.width; anchors.verticalCenter: parent.verticalCenter
// anchors.verticalCenter: parent.verticalCenter font: UM.Theme.fonts.default;
// font: UM.Theme.fonts.default; color: UM.Theme.colors.text_white
// color: UM.Theme.colors.text_white }
// } TextField {
// TextField { id: printJobTextfield
// id: printJobTextfield 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 width: parent.width/100*55
// width: parent.width/100*55 height: UM.Theme.sizes.sidebar_inputFields.height
// height: UM.Theme.sizes.sidebar_inputFields.height property int unremovableSpacing: 5
// property int unremovableSpacing: 5 text: ''
// text: '' onEditingFinished: {
// onEditingFinished: { if (printJobTextfield.text != ''){
// if (printJobTextfield.text != ''){ printJobTextfield.focus = false
// printJobTextfield.focus = false }
// } }
// } validator: RegExpValidator {
// validator: RegExpValidator { regExp: /^[^\\ \/ \.]*$/
// regExp: /^[^\\ \/ \.]*$/ }
// } style: TextFieldStyle{
// style: TextFieldStyle{ textColor: UM.Theme.colors.setting_control_text;
// textColor: UM.Theme.colors.setting_control_text; font: UM.Theme.fonts.default;
// font: UM.Theme.fonts.default; background: Rectangle {
// background: Rectangle { radius: 0
// radius: 0 implicitWidth: parent.width
// implicitWidth: parent.width implicitHeight: parent.height
// implicitHeight: parent.height border.width: 1;
// border.width: 1; border.color: UM.Theme.colors.slider_groove_border;
// border.color: UM.Theme.colors.slider_groove_border; }
// } }
// } }
// }
} }
Rectangle { Rectangle {
@ -138,7 +136,7 @@ Rectangle {
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
font: UM.Theme.fonts.default font: UM.Theme.fonts.default
color: UM.Theme.colors.text color: UM.Theme.colors.text
text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label h:m (abbreviation for hours:minutes) is added to the expected printtime (%1)", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short))
} }
} }
Item{ Item{
@ -165,7 +163,7 @@ Rectangle {
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
font: UM.Theme.fonts.default font: UM.Theme.fonts.default
color: UM.Theme.colors.text color: UM.Theme.colors.text
text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label","%1 m").arg(base.printMaterialAmount) text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label m (abbreviation for meters) is added to the expected length of filament (%1) ","%1 m").arg(base.printMaterialAmount)
} }
} }
} }

2
resources/qml/Sidebar.qml
View File

@ -126,7 +126,7 @@ Rectangle
{ {
for(var i = 0; i < modesListModel.count; ++i) for(var i = 0; i < modesListModel.count; ++i)
{ {
modesListModel.setProperty(i, "text", modesListModel.get(i).text); modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text));
} }
} }
} }