diff options
author | Jaime van Kessel <nallath@gmail.com> | 2015-08-19 17:51:47 +0300 |
---|---|---|
committer | Jaime van Kessel <nallath@gmail.com> | 2015-08-19 17:51:47 +0300 |
commit | 5cab8b94677d8fde7aa7f7f344731f7e111e9e40 (patch) | |
tree | de0b4048fe4613b71922e83882c4d88846289fa0 | |
parent | 07c19498f1bddb6e4c149b4d4a285db882f5838d (diff) | |
parent | 9324dbff02a9d2a8ab5d066b54d84976412ddd5d (diff) |
Merge branch 'master' of https://github.com/Ultimaker/Cura
27 files changed, 47 insertions, 64 deletions
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 8d5b8337f0..5b5a73a81a 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -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; } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index f01c3989b9..24fb33490f 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -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; } diff --git a/resources/themes/cura/fonts/ProximaNova-Black.otf b/resources/themes/cura/fonts/ProximaNova-Black.otf Binary files differnew file mode 100644 index 0000000000..ec4d45f178 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-Black.otf diff --git a/resources/themes/cura/fonts/ProximaNova-Bold.otf b/resources/themes/cura/fonts/ProximaNova-Bold.otf Binary files differnew file mode 100644 index 0000000000..4df9e17140 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-Bold.otf diff --git a/resources/themes/cura/fonts/ProximaNova-BoldIt.otf b/resources/themes/cura/fonts/ProximaNova-BoldIt.otf Binary files differnew file mode 100644 index 0000000000..60188efbff --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-BoldIt.otf diff --git a/resources/themes/cura/fonts/ProximaNova-Extrabold.otf b/resources/themes/cura/fonts/ProximaNova-Extrabold.otf Binary files differnew file mode 100644 index 0000000000..bd8e650ff9 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-Extrabold.otf diff --git a/resources/themes/cura/fonts/ProximaNova-Light.otf b/resources/themes/cura/fonts/ProximaNova-Light.otf Binary files differnew file mode 100644 index 0000000000..d8f5338d21 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-Light.otf diff --git a/resources/themes/cura/fonts/ProximaNova-LightItalic.otf b/resources/themes/cura/fonts/ProximaNova-LightItalic.otf Binary files differnew file mode 100644 index 0000000000..f779115b97 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-LightItalic.otf diff --git a/resources/themes/cura/fonts/ProximaNova-Regular.otf b/resources/themes/cura/fonts/ProximaNova-Regular.otf Binary files differnew file mode 100644 index 0000000000..27c8d8f7bf --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-Regular.otf diff --git a/resources/themes/cura/fonts/ProximaNova-RegularItalic.otf b/resources/themes/cura/fonts/ProximaNova-RegularItalic.otf Binary files differnew file mode 100644 index 0000000000..20ffc1fcdd --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNova-RegularItalic.otf diff --git a/resources/themes/cura/fonts/ProximaNovaCond-Light.otf b/resources/themes/cura/fonts/ProximaNovaCond-Light.otf Binary files differnew file mode 100644 index 0000000000..0b27849cd0 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNovaCond-Light.otf diff --git a/resources/themes/cura/fonts/ProximaNovaCond-LightIt.otf b/resources/themes/cura/fonts/ProximaNovaCond-LightIt.otf Binary files differnew file mode 100644 index 0000000000..a7dd085cf1 --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNovaCond-LightIt.otf diff --git a/resources/themes/cura/fonts/ProximaNovaCond-Regular.otf b/resources/themes/cura/fonts/ProximaNovaCond-Regular.otf Binary files differnew file mode 100644 index 0000000000..7356c3b88b --- /dev/null +++ b/resources/themes/cura/fonts/ProximaNovaCond-Regular.otf diff --git a/resources/themes/cura/fonts/Roboto-Black.ttf b/resources/themes/cura/fonts/Roboto-Black.ttf Binary files differdeleted file mode 100644 index 9002aab5d4..0000000000 --- a/resources/themes/cura/fonts/Roboto-Black.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-BlackItalic.ttf b/resources/themes/cura/fonts/Roboto-BlackItalic.ttf Binary files differdeleted file mode 100644 index b87e025dff..0000000000 --- a/resources/themes/cura/fonts/Roboto-BlackItalic.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Bold.ttf b/resources/themes/cura/fonts/Roboto-Bold.ttf Binary files differdeleted file mode 100644 index 072b842925..0000000000 --- a/resources/themes/cura/fonts/Roboto-Bold.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-BoldItalic.ttf b/resources/themes/cura/fonts/Roboto-BoldItalic.ttf Binary files differdeleted file mode 100644 index 74919ff649..0000000000 --- a/resources/themes/cura/fonts/Roboto-BoldItalic.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Italic.ttf b/resources/themes/cura/fonts/Roboto-Italic.ttf Binary files differdeleted file mode 100644 index bd57775e44..0000000000 --- a/resources/themes/cura/fonts/Roboto-Italic.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Light.ttf b/resources/themes/cura/fonts/Roboto-Light.ttf Binary files differdeleted file mode 100644 index 13bf13af00..0000000000 --- a/resources/themes/cura/fonts/Roboto-Light.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-LightItalic.ttf b/resources/themes/cura/fonts/Roboto-LightItalic.ttf Binary files differdeleted file mode 100644 index 130672a907..0000000000 --- a/resources/themes/cura/fonts/Roboto-LightItalic.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Medium.ttf b/resources/themes/cura/fonts/Roboto-Medium.ttf Binary files differdeleted file mode 100644 index d0f6e2b64f..0000000000 --- a/resources/themes/cura/fonts/Roboto-Medium.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-MediumItalic.ttf b/resources/themes/cura/fonts/Roboto-MediumItalic.ttf Binary files differdeleted file mode 100644 index 6153d48b49..0000000000 --- a/resources/themes/cura/fonts/Roboto-MediumItalic.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Regular.ttf b/resources/themes/cura/fonts/Roboto-Regular.ttf Binary files differdeleted file mode 100644 index 0ba95c98c4..0000000000 --- a/resources/themes/cura/fonts/Roboto-Regular.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-Thin.ttf b/resources/themes/cura/fonts/Roboto-Thin.ttf Binary files differdeleted file mode 100644 index 309c22d358..0000000000 --- a/resources/themes/cura/fonts/Roboto-Thin.ttf +++ /dev/null diff --git a/resources/themes/cura/fonts/Roboto-ThinItalic.ttf b/resources/themes/cura/fonts/Roboto-ThinItalic.ttf Binary files differdeleted file mode 100644 index 0b53ba4d38..0000000000 --- a/resources/themes/cura/fonts/Roboto-ThinItalic.ttf +++ /dev/null diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 77b1d2852e..4f2ab10422 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -35,55 +35,33 @@ QtObject { } } - property Component open_file_button: Component { + property Component open_file_button: Component { ButtonStyle { - background: Item { - implicitWidth: UM.Theme.sizes.button.width; - implicitHeight: UM.Theme.sizes.button.height; - + background: Item{ + implicitWidth: UM.Theme.sizes.loadfile_button.width + implicitHeight: UM.Theme.sizes.loadfile_button.height Rectangle { - anchors.bottom: parent.verticalCenter; - width: parent.width; - height: control.hovered ? parent.height / 2 + label.height : 0; - Behavior on height { NumberAnimation { duration: 100; } } - - opacity: control.hovered ? 1.0 : 0.0; - Behavior on opacity { NumberAnimation { duration: 100; } } - - Label { - id: label; - anchors.horizontalCenter: parent.horizontalCenter; - text: control.text.replace("&", ""); - font: UM.Theme.fonts.button_tooltip; - color: UM.Theme.colors.button_tooltip_text; - } - } - - UM.AngledCornerRectangle { - anchors.fill: parent; + width: parent.width + height: parent.height color: { if(control.hovered) { - return UM.Theme.colors.button_active_hover; + return UM.Theme.colors.open_file_button_hover } else { - return UM.Theme.colors.button_active; + return UM.Theme.colors.open_file_button } } Behavior on color { ColorAnimation { duration: 50; } } - cornerSize: UM.Theme.sizes.default_margin.width; } - } - - label: Item { - 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; + Label { + anchors.centerIn: parent + text: control.text + color: UM.Theme.colors.open_file_button_text + font: UM.Theme.fonts.default } } + label: Label{ + visible: false + } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index b600db1c2c..1d0c1d29b7 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -3,52 +3,52 @@ "large": { "size": 1.5, "bold": true, - "family": "Roboto" + "family": "ProximaNova" }, "default": { "size": 1, - "family": "Roboto" + "family": "ProximaNova" }, "default_allcaps": { "size": 1, "capitalize": true, - "family": "Roboto" + "family": "ProximaNova" }, "small": { "size": 0.75, - "family": "Roboto" + "family": "ProximaNova" }, "tiny": { "size": 0.5, - "family": "Roboto" + "family": "ProximaNova" }, "caption": { "size": 0.75, "italic": true, - "family": "Roboto" + "family": "ProximaNova" }, "sidebar_header": { "size": 0.75, "capitalize": true, - "family": "Roboto" + "family": "ProximaNova" }, "sidebar_save_to": { "size": 1.0, - "family": "Roboto" + "family": "ProximaNova" }, "timeslider_time": { "size": 1.0, "bold": true, - "family": "Roboto" + "family": "ProximaNova" }, "button_tooltip": { "size": 0.75, "capitalize": true, - "family": "Roboto" + "family": "ProximaNova" }, "setting_category": { "size": 1.5, - "family": "Roboto" + "family": "ProximaNova" } }, @@ -75,6 +75,10 @@ "button_disabled": [245, 245, 245, 255], "button_tooltip_text": [35, 35, 35, 255], + "open_file_button": [0, 0, 0, 255], + "open_file_button_text": [255, 255, 255, 255], + "open_file_button_hover": [43, 45, 46, 255], + "scrollbar_background": [245, 245, 245, 255], "scrollbar_handle": [205, 202, 201, 255], "scrollbar_handle_hover": [174, 174, 174, 255], @@ -140,6 +144,9 @@ "toolbar_button": [2.0, 2.0], "toolbar_spacing": [1.0, 1.0], + "loadfile_button": [11.0, 2.4], + "loadfile_margin": [0.8, 0.4], + "section": [22.0, 3.0], "section_icon": [2.14, 2.14], "section_text_margin": [0.33, 0.33], |