diff --git a/resources/Icon.icns b/resources/Icon.icns index 59f90d9..8ca7496 100644 Binary files a/resources/Icon.icns and b/resources/Icon.icns differ diff --git a/resources/QIDIStudio.icns b/resources/QIDIStudio.icns index 59f90d9..8ca7496 100644 Binary files a/resources/QIDIStudio.icns and b/resources/QIDIStudio.icns differ diff --git a/resources/images/QIDIStudio-mac_128px.png b/resources/images/QIDIStudio-mac_128px.png index 1376ba5..697789c 100644 Binary files a/resources/images/QIDIStudio-mac_128px.png and b/resources/images/QIDIStudio-mac_128px.png differ diff --git a/resources/images/QIDIStudio-mac_256px.ico b/resources/images/QIDIStudio-mac_256px.ico index fa2440f..d60e491 100644 Binary files a/resources/images/QIDIStudio-mac_256px.ico and b/resources/images/QIDIStudio-mac_256px.ico differ diff --git a/resources/images/QIDIStudio.icns b/resources/images/QIDIStudio.icns index d045d16..8ca7496 100644 Binary files a/resources/images/QIDIStudio.icns and b/resources/images/QIDIStudio.icns differ diff --git a/resources/images/QIDIStudio.ico b/resources/images/QIDIStudio.ico index a927d79..835f4e7 100644 Binary files a/resources/images/QIDIStudio.ico and b/resources/images/QIDIStudio.ico differ diff --git a/resources/images/QIDIStudio.png b/resources/images/QIDIStudio.png index cf0cb1e..1af6932 100644 Binary files a/resources/images/QIDIStudio.png and b/resources/images/QIDIStudio.png differ diff --git a/resources/images/QIDIStudio.svg b/resources/images/QIDIStudio.svg index cc6a80a..3b511da 100644 --- a/resources/images/QIDIStudio.svg +++ b/resources/images/QIDIStudio.svg @@ -1,19 +1,20 @@ - - - - - - - + + + + + + + + + + diff --git a/resources/images/QIDIStudioTitle.ico b/resources/images/QIDIStudioTitle.ico index 6dcdcfc..2eaed47 100644 Binary files a/resources/images/QIDIStudioTitle.ico and b/resources/images/QIDIStudioTitle.ico differ diff --git a/resources/images/QIDIStudio_128px.png b/resources/images/QIDIStudio_128px.png index 1376ba5..697789c 100644 Binary files a/resources/images/QIDIStudio_128px.png and b/resources/images/QIDIStudio_128px.png differ diff --git a/resources/images/QIDIStudio_192px.png b/resources/images/QIDIStudio_192px.png index c9d67cd..1a4cb4a 100644 Binary files a/resources/images/QIDIStudio_192px.png and b/resources/images/QIDIStudio_192px.png differ diff --git a/resources/images/QIDIStudio_192px_grayscale.png b/resources/images/QIDIStudio_192px_grayscale.png index 9edbfb0..388dd94 100644 Binary files a/resources/images/QIDIStudio_192px_grayscale.png and b/resources/images/QIDIStudio_192px_grayscale.png differ diff --git a/resources/images/QIDIStudio_192px_transparent.png b/resources/images/QIDIStudio_192px_transparent.png index b9feb35..ac1c63a 100644 Binary files a/resources/images/QIDIStudio_192px_transparent.png and b/resources/images/QIDIStudio_192px_transparent.png differ diff --git a/resources/images/QIDIStudio_32px.png b/resources/images/QIDIStudio_32px.png index 3cdd00a..f33c0db 100644 Binary files a/resources/images/QIDIStudio_32px.png and b/resources/images/QIDIStudio_32px.png differ diff --git a/resources/images/QIDIStudio_about.svg b/resources/images/QIDIStudio_about.svg index e890d0f..6bbff2a 100644 --- a/resources/images/QIDIStudio_about.svg +++ b/resources/images/QIDIStudio_about.svg @@ -1,38 +1,47 @@ - - - - - - - - + viewBox="0 0 562 238" enable-background="new 0 0 562 238" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/gcode.icns b/resources/images/gcode.icns index 522d6b4..d5be3bd 100644 Binary files a/resources/images/gcode.icns and b/resources/images/gcode.icns differ diff --git a/resources/images/splash_logo.svg b/resources/images/splash_logo.svg index 8a71c2c..3b511da 100644 --- a/resources/images/splash_logo.svg +++ b/resources/images/splash_logo.svg @@ -1,30 +1,20 @@ - + - - - - + - + - - - - - - - + diff --git a/resources/images/user_dark.png b/resources/images/user_dark.png index f563142..4e3fd67 100644 Binary files a/resources/images/user_dark.png and b/resources/images/user_dark.png differ diff --git a/resources/images/user_dark_tiny.png b/resources/images/user_dark_tiny.png index f6d4031..e4c7003 100644 Binary files a/resources/images/user_dark_tiny.png and b/resources/images/user_dark_tiny.png differ diff --git a/resources/web/homepage3/css/dark.css b/resources/web/homepage3/css/dark.css index 2166db3..02cb709 100644 --- a/resources/web/homepage3/css/dark.css +++ b/resources/web/homepage3/css/dark.css @@ -33,6 +33,10 @@ html,body /*----Left Menu Button----*/ +#LoginBtn .trans +{ + color: #efeff0; +} #LogoutBtn:hover { /* y6 */ diff --git a/resources/web/image/logo.png b/resources/web/image/logo.png index 2bde63e..1af6932 100644 Binary files a/resources/web/image/logo.png and b/resources/web/image/logo.png differ diff --git a/resources/web/image/logo2.png b/resources/web/image/logo2.png index d86cfd7..9cfe8c8 100644 Binary files a/resources/web/image/logo2.png and b/resources/web/image/logo2.png differ diff --git a/resources/web/image/userdark.png b/resources/web/image/userdark.png index f563142..9671cdc 100644 Binary files a/resources/web/image/userdark.png and b/resources/web/image/userdark.png differ diff --git a/resources/web/qidi/link_connection.png b/resources/web/qidi/link_connection.png index db25676..a3cc346 100644 Binary files a/resources/web/qidi/link_connection.png and b/resources/web/qidi/link_connection.png differ diff --git a/resources/web/qidi/link_missing_connection.html b/resources/web/qidi/link_missing_connection.html index dc729c7..11597c6 100644 --- a/resources/web/qidi/link_missing_connection.html +++ b/resources/web/qidi/link_missing_connection.html @@ -3,6 +3,13 @@ + + + + + + + Connect Device - -

