GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 19:56:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,256 Commits 295 Branches 268 Tags
Commit Graph

19256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
f5ef6aed8d Make textfield use states 
CURA-6435
 2019-04-08 17:10:36 +02:00
Lipu Fei
dfa35bd589 Fix goToPage() when page_id is not found 
CURA-6435
 2019-04-08 09:20:24 +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
fe14024620 Move existNetworkInstances into discover action 2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a Move a bunch of network only functions out of machine manager 
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
 2019-04-05 17:45:19 +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
ac0a5bb156 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-05 16:41:38 +02:00
Jaime van Kessel
495b24b87b Factor out the scene proxy 2019-04-05 16:41:22 +02:00
Lipu Fei
6892307be3 Fix typo 2019-04-05 10:49:36 +02:00
Lipu Fei
f2234cffa4 Fix extruder enable/disable problem in color scheme 2019-04-05 10:43:09 +02:00
Lipu Fei
5074cf69dd Fix typing 
CURA-6435
 2019-04-05 09:57:58 +02:00
Lipu Fei
d5f4fd43dd Fix typing 
CURA-6435
 2019-04-05 09:42:24 +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
945fa35946 Fix incorrect reference in UM2UpgradeSelectionMachineAction 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
a18bb9d953 Add AddPrinterPagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
0f62f0c60a Add next_page_button_text field to WelcomePagesModel 
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
13c56d40e7 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-04 20:07:16 +02:00
Ghostkeeper
93ef8f6c98
Merge branch 'master' into CURA-6440_exclude_support_blocks_in_used_extruders 2019-04-04 16:41:00 +02:00
Ghostkeeper
8c5f871185
Also omit support meshes from used extruders list 
Their own extruder doesn't get used necessarily, because these meshes are then printed using the support extruder.

Contributes to issue CURA-6440.
 2019-04-04 16:35:48 +02:00
Ghostkeeper
4e2d7a6ea9
Fix combing setting 
This is a Python expression so it needs to be in quotes to become a string.
 2019-04-04 16:22:03 +02:00
Jaime van Kessel
8ae87d3904
Merge pull request #5570 from Ultimaker/remove_compatibility_chart_link 
Remove the link to the compatibility chart
 2019-04-04 15:32:22 +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
Jaime van Kessel
932a5c8fc9 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura 2019-04-04 14:38:18 +02:00
Jaime van Kessel
8acafe09f6 No longer prevent old versions from being restored in backup 
CURA-5983
 2019-04-04 14:28:29 +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
53c38e0a80 Fix quality_changes container handling in project loading 
CURA-6441

Containers are created but not added...
 2019-04-04 09:21:22 +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
Simon Edwards
f933f2f271
Merge pull request #5478 from Ultimaker/CL-1267_selective_cloud_flow_metadata 
CL-1267 Don't hide Cloud flow message for wrong printer
 2019-04-03 17:09:57 +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