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

5880 commits

Author SHA1 Message Date
ChrisTerBeke
ce07e31bbf Implement active printer for cloud device to get monitor page functionality working 2018-12-05 17:21:46 +01:00
ChrisTerBeke
66690dfef7 Add testing todo 2018-12-05 17:06:22 +01:00
ChrisTerBeke
5e15858cae more mocks for monitor page, fix showing current print job in monitor page, add todo 2018-12-05 17:05:21 +01:00
Daniel Schiavini
117cf10a2c STAR-322: Removing devices when logging off 2018-12-05 16:26:20 +01:00
Daniel Schiavini
657e763318 STAR-322: Using findChanges method to simplify code 2018-12-05 16:15:51 +01:00
Daniel Schiavini
7e76913736 STAR-322: Fixing printer matching by network key 2018-12-05 16:02:38 +01:00
ChrisTerBeke
cd67100097 Comment out some currently broken code 2018-12-05 15:40:45 +01:00
Jaime van Kessel
00e95e68eb Removed unneeded Marketplace tag in logging 
The logger does that all by itself already. CURA-6006
 2018-12-05 14:26:47 +01:00
Jaime van Kessel
d6630b6881 Removed some more cases where data was duplicated and re-used for different purposes 
CURA-6006
 2018-12-05 14:09:55 +01:00
Daniel Schiavini
9f4b047ee1 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-05 14:08:46 +01:00
Daniel Schiavini
b693b9d98f STAR-322: Extracting models to be able for converting themselves 2018-12-05 14:08:40 +01:00
Jaime van Kessel
a52f866f81 Move most models out of dictionary 
CURA-6006
 2018-12-05 14:03:32 +01:00
ChrisTerBeke
7d7dd6bdde First idea for pairing local and remote clusters 2018-12-05 14:02:53 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Jaime van Kessel
07d210483c Greatly decrease the bloat / complexity of the toolbox 
There was a lot of stuff going on that didn't need to happen, so I cut those parts out in order
to improve the overview.
 2018-12-05 13:42:13 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code 
CURA-6006
 2018-12-05 13:21:17 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f Merge branch 'master' into ui_rework_4_0 2018-12-05 13:10:14 +01:00
Ian Paschal
e8a933331c Clean-up printer status label 
Contributes to CL-1153
 2018-12-05 12:14:18 +01:00
Daniel Schiavini
163226f940 STAR-322: Using composition rather than inheritance 2018-12-05 12:02:04 +01:00
Jaime van Kessel
abcc621cc6 Added missing typing 2018-12-05 11:29:44 +01:00
Daniel Schiavini
d99e2d1533 STAR-322: Extracting file handler methods 2018-12-05 11:21:17 +01:00
Jaime van Kessel
d9135ac72f Fix more codestyle issues 
CURA-6006
 2018-12-05 11:06:14 +01:00
Jaime van Kessel
978a01e4c8 Fix typing & codestyle 
CURA-6006
 2018-12-05 10:51:05 +01:00
Jaime van Kessel
700ae4bebb Removed super spammy logging 
CURA-6006
 2018-12-05 10:48:06 +01:00
Daniel Schiavini
3c5e74a72c Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-05 10:44:53 +01:00
Daniel Schiavini
01e443049f STAR-322: Creating a subclass for connect devices 2018-12-05 10:37:58 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component 
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
 2018-12-05 09:39:04 +01:00
ChrisTerBeke
b57f6c5c6a
Do no stop when no clusters are found, we still might need to remove some 2018-12-04 22:58:50 +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
4ff5e43a28 Handle Empty and Unknown material cases 
CURA-5982
 2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material 2018-12-04 17:15:26 +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
27dc17f993 STAR-322: Extracting translations 2018-12-04 16:49:26 +01:00
Marijn Deé
3a733bb0a3 Check before removing a printer 2018-12-04 16:35:48 +01:00
Marijn Deé
b32d6812db We don't need a Signal with QTimer 2018-12-04 16:20:27 +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
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Marijn Deé
a9273ec2b5 Use QTimer instead of threading.Timer 2018-12-04 15:20:24 +01:00
Ian Paschal
014a138fda Remove semi-colon 
Contributes to CL-1153
 2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671 Simplify preview icon logic 
Contributes to CL-1153
 2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8 Always return a string for preview icon 
Contributes to CL-1153
 2018-12-04 15:10:31 +01:00
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00