GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-21 18:23:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,991 Commits 295 Branches 268 Tags
Commit Graph

11418 Commits

Author SHA1 Message Date
Jaime van Kessel
932a5c8fc9 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura 2019-04-04 14:38:18 +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
Lipu Fei
992040d4e6
Merge pull request #5497 from TinkerGnome/Mark2_definition 
add Mark2 definition files
 2019-04-04 08:08:46 +02:00
TinkerGnome
ebfd33ba10 remove machine_extruder positions from the definition file 2019-04-03 21:01:36 +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
Remco Burema
6242433d8e
Merge pull request #5356 from DesktopMetal/feature_wipe_script 
Feature: "Wipe Script"
 2019-04-03 14:42:18 +02:00
Vlad Gribinchuk
a56e088ee0 Put all of wiping settings to expert.cfg file to allow also browsing them 2019-04-03 13:46:37 +03:00
Vlad Gribinchuk
6e955f780b Change description of clean_between_layers to make the relation this setting to retract_at_layer_change more clear for user 2019-04-03 13:45:19 +03: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
Ghostkeeper
168c4e17c6
Reduce support horizontal expansion to 0 
We have a long-standing issue in CuraEngine that support can be thinner than one line width and is then not generated, but if there is later some extra room it still gets supported in lower layers. This results in unnecessary support.

That issue in itself is a bit hairy to fix. But it does point out to another weirdness: PLA support has a horizontal offset of 0.2mm. This was introduced when the Support Horizontal Expansion setting was made as the default, but it was never really investigated. I asked Ultimaker's process engineers and we agreed that the setting could be set to 0 except for PVA.

Contributes to issue CURA-6438.
 2019-04-02 11:42:26 +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
8b28dfb5e2 Removed unused style 2019-04-01 16:30:31 +02:00
Jaime van Kessel
dc66bdacc6 Simplify the main_window_header_tab style 2019-04-01 16:27:46 +02:00
Jaime van Kessel
5105b67a8c Remove unused entries from the theme 2019-04-01 15:18:49 +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
0c43b4a180 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-04-01 13:33:41 +02:00
Lipu Fei
395dc269b0 Fix hms434 definition file 2019-04-01 13:33:25 +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
Ghostkeeper
add6c0b489
Default the gantry height to be equal to the printer height 
You can't fit any objects higher than that anyway.

Fixes #5528.
 2019-04-01 13:04:38 +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
Ghostkeeper
8c41a05183
Merge branch 'maukcc-master' 2019-04-01 11:09:07 +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
maukcc
7f2fcb16a8 Adding platform to HMS434 2019-03-29 14:26:42 +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
Diego Prado Gesto
0ffcfe041a Exclude HIPS and PETG for UM3 as it use to be in 4.0 2019-03-29 11:49:06 +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