From dc1deb2938b766bfdb0207e096d610b4a900ab63 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 27 Oct 2022 15:23:17 -0700 Subject: [PATCH 1/2] fixing tests --- StaticData/Profiles/Anycubic/i3 Mega.printer | 1 + StaticData/Profiles/Creality/Ender 5.printer | 4 +- StaticData/Profiles/Elegoo/Neptune 2.printer | 2 +- StaticData/Profiles/Peopoly/Moai.printer | 451 ------------------- Submodules/agg-sharp | 2 +- 5 files changed, 5 insertions(+), 455 deletions(-) delete mode 100644 StaticData/Profiles/Peopoly/Moai.printer diff --git a/StaticData/Profiles/Anycubic/i3 Mega.printer b/StaticData/Profiles/Anycubic/i3 Mega.printer index 7de573630..0686fbebc 100644 --- a/StaticData/Profiles/Anycubic/i3 Mega.printer +++ b/StaticData/Profiles/Anycubic/i3 Mega.printer @@ -27,6 +27,7 @@ "skirt_distance": "5", "skirts": "5", "nozzle_diameter": "0.25", + "first_layer_height": "0.25", "extrusion_multiplier": "0.96", "retract_length": "5.1", "coast_at_end_distance": "0.2", diff --git a/StaticData/Profiles/Creality/Ender 5.printer b/StaticData/Profiles/Creality/Ender 5.printer index 138fce180..3f971a324 100644 --- a/StaticData/Profiles/Creality/Ender 5.printer +++ b/StaticData/Profiles/Creality/Ender 5.printer @@ -74,7 +74,7 @@ "create_raft": "0", "default_acceleration": "0", "disable_fan_first_layers": "1", - "end_gcode": ";End GCode\\nM104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\n\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\n\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM81", + "end_gcode": ";End GCode\\nM104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\n\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F[travel_speed] ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\n\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM81", "external_perimeter_speed": "25", "external_perimeters_first": "0", "extra_perimeters": "1", @@ -166,7 +166,7 @@ "solid_infill_extrusion_width": "0", "solid_infill_speed": "60", "standby_temperature_delta": "-5", - "start_gcode": "G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\n\\nG28 X0 Y0 ;move X/Y to min endstops\\nG28 Z0 ;move Z to min endstops\\n\\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\\n\\nG92 E0 ;zero the extruded length\\nG1 F200 E3 ;extrude 3mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F{travel_speed}\\n;Put printing message on LCD screen\\nM117 Printing...", + "start_gcode": "G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\n\\nG28 X0 Y0 ;move X/Y to min endstops\\nG28 Z0 ;move Z to min endstops\\n\\nG1 Z15.0 F[travel_speed] ;move the platform down 15mm\\n\\nG92 E0 ;zero the extruded length\\nG1 F200 E3 ;extrude 3mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F[travel_speed]\\n;Put printing message on LCD screen\\nM117 Printing...", "start_perimeters_at_concave_points": "0", "start_perimeters_at_non_overhang": "0", "support_material": "0", diff --git a/StaticData/Profiles/Elegoo/Neptune 2.printer b/StaticData/Profiles/Elegoo/Neptune 2.printer index 22fd5f3d7..56a7fb6fb 100644 --- a/StaticData/Profiles/Elegoo/Neptune 2.printer +++ b/StaticData/Profiles/Elegoo/Neptune 2.printer @@ -74,7 +74,7 @@ "create_raft": "0", "default_acceleration": "0", "disable_fan_first_layers": "1", - "end_gcode": "G91 ;Relative positionning\\nG1 E-2 F2700 ;Retract a bit\\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\\nG1 X5 Y5 F3000 ;Wipe out\\nG1 Z10 ;Raise Z more\\nG90 ;Absolute positionning\\nG1 X0 Y{machine_depth} ;Present print\\nM106 S0 ;Turn-off fan\\nM104 S0 ;Turn-off hotend\\nM140 S0 ;Turn-off bed\\nM84 X Y E ;Disable all steppers but Z", + "end_gcode": "G91 ;Relative positionning\\nG1 E-2 F2700 ;Retract a bit\\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\\nG1 X5 Y5 F3000 ;Wipe out\\nG1 Z10 ;Raise Z more\\nG90 ;Absolute positionning\\nG1 X0 Y[machine_depth] ;Present print\\nM106 S0 ;Turn-off fan\\nM104 S0 ;Turn-off hotend\\nM140 S0 ;Turn-off bed\\nM84 X Y E ;Disable all steppers but Z", "external_perimeter_speed": "25", "external_perimeters_first": "0", "extra_perimeters": "1", diff --git a/StaticData/Profiles/Peopoly/Moai.printer b/StaticData/Profiles/Peopoly/Moai.printer deleted file mode 100644 index 303f146a7..000000000 --- a/StaticData/Profiles/Peopoly/Moai.printer +++ /dev/null @@ -1,451 +0,0 @@ -{ - "DocumentVersion": 201606271, - "ID": "Moai-5259771359264768", - "StagedUserSettings": { - "bridge_speed": "85", - "external_perimeter_speed": "100%", - "infill_speed": "85", - "support_material_speed": "85" - }, - "Macros": [], - "OemLayer": { - "avoid_crossing_perimeters": "0", - "bed_remove_part_temperature": "0", - "bed_shape": "rectangular", - "bed_size": "130,130", - "bed_temperature": "0", - "bottom_clip_amount": "0", - "bridge_acceleration": "0", - "bridge_fan_speed": "0", - "bridge_flow_ratio": "1", - "bridge_speed": "20", - "brim_width": "0", - "build_height": "180", - "cancel_gcode": "", - "center_part_on_bed": "0", - "complete_objects": "0", - "connect_gcode": "", - "cool_extruder_lift": "0", - "cooling": "1", - "create_raft": "0", - "default_acceleration": "0", - "disable_fan_first_layers": "0", - "end_gcode": "M104 S0\\nM140 S0\\nG28 X0 Y0\\nM84", - "external_perimeter_extrusion_width": "100%", - "external_perimeter_speed": "70%", - "external_perimeters_first": "0", - "extra_perimeters": "1", - "extruder_clearance_height": "20", - "extruder_clearance_radius": "20", - "extruder_count": "1", - "extruder_offset": "0x0,0x0,0x0,0x0", - "extruder_wipe_temperature": "0", - "extruders_share_temperature": "0", - "extrusion_axis": "E", - "extrusion_multiplier": "1", - "extrusion_width": "0", - "fan_always_on": "0", - "fan_below_layer_time": "60", - "filament_diameter": "1.75", - "fill_angle": "45", - "fill_density": "90%", - "fill_pattern": "honeycomb", - "first_layer_acceleration": "0", - "first_layer_bed_temperature": "75", - "first_layer_height": "0.1", - "first_layer_speed": "10", - "first_layer_temperature": "205", - "g0": "1", - "gap_fill_speed": "20", - "gcode_arcs": "0", - "gcode_comments": "0", - "gcode_flavor": "reprap", - "gcode_output_type": "REPRAP", - "has_fan": "0", - "has_hardware_leveling": "1", - "has_heated_bed": "0", - "has_power_control": "0", - "has_sd_card_reader": "0", - "heat_extruder_before_homing": "0", - "infill_acceleration": "0", - "infill_every_layers": "1", - "infill_extruder": "1", - "infill_extrusion_width": "0", - "infill_first": "0", - "infill_only_where_needed": "0", - "infill_overlap_perimeter": "100%", - "infill_speed": "60", - "infill_type": "LINES", - "layer_height": "0.1", - "manual_probe_paper_width": ".1", - "max_fan_speed": "0", - "min_extrusion_before_retract": "0", - "min_fan_speed": "0", - "min_print_speed": "0", - "min_skirt_length": "0", - "notes": "", - "nozzle_diameter": "0.055", - "only_retract_when_crossing_perimeters": "1", - "ooze_prevention": "0", - "output_filename_format": "[input_filename_base].gcode", - "overhangs": "1", - "pause_gcode": "", - "perimeter_acceleration": "0", - "perimeter_extruder": "1", - "perimeter_extrusion_width": "0", - "perimeter_speed": "30", - "perimeters": "4", - "post_process": "", - "print_center": "65,65", - "print_leveling_method": "Manual", - "print_leveling_required_to_print": "0", - "print_leveling_solution": "3 Point Plane", - "raft_air_gap": "0", - "raft_extra_distance_around_part": "5", - "raft_extruder": "1", - "raft_fan_speed_percent": "0", - "raft_layers": "0", - "raft_print_speed": "100%", - "randomize_start": "0", - "repair_outlines_extensive_stitching": "0", - "repair_outlines_keep_open": "0", - "resolution": "0", - "resume_gcode": "", - "retract_before_travel": "0", - "retract_layer_change": "1", - "retract_length": "0", - "retract_length_tool_change": "0", - "retract_lift": "0", - "retract_restart_extra": "0", - "retract_restart_extra_toolchange": "0", - "retract_speed": "30", - "show_reset_connection": "0", - "skirt_distance": "3", - "skirt_height": "1", - "skirts": "0", - "slowdown_below_layer_time": "0", - "small_perimeter_speed": "30", - "solid_fill_pattern": "rectilinear", - "solid_infill_below_area": "70", - "solid_infill_every_layers": "0", - "solid_infill_extrusion_width": "0", - "solid_infill_speed": "60", - "solid_shell": "0", - "spiral_vase": "0", - "standby_temperature_delta": "-5", - "start_gcode": "G28", - "start_perimeters_at_concave_points": "0", - "start_perimeters_at_non_overhang": "0", - "support_material": "0", - "support_material_angle": "45", - "support_material_enforce_layers": "0", - "support_material_extruder": "1", - "support_material_extrusion_width": "0", - "support_material_infill_angle": "45", - "support_material_interface_extruder": "1", - "support_material_interface_layers": "0.8mm", - "support_material_interface_spacing": "0", - "support_material_pattern": "honeycomb", - "support_material_spacing": "2.5", - "support_material_speed": "60", - "support_material_threshold": "0", - "support_material_xy_distance": "0.7", - "support_material_z_distance": "0.15", - "support_material_z_gap_layers": ".3mm", - "support_type": "GRID", - "temperature": "0", - "thin_walls": "1", - "threads": "2", - "toolchange_gcode": "", - "top_infill_extrusion_width": "0", - "top_solid_infill_speed": "100%", - "top_solid_layers": "0.4mm", - "travel_speed": "300", - "use_firmware_retraction": "0", - "use_relative_e_distances": "0", - "vibration_limit": "0", - "wipe": "0", - "wipe_shield_distance": "0", - "wipe_tower_size": "0", - "z_can_be_negative": "0", - "z_offset": "0", - "make": "Peopoly", - "model": "Moai", - "created_date": "2018-07-17T01:10:17.520Z", - "baud_rate": "0", - "default_material_presets": "PLA", - "windows_driver": "MHSerial.inf", - "calibration_files": "Calibration - Circle.stl", - "active_theme_name": "Blue - Dark", - "auto_connect": "0", - "bottom_solid_layers": "0.4mm", - "support_air_gap": "0", - "support_material_percent": "0", - "retract_when_changing_islands": "0", - "z_homes_to_max": "1", - "active_quality_key": "", - "validate_layer_height": "0", - "sla_printer": "1", - "enable_retractions": "1", - "number_of_first_layers": "0.3mm", - "laser_speed_100": "85", - "fill_thin_gaps": "0", - "max_acceleration": "1000000", - "max_velocity": "1000000", - "jerk_velocity": "1000", - "brims": "3mm", - "print_time_estimate_multiplier": "41.8", - "progress_reporting": "None", - "enable_fan": "0", - "create_skirt": "0" - }, - "ActiveQualityKey": "", - "ActiveMaterialKey": "4d9b8cbd-2390-4abd-8eca-edd39c14aa1d", - "MaterialSettingsKeys": [ - "4d9b8cbd-2390-4abd-8eca-edd39c14aa1d" - ], - "MaterialLayers": [ - { - "layer_name": "MakerJuice G+ Black", - "layer_id": "de48cd09-ce62-43ac-9f09-ec8fa583de0a", - "fill_density": "80%", - "infill_overlap_perimeter": "0.0168", - "infill_speed": "100", - "top_solid_infill_speed": "100", - "perimeter_speed": "100", - "external_perimeter_speed": "100%", - "support_material_speed": "100", - "bridge_speed": "100", - "filament_density": "1.1", - "filament_cost": "52.73", - "extrusion_multiplier": "1" - }, - { - "layer_name": "PeoResin", - "layer_id": "4d9b8cbd-2390-4abd-8eca-edd39c14aa1d", - "infill_speed": "85", - "top_solid_infill_speed": "85", - "perimeter_speed": "85", - "external_perimeter_speed": "100%", - "support_material_speed": "85", - "bridge_speed": "85", - "extrusion_multiplier": "1", - "filament_density": "1.1", - "filament_cost": "63.64" - } - ], - "QualityLayers": [], - "BaseLayer": { - "avoid_crossing_perimeters": "1", - "bed_shape": "rectangular", - "bed_size": "200,200", - "bed_temperature": "70", - "load_filament_length": "20", - "load_filament_speed": "80", - "load_filament_length_over_six": "100%", - "unload_filament_length": "70", - "unload_filament_length_over_six": "100%", - "trim_image": "https://lh3.googleusercontent.com/7vFs0ih2mGseQBKo-0gHnzaT2SsuAPgeRuqFlVKG23c4brFnIaA2nlYIg8BUcdI-mVaDAadgu5bdBv_jZ69VOi3mYw", - "insert_image": "https://lh3.googleusercontent.com/S4eW9-uZ0lgpg_ws9Ss4LmUc_MiXCfHnfJmGVQ0XtOdpvr_XZQLuP5zWGv7eCSM65EbsWIdHVMC40EYL7u8k7LvMP4Y", - "running_clean_image": "", - "bottom_solid_layers": "1mm", - "layer_to_pause": "", - "bridge_speed": "20", - "build_height": "0", - "cancel_gcode": "", - "complete_objects": "0", - "connect_gcode": "", - "cool_extruder_lift": "0", - "cooling": "1", - "create_raft": "0", - "raft_extra_distance_around_part": "5", - "raft_air_gap": ".2", - "raft_print_speed": "100%", - "end_gcode": "M104 S0 ; turn off temperature\\nG28 X0 ; home X axis\\nM84 ; disable motors", - "external_perimeter_speed": "70%", - "external_perimeters_first": "0", - "extruder_count": "1", - "extruder_offset": "0x0,0x0,0x0,0x0", - "baby_step_z_offset": "0", - "extruders_share_temperature": "0", - "heat_extruder_before_homing": "0", - "merge_overlapping_lines": "1", - "expand_thin_walls": "1", - "extrusion_multiplier": "1", - "filament_cost": "0", - "filament_density": "1.24", - "filament_diameter": "3", - "fill_angle": "45", - "fill_density": "0.4", - "fill_pattern": "honeycomb", - "fill_thin_gaps": "1", - "first_layer_bed_temperature": "75", - "first_layer_extrusion_width": "100%", - "first_layer_height": "0.3", - "first_layer_speed": "30%", - "number_of_first_layers": "1", - "recover_first_layer_speed": "10", - "recover_is_enabled": "0", - "validate_layer_height": "1", - "z_homes_to_max": "0", - "recover_position_before_z_home": "0,0", - "first_layer_temperature": "205", - "auto_release_motors": "1", - "g0": "0", - "gcode_flavor": "reprap", - "gcode_output_type": "REPRAP", - "has_z_probe": "0", - "has_z_servo": "0", - "has_hardware_leveling": "0", - "has_heated_bed": "1", - "sla_printer": "0", - "include_firmware_updater": "None", - "backup_firmware_before_update": "1", - "has_power_control": "0", - "has_sd_card_reader": "0", - "show_reset_connection": "0", - "infill_overlap_perimeter": "25%", - "laser_speed_025": "100", - "laser_speed_100": "85", - "infill_speed": "60", - "infill_type": "TRIANGLES", - "print_leveling_solution": "3 Point Plane", - "clean_nozzle_image": "clean_nozzle.png", - "print_leveling_required_to_print": "0", - "filament_runout_sensor": "0", - "probe_has_been_calibrated": "0", - "print_leveling_probe_start": "10", - "z_probe_z_offset": ".1", - "use_z_probe": "0", - "z_probe_xy_offset": "0,0", - "z_probe_samples": "1", - "z_servo_depolyed_angle": "0", - "z_servo_retracted_angle": "0", - "layer_gcode": "; LAYER:[layer_num]", - "layer_height": "0.4", - "solid_shell": "0", - "min_extrusion_before_retract": ".1", - "has_fan": "1", - "enable_fan": "1", - "min_fan_speed_layer_time": "60", - "max_fan_speed_layer_time": "30", - "min_fan_speed": "35", - "max_fan_speed": "100", - "bridge_fan_speed": "100", - "disable_fan_first_layers": "1", - "min_print_speed": "10", - "min_skirt_length": "0", - "nozzle_diameter": "0.5", - "calibration_files": "Calibration - Box.stl", - "output_only_first_layer": "0", - "pause_gcode": "", - "perimeter_extrusion_width": "0", - "external_perimeter_extrusion_width": "100%", - "perimeter_speed": "30", - "perimeter_start_end_overlap": "90", - "perimeters": "3", - "print_center": "100,100", - "raft_layers": "0", - "randomize_start": "0", - "resume_gcode": "", - "retract_before_travel": "20", - "enable_retractions": "1", - "retract_length": "1", - "retract_length_tool_change": "10", - "retract_when_changing_islands": "1", - "retract_lift": "0", - "retract_restart_extra_toolchange": "0", - "reset_long_extrusion": "1", - "send_with_checksum": "1", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", - "retract_speed": "30", - "repair_outlines_extensive_stitching": "0", - "repair_outlines_keep_open": "0", - "resolution": "0", - "skirt_distance": "6", - "skirt_height": "1", - "skirts": "1", - "brims": "0", - "slowdown_below_layer_time": "30", - "small_perimeter_speed": "30", - "solid_fill_pattern": "rectilinear", - "solid_infill_extrusion_width": "0", - "solid_infill_speed": "60", - "spiral_vase": "0", - "standby_temperature_delta": "-5", - "start_gcode": "G28 ; home all axes\\nG1 Z5 F5000 ; lift nozzle", - "write_regex": "", - "read_regex": "", - "start_perimeters_at_concave_points": "0", - "start_perimeters_at_non_overhang": "0", - "support_air_gap": ".3", - "support_material_percent": "50", - "support_material_infill_angle": "45", - "support_material_create_internal_support": "1", - "support_material_create_perimeter": "1", - "support_material_extruder": "1", - "raft_extruder": "0", - "support_material_interface_extruder": "1", - "support_material_interface_layers": ".9mm", - "support_material_spacing": "2.5", - "support_material_speed": "60", - "support_material_xy_distance": "0.7", - "support_material": "0", - "support_type": "LINES", - "temperature": "200", - "temperature1": "200", - "temperature2": "200", - "temperature3": "200", - "extruder_wipe_temperature": "0", - "bed_remove_part_temperature": "0", - "thin_walls": "1", - "threads": "2", - "toolchange_gcode": "", - "before_toolchange_gcode": "", - "boolean_operations": "", - "additional_args_to_process": "", - "top_infill_extrusion_width": "0", - "top_solid_infill_speed": "50", - "top_solid_layers": "1mm", - "travel_speed": "130", - "use_firmware_retraction": "0", - "use_relative_e_distances": "0", - "baud_rate": "250000", - "printer_name": "", - "auto_connect": "1", - "com_port": "", - "vibration_limit": "0", - "wipe": "0", - "wipe_shield_distance": "0", - "wipe_tower_size": "0", - "driver_type": "RepRap", - "enable_network_printing": "0", - "enable_sailfish_communication": "0", - "selector_ip_address": "Manual", - "ip_address": "127.0.0.1", - "ip_port": "23", - "z_offset": "0", - "feedrate_ratio": "1", - "extrusion_ratio": "1", - "max_acceleration": "1000", - "max_velocity": "500", - "jerk_velocity": "8", - "print_time_estimate_multiplier": "100", - "manual_movement_speeds": "x,3000,y,3000,z,315,e0,150", - "progress_reporting": "M117", - "create_brim": "0", - "create_skirt": "1", - "extrusion_width": "0", - "infill_extrusion_width": "0", - "raft_fan_speed_percent": "100", - "fan_always_on": "0", - "fan_below_layer_time": "60", - "leveling_manual_positions": "", - "notes": "", - "ooze_prevention": "0", - "overhangs": "1", - "post_process": "", - "gcode_buffer_size": "16" - } -} \ No newline at end of file diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7ae6015ea..c56e880ad 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7ae6015eadfeaae062b5e00dfd7a3a4a4c66304d +Subproject commit c56e880adf4594bb4c17b5cb7f99eeda3a9f40b6 From cba9437ffa7478f2acdcfa30a13a0908fc87d4f2 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 28 Oct 2022 17:05:55 -0700 Subject: [PATCH 2/2] Fixed a regression with menus not set to radio buttons and then not unsetting other menu buttons --- .../Providers/FileSystem/FileSystemItem.cs | 16 ++++++++++++++- .../Library/Widgets/LibraryWidget.cs | 20 +++++++++---------- StaticData/Translations/Master.txt | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs b/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs index 16e0be433..eccabcee4 100644 --- a/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs +++ b/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using MatterHackers.Agg; +using MatterHackers.Localizations; using System; using System.IO; using System.Text.RegularExpressions; @@ -88,7 +89,20 @@ namespace MatterHackers.MatterControl.Library { get { - return Path.GetFileName(this.FilePath); + var finalDirectory = Path.GetFileName(this.FilePath); + if (string.IsNullOrEmpty(finalDirectory)) + { + if (FilePath.Length > 0) + { + return $"{FilePath[0]} " + "Drive".Localize(); + } + else + { + return "Unknown".Localize(); + } + } + + return finalDirectory; } set diff --git a/MatterControlLib/Library/Widgets/LibraryWidget.cs b/MatterControlLib/Library/Widgets/LibraryWidget.cs index 3592882c0..361a923ae 100644 --- a/MatterControlLib/Library/Widgets/LibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/LibraryWidget.cs @@ -249,21 +249,21 @@ namespace MatterHackers.MatterControl.Library.Widgets "Date Created".Localize(), () => libraryView.ActiveSort.HasFlag(SortKey.CreatedDate), (v) => libraryView.SetUserSort(SortKey.CreatedDate), - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateBoolMenuItem( "Date Modified".Localize(), () => libraryView.ActiveSort.HasFlag(SortKey.ModifiedDate), (v) => libraryView.SetUserSort(SortKey.ModifiedDate), - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateBoolMenuItem( "Name".Localize(), () => libraryView.ActiveSort.HasFlag(SortKey.Name), (v) => libraryView.SetUserSort(SortKey.Name), - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateSeparator(); @@ -274,14 +274,14 @@ namespace MatterHackers.MatterControl.Library.Widgets "Ascending".Localize(), () => libraryView.Ascending, (v) => libraryView.SetUserSort(ascending: true), - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateBoolMenuItem( "Descending".Localize(), () => !libraryView.Ascending, (v) => libraryView.SetUserSort(ascending: false), - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); return popupMenu; @@ -328,7 +328,7 @@ namespace MatterHackers.MatterControl.Library.Widgets (isChecked) => { listView.SetContentView(ListViewModes.RowListView); }, - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); #if DEBUG popupMenu.CreateBoolMenuItem( @@ -338,7 +338,7 @@ namespace MatterHackers.MatterControl.Library.Widgets { listView.SetContentView(ListViewModes.IconListView18); }, - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateBoolMenuItem( @@ -348,7 +348,7 @@ namespace MatterHackers.MatterControl.Library.Widgets { listView.SetContentView(ListViewModes.IconListView70); }, - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); #endif popupMenu.CreateBoolMenuItem( @@ -358,7 +358,7 @@ namespace MatterHackers.MatterControl.Library.Widgets { listView.SetContentView(ListViewModes.IconListView); }, - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); popupMenu.CreateBoolMenuItem( @@ -368,7 +368,7 @@ namespace MatterHackers.MatterControl.Library.Widgets { listView.SetContentView(ListViewModes.IconListView256); }, - useRadioStyle: false, + useRadioStyle: true, siblingRadioButtonList: siblingList); return popupMenu; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 0cd659555..5241998e6 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -1405,6 +1405,9 @@ Translated:Downloading updates... English:Downloads Translated:Downloads +English:Drive +Translated:Drive + English:Dual Contouring Translated:Dual Contouring