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

15880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
36da9cc9e5 Added verticalOffset to popup shadow. 
This way it's more in line with the rest of the elements

CL-896
 2018-08-24 13:52:34 +02:00
Jaime van Kessel
bc651fea92 First printer tile no longer has shadow cut off from top 
CL-894
 2018-08-24 13:50:52 +02:00
Jaime van Kessel
c13f252193 Some spacing / anchoring fixes 
CL-896
 2018-08-24 13:41:33 +02:00
Aleksei S
ea935024cf Add materil xml file to UFP file 
CURA-5555
 2018-08-24 13:02: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
Jaime van Kessel
3e623a6fe6 Added pointer to context popup 
CL-894
 2018-08-24 11:02:05 +02:00
Lipu Fei
61c635fbaf Mock application in unit tests 2018-08-24 10:47:01 +02:00
Ian Paschal
93645e6bfe Reduce component sizes 
Contributes to CURA-5378
 2018-08-24 10:46:23 +02:00
Jaime van Kessel
fc83520ad9 Added camera view back to cluster screen 
CL-893
 2018-08-23 20:34:20 +02:00
Jaime van Kessel
6bfa2fed96 Updated display states and fixed some more margins 
CL-896
 2018-08-23 19:46:14 +02:00
Jaime van Kessel
e9d4c36b32 Updated labels 2018-08-23 18:16:39 +02:00
Jaime van Kessel
c703d15cd3 Updated the styling of the context hover 
CL-896
 2018-08-23 18:05:13 +02:00
Jaime van Kessel
dab2efab7f Updated margins & layout for the monitor page 
CL-896
 2018-08-23 17:29:48 +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
Lipu Fei
01cf9ee23b Remove "Experimental" text 2018-08-23 17:08:27 +02:00
Lipu Fei
26fced22bb Add quality profiles for S5 aluminum 
CURA-5656
 2018-08-23 17:08:15 +02:00
Lipu Fei
8582a1ba1a Mock application in unit tests 2018-08-23 17:00:57 +02:00
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
Jaime van Kessel
b0d9dc6fdd Added DropShadow to the printer & printjob tiles 
CL-893 && CL-894
 2018-08-23 15:53:32 +02:00
Jaime van Kessel
5176ead0e2 Added print progress to sidebar 
CL-893
 2018-08-23 15:07:31 +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
Ghostkeeper
49e3c23d14
Brackets on new line 
As per our code style.
 2018-08-22 16:53:27 +02:00
alekseisasin
0d293ddced
Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files 
CURA-5645 Do not add saved gcodes to recent files list
 2018-08-22 16:28:58 +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
Lipu Fei
94ce9205c3 Remove pytest cache 2018-08-22 13:30:59 +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
Lipu Fei
af64d91587 Fix stack handling in project loading 
CURA-5663
 2018-08-21 16:07:17 +02:00
Jaime van Kessel
5a13b86a3f Changed style for context button 
CL-894
 2018-08-21 14:55:18 +02:00
Cherubim
f35005c8ba
Brackets on new line 
As per our code style.
 2018-08-21 14:24:07 +02:00
Jaime van Kessel
dc85568973 Printer tiles in sidepanel can now be collapsed even if no job is active 
CL-893
 2018-08-21 13:52:09 +02:00
Lipu Fei
10e474ad27 Add draft shield distance into the prime tower position fomulas 
CURA-5644
 2018-08-21 13:38:56 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted 
CL-894
 2018-08-21 13:32:22 +02:00
Aleksei S
4635c8117d Add changed_settings(retraction_combing) to Version Upgrade Cura3.4 
CURA-5505
 2018-08-21 11:49:13 +02:00
Remco Burema
ca25638c07 .ufp should also not show up in recent files since it's a gcode format 2018-08-21 11:01:35 +02:00
Jaime van Kessel
03a7833180 Fixed qml warnings (reading from undefined properties) 
CL-893 && CL-894
 2018-08-21 10:14:12 +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
Lipu Fei
1468ac1d59 Check if dict has key before accessing in BuildVolume 2018-08-20 13:20:52 +02:00
alekseisasin
4b5cc59508
Merge pull request #4144 from smartavionics/mb-add-combing-mode-within-infill 
Added the "Within Infill" combing option that functions identically to the original "Not in Skin" option.
 2018-08-20 12:50:41 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests 
Fix unit tests
 2018-08-20 10:32:38 +02:00
Jaime van Kessel
1fa3b60f94 Added rough outline of the redesigned cluster controlItem 
CL-893
 2018-08-17 16:10:23 +02:00