Lipu Fei
|
19ee790cd7
|
Remove device pixel ratio from DiscardOrKeepProfileChangesDialog
|
2017-05-09 12:05:01 +02:00 |
|
Lipu Fei
|
36dedabd11
|
Fix DPI issue with DiscardOrKeepProfileChangesDialog
|
2017-05-09 11:47:55 +02:00 |
|
Jaime van Kessel
|
eb677f5625
|
Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura
|
2017-05-09 10:20:27 +02:00 |
|
Mark
|
1449f785f7
|
Fix so that sliding the switch also changes the mode
|
2017-05-08 15:51:38 +02:00 |
|
Jack Ha
|
0b0011fc88
|
Multiply dialog now has focus on #, added shortcut Ctrl-M
|
2017-05-04 16:31:33 +02:00 |
|
Ghostkeeper
|
45a369e31b
|
Merge branch 'Sidebar-fix'
|
2017-05-04 13:00:03 +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 |
|
Ghostkeeper
|
a1f32b74e5
|
Include recommended/custom switch in theme
Otherwise it stays white.
|
2017-05-04 09:48:54 +02:00 |
|
Ghostkeeper
|
945486ade9
|
Merge branch 'cura_containerstack'
Contributes to issue CURA-3497.
|
2017-05-03 17:11:55 +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 |
|
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 |
|
Lipu Fei
|
ac560229a1
|
Fix TypeError in JobSpec.qml due to material cost being undefined
|
2017-05-03 10:45:39 +02:00 |
|
Jack Ha
|
5d15d6e792
|
Merge branch 'master' into feature_multiextruder_machinesettings
|
2017-05-02 17:26:27 +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
|
0e1748b705
|
Small layout fix so the comboboxes are aligned
|
2017-05-02 12:55:37 +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
|
2bc4355f00
|
Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura
|
2017-05-02 09:40: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 |
|
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
|
58a857403c
|
Added resetting of theme
|
2017-04-27 16:37:01 +06: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 |
|
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
|
09f23f5f91
|
Styling fixes in Toolbar QML
|
2017-04-25 11:31:59 +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 |
|
Arjen Hiemstra
|
bca27ad11f
|
Document findItemIndex function in ContextMenu
|
2017-04-24 13:13:00 +02:00 |
|
Arjen Hiemstra
|
78603bed63
|
Rename setSelectionExtruder to setExtruderForSelection
This matches more closely with the naming of the other selection
actions.
|
2017-04-24 13:12:00 +02:00 |
|
fieldOfView
|
c1fa927118
|
Make the general settings page options draggable only in the vertical direction
... to match other scrollviews. Fixes #1723
|
2017-04-22 23:07:13 +02:00 |
|
fieldOfView
|
4d12ab1296
|
Merge branch 'master' into feature_multiextruder_machinesettings
|
2017-04-21 19:31:44 +02:00 |
|
Ghostkeeper
|
2fda85a6aa
|
Hide estimated time left if print is aborted or completed
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.
Contributes to issue TRI-1550.
|
2017-04-21 14:29:40 +02:00 |
|
Victor Larchenko
|
e5eb0c9a14
|
Merge remote-tracking branch 'um/master' into theme-picker
|
2017-04-21 14:29:01 +06:00 |
|
Arjen Hiemstra
|
e108bd0627
|
Add extruder selection to Context menu
Contributes to CURA-3609
|
2017-04-20 17:42:06 +02:00 |
|
Arjen Hiemstra
|
03ccdec861
|
Call the right methods of CuraActions in Actions.qml
Contributes to CURA-3609
|
2017-04-20 17:42:06 +02:00 |
|
Arjen Hiemstra
|
c21895de97
|
Add a multiplySelection method to CuraActions
Contributes to CURA-3609
|
2017-04-20 17:41:53 +02:00 |
|
Arjen Hiemstra
|
dd73c53ece
|
Introduce center and multiply actions that work on the entire selection
Instead of working on a single object.
Contributes to CURA-3609
|
2017-04-20 17:41:53 +02:00 |
|
Arjen Hiemstra
|
06cc0e9a63
|
Move the ContextMenu to its own file
Contributes to CURA-3609
|
2017-04-20 17:39:43 +02:00 |
|
fieldOfView
|
62f2fe062b
|
Enable settings when machine_extruder_count is set to 1 but multiple extruders are defined
|
2017-04-19 16:20:01 +02:00 |
|
Lipu Fei
|
7db0f0ebb7
|
Make toggle button labels clickable
|
2017-04-19 12:46:25 +02:00 |
|
Jack Ha
|
232f975092
|
Removed unused code, added ';' to end of lines. CURA-3574
|
2017-04-19 10:28:16 +02:00 |
|
Lipu Fei
|
61c4631270
|
Put sizes and numbers for toggle button into theme
CURA-3574
|
2017-04-19 08:56:11 +02:00 |
|
Lipu Fei
|
c75887be80
|
Use a toggle button for mode switching
CURA-3574
|
2017-04-18 16:40:59 +02:00 |
|