GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 291 Branches 260 Tags
Commit Graph

911 Commits

Author SHA1 Message Date
Diego Prado Gesto
f871a89825 Clean up the code by removing duplicate code. Also try to unify the 
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.

Contributes to CURA-5682.
 2018-09-17 09:09:14 +02:00
Diego Prado Gesto
972f0bef43 WIP Fix an error in which the current selected material was not 
correctly selected when there is more than one brand (stupid mistake).
Also fix problems when the user changes some material information.

Contributes to CURA-5682.
 2018-09-14 10:54:07 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed. 
Contributes to CURA-5682.
 2018-09-12 18:39:19 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment. 
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
 2018-09-12 16:57:43 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style. 
Contributes to CURA-5682.
 2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated. 
Contributes to CURA-5682.
 2018-09-12 16:35:01 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted. 
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
 2018-09-12 15:42:02 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected. 
Contributes to CURA-5682.
 2018-09-12 14:09:29 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of 
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
 2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button. 
Contributes to CURA-5682.
 2018-09-11 22:07:14 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them. 
CURA-5618
 2018-09-11 16:05:53 +02:00
Diego Prado Gesto
fe256b3562 Fix some issues in the material preference page. 
Now the generic section collapses and expands correctly. Some qml error
was also fixed.

Contributes to CURA-5682.
 2018-09-10 15:57:19 +02:00
Diego Prado Gesto
51b0497f84 Fix the collapsable panel of the Generic materials. 
Contributes to CURA-5682.
 2018-09-10 14:28:41 +02:00
Ghostkeeper
c1ef9abf1d
Fix code style 
These changed in the same pull request so I'll remove them here.

Contributes to issue CURA-5682.
 2018-09-06 17:23:16 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior 
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
 2018-09-05 17:16:06 +02:00
Ian Paschal
2304aeaceb Expanded states preserved when updating models 
Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section.

It's also the ground work for saving material section expansion to preferences.

Contributes to CURA-5378
 2018-08-24 12:10:32 +02:00
Ian Paschal
13069a2f99 Some file renaming 
Contributes to CURA-5378
 2018-08-24 11:06:44 +02:00
Ian Paschal
93645e6bfe Reduce component sizes 
Contributes to CURA-5378
 2018-08-24 10:46:23 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials 
Contributes to CURA-5162, CURA-5378
 2018-08-23 17:24:39 +02:00
Ian Paschal
56a5f59964 Cleaner code 
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
 2018-08-23 16:39:40 +02:00
Ian Paschal
8da7773600 Remove unused code 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:04:51 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view 
Contributes to CURA-5378
 2018-08-22 15:58:58 +02:00
Ian Paschal
00eb8e6788 Organize material preferences 
Contributes to CURA-5378
 2018-08-22 12:34:38 +02:00
Cherubim
f35005c8ba
Brackets on new line 
As per our code style.
 2018-08-21 14:24:07 +02:00
Ian Paschal
2410c21839 Move material list to separate QML file 
Contributes to CURA-5378
 2018-08-20 17:16:05 +02:00
Jack Ha
abbbdb17e6 Fix if you randomly click around in the materials then some spool_weights of 0 gets mixed up. The cause was that base.containerId was not updated at the same time as properties.guid. CURA-5408 2018-07-12 15:17:46 +02:00
Jack Ha
5eb2230d82 Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408 2018-07-10 15:40:13 +02:00
Jack Ha
e7c1d31bee Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408 2018-07-10 13:14:11 +02:00
Ian Paschal
a596c5a034 Code-style fixes 
Contributes to CURA-5408
 2018-07-09 14:39:13 +02:00
Aleksei S
77bd6cf749 Read material weight from container 
CURA-5408
 2018-07-09 14:20:51 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask 
Clarify Profile Override preference options
 2018-07-02 16:43:20 +02:00
fieldOfView
1f7ef027ec Clarify Profile Override preference options 2018-06-27 10:16:39 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and 
now the arranger makes the job.
 2018-06-12 13:20:20 +02:00
Ghostkeeper
b55d2eda4f
Remove Polish translation option 
The translator said he won't be maintaining this language any more. Someone else can pick it up now if he wants to, but we'll disable the language until it is complete again.

Contributes to issue CURA-5451.
 2018-06-11 09:14:48 +02:00
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