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

3111 Commits

Author SHA1 Message Date
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
Ian Paschal
2410c21839 Move material list to separate QML file 
Contributes to CURA-5378
 2018-08-20 17:16:05 +02:00
Jaime van Kessel
01b9ba03d4 Added extruder icon 
CL-894
 2018-08-16 16:24:14 +02:00
Lipu Fei
f42dc24d95 Do not show gcode.gz as an option in save file dialog 
CURA-5649
 2018-08-16 15:16:32 +02:00
Ian Paschal
e8cda90021 Add favorites to materials menu 
Contributes to CURA-5162
 2018-08-16 13:04:58 +02:00
Diego Prado Gesto
848e99a4ba Don't show the hint message when the buildplate selector is shown. 
Contributes to CURA-5570.
 2018-08-13 17:04:13 +02:00
Diego Prado Gesto
152005ab14
Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension 
CURA-5570 More decision points in material and quality lookup!
 2018-08-13 12:06:29 +02:00
Diego Prado Gesto
b1c073aab6 CURA-5570 Expose the CuraSDKVersion to qml and show the buildplate 
selector only when "dev" version is selected.
 2018-08-13 11:50:50 +02:00
Ian Paschal
3fad11e07f Code style fixes 
Contributes to CURA-5595
 2018-08-13 10:45:03 +02:00
Aleksei S
787948f401 Removed "Preparing" button state 
CURA-5551
 2018-08-13 10:42:22 +02:00
Diego Prado Gesto
de1b8edb72 Merge branch 'master' into CURA-5570_beyond_comprehension 2018-08-13 09:57:36 +02:00
Aleksei S
a1bc2f3ebf Merge branch 'master' into CURA-5595_add_custom_button_to_menu 2018-08-10 15:51:38 +02:00
Ghostkeeper
f247c328c6
Show shortcut key in tool tooltips 
In brackets. I couldn't translate it to an icon easily. It was possible but I'd have to create a giant mapping from every key to the key icons and add a bunch of icons and I don't think that's necessary.

Contributes to issue CURA-5634.
 2018-08-10 11:22:42 +02:00
Ghostkeeper
4a22bb3b69
Code style 2018-08-10 11:22:42 +02:00
Jaime van Kessel
1180fad62f Fix binding loop 2018-08-09 11:33:04 +02:00
Lipu Fei
cc39ca09b8 Enable build plate selection menu 2018-08-02 17:16:16 +02:00
jack
4dd0ad6984
Merge pull request #4159 from Ultimaker/fix_settings_scrolling 
Fix the scrolling when the cursor is hovering the combobox settings
 2018-07-30 14:28:47 +02:00
Jack Ha
c036912752 Pressing enter on project window will now open the file dialog to save instead of just closing the window 2018-07-30 13:31:10 +02:00
Diego Prado Gesto
7215b8081d Fix the scrolling when the cursor is hovering the combobox settings. 2018-07-30 13:08:13 +02:00
Ian Paschal
2790650686 Code style improvements 
Contributes to CURA-5551
 2018-07-30 09:39:10 +02:00