GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:15:52 +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 15:18:21 +02:00
commit 76d2fd3665
5 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/Actions.qml
View File

@ -93,7 +93,7 @@ Item
Action Action
{ {
id: settingsAction; id: settingsAction;
text: catalog.i18nc("@action","Configure Printers"); text: catalog.i18nc("@action","Manage Printers");
iconName: "configure"; iconName: "configure";
} }
@ -149,21 +149,21 @@ Item
Action Action
{ {
id: groupObjectsAction id: groupObjectsAction
text: catalog.i18nc("@action","Group objects"); text: catalog.i18nc("@action","Group Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
} }
Action Action
{ {
id: unGroupObjectsAction id: unGroupObjectsAction
text: catalog.i18nc("@action","Ungroup objects"); text: catalog.i18nc("@action","Ungroup Objects");
enabled: UM.Scene.isGroupSelected enabled: UM.Scene.isGroupSelected
} }
Action Action
{ {
id: mergeObjectsAction id: mergeObjectsAction
text: catalog.i18nc("@action","Merge objects"); text: catalog.i18nc("@action","Merge Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
} }
@ -208,7 +208,7 @@ Item
Action Action
{ {
id: openAction; id: openAction;
text: catalog.i18nc("@action","Load file"); text: catalog.i18nc("@action","Open File");
iconName: "document-open"; iconName: "document-open";
shortcut: StandardKey.Open; shortcut: StandardKey.Open;
} }
@ -224,7 +224,7 @@ Item
Action Action
{ {
id: showEngineLogAction; id: showEngineLogAction;
text: catalog.i18nc("@action","Show engine &log..."); text: catalog.i18nc("@action","Show Engine &Log...");
iconName: "view-list-text"; iconName: "view-list-text";
} }
} }

5
resources/qml/Cura.qml
View File

@ -112,6 +112,7 @@ UM.MainWindow
MenuItem { action: actions.deleteSelection; } MenuItem { action: actions.deleteSelection; }
MenuItem { action: actions.deleteAll; } MenuItem { action: actions.deleteAll; }
} }
Menu Menu
{ {
title: catalog.i18nc("@title:menu","&View"); title: catalog.i18nc("@title:menu","&View");
@ -297,6 +298,9 @@ UM.MainWindow
{ {
id: openFileButton; id: openFileButton;
//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
text: catalog.i18nc("@action:button","Open File");
iconSource: UM.Theme.icons.open
style: UM.Theme.styles.open_file_button style: UM.Theme.styles.open_file_button
tooltip: ''; tooltip: '';
anchors anchors
@ -337,7 +341,6 @@ UM.MainWindow
right: sidebar.left; right: sidebar.left;
rightMargin: UM.Theme.sizes.window_margin.width; rightMargin: UM.Theme.sizes.window_margin.width;
} }
//: View Mode toolbar button
text: catalog.i18nc("@action:button","View Mode"); text: catalog.i18nc("@action:button","View Mode");
iconSource: UM.Theme.icons.viewmode; iconSource: UM.Theme.icons.viewmode;

2
resources/qml/SaveButton.qml
View File

@ -67,7 +67,7 @@ Rectangle {
color: UM.Theme.colors.sidebar_header_bar color: UM.Theme.colors.sidebar_header_bar
Label{ Label{
id: printJobTextfieldLabel id: printJobTextfieldLabel
text: catalog.i18nc("@label:textbox", "Printjob name"); text: catalog.i18nc("@label:textbox", "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

2
resources/qml/SidebarHeader.qml
View File

@ -27,7 +27,7 @@ Item
Label{ Label{
id: settingsModeLabel id: settingsModeLabel
text: catalog.i18nc("@label:listbox","Print setup: "); text: catalog.i18nc("@label:listbox","Print Setup: ");
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

40
resources/themes/cura/styles.qml
View File

@ -56,23 +56,39 @@ QtObject {
property Component open_file_button: Component { property Component open_file_button: Component {
ButtonStyle { ButtonStyle {
background: Item{ background: Item{
implicitWidth: UM.Theme.sizes.loadfile_button.width implicitWidth: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.loadfile_button.height implicitHeight: UM.Theme.sizes.button.width;
Rectangle { Rectangle {
width: parent.width anchors.left: parent.right
height: parent.height anchors.verticalCenter: parent.verticalCenter
color: "white"
width: control.hovered ? openFileLabel.width : 0;
height: openFileLabel.height
Behavior on width { NumberAnimation { duration: 100; } }
opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 100; } }
Label {
id: openFileLabel
anchors.bottom: parent.bottom
text: control.text
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
}
}
Rectangle {
anchors.fill: parent;
color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
} }
Label {
anchors.centerIn: parent
text: control.text
color: UM.Theme.colors.load_save_button_text
font: UM.Theme.fonts.default
}
} }
label: Label{ label: Item {
visible: false Image {
anchors.centerIn: parent;
source: control.iconSource;
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;
sourceSize: UM.Theme.sizes.button_icon;
}
} }
} }
} }