Commit graph

2697 commits

Author SHA1 Message Date
Jack Ha
041e9cd96f Corrected bed temperature max value warning for UM3 2016-12-08 14:38:07 +01:00
Jaime van Kessel
19ca4ec964 Save dialog also shows num of setting visibility items saved
CURA-1261
2016-12-08 14:16:51 +01:00
Jaime van Kessel
0f910ae7a2 Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog 2016-12-08 12:37:40 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving
CURA-1263
2016-12-08 11:56:42 +01:00
Jack Ha
0d023a196e Code layout. CURA-2763 2016-12-08 11:21:30 +01:00
jack
332ef2ed19 Merge pull request #1228 from Ultimaker/extruder_tab_layout
Added hover color for machine selection. CURA-2763
2016-12-08 11:19:51 +01:00
Jack Ha
054e73383d Added hover color for machine selection. CURA-2763 2016-12-08 11:12:48 +01:00
Simon Edwards
70affc46a3 Merge pull request #1224 from Ultimaker/extruder_tab_layout
Extruder tab layout CURA-2763
2016-12-08 11:11:13 +01:00
Ghostkeeper
9f7f181e33
Update Nylon profiles
This is an update from our materials team.
2016-12-08 10:28:11 +01:00
fieldOfView
ace4bfba10 Fix QML error about use of anchors in a row 2016-12-07 22:30:31 +01:00
fieldOfView
d67395b42b Codestyle & documentation update 2016-12-07 22:23:06 +01:00
fieldOfView
bd4cac53b4 Fix colors to adhere to hig 2016-12-07 22:10:22 +01:00
fieldOfView
18fb379fbe Add tooltips for Setup/Monitor and Recommended/Custom tabs 2016-12-07 19:40:33 +01:00
fieldOfView
e642b4ebe9 Tweak 2.4 sidebar changes
* Make extruder-tabs more clear on badly calibrated displays
* Make infill selection same width as other "Recommended" controls
* Move printer selection to the top bar
* Add animation to support extruder selection combobox
2016-12-07 17:41:04 +01:00
Jack Ha
7694b8f128 Cannot do it simpler. CURA-2763 2016-12-07 15:40:25 +01:00
Jack Ha
4ecd1a0fe3 Simplifying layout by removing unneeded elements. CURA-2763 2016-12-07 15:16:47 +01:00
Jack Ha
67f1afb9ce Revert "Show extruder tabs only in custom mode. CURA-2763"
This reverts commit f916c9b4cf.
2016-12-07 14:32:40 +01:00
Ghostkeeper
34a8ba49e9
Update quality profiles
These are the latest profile updates from materials.
2016-12-07 13:47:16 +01:00
Ghostkeeper
178e7c8a82
Adjust cool down speed modifier default
This is part of the weekly profile update from the materials team.
2016-12-07 12:03:43 +01:00
Tim Kuipers
976f822158 JSON fix: give pre_print_temp and post_print_temp back their default_temp 2016-12-06 16:49:57 +01:00
Jack Ha
f916c9b4cf Show extruder tabs only in custom mode. CURA-2763 2016-12-06 16:32:34 +01:00
Jack Ha
3efc5d63ef Improved layout, removed material name from extruder name. CURA-2763 2016-12-06 16:11:08 +01:00
Ghostkeeper
e1b4379c74
Add park distance setting
As a result, the description of the other two settings no longer needs to mention that it is used by the park distance.

Contributes to issue CURA-2795.
2016-12-06 16:01:08 +01:00
Jack Ha
b120cba148 Better colors. CURA-2763 2016-12-06 15:56:20 +01:00
Jack Ha
30a74fb2c1 Layout changes, extruders are now displayed as extruder tabs. CURA-2763 2016-12-06 15:49:34 +01:00
Jack Ha
a65a81e60b colours 2016-12-06 14:14:24 +01:00
Jack Ha
ed7ec58822 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:52:14 +01:00
Jack Ha
64c0cbd0a4 Fix clean config cura, recommended mode support extruder update. CURA-3033 2016-12-06 11:48:49 +01:00
Tim Kuipers
f4979be5cb JSON fix: description of speed_travel_layer_0 now includes explanation of inheritance function (CURA-3066) 2016-12-06 11:48:04 +01:00
Jaime van Kessel
5aa394b197 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:39:37 +01:00
Jaime van Kessel
58e7e6ef5a Added default_printing_temperature property
CURA-2586
2016-12-06 11:38:56 +01:00
Ghostkeeper
2f790c12b8
Expand description of heat zone with implementation details
It is used to move filament in parking position when an extruder is not used any more.

Contributes to issue CURA-2795.
2016-12-06 08:58:19 +01:00
Ghostkeeper
1932a95ded
Expand description of cool zone setting
It is apparently desirable to have more implementation detail in here.

Contributes to issue CURA-2795.
2016-12-06 08:55:06 +01:00
Jaime van Kessel
adb1cc7933 Merge branch 'recommended_sidebar' of github.com:Ultimaker/Cura 2016-12-05 14:02:51 +01:00
Ghostkeeper
1c14c8e2c5 Add cool zone length setting
This setting can vary from cartridge to cartridge and between machines.

Contributes to issue CURA-2795.
2016-12-05 13:20:43 +01:00
Ghostkeeper
96bca5e297 Fix spelling of heat zone length description
Not user visible, but eh.
2016-12-05 13:20:43 +01:00
Tim Kuipers
0e7223bd30 JSON fix: set user specified z seam position at back by default 2016-12-05 12:50:45 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling
CURA-1263
2016-12-05 11:44:42 +01:00
SAMSECTOR
c4a39443cb
Minor starting code new line fix 2016-12-05 09:27:35 +01:00
Jaime van Kessel
c50d0172cc Moved open project to below open recent
CURA-1263
2016-12-02 13:33:13 +01:00
Jaime van Kessel
ea0cbec691 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-02 11:13:45 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open
CURA-1263
2016-12-02 11:13:21 +01:00
Ghostkeeper
53ab4955df
Set initial bed temperature to be equal to normal
By default. Update from the materials team.
2016-12-02 11:05:54 +01:00
Jaime van Kessel
4cf454757f Change import & export back to save & open
CURA-1263
2016-12-02 10:43:02 +01:00
Jack Ha
8c5d97f6a0 Removed log. CURA-2767 2016-12-01 14:52:40 +01:00
Jack Ha
8ff233871f Fixed typo. CURA-2767 2016-12-01 14:51:41 +01:00
Jack Ha
14701d89d0 Finally got edge cases regarding recommended mode support extruder color working. CURA-2767 2016-12-01 14:50:40 +01:00
Jack Ha
23f7a91b40 Merge branch 'master' into recommended_sidebar 2016-12-01 14:10:06 +01:00
Jack Ha
1972e59713 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-01 14:06:34 +01:00
Jack Ha
2924d2bf71 Fix color update in extruder comboboxes. CURA-3033 2016-12-01 14:06:17 +01:00