GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 12:05:57 +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:
Tim Kuipers 2015-09-09 17:05:22 +02:00
commit d1a87f6add
7 changed files with 51 additions and 79 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": {
"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": {
"output": [{
"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",
"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
## 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.addMenuItem(i18n_catalog.i18nc("@item:inmenu", "Update Firmware"), self.updateAllFirmware)

25
resources/qml/Actions.qml
View File

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

88
resources/qml/SaveButton.qml
View File

@ -48,7 +48,7 @@ Rectangle {
}
}
}
//printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
}
Connections {
@ -62,49 +62,47 @@ Rectangle {
Rectangle{
id: printJobRow
implicitWidth: base.width;
//implicitHeight: UM.Theme.sizes.sidebar_header.height /////////////remove this TODO
implicitHeight: 1
implicitHeight: UM.Theme.sizes.sidebar_header.height
anchors.top: parent.top
//color: UM.Theme.colors.sidebar_header_bar
color: UM.Theme.colors.setting_control_border
// Label{
// id: printJobTextfieldLabel
// text: catalog.i18nc("@label","Printjob name");
// anchors.left: parent.left
// anchors.leftMargin: UM.Theme.sizes.default_margin.width;
// anchors.verticalCenter: parent.verticalCenter
// font: UM.Theme.fonts.default;
// color: UM.Theme.colors.text_white
// }
// TextField {
// id: printJobTextfield
// anchors.right: parent.right
// anchors.rightMargin: UM.Theme.sizes.default_margin.width;
// anchors.verticalCenter: parent.verticalCenter
// width: parent.width/100*55
// height: UM.Theme.sizes.sidebar_inputFields.height
// property int unremovableSpacing: 5
// text: ''
// onEditingFinished: {
// if (printJobTextfield.text != ''){
// printJobTextfield.focus = false
// }
// }
// validator: RegExpValidator {
// regExp: /^[^\\ \/ \.]*$/
// }
// style: TextFieldStyle{
// textColor: UM.Theme.colors.setting_control_text;
// font: UM.Theme.fonts.default;
// background: Rectangle {
// radius: 0
// implicitWidth: parent.width
// implicitHeight: parent.height
// border.width: 1;
// border.color: UM.Theme.colors.slider_groove_border;
// }
// }
// }
color: UM.Theme.colors.sidebar_header_bar
Label{
id: printJobTextfieldLabel
text: catalog.i18nc("@label:textbox", "Printjob name");
anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width;
anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_white
}
TextField {
id: printJobTextfield
anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width;
anchors.verticalCenter: parent.verticalCenter
width: parent.width/100*55
height: UM.Theme.sizes.sidebar_inputFields.height
property int unremovableSpacing: 5
text: ''
onEditingFinished: {
if (printJobTextfield.text != ''){
printJobTextfield.focus = false
}
}
validator: RegExpValidator {
regExp: /^[^\\ \/ \.]*$/
}
style: TextFieldStyle{
textColor: UM.Theme.colors.setting_control_text;
font: UM.Theme.fonts.default;
background: Rectangle {
radius: 0
implicitWidth: parent.width
implicitHeight: parent.height
border.width: 1;
border.color: UM.Theme.colors.slider_groove_border;
}
}
}
}
Rectangle {
@ -138,7 +136,7 @@ Rectangle {
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
font: UM.Theme.fonts.default
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{
@ -165,7 +163,7 @@ Rectangle {
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
font: UM.Theme.fonts.default
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)
{
modesListModel.setProperty(i, "text", modesListModel.get(i).text);
modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text));
}
}
}