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

4529 Commits

Author SHA1 Message Date
Lipu Fei
4f1282df04 Add ScrollableTextArea 
CURA-6057
 2019-04-08 14:10:18 +02:00
Jaime van Kessel
0bad57259c Increased the font size of notification icon to make it more readable 
CURA-6151
 2019-04-08 13:27:30 +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
b1fe110f9f Add Cura.TextField 
CURA-6435
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
7d096e5734 Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine 2019-04-08 09:09:07 +02:00
Jaime van Kessel
ed503cb6ec Removed platform check that always had the same result 
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
 2019-04-05 17:07:12 +02:00
Jaime van Kessel
495b24b87b Factor out the scene proxy 2019-04-05 16:41:22 +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
b269dc95b0 Remove old AddMachineDialog 
CURA-6435
 2019-04-05 09:10:58 +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
76947df6c1 Add Cura.TextField 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
8e9a934035 Replace with the new add machine dialog 
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
2dd4a30586 Prevent machines without an extruder from showing "undefined" in the workspace dialog 
This fixes #5572
 2019-04-04 20:07:27 +02:00
Jaime van Kessel
7dd54aefcd Merge branch 'remove_compatibility_chart_link' of github.com:Ultimaker/Cura 2019-04-04 15:05:43 +02:00
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart 
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
 2019-04-04 14:46:20 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden 
I think some of us got the spelling of this word wrong in their heads.
 2019-04-04 14:39:01 +02:00
Lipu Fei
06f427ef46 Make GCode TextField scrollable 
CURA-6057
 2019-04-04 14:18:54 +02:00
Jaime van Kessel
29a55c2953 Added missing rendertype 2019-04-04 14:11:07 +02:00
Jaime van Kessel
2e50c19949 Added missing rendertype 2019-04-04 09:51:53 +02:00
Jaime van Kessel
75386c0b7e Change the font of the customMachineSettings window 
CURA-6057
 2019-04-03 17:08:07 +02:00
Jaime van Kessel
cf68fb9cae Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-03 17:04:16 +02:00
Jaime van Kessel
362036e064 Fix small display issue where a line was drawn between the tabs 
CURA-6057
 2019-04-03 17:03:39 +02:00
Ghostkeeper
b9efeb47ed
Don't open add printer wizard on first launch 
Oops.

Contributes to issue CURA-6057.
 2019-04-03 15:56:54 +02:00
Ghostkeeper
2ccc30b824
Only show add machine dialogue if your stack got corrupt, not whole onboarding 
We don't need to accept the EULA again or whatever. Just add the printer that got lost.

Contributes to issue CURA-6057.
 2019-04-03 15:52: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
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +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
745d9e6116
Also catch middle mouse button in overlay 
Just catch all buttons. There's an entry for that in QML.

Contributes to issue CURA-6057.
 2019-04-03 11:03:55 +02:00
Ghostkeeper
453a785bee
Fix typo 
Contributes to issue CURA-6057.
 2019-04-03 10:42:07 +02:00
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