GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 08:56:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further renames

Browse Source
This commit is contained in:
Joseph Lenox 2021-03-28 10:51:26 -05:00
parent 785a00675d
commit ac5b22d3d9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/MainFrame.cpp
View File

@ -60,9 +60,9 @@ public:
wxMenu *CreatePopupMenu() override {
wxMenu *menu = new wxMenu;
if(wxGetApp().app_config->get("single_instance") == "0") {
// Only allow opening a new PrusaSlicer instance on OSX if "single_instance" is disabled,
// Only allow opening a new Slic3r instance on OSX if "single_instance" is disabled,
// as starting new instances would interfere with the locking mechanism of "single_instance" support.
append_menu_item(menu, wxID_ANY, _L("Open new instance"), _L("Open a new PrusaSlicer instance"),
append_menu_item(menu, wxID_ANY, _L("Open new instance"), _L("Open a new Slic3r instance"),
[this](wxCommandEvent&) { start_new_slicer(); }, "", nullptr);
}
append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open G-code viewer"),
@ -76,7 +76,7 @@ public:
GCodeViewerTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {}
wxMenu *CreatePopupMenu() override {
wxMenu *menu = new wxMenu;
append_menu_item(menu, wxID_ANY, _L("Open PrusaSlicer"), _L("Open a new PrusaSlicer instance"),
append_menu_item(menu, wxID_ANY, _L("Open Slic3r"), _L("Open a new Slic3r instance"),
[this](wxCommandEvent&) { start_new_slicer(nullptr, true); }, "", nullptr);
append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open new G-code viewer"),
[this](wxCommandEvent&) { start_new_gcodeviewer_open_file(); }, "", nullptr);
@ -582,9 +582,7 @@ void MainFrame::update_title()
}
}
title += wxString(SLIC3R_APP_NAME) + "_" + wxString(SLIC3R_VERSION) ;
if (wxGetApp().is_editor() && !has_name)
title += (" " + _L("based on PrusaSlicer & Slic3r"));
title += wxString(SLIC3R_APP_NAME) + " " + wxString(SLIC3R_VERSION) ;
SetTitle(title);
}

10
src/slic3r/GUI/Preferences.cpp
View File

@ -166,13 +166,13 @@ void PreferencesDialog::build()
#if __APPLE__
def.label = L("Allow just a single PrusaSlicer instance");
def.label = L("Allow just a single Slic3r instance");
def.type = coBool;
def.tooltip = L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances of same app from the command line. In such case this settings will allow only one instance.");
#else
def.label = L("Allow just a single PrusaSlicer instance");
def.label = L("Allow just a single Slic3r instance");
def.type = coBool;
def.tooltip = L("If this is enabled, when starting PrusaSlicer and another instance of the same PrusaSlicer is already running, that instance will be reactivated instead.");
def.tooltip = L("If this is enabled, when starting Slic3r and another instance of the same Slic3r is already running, that instance will be reactivated instead.");
#endif
def.set_default_value(new ConfigOptionBool{ app_config->has("single_instance") ? app_config->get("single_instance") == "1" : false });
option = Option(def, "single_instance");
@ -209,9 +209,9 @@ void PreferencesDialog::build()
#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
#ifdef _WIN32
else {
def.label = L("Associate .gcode files to PrusaSlicer G-code Viewer");
def.label = L("Associate .gcode files to Slic3r G-code Viewer");
def.type = coBool;
def.tooltip = L("If enabled, sets PrusaSlicer G-code Viewer as default application to open .gcode files.");
def.tooltip = L("If enabled, sets Slic3r G-code Viewer as default application to open .gcode files.");
def.set_default_value(new ConfigOptionBool(app_config->get("associate_gcode") == "1"));
option = Option(def, "associate_gcode");
m_optgroup_general->append_single_option_line(option);