Commit graph

17030 commits

Author SHA1 Message Date
Lipu Fei
6058f632df Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
Diego Prado Gesto
aa8d91faf6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-16 10:58:56 +01:00
Diego Prado Gesto
06d028652d CURA-4870 Change code style 2018-03-16 10:58:31 +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
d78e2d56f7 Fix quality and variant processing in project loading
From version 22 to 24, there is an upgrade for "quality" that changes
it to "quality_changes", but for "quality", we don't have any upgrades.
2018-03-16 10:33:22 +01:00
Lipu Fei
518423f25b Fix broken settingsEnabled 2018-03-16 10:14:08 +01:00
Lipu Fei
579df7537b Fix upgrade from 26 to 27
Missing definition changes container.
2018-03-16 10:03:38 +01:00
fieldOfView
2a811c62d8 Ignore the first press after the selection has been cleared
if the selection is cleared with this tool active, there is no way to switch to another tool than to re-select an object (by clicking it) because the tool buttons in the toolbar will have been disabled. The mouse-event happens after the selection is changed, so we need to keep track of what the selection was previously by monitoring the selection state.
2018-03-15 23:58:22 +01:00
fieldOfView
d1d1307e6e Merge branch 'master' into feature_support_eraser_ux 2018-03-15 22:43:24 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same
group.
2018-03-15 20:01:47 +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
3497736c88 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-15 16:56:02 +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
Ghostkeeper
b0f7a5b358
Fix translation of there being no file formats available
This entry said that it had a context, but it had none. As a result, the whole string was seen as a context.
2018-03-15 16:53:26 +01:00
Ghostkeeper
40ba06f011
Fix output type of BQ Hephestos
That application/x-code may actually be the XCode application or something? Whatever, it should be x-gcode...
2018-03-15 16:53:26 +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
Lipu Fei
9de114c73a Simplify discardOrKeepProfileChangesClosed() 2018-03-15 16:48:09 +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
Mark
1cd26b790c
Merge pull request #3474 from pouncingiguana/master
Added default material diameter to SeeMeCNC printer definitions
2018-03-15 16:44:19 +01:00
Lipu Fei
440a56b7fa Fix settings export in gcode 2018-03-15 16:42:11 +01:00
ChrisTerBeke
5ee30e0c99 Merge branch 'master' into feature_custom_gcode_commands 2018-03-15 16:40:42 +01:00
Ian Paschal
f2512a92a7
Merge pull request #3154 from fieldOfView/fix_per_meshgroup_settings
Enable setting per mesh group settings when printing One at a Time
2018-03-15 16:38:50 +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
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
2c364f4699 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:44:38 +01:00
Jack Ha
4b060f297f CURA-4400 grey out disabled extruder in context menu 2018-03-15 15:44:27 +01:00
Lipu Fei
08f43f6b2e Fix profile ordering in profile importing
CURA-5054
2018-03-15 15:27:47 +01:00
Diego Prado Gesto
b44f32ad1d Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:14:40 +01:00
Diego Prado Gesto
dcb68bb33e CURA-4870 Move the checkCorrectGroupName to the machine manager, where
it must belong to.
2018-03-15 15:13:35 +01:00
fieldOfView
b9bf78d36c Remove group when "parent" is the only node in the group 2018-03-15 15:05:56 +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
fieldOfView
c3c096aaa0 Select the picked node so the group does not get drawn 2018-03-15 14:57:11 +01:00
Lipu Fei
98b325c9d5 Fix material serialization crash 2018-03-15 14:54:37 +01:00
Diego Prado Gesto
1e9a1f2668 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 14:48:43 +01:00
Diego Prado Gesto
cbe929242e CURA-4870 Update the names of the groups in the container stacks when
there is temporary name after upgrading from 3.2
2018-03-15 14:44:01 +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
Lipu Fei
1f2602a2f4 Move SettingVisibilityPresetsModel to Machines.Models
CURA-5088
2018-03-15 14:41:34 +01:00
Jack Ha
50f9548da0 CURA-4557 setting up plugin 2018-03-15 14:33:31 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network
after clicking refresh button.
2018-03-15 14:33:27 +01:00
fieldOfView
a0c44192da Add support eraser meshes to group so it does not drop 2018-03-15 14:27:33 +01:00