3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
28446 commits 306 branches 270 tags 779 MiB
Commit graph

6967 commits

Author SHA1 Message Date
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15 
Once more into the fray.

Contributes to issue CURA-7420.
 2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
fieldOfView
cdc5c8948c Simplify single instance preference 
The Preferences have already been initialized in QTApplication.initialize to get the language to use in the splashscreen.
 2020-05-07 18:13:23 +02:00
fieldOfView
1b34449242 Add a preference to use a single instance for loading files 
Contributes to #7664
 2020-05-07 17:29:18 +02:00
Ghostkeeper
88bf80c424
Don't provide setVariant with None as variant 
That is not allowed as per the type. This could happen if the preferred variant of a printer also doesn't exist.

Fixes Sentry issue CURA-NP.
 2020-05-07 08:53:52 +02:00
Nino van Hooff
8937c63219 Finish merge of auto sync packages 
CURA-7290
 2020-05-06 16:08:47 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
ef6cf8d5cc Remove unused pyqtProperty 
CURA-7290
 2020-05-06 12:08:55 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 
Cura 7022 add cloud printer within add a connected printer
 2020-05-06 11:13:27 +02:00
Nino van Hooff
7322526791 Fix typing warning 
CURA-7290
 2020-05-04 17:30:32 +02:00
Nino van Hooff
eac884fcd2 Convert SYNC_STATES to Enum 
CURA-7290
 2020-05-04 17:26:38 +02:00
Nino van Hooff
88ff68e40c Also check for package updates automatically 
Moves the 30-second sync timer from CloudOutputDeviceManager to
Account and subscribes CloudPackageChecker to the timer.

CURA-7290
 2020-05-04 16:56:09 +02:00
Nino van Hooff
637a241d99 Use single qml file for sync states 
CURA-7290
 2020-05-04 15:13:38 +02:00
Nino van Hooff
049c1946d4 Create Account sync state interface to allow for multiple sync services 
Needed to add the package sync

CURA-7290
 2020-05-04 13:52:40 +02:00
Nino van Hooff
81d02d5d58 Implement printer cloud sync error state 
CURA-7290
 2020-05-04 13:19:16 +02:00
Kostas Karmas
aab2257574 Up the setting version to 14 in CuraApplication 
CURA-7421
 2020-05-04 13:06:19 +02:00
Nino van Hooff
4e7f446fe1 Account sync: create additional sync states 
CURA-7290
 2020-05-04 11:26:20 +02:00
Nino van Hooff
4b88247af8 Account sync: remove debug info 
CURA-7290
 2020-05-01 17:49:40 +02:00
Ghostkeeper
51378cae56
Don't crash if the shader fails to compile 2020-05-01 17:49:29 +02:00
Nino van Hooff
acf36d1e42 Add Account sync last update datetime 
CURA-7290
 2020-05-01 17:44:58 +02:00
Nino van Hooff
0aed6d3731 Connect the manual sync button 
CURA-7290
 2020-05-01 15:56:09 +02:00
Nino van Hooff
828e931f52 Add manual sync button (non-functional) 
CURA-7290
 2020-04-30 17:19:14 +02:00
Kostas Karmas
6959c9ac42 Rename _discovered_ultimaker_cloud_printers_list to _discovered_cloud_printers_list 
CURA-7022
 2020-04-29 15:01:50 +02:00
Kostas Karmas
b459895589 Add comments 
CURA-7022
 2020-04-29 14:19:28 +02:00
Kostas Karmas
2fb7e67043 Cleanup _update() 
CURA-7022
 2020-04-29 13:55:03 +02:00
Kostas Karmas
58b61f2331 Remove unnecessary newCloudPrintersDetected variable 
Variable newCloudPrintersDetected is no longer needed, as it is communicated through the
signal itself.

CURA-7022
 2020-04-29 13:47:11 +02:00
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
c7cf0fab2f Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 12:04:04 +02:00
Kostas Karmas
d6f150a523 Rearrange the AddPrinterPagesModel and mark "Add Cloud Printer" page as final 
In order to avoid cases where the "Machine actions" page would lead to the "add cloud printer"
page when pressing next, the AddPrinterPagesModel was rearranged and the "add cloud printer"
page was marked as final.

CURA-7022
 2020-04-29 11:38:36 +02:00
Kostas Karmas
b2382593ed Add is_final_page attribute and mark the "Add Cloud Printers" page as final 
CURA-7022
 2020-04-29 11:37:42 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Kostas Karmas
d6ddfb3990 Add typing 
CURA-7022
 2020-04-28 14:50:47 +02:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Kostas Karmas
0ad9464131 Remove IP Address from DiscoveredCloudPrintersModel 
CURA-7022
 2020-04-28 13:19:19 +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
Jelle Spijker
679739d09d
Applied requested changes proposed by @ninovanhooff 
Fixed a couple of missed double quotes, trailing and leading spaces, to long comment lines
 2020-04-27 20:09:00 +02:00
Kostas Karmas
c8e86175cd Create a DiscoveredUltimakerPrintersModel in the CuraApplication 
CURA-7022
 2020-04-24 19:16:24 +02:00
Kostas Karmas
cd8a0fc0bc Introduce DiscoveredUltimakerCloudPrintersModel 
Have a separate model to hold the discovered ultimaker cloud printers.
This model will be used to communicate across the application that new
cloud printers have been found which they weren't seen before.

CURA-7022
 2020-04-24 19:09:50 +02:00
Kostas Karmas
15e7cb44af Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-23 15:07:18 +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
Ghostkeeper
09ee9660ea
Don't crash if the build volume is smaller than one arrange cell 
Fixes Sentry issue CURA-M6.
 2020-04-23 14:42:36 +02:00
Ghostkeeper
52b4e98056
Prevent crash when unable to write to storage location for container manager 
Or the temp directory.

Fixes Sentry issue CURA-KY.
 2020-04-23 13:48:05 +02:00
Jelle Spijker
9b44ca37ef
Converted comments in dir Cura/cura/Arranging to rst style 
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura/Arranging directory recursively  using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.

Various missing return types were added to complete Typing support
 2020-04-23 12:13:24 +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
Jelle Spijker
68318d20fd
Converted comments in dir Cura/cura/API to rst style 
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura/API directory recursively  using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.

Comments from the hidden attributes in the class CuraAPI (_acount, _backups, _interface) were moved to the public property getters, so they docstrings are exposed to the user.
 2020-04-22 20:57:41 +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
Kostas Karmas
1d7c327b36 Redirect to "Add cloud printer" page when button clicked 
CURA-7022
 2020-04-22 16:15:24 +02:00
Jelle Spijker
6aedab78dc
Converted comments in dir Cura/cura to rst style 
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura directory using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.
 2020-04-21 16:58:45 +02:00