18863 Commits

Author SHA1 Message Date
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
56c9de44f7 Update Cura Backups sdk_version to 6 in bundled json
CURA-6005
2019-01-03 11:26:14 +01:00
Lipu Fei
136317c3c7 Fix code styles
CURA-6005
2019-01-03 11:26:14 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +01:00
Ghostkeeper
707c3a26a8
Make job specs not bold
As per the design.

Contributes to issue CURA-6025.
2019-01-03 11:06:43 +01:00
Lipu Fei
ee1390a6a3
Merge pull request #5090 from Ultimaker/unify_font_types
Unify font types
2019-01-03 10:57:34 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
979fd507de Give the section delegates a fixed height
This fixes the issue where the first printer would be drawn over the section label

CURA-6011
2019-01-03 10:39:43 +01:00
Jaime van Kessel
7fc4e6ddde Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-03 10:23:22 +01:00
Jaime van Kessel
195d39f698 Update the style of the postprocessing button
CURA-6043
2019-01-03 09:47:48 +01:00
Jaime van Kessel
0b1773e087 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-03 09:43:13 +01:00
Jaime van Kessel
3505eb321f Also add space for the savebutton additional components with the output widget
CURA-6043
2019-01-03 09:42:22 +01:00
Lipu Fei
ee72284616 Use appropriate log level
CURA-6035
2019-01-03 08:32:42 +01:00
Lipu Fei
08dc035f6e Merge remote-tracking branch 'origin/4.0' 2019-01-03 08:30:27 +01:00
Lipu Fei
d295dfbf7c
Merge pull request #5096 from Ultimaker/remember_opened_settings_panel
Remember opened state of settings panel
2019-01-03 08:26:35 +01:00
Ghostkeeper
a5385b229a
Make text in printer type label bigger
Just shown it to our UX designer and she thinks it's better this way.

Contributes to issue CURA-6025.
2019-01-02 16:37:19 +01:00
Ghostkeeper
82c9e99ab3
Merge branch '4.0' 2019-01-02 14:11:30 +01:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.

Contributes to issue CURA-6069.
2019-01-02 14:05:17 +01:00
Jaime van Kessel
ae7f843bbc Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-02 13:54:19 +01:00
Jaime van Kessel
71632fd098 Add the postProcessing button back next to the slice button
CURA-6043
2019-01-02 13:53:35 +01:00
Ghostkeeper
9e0a423f28
Disable visibility of glass buildplate configuration in sync menu
Because the build plate swapping is not implemented yet.
2019-01-02 13:30:29 +01:00
Jaime van Kessel
59af006b46 Merge branch 'CURA-6066_remove_pluginspage_qml' of github.com:Ultimaker/Cura 2019-01-02 13:24:41 +01:00
Jaime van Kessel
df23097a99 Changed the label for when no remote configurations are loaded yet 2019-01-02 11:36:07 +01:00
Jaime van Kessel
9be1f8aa7b Removed marketplace menu item from top menu
It was a bit double since we had the marketplace button in the top bar
2019-01-02 11:33:49 +01:00
Jaime van Kessel
a0031853d3 Fix button color in toolpanel for dark theme 2019-01-02 11:32:49 +01:00
Lipu Fei
11dfb9acdc Remove PluginsPage.qml
CURA-6066
2019-01-02 11:18:17 +01:00
Jaime van Kessel
2a4c66888e Use getNumInstances instead of counting the number of instances in machinemanager
This should prevent having to initiate the cached values if we only want to know the number of settings.
2019-01-02 09:39:44 +01:00
Jaime van Kessel
e8febaff59 Remove code duplication 2019-01-02 09:23:20 +01:00
Jaime van Kessel
0b0f674e4b Remove unused code 2019-01-02 09:22:50 +01:00
pinchies
208811f383
fix start gcode on alfawise u20
small tweak to fixestart gcode to avoid default position of bed clamps
2019-01-02 02:58:19 +11:00
Ghostkeeper
6092402a87
Fix 'Slicing...' message when not autoslicing
Also changes the 'auto slicing' text to just 'slicing', because that's more what the user expects.
Discussed with UX.

Contributes to issue CURA-6025.
2018-12-31 15:44:09 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins
Several different font sizes should be used here.

Contributes to issue CURA-6025.
2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
2018-12-31 15:33:37 +01:00
Ghostkeeper
346c820959
Remove hover color for Marketplace header tabs
It was not desirable, as discussed with the designer.

Contributes to issue CURA-6025.
2018-12-31 15:22:34 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large
As per the design.

Contributes to issue CURA-6025.
2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles
Contributes to issue CURA-6025.
2018-12-31 15:14:23 +01:00
Ghostkeeper
c92a0f1fd4
Fix bold fonts on Linux
I'm not sure how this performs on other platforms, but on mine it needs at least 63 weight for bold. This is because there is a normal font at weight 40 and a bold font at weight 85. From 63+ it rounds to the bold font with the closest weight then.

Contributes to issue CURA-6025.
2018-12-31 15:09:15 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
Ghostkeeper
66aeb2d1dd
Give print time estimate a large font
Contributes to issue CURA-6025.
2018-12-31 14:28:51 +01:00
Ghostkeeper
cf6cce5df0
Make 'Profile' text larger
As per the design.

Contributes to issue CURA-6025.
2018-12-31 14:00:39 +01:00
Ghostkeeper
4be9fbb75e
Give tick marks a font
Otherwise it uses your system's font, which is not consistent.

Contributes to issue CURA-6025.
2018-12-31 13:57:49 +01:00
Ghostkeeper
44f21b37ac
Make labels on left side of recommended mode larger
Contributes to issue CURA-6025.
2018-12-31 13:49:03 +01:00
Jaime van Kessel
6b5fec379c Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-31 13:44:41 +01:00
Jaime van Kessel
4be228a4e2 Fix merging & grouping
I made a boo-boo while adding typing.
CURA-6058
2018-12-31 13:43:47 +01:00
Ghostkeeper
60a5438db6
Make expandable component header fonts larger
As per the design.

Contributes to issue CURA-6025.
2018-12-31 13:43:31 +01:00
Ghostkeeper
8d8133d521
Make synced material name larger than the rest
In accordance with the designs.

Contributes to issue CURA-6025.
2018-12-31 13:34:57 +01:00
Ghostkeeper
c74d6fc1e7
Make printerTypeLabel smaller
More in line with the theme.

Contributes to issue CURA-6025.
2018-12-31 13:32:49 +01:00
Ghostkeeper
d020a49b75
Assign a font to Marketplace button
Otherwise the font face may be different, and the theme has no effect on the font.

Contributes to issue CURA-6025.
2018-12-31 13:26:55 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Jaime van Kessel
8dbebaa23c Ensure that the machine selector list scales properly
The old implementation directly listend to the height (instead of childrenRect).
This caused issues, since other things apart from adding / removing machines could
influence the height.

CURA-6060
2018-12-31 13:14:08 +01:00