Commit graph

26315 commits

Author SHA1 Message Date
Kostas Karmas
d662c607dd Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:06 +02:00
Ghostkeeper
ac98caee54
Remove debugging code 2020-06-05 19:35:25 +02:00
Mark Burton
2669fbe608 Set padding to 0 to remove vertical shift on Linux builds. 2020-06-05 15:31:57 +01:00
Kostas Karmas
3073d7c349 Fix height binding loop QmlWarning in ConfigurationListView
Done during Turbo Testing and Tooling
2020-06-05 15:54:53 +02:00
Ghostkeeper
9404fe0fb9
Fix getting contentWidth in variable width mode
Undefined seems to work fine as well though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-06-05 15:18:10 +02:00
Ghostkeeper
44abd08b32
Use newer extruderList rather than deprecated extruders property
Done during Turbo Testing and Tooling.
2020-06-05 15:17:36 +02:00
Ghostkeeper
43980e90cd
Use extruderList rather than extruders property
Done during Turbo Testing and Tooling.
2020-06-05 15:17:36 +02:00
Ghostkeeper
336bd2bd16
Use extruderList rather than deprecated extruders property
Done during Turbo Testing and Tooling.
2020-06-05 15:17:35 +02:00
Kostas Karmas
ec62cd5671 Fix "Unable to assing null to double" QmlWarning 2020-06-05 14:20:52 +02:00
Kostas Karmas
306f58f96e Fix contentWidth reference error in ActionButton 2020-06-05 14:13:36 +02:00
Ghostkeeper
9fab964afe
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-05 13:48:52 +02:00
Remco Burema
7fd7b3a868
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-06-05 13:29:53 +02:00
Remco Burema
670f1df6c7
Show latest version nr. available in firmware-update-checker-message. 2020-06-05 13:29:21 +02:00
Kostas Karmas
42daef0a75 Remove spam info message 2020-06-05 13:20:38 +02:00
Ghostkeeper
7ec681a04d
Merge branch 'feature_support_meshes_present' of https://github.com/fieldOfView/Cura into fieldOfView-feature_support_meshes_present 2020-06-05 13:20:31 +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
fieldOfView
33eaebe397 Change wording 2020-06-05 11:42:11 +02:00
Kostas Karmas
27b733fe3d Add "Keep printer configurations" button in removed printers message
Since keeping the printers as local ones is the default action, this
button behaves the same way as the "X" button, hiding the message.

CURA-7455
2020-06-05 11:39:26 +02:00
Kostas Karmas
da49d49d3c Merge branch 'CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account' into CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 2020-06-05 11:28:35 +02:00
Kostas Karmas
167a4c1f58 Make reported_device_ids a class variable
So that the actions that can be performed by the message buttons
can properly access the list and take the necessary steps to achieve
their purpose.

CURA-7438
2020-06-05 11:25:44 +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
Kostas Karmas
ee7f2d4b38 Handle the case when a cloud printer is removed from the account
When a cloud printer is no longer received from mycloud, it is safe to
assume that the printer is removed from the account. In such a case,
the new function _devicesRemovedFromAccount(..) will retrieve all the
devices that are to be removed (i.e. they are added in Cura but they
do not exist in the clusters received from mycloud) and will remove
their output device. In addition the function will generate a message
that mentions all the devices that were no longer linked to the
account.

In order to achieve that, the Cloud/CloudOutputDeviceManager is
enriched with the dictionary self._um_cloud_printers that contains all
the currently existing cloud-enabled devices that were previously added
in Cura. In addition, the meta-data field "removed_from_account" is
added to all the cloud-enabled Cura devices to distinguish the ones
actually linked to the current account.

With these additions, the cloud devices that are removed from the
account will be automagically re-linked to it once the devices are once
again retrieved from mycloud for the specific account.

CURA-7438
2020-06-04 14:56:58 +02:00
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
2020-06-04 14:22:14 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
2020-06-04 14:06:03 +02:00
Gabriel Vogel
2ebf32831a remove duplicate updates for model properties 2020-06-04 13:50:24 +02:00
Ghostkeeper
9b6f10b6e7
Merge branch '4.6' 2020-06-04 13:37:44 +02:00
Ghostkeeper
2e5f4764bd
Remove duplicated version upgrade plug-in
These two version upgraders do the same operation. Their code is copied. Instead, we can just let one version upgrader upgrade both versions of the files.

Contributes to issue CURA-7413.
2020-06-04 13:37:30 +02:00
Ghostkeeper
1d6c722505
Indent using spaces, not a mix of tabs and spaces
Contributes to issue CURA-7450.
2020-06-04 13:14:56 +02:00
Ghostkeeper
06dce91bef
Merge branch 'master' of https://github.com/grk3010/Cura into grk3010-master 2020-06-04 13:06:08 +02:00
Mark Burton
f8c86cce4d Improve readability and add comments. 2020-06-04 12:04:29 +01:00
Mark Burton
74984ca12a Stop panel growing above first tool button. 2020-06-04 11:30:13 +01:00
Jaime van Kessel
d4eba3d089
Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' of github.com:Ultimaker/Cura 2020-06-04 11:27:41 +02:00
Kostas Karmas
230ba01d14 Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 10:46:54 +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
Orel
e537af24da Refine platform offset 2020-06-03 20:14:10 +02:00
Orel
93715bf2ad Replace 3mf to stl files for mono extruder dagoma printers 2020-06-03 20:05:15 +02:00
Orel
5079009ccd Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-03 20:04:16 +02:00
Ghostkeeper
b2ce1419cf
Don't crash when syncing material that has no colour code
Use the colour code for Generic PLA then.
2020-06-03 17:48:28 +02:00
Kostas Karmas
07bbee7cb9 Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-03 17:32:04 +02:00
Ghostkeeper
1e49438c03
Merge branch 'master' of https://github.com/victornpb/Cura into victornpb-master 2020-06-03 16:21:50 +02:00
Remco Burema
2337e3b82c
Merge pull request #7862 from Ultimaker/CURA-7457_Fix_resyncing_removed_online_cloud_printers
Update _remote_clusters dict when cloud printer is removed from Cura
2020-06-03 16:14:37 +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
Kostas Karmas
be9aec624a Use the um_cloud_cluster_id metadata when removing the cloud printer
CURA-7457
2020-06-03 11:13:21 +02:00
Ghostkeeper
6d1d6ca1aa
Add warning for Support Wall Line Count if breaking up support in chunks
It will be hard to break it up then.

Fixes #7841.
2020-06-03 10:51:43 +02:00
Kostas Karmas
09ff6b72ed Merge branch 'master' into CURA-7457_Fix_resyncing_removed_online_cloud_printers 2020-06-03 09:46:10 +02:00
Mark Burton
700533b4aa Change the panelBorder rectangle anchor to the bottom for lower toolbar buttons.
This makes the panel grow upwards into clear space rather than downwards which is a problem
when the Cura window height is restricted.
2020-06-03 08:15:10 +01:00