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

2830 Commits

Author SHA1 Message Date
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
6c9c68e004 Active the focus when the selected item changes. 
In this case, if the user was updating some information in one material
and then select other material, the new data is stored.

Contributes to CURA-5682.
 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
74fcc10f59 Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-17 12:11:00 +02:00
Diego Prado Gesto
bafc2b98c9 Reuse MaterialBrandSection component for Favorites, Generic and branded 
materials.

This component will show different children depending on the
hasMaterialTypes flag.

Adjust some small UI issues.

Contributes to CURA-5682.
 2018-09-17 12:08:41 +02:00
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
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About 
CURA-5642

It has conflict with "&Add Printer".
 2018-09-13 10:54:46 +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
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +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
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework 
CL-893 CL-894 Cura connect ui rework
 2018-09-07 12:45:56 +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
Aleksei S
27c112d4db Fix duplicated shortcut keys in all languages 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
e853cdc04d Removed shortcut from Reset All Model &Transformations 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371 Addded test for checking shortcut keys 
CURA-5642
 2018-09-06 16:06:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +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
Aleksei S
149a47e5a7 Remove double keys from right click menu, remove backspaceSelectionAction because not used 
CURA-5642
 2018-09-03 11:15:25 +02:00
KangDroid
9edf2b5b0b
Re-Enable fullscreen shortcut and add menu on ViewMenu 2018-09-03 12:04:54 +09:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons" 
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
 2018-08-31 15:14:12 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +02:00
Mark
baef0350cd Cleaned up MIME types 2018-08-29 14:41:38 +02:00
Ian Paschal
694cc91ae9 Add a "Favorites" heading to materials menu 
Contributes to CURA-5162

Also fixed some non i18n strings
 2018-08-28 11:21:47 +02:00
Aleksei S
3e3f1cb03d Remove double shortcut buttons 
CURA-5642
 2018-08-28 09:31:05 +02:00
Lipu Fei
9d1b115f2a
Merge pull request #4244 from Ultimaker/feature_favorite_materials 
Feature favorite materials
 2018-08-27 11:12:08 +02:00
Ghostkeeper
eac70dc06d
Change default print job name to 'Untitled' 
This is more common for documents that don't yet have a title in many applications.
 2018-08-27 09:41:19 +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
Jaime van Kessel
8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-23 12:45:41 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view 
Contributes to CURA-5378
 2018-08-22 15:58:58 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog 
CURA-5649 Do not show gcode.gz as an option in save file dialog
 2018-08-22 14:12:08 +02:00
Lipu Fei
29180740de Fix missed names 2018-08-22 13:36:17 +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