3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jaime van Kessel 2015-08-19 16:51:47 +02:00
commit 5cab8b9467
27 changed files with 47 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/Actions.qml
View file

@ -43,7 +43,7 @@ Item {
Action {
id: undoAction;
//: Undo action
text: qsTr("&Undo");
text: qsTr("Undo");
iconName: "edit-undo";
shortcut: StandardKey.Undo;
}
@ -51,7 +51,7 @@ Item {
Action {
id: redoAction;
//: Redo action
text: qsTr("&Redo");
text: qsTr("Redo");
iconName: "edit-redo";
shortcut: StandardKey.Redo;
}
@ -59,7 +59,7 @@ Item {
Action {
id: quitAction;
//: Quit action
text: qsTr("&Quit");
text: qsTr("Quit");
iconName: "application-exit";
shortcut: StandardKey.Quit;
}
@ -67,20 +67,20 @@ Item {
Action {
id: preferencesAction;
//: Preferences action
text: qsTr("&Preferences...");
text: qsTr("Preferences...");
iconName: "configure";
}
Action {
id: addMachineAction;
//: Add Printer action
text: qsTr("&Add Printer...");
text: qsTr("Add Printer...");
}
Action {
id: settingsAction;
//: Configure Printers action
text: qsTr("&Configure Printers");
text: qsTr("Configure Printers");
iconName: "configure";
}
@ -102,7 +102,7 @@ Item {
Action {
id: aboutAction;
//: About action
text: qsTr("&About...");
text: qsTr("About...");
iconName: "help-about";
}
@ -190,7 +190,7 @@ Item {
Action {
id: openAction;
//: Open file action
text: qsTr("&Open...");
text: qsTr("Load file");
iconName: "document-open";
shortcut: StandardKey.Open;
}
@ -198,7 +198,7 @@ Item {
Action {
id: saveAction;
//: Save file action
text: qsTr("&Save...");
text: qsTr("Save...");
iconName: "document-save";
shortcut: StandardKey.Save;
}

10
resources/qml/Cura.qml
View file

@ -239,17 +239,15 @@ UM.MainWindow {
Button {
id: openFileButton;
iconSource: UM.Theme.icons.open;
style: UM.Backend.progress < 0 ? UM.Theme.styles.open_file_button : UM.Theme.styles.tool_button;
//style: UM.Backend.progress < 0 ? UM.Theme.styles.open_file_button : UM.Theme.styles.tool_button;
style: UM.Theme.styles.open_file_button
tooltip: '';
anchors {
top: parent.top;
topMargin: UM.Theme.sizes.window_margin.height;
topMargin: UM.Theme.sizes.loadfile_margin.height
left: parent.left;
leftMargin: UM.Theme.sizes.window_margin.width;
leftMargin: UM.Theme.sizes.loadfile_margin.width
}
action: actions.open;
}