3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
18130 commits 313 branches 275 tags 718 MiB
Commit graph

4671 commits

Author SHA1 Message Date
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +01:00
Ghostkeeper
05b32548f3
Code style: Start comments with a space 
Contributes to issue CURA-5876.
 2018-12-06 16:27:56 +01:00
Aleksei S
e8cf9e034d Catch All Exception except: SystemExit, KeyboardInterrupt, GeneratorException 
CURA-5939
 2018-12-06 13:41:50 +01:00
Aleksei S
84c85439ff The trigger_early_crash did not trigger early crash for testing purposes 
CURA-5939
 2018-12-06 12:00:26 +01:00
ChrisTerBeke
57efca1376
Fix a possible division by zero error 2018-12-05 19:31:58 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Daniel Schiavini
163226f940 STAR-322: Using composition rather than inheritance 2018-12-05 12:02:04 +01:00
ChrisTerBeke
d0513e40e1
Remove crappy implementation 2018-12-04 22:21:36 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
 2018-12-04 21:30:24 +01:00
Daniel Schiavini
8ea4edf67e STAR-322: Fixing job uploads 2018-12-04 17:37:58 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Daniel Schiavini
54744b46a7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:15:19 +01:00
Daniel Schiavini
9046b39b43 STAR-322: Creating a Cloud API client to handle the interaction 2018-12-04 16:14:08 +01:00
ChrisTerBeke
e98f3bff38 Implement test version of showing cloud connected printers in list 2018-12-04 14:09:20 +01:00
Ghostkeeper
82d8410d18
Don't emit enabledChanged signal if it didn't change 
Contributes to issue CURA-5876.
 2018-12-04 13:58:54 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
ChrisTerBeke
12b3f0088d Add content type to file upload 2018-12-04 10:07:43 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring 2018-12-03 22:12:18 +01:00
ChrisTerBeke
24b75d781e Fix merge conflict 2018-12-03 15:58:25 +01:00
Daniel Schiavini
fc26ccd6fa STAR-332: Some improvements to get the job in connect 2018-12-03 14:41:36 +01:00
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Daniel Schiavini
8066074a2f STAR-332: Fixing warnings 2018-12-03 11:02:49 +01:00
Ghostkeeper
18bb403413
No longer switch away from extruder when disabling 
It feels confusing when this happens.

Contributes to issue CURA-5876.
 2018-11-30 15:42:46 +01:00
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry 
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
 2018-11-30 11:11:17 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Jaime van Kessel
7d42fdf183 Add missing typing 2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3 Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00
Jaime van Kessel
aeb2887796 Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-28 10:15:07 +01:00
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6 Fix typing 2018-11-27 17:54:53 +01:00
ChrisTerBeke
4e150fb4bf Merge branch 'master' into cloud-output-device 2018-11-27 16:59:28 +01:00
Diego Prado Gesto
dad2031e4b Switch to the preview stage before to switch to simulation view 
... since now the list of views are in a different stage.

Contributes to CURA-5979.
 2018-11-27 16:06:37 +01:00
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs 
CURA-5879
 2018-11-27 15:50:03 +01:00
Jaime van Kessel
854755277c Fix styling of comments 
Because sentences should start with capitals
 2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6 Prevent a KeyError from messing 
CURA-5978
 2018-11-27 14:34:29 +01:00
Diego Prado Gesto
ea75a60dd8 Merge branch 'master' into ui_rework_4_0 2018-11-27 13:17:10 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin 
Tests for um3networkplugin
 2018-11-27 12:59:44 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
ChrisTerBeke
a9fedb4f66 Restore NetworkedPrinterOutputDevice for now 2018-11-26 15:05:53 +01:00
Marijn Deé
579522857a Fix the code-style test 2018-11-26 14:42:50 +01:00
Diego Prado Gesto
52b916d45c Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 14:33:41 +01:00
ChrisTerBeke
014b1d6e4e test 2018-11-26 13:45:37 +01:00
Mark
8bae9fa667 Merge branch 'master' into ui_rework_4_0 2018-11-26 13:41:25 +01:00