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

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

Browse Source
This commit is contained in:
Ghostkeeper 2016-01-13 17:05:25 +01:00
commit ac1ada87e6
7 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/CuraProfileWriter/__init__.py
View File

@ -4,7 +4,7 @@
from . import CuraProfileWriter from . import CuraProfileWriter
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
catalog = i18nCatalog("uranium") catalog = i18nCatalog("cura")
def getMetaData(): def getMetaData():
return { return {

4
plugins/ImageReader/ConfigUI.qml
View File

@ -18,12 +18,14 @@ UM.Dialog
minimumHeight: 200*Screen.devicePixelRatio; minimumHeight: 200*Screen.devicePixelRatio;
maximumHeight: 200*Screen.devicePixelRatio; maximumHeight: 200*Screen.devicePixelRatio;
modality: Qt.Modal modality: Qt.Modal
title: catalog.i18nc("@title:window", "Convert Image...") title: catalog.i18nc("@title:window", "Convert Image...")
GridLayout GridLayout
{ {
UM.I18nCatalog{id: catalog; name:"cura"}
anchors.fill: parent; anchors.fill: parent;
Layout.fillWidth: true Layout.fillWidth: true
columnSpacing: 16 columnSpacing: 16
@ -82,8 +84,6 @@ UM.Dialog
onValueChanged: { manager.onSmoothingChanged(value) } onValueChanged: { manager.onSmoothingChanged(value) }
} }
} }
UM.I18nCatalog{id: catalog; name:"ultimaker"}
} }
rightButtons: [ rightButtons: [

3
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -13,6 +13,8 @@ Item {
property int currentIndex: UM.ActiveTool.properties.SelectedIndex; property int currentIndex: UM.ActiveTool.properties.SelectedIndex;
property string printSequence: UM.ActiveTool.properties.PrintSequence; property string printSequence: UM.ActiveTool.properties.PrintSequence;
UM.I18nCatalog { id: catalog; name: "cura"; }
width: childrenRect.width; width: childrenRect.width;
height: childrenRect.height; height: childrenRect.height;
@ -157,7 +159,6 @@ Item {
} }
} }
UM.I18nCatalog { id: catalog; name: "uranium"; }
UM.Dialog { UM.Dialog {
id: settingPickDialog id: settingPickDialog

2
plugins/PerObjectSettingsTool/__init__.py
View File

@ -4,7 +4,7 @@
from . import PerObjectSettingsTool from . import PerObjectSettingsTool
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("uranium") i18n_catalog = i18nCatalog("cura")
def getMetaData(): def getMetaData():
return { return {

40
resources/qml/Actions.qml
View File

@ -54,7 +54,7 @@ Item
Action Action
{ {
id: undoAction; id: undoAction;
text: catalog.i18nc("@action:inmenu","&Undo"); text: catalog.i18nc("@action:inmenu menubar:edit","&Undo");
iconName: "edit-undo"; iconName: "edit-undo";
shortcut: StandardKey.Undo; shortcut: StandardKey.Undo;
} }
@ -62,7 +62,7 @@ Item
Action Action
{ {
id: redoAction; id: redoAction;
text: catalog.i18nc("@action:inmenu","&Redo"); text: catalog.i18nc("@action:inmenu menubar:edit","&Redo");
iconName: "edit-redo"; iconName: "edit-redo";
shortcut: StandardKey.Redo; shortcut: StandardKey.Redo;
} }
@ -70,7 +70,7 @@ Item
Action Action
{ {
id: quitAction; id: quitAction;
text: catalog.i18nc("@action:inmenu","&Quit"); text: catalog.i18nc("@action:inmenu menubar:file","&Quit");
iconName: "application-exit"; iconName: "application-exit";
shortcut: StandardKey.Quit; shortcut: StandardKey.Quit;
} }
@ -78,55 +78,55 @@ Item
Action Action
{ {
id: preferencesAction; id: preferencesAction;
text: catalog.i18nc("@action:inmenu","&Preferences..."); text: catalog.i18nc("@action:inmenu menubar:settings","&Preferences...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: addMachineAction; id: addMachineAction;
text: catalog.i18nc("@action:inmenu","&Add Printer..."); text: catalog.i18nc("@action:inmenu menubar:printer","&Add Printer...");
} }
Action Action
{ {
id: settingsAction; id: settingsAction;
text: catalog.i18nc("@action:inmenu","Manage Pr&inters..."); text: catalog.i18nc("@action:inmenu menubar:printer","Manage Pr&inters...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: manageProfilesAction; id: manageProfilesAction;
text: catalog.i18nc("@action:inmenu","Manage Profiles..."); text: catalog.i18nc("@action:inmenu menubar:profile","Manage Profiles...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: documentationAction; id: documentationAction;
text: catalog.i18nc("@action:inmenu","Show Online &Documentation"); text: catalog.i18nc("@action:inmenu menubar:help","Show Online &Documentation");
iconName: "help-contents"; iconName: "help-contents";
shortcut: StandardKey.Help; shortcut: StandardKey.Help;
} }
Action { Action {
id: reportBugAction; id: reportBugAction;
text: catalog.i18nc("@action:inmenu","Report a &Bug"); text: catalog.i18nc("@action:inmenu menubar:help","Report a &Bug");
iconName: "tools-report-bug"; iconName: "tools-report-bug";
} }
Action Action
{ {
id: aboutAction; id: aboutAction;
text: catalog.i18nc("@action:inmenu","&About..."); text: catalog.i18nc("@action:inmenu menubar:help","&About...");
iconName: "help-about"; iconName: "help-about";
} }
Action Action
{ {
id: deleteSelectionAction; id: deleteSelectionAction;
text: catalog.i18nc("@action:inmenu","Delete &Selection"); text: catalog.i18nc("@action:inmenu menubar:edit","Delete &Selection");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Delete; shortcut: StandardKey.Delete;
} }
@ -147,7 +147,7 @@ Item
Action Action
{ {
id: groupObjectsAction id: groupObjectsAction
text: catalog.i18nc("@action:inmenu","&Group Objects"); text: catalog.i18nc("@action:inmenu menubar:edit","&Group Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
iconName: "object-group" iconName: "object-group"
} }
@ -155,7 +155,7 @@ Item
Action Action
{ {
id: unGroupObjectsAction id: unGroupObjectsAction
text: catalog.i18nc("@action:inmenu","Ungroup Objects"); text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Objects");
enabled: UM.Scene.isGroupSelected enabled: UM.Scene.isGroupSelected
iconName: "object-ungroup" iconName: "object-ungroup"
} }
@ -163,7 +163,7 @@ Item
Action Action
{ {
id: mergeObjectsAction id: mergeObjectsAction
text: catalog.i18nc("@action:inmenu","&Merge Objects"); text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
iconName: "merge"; iconName: "merge";
} }
@ -178,7 +178,7 @@ Item
Action Action
{ {
id: deleteAllAction; id: deleteAllAction;
text: catalog.i18nc("@action:inmenu","&Clear Build Platform"); text: catalog.i18nc("@action:inmenu menubar:edit","&Clear Build Platform");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: "Ctrl+D"; shortcut: "Ctrl+D";
} }
@ -186,26 +186,26 @@ Item
Action Action
{ {
id: reloadAllAction; id: reloadAllAction;
text: catalog.i18nc("@action:inmenu","Re&load All Objects"); text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Objects");
iconName: "document-revert"; iconName: "document-revert";
} }
Action Action
{ {
id: resetAllTranslationAction; id: resetAllTranslationAction;
text: catalog.i18nc("@action:inmenu","Reset All Object Positions"); text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object Positions");
} }
Action Action
{ {
id: resetAllAction; id: resetAllAction;
text: catalog.i18nc("@action:inmenu","Reset All Object &Transformations"); text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object &Transformations");
} }
Action Action
{ {
id: openAction; id: openAction;
text: catalog.i18nc("@action:inmenu","&Open File..."); text: catalog.i18nc("@action:inmenu menubar:file","&Open File...");
iconName: "document-open"; iconName: "document-open";
shortcut: StandardKey.Open; shortcut: StandardKey.Open;
} }
@ -213,7 +213,7 @@ Item
Action Action
{ {
id: showEngineLogAction; id: showEngineLogAction;
text: catalog.i18nc("@action:inmenu","Show Engine &Log..."); text: catalog.i18nc("@action:inmenu menubar:help","Show Engine &Log...");
iconName: "view-list-text"; iconName: "view-list-text";
shortcut: StandardKey.WhatsThis; shortcut: StandardKey.WhatsThis;
} }

22
resources/qml/Cura.qml
View File

@ -44,7 +44,7 @@ UM.MainWindow
{ {
id: fileMenu id: fileMenu
//: File menu //: File menu
title: catalog.i18nc("@title:menu","&File"); title: catalog.i18nc("@title:menu menubar:toplevel","&File");
MenuItem { MenuItem {
action: actions.open; action: actions.open;
@ -53,7 +53,7 @@ UM.MainWindow
Menu Menu
{ {
id: recentFilesMenu; id: recentFilesMenu;
title: catalog.i18nc("@title:menu", "Open &Recent") title: catalog.i18nc("@title:menu menubar:file", "Open &Recent")
iconName: "document-open-recent"; iconName: "document-open-recent";
enabled: Printer.recentFiles.length > 0; enabled: Printer.recentFiles.length > 0;
@ -82,7 +82,7 @@ UM.MainWindow
MenuItem MenuItem
{ {
text: catalog.i18nc("@action:inmenu", "&Save Selection to File"); text: catalog.i18nc("@action:inmenu menubar:file", "&Save Selection to File");
enabled: UM.Selection.hasSelection; enabled: UM.Selection.hasSelection;
iconName: "document-save-as"; iconName: "document-save-as";
onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", Printer.jobName); onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", Printer.jobName);
@ -90,7 +90,7 @@ UM.MainWindow
Menu Menu
{ {
id: saveAllMenu id: saveAllMenu
title: catalog.i18nc("@title:menu","Save &All") title: catalog.i18nc("@title:menu menubar:file","Save &All")
iconName: "document-save-all"; iconName: "document-save-all";
enabled: devicesModel.rowCount() > 0 && UM.Backend.progress > 0.99; enabled: devicesModel.rowCount() > 0 && UM.Backend.progress > 0.99;
@ -118,7 +118,7 @@ UM.MainWindow
Menu Menu
{ {
//: Edit menu //: Edit menu
title: catalog.i18nc("@title:menu","&Edit"); title: catalog.i18nc("@title:menu menubar:toplevel","&Edit");
MenuItem { action: actions.undo; } MenuItem { action: actions.undo; }
MenuItem { action: actions.redo; } MenuItem { action: actions.redo; }
@ -135,7 +135,7 @@ UM.MainWindow
Menu Menu
{ {
title: catalog.i18nc("@title:menu","&View"); title: catalog.i18nc("@title:menu menubar:toplevel","&View");
id: top_view_menu id: top_view_menu
Instantiator Instantiator
{ {
@ -157,7 +157,7 @@ UM.MainWindow
{ {
id: machineMenu; id: machineMenu;
//: Machine menu //: Machine menu
title: catalog.i18nc("@title:menu","&Printer"); title: catalog.i18nc("@title:menu menubar:toplevel","&Printer");
Instantiator Instantiator
{ {
@ -203,7 +203,7 @@ UM.MainWindow
Menu Menu
{ {
id: profileMenu id: profileMenu
title: catalog.i18nc("@title:menu", "P&rofile") title: catalog.i18nc("@title:menu menubar:toplevel", "P&rofile")
Instantiator Instantiator
{ {
@ -230,7 +230,7 @@ UM.MainWindow
{ {
id: extension_menu id: extension_menu
//: Extensions menu //: Extensions menu
title: catalog.i18nc("@title:menu","E&xtensions"); title: catalog.i18nc("@title:menu menubar:toplevel","E&xtensions");
Instantiator Instantiator
{ {
@ -263,7 +263,7 @@ UM.MainWindow
Menu Menu
{ {
//: Settings menu //: Settings menu
title: catalog.i18nc("@title:menu","&Settings"); title: catalog.i18nc("@title:menu menubar:toplevel","&Settings");
MenuItem { action: actions.preferences; } MenuItem { action: actions.preferences; }
} }
@ -271,7 +271,7 @@ UM.MainWindow
Menu Menu
{ {
//: Help menu //: Help menu
title: catalog.i18nc("@title:menu","&Help"); title: catalog.i18nc("@title:menu menubar:toplevel","&Help");
MenuItem { action: actions.showEngineLog; } MenuItem { action: actions.showEngineLog; }
MenuItem { action: actions.documentation; } MenuItem { action: actions.documentation; }

4
resources/qml/JobSpecs.qml
View File

@ -184,7 +184,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.small font: UM.Theme.fonts.small
color: UM.Theme.colors.text_subtext color: UM.Theme.colors.text_subtext
text: (!base.printDuration || !base.printDuration.valid) ? "00h 00min" : base.printDuration.getDisplayString(UM.DurationFormat.Short) text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
} }
UM.RecolorImage { UM.RecolorImage {
id: lengthIcon id: lengthIcon
@ -204,7 +204,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.small font: UM.Theme.fonts.small
color: UM.Theme.colors.text_subtext color: UM.Theme.colors.text_subtext
text: base.printMaterialAmount <= 0 ? "0.0 m" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount) text: base.printMaterialAmount <= 0 ? catalog.i18nc("@label", "0.0 m") : catalog.i18nc("@label", "%1 m").arg(base.printMaterialAmount)
} }
} }
} }