GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,529 Commits 289 Branches 260 Tags
Commit Graph

185 Commits

Author SHA1 Message Date
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
61e65d5cb0 Fixing code style - 
CURA-4386 CURA-4379
 2017-09-28 16:14:58 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
07899ba798 Merge branch 'feature_hide_gradual_infill' into 3.0 2017-09-28 09:34:25 +02:00
ChrisTerBeke
8f4692b3bb Merge branch '3.0' into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:19:13 +02:00
ChrisTerBeke
f2e362838e Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890 Hide gradual infill checkbox if the gradual infill steps setting is disabled 2017-09-27 22:28:20 +02:00
Diego Prado Gesto
dcf07e4f35 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 17:25:22 +02:00
Diego Prado Gesto
f8722a2d4b Fixed code style in the function - CURA-4352 2017-09-27 17:21:43 +02:00
fieldOfView
47ad68bda7 Show ticks when they are not available 2017-09-27 17:20:55 +02:00
fieldOfView
87c7373cb0 Fix visibility when there are ticks but no available ticks 2017-09-27 17:14:41 +02:00
ChrisTerBeke
3ddb45160d Update infill slider icon border color to not look like a checkbox, fixes #2487 2017-09-27 16:59:03 +02:00
ChrisTerBeke
e948f54ada Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-27 16:37:40 +02:00
Diego Prado Gesto
c03d54f598 Merge branch '3.0' into fix_infill_slider_rounding 2017-09-27 16:11:10 +02:00
fieldOfView
3be8f45636 Move the quality indicator to the center when there is only one quality available 
Fixes #2485
CURA-4383
 2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a CURA-4380 code improvements for build plate adhesion label 2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc CURA-4380 gradual infill checkbox closer to slider to indicate category 2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c CURA-4380 quality slider text disabled color when slider cannot be used 2017-09-27 14:32:05 +02:00
Mark
500989e36d Re-add the margin between infill and support checkbox 
CURA-4380
 2017-09-27 14:28:31 +02:00
Mark
aa93c67a94 Re-add the margin between infill and support checkbox 
CURA-4380
 2017-09-27 14:27:04 +02:00
ChrisTerBeke
f8e8dcacdf CURA-4381 use modulus to set infill slider step size and tick show 2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc CURA-4352 fix passing int values as float when changing slider value 2017-09-27 13:13:55 +02:00
Jaime van Kessel
2dee054003 Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0 2017-09-27 12:57:42 +02:00
fieldOfView
3d08ec6bac Fix Simple mode sliders for Hi DPI 2017-09-27 11:43:57 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
alekseisasin
c33bd80818 Added NOT SUPPORTED profile for UM2++ and quality slider validation if value:-1 
CURA-4182
 2017-09-25 15:38:47 +02:00
alekseisasin
ea65457920 After first start (no machine added) the controls on right side are invisible 
CURA-4357
 2017-09-22 14:45:23 +02:00
alekseisasin
e1f8676cac Removed tooltip translation in SidebarSimple 
CURA-4182
 2017-09-22 14:02:13 +02:00
alekseisasin
4c3f146995 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-22 13:51:15 +02:00
alekseisasin
9a0926b009 Check undefined text 
CURA-4182
 2017-09-22 13:50:31 +02:00
Ghostkeeper
0b166defd3
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-22 12:58:57 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 
Contributes to issue CURA-4357.
 2017-09-22 12:58:20 +02:00
Ghostkeeper
bf6c6891c4
Don't display layer height before a printer is added 
Contributes to issue CURA-4357, somewhat.
 2017-09-22 12:52:22 +02:00
alekseisasin
191854adef Added tooltip text for the infill icons 
CURA-4303
 2017-09-22 12:52:03 +02:00
Ghostkeeper
0183616b8f
Only switch profiles with slider if there is an added machine 
Otherwise we crash and burn.

Contributes to issue CURA-4357.
 2017-09-22 12:48:05 +02:00
ChrisTerBeke
0fa3bdd68b CURA-4182 text color for unavailable quality to disabled 2017-09-22 11:57:05 +02:00
ChrisTerBeke
fe5910dd96 CURA-4182 final tweaks to quality slider color and position 2017-09-22 11:54:59 +02:00
ChrisTerBeke
781f2d56c8 CURA-4182 code improvements for slider property calcs 2 2017-09-22 11:31:24 +02:00
ChrisTerBeke
f016e5346a CURA-4182 code improvements for slider property calcs 2017-09-22 11:29:18 +02:00
ChrisTerBeke
ae6b1a9f15 CURA-4182 better variable names 2017-09-22 11:14:13 +02:00
ChrisTerBeke
7f909df84a CURA-4182 refactor quality slider to use model for updating 2017-09-22 11:04:46 +02:00
Aleksei Sasin
879b3df816 On Windows platform the qualitys slider is properly aligned CURA-4182 2017-09-21 21:20:54 +02:00
ChrisTerBeke
ecafa24888 code cleanup 2017-09-21 17:35:12 +02:00
ChrisTerBeke
a74a6a59fc CURA-4182 fix merge conflicts with 3.0 branch 2017-09-21 15:33:00 +02:00
alekseisasin
bd6bb872b7 Changed Quality slider 
CURA-4182
 2017-09-21 15:24:40 +02:00
ChrisTerBeke
cdc1b9ba66 CURA-4303 infill slider icon color, border, alignment 2017-09-21 14:28:22 +02:00
Mark
03a159e423 Add some margin for the helper boxes, not perfect yet 
CURA-4303
 2017-09-19 11:36:05 +02:00