2664 Commits

Author SHA1 Message Date
Ghostkeeper
f15eb4be2d
Merge branch 'feature_custom_gcode_commands' 2018-03-20 13:44:23 +01:00
Ghostkeeper
877032584e
Correct documentation
This code was obviously copied from the pre-heat functionality. Let's fix the code duplication next as far as possible.

Contributes to issue CURA-4879.
2018-03-20 13:22:18 +01:00
Ian Paschal
a7b2632739 CURA-4400 Recommended mode shows support extruders 2018-03-20 13:14:48 +01:00
Diego Prado Gesto
9b3a1b4056 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-20 11:42:49 +01:00
Diego Prado Gesto
cd9531b746 Add the correct value to the setting viewer when the type is unknown.
Contributes to CURA-4495
2018-03-20 11:42:42 +01:00
Lipu Fei
f97e615634 Fix file name update
CURA-5122
2018-03-20 11:30:06 +01:00
Diego Prado Gesto
311b5ac791 CURA-4870 Force update the list model also when the output device
changes.
2018-03-19 18:00:48 +01:00
Guillem
faf8ed3ba6 Replace only user changed values
removed machine_settings and settable_per_extruder_check. Not needed.
2018-03-19 14:57:31 +01:00
Lipu Fei
f0dc138b37 Fix visibilty preset update
CURA-5088
2018-03-19 14:14:22 +01:00
Lipu Fei
6620909f3d Remove non-existing showingAllSettings
CURA-5088
2018-03-19 13:47:04 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant()
There is no such thing as VariantGroup.
2018-03-19 12:27:15 +01:00
Lipu Fei
2660d15857 Make "show all settings" work
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
2018-03-19 10:58:56 +01:00
Lipu Fei
ee4a6dc704 Always show confirm dialog upon material diameter change 2018-03-16 13:21:51 +01:00
Diego Prado Gesto
747efda52b CURA-4870 Hide the configuration selector if the connection is lost. 2018-03-16 11:51:52 +01:00
Diego Prado Gesto
a03a57fd60 Change the URL for redirect when checking material compatibility. 2018-03-16 11:10:35 +01:00
Lipu Fei
6058f632df Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
Lipu Fei
a115956575 Do not show a material itself in its linked material list 2018-03-16 10:40:16 +01:00
Lipu Fei
518423f25b Fix broken settingsEnabled 2018-03-16 10:14:08 +01:00
Diego Prado Gesto
222a18e698 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 18:42:45 +01:00
Lipu Fei
f14ddb8711 Fix reset to default quality 2018-03-15 17:09:13 +01:00
Jack Ha
5a55c1817d Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 17:02:44 +01:00
Jack Ha
f8709b6d1a CURA-4400 improved enabled / disabled extruder visually, improved colors of dark theme 2018-03-15 17:02:36 +01:00
Lipu Fei
3bb0a481f1 Simplify default quality reset 2018-03-15 17:01:05 +01:00
Aleksei S
b8ab623c80 Fix: Infill slider did not work at first Cura start
CURA-5071
2018-03-15 16:54:39 +01:00
ChrisTerBeke
d4d9a58d04 Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes 2018-03-15 16:51:25 +01:00
Diego Prado Gesto
d0e6e59845 Set the frame visible for the materials and profiles page in
preferences.
2018-03-15 16:46:25 +01:00
ChrisTerBeke
5ee30e0c99 Merge branch 'master' into feature_custom_gcode_commands 2018-03-15 16:40:42 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder
Feature preheat extruder
2018-03-15 16:38:18 +01:00
Diego Prado Gesto
b3eb1ca877 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 16:15:20 +01:00
Diego Prado Gesto
3ce51bb255 CURA-4870 Correctly align the name with the connection icon when the
printer is connected to USB
2018-03-15 16:14:20 +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
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
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
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