Jack Ha
5d15d6e792
Merge branch 'master' into feature_multiextruder_machinesettings
2017-05-02 17:26:27 +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
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
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
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
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
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
Arjen Hiemstra
0fad973181
Never enable the per-object tool when in simple mode
...
Contributes to CURA-3577
2017-04-25 16:12:36 +02:00
Arjen Hiemstra
7822173881
Remove extruder selection from per-object settings tool
...
Contributes to CURA-3577
2017-04-25 16:12:03 +02:00
Arjen Hiemstra
89e6313143
Add buttons to select the extruder for the selection to the toolbar
...
Contributes to CURA-3577
2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4
Fix the extruder icons to have a proper square aspect ratio
...
Contributes to CURA-3577
2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125
Add support for overriding the background color of a Tool button
...
Contributes to CURA-3577
2017-04-25 16:09:51 +02:00
Arjen Hiemstra
09f23f5f91
Styling fixes in Toolbar QML
2017-04-25 11:31:59 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern
...
It was depending on support bottom extruder.
Contributes to issue CURA-3491.
2017-04-24 17:31:07 +02:00
Arjen Hiemstra
ada614e413
Workaround a tiny display issue with checkable MenuItems
...
If there are no changes to make, we still need to reset the selected
extruders. This is a workaround for checked menu items being deselected
while they actually should still be selected.
Contributes to CURA-3609
2017-04-24 17:11:37 +02:00
Arjen Hiemstra
89310cb41e
Select the group when right clicking an object that is part of a group
...
Instead of selecting the individual object.
Contributes to CURA-3609
2017-04-24 17:10:00 +02:00
Arjen Hiemstra
86d3cbadca
Also search through groups when figuring out the extruders of the selection
...
Contributes to CURA-3609
2017-04-24 17:09:18 +02:00
Arjen Hiemstra
b4c557679c
Change the selected extruder for all child nodes of a group
...
Instead of setting the extruder for the group node, go through all
children and set their extruders instead. Fixes extruder selection on
groups.
Contributes to CURA-3609
2017-04-24 17:08:19 +02:00
Jaime van Kessel
33d92f9596
Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons
2017-04-24 16:39:15 +02:00
Ghostkeeper
e7157e9e6d
Merge branch 'gcode-keywords' of https://github.com/alephobjects/Cura2 into alephobjects-gcode-keywords
2017-04-24 15:35:10 +02:00
Jaime van Kessel
01f33d3f28
Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu
...
Add Extruders to Context Menu and Refactor
2017-04-24 14:55:57 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings
...
This was deemed the most logical ordering.
Contributes to issue CURA-3491.
2017-04-24 14:28:10 +02:00
