Commit graph

7628 commits

Author SHA1 Message Date
Ghostkeeper
180e9b6612
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-16 16:37:30 +02:00
Kostas Karmas
87a97afd84 Add newlines at the end of files
CURA-7418
2020-06-16 13:35:28 +02:00
Jaime van Kessel
1a04744679
Prevent crash when starting the firmware update twice
CURA-6Q
2020-06-16 09:50:18 +02:00
Jaime van Kessel
c58ef1b531
Fix mypy issues
CURA-7418
2020-06-15 14:20:34 +02:00
Jaime van Kessel
f6e9bc7c3c
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window 2020-06-15 14:10:20 +02:00
Jaime van Kessel
a7e7ddf4b5
Add the digital factory button
CURA-7418
2020-06-15 13:33:47 +02:00
Nino van Hooff
994f9fbde7 Re-implement ConnectionStatus by adding a pyqtSignal to HttpRequestMgr
and using ConnectionStatus as proxy for it.

CURA-7492
2020-06-15 11:39:06 +02:00
Kostas Karmas
9bf9bf9a3f Fix typing
CURA-7492
2020-06-15 09:45:39 +02:00
Kostas Karmas
ddf312eca5 Refactor the connection status to be informed by the autosync
The autosync, which happens every 30 seconds, will now also inform the
connection status when the get request succeeds or fails, which is an
indicator of whether the internet is reachable.

CURA-7492
2020-06-15 09:34:56 +02:00
Remco Burema
30ad6e1445
On crash report unbundled plugins + version numbers.
3T-sessions have their own internal tickets now! See CURA-7509 for this one.
2020-06-12 18:39:18 +02:00
Nino van Hooff
e5a7ad2eca
Merge pull request #7904 from Ultimaker/CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message
CURA-7454: Add "remove printers" button in removed printers from account message
2020-06-12 17:35:09 +02:00
Jaime van Kessel
d33529f932
Use property & states instead of listening to changed signal
It makes a lot more sense to me to use states and an actual property.

CURA-7418
2020-06-11 17:31:19 +02:00
Kostas Karmas
6d7d7bdb95 Fix local authorization server crashing
The thread handling the web_server was crashing. This in turn ended in
the web_server not being able to start again, thus being impossible to
login again if you logged out.
2020-06-11 15:27:29 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
2020-06-10 12:50:03 +02:00
Kostas Karmas
984426fabb Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-10 12:06:41 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account
CURA-7438 Handle the case when a cloud printer is removed from the account
2020-06-10 11:46:10 +02:00
Jaime van Kessel
1747dea203
Merge pull request #7902 from Ultimaker/CURA-7490_authorization_server_cpu_usage
Fix Authorization server not properly stopping after flow completes.
2020-06-09 17:27:25 +02:00
Jaime van Kessel
ed53557044
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-09 16:53:33 +02:00
Kostas Karmas
f26445a914 Fix mypy complaint
CURA-7454
2020-06-09 16:01:38 +02:00
Kostas Karmas
8c6a7d3098 Remove definitionChanges before removing a printer
When removing a printer, the files in %appdata%/cura/<version>/
/definition_changes/ remained intact. This commit fixes that by
making sure that the definitionChanges are removed before removing
the machine.
2020-06-09 15:56:13 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
2020-06-09 15:33:22 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
2020-06-09 15:20:15 +02:00
Nino van Hooff
f66e723866 Fix Authorization server not properly stopping after flow completes.
CURA-7490
2020-06-09 15:12:26 +02:00
Kostas Karmas
f0dda6553b Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:04:54 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Jaime van Kessel
b6b3646f32
Merge branch 'CURA-7437_no_internet_cloud_bugs' of github.com:Ultimaker/Cura 2020-06-09 13:45:21 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
2020-06-09 13:41:30 +02:00
Nino van Hooff
32f57b8770 Merge remote-tracking branch 'origin/master' into CURA-7437_no_internet_cloud_bugs 2020-06-09 10:47:53 +02:00
Jaime van Kessel
83fd35424b
Store data for metadata first
This should help with providing data to sentry to find out what the hell is going wrong
2020-06-08 10:31:40 +02:00
Jaime van Kessel
773edfd533
Prevent crash when camera tool was not found 2020-06-08 10:24:59 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Ghostkeeper
ac98caee54
Remove debugging code 2020-06-05 19:35:25 +02:00
Ghostkeeper
9fab964afe
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-05 13:48:52 +02:00
Kostas Karmas
ea6a73e76d Fix mypy complains 2020-06-05 13:18:48 +02:00
Kostas Karmas
22b9bb77ef Fix reporting the [WinError 10038] exception traceback on sign-in
Surround the serve_forever function of the web server with a try-catch
on Windows, in order to avoid printing the entire (useless) traceback.
Now a warning message is be displayed in the log instead.

The behavior is untouched in other platforms
2020-06-05 12:59:31 +02:00
Kostas Karmas
458b439a9a Rename META_REMOVED_FROM_ACCOUNT to META_LINKED_TO_ACCOUNT
The meta data entry was rename to be more representative of its
function. In addition, the bool metadata entry is now properly
handled using the parseBool function.

CURA-7438
2020-06-04 16:14:09 +02:00
Kostas Karmas
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
2020-06-04 15:08:27 +02:00
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
fieldOfView
c34162a2ba Merge branch 'master' into feature_support_meshes_present
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
2020-06-04 10:27:11 +02:00
Nino van Hooff
80a5b53aad Store the printer cluster size as a metadata entry on the machine
This makes the cluster size also available when the machine is offline.
Also fixes an issue where the cluster size is improperly restored
once the internet connection comes back online, resulting in the printer
showing as a single printer until next sync

CURA-7347
2020-06-03 13:59:51 +02:00
Jaime van Kessel
73026a0744
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-02 14:20:35 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Ghostkeeper
19f500834b
Remove use of deprecated extruders property
Still had this one uncommitted from last Friday. I tested it and it works the same way.
2020-06-02 11:54:10 +02:00
Ghostkeeper
e68ebb198e
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:14:21 +02:00
Ghostkeeper
0e4830e6ef
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:10:59 +02:00
Ghostkeeper
e98c26a33c
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:07:08 +02:00
Ghostkeeper
b68c3b7301
Remove usage of deprecated extruders property
Initially PyCharm didn't find this because it's not typed.

Done during Turbo Testing and Tooling.
2020-05-29 18:06:02 +02:00
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments
Converted doxygen style comments to reStructuredText style
2020-05-29 16:46:25 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00