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

475 Commits

Author SHA1 Message Date
Diego Prado Gesto
97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. 
Fix other possible cases when the type or the color are also None.
 2018-06-07 10:54:23 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before 
retrieving it from the definition if there are not defined in the material.
 2018-05-30 16:58:11 +02:00
fieldOfView
fb8f735566 Make selecting objects on load optional and opt-in 2018-05-23 10:05:08 +02:00
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
491e0c83ba Allow to select custom profiles based-on not supported 
CURA-5285
 2018-04-25 12:38:57 +02:00
Ghostkeeper
47101cc1ca
Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-23 14:14:12 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Diego Prado Gesto
5333ca5aa8
Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data 
Show information dialogue on what usage data is sent
 2018-04-23 13:32:22 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management 
page if the selected profile is not supported
 2018-04-20 17:04:51 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line 
And one comma without a space after it.

Contributes to issue CURA-5204.
 2018-04-20 15:36:32 +02:00
Diego Prado Gesto
576881bfeb CURA-5204 Update the checkbox if the setting has changed in the 'More 
information' dialog.
 2018-04-20 14:12:05 +02:00
Diego Prado Gesto
122b5e36cf CURA-5204 Revert a change since it sets the setting to false if the 
panel is not visible.
 2018-04-20 13:36:07 +02:00
Ghostkeeper
d2caeee8c1
Clarify warning for filament diameter change 
It's the diameter of the filament, not the diameter of the material. Diameter of a material doesn't make any sense. Also corrected grammar and clarified context.
 2018-04-20 13:32:14 +02:00
Diego Prado Gesto
121d1806be Don't show the corresponding element in the general preference panel 
if the related plugin is not enabled.
Contributes to CURA-5204
 2018-04-20 11:56:59 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
0d5b21932e Use "More information" for button 
CURA-5204
 2018-04-17 16:13:13 +02:00
Lipu Fei
40eedbcf70 Add more info dialog 
CURA-5204
 2018-04-10 15:33:32 +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
Lipu Fei
f0dc138b37 Fix visibilty preset update 
CURA-5088
 2018-03-19 14:14:22 +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
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
Diego Prado Gesto
d0e6e59845 Set the frame visible for the materials and profiles page in 
preferences.
 2018-03-15 16:46:25 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
d807ce57a5 CURA-4870 Disable rename button in MachinesPage when the selected item 
is a network printer since the name is the name of the host printer (or
group)
 2018-03-13 10:49:29 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line 
Contributes to issue CURA-4606.
 2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int 
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
 2018-03-12 17:08:13 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close 
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
 2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up 
CURA-4606
 2018-03-06 11:55:24 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Lipu Fei
6a14e39610 Remove outdated TODOs in ProfilesPage 2018-03-03 16:34:31 +01:00
Lipu Fei
730048d2b2 Simplify code in MaterialsPage.qml 2018-03-03 16:32:29 +01:00
Lipu Fei
86b75ae3b6 Remove outdated TODO 2018-03-03 16:29:31 +01:00
Lipu Fei
0e5aff84e9 Remove outdated comment in MaterialsPage.qml 2018-03-03 16:26:03 +01:00
Lipu Fei
575f38e63e Fix code style in MaterialView.qml 2018-03-03 16:25:09 +01:00
Lipu Fei
d24bc0b41b Fix code style in MaterialView.qml 2018-03-03 16:23:54 +01:00
Lipu Fei
c93643bc2f Move createMaterial() to MaterialManager 2018-03-02 17:30:19 +01:00