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

333 Commits

Author SHA1 Message Date
Lipu Fei
9b603d1f4b Use Cura.MachineNameValidator 
CURA-6435
 2019-04-17 08:31:27 +02:00
Lipu Fei
96e10ee00c Add max length to machine name textbox 
CURA-6435
 2019-04-17 08:25:32 +02:00
Lipu Fei
d9018220b5
Merge branch 'master' into CURA-6449_fix_non_host_printers 2019-04-15 11:37:02 +02:00
Diego Prado Gesto
d0aee9da3f Merge branch 'master' into CURA-6447_fix_start_onboarding 2019-04-12 16:39:51 +02:00
Diego Prado Gesto
6169d1ad5c Change a label 
Contributes to CURA-6435.
 2019-04-12 16:16:10 +02:00
Diego Prado Gesto
969b5f7081 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-12 16:15:36 +02:00
Diego Prado Gesto
06a044b40f Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-12 16:10:15 +02:00
Diego Prado Gesto
82b7817fc6
Merge pull request #5616 from Ultimaker/CURA-6057_fix_onboarding 
Latest commits to onboarding
 2019-04-12 16:00:11 +02:00
Diego Prado Gesto
3bfe7df044 Fix the alignment of the MachineSelectorButton 
Sometimes it was creating a button with width zero. Now it expands to the width of the container.

Also fixing a small issue with the buttons and the link not being correctly aligned to the vertical center.

Contributes to CURA-6057.
 2019-04-12 15:45:10 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Diego Prado Gesto
13be1eb9aa Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 14:20:39 +02:00
Diego Prado Gesto
a428bf49f4 Use the 'busy' property of the ActionButton 
Instead of creating a new BusyIndicator, use the existing one.

Contributes to CURA-6435.
 2019-04-11 14:20:17 +02:00
Diego Prado Gesto
aabcd71b72 Use the 'busy' property of the ActionButton 
Instead of creating a new BusyIndicator, use the existing one.

Contributes to CURA-6435.
 2019-04-11 14:17:10 +02:00
Diego Prado Gesto
a32488895b Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 12:08:18 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group 
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
 2019-04-11 11:33:01 +02:00
Lipu Fei
0d437e7e96 Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 10:40:42 +02:00
Lipu Fei
70e97304d1 Fix add-by-ip page layout 
CURA-6057
 2019-04-10 10:33:11 +02:00
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
f94344263b Fix merge conflicts 2019-04-09 11:33:07 +02:00
Jaime van Kessel
f5ef6aed8d Make textfield use states 
CURA-6435
 2019-04-08 17:10:36 +02:00
Lipu Fei
a0a9f20454 Fix disagree user agreement 
CURA-6057
 2019-04-08 15:06:40 +02:00
Lipu Fei
ac1b1a9902 Use ScrollableTextArea in whats new page 
CURA-6057
 2019-04-08 14:11:28 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page 
CURA-6057
 2019-04-08 13:06:30 +02:00
Lipu Fei
0bac3e8111 Fix button text 
CURA-6057
 2019-04-08 12:39:21 +02:00
Lipu Fei
5cce4cd4cd Fix add by ip page styling 
CURA-6057
 2019-04-08 12:27:32 +02:00
Lipu Fei
0962481bc1 Fix printer type update in the main printer selection menu 
CURA-6057
 2019-04-08 12:27:31 +02:00
Lipu Fei
b0fd6628a5 Make sure that printer name is not empty 
CURA-6435
 2019-04-05 09:35:02 +02:00
Lipu Fei
3fefb47426 Add printer name textfield into AddLocalPrinter 
CURA-6435
 2019-04-05 09:10:58 +02:00
Lipu Fei
b68b154e59 Use contentLoader.item to determine height 
CURA-6435
 2019-04-05 09:10:53 +02:00
Lipu Fei
a5259ce22e Make progressBar optional in Wizard 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
8f755f8818 Use next_page_button_text in AddNetworkOrLocalPrinterContent 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
3ee32944d5 Add a reusable WizardDialog 
CURA-6435
 2019-04-05 09:08:59 +02:00
Lipu Fei
a030e4a264 Rename WelcomDialog to WelcomeDialogItem 
CURA-6435
 2019-04-05 09:08:59 +02:00
Jaime van Kessel
75386c0b7e Change the font of the customMachineSettings window 
CURA-6057
 2019-04-03 17:08:07 +02:00
Lipu Fei
1207533046 Fix local printer selection update 
CURA-6057
 2019-04-03 15:14:06 +02:00
Jaime van Kessel
cf04ee98ef Fix being able to add a local machine that is not the first in the list 
CURA-6057
 2019-04-03 15:04:59 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium 
It is not specific to 3D printing.

Contributes to issue CURA-6057.
 2019-04-03 11:51:57 +02:00
Ghostkeeper
453a785bee
Fix typo 
Contributes to issue CURA-6057.
 2019-04-03 10:42:07 +02:00
Jaime van Kessel
52589ffcad Fix incorrect margin 
CURA-6057
 2019-04-01 14:29:11 +02:00
Jaime van Kessel
7a3cd81e3f Fix font size for the titles in the welcome flow 
CURA-6057
 2019-04-01 14:10:09 +02:00
Jaime van Kessel
74903fe3e5 Cleaned up the QML 
This moves all the "default" margins of the welcome pages into a single point (the WizardPanel)
in order to prevent having to re-define it every time.
I've also fixed some incorrect margins that we had

CURA-6057
 2019-04-01 13:44:27 +02:00
Jaime van Kessel
1d6d3d729d Once the user logged in in the cloudContent page ensure that it moves to the next. 
This fixes the weird situation that when logging in, the screen was still visible
and the user could still press the create / sign in button.

CURA-6057
 2019-04-01 13:04:29 +02:00
Ghostkeeper
5028290e0d
Remove welcome_pages_default_margin theme entry 
Use the wide margin instead. It's practically the same, nobody is going to notice. It still looks spacey and nice, and it's more consistent with the rest of the interface.
We had previously agreed that we will not make any new widget-specific theme entries any more.

Contributes to issue CURA-6057.
 2019-03-29 13:41:45 +01:00
Ghostkeeper
129c1ab3d4
Fix welcome page buttons text not fitting 
On some operating systems the text would not fit due to different font rendering. Also, after translation, it probably wouldn't fit either.
Usually we have the button size adjusting to the text inside it. The design didn't do this, either because it was too difficult to do in Zeplin, because the designer was lazy, or because the designer didn't know that this was the normal style in the rest of Cura. And the programmer took that over literally.

Contributes to issue CURA-6057.
 2019-03-29 13:41:45 +01:00
Remco Burema
39f6eafe3c Remove wrong qml in WhatsNewContent. 2019-03-29 13:04:11 +01:00
Jaime van Kessel
91a886793b Hide welcome dialog instead of close cura if you complete it 
CURA-6057
 2019-03-29 12:04:00 +01:00
Jaime van Kessel
2f34bdc650 Fix shadow of the first run screen 
CURA-6057
 2019-03-29 11:51:57 +01:00
Jaime van Kessel
69935115f3 Fix some layout issues with the addNetworkedOrLocalPrinter screen 
CURA-6057
 2019-03-29 11:44:09 +01:00
Jaime van Kessel
f92ed4cd02 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 11:35:42 +01:00
Jaime van Kessel
894a09b654 The welcome dialog is now a rectangle instead of a dialog 
The whole window approach was just causing to much cross platform issues, so
I converted it into a rectangle and put a mouseArea that eats all the events in the
greyOut background

CURA-6057
 2019-03-29 11:33:49 +01:00