GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 03:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,795 Commits 290 Branches 260 Tags
Commit Graph

712 Commits

Author SHA1 Message Date
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic 
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
 2020-04-29 13:31:45 +02:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Kostas Karmas
6583f5f5ac Reset the model when pressing the Add cloud printer button 
CURA-7022
 2020-04-28 12:08:48 +02:00
Kostas Karmas
49cb1d325e Update the DiscoveredCloudUltimakerPrinters model 
Whenever new cloud devices are detected on the ultimaker account, add
them to the model

CURA-7022
 2020-04-24 19:17:34 +02:00
Nino van Hooff
3ba284b36c
Merge pull request #7539 from Ultimaker/CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard 
Cura 7019 move sign in screen in front of add printer in first run wizard
 2020-04-23 14:56:31 +02:00
Jaime van Kessel
0bf862f9a9
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-23 11:39:04 +02:00
Jaime van Kessel
45dc8bcc68
Fix warnings about output device not being detected 
CURA-7055
 2020-04-23 11:38:34 +02:00
Ghostkeeper
d9cdea9496
Don't crash when material file is missing 
This could happen because a material is deleted right at that moment, since the SendMaterialJob is done on a separate thread.

Fixes Sentry issue CURA-JZ.
 2020-04-23 11:10:52 +02:00
Jaime van Kessel
6746106608
Also connect with cloudOutput device if it was added 
CURA-7055
 2020-04-23 11:07:21 +02:00
Jaime van Kessel
7c7c1ad96c
Fix remote_clusters not being added in second boot 
CURA-7055
 2020-04-23 10:58:16 +02:00
Kostas Karmas
1602b71841 Inform the Cloud page about new cloud printers 
Properly close the welcome screen if the user has signed in and has
cloud printers linked to his/her account. If he doesn't have any, move
to the next page of the welcome wizard.

CURA-7019
 2020-04-23 09:59:32 +02:00
Kostas Karmas
1262d1f641 Activate the first available Cloud printer if the activeMachine is empty 
CURA-7019
 2020-04-22 18:31:04 +02:00
Kostas Karmas
3d26b6886f Fix the welcome dialog not closing when cloud printers detected 
The welcome dialog was not closing because when pressing the "Sign up"
button in the cloud page, a signal is emitted that is forcing the
welcome wizard to move to the next page. Therefore the currentPageIdx
was detected as cloud_page_idx+1.

This commit fixes the check by checking whether the welcome dialog is
in the page after the Cloud page.

CURA-7019
 2020-04-22 18:22:42 +02:00
Kostas Karmas
1030945c5d Merge branch 'master' into CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard 2020-04-22 16:51:40 +02:00
Nino van Hooff
6bbfd14d00
Merge pull request #7443 from Ultimaker/CURA-7055_auto_add_cloud_printers 
CURA-7055_auto_add_cloud_printers
 2020-04-22 16:05:40 +02:00
Kostas Karmas
7b464e5550 Close welcome wizard when user has cloud printers 
If the user signs in during the welcome process, if he/she has cloud
printers connected to his/her account, then the welcome wizard will
close so that the user will not be asked to add local printers.

CURA-7019
 2020-04-20 15:06:31 +02:00
Jaime van Kessel
2da965e46e
Merge branch 'CURA-7147_preview_img_for_cloud' of github.com:Ultimaker/Cura into 4.6 2020-04-16 15:11:20 +02:00
Remco Burema
ac5213d232
Fix typing. 
part of CURA-7147
 2020-04-16 12:59:36 +02:00
Remco Burema
006822334c
Fetch preview image from cloud for monitor page. 
part of CURA-7147
 2020-04-16 12:18:49 +02:00
Nino van Hooff
783b8e08ff Only schedule a new cloud sync after the previous one finished 
Prevents concurrent syncs, which would create duplicate printers.

Also doxygen comments to docstring

CURA-7055
 2020-04-14 11:40:04 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables 2020-04-10 13:46:19 +02:00
