diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 4f5667320d..1a3caea5ce 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -1,6 +1,6 @@ name: Build Linux -on: [push, pull_request] +on: [pull_request] jobs: appimage-builder: diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index c6ad21238a..62d5985ce0 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -1,6 +1,6 @@ name: Build Mac arm64 -on: [pull_request, push] +on: [pull_request] jobs: build_win64: diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index 5c6f567292..aa26b7078a 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -1,6 +1,6 @@ name: Build Mac x64 -on: [pull_request, push] +on: [pull_request] jobs: build_win64: diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index c68ed53bc1..4cdf8c54ee 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -1,6 +1,6 @@ name: Build Win64 -on: [pull_request,push] +on: [pull_request] jobs: build_win64: @@ -10,37 +10,37 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 - # - name: Install perl - # run: | - # choco install strawberryperl + - name: Install perl + run: | + choco install strawberryperl - run: mkdir ${{ github.workspace }}/deps/build - run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep - - name: download deps - shell: powershell - run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep.zip", "$env:temp\BambuStudio_dep.zip")' - - name: extract deps - working-directory: ${{ github.workspace }}/deps/build - shell: cmd - run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep.zip' + # - name: download deps + # shell: powershell + # run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep.zip", "$env:temp\BambuStudio_dep.zip")' + # - name: extract deps + # working-directory: ${{ github.workspace }}/deps/build + # shell: cmd + # run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep.zip' - - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" + # - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" - # - name: build deps - # id: cache_deps - # uses: actions/cache@v3 - # env: - # cache-name: ${{ runner.os }}-cache-bambustudio_deps - # with: - # path: ${{ github.workspace }}/deps/build/BambuStudio_dep - # key: ${{ runner.os }}-build-${{ env.cache-name }} + - name: build deps + id: cache_deps + uses: actions/cache@v3 + env: + cache-name: ${{ runner.os }}-cache-bambustudio_deps + with: + path: ${{ github.workspace }}/deps/build/BambuStudio_dep + key: ${{ runner.os }}-build-${{ env.cache-name }} - # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} - # name: build deps - # working-directory: ${{ github.workspace }} - # continue-on-error: true - # run: .\build_release.bat deps + - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} + name: build deps + working-directory: ${{ github.workspace }} + continue-on-error: true + run: .\build_release.bat deps - # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force + - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force - name: Build studio working-directory: ${{ github.workspace }} diff --git a/resources/images/BambuStudio-mac_256px.ico b/resources/images/BambuStudio-mac_256px.ico index fa9c43cdea..33219aa1c0 100644 Binary files a/resources/images/BambuStudio-mac_256px.ico and b/resources/images/BambuStudio-mac_256px.ico differ diff --git a/resources/images/check_half_focused.svg b/resources/images/check_half_focused.svg index ad3f4c1013..517bb7acbc 100644 --- a/resources/images/check_half_focused.svg +++ b/resources/images/check_half_focused.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/check_on_focused.svg b/resources/images/check_on_focused.svg index 379f61b650..3c1c56c7c4 100644 --- a/resources/images/check_on_focused.svg +++ b/resources/images/check_on_focused.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/compare.svg b/resources/images/compare.svg index c5e4ae4250..6dbef6ecbf 100644 --- a/resources/images/compare.svg +++ b/resources/images/compare.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/resources/images/edit_button.svg b/resources/images/edit_button.svg index 862efef7f9..2d298f5661 100644 --- a/resources/images/edit_button.svg +++ b/resources/images/edit_button.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/gcode.icns b/resources/images/gcode.icns index 522d6b4e58..a2a243cb89 100644 Binary files a/resources/images/gcode.icns and b/resources/images/gcode.icns differ diff --git a/resources/images/question.svg b/resources/images/question.svg index 9361229bc3..6fb955b628 100644 --- a/resources/images/question.svg +++ b/resources/images/question.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/images/studio_logo.svg b/resources/images/studio_logo.svg new file mode 100644 index 0000000000..ae89a13cea --- /dev/null +++ b/resources/images/studio_logo.svg @@ -0,0 +1,59 @@ + + + + + + + + + diff --git a/resources/web/homepage/img/i4.png b/resources/web/homepage/img/i4.png index 81aa876cee..8a376b4faf 100644 Binary files a/resources/web/homepage/img/i4.png and b/resources/web/homepage/img/i4.png differ diff --git a/resources/web/image/logo.png b/resources/web/image/logo.png index aa57e28dff..1af136da06 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 400d65048b..9d9ab973b5 100644 Binary files a/resources/web/image/logo2.png and b/resources/web/image/logo2.png differ diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index daa95e0bb3..15177cd4db 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1559,8 +1559,10 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato m_placeholder_parser.set("chamber_temperature",new ConfigOptionInt(m_config.chamber_temperature)); // SoftFever: support variables `first_layer_temperature` and `first_layer_bed_temperature` - m_placeholder_parser.set("first_layer_bed_temperature", new ConfigOptionInt(first_bed_temp_opt->get_at(initial_extruder_id))); - m_placeholder_parser.set("first_layer_temperature", new ConfigOptionInt(m_config.nozzle_temperature_initial_layer.get_at(initial_extruder_id))); + m_placeholder_parser.set("first_layer_bed_temperature", new ConfigOptionInts(*first_bed_temp_opt)); + m_placeholder_parser.set("first_layer_temperature", new ConfigOptionInts(m_config.nozzle_temperature_initial_layer)); + m_placeholder_parser.set("max_print_height",new ConfigOptionInt(m_config.printable_height)); + m_placeholder_parser.set("z_offset", new ConfigOptionFloat(0.0f)); //BBS: calculate the volumetric speed of outer wall. Ignore pre-object setting and multi-filament, and just use the default setting { @@ -1902,14 +1904,10 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato // SoftFever: write compatiple info int first_layer_bed_temperature = get_bed_temperature(0, true, print.config().curr_bed_type); - file.write_format("; first_layer_bed_temperature = %d\n", - first_layer_bed_temperature); - file.write_format( - "; first_layer_temperature = %d\n", - print.config().nozzle_temperature_initial_layer.get_at(0)); - file.write_format( - "; first_layer_height = %.3f\n", - print.config().initial_layer_print_height.value); + file.write_format("; first_layer_bed_temperature = %d\n", first_layer_bed_temperature); + file.write_format("; bed_shape = %s\n", print.full_print_config().opt_serialize("printable_area").c_str()); + file.write_format("; first_layer_temperature = %d\n", print.config().nozzle_temperature_initial_layer.get_at(0)); + file.write_format("; first_layer_height = %.3f\n", print.config().initial_layer_print_height.value); //SF TODO // file.write_format("; variable_layer_height = %d\n", print.ad.adaptive_layer_height ? 1 : 0); @@ -3215,9 +3213,17 @@ void GCode::append_full_config(const Print &print, std::string &str) auto is_banned = [](const std::string &key) { return std::binary_search(banned_keys.begin(), banned_keys.end(), key); }; - for (const std::string &key : cfg.keys()) - if (! is_banned(key) && ! cfg.option(key)->is_nil()) - str += "; " + key + " = " + cfg.opt_serialize(key) + "\n"; + std::ostringstream ss; + for (const std::string& key : cfg.keys()) { + if (!is_banned(key) && !cfg.option(key)->is_nil()) { + if (key == "wipe_tower_x" || key == "wipe_tower_y") { + ss << std::fixed << std::setprecision(3) << "; " << key << " = " << dynamic_cast(cfg.option(key))->get_at(print.get_plate_index()) << "\n"; + } + else + ss << "; " << key << " = " << cfg.opt_serialize(key) << "\n"; + } + } + str += ss.str(); } void GCode::set_extruders(const std::vector &extruder_ids) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index d8a939f477..722c218e4d 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -194,7 +194,7 @@ void AMSMaterialsSetting::create() m_sizer_button->Add(0, 0, 1, wxEXPAND, 0); m_button_confirm = new Button(this, _L("Confirm")); - m_btn_bg_green = StateColor(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + m_btn_bg_green = StateColor(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_confirm->SetBackgroundColor(m_btn_bg_green); m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 521ac34aab..0a3469ad2e 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -251,9 +251,9 @@ AboutDialog::AboutDialog() version_font.SetPointSize(FromDIP(16)); version->SetFont(version_font); version->SetForegroundColour(wxColour("#FFFFFD")); - if(wxGetApp().dark_mode()) - version->SetBackgroundColour(wxColour("#00675b")); - else + if(wxGetApp().dark_mode()) + version->SetBackgroundColour(wxColour("#00675b")); + else version->SetBackgroundColour(wxColour("#009688")); vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 2a6aa717e2..f69039a278 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -131,7 +131,7 @@ namespace GUI { wxBoxSizer *m_sizer_button = new wxBoxSizer(wxHORIZONTAL); m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_button_bind = new Button(button_panel, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_bind->SetBackgroundColor(btn_bg_green); m_button_bind->SetBorderColor(wxColour(0, 150, 136)); @@ -402,7 +402,7 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/) m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_button_unbind = new Button(this, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_unbind->SetBackgroundColor(btn_bg_green); m_button_unbind->SetBorderColor(wxColour(0, 150, 136)); diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp index 933271c777..6c7cd77384 100644 --- a/src/slic3r/GUI/BitmapCache.cpp +++ b/src/slic3r/GUI/BitmapCache.cpp @@ -333,6 +333,7 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_ replaces["\"#6B6B6B\""] = "\"#818182\""; replaces["\"#909090\""] = "\"#FFFFFF\""; replaces["\"#00FF00\""] = "\"#FF0000\""; + replaces["\"#009688\""] = "\"#00675b\""; } //if (!new_color.empty()) // replaces["\"#ED6B21\""] = "\"" + new_color + "\""; diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index 708a8cf7d4..0a68e6de34 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -140,8 +140,8 @@ CalibrationDialog::CalibrationDialog(Plater *plater) calibration_panel->Layout(); calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); + StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bd_green(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); m_calibration_btn = new Button(cali_right_panel, _L("Start Calibration")); diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index 13286eabeb..05f11cdc39 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -54,8 +54,8 @@ ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, cons m_button_confirm->SetTextColor(wxColour("#FFFFFE")); StateColor btn_bg( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 055f4f4e4d..ba1645f1da 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -158,8 +158,8 @@ Button* MsgDialog::add_button(wxWindowID btn_id, bool set_focus /*= false*/, con btn->SetCornerRadius(FromDIP(12)); StateColor btn_bg_green( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index edb4a08110..efbe156648 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -61,7 +61,7 @@ TipsDialog::TipsDialog(wxWindow *parent, const wxString &title, const wxString & wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL); m_confirm = new Button(this, _L("OK")); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_confirm->SetBackgroundColor(btn_bg_green); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 47298e67f7..e925eadbed 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -8340,7 +8340,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL); m_confirm = new Button(this, _L("OK")); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_confirm->SetBackgroundColor(btn_bg_green); diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp index ad91312a9a..c1075ef577 100644 --- a/src/slic3r/GUI/PublishDialog.cpp +++ b/src/slic3r/GUI/PublishDialog.cpp @@ -87,8 +87,8 @@ PublishDialog::PublishDialog(Plater *plater) m_btn_cancel = new Button(this, _L("Cancel")); m_progress_sizer->Add(m_btn_cancel, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5)); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(255, 255, 255), StateColor::Normal)); StateColor text_color(std::pair(wxColour(255, 255, 255), StateColor::Pressed), std::pair(wxColour(255, 255, 255), StateColor::Hovered), diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp index ab29026233..c297f672a2 100644 --- a/src/slic3r/GUI/RecenterDialog.cpp +++ b/src/slic3r/GUI/RecenterDialog.cpp @@ -32,7 +32,7 @@ RecenterDialog::RecenterDialog(wxWindow* parent, wxWindowID id, const wxString& m_button_confirm->SetFont(Label::Body_14); m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24))); m_button_confirm->SetCornerRadius(FromDIP(12)); - StateColor confirm_btn_bg(std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor confirm_btn_bg(std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_confirm->SetBackgroundColor(confirm_btn_bg); m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 5893d63492..38c86c6a1a 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -141,7 +141,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -314,7 +314,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -530,7 +530,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -703,7 +703,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index fb79146ece..bb9c18060b 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -338,8 +338,8 @@ void SavePresetDialog::build(std::vector types, std::string suffix btns->Add(0, 0, 1, wxEXPAND, 5); m_confirm = new Button(this, _L("OK")); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_confirm->SetBackgroundColor(btn_bg_green); m_confirm->SetBorderColor(wxColour(0, 150, 136)); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index f5ef5d9252..b86edd021a 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1117,7 +1117,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, this); m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5)); - btn_bg_enable = StateColor(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + btn_bg_enable = StateColor(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_refresh = new Button(this, _L("Refresh")); @@ -3214,7 +3214,7 @@ EditDevNameDialog::EditDevNameDialog(Plater *plater /*= nullptr*/) m_button_confirm = new Button(this, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(0, 150, 136), StateColor::Normal)); + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_confirm->SetBackgroundColor(btn_bg_green); m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); m_button_confirm->SetTextColor(wxColour(255, 255, 255)); diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index abf38cdb9c..ac0a059071 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -234,7 +234,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SendToPrinterDialog::on_selection_changed, this); m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5)); - btn_bg_enable = StateColor(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + btn_bg_enable = StateColor(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_refresh = new Button(this, _L("Refresh")); diff --git a/src/slic3r/GUI/SetBedTypeDialog.cpp b/src/slic3r/GUI/SetBedTypeDialog.cpp index 1df98542db..99545ccc46 100644 --- a/src/slic3r/GUI/SetBedTypeDialog.cpp +++ b/src/slic3r/GUI/SetBedTypeDialog.cpp @@ -34,7 +34,7 @@ SetBedTypeDialog::SetBedTypeDialog(wxWindow* parent, wxWindowID id, const wxStri m_sizer_main->Add(m_sizer_radiobutton, 0, wxEXPAND | wxALL, FromDIP(10)); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 9c0f14cfb2..233047075e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -591,8 +591,8 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) m_staticText_control->SetFont(PAGE_TITLE_FONT); m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL); - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); + StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bd_green(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); m_options_btn = new Button(m_panel_control_title, _L("Print Options")); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 417dbc2d8e..bcbf33c079 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -939,7 +939,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ // Add Buttons wxFont btn_font = this->GetFont().Scaled(1.4f); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); auto add_btn = [this, m_sizer_button, btn_font, dependent_presets, btn_bg_green](Button **btn, int &btn_id, const std::string &icon_name, Action close_act, const wxString &label, diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index d736f31520..16d137de59 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -141,8 +141,8 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector &updates, bool force_ sizer_button->Add(0, 0, 1, wxEXPAND, 5); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index a772334e6b..41eb30966d 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -166,8 +166,8 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin m_main_right_sizer->Add(0, FromDIP(50), 0, wxEXPAND, FromDIP(5)); m_button_upgrade_firmware = new Button(this, _L("Update firmware")); - StateColor btn_bg(std::pair(wxColour(255, 255, 255), StateColor::Disabled), std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Enabled), + StateColor btn_bg(std::pair(wxColour(255, 255, 255), StateColor::Disabled), std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Enabled), std::pair(wxColour(0, 150, 136), StateColor::Normal)); StateColor btn_bd(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(0, 150, 136), StateColor::Enabled)); StateColor btn_text(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(255, 255, 255), StateColor::Enabled)); diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 4eb30cc296..7ac5d68130 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1509,7 +1509,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_sizer_left_bottom->Add(0, 0, 0, wxEXPAND, 0); m_sizer_left_bottom->Add(0, 0, 0, wxALL | wxLEFT, FromDIP(26)); - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed), diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp index daca37f32a..9f11b682d7 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.cpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp @@ -43,7 +43,7 @@ void ProgressBar::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, w auto m_progress_bk = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); m_progress_bk->SetBackgroundColour(wxColour(238, 130, 238)); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); wxBoxSizer *m_sizer_progress= new wxBoxSizer(wxHORIZONTAL); diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 8296254ac7..f08db28c4e 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -28,8 +28,8 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly border_color.append(0x6B6B6B, StateColor::Disabled); - border_color.append(wxColour(23, 129, 63), StateColor::Pressed); - border_color.append(wxColour(48,221,112), StateColor::Hovered); + border_color.append(wxColour(0, 137, 123), StateColor::Pressed); + border_color.append(wxColour(38, 166, 154), StateColor::Hovered); border_color.append(0x009688, StateColor::Normal); text_color.append(0xACACAC, StateColor::Disabled); @@ -38,8 +38,8 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly text_color.append(0xFEFEFE, StateColor::Normal); background_color.append(0x6B6B6B, StateColor::Disabled); - background_color.append(wxColour(23, 129, 63), StateColor::Pressed); - background_color.append(wxColour(48, 221, 112), StateColor::Hovered); + background_color.append(wxColour(0, 137, 123), StateColor::Pressed); + background_color.append(wxColour(38, 166, 154), StateColor::Hovered); background_color.append(0x009688, StateColor::Normal); SetBottomColour(wxColour("#3B4446")); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 05cb17fb7f..9ad6c08993 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -56,8 +56,8 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags) btn_sizer->AddStretchSpacer(); StateColor ok_btn_bg( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); @@ -85,8 +85,8 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags) StateColor calc_btn_bg( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); @@ -135,8 +135,8 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector& matrix, c // BBS #ifdef __WINDOWS__ StateColor calc_btn_bg( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); @@ -335,8 +335,8 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector& matrix, con #ifndef __WINDOWS__ StateColor calc_btn_bg( - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal) ); diff --git a/src/slic3r/Utils/Process.cpp b/src/slic3r/Utils/Process.cpp index 2112d101b0..309ad2308e 100644 --- a/src/slic3r/Utils/Process.cpp +++ b/src/slic3r/Utils/Process.cpp @@ -60,12 +60,13 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance boost::filesystem::path bin_path = into_path(wxStandardPaths::Get().GetExecutablePath()); #if defined(__APPLE__) { + auto bundle_path = bin_path.parent_path().parent_path().parent_path(); //bin_path = bin_path.parent_path() / "BambuStudio"; bin_path = "/usr/bin/open"; // On Apple the wxExecute fails, thus we use boost::process instead. BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\""; try { - std::vector args = { "-n", "-a", "/Applications/BambuStudio.app"}; + std::vector args = { "-n", "-a", bundle_path.string()}; if (!paths_to_open.empty()) { for (const auto& file : paths_to_open) args.emplace_back(into_u8(file));