diff --git a/README.md b/README.md index c9958a8d1..053a3aa36 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Slic3r is: * **Embeddable:** a complete and powerful command line interface allows Slic3r to be used from the shell or integrated with server-side applications. * **Powerful:** see the list below! -See the [project homepage](http://slic3r.org/) at slic3r.org for more information. +See the [project homepage](https://slic3r.org/) at slic3r.org for more information. ### Features @@ -44,7 +44,7 @@ The core parts of Slic3r are written in C++11, with multithreading. The graphica ### How to install? -You can download a precompiled package from [slic3r.org](http://slic3r.org/) (releases) or from [dl.slicr3r.org](http://dl.slic3r.org/dev/) (automated builds). +You can download a precompiled package from [slic3r.org](https://slic3r.org/) (releases) or from [dl.slicr3r.org](https://dl.slic3r.org/dev/) (automated builds). If you want to compile the source yourself follow the instructions on one of these wiki pages: * [Linux](https://github.com/slic3r/Slic3r/wiki/Running-Slic3r-from-git-on-GNU-Linux) diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index 0d07b9434..6001c4bb6 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -228,7 +228,7 @@ sub OnInit { if ($response =~ /^obsolete ?= ?([a-z0-9.-]+,)*\Q$Slic3r::VERSION\E(?:,|$)/) { my $res = Wx::MessageDialog->new(undef, "A new version is available. Do you want to open the Slic3r website now?", 'Update', wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_INFORMATION | wxICON_ERROR)->ShowModal; - Wx::LaunchDefaultBrowser('http://slic3r.org/') if $res == wxID_YES; + Wx::LaunchDefaultBrowser('https://slic3r.org/') if $res == wxID_YES; } else { Slic3r::GUI::show_info(undef, "You're using the latest version. No updates are available.") if $manual_check; } @@ -386,7 +386,7 @@ sub check_version { threads->create(sub { my $ua = LWP::UserAgent->new; $ua->timeout(10); - my $response = $ua->get('http://slic3r.org/updatecheck'); + my $response = $ua->get('https://slic3r.org/updatecheck'); Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $VERSION_CHECK_EVENT, threads::shared::shared_clone([ $response->is_success, $response->decoded_content, $manual_check ]))); diff --git a/lib/Slic3r/GUI/AboutDialog.pm b/lib/Slic3r/GUI/AboutDialog.pm index 928682a4e..75f73a0ae 100644 --- a/lib/Slic3r/GUI/AboutDialog.pm +++ b/lib/Slic3r/GUI/AboutDialog.pm @@ -50,8 +50,8 @@ sub new { '

' . '' . 'Copyright © 2011-2017 Alessandro Ranellucci.
' . - 'Slic3r is licensed under the ' . - 'GNU Affero General Public License, version 3.' . + 'Slic3r is licensed under the ' . + 'GNU Affero General Public License, version 3.' . '


' . 'Contributions by Henrik Brix Andersen, Vojtech Bubnik, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Kliment Yanev and numerous others. ' . 'Manual by Gary Hodgson. Inspired by the RepRap community.
' . diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index b214eef89..995b82182 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -41,7 +41,7 @@ sub new { # initialize status bar $self->{statusbar} = Slic3r::GUI::ProgressStatusBar->new($self, -1); - $self->{statusbar}->SetStatusText("Version $Slic3r::VERSION - Remember to check for updates at http://slic3r.org/"); + $self->{statusbar}->SetStatusText("Version $Slic3r::VERSION - Remember to check for updates at https://slic3r.org/"); $self->SetStatusBar($self->{statusbar}); $self->{loaded} = 1; @@ -308,7 +308,7 @@ sub _init_menubar { }); $helpMenu->AppendSeparator(); wxTheApp->append_menu_item($helpMenu, "Slic3r &Website", 'Open the Slic3r website in your browser', sub { - Wx::LaunchDefaultBrowser('http://slic3r.org/'); + Wx::LaunchDefaultBrowser('https://slic3r.org/'); }); my $versioncheck = wxTheApp->append_menu_item($helpMenu, "Check for &Updates...", 'Check for new Slic3r versions', sub { wxTheApp->check_version(1); diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm index 3b0bfea25..27c1bed4e 100644 --- a/lib/Slic3r/Print.pm +++ b/lib/Slic3r/Print.pm @@ -184,7 +184,7 @@ sub export_svg { EOF diff --git a/slic3r.pl b/slic3r.pl index d5c0770e1..16531fc40 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -312,7 +312,7 @@ EOF print <<"EOF"; Slic3r $Slic3r::VERSION is a STL-to-GCODE translator for RepRap 3D printers -written by Alessandro Ranellucci - http://slic3r.org/ +written by Alessandro Ranellucci - https://slic3r.org/ Usage: slic3r.pl [ OPTIONS ] [ file.stl ] [ file2.stl ] ... diff --git a/src/GUI/Dialogs/AboutDialog.cpp b/src/GUI/Dialogs/AboutDialog.cpp index 6cafde4ad..d68f38412 100644 --- a/src/GUI/Dialogs/AboutDialog.cpp +++ b/src/GUI/Dialogs/AboutDialog.cpp @@ -43,8 +43,8 @@ AboutDialog::AboutDialog(wxWindow* parent) : wxDialog(parent, -1, _("About Slic3 text << "" << "" << "Copyright © 2011-2017 Alessandro Ranellucci.
" - << "Slic3r is licensed under the " - << "GNU Affero General Public License, version 3." + << "Slic3r is licensed under the " + << "GNU Affero General Public License, version 3." << "


" << "Contributions by Henrik Brix Andersen, Vojtech Bubnik, Nicolas Dandrimont, Mark Hindess, " << "Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Kliment Yanev and numerous others. " diff --git a/src/GUI/GUI.cpp b/src/GUI/GUI.cpp index ac8b11aca..7cb5b922f 100644 --- a/src/GUI/GUI.cpp +++ b/src/GUI/GUI.cpp @@ -124,7 +124,7 @@ bool App::OnInit() if ($response =~ /^obsolete ?= ?([a-z0-9.-]+,)*\Q$Slic3r::VERSION\E(?:,|$)/) { my $res = Wx::MessageDialog->new(undef, "A new version is available. Do you want to open the Slic3r website now?", 'Update', wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_INFORMATION | wxICON_ERROR)->ShowModal; - Wx::LaunchDefaultBrowser('http://slic3r.org/') if $res == wxID_YES; + Wx::LaunchDefaultBrowser('https://slic3r.org/') if $res == wxID_YES; } else { Slic3r::GUI::show_info(undef, "You're using the latest version. No updates are available.") if $manual_check; } diff --git a/src/GUI/MainFrame.cpp b/src/GUI/MainFrame.cpp index 541a8dc14..0f2c20bd1 100644 --- a/src/GUI/MainFrame.cpp +++ b/src/GUI/MainFrame.cpp @@ -25,7 +25,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si // initialize status bar this->statusbar = new ProgressStatusBar(this, -1); - wxString welcome_text {_("Version SLIC3R_VERSION_REPLACE - Remember to check for updates at http://slic3r.org/")}; + wxString welcome_text {_("Version SLIC3R_VERSION_REPLACE - Remember to check for updates at https://slic3r.org/")}; welcome_text.Replace("SLIC3R_VERSION_REPLACE", wxString(SLIC3R_VERSION)); this->statusbar->SetStatusText(welcome_text); this->SetStatusBar(this->statusbar); diff --git a/xs/src/libslic3r/SLAPrint.cpp b/xs/src/libslic3r/SLAPrint.cpp index 0b5e5c528..e5f837d1a 100644 --- a/xs/src/libslic3r/SLAPrint.cpp +++ b/xs/src/libslic3r/SLAPrint.cpp @@ -228,7 +228,7 @@ SLAPrint::write_svg(const std::string &outputfile) const "\n" "\n" "\n" - "\n" + "\n" , size.x, size.y, SLIC3R_VERSION); for (size_t i = 0; i < this->layers.size(); ++i) {