diff --git a/resources/images/monitor_recording_off.svg b/resources/images/monitor_recording_off.svg index fa08204bd5c..c45f93e9a6d 100644 --- a/resources/images/monitor_recording_off.svg +++ b/resources/images/monitor_recording_off.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/resources/images/monitor_recording_off_dark.svg b/resources/images/monitor_recording_off_dark.svg new file mode 100644 index 00000000000..520dd1bdb13 --- /dev/null +++ b/resources/images/monitor_recording_off_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/images/monitor_recording_on.svg b/resources/images/monitor_recording_on.svg index 33c348eb253..4bccded8bda 100644 --- a/resources/images/monitor_recording_on.svg +++ b/resources/images/monitor_recording_on.svg @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/resources/images/monitor_recording_on_dark.svg b/resources/images/monitor_recording_on_dark.svg new file mode 100644 index 00000000000..cc0b3ec16f9 --- /dev/null +++ b/resources/images/monitor_recording_on_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/monitor_state_off.svg b/resources/images/monitor_state_off.svg deleted file mode 100644 index 9a6de7d0823..00000000000 --- a/resources/images/monitor_state_off.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - Layer 1 - - - - - - \ No newline at end of file diff --git a/resources/images/monitor_state_on.svg b/resources/images/monitor_state_on.svg deleted file mode 100644 index c39cf9be9a7..00000000000 --- a/resources/images/monitor_state_on.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - Layer 1 - - - - - - \ No newline at end of file diff --git a/resources/images/monitor_timelapse_off.svg b/resources/images/monitor_timelapse_off.svg index 21d9fd69e6a..103a97f3fcb 100644 --- a/resources/images/monitor_timelapse_off.svg +++ b/resources/images/monitor_timelapse_off.svg @@ -1,11 +1,11 @@ - - - - - - + + + + + + diff --git a/resources/images/monitor_timelapse_off_dark.svg b/resources/images/monitor_timelapse_off_dark.svg new file mode 100644 index 00000000000..19785321b12 --- /dev/null +++ b/resources/images/monitor_timelapse_off_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/images/monitor_timelapse_on.svg b/resources/images/monitor_timelapse_on.svg index c82e3ca0a5a..ca46179f763 100644 --- a/resources/images/monitor_timelapse_on.svg +++ b/resources/images/monitor_timelapse_on.svg @@ -1,12 +1,12 @@ - - + + - - - - + + + + diff --git a/resources/images/monitor_timelapse_on_dark.svg b/resources/images/monitor_timelapse_on_dark.svg new file mode 100644 index 00000000000..63ab2297c22 --- /dev/null +++ b/resources/images/monitor_timelapse_on_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/images/monitor_vcamera_off.svg b/resources/images/monitor_vcamera_off.svg index 51609adc4aa..edbcc923700 100644 --- a/resources/images/monitor_vcamera_off.svg +++ b/resources/images/monitor_vcamera_off.svg @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/resources/images/monitor_vcamera_off_dark.svg b/resources/images/monitor_vcamera_off_dark.svg new file mode 100644 index 00000000000..8ed58c9da9b --- /dev/null +++ b/resources/images/monitor_vcamera_off_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/monitor_vcamera_on.svg b/resources/images/monitor_vcamera_on.svg index 5e741389eb6..b26c3f10cf9 100644 --- a/resources/images/monitor_vcamera_on.svg +++ b/resources/images/monitor_vcamera_on.svg @@ -1,8 +1,8 @@ - - - + + + - - + + diff --git a/resources/images/monitor_vcamera_on_dark.svg b/resources/images/monitor_vcamera_on_dark.svg new file mode 100644 index 00000000000..1c829d6554a --- /dev/null +++ b/resources/images/monitor_vcamera_on_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/images/sdcard_state_abnormal.svg b/resources/images/sdcard_state_abnormal.svg index b2ac57f52a0..a88e8df1751 100644 --- a/resources/images/sdcard_state_abnormal.svg +++ b/resources/images/sdcard_state_abnormal.svg @@ -1,9 +1,9 @@ - - - - - + + + + + - + diff --git a/resources/images/sdcard_state_abnormal_dark.svg b/resources/images/sdcard_state_abnormal_dark.svg new file mode 100644 index 00000000000..b2ac57f52a0 --- /dev/null +++ b/resources/images/sdcard_state_abnormal_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/images/sdcard_state_no.svg b/resources/images/sdcard_state_no.svg index 6b177014086..ae45a0c3b5d 100644 --- a/resources/images/sdcard_state_no.svg +++ b/resources/images/sdcard_state_no.svg @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + diff --git a/resources/images/sdcard_state_no_dark.svg b/resources/images/sdcard_state_no_dark.svg new file mode 100644 index 00000000000..6b177014086 --- /dev/null +++ b/resources/images/sdcard_state_no_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/sdcard_state_normal.svg b/resources/images/sdcard_state_normal.svg index e0ae5db617f..2c55e87010c 100644 --- a/resources/images/sdcard_state_normal.svg +++ b/resources/images/sdcard_state_normal.svg @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/resources/images/sdcard_state_normal_dark.svg b/resources/images/sdcard_state_normal_dark.svg new file mode 100644 index 00000000000..09217c6d67d --- /dev/null +++ b/resources/images/sdcard_state_normal_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 36e6a329a7d..287f858335e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -190,15 +190,16 @@ void StatusBasePanel::init_bitmaps() m_bitmap_extruder_filled_load = *cache.load_png("monitor_extruder_filled_load", FromDIP(28), FromDIP(70), false, false); m_bitmap_extruder_empty_unload = *cache.load_png("monitor_extruder_empty_unload", FromDIP(28), FromDIP(70), false, false); m_bitmap_extruder_filled_unload = *cache.load_png("monitor_extruder_filled_unload", FromDIP(28), FromDIP(70), false, false); - m_bitmap_sdcard_state_abnormal = ScalableBitmap(this, "sdcard_state_abnormal", 20); - m_bitmap_sdcard_state_normal = ScalableBitmap(this, "sdcard_state_normal", 20); - m_bitmap_sdcard_state_no = ScalableBitmap(this, "sdcard_state_no", 20); - m_bitmap_recording_on = ScalableBitmap(this, "monitor_recording_on", 20); - m_bitmap_recording_off = ScalableBitmap(this, "monitor_recording_off", 20); - m_bitmap_timelapse_on = ScalableBitmap(this, "monitor_timelapse_on", 20); - m_bitmap_timelapse_off = ScalableBitmap(this, "monitor_timelapse_off", 20); - m_bitmap_vcamera_on = ScalableBitmap(this, "monitor_vcamera_on", 20); - m_bitmap_vcamera_off = ScalableBitmap(this, "monitor_vcamera_off", 20); + + m_bitmap_sdcard_state_abnormal = ScalableBitmap(this, wxGetApp().dark_mode() ? "sdcard_state_abnormal_dark" : "sdcard_state_abnormal", 20); + m_bitmap_sdcard_state_normal = ScalableBitmap(this, wxGetApp().dark_mode() ? "sdcard_state_normal_dark" : "sdcard_state_normal", 20); + m_bitmap_sdcard_state_no = ScalableBitmap(this, wxGetApp().dark_mode() ? "sdcard_state_no_dark" : "sdcard_state_no", 20); + m_bitmap_recording_on = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_recording_on_dark" : "monitor_recording_on", 20); + m_bitmap_recording_off = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_recording_off_dark" : "monitor_recording_off", 20); + m_bitmap_timelapse_on = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_timelapse_on_dark" : "monitor_timelapse_on", 20); + m_bitmap_timelapse_off = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_timelapse_off_dark" : "monitor_timelapse_off", 20); + m_bitmap_vcamera_on = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_vcamera_on_dark" : "monitor_vcamera_on", 20); + m_bitmap_vcamera_off = ScalableBitmap(this, wxGetApp().dark_mode() ? "monitor_vcamera_off_dark" : "monitor_vcamera_off", 20); } @@ -3379,8 +3380,17 @@ void StatusPanel::rescale_camera_icons() { m_setting_button->msw_rescale(); - m_bitmap_vcamera_on.msw_rescale(); - m_bitmap_vcamera_off.msw_rescale(); + + m_bitmap_sdcard_state_abnormal = ScalableBitmap(this, wxGetApp().dark_mode()?"sdcard_state_abnormal_dark":"sdcard_state_abnormal", 20); + m_bitmap_sdcard_state_normal = ScalableBitmap(this, wxGetApp().dark_mode()?"sdcard_state_normal_dark":"sdcard_state_normal", 20); + m_bitmap_sdcard_state_no = ScalableBitmap(this, wxGetApp().dark_mode()?"sdcard_state_no_dark":"sdcard_state_no", 20); + m_bitmap_recording_on = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_recording_on_dark":"monitor_recording_on", 20); + m_bitmap_recording_off = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_recording_off_dark":"monitor_recording_off", 20); + m_bitmap_timelapse_on = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_timelapse_on_dark":"monitor_timelapse_on", 20); + m_bitmap_timelapse_off = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_timelapse_off_dark":"monitor_timelapse_off", 20); + m_bitmap_vcamera_on = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_vcamera_on_dark":"monitor_vcamera_on", 20); + m_bitmap_vcamera_off = ScalableBitmap(this, wxGetApp().dark_mode()?"monitor_vcamera_off_dark":"monitor_vcamera_off", 20); + if (m_media_play_ctrl->IsStreaming()) { m_bitmap_vcamera_img->SetBitmap(m_bitmap_vcamera_on.bmp()); } @@ -3389,9 +3399,7 @@ void StatusPanel::rescale_camera_icons() } if (!obj) return; - m_bitmap_sdcard_state_no.msw_rescale(); - m_bitmap_sdcard_state_abnormal.msw_rescale(); - m_bitmap_sdcard_state_normal.msw_rescale(); + if (obj->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD) { m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_no.bmp()); } else if (obj->get_sdcard_state() == MachineObject::SdcardState::HAS_SDCARD_NORMAL) { @@ -3402,16 +3410,12 @@ void StatusPanel::rescale_camera_icons() m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_normal.bmp()); } - m_bitmap_recording_on.msw_rescale(); - m_bitmap_recording_off.msw_rescale(); if (obj->is_recording()) { m_bitmap_recording_img->SetBitmap(m_bitmap_recording_on.bmp()); } else { m_bitmap_recording_img->SetBitmap(m_bitmap_recording_off.bmp()); } - m_bitmap_timelapse_on.msw_rescale(); - m_bitmap_timelapse_off.msw_rescale(); if (obj->is_timelapse()) { m_bitmap_timelapse_img->SetBitmap(m_bitmap_timelapse_on.bmp()); } else { diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index d93c2840a6e..b17a58ef4ab 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -446,7 +446,7 @@ wxBitmap create_scaled_bitmap( const std::string& bmp_name_in, #ifdef _WIN32 menu_bitmap ? Slic3r::GUI::check_dark_mode() : #endif - Slic3r::GUI::wxGetApp().dark_mode(); + Slic3r::GUI::wxGetApp().dark_mode(); // Try loading an SVG first, then PNG if SVG is not found: wxBitmap *bmp = cache.load_svg(bmp_name, width, height, grayscale, dark_mode, new_color, resize ? em_unit(win) * 0.1f : 0.f);