GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 291 Branches 260 Tags
Commit Graph

4529 Commits

Author SHA1 Message Date
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
637a241d99 Use single qml file for sync states 
CURA-7290
 2020-05-04 15:13:38 +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
acf36d1e42 Add Account sync last update datetime 
CURA-7290
 2020-05-01 17:44:58 +02:00
Nino van Hooff
a6c0ee6c82 Connect rotation animation to isSyncingChanged 
Code would be much cleaner if alwaysRunToEnd could be combined with
Animation.Infinite loops to complete the current loop

CURA-7290
 2020-05-01 14:50:18 +02:00
Nino van Hooff
42f5456ed4 Animate the sync icon 
CURA-7290
 2020-04-30 17:26:12 +02:00
Nino van Hooff
828e931f52 Add manual sync button (non-functional) 
CURA-7290
 2020-04-30 17:19:14 +02:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more. 2020-04-29 16:23:06 +02:00
Kostas Karmas
b008f1e823 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 15:37:53 +02:00
Kostas Karmas
b459895589 Add comments 
CURA-7022
 2020-04-29 14:19:28 +02:00
Kostas Karmas
4a49c1cc8d Fix bottom margin of the discoveredCloudPrintersScrollView 
CURA-7022
 2020-04-29 14:14:01 +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
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Kostas Karmas
fb328bd307 Display a summary of the Cloud printers added after login in WelcomeWizard 
If the user has cloud printers linked to his/her account, then the welcome
wizard will display a summary of the cloud printers that were found in the account
and added in Cura.

CURA-7022
 2020-04-29 12:11:05 +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
64cfe423fe Fix moving to next page when no printers in account 
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
 2020-04-29 11:49:45 +02:00
Kostas Karmas
411a02a827 Simplify the DiscoveredUltimakerCloudPrintersModel reference calls 
CURA-7022
 2020-04-29 11:40:47 +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
Kostas Karmas
05e92b953a Size the Welcome Wizard using the theme 
CURA-7022
 2020-04-28 17:44:35 +02:00
Kostas Karmas
1981325b05 Make "Add printers manually" button invisible when cloud printers found 
CURA-7022
 2020-04-28 16:31:01 +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
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
1d4225a44a Refine the AddCloudPrinter page to display the new cloud printers 
Added a scrollView to the page, which depends on the DiscoveredUltimakerCloudPrinters
model and displays the printer name, type, and firmware version. If the model is
empty, this page displays a busy indicator and a message instead.

In addition, whenever the "Add printer manually" or "Finish" button are pressed,
they also reset the DiscoveredUltimakerCloudPrintersModel.

CURA-7022
 2020-04-24 19:21:01 +02:00
Kostas Karmas
889ed90adb End the wizard if we have found a network printer 
CURA-7019
 2020-04-23 17:27:30 +02:00
Kostas Karmas
e7d12745e1 Fix redirecting to "cloud" page when finding a network printer 
CURA-7019
 2020-04-23 17:18:19 +02:00
Kostas Karmas
1aea28a8eb Add busyIndicator and text in AddCloudPrintersView 
CURA-7022
 2020-04-23 15:10:45 +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
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
1d7c327b36 Redirect to "Add cloud printer" page when button clicked 
CURA-7022
 2020-04-22 16:15:24 +02:00
Kostas Karmas
a4c5e63355 Add "Add cloud printer" button in "Add a printer" page 
CURA-7022
 2020-04-22 16:10:31 +02:00
Kostas Karmas
41c472c2ed Add "Add a Cloud printer" QML page 
CURA-7022
 2020-04-22 16:09:24 +02:00
Jaime van Kessel
967488095b
Fix weird wording. 
Whoops. It's only been there for a year...
 2020-04-22 15:43:38 +02:00
Kostas Karmas
b4909e88ef Rename "Next" button to "Skip" 
CURA-7019
 2020-04-21 10:34:54 +02:00
Kostas Karmas
ca2962aa12 Revert text to the correct one 
CURA-7019
 2020-04-21 09:46:22 +02:00
Kostas Karmas
cac834b101 Refactor "Ultimaker Cloud" page in welcome wizard 
The following changes have been done:
  - Text content changed
  - "Sign in" and "Create an account" buttons moved in the middle,
	under the main text
  - "Sign in" button changed to PrimaryButton format
  - "Finish" button changed to "Skip"
  - "Skip" button format changed

CURA-7019
 2020-04-20 15:12:40 +02:00
fieldOfView
0ed4931056 Add additional information to tooltips in object selector 2020-04-12 15:46:13 +02:00
fieldOfView
4f0c24fecb Reorder code for readability 2020-04-12 09:24:41 +02:00
fieldOfView
a9ecec0d5c Hide per object settings info when there is nothing to show 2020-04-12 09:20:46 +02:00
fieldOfView
e13a0bca4a Add extruder swatches to object selector 2020-04-11 20:48:06 +02:00
fieldOfView
bba07d01fb Show mesh type and number of per model settings in ObjectSelector 2020-04-10 19:13:36 +02:00
fieldOfView
d1c79a3af2 Mark models that are outside the buildarea in the objectlist 2020-04-09 10:53:43 +02:00
Nino van Hooff
74253e420a
Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest 
CURA-7262 X-Ray in solid-view (colors instead)
 2020-04-08 15:45:00 +02:00
Ghostkeeper
4f50f42796
Merge branch '4.6' 2020-04-02 17:21:03 +02:00
Ghostkeeper
f5669a5a27
Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6 2020-04-02 17:20:45 +02:00
Ghostkeeper
b86b6a9449
Merge branch 'fix_jogging_layout' of https://github.com/fieldOfView/Cura into fieldOfView-fix_jogging_layout 2020-04-02 17:07:42 +02:00
Nino van Hooff
9d9753cb45 Fix: Using onCompleted would break the binding. So Use a Binding instead 2020-04-02 16:31:29 +02:00
Nino van Hooff
6d56b52913 Revert "Fix binding loop in action panel widget" 
Fix improper player slider layout which was introduced in 5cfe71e5
 2020-04-02 15:15:05 +02:00