Ghostkeeper
9c55ae5ac5
Allow print job actions from 5.2.12 
This feature was backported to 5.2 so that UM3 can actually do this as well.
 2020-04-10 10:39:18 +02:00
Jaime van Kessel
d1337c9e22
Prevent printer from being added twice if it's in cloud and local 
CURA-7055
 2020-04-09 16:39:47 +02:00
Jaime van Kessel
33b3bb77c3
Fix typing 
List wasn't added, so mypy borked. CURA-7055
 2020-04-07 16:58:08 +02:00
Nino van Hooff
ff017e6a52 Remove unnecessary call to remove printer from qt model 
Since cloud printers are not added to that model anymore

CURA-7055
 2020-04-07 14:44:24 +02:00
Nino van Hooff
99b4b86052 Display max 3 printer names in the printer discover message 
CURA-7055
 2020-04-07 14:43:26 +02:00
Nino van Hooff
22a06fca3b Shorten new cloud printers message 
So the plural form also fits on one line

CURA-7055
 2020-04-07 13:50:24 +02:00
Nino van Hooff
0ec3e0972b Add an image to the cloud printer sync message 
CURA-7055
 2020-04-06 18:01:57 +02:00
Nino van Hooff
b141bb139e Update documentation of _connectToActiveMachine 
CURA-7055
 2020-04-06 15:04:39 +02:00
Nino van Hooff
52ef794c4d Add a Message informing users of progress on cloud syncing printers. 
CURA-7055
 2020-04-06 14:49:45 +02:00
Nino van Hooff
a80a5f36ff Add a Message informing users of progress on cloud syncing printers. 
CURA-7055
 2020-04-06 13:44:48 +02:00
Nino van Hooff
4adf4dceb8 Automatically make discovered printers available to use. 
instead of the list of available printers to be connected

CURA-7055
 2020-04-03 12:02:27 +02:00
Remco Burema
c20b2c6ee0
Merge pull request #7211 from Ultimaker/CURA-7150_proper_http_request_headers 
CURA-7150_proper_http_request_headers
 2020-03-24 11:25:07 +01:00
Jaime van Kessel
56c387502a
Strip extension from file_name when printing via the cloud 
ST-2880
 2020-03-16 15:54:41 +01:00
Nino van Hooff
96ed85f9c0 Move UltimakerCloudAuthentication and UltimakerCloudScope 
...to their own module
Fixes an import error where UltimakerCloudScope was used my both the
Toolbox and CuraDrive plugins

CURA-7150
 2020-03-12 17:48:54 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Lipu Fei
3ddc2466f8 Fix typing 2019-12-17 10:27:05 +01:00
Ghostkeeper
5ea60823f5
Don't crash if address is still none after getting info 
This can happen (starting somewhere between zeroconf version 21.0 and 24.0).

Contributes to issue CURA-7032.
 2019-12-13 10:54:27 +01:00
Ghostkeeper
e54ce8643b
Don't wrap str unnecessarily 
Just an inefficiency that I found.
 2019-12-13 10:44:48 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Jaime van Kessel
141bd0f127
Remove spammy New Cloud Printer detected message 
ST-3153
 2019-11-04 11:10:30 +01:00
Jaime van Kessel
c2e6116983
Add names to all the threads 2019-11-01 16:20:42 +01:00
Jaime van Kessel
c5623a1364
Also catch ValueError when handling modelParsing from network 
CURA-6855
 2019-10-28 10:30:25 +01:00
ChrisTerBeke
8f46c02e5d Fix MyPy issues 2019-10-25 12:35:03 +02:00
ChrisTerBeke
9a3ff527ac Bring back the printer selection dialog for networked printers 2019-10-25 12:25:41 +02:00
Lipu Fei
5548c30616 Catch WinErrors for zeroconf 
CURA-6855
 2019-10-21 10:21:50 +02:00
Lipu Fei
750632ec41 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-02 12:52:37 +02:00
ChrisTerBeke
445743ab75
Use empty string as fallback value 2019-10-01 19:53:40 +02:00
ChrisTerBeke
76536fe715
Ensure string matching is done with strings 2019-10-01 19:52:40 +02:00