3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: select file in folder

Browse source 
Change-Id: I383a60f19fe7c54bcb6c1348152ac72a2bab9e34
This commit is contained in:
chunmao.guo 2022-11-11 09:48:23 +08:00 • committed by Lane.Wei
parent c431cbf202
commit 011b22dee8
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/GUI.cpp
View file

@ -4,7 +4,9 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/LocalesUtils.hpp" #include "libslic3r/LocalesUtils.hpp"
#ifdef __APPLE__
#include "slic3r/Utils/MacDarkMode.hpp"
#endif
#include <string> #include <string>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@ -545,11 +547,9 @@ void desktop_open_any_folder( const std::string path )
#ifdef _WIN32 #ifdef _WIN32
const wxString widepath = from_u8(path); const wxString widepath = from_u8(path);
const wchar_t *argv[] = {L"explorer", widepath.GetData(), nullptr}; ::wxExecute(L"explorer /select," + widepath, wxEXEC_ASYNC, nullptr);
::wxExecute(const_cast<wchar_t **>(argv), wxEXEC_ASYNC, nullptr);
#elif __APPLE__ #elif __APPLE__
const char *argv[] = {"open", path.data(), nullptr}; openFolderForFile(from_u8(path));
::wxExecute(const_cast<char **>(argv), wxEXEC_ASYNC, nullptr);
#else #else
const char *argv[] = {"xdg-open", path.data(), nullptr}; const char *argv[] = {"xdg-open", path.data(), nullptr};

4
src/slic3r/GUI/GUI_App.cpp
View file

@ -3336,8 +3336,8 @@ std::string GUI_App::handle_web_request(std::string cmd)
{ {
boost::filesystem::path NowFile(path.value()); boost::filesystem::path NowFile(path.value());
std::string FolderPath = NowFile.parent_path().make_preferred().string(); std::string FilePath = NowFile.make_preferred().string();
desktop_open_any_folder(FolderPath); desktop_open_any_folder(FilePath);
} }
} }
} }

2
src/slic3r/GUI/Plater.cpp
View file

@ -722,7 +722,7 @@ Sidebar::Sidebar(Plater *parent)
ams_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "ams_fila_sync", wxEmptyString, wxDefaultSize, wxDefaultPosition, ams_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "ams_fila_sync", wxEmptyString, wxDefaultSize, wxDefaultPosition,
wxBU_EXACTFIT | wxNO_BORDER, false, 18); wxBU_EXACTFIT | wxNO_BORDER, false, 18);
ams_btn->SetToolTip(_L("Sync material list from AMS")); ams_btn->SetToolTip(_L("Synchronize filament list from AMS"));
ams_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) { ams_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) {
sync_ams_list(); sync_ams_list();
}); });