GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 07:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 289 Branches 260 Tags
Commit Graph

361 Commits

Author SHA1 Message Date
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
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
Remco Burema
175121e86c
Fix add printer scrollview overlaps buttons. 
CURA-7336
 2020-04-01 17:31:23 +02:00
Matt Jani
0516756c3b Summary 
Updated Cloud sign in strings CURA-7314
 2020-03-24 12:54:38 +01:00
Jaime van Kessel
ced25adc2b
Merge branch 'CURA-7017_link_to_help' of github.com:Ultimaker/Cura 2020-03-18 10:49:35 +01:00
Kostas Karmas
34f81ed0b0 Add link then the printer is not found 
CURA-7017
 2020-03-18 09:31:13 +01:00
Jaime van Kessel
68ad38de28
Fix sizing of the machine action dialog 
Contributes to #7224
 2020-03-06 11:02:59 +01:00
Ghostkeeper
365d1c0f74
Reset 'has responded' state when pressing Add 
It's maybe not a good idea to remember this state only in QML. Not changing that now though.

Contributes to issue CURA-7017.
 2020-03-05 17:39:57 +01:00
Ghostkeeper
2dcf5a9c97
Fix link to connecting page 
Contributes to issue CURA-7017.
 2020-03-05 14:01:02 +01:00
Ghostkeeper
25292a4c7c
Add link to help pages if it can't connect 
I don't know what the link is supposed to be linking to though. Yet.

Contributes to issue CURA-7017.
 2020-03-05 13:16:54 +01:00
Jaime van Kessel
670a106957
Be a bit more gracefull when adding a machine failed 
This seems to happen for people that manually add machines to cura
but mess something up when copying the files.

CURA-3X
 2020-02-28 17:03:38 +01:00
Jaime van Kessel
6a5fbba519
Prevent the Networked printer scrollview from slowing shit down when it's not even visible 2020-01-03 17:29:04 +01:00
Jaime van Kessel
997f19ba26
Prevent flicking behavior for machine selection 
Contributes to #6684
 2019-11-22 11:02:19 +01:00
Lipu Fei
877bb1efdb Diable local printer ListView buffer to force redraw 
CURA-6793
 2019-10-03 15:56:00 +02:00
Ghostkeeper
9122d0cca4
Remove misleading text that says you could enter hostnames 
We don't resolve the hostnames ever. You can only enter IP addresses.
 2019-08-21 09:56:32 +02:00
Ghostkeeper
483e343b38
Specify both Ultimaker B.V. and Custom as preferred categories 
This requires commit 91c6abfc56162aedc887098744533dfcd8f1cdd5 on Ultimaker/Cura.

Contributes to issue CURA-6640.
 2019-07-11 09:58:40 +02:00
Ghostkeeper
0678d47dad
Make 'Ultimaker B.V.' preferred manufacturer rather than 'Ultimaker' 
Ultimaker was the category. Ultimaker B.V. is the manufacturer, which is now used as the section property.

Contributes to issue CURA-6635.
 2019-07-03 11:12:41 +02:00
Ghostkeeper
e6f25884f8
Categorise printers by manufacturer 
This should make it easier to find the printer you want.

Contributes to issue CURA-6635.
 2019-07-03 10:56:19 +02:00
Lipu Fei
0555cbae4e Fix add machine dialog state 2019-05-17 15:01:18 +02:00
Lipu Fei
361636af29 Allow WizardDialog to resize 2019-05-17 14:30:18 +02:00
Diego Prado Gesto
a28ca19647 Change the font size 
To make it consistent with the size of texts in the other Welcome pages.
 2019-05-17 11:54:40 +02:00
Diego Prado Gesto
cac4b8b7f1 Remove useless comment line 2019-05-13 13:34:13 +02:00
Diego Prado Gesto
233013c946 Cache a lot of items in the list so there are no glitches 2019-05-13 13:23:10 +02:00
Lipu Fei
7d4c821551 Prevent auto selecting an invalid printer 
CURA-6483
 2019-05-03 08:49:39 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button 
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
 2019-05-02 15:38:19 +02:00
Lipu Fei
85822d6e73 Fix add by IP validator regex 
CURA-6483
 2019-05-02 15:30:11 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts. 
Contributes to CURA-6434.
 2019-05-01 15:53:54 +02:00
Diego Prado Gesto
5b06efdd19 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-01 15:51:12 +02:00