diff --git a/resources/icons/PrusaSlicer.icns b/resources/icons/PrusaSlicer.icns index c1eba897e..2364b6c13 100644 Binary files a/resources/icons/PrusaSlicer.icns and b/resources/icons/PrusaSlicer.icns differ diff --git a/resources/icons/PrusaSlicer.ico b/resources/icons/PrusaSlicer.ico index 5765f77d2..4a335cb6a 100644 Binary files a/resources/icons/PrusaSlicer.ico and b/resources/icons/PrusaSlicer.ico differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ab2abbd2..b1fcd5612 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,11 +73,8 @@ else () add_executable(PrusaSlicer PrusaSlicer.cpp PrusaSlicer.hpp) endif () if (NOT MSVC) - if(SLIC3R_GUI) - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "PrusaSlicer-gui") - else() - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "PrusaSlicer-console") - endif() + # Binary name on unix like systems (OSX, Linux) + set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") endif () target_link_libraries(PrusaSlicer libslic3r) diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp index e4f0c9ec7..1134a28ca 100644 --- a/src/slic3r/GUI/AppConfig.cpp +++ b/src/slic3r/GUI/AppConfig.cpp @@ -22,7 +22,7 @@ namespace Slic3r { static const std::string VENDOR_PREFIX = "vendor:"; static const std::string MODEL_PREFIX = "model:"; -static const std::string VERSION_CHECK_URL = "https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/Slic3rPE.version"; +static const std::string VERSION_CHECK_URL = "https://raw.githubusercontent.com/prusa3d/PrusaSlic3r-settings/master/live/PrusaSlicer.version"; void AppConfig::reset() { diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 137ebe68e..3880f1d79 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -915,6 +915,11 @@ int GUI_App::extruders_cnt() const preset.config.option("nozzle_diameter")->values.size(); } +void GUI_App::open_web_page_localized(const std::string &http_address) +{ + wxLaunchDefaultBrowser(http_address + "&lng=" + this->current_language_code()); +} + void GUI_App::window_pos_save(wxTopLevelWindow* window, const std::string &name) { if (name.empty()) { return; } diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 0ac5e1d42..0d0634826 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -171,6 +171,8 @@ public: PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); } + void open_web_page_localized(const std::string &http_address); + private: bool on_init_inner(); void window_pos_save(wxTopLevelWindow* window, const std::string &name); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index c45cd2e21..ba9664ce9 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -545,16 +545,16 @@ void MainFrame::init_menubar() auto helpMenu = new wxMenu(); { append_menu_item(helpMenu, wxID_ANY, _(L("Prusa 3D &Drivers")), _(L("Open the Prusa3D drivers download page in your browser")), - [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://www.prusa3d.com/drivers/"); }); + [this](wxCommandEvent&) { wxGetApp().open_web_page_localized("https://www.prusa3d.com/downloads"); }); append_menu_item(helpMenu, wxID_ANY, _(L("Software &Releases")), _(L("Open the software releases page in your browser")), - [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/slic3r/releases"); }); + [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/PrusaSlicer/releases"); }); //# my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", "Check for new Slic3r versions", sub{ //# wxTheApp->check_version(1); //# }); //# $versioncheck->Enable(wxTheApp->have_version_check); append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Website")), SLIC3R_APP_NAME), wxString::Format(_(L("Open the %s website in your browser")), SLIC3R_APP_NAME), - [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://www.prusa3d.com/slic3r-prusa-edition/"); }); + [this](wxCommandEvent&) { wxGetApp().open_web_page_localized("https://www.prusa3d.com/slicerweb"); }); // append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Manual")), SLIC3R_APP_NAME), // wxString::Format(_(L("Open the %s manual in your browser")), SLIC3R_APP_NAME), // [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://manual.slic3r.org/"); });