diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 647f62ee13..0cc2afa02e 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -14346,7 +14346,7 @@ msgid "" "\n" "Using a non-zero value is useful if the printer is set up to print without a " "prime line.\n" -"Final number of loops is not taken into account while arranging or " +"Final number of loops is not taking into account while arranging or " "validating objects distance. Increase loop number in such case." msgstr "" diff --git a/resources/handy_models/calicat.stl b/resources/handy_models/calicat.stl deleted file mode 100644 index 3380af233b..0000000000 Binary files a/resources/handy_models/calicat.stl and /dev/null differ diff --git a/resources/images/advanced.svg b/resources/images/advanced.svg index ef868e36b1..561a15b303 100644 --- a/resources/images/advanced.svg +++ b/resources/images/advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/ams_1_tray.svg b/resources/images/ams_1_tray.svg index d46cb35b07..6d9c7b3f28 100644 --- a/resources/images/ams_1_tray.svg +++ b/resources/images/ams_1_tray.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/resources/images/ams_4_tray.svg b/resources/images/ams_4_tray.svg index 779383ed27..379dcdf991 100644 --- a/resources/images/ams_4_tray.svg +++ b/resources/images/ams_4_tray.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/resources/images/custom-gcode_advanced.svg b/resources/images/custom-gcode_advanced.svg index e363a28d13..561a15b303 100644 --- a/resources/images/custom-gcode_advanced.svg +++ b/resources/images/custom-gcode_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/four_slot_ams_item.svg b/resources/images/four_slot_ams_item.svg index 8b1f7f787b..b42e94a6ca 100644 --- a/resources/images/four_slot_ams_item.svg +++ b/resources/images/four_slot_ams_item.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/resources/images/four_slot_ams_item_dark.svg b/resources/images/four_slot_ams_item_dark.svg index 8b1f7f787b..1d788268ff 100644 --- a/resources/images/four_slot_ams_item_dark.svg +++ b/resources/images/four_slot_ams_item_dark.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/resources/web/guide/0/loading.svg b/resources/images/loading_spinner.svg similarity index 100% rename from resources/web/guide/0/loading.svg rename to resources/images/loading_spinner.svg diff --git a/resources/images/lock_hover.svg b/resources/images/lock_hover.svg index 7abfb97480..b25ba1cfdc 100644 --- a/resources/images/lock_hover.svg +++ b/resources/images/lock_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/lock_normal.svg b/resources/images/lock_normal.svg index 7abfb97480..e585aba3f6 100644 --- a/resources/images/lock_normal.svg +++ b/resources/images/lock_normal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/obj_variable_layer_height.svg b/resources/images/obj_variable_layer_height.svg deleted file mode 100644 index 801d3e4ad2..0000000000 --- a/resources/images/obj_variable_layer_height.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/images/page_down.svg b/resources/images/page_down.svg index 7a9b362b61..077526b5a7 100644 --- a/resources/images/page_down.svg +++ b/resources/images/page_down.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/resources/images/page_up.svg b/resources/images/page_up.svg index d500df39a8..3a801242b2 100644 --- a/resources/images/page_up.svg +++ b/resources/images/page_up.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/resources/images/param_advanced.svg b/resources/images/param_advanced.svg index d5bbb99a94..86d13f71a7 100644 --- a/resources/images/param_advanced.svg +++ b/resources/images/param_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/param_zig-zag.svg b/resources/images/param_zig-zag.svg new file mode 100644 index 0000000000..0c062058bc --- /dev/null +++ b/resources/images/param_zig-zag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/reset_gray.svg b/resources/images/reset_gray.svg index dea3f8dcc5..9e5578903e 100644 --- a/resources/images/reset_gray.svg +++ b/resources/images/reset_gray.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/resources/images/revert_btn.svg b/resources/images/revert_btn.svg index ffcc5535f2..763a86ff76 100644 --- a/resources/images/revert_btn.svg +++ b/resources/images/revert_btn.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/single_slot_ams_item.svg b/resources/images/single_slot_ams_item.svg index edd4698500..a1f94f84fc 100644 --- a/resources/images/single_slot_ams_item.svg +++ b/resources/images/single_slot_ams_item.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/resources/images/single_slot_ams_item_dark.svg b/resources/images/single_slot_ams_item_dark.svg index edd4698500..b259df0329 100644 --- a/resources/images/single_slot_ams_item_dark.svg +++ b/resources/images/single_slot_ams_item_dark.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + 第 1 层 + + + + + + + \ No newline at end of file diff --git a/resources/images/tab_multi_active.svg b/resources/images/tab_multi_active.svg index a005848cee..dc776469e5 100644 --- a/resources/images/tab_multi_active.svg +++ b/resources/images/tab_multi_active.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/resources/images/toolbar_double_directional_arrow.svg b/resources/images/toolbar_double_directional_arrow.svg index b2b52621a0..4cc9b2ecb3 100644 --- a/resources/images/toolbar_double_directional_arrow.svg +++ b/resources/images/toolbar_double_directional_arrow.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/resources/images/toolbar_reset.svg b/resources/images/toolbar_reset.svg index ffcc5535f2..ad78b43e15 100644 --- a/resources/images/toolbar_reset.svg +++ b/resources/images/toolbar_reset.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_hover.svg b/resources/images/toolbar_reset_hover.svg index ffcc5535f2..ad78b43e15 100644 --- a/resources/images/toolbar_reset_hover.svg +++ b/resources/images/toolbar_reset_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero.svg b/resources/images/toolbar_reset_zero.svg index 07ce4a5fd2..10be9c46fc 100644 --- a/resources/images/toolbar_reset_zero.svg +++ b/resources/images/toolbar_reset_zero.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero_hover.svg b/resources/images/toolbar_reset_zero_hover.svg index 07ce4a5fd2..10be9c46fc 100644 --- a/resources/images/toolbar_reset_zero_hover.svg +++ b/resources/images/toolbar_reset_zero_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/undo.svg b/resources/images/undo.svg index ffcc5535f2..763a86ff76 100644 --- a/resources/images/undo.svg +++ b/resources/images/undo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json index 2c42cc077b..3ea31a77ae 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json @@ -41,7 +41,7 @@ "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", "best_object_pos": "0.5,0.5", "change_extrusion_role_gcode": "", - "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X261 Y25 F12000\n;;; G1 Y1 F600\n;;; M400 P2730\n;;; G1 Y25 F3000\n;;; M400 P76250\n;;; M400 P35780\n; 2.1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X47 Y230 F12000\n;;; M400 P0\n; 2.2\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n; 3.1\n;;; G1 F36000\n;;; G1 Y250\n;;; G1 F8000\n;;; G1 X81\n;;; G1 Y273\n; 3.2\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n; 3.3\n;;; G1 X72\n;;; G1 X77\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", + "change_filament_gcode": "", "cooling_tube_length": "0", "cooling_tube_retraction": "0", "deretraction_speed": [ @@ -228,4 +228,4 @@ "Slope Lift" ], "z_offset": "0" -} +} \ No newline at end of file diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html index efaea1c8ea..4f6b807b9d 100644 --- a/resources/web/flush/WipingDialog.html +++ b/resources/web/flush/WipingDialog.html @@ -137,6 +137,40 @@ display: inline-block; } + .btn { + display: inline-block; + padding: 6px 9px; + border: 2px solid transparent; + border-radius: 12px; + font-size: 12px; + text-align: center; + cursor: pointer; + transition: all 0.3s; + } + + .btn-ok { + color: #fff; + background-color: #009688; + } + .btn-ok:hover { + background-color: #26A69A; + } + + .btn-cancel { + color: black; + background-color: white; + border: 1px solid black; + } + .btn-cancel:hover { + background-color: #eeeeee; + } + + body.dark-mode button.btn-cancel { + background-color: #2d2d31; + color: #e0e0e0; + border: 1px solid #e0e0e0; + } + select { padding: 6px 9px; border: 1px solid #dbdbdb; @@ -163,7 +197,7 @@ .button-container { display: flex; justify-content: center; - gap: 0px; + gap: 10px; margin: 10px; } @@ -232,6 +266,15 @@ position: sticky; z-index: 11; } + + body.dark-mode .btn-ok { + background-color: #009688; + } + + body.dark-mode .btn-dark { + background-color: #34495e; + } + body.dark-mode select { background-color: #2d2d31; color: white; @@ -252,8 +295,6 @@ - -
@@ -262,14 +303,14 @@ in Orca Slicer > Preferences.
-
-
+
+