Commit graph

7343 commits

Author SHA1 Message Date
Ghostkeeper
f127660cfc
Remove whitespace at the end of the lines
Someone put tabs there.
2018-03-15 16:13:05 +01:00
Lipu Fei
b1c1b04f0d Restore change to SettingView removeUnusedValue 2018-03-15 16:09:01 +01:00
Jack Ha
8af82cc3f4 CURA-4400 prevent disabling last enabled extruder 2018-03-15 15:54:44 +01:00
Jack Ha
4b060f297f CURA-4400 grey out disabled extruder in context menu 2018-03-15 15:44:27 +01:00
Jack Ha
1dba5629f7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton
CURA-5088
2018-03-15 14:41:34 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
2018-03-15 11:21:37 +01:00
Jack Ha
d0609e97e4 CURA-4557 added material_shrinkage_ratio_percentage setting 2018-03-15 11:19:14 +01:00
fieldOfView
11be8f158f Merge branch 'master' into feature_support_eraser_ux 2018-03-15 11:10:49 +01:00
Diego Prado Gesto
50bf61d823 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 10:34:09 +01:00
Diego Prado Gesto
0155a20994 CURA-4870 Fix visibility in the status icon 2018-03-15 10:33:06 +01:00
jack
f3f4be5334
Merge pull request #3496 from fieldOfView/fix_textfield_select
Only select all text when tabbing to fields, not when clicking a field
2018-03-15 10:28:47 +01:00
Lipu Fei
a477b8cdc2 Fix malyan m180 definitions
CURA-4696
2018-03-15 09:58:02 +01:00
Jack Ha
8dd065e3f5 Merge branch 'master' into extra_machine_settings 2018-03-15 09:36:30 +01:00
Diego Prado Gesto
1cf832653c CURA-4870 Make the configuration selector only available for network
printers.
Show the connection icon also for printers connected via USB or
Octoprint.
2018-03-14 17:00:39 +01:00
Diego Prado Gesto
e6c5bd28b2 CURA-4870 Use the visible property instead of a Qt5.10 existing 'opened'
property.
This is needed to avoid a crashing for those that are using 5.10 running from
source.
2018-03-14 16:53:51 +01:00
Diego Prado Gesto
61ce0c3154 CURA-4870 Make the configuration pop-up open and close with one click.
Before it was the case in which sometimes the user needs two clicks for
that.
Also collapse the dropdown when the configuration is applied.
2018-03-14 15:15:43 +01:00
Diego Prado Gesto
ff676c98a6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 13:56:24 +01:00
ChrisTerBeke
eec963b313 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-14 13:30:30 +01:00
ChrisTerBeke
474db38ddf Fix failing test for um3_extended 0.8 variant 2018-03-14 13:30:20 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Lipu Fei
d6b270954a Fix the case when no quality is available
CURA-5044

The tooltip should also show up if there is no quality available.
2018-03-14 13:11:24 +01:00
Lipu Fei
fcd50b0cf2 Fix code style
CURA-5044
2018-03-14 13:10:58 +01:00
Lipu Fei
b8c32eb166 Fix typo in ConfigurationListView.qml 2018-03-14 12:59:48 +01:00
Diego Prado Gesto
23a2b6e0f7 CURA-4870 Don't show the configuration selector if the printer is not a
network printer (for example don't show if is USB)
2018-03-14 11:54:10 +01:00
Aleksei S
160a59191b Show Tooltip for the unavailable slider's area
CURA-5044
2018-03-14 11:45:00 +01:00
Diego Prado Gesto
c69987b824 CURA-4870 Reintroduce the "Check compatibility" link in the sidebar 2018-03-14 11:26:22 +01:00
Lipu Fei
f5f8bf19ec Fix QML warnings 2018-03-14 11:05:32 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts
CURA-4879
2018-03-14 10:53:10 +01:00
Lipu Fei
cff1e8639d Fix preferred material PLA for printrbot simple makers kit
CURA-5089
2018-03-14 10:48:05 +01:00
Lipu Fei
17525b9cb6
Merge pull request #3421 from timur-tabi/master
Add definition for Printrbot Simple Maker's Kit 1405
2018-03-14 10:47:20 +01:00
Ghostkeeper
00bd306307
Merge branch 'M&P-Setting-Optimization' 2018-03-14 09:02:38 +01:00
Mark Burton
4aa89068d7 Now, wall_min_flow and wall_min_flow_retract are hidden if overlap compensation is disabled. 2018-03-13 19:00:27 +00:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar
CURA-5084
2018-03-13 17:41:15 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Lipu Fei
5adb769cf8 Fix value function for extruders_enabled_count
CIRA-5056
2018-03-13 16:48:44 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility
Cura 5059 reset icon visibility
2018-03-13 16:11:58 +01:00
Diego Prado Gesto
855df814d8 CURA-4870 Fix some style with brackets in QML 2018-03-13 16:11:51 +01:00
THeijmans
6b7fc8b903 Removed retraction z hops from variants
To make single extrusion mode work.
2018-03-13 15:00:24 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
9196802e83 CURA-4870 Clean the error messages from qml by not rendering components
if there is no outputDevice defined.
2018-03-13 13:40:31 +01:00
Ian Paschal
516772e1f7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-13 13:29:03 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Jack Ha
d6979bc89a CURA-4400 using an intermediate variable prevents an empty popup that occured now and then 2018-03-13 13:14:33 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders
context menu option
2018-03-13 12:31:03 +01:00
fieldOfView
0caea24afc Add depth pass for picking a location 2018-03-13 12:14:05 +01:00
THeijmans
392605014a Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization
Fixed conflicts
2018-03-13 11:58:33 +01:00