GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-03 10:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,032 Commits 295 Branches 267 Tags
Commit Graph

2595 Commits

Author SHA1 Message Date
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable" 
CURA-5218

This reverts commit fdd78077697f9e3ff9f0fe654eff8af36a1623d9.
 2018-04-17 11:14:14 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor 
This way it scales along with the high-resolution screen scaling for high-DPI screens.
 2018-04-13 11:43:43 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data 
CURA-4644
 2018-04-12 15:46:53 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
fdd7807769 Custom qualities are always checkable 
CURA-5218
 2018-04-12 13:58:20 +02:00
Lipu Fei
406b64b331 Remove unneeded code 
CURA-4644
 2018-04-12 13:14:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile() 
CURA-5203
 2018-04-10 11:40:47 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura 
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
 2018-04-06 11:55:07 +02:00
Lipu Fei
1737267dfd Accept drag-and-drop for curapackage files 2018-04-05 15:14:15 +02:00
Aleksei S
43e535ea54 Rename expandAll to expandRecursive 
CURA-5190
 2018-04-04 11:04:54 +02:00
Diego Prado Gesto
89c27ae7f4 CURA-5137 Get the list of packages from the server 2018-03-30 15:13:10 +02:00
Ghostkeeper
6d10ac993e
Add option to collapse or expand all setting categories 
Sadly it doesn't display on the category headers themselves, but it works just as well.
 2018-03-30 15:07:50 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive 
Because it doesn't expand all settings, just a category.
 2018-03-30 15:07:42 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
Diego Prado Gesto
b2950eca51 CURA-5158 Fix some mistakes in previous confict fixing. 2018-03-29 14:37:55 +02:00
Ghostkeeper
b30df14073
Merge branch '3.3' 2018-03-29 08:55:06 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +02:00
Diego Prado Gesto
2ee42dda33 CURA-5158 The printer menu now reacts to the global container changes so 
it is updates even if there is no connection.
 2018-03-27 11:56:08 +02:00
Ghostkeeper
3eb50cf37e
Only list configurations if we're still connected 
Otherwise there are no available configurations, so no syncing.
 2018-03-22 17:30:15 +01:00
Lipu Fei
fd2abdd9fb
Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders 
add Copy all values to all extruders
 2018-03-22 16:16:30 +01:00
Ruben D
c8222b73c7
Merge branch 'feature_model_check' 2018-03-22 01:56:46 +01:00
Jack Ha
d8d226c0d6 CURA-4557 it's now a small button next to the job spec when one of the warping materials is selected 2018-03-21 16:55:58 +01:00
Diego Prado Gesto
3eb9969d6d CURA-4870 Make the Sync button react when the output device changed, 
otherwise can show a wrong value (not updated).
 2018-03-21 15:08:34 +01:00
Diego Prado Gesto
42b40a713d CURA-4870 Adapt the colors of the configuration list for the Ultimaker dark theme. 2018-03-21 10:34:25 +01:00
Lipu Fei
5993847c4a Show printer group or machine name in workspace summary 
CURA-5125
 2018-03-20 16:23:23 +01:00
Ghostkeeper
f15eb4be2d
Merge branch 'feature_custom_gcode_commands' 2018-03-20 13:44:23 +01:00
Ghostkeeper
877032584e
Correct documentation 
This code was obviously copied from the pre-heat functionality. Let's fix the code duplication next as far as possible.

Contributes to issue CURA-4879.
 2018-03-20 13:22:18 +01:00
Ian Paschal
a7b2632739 CURA-4400 Recommended mode shows support extruders 2018-03-20 13:14:48 +01:00
Diego Prado Gesto
9b3a1b4056 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-20 11:42:49 +01:00
Diego Prado Gesto
cd9531b746 Add the correct value to the setting viewer when the type is unknown. 
Contributes to CURA-4495
 2018-03-20 11:42:42 +01:00
Lipu Fei
f97e615634 Fix file name update 
CURA-5122
 2018-03-20 11:30:06 +01:00
Diego Prado Gesto
311b5ac791 CURA-4870 Force update the list model also when the output device 
changes.
 2018-03-19 18:00:48 +01:00
Guillem
faf8ed3ba6 Replace only user changed values 
removed machine_settings and settable_per_extruder_check. Not needed.
 2018-03-19 14:57:31 +01:00
Lipu Fei
f0dc138b37 Fix visibilty preset update 
CURA-5088
 2018-03-19 14:14:22 +01:00
Lipu Fei
6620909f3d Remove non-existing showingAllSettings 
CURA-5088
 2018-03-19 13:47:04 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant() 
There is no such thing as VariantGroup.
 2018-03-19 12:27:15 +01:00
Lipu Fei
2660d15857 Make "show all settings" work 
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
 2018-03-19 10:58:56 +01:00
Lipu Fei
ee4a6dc704 Always show confirm dialog upon material diameter change 2018-03-16 13:21:51 +01:00
Diego Prado Gesto
747efda52b CURA-4870 Hide the configuration selector if the connection is lost. 2018-03-16 11:51:52 +01:00
Diego Prado Gesto
a03a57fd60 Change the URL for redirect when checking material compatibility. 2018-03-16 11:10:35 +01:00
Lipu Fei
6058f632df Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
Lipu Fei
a115956575 Do not show a material itself in its linked material list 2018-03-16 10:40:16 +01:00
Lipu Fei
518423f25b Fix broken settingsEnabled 2018-03-16 10:14:08 +01:00
Diego Prado Gesto
222a18e698 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 18:42:45 +01:00