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

change option priority, change "prusa" to "++"

Browse Source
This commit is contained in:
supermerill 2018-12-19 19:03:11 +01:00
parent 86d73b9a2a
commit 000d6a4aac
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/PrintConfig.cpp
View File

@ -167,7 +167,7 @@ void PrintConfigDef::init_fff_params()
def->cli = "top-fan-speed=i@";
def->min = 0;
def->max = 100;
def->mode = comAdvanced;
def->mode = comExpert;
def->default_value = new ConfigOptionInts{ 100 };
def = this->add("bridge_flow_ratio", coFloat);
@ -212,7 +212,6 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("mm");
def->cli = "brim-width=f";
def->min = 0;
def->mode = comAdvanced;
def->default_value = new ConfigOptionFloat(0);
def = this->add("clip_multipart_objects", coBool);
@ -524,7 +523,7 @@ void PrintConfigDef::init_fff_params()
def->mode = comAdvanced;
def->default_value = new ConfigOptionEnum<SeamPosition>(spRear);
def = this->add("extra_perimeters", coBool);avoid
def = this->add("extra_perimeters", coBool);
def->label = L("Extra perimeters if needed");
def->category = L("Layers and Perimeters");
def->tooltip = L("Add more perimeters when needed for avoiding gaps in sloping walls. "
@ -1041,6 +1040,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Enable gap fill algorithm. It will extrude small lines between perimeters "
"when there is not enough space for another perimeter or an infill.");
def->cli = "gap-fill!";
def->mode = comExpert;
def->default_value = new ConfigOptionBool(true);
def = this->add("gap_fill_speed", coFloat);
@ -1066,6 +1066,7 @@ void PrintConfigDef::init_fff_params()
def->label = "Label Prints with Object ID";
def->tooltip = "Enable this to add comments in the G-Code that label print moves with what object they belong. Can be used with Octoprint CancelObject plugin.";
def->cli = "label-printed-objects!";
def->mode = comAdvanced;
def->default_value = new ConfigOptionBool(0);
def = this->add("gcode_flavor", coEnum);
@ -1262,6 +1263,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Layers and Perimeters");
def->tooltip = L("This setting controls the height of last object layers to put the last layer at the exact highest height possible. Experimental.");
def->cli = "exact_last-layer-height=f";
def->mode = comExpert;
def->default_value = new ConfigOptionBool(false);
def = this->add("remaining_times", coBool);
@ -1380,7 +1382,7 @@ void PrintConfigDef::init_fff_params()
def->cli = "max-fan-speed=i@";
def->min = 0;
def->max = 100;
def->mode = comExpert;
def->mode = comAdvanced;
def->default_value = new ConfigOptionInts { 100 };
def = this->add("max_layer_height", coFloats);
@ -1447,7 +1449,7 @@ void PrintConfigDef::init_fff_params()
def->cli = "min-fan-speed=i@";
def->min = 0;
def->max = 100;
def->mode = comExpert;
def->mode = comAdvanced;
def->default_value = new ConfigOptionInts { 35 };
def = this->add("min_layer_height", coFloats);

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

@ -48,7 +48,7 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
m_statusbar->embed(this);
m_statusbar->set_status_text(_(L("Version ")) +
SLIC3R_VERSION +
_(L(" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases")));
_(L(" - Remember to check for updates at http://github.com/supermerill/slic3r/releases")));
// initialize tabpanel and menubar
init_tabpanel();
@ -392,10 +392,12 @@ void MainFrame::init_menubar()
// Help menu
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/"); });
append_menu_item(helpMenu, wxID_ANY, _(L("Prusa Edition Releases")), _(L("Open the Prusa Edition releases page in your browser")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/slic3r/releases"); });
append_menu_item(helpMenu, wxID_ANY, _(L("Slic3r++ Releases")), _(L("Open the slic3r++ releases page in your browser")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/slic3r/releases"); });
append_menu_item(helpMenu, wxID_ANY, _(L("Slic3r++ website")), _(L("Open the slic3r++ website in your browser")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/slic3r"); });
append_menu_item(helpMenu, wxID_ANY, _(L("Prusa Edition website")), _(L("Open the Prusa Edition website in your browser")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/slic3r"); });
//# my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", "Check for new Slic3r versions", sub{
//# wxTheApp->check_version(1);
//# });
@ -409,8 +411,8 @@ void MainFrame::init_menubar()
[this](wxCommandEvent&) { wxGetApp().system_info(); });
append_menu_item(helpMenu, wxID_ANY, _(L("Show Configuration Folder")), _(L("Show user configuration folder (datadir)")),
[this](wxCommandEvent&) { Slic3r::GUI::desktop_open_datadir_folder(); });
append_menu_item(helpMenu, wxID_ANY, _(L("Report an Issue")), _(L("Report an issue on the Slic3r Prusa Edition")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/slic3r/issues/new"); });
append_menu_item(helpMenu, wxID_ANY, _(L("Report an Issue")), _(L("Report an issue on Slic3r++")),
[this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/supermerill/issues/new"); });
append_menu_item(helpMenu, wxID_ANY, _(L("About Slic3r")), _(L("Show about dialog")),
[this](wxCommandEvent&) { Slic3r::GUI::about(); });
}

2
version.inc
View File

@ -1,7 +1,7 @@
# Included by CMakeLists, edited by the build script
# (the version numbers are generated by the build script from the git current label)
set(SLIC3R_FORK_NAME "Slic3r Prusa Edition")
set(SLIC3R_FORK_NAME "Slic3r++")
set(SLIC3R_VERSION "1.42.0-alpha")
set(SLIC3R_BUILD "${SLIC3R_VERSION}+UNKNOWN")
set(SLIC3R_BUILD_ID "${SLIC3R_BUILD_ID}")