GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 11:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,439 Commits 295 Branches 268 Tags
Commit Graph

15439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
6be9b5e27f Consolidate models some more 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:58:23 +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
Ian Paschal
272e892179 Extend Cura Light theme for material favorites 
Contributes to CURA-5162, CURA-5378
 2018-08-22 12:33:55 +02:00
Ian Paschal
cb713eea6a Improve models 
Contributes to CURA-5162, CURA-5378
 2018-08-22 12:33:29 +02:00
Ian Paschal
08b325ee04 Correctly load material favorites from preferences 
Contributes to CURA-5378, CURA-5162
 2018-08-22 12:31:48 +02:00
Ian Paschal
6d1fd8281c Add favorites funcitonality to MaterialManager.py 
Contributes to CURA-5378
 2018-08-20 17:17:14 +02:00
Ian Paschal
68bccd8bf7 Improve the Favorites, Base, and Brand materials models (WIP) 
Contribuetes to CURA-5378
 2018-08-20 17:16:54 +02:00
Ian Paschal
2410c21839 Move material list to separate QML file 
Contributes to CURA-5378
 2018-08-20 17:16:05 +02:00
Ian Paschal
e8cda90021 Add favorites to materials menu 
Contributes to CURA-5162
 2018-08-16 13:04:58 +02:00
Ian Paschal
57d41216e1 Remove dummy favorites 
Contributes to CURA-5162
 2018-08-16 13:04:17 +02:00
Ian Paschal
8493948ba1 Add a favorite materials model 
Contributes to CURA-5162
 2018-08-15 14:06:07 +02:00
Diego Prado Gesto
3d9c7f7eb5
Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size 
Adjust maximum zoom to printer size
 2018-08-15 13:19:46 +02:00
Ghostkeeper
f1a7b23a5c
Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
Ghostkeeper
da39e842f1
Move getting diagonal size out to separate function 2018-08-15 09:25:24 +02:00
Diego Prado Gesto
230dac1b9f
Merge pull request #4236 from Ultimaker/UM3extended_variant_fix 
Fix UM3extended 0.25 variant file
 2018-08-14 17:17:50 +02:00
DavidGergely
05bfee8158 Fix UM3extended 0.25 variant file 
Set ultimaker3_extended_aa0.25.inst.cfg to be the same as the ultimaker3_aa0.25.inst.cfg.
 2018-08-14 15:26:52 +02:00
Lipu Fei
746644e6ed Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-14 12:02:23 +02:00
Lipu Fei
5869644b0b Fix typo 2018-08-14 12:02:11 +02:00
Diego Prado Gesto
be021b8fac Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-13 17:04:52 +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
Ian Paschal
f91254c7c0 Fix typo in comment 2018-08-13 15:27:01 +02:00
Ghostkeeper
6ffe0a9083
Fix indent and typo 2018-08-13 14:47:51 +02:00
Lipu Fei
e0ad7a9fb4 Add answer commments to some puzzling code 2018-08-13 14:24:25 +02:00
Lipu Fei
8e891b69b0 Move type hinting imports into TYPE_CHECKING block 2018-08-13 13:48:00 +02:00
Lipu Fei
25e6fd8bec Fix incorrect type hinting 2018-08-13 13:47:26 +02:00
Lipu Fei
42b509cd4a Fix a wrong type hinting 2018-08-13 13:44:07 +02:00
Ian Paschal
5ede82eddc
Merge pull request #4233 from Ultimaker/CURA-5538-fix-on-at-a-time 
CURA-5538 Fix one at a time
 2018-08-13 13:14:30 +02:00
Lipu Fei
d45d6add40 Add collision detection in on-at-a-time iterator 2018-08-13 12:56:41 +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
Lipu Fei
bd47dfef75 Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2"" 
This reverts commit 89ed2bcff80a7a414f77c455baa0023c631eae7c.
 2018-08-13 11:23:10 +02:00
Diego Prado Gesto
98a0bb5002 CURA-5570 Remove a check that caused empty list of profiles. 2018-08-13 11:15:32 +02:00
alekseisasin
792a275ccf
Merge pull request #4231 from Ultimaker/CURA-5595_code_style_fixes 
Code style fixes
 2018-08-13 10:47:11 +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
alekseisasin
7af6672547
Merge pull request #4137 from Ultimaker/CURA-5595_add_custom_button_to_menu 
Cura 5595 add custom button to menu
 2018-08-13 09:56:32 +02:00
Diego Prado Gesto
825a3cd08f CURA-5570 Fix the configuration sync feature. 
It crashed Cura because it was using an outdated signature of the method
getMaterialNodeByType.
 2018-08-13 09:55:57 +02:00
Diego Prado Gesto
429cbc11c6
Merge pull request #4210 from fieldOfView/fix_support_eraser_rendering 
Fix rendering support eraser cubes
 2018-08-10 16:52:39 +02:00
Ian Paschal
16db297613 Some final tweaks 
Contributes to CURA-5595
 2018-08-10 16:28:02 +02:00
Ian Paschal
6d237b09e8 Proposed improvement on API naming 2018-08-10 16:08:54 +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
f91c696e4b
Clarify error message a bit more 
The QA engineer was a bit confused by this one. Let's make the language a bit easier.
 2018-08-10 13:17:20 +02:00
Ghostkeeper
6924d28ee7
Disambiguate translation of 'Settings' from 'Preferences' 
The 'settings' entry contains the set-up of the printer so Konfiguration is a better word there.

Discovered during investigation of #3971.
 2018-08-10 11:52:52 +02:00
Ian Paschal
89ed2bcff8 Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2" 
This reverts commit 82e1a7c5fc43a12d1498779d392286c6e49ee4ea, reversing
changes made to 1915659393b72f7e4d4dbd9b73e92b8a665efcdc.
 2018-08-10 11:45:25 +02:00
alekseisasin
c190c8d05a
Merge pull request #3999 from fieldOfView/fix_firmware_upload 
Fix firmware upload on Windows
 2018-08-10 11:39:53 +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