3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
19125 commits 306 branches 270 tags 779 MiB
Commit graph

19125 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
b4134e6dbb Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 10:44:29 +01:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable 
CURA-6057
 2019-03-29 10:43:47 +01:00
Remco Burema
60920c89af Remove old send slice-info confirm: part of the new onboard. [CURA-6057] 2019-03-29 09:33:41 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
109631d023 Update doc for updateHasMaterialsMetadata() 2019-03-28 15:13:41 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
3ad79a5888 Fix divided by 0 problem 2019-03-28 14:34:18 +01:00
Lipu Fei
82471a0e39 Add doc for MachineSettingsManager 2019-03-28 14:31:33 +01:00
Lipu Fei
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +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
84aa7fd007 Fix mypy type errors 
CURA-6057
 2019-03-27 17:40:33 +01:00
Jaime van Kessel
9091eaa6f8 Re-added the imports to the conftest 
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
 2019-03-27 17:32:34 +01:00
Jaime van Kessel
5c50ef41cc Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-27 17:21:16 +01:00
Jaime van Kessel
804e2060ea Re-added the imports to the conftest 
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
 2019-03-27 17:20:17 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names 
CURA-6426
 2019-03-27 14:08:06 +01:00
Lipu Fei
0a8a25860c Update network troubleshooting URL 2019-03-27 13:09:25 +01:00
Lipu Fei
79c13ce35c
Merge pull request #5511 from Ultimaker/fix_weird_home_directories_windows 
Fix for weird home directories on Windows
 2019-03-27 11:11:57 +01:00
Remco Burema
494c290cc4
Merge pull request #5505 from Ultimaker/CURA-6089_hide_materials 
Exclude gff and cff materials for all ultimaker printers
 2019-03-27 09:56:45 +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
Ghostkeeper
f6dd3f922d
Merge branch 'shorter_ops_logs' 2019-03-26 15:34:26 +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
ea48e6ded1
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-03-26 15:13:00 +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
Simon Edwards
eed810af35
Merge pull request #5479 from Ultimaker/CL-1287_improved_cloud_pop_up 
CL-1287 Improved Cloud pop-up
 2019-03-26 12:17:35 +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
Ghostkeeper
a4924d2695
Fix for weird home directories on Windows 
The expanduser function will expand to a combination of HOMEDRIVE and HOMEPATH which might not be the same as APPDATA if your configuration is very weird (e.g. you've changed your APPDATA location).

Contributes to CURA-6418.
 2019-03-26 12:04: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
Ghostkeeper
07ea8221c1
Merge branch 'thopiekar-patch-1' 2019-03-26 10:42:58 +01:00