Lipu Fei
25be8d9abb
Fix default Line Width float value representation for UM3
2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme"
...
This reverts commit a1f32b74e5b4a30e892a87deb3f7e052e94bbf54. The fix was correct but we allow the honour for Randyxxl.
2017-05-04 12:53:05 +02:00
Mark Burton
53b7e1a8ca
Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing.
...
Smoothing the contours minimises the visibility of the z-seam and for most models is
probably a good idea. Where it is less good is when the model has a fine surface details
which will get mangled by the smoothing. So we should let the user decide whether they
want to smooth or not. The default is true as most of the time it's a good thing.
# Conflicts:
# resources/definitions/fdmprinter.def.json
2017-05-04 09:02:38 +01:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme
...
Otherwise it stays white.
2017-05-04 09:48:54 +02:00
Robert Colbert
7d7b0eaabb
Delete slnx.sqlite
2017-05-03 14:58:35 -05:00
Robert Colbert
c5bcaf2d72
Delete ProjectSettings.json
2017-05-03 14:58:27 -05:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
...
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Ghostkeeper
ea9e0e2e9c
Replace material without needing to find its index
...
We have an easy setter for this.
Contributes to issue CURA-3497.
2017-05-03 17:09:33 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
...
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.
Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
41e444714f
Fix spacing
...
Minor code style stuff.
2017-05-03 16:54:20 +02:00
Ghostkeeper
cd78ab850d
Remove semicolons
...
Semicolons, a relic of the past.
Contributes to issue CURA-3497.
2017-05-03 16:03:47 +02:00
awhiemstra
cee0539146
Remove version field from Desktop file
...
Apparently, it is not required and we are specifying an invalid version.
Fixes #1784
2017-05-03 15:54:09 +02:00
Ghostkeeper
1778751397
Fix travel speed override
...
Was a typo by the contributor of this definition.
2017-05-03 15:39:20 +02:00
Ghostkeeper
337be1b9be
Fix setting machine changes profile with new specified container stacks
...
Don't need to insert it, because there's already a slot for it on the stack. In fact, you're not allowed to insert anything.
Contributes to issue CURA-3497.
2017-05-03 15:38:20 +02:00
Randall Wessel
687d326fae
Changed color to transparancy and spaces instead of tabs
2017-05-03 15:34:56 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack
2017-05-03 15:21:01 +02:00
Ghostkeeper
86f1a0559f
Add documentation and further specify except around disconnecting signals
...
Catch just a TypeError instead of all exceptions. Added documentation to say why we catch a TypeError there. Also splitted up the try-except block for the 3 disconnects, just so that if the first fails we still try to disconnect from the other two.
Contributes to issue CURA-3497.
2017-05-03 14:56:52 +02:00
Randall Wessel
163543b86b
Make background color of toggle button themeable
...
Background of toggle button gets same color as toolbar surrounding the
button.
2017-05-03 14:26:44 +02:00
Jaime van Kessel
4920646d85
Merge branch 'bugfix_CURA-3711_cli_open_file_jobname' of github.com:Ultimaker/Cura
2017-05-03 14:17:52 +02:00
Jaime van Kessel
8d6450111a
Merge branch 'feature_CURA-3730' of github.com:Ultimaker/Cura
2017-05-03 14:15:50 +02:00
Jaime van Kessel
5159894d5b
Merge pull request #1780 from LipuFei/fix_jobspec_tofix
...
Fix TypeError in JobSpec.qml due to material cost being undefined
2017-05-03 14:12:03 +02:00
Jaime van Kessel
b2d0642269
Merge pull request #1782 from LipuFei/enter_for_UM3_network_dialog
...
Accept Enter key on UM3 Add Printer Dialog
2017-05-03 14:11:10 +02:00
Lipu Fei
c2dff9fcd9
Accept Enter key on UM3 Add Printer Dialog
2017-05-03 13:58:58 +02:00
Jack Ha
a5033bae54
Enable Support settings that are applicable to support meshes. CURA-2747
2017-05-03 13:40:33 +02:00
Lipu Fei
155f01356a
Set job name when opening a file from CLI
...
CURA-3711
2017-05-03 13:30:52 +02:00
Arjen Hiemstra
d95488a940
Use the new stack properties so we can properly create quality changes
...
Contributes to CURA-3497
2017-05-03 13:16:57 +02:00
Arjen Hiemstra
aad623fab6
Correct a typo in CuraContainerStack::findDefaultQuality
...
Contributes to CURA-3497
2017-05-03 13:16:19 +02:00
Jaime van Kessel
9a46a24b19
Profile menu now correctly marks active qualties as checked
...
CURA-3497
2017-05-03 13:13:09 +02:00
Jaime van Kessel
d83b4daf78
Switching from quality_changes to quality profile is now possible again
...
CURA-3497
2017-05-03 11:23:59 +02:00
Jaime van Kessel
c8f823154c
Instead of searching for a container with type, we now use the newly introduced properties
...
CURA-3497
2017-05-03 11:10:39 +02:00
Jaime van Kessel
f062322ebf
Switching from dual extrusion to single extrusion machine is now possible again
...
CURA-3497
2017-05-03 10:59:07 +02:00
Lipu Fei
ac560229a1
Fix TypeError in JobSpec.qml due to material cost being undefined
2017-05-03 10:45:39 +02:00
Jaime van Kessel
ab6240bd31
Replace quality(changes) in machine manager now uses new API as well
...
CURA-3497
2017-05-03 10:38:31 +02:00
Lipu Fei
0b57fa0bcb
Hide Top/Bottom and Inner Wall legends in "Material Color"
...
CURA-3730
2017-05-03 10:37:24 +02:00
Jaime van Kessel
a028297cb2
Machine manager now uses the new specific setters to switch instanceContainers
...
CURA-3497
2017-05-03 10:15:18 +02:00
Jaime van Kessel
8d80f20db7
Added way to dynamicly set loading order
...
This is to ensure that Global stacks are loaded before extruders, so once the extruders are deseralized, they can always find the next (global) stack
CURA-3497
2017-05-03 09:54:00 +02:00
Jack Ha
0452cffff9
Fix setting active extruder when changing Custom FDM printer extruders. CURA-3299
2017-05-03 09:37:12 +02:00
Robert Colbert
b6a5e5a1af
Added VCP serial device support for USB Printing on Windows.
2017-05-02 12:51:34 -05:00
Jack Ha
5d15d6e792
Merge branch 'master' into feature_multiextruder_machinesettings
2017-05-02 17:26:27 +02:00
Jaime van Kessel
58ab9dcd09
Fixed wrong typehinting
2017-05-02 17:00:26 +02:00
Ghostkeeper
745e3cd5bf
Merge branch 'alephobjects-gcode-keywords'
2017-05-02 14:57:22 +02:00
Ghostkeeper
5176b98f6e
Set the correct result in visible settings
...
Oops.
Contributes to issue CURA-3491.
2017-05-02 13:58:11 +02:00
Ghostkeeper
a988571d2b
Merge branch 'gcode-keywords' of https://github.com/alephobjects/Cura2 into alephobjects-gcode-keywords
2017-05-02 13:50:37 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size
...
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
2017-05-02 13:39:12 +02:00
Tim Kuipers
c69000da75
Merge branch 'feature_support_stair_width'
2017-05-02 13:22:19 +02:00
Ghostkeeper
7a9a4ae290
Revert "Change Label to Text because of ugle font rendering"
...
This reverts commit 8c9eccd1f4f49a0d0584b3f56985f4fa16e48915. This element is in a modal window, where the fonts should get the system themeing.
2017-05-02 12:58:29 +02:00
Mark
39af3aea4c
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-02 12:55:56 +02:00
Mark
0e1748b705
Small layout fix so the comboboxes are aligned
2017-05-02 12:55:37 +02:00
Ghostkeeper
bb0e9c3fdc
Split interface line distance into two in user's profiles
...
This hasn't been deep-tested yet, but I assume that'll happen when the plug-in is reactivated in the source code.
Contributes to issue CURA-3491.
2017-05-02 12:36:25 +02:00
Jaime van Kessel
3dae6b4bbf
Fixed machine not being set
2017-05-02 11:58:48 +02:00