Commit graph

5880 commits

Author SHA1 Message Date
Ian Paschal
e7704ede3c Monitor Tab - Fix queue/manage queue alignment
Contributes to CL-1052
2018-09-11 17:01:26 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them.
CURA-5618
2018-09-11 16:05:53 +02:00
Jaime van Kessel
f628b63c29 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 15:50:26 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered
calls to the api don't work yet.

Contributes to CURA-5670.
2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00
Jaime van Kessel
4f30dffaf9 Ensure that when a corrupt 3mf file is loaded, the "failed to load" message will pop up 2018-09-11 12:58:00 +02:00
Lipu Fei
1fb6441327 Fix default hardware type NOZZLE in XML material
CURA-5716
2018-09-11 11:20:00 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Jaime van Kessel
d9e23bf02b Fix issue caused by making metadata of containerNode private 2018-09-11 10:42:42 +02:00
Jaime van Kessel
8a6c4a9fb6 Merge branch 'CURA-5677_auto_stop_sim_on_layer_change' of github.com:Ultimaker/Cura into 3.5 2018-09-11 10:40:01 +02:00
Jaime van Kessel
e717fa2251 Fix issue caused by making metadata of containerNode private 2018-09-11 10:36:53 +02:00
Ian Paschal
ac5a038065 Monitor Tab - Fix syntax error
Contributes to CL-1048
2018-09-11 10:27:50 +02:00
Remco Burema
109b3fc1d2 [CURA-5677] Removed some superfluous and/or dead lines. 2018-09-11 09:08:50 +02:00
Wayne Porter
74a6d31c74
Add time lapse post processing plugin 2018-09-10 15:30:52 -07:00
Wayne Porter
2715a20922
Add insert gcode at layer change to PostProcessingPlugin 2018-09-10 12:25:01 -07:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Ian Paschal
333cea4e6d Some tweaks were not really improvements
Contributes to CL-1048
2018-09-10 15:06:19 +02:00
Ian Paschal
1c8b086403 Improve inactive coloring
Contributes to CL-1048
2018-09-10 14:35:05 +02:00
Ian Paschal
0d67420601 Monitor Tab - Accordion-style printer blocks
Includes some unsuccessful attempts at scaling the outer-shadow

Contributes to CL-1048
2018-09-10 13:38:26 +02:00
Ian Paschal
0ecac9f01e Merge remote-tracking branch 'origin/master' into cura_connect_improvements 2018-09-10 11:46:44 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates
Contributes to CL-1047
2018-09-10 11:35:58 +02:00
Thomas Karl Pietrowski
5139e61475 Found the dead line while reading some code 2018-09-10 09:42:47 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
2018-09-07 17:06:18 +02:00
Ian Paschal
79aeca9663 Monitor Tab - Grey progress bar for pause/abort
Contributes to CL-1047
2018-09-07 16:46:11 +02:00
Ian Paschal
97e8db577a Monitor Tab - Add grey monitor tab text
Contributes to CL-1047
2018-09-07 16:45:30 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Ian Paschal
90e8c41fa2 Show time remaining instead of "Paused"
Contributes to CL-1047
2018-09-07 16:09:25 +02:00
Ian Paschal
13717d3ce6 Monitor Tab - Fix -1h -1m bug
Contributes to CL-1047
2018-09-07 16:05:24 +02:00
Remco Burema
c8eeb737bb Automatically stop simulation when the user manually changes the layer (as opposed to the sim. itself). [CURA-5677] 2018-09-07 15:45:31 +02:00
Ian Paschal
28324ff2f6 Monitor Tab - Font improvements
Contributes to CL-1046
2018-09-07 15:28:35 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
2018-09-07 15:23:09 +02:00
Diego Prado Gesto
a9f151670e Remove unused components. They are no longer used. 2018-09-07 14:31:53 +02:00
Ian Paschal
18e0dacda4 Organize files better
First things first... organize!
2018-09-07 14:11:37 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework
CL-893 CL-894 Cura connect ui rework
2018-09-07 12:45:56 +02:00
Ghostkeeper
b0e7562579
Rename VersionUpgrade plug-in from 40 to 35
Because the next version is going to be called 3.5, not 4.0.
2018-09-07 10:59:45 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings
CURA-5670
2018-09-07 09:29:31 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Lipu Fei
a8a88e5ccb Remove mistake changes in CuraEngineBackend 2018-09-06 16:06:45 +02:00
Lipu Fei
c36434ebdd Fix TestShortcutKeys 2018-09-06 16:06:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Lipu Fei
a7f421c60c
Merge pull request #4097 from Ultimaker/fix_layer_number_width
Adjust size of layer number depending on the maximum number of layers
2018-09-06 09:50:32 +02:00
Lipu Fei
2819b6cbc6 Fix code style 2018-09-06 08:57:00 +02:00
Lipu Fei
f9b8a8cbd3 Merge remote-tracking branch 'origin/master' into CURA-5095_collect_user_modified_settings 2018-09-06 08:22:44 +02:00
Mark
cfcf52d7c3 Center in parent and increase width. Fits good on Mac 2018-09-05 22:05:08 +02:00
Lipu Fei
b21200c6a8 Check for None before updating model
CURA-5670
2018-09-05 17:16:58 +02:00
Mark
68a62f1a66 Merge branch 'master' into fix_layer_number_width 2018-09-05 14:50:12 +02:00
Jaime van Kessel
57a7c3bcd2 Decrease margin for "manage queue" label
CL-896
2018-09-05 14:26:11 +02:00
Jaime van Kessel
534e60d8e1 Added pausing text for pausing state
CL-896
2018-09-05 14:22:41 +02:00