diff --git a/resources/images/recording_off_hover.svg b/resources/images/recording_off_hover.svg index 729484ea2..0f59b4dee 100644 --- a/resources/images/recording_off_hover.svg +++ b/resources/images/recording_off_hover.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/resources/images/recording_off_normal.svg b/resources/images/recording_off_normal.svg index 1a4d35762..3ba0450e8 100644 --- a/resources/images/recording_off_normal.svg +++ b/resources/images/recording_off_normal.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/resources/images/recording_on_hover.svg b/resources/images/recording_on_hover.svg index c2cd0833a..45a46c0fd 100644 --- a/resources/images/recording_on_hover.svg +++ b/resources/images/recording_on_hover.svg @@ -1,7 +1,6 @@ - - - - - - + + + + + diff --git a/resources/images/recording_on_normal.svg b/resources/images/recording_on_normal.svg index f1984fbf1..b75b916e9 100644 --- a/resources/images/recording_on_normal.svg +++ b/resources/images/recording_on_normal.svg @@ -1,7 +1,6 @@ - - - - - - + + + + + diff --git a/resources/images/sdcard_state_off.svg b/resources/images/sdcard_state_off.svg index 5e9fa83a8..97b4866de 100644 --- a/resources/images/sdcard_state_off.svg +++ b/resources/images/sdcard_state_off.svg @@ -1,20 +1,10 @@ - - - - - - - - Layer 1 - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/resources/images/sdcard_state_on.svg b/resources/images/sdcard_state_on.svg index c82fdd317..deef48a11 100644 --- a/resources/images/sdcard_state_on.svg +++ b/resources/images/sdcard_state_on.svg @@ -1,17 +1,7 @@ - - - - - - - - Layer 1 - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/resources/images/timelapse_off_hover.svg b/resources/images/timelapse_off_hover.svg index 583bfd046..d21e599c2 100644 --- a/resources/images/timelapse_off_hover.svg +++ b/resources/images/timelapse_off_hover.svg @@ -1,12 +1,15 @@ - - - - - + + + + + + + + - - + + diff --git a/resources/images/timelapse_off_normal.svg b/resources/images/timelapse_off_normal.svg index b8f0505d9..ec30c1b72 100644 --- a/resources/images/timelapse_off_normal.svg +++ b/resources/images/timelapse_off_normal.svg @@ -1,12 +1,15 @@ - - - - - + + + + + + + + - - + + diff --git a/resources/images/timelapse_on_hover.svg b/resources/images/timelapse_on_hover.svg index e46f1015f..7ea45dc91 100644 --- a/resources/images/timelapse_on_hover.svg +++ b/resources/images/timelapse_on_hover.svg @@ -1,13 +1,16 @@ - - - - - - + + + + + + + + + - - + + diff --git a/resources/images/timelapse_on_normal.svg b/resources/images/timelapse_on_normal.svg index bd8898b5d..09655e134 100644 --- a/resources/images/timelapse_on_normal.svg +++ b/resources/images/timelapse_on_normal.svg @@ -1,13 +1,16 @@ - - - - - - + + + + + + + + + - - + + diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 2c27a68ca..a7f4dd82b 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -176,8 +176,8 @@ void StatusBasePanel::init_bitmaps() m_thumbnail_sdcard = ScalableBitmap(this, "monitor_sdcard_thumbnail", 120); //m_bitmap_camera = create_scaled_bitmap("monitor_camera", nullptr, 18); m_bitmap_extruder = *cache.load_png("monitor_extruder", FromDIP(28), FromDIP(70), false, false); - m_bitmap_sdcard_state_on = create_scaled_bitmap("sdcard_state_on", nullptr, 16); - m_bitmap_sdcard_state_off = create_scaled_bitmap("sdcard_state_off", nullptr, 16); + m_bitmap_sdcard_state_on = create_scaled_bitmap("sdcard_state_on", nullptr, 20); + m_bitmap_sdcard_state_off = create_scaled_bitmap("sdcard_state_off", nullptr, 20); } wxBoxSizer *StatusBasePanel::create_monitoring_page() @@ -214,18 +214,18 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page() //m_bitmap_camera_img->SetMinSize(wxSize(FromDIP(32), FromDIP(18))); //bSizer_monitoring_title->Add(m_bitmap_camera_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5)); - m_bitmap_sdcard_off_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_off, wxDefaultPosition, wxSize(FromDIP(32), FromDIP(16)), 0); - m_bitmap_sdcard_off_img->SetMinSize(wxSize(FromDIP(32), FromDIP(16))); - m_bitmap_sdcard_on_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_on, wxDefaultPosition, wxSize(FromDIP(32), FromDIP(16)), 0); - m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(32), FromDIP(16))); + m_bitmap_sdcard_off_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_off, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0); + m_bitmap_sdcard_off_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24))); + m_bitmap_sdcard_on_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_on, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0); + m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24))); m_bitmap_sdcard_on_img->Hide(); m_timelapse_button = new CameraItem(m_panel_monitoring_title, "timelapse_off_normal", "timelapse_on_normal", "timelapse_off_hover", "timelapse_on_hover"); - m_timelapse_button->SetMinSize(wxSize(32, 24)); + m_timelapse_button->SetMinSize(wxSize(38, 24)); m_timelapse_button->SetBackgroundColour(STATUS_TITLE_BG); m_recording_button = new CameraItem(m_panel_monitoring_title, "recording_off_normal", "recording_on_normal", "recording_off_hover", "recording_on_hover"); - m_recording_button->SetMinSize(wxSize(32, 24)); + m_recording_button->SetMinSize(wxSize(38, 24)); m_recording_button->SetBackgroundColour(STATUS_TITLE_BG); m_timelapse_button->SetToolTip(_L("Timelapse")); @@ -2437,10 +2437,10 @@ void StatusPanel::msw_rescale() //m_bitmap_camera_img->SetBitmap(m_bitmap_camera); //m_bitmap_camera_img->SetMinSize(wxSize(FromDIP(32), FromDIP(18))); - m_timelapse_button->SetMinSize(wxSize(32, 24)); - m_recording_button->SetMinSize(wxSize(32, 24)); - m_bitmap_sdcard_off_img->SetMinSize(wxSize(FromDIP(32), FromDIP(20))); - m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(32), FromDIP(20))); + m_timelapse_button->SetMinSize(wxSize(38, 24)); + m_recording_button->SetMinSize(wxSize(38, 24)); + m_bitmap_sdcard_off_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24))); + m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24))); m_bpButton_xy->Rescale(); m_tempCtrl_nozzle->SetMinSize(TEMP_CTRL_MIN_SIZE);