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
19,575 Commits 289 Branches 260 Tags
Commit Graph

3984 Commits

Author SHA1 Message Date
Jaime van Kessel
8ae0c695bd Add total cost to the output overview. 
This fixes #5529
 2019-04-02 11:09:12 +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
1b8b5415f7 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-01 13:46:00 +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
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Lipu Fei
b28e98f288
Merge pull request #5521 from Ultimaker/CURA-6151-Notify-updates-from-marketplace 
Notify updates from marketplace
 2019-04-01 13:19:37 +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
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
15f9844b85 Make reusable NotificationIcon 
CURA-6151
 2019-04-01 11:51:31 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children 
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
 2019-04-01 10:41:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Diego Prado Gesto
3d86499069 Don't round the radius of the RadioButton 
Otherwise it looks like a weird circle.

Contributes to CURA-6057.
 2019-03-29 15:41:20 +01: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
Remco Burema
7ceaade26d Sort changelog correctly (newest on top). [CURA-6057] 2019-03-29 11:27:37 +01:00
Jaime van Kessel
28dc187731 Set the flag of the welcome dialog to Dialog 
We want the dialog to be modal, but if it's a window (and not a dialog) the
modality can't be set (or well, it can be set, but it's just ignored at that point)

CURA-6057
 2019-03-29 11:08:10 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +01:00
Jaime van Kessel
84de34341d
Merge pull request #5470 from Ultimaker/WIP_onboarding_machine_action 
New onboarding flow - machine action
 2019-03-28 13:43:48 +01:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from 
For the maximumSize of a button.

Contributes to CURA-6412.
 2019-03-28 09:29:31 +01:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace. 
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
 2019-03-27 13:21:56 +01:00
Lipu Fei
0a8a25860c Update network troubleshooting URL 2019-03-27 13:09:25 +01:00
Lipu Fei
6dbae6f088 Show machine actions page optionally 2019-03-27 09:34:48 +01:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +01:00
Lipu Fei
6c7ae309a1 Add network troubleshooting url 2019-03-26 16:27:06 +01:00
Lipu Fei
1dd48c5728 Show welcome page if no printer 2019-03-26 16:21:07 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Lipu Fei
98b7df790d Implement More-info button on Data Collection page 2019-03-26 15:20:18 +01:00
Lipu Fei
2511b7a26a Implement More-info button on Data Collection page 2019-03-26 15:18:54 +01:00
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4 2019-03-26 15:00:31 +01:00
Lipu Fei
f99affd4f5 Create Cura.RadioButton 2019-03-26 14:46:06 +01:00
Lipu Fei
839d8c2227 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-26 12:07:25 +01:00
Lipu Fei
e564687722 Use themed margins 2019-03-26 12:06:46 +01:00
Lipu Fei
f6d212dc88 Use screenScaleFactor for WelcomeDialog size 2019-03-26 11:59:44 +01:00
Lipu Fei
a6d05aa3bb Fix misc issues 2019-03-26 11:47:09 +01:00
Lipu Fei
af9f9fc857 Fix merge conflicts 2019-03-26 11:46:35 +01:00
Lipu Fei
418ad73a63 Move page index logic into WelcomePagesModel 2019-03-26 11:34:44 +01:00
Lipu Fei
20bd9ea501 Fix binding loop in CloudContent 2019-03-26 11:08:35 +01:00
Lipu Fei
fd0a60f8dc Rename StepPanel to WizardPanel 2019-03-26 11:06:43 +01:00
Lipu Fei
60be55802e Refactor StepPanel and WelcomeDialog 2019-03-26 11:04:17 +01:00