Ian Paschal
5f0d9fc16a
Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top
2019-02-08 09:41:41 +01:00
Ian Paschal
729f4c9d52
Revert "Fix line length"
...
This reverts commit 19f1a2f2d0
.
2019-02-08 09:40:56 +01:00
Ian Paschal
19f1a2f2d0
Fix line length
...
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Jaime van Kessel
e869829f10
Updated the icon so it also works in the dark theme
2019-02-07 15:17:07 +01:00
Lipu Fei
e5071eac5b
Fix typing
2019-02-07 14:31:40 +01:00
Remco Burema
3a94745667
Make sliders reappear in simulation-view. [CURA-6183]
2019-02-06 16:01:01 +01:00
Jaime van Kessel
8d7b623879
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-06 12:37:50 +01:00
Jaime van Kessel
c7c57c167c
Fix call to non-existing function
2019-02-06 12:37:30 +01:00
Simon Edwards
8e569126ff
Use the older but backwards compatible API for moving print jobs in the queue.
...
CL-1237
2019-02-06 12:19:59 +01:00
Simon Edwards
18786a1e7d
Fix the default content-type for HTTP PUT requests in NetworkedPrinterOutputDevice
...
CL-1237
2019-02-06 12:18:32 +01:00
Ian Paschal
58d998af68
Add theme entry for message image
...
Contributes to CL-1222
2019-02-06 11:58:22 +01:00
Jaime van Kessel
f2fbb4e989
Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94
Fix display of long names in sync configuration menu
2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a
Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174]
2019-02-05 13:24:28 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage
...
Let each stage create its own action panel
2019-02-05 11:16:00 +01:00
Jaime van Kessel
d59889a4ab
Fix logo in about popup
2019-02-05 11:13:47 +01:00
Jaime van Kessel
d57d4fd277
Fix text color not being themed
2019-02-05 11:05:33 +01:00
Lipu Fei
bac344a692
Show extruder names in disabled message
...
CURA-5693
2019-02-05 09:26:50 +01:00
Lipu Fei
7964465eb5
UM2+ do not support olsson block upgrade
...
CURA-6133
2019-02-05 07:59:49 +01:00
Ghostkeeper
7569ed9834
Another adjustment to account creation commercial text
...
The marketing team wants to make this small adjustment too.
2019-02-04 16:18:54 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning
...
This was most likely copied from an old release but the font in question was deleted.
2019-02-04 15:23:57 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property
...
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.
Contributes to issue CURA-6086.
2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage
...
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.
Contributes to issue CURA-6086.
2019-02-04 15:08:59 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen
...
This is a new text that we got from marketing.
2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f
Stop using depreciated API call
2019-02-04 11:53:24 +01:00
Diego Prado Gesto
42ca21fc1a
Fix typo in comment
2019-02-01 16:46:09 +01:00
Lipu Fei
f7765189c8
Show Extruder 1,2,3,... in message
...
CURA-5693
2019-02-01 13:36:10 +01:00
Jaime van Kessel
39e1dbd95f
Merge branch 'CURA-6169_dark_theme_messagebox' of github.com:Ultimaker/Cura into 4.0
2019-02-01 12:06:46 +01:00
Jaime van Kessel
5600d5407c
Add default if group_name is not set.
...
Otherwise we get a crash.
CURA-6153
2019-02-01 12:02:59 +01:00
Jaime van Kessel
4aaeb8c2d5
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
2019-02-01 11:54:35 +01:00
Remco Burema
203f699d0a
Override message-box bg-color in dark theme. [CURA-6169]
2019-02-01 11:24:50 +01:00
Lipu Fei
60a4fb3151
Fix missing "group_name" renaming
...
CURA-6153
2019-02-01 10:23:51 +01:00
Lipu Fei
18cec8dbe8
Fix typing
...
CURA-6153
2019-02-01 10:20:16 +01:00
Remco Burema
7e11345f14
Remove checked off TODO-comment. [CURA-6153]
2019-01-31 20:30:57 +01:00
Remco Burema
435c8deded
Add 'connect_group_name' to 'group_name' rename to version-upgrade. [CURA-6153]
2019-01-31 20:25:21 +01:00
Remco Burema
954fdb20ad
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
2019-01-31 20:21:42 +01:00
Jaime van Kessel
9a3d9dd2c1
Ensure that writeStarted is called when attempting to print via USB
2019-01-31 17:42:20 +01:00
Jaime van Kessel
eae8e80923
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-31 17:14:28 +01:00
Jaime van Kessel
e6f722b29c
Move additional component loader into ActionPanelWidget
2019-01-31 17:13:32 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states
...
CL-1154 Monitor empty states
2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d
Show correct printer name in selector-header on disconnect. [CURA-6153]
2019-01-31 15:05:27 +01:00
Ian Paschal
1cd9ffefcc
Improve no connection message
...
Contributes to CL-1154
2019-01-31 14:51:58 +01:00
Jaime van Kessel
1a037bdb82
Prevent UFP writer from crashing if the base file of a material can not be found
...
Another issue found in the crash reports
2019-01-31 14:48:40 +01:00
Jaime van Kessel
d5e34cc9c9
Prevent crash when activePrinter doesn't have a controller
...
Got the crash from the automatic crash reports
2019-01-31 12:59:29 +01:00
Jaime van Kessel
9885ce2817
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-31 11:32:16 +01:00
Jaime van Kessel
3734b980d8
When disabling an extruder due to sync, always show a message.
...
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.
CURA-5693
2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457
Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0
2019-01-31 11:22:00 +01:00
Ian Paschal
7189daec80
Finalize monitor stage empty states
...
Contributes to CL-1154
2019-01-31 10:50:30 +01:00
Ian Paschal
389bdeb0c7
Expose configurations the same way as connectivity
...
Contributes to CL-1154
2019-01-31 10:50:14 +01:00