3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 302 branches 270 tags 770 MiB
Commit graph

5045 commits

Author SHA1 Message Date
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
ccef0843c2
Merge pull request #4273 from Kriechi/pause-at-height-rrf 
add PauseAtHeight post-processing script for RRF
 2018-09-13 15:11:30 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements 
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
 2018-09-13 14:52:52 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned 
Contributes to CL-1052
 2018-09-13 10:35:31 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream 
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
 2018-09-12 17:07:10 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
Aleksei S
3da6e3c453 Set simulation path to 0 after updating layer 
CURA-5677
 2018-09-12 16:56:54 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button 
Contributes to CL-1049
 2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles 
Contributes to CL-1049
 2018-09-12 16:46:18 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon 
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
 2018-09-12 16:31:59 +02:00
Jaime van Kessel
c59ff82c64 Revert "[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)" 
This reverts commit f9585b5fae.
 2018-09-12 13:39:10 +02:00
Jaime van Kessel
00494d8301 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-12 13:38:56 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Ian Paschal
e51089a880 Mointor Tab - CL-1046 Make fonts bold 2018-09-12 13:03:12 +02:00
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
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