Connect Device

-

Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the "Link" page.

+ +

+ Connect Device +

+

+ Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the "Link" page. +

Device Connection Image \ No newline at end of file diff --git a/resources/web/qidi/missing_connection.html b/resources/web/qidi/missing_connection.html index 4bcbec5..c9eb04f 100644 --- a/resources/web/qidi/missing_connection.html +++ b/resources/web/qidi/missing_connection.html @@ -3,6 +3,13 @@ + + + + + + + Connect Device - -

Connect Device

-

Please set up your printer connection to view the device.

+ +

+ Connect Device +

+

+ Please set up your printer connection to view the device. +

Device Connection Image \ No newline at end of file diff --git a/resources/web/qidi/setup_connection.gif b/resources/web/qidi/setup_connection.gif index c37adab..283449c 100644 Binary files a/resources/web/qidi/setup_connection.gif and b/resources/web/qidi/setup_connection.gif differ diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 4d98c58..eff18a0 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -344,14 +344,27 @@ AboutDialog::AboutDialog() m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size); m_html->SetMinSize(wxSize(FromDIP(-1), FromDIP(16))); m_html->SetBorders(2); - const auto text = from_u8( - (boost::format( - "" - "" - "

www.qidi3d.com

" - "" - "") - ).str()); + wxString text; + if (wxGetApp().dark_mode()) { + text = from_u8( + (boost::format( + "" + "" + "

www.qidi3d.com

" + "" + "") + ).str()); + } + else { + text = from_u8( + (boost::format( + "" + "" + "

www.qidi3d.com

" + "" + "") + ).str()); + } m_html->SetPage(text); copyright_ver_sizer->Add(m_html, 0, wxEXPAND, 0); m_html->Bind(wxEVT_HTML_LINK_CLICKED, &AboutDialog::onLinkClicked, this); diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 19e98d0..b20635f 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -148,7 +148,13 @@ void CalibrationPanel::create_preset_box(wxWindow* parent, wxBoxSizer* sizer_sid h_process_sizer->Add(m_process_title, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, 5); h_process_sizer->AddStretchSpacer(1); - wxColour bg(243, 243, 243); + wxColour bg(241, 241, 241); + m_printer_icon->SetBackgroundColour(bg); + m_filament_icon->SetBackgroundColour(bg); + m_process_icon->SetBackgroundColour(bg); + m_printer_title->SetBackgroundColour(bg); + m_filament_title->SetBackgroundColour(bg); + m_process_title->SetBackgroundColour(bg); m_printer_panel->SetBackgroundColour(bg); m_filament_panel->SetBackgroundColour(bg); m_process_panel->SetBackgroundColour(bg); @@ -164,7 +170,8 @@ void CalibrationPanel::create_preset_box(wxWindow* parent, wxBoxSizer* sizer_sid sizer_side_tools->Add(m_print_choice, 0, wxEXPAND | wxLEFT | wxRIGHT, 5); wxStaticLine* line = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL); - line->SetBackgroundColour(wxColour(192, 192, 192)); + line->SetForegroundColour(bg); + line->SetBackgroundColour(bg); sizer_side_tools->Add(line, 0, wxEXPAND | wxTOP, 10); diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 124b229..2d40cd8 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -527,6 +527,7 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) DeviceButton *machine_button = new DeviceButton(leftScrolledWindow, fullname, Machine_Name, wxBU_LEFT, wxSize(80, 80), device_name, ip); machine_button->SetBackgroundColor(mac_btn_bg); + machine_button->SetBorderColor(wxColour(57, 51, 55)); machine_button->SetCanFocus(false); machine_button->SetIsSimpleMode(m_isSimpleMode); wxString formattedHost = ip; diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp index 735456f..d32115c 100644 --- a/src/slic3r/GUI/Widgets/StateColor.cpp +++ b/src/slic3r/GUI/Widgets/StateColor.cpp @@ -39,6 +39,8 @@ static std::map gDarkColors{ {"#2B3436", "#808080"}, {"#ABABAB", "#ABABAB"}, {"#D9D9D9", "#2D2D32"}, + {"#e0ffff", "#0078d7"}, + {"#afeeff", "#4479fb"}, //{"#F0F0F0", "#4C4C54"}, };