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

Change name to Slic3r++ to avoid prusa being flood with issue from my fork.

Browse Source
This commit is contained in:
supermerill 2018-07-05 15:29:06 +02:00 committed by supermerill
parent a1ba36b116
commit 4c03b73f1b
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r.pm
View File

@ -28,7 +28,7 @@ BEGIN {
use Config; use Config;
use Moo; use Moo;
my $have_threads = $Config{useithreads} && eval "use threads; use threads::shared; use Thread::Queue; 1"; my $have_threads = $Config{useithreads} && eval "use threads; use threads::shared; use Thread::Queue; 1";
die "Slic3r Prusa Edition requires working Perl threads.\n" if ! $have_threads; die "Slic3r++ requires working Perl threads.\n" if ! $have_threads;
die "threads.pm >= 1.96 is required, please update\n" if $threads::VERSION < 1.96; die "threads.pm >= 1.96 is required, please update\n" if $threads::VERSION < 1.96;
die "Perl threading is broken with this Moo version: " . $Moo::VERSION . "\n" if $Moo::VERSION == 1.003000; die "Perl threading is broken with this Moo version: " . $Moo::VERSION . "\n" if $Moo::VERSION == 1.003000;
$debug = 1 if (defined($ENV{'SLIC3R_DEBUGOUT'}) && $ENV{'SLIC3R_DEBUGOUT'} == 1); $debug = 1 if (defined($ENV{'SLIC3R_DEBUGOUT'}) && $ENV{'SLIC3R_DEBUGOUT'} == 1);

2
lib/Slic3r/GUI.pm
View File

@ -74,7 +74,7 @@ sub OnInit {
my ($self) = @_; my ($self) = @_;
$self->SetAppName('Slic3rPE'); $self->SetAppName('Slic3rPE');
$self->SetAppDisplayName('Slic3r Prusa Edition'); $self->SetAppDisplayName('Slic3r++');
Slic3r::debugf "wxWidgets version %s, Wx version %s\n", &Wx::wxVERSION_STRING, $Wx::VERSION; Slic3r::debugf "wxWidgets version %s, Wx version %s\n", &Wx::wxVERSION_STRING, $Wx::VERSION;
# Set the Slic3r data directory at the Slic3r XS module. # Set the Slic3r data directory at the Slic3r XS module.

4
lib/Slic3r/GUI/MainFrame.pm
View File

@ -339,8 +339,8 @@ sub _init_menubar {
$self->_append_menu_item($helpMenu, L("Show &Configuration Folder"), L('Show user configuration folder (datadir)'), sub { $self->_append_menu_item($helpMenu, L("Show &Configuration Folder"), L('Show user configuration folder (datadir)'), sub {
Slic3r::GUI::desktop_open_datadir_folder(); Slic3r::GUI::desktop_open_datadir_folder();
}); });
$self->_append_menu_item($helpMenu, L("Report an Issue"), L('Report an issue on the Slic3r Prusa Edition'), sub { $self->_append_menu_item($helpMenu, L("Report an Issue"), L('Report an issue on the Slic3r++ github'), sub {
Wx::LaunchDefaultBrowser('http://github.com/prusa3d/slic3r/issues/new'); Wx::LaunchDefaultBrowser('http://github.com/supermerill/slic3r/issues/new');
}); });
$self->_append_menu_item($helpMenu, L("&About Slic3r"), L('Show about dialog'), sub { $self->_append_menu_item($helpMenu, L("&About Slic3r"), L('Show about dialog'), sub {
Slic3r::GUI::about; Slic3r::GUI::about;

2
lib/Slic3r/GUI/SystemInfo.pm
View File

@ -10,7 +10,7 @@ use base 'Wx::Dialog';
sub new { sub new {
my ($class, %params) = @_; my ($class, %params) = @_;
my $self = $class->SUPER::new($params{parent}, -1, 'Slic3r Prusa Edition - System Information', wxDefaultPosition, [600, 340], my $self = $class->SUPER::new($params{parent}, -1, 'Slic3r++ - System Information', wxDefaultPosition, [600, 340],
wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxRESIZE_BORDER); wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxRESIZE_BORDER);
$self->{text_info} = $params{text_info}; $self->{text_info} = $params{text_info};

2
xs/src/libslic3r/libslic3r.h
View File

@ -13,7 +13,7 @@
#include <vector> #include <vector>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#define SLIC3R_FORK_NAME "Slic3r Prusa Edition" #define SLIC3R_FORK_NAME "Slic3r++"
#define SLIC3R_VERSION "1.40.0" #define SLIC3R_VERSION "1.40.0"
#define SLIC3R_BUILD "UNKNOWN" #define SLIC3R_BUILD "UNKNOWN"

2
xs/src/slic3r/GUI/AboutDialog.cpp
View File

@ -53,7 +53,7 @@ AboutDialog::AboutDialog()
// title // title
{ {
wxStaticText* title = new wxStaticText(this, wxID_ANY, "Slic3r Prusa Edition", wxDefaultPosition, wxDefaultSize); wxStaticText* title = new wxStaticText(this, wxID_ANY, "Slic3r++", wxDefaultPosition, wxDefaultSize);
wxFont title_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); wxFont title_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
title_font.SetWeight(wxFONTWEIGHT_BOLD); title_font.SetWeight(wxFONTWEIGHT_BOLD);
title_font.SetFamily(wxFONTFAMILY_ROMAN); title_font.SetFamily(wxFONTFAMILY_ROMAN);

2
xs/src/slic3r/GUI/ConfigWizard.cpp
View File

@ -218,7 +218,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent) :
if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) { if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
wxString::Format(_(L("Run %s")), ConfigWizard::name()); wxString::Format(_(L("Run %s")), ConfigWizard::name());
append_text(wxString::Format( append_text(wxString::Format(
_(L("Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")), _(L("Hello, welcome to Slic3r++ (fork of Slic3r Prusa Edition)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
ConfigWizard::name()) ConfigWizard::name())
); );
} else { } else {