Commit graph

8977 commits

Author SHA1 Message Date
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 8c9eccd1f4. 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
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Jaime van Kessel
4bdbe42dcb Fixed type hinting issues
CURA-3497
2017-05-02 11:21:17 +02:00
Jaime van Kessel
69c3baf87f Fixed unit test
CURA-3497
2017-05-02 11:06:25 +02:00
Ghostkeeper
f612a53563
Detect more temperature settings in start g-code
Other settings such as the layer 0 temperatures are now also properly detected.
2017-05-02 09:52:38 +02:00
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Jaime van Kessel
c815077278 Fixed the upgraderFileRename test
CURA-3479
2017-05-01 17:28:55 +02:00
Jaime van Kessel
e6e442348b Fixed one of the tests
The test failed due to it not creating the right application CURA-3497
2017-05-01 16:10:05 +02:00
Ghostkeeper
5b8e1f25b7
Don't add prime tower area if single extrusion
Simple papercut fix.
2017-05-01 14:25:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control
While simplifying theme additions
2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
2017-04-30 12:38:46 +02:00
fieldOfView
c9039bb6fc Add a field to set the material diameter for the printer
This is used to filter the list of available materials, see https://github.com/Ultimaker/Cura/pull/1685
2017-04-30 11:08:24 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer
See https://github.com/Ultimaker/Cura/issues/1759
2017-04-30 10:53:23 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues
Make scrollview look more in line with the scrollview on the profiles page
2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons
Add Extruder selection buttons to the Toolbar
2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker
Theme picker
2017-04-27 15:32:14 +02:00
Victor Larchenko
4f446bfcbc Added filament cost keyword replacement 2017-04-27 16:44:43 +06:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material.
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
2017-04-27 11:19:46 +02:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
2017-04-26 16:17:54 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label
CURA-3609
2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling
Make the general settings page options draggable only vertically
2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
9371b28cb3 Add color swatch for "by material" view style and show proper extruder names 2017-04-25 18:55:25 +02:00
fieldOfView
49880d54ad Remove code repetition while touching up layout 2017-04-25 18:45:43 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly
The Label style property should not be confused with e TextField style property
2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed'
Contributes to issue CURA-3491.
2017-04-25 16:46:30 +02:00