diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f70c7fba6a..1b41cdda2f 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -78,6 +78,8 @@ class CuraApplication(QtApplication): if not hasattr(sys, "frozen"): Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) + self._open_file_queue = [] #Files to open when plug-ins are loaded. + super().__init__(name = "cura", version = CuraVersion) self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) @@ -148,6 +150,8 @@ class CuraApplication(QtApplication): if self.getBackend() == None: raise RuntimeError("Could not load the backend plugin!") + self._plugins_loaded = True + def addCommandLineOptions(self, parser): super().addCommandLineOptions(parser) parser.add_argument("file", nargs="*", help="Files to load after starting the application.") @@ -205,14 +209,18 @@ class CuraApplication(QtApplication): for file in self.getCommandLineOption("file", []): self._openFile(file) + for file_name in self._open_file_queue: #Open all the files that were queued up while plug-ins were loading. + self._openFile(file_name) self.exec_() # Handle Qt events def event(self, event): if event.type() == QEvent.FileOpen: - Logger.log("i", "File open via Qt event: %s", event.file()) - self._openFile(event.file()) + if self._plugins_loaded: + self._openFile(event.file()) + else: + self._open_file_queue.append(event.file()) return super().event(event) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 20ec26f223..ca21e83a97 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1305,7 +1305,7 @@ "description": "Experimental feature: Make support areas smaller at the bottom than at the overhang.", "type": "boolean", "default": false, - "visible": false, + "visible": true, "enabled": "support_enable" }, "support_conical_angle": { diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 679dcfc35f..50e95b7f67 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -1,12 +1,13 @@ { "id": "ultimaker2_extended_olsson_base", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json index 4a63cd56a6..7d5e1ba384 100644 --- a/resources/machines/ultimaker2_extended_olsson_025.json +++ b/resources/machines/ultimaker2_extended_olsson_025.json @@ -1,12 +1,13 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", "variant": "0.25 mm", "profiles_machine": "ultimaker2_olsson", diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json index 13bc8def5f..c031c5a7f4 100644 --- a/resources/machines/ultimaker2_extended_olsson_040.json +++ b/resources/machines/ultimaker2_extended_olsson_040.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.4 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json index 506f9362e4..ce811fa556 100644 --- a/resources/machines/ultimaker2_extended_olsson_060.json +++ b/resources/machines/ultimaker2_extended_olsson_060.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.6 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json index 089a2d5d50..a7b703f051 100644 --- a/resources/machines/ultimaker2_extended_olsson_080.json +++ b/resources/machines/ultimaker2_extended_olsson_080.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", + "file_formats": "text/x-gcode", "visible": false, "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.8 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 24d397381d..ec6acd1a18 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -1,39 +1,16 @@ { "id": "ultimaker2_olsson_base", - "version": 1, + "version": 1, "name": "Ultimaker 2 with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", "overrides": { - "machine_show_variants": { "default": true }, - "shell_thickness": { "default": 1.2 }, - "top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" }, - "travel_compensate_overlapping_walls_enabled": { "default": true }, - "skin_alternate_rotation": { "default": true }, - "skin_outline_count": { "default": 2 }, - "infill_sparse_density": { "default": 10 }, - "infill_overlap": { "default": 14, "inherit_function": "14 if infill_sparse_density < 95 else 0" }, - "infill_wipe_dist": { "default": 0.35, "inherit_function": "wall_line_width_0" }, - "retraction_amount": { "default": 6 }, - "retraction_min_travel": { "default": 4.5 }, - "retraction_count_max": { "default": 6 }, - "retraction_extrusion_window": { "default": 6.0 }, - "speed_print": { "default": 50 }, - "speed_wall": { "inherit_function": "parent_value / 50 * 30" }, - "speed_wall_x": { "inherit_function": "speed_print / 50 * 40" }, - "speed_topbottom": { "inherit_function": "parent_value / 50 * 20" }, - "speed_layer_0": { "default": 20 }, - "skirt_speed": { "default": 20 }, - "travel_avoid_distance": { "default": 1.0 }, - "coasting_enable": { "default": true }, - "coasting_volume": { "default": 0.4 }, - "support_angle": { "default": 50 }, - "adhesion_type": { "default": "brim" } + "machine_show_variants": { "default": true } } } diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json index 8e45d35f6d..cc70c21624 100644 --- a/resources/machines/ultimaker2_olsson_025.json +++ b/resources/machines/ultimaker2_olsson_025.json @@ -1,13 +1,13 @@ { "id": "ultimaker2_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2_olsson.json", "variant": "0.25 mm", @@ -15,15 +15,6 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, - "layer_height": { "default": 0.06 }, - "layer_height_0": { "default": 0.15 }, - - "infill_sparse_density": { "default": 12 }, - "speed_print": { "default": 30 }, - "speed_wall": { "inherit_function": "parent_value / 30 * 20" }, - "speed_wall_x": { "inherit_function": "speed_print / 30 * 25" }, - "speed_topbottom": { "inherit_function": "parent_value / 30 * 20" }, - "coasting_volume": { "default": 0.1 }, "coasting_min_volume": { "default": 0.17 } } diff --git a/resources/machines/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json index cebdce773a..481ff00b3a 100644 --- a/resources/machines/ultimaker2_olsson_040.json +++ b/resources/machines/ultimaker2_olsson_040.json @@ -7,15 +7,12 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2_olsson.json", "variant": "0.4 mm", "overrides": { - "machine_nozzle_size": { "default": 0.40 }, - - "wall_line_width_0": { "inherit_function": "parent_value * 0.875" }, - "skin_line_width": { "inherit_function": "parent_value * 0.875" } + "machine_nozzle_size": { "default": 0.40 } } } diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json index 960c697c92..a0e2af8ee9 100644 --- a/resources/machines/ultimaker2_olsson_060.json +++ b/resources/machines/ultimaker2_olsson_060.json @@ -7,25 +7,13 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2_olsson.json", "variant": "0.6 mm", "overrides": { "machine_nozzle_size": { "default": 0.60 }, - - "layer_height": { "default": 0.15 }, - "layer_height_0": { "default": 0.4 }, - - "shell_thickness": { "default": 1.8 }, - - "infill_sparse_density": { "default": 15 }, - "speed_print": { "default": 55 }, - "speed_wall": { "inherit_function": "parent_value / 55 * 25" }, - "speed_wall_x": { "inherit_function": "speed_print / 55 * 40" }, - "speed_topbottom": { "inherit_function": "parent_value / 55 * 20" }, - "coasting_volume": { "default": 1.36 } } } diff --git a/resources/machines/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json index 9509985a2f..9ab0497651 100644 --- a/resources/machines/ultimaker2_olsson_080.json +++ b/resources/machines/ultimaker2_olsson_080.json @@ -7,26 +7,13 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2_olsson.json", "variant": "0.8 mm", "overrides": { "machine_nozzle_size": { "default": 0.80 }, - - "layer_height": { "default": 0.2 }, - "layer_height_0": { "default": 0.5 }, - - "shell_thickness": { "default": 2.4 }, - "top_bottom_thickness": { "inherit_function": "parent_value / 2" }, - - "infill_sparse_density": { "default": 16 }, - "speed_print": { "default": 40 }, - "speed_wall": { "inherit_function": "parent_value / 40 * 20" }, - "speed_wall_x": { "inherit_function": "speed_print / 40 * 30" }, - "speed_topbottom": { "inherit_function": "parent_value / 40 * 20" }, - "coasting_volume": { "default": 3.22 } } } diff --git a/resources/themes/cura/fonts/OpenSans-Bold.ttf b/resources/themes/cura/fonts/OpenSans-Bold.ttf new file mode 100644 index 0000000000..fd79d43bea Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-Bold.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-BoldItalic.ttf b/resources/themes/cura/fonts/OpenSans-BoldItalic.ttf new file mode 100644 index 0000000000..9bc800958a Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-BoldItalic.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf b/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf new file mode 100644 index 0000000000..21f6f84a07 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-ExtraBold.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf b/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf new file mode 100644 index 0000000000..31cb688340 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-Italic.ttf b/resources/themes/cura/fonts/OpenSans-Italic.ttf new file mode 100644 index 0000000000..c90da48ff3 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-Italic.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-Light.ttf b/resources/themes/cura/fonts/OpenSans-Light.ttf new file mode 100644 index 0000000000..0d381897da Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-Light.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-LightItalic.ttf b/resources/themes/cura/fonts/OpenSans-LightItalic.ttf new file mode 100644 index 0000000000..68299c4bc6 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-LightItalic.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-Regular.ttf b/resources/themes/cura/fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000000..db433349b7 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-Regular.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-Semibold.ttf b/resources/themes/cura/fonts/OpenSans-Semibold.ttf new file mode 100644 index 0000000000..1a7679e394 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-Semibold.ttf differ diff --git a/resources/themes/cura/fonts/OpenSans-SemiboldItalic.ttf b/resources/themes/cura/fonts/OpenSans-SemiboldItalic.ttf new file mode 100644 index 0000000000..59b6d16b06 Binary files /dev/null and b/resources/themes/cura/fonts/OpenSans-SemiboldItalic.ttf differ diff --git a/resources/themes/cura/fonts/Roboto-Black.ttf b/resources/themes/cura/fonts/Roboto-Black.ttf deleted file mode 100644 index 9002aab5d4..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Black.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-BlackItalic.ttf b/resources/themes/cura/fonts/Roboto-BlackItalic.ttf deleted file mode 100644 index b87e025dff..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-BlackItalic.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Bold.ttf b/resources/themes/cura/fonts/Roboto-Bold.ttf deleted file mode 100644 index 072b842925..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-BoldItalic.ttf b/resources/themes/cura/fonts/Roboto-BoldItalic.ttf deleted file mode 100644 index 74919ff649..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Italic.ttf b/resources/themes/cura/fonts/Roboto-Italic.ttf deleted file mode 100644 index bd57775e44..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Italic.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Light.ttf b/resources/themes/cura/fonts/Roboto-Light.ttf deleted file mode 100644 index 13bf13af00..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Light.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-LightItalic.ttf b/resources/themes/cura/fonts/Roboto-LightItalic.ttf deleted file mode 100644 index 130672a907..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-LightItalic.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Medium.ttf b/resources/themes/cura/fonts/Roboto-Medium.ttf deleted file mode 100644 index d0f6e2b64f..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Medium.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-MediumItalic.ttf b/resources/themes/cura/fonts/Roboto-MediumItalic.ttf deleted file mode 100644 index 6153d48b49..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Regular.ttf b/resources/themes/cura/fonts/Roboto-Regular.ttf deleted file mode 100644 index 0ba95c98c4..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-Thin.ttf b/resources/themes/cura/fonts/Roboto-Thin.ttf deleted file mode 100644 index 309c22d358..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-Thin.ttf and /dev/null differ diff --git a/resources/themes/cura/fonts/Roboto-ThinItalic.ttf b/resources/themes/cura/fonts/Roboto-ThinItalic.ttf deleted file mode 100644 index 0b53ba4d38..0000000000 Binary files a/resources/themes/cura/fonts/Roboto-ThinItalic.ttf and /dev/null differ diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 24cc3c541b..1332aedca0 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -3,52 +3,52 @@ "large": { "size": 1.25, "bold": true, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "default": { "size": 1.15, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "default_bold": { "size": 1.15, "bold": true, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "small": { "size": 1.0, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "very_small": { "size": 0.75, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "caption": { "size": 1.0, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "sidebar_header": { "size": 0.75, "capitalize": true, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "default_header": { "size": 1.0, "bold": true, - "family": "Proxima Nova Rg", + "family": "Open Sans", "letterSpacing": 2.0 }, "button_tooltip": { "size": 1.0, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "setting_category": { "size": 1.15, - "family": "Proxima Nova Rg" + "family": "Open Sans" }, "action_button": { "size": 1.15, "bold": true, - "family": "Proxima Nova Rg" + "family": "Open Sans" } },