3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Extract app icon from exe on Windows

Browse source
This commit is contained in:
enricoturri1966 2020-09-01 16:14:18 +02:00
parent 83a6e45df5
commit ac9e1e8e4a
1 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/slic3r/GUI/MainFrame.cpp
View file

@ -115,18 +115,18 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
} }
#endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
// // Load the icon either from the exe, or from the ico file.
//#if _WIN32
// {
//
// TCHAR szExeFileName[MAX_PATH];
// GetModuleFileName(nullptr, szExeFileName, MAX_PATH);
// SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO));
// }
//#else
// SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); // SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
//#endif // _WIN32 // Load the icon either from the exe, or from the ico file.
#if _WIN32
{
TCHAR szExeFileName[MAX_PATH];
GetModuleFileName(nullptr, szExeFileName, MAX_PATH);
SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO));
}
#else
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
#endif // _WIN32
// initialize status bar // initialize status bar
m_statusbar = std::make_shared<ProgressStatusBar>(this); m_statusbar = std::make_shared<ProgressStatusBar>(this);
@ -1416,7 +1416,18 @@ void MainFrame::set_mode(EMode mode)
m_plater->Thaw(); m_plater->Thaw();
// SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
// Load the icon either from the exe, or from the ico file.
#if _WIN32
{
TCHAR szExeFileName[MAX_PATH];
GetModuleFileName(nullptr, szExeFileName, MAX_PATH);
SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO));
}
#else
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
#endif // _WIN32
#if ENABLE_GCODE_VIEWER_TASKBAR_ICON #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
if (m_taskbar_icon != nullptr) { if (m_taskbar_icon != nullptr) {
m_taskbar_icon->RemoveIcon(); m_taskbar_icon->RemoveIcon();
@ -1473,7 +1484,7 @@ void MainFrame::set_mode(EMode mode)
#if ENABLE_GCODE_VIEWER_TASKBAR_ICON #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
if (m_taskbar_icon != nullptr) { if (m_taskbar_icon != nullptr) {
m_taskbar_icon->RemoveIcon(); m_taskbar_icon->RemoveIcon();
m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer-GCode viewer"); m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicerGCodeViewer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer-GCode viewer");
} }
#endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
@ -1981,18 +1992,18 @@ SettingsDialog::SettingsDialog(MainFrame* mainframe)
this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); // SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
// // Load the icon either from the exe, or from the ico file. // Load the icon either from the exe, or from the ico file.
//#if _WIN32 #if _WIN32
// { {
//
// TCHAR szExeFileName[MAX_PATH]; TCHAR szExeFileName[MAX_PATH];
// GetModuleFileName(nullptr, szExeFileName, MAX_PATH); GetModuleFileName(nullptr, szExeFileName, MAX_PATH);
// SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO)); SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO));
// } }
//#else #else
// SetIcon(wxIcon(var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
//#endif // _WIN32 #endif // _WIN32
this->Bind(wxEVT_SHOW, [this](wxShowEvent& evt) { this->Bind(wxEVT_SHOW, [this](wxShowEvent& evt) {