GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 05:52:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed regression causing no_controller not to hide the USB/Serial configuration options in Printer config. Fixes #3819

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-30 08:15:26 +02:00
parent 5e1f3e883d
commit 35fc1decfa
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/GUI.pm
View File

@ -148,10 +148,7 @@ sub OnInit {
# application frame
Wx::Image::AddHandler(Wx::PNGHandler->new);
$self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new(
# If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
no_controller => $no_controller // $Settings->{_}{no_controller},
);
$self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new;
$self->SetTopWindow($frame);
# load init bundle

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

@ -18,7 +18,7 @@ our $qs_last_output_file;
our $last_config;
sub new {
my ($class, %params) = @_;
my ($class) = @_;
my $self = $class->SUPER::new(undef, -1, 'Slic3r', wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
if ($^O eq 'MSWin32') {
@ -27,9 +27,6 @@ sub new {
$self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG));
}
# store input params
# If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
$self->{no_controller} = $params{no_controller};
$self->{loaded} = 0;
# initialize tabpanel and menubar

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

@ -1184,7 +1184,6 @@ sub overridable_options {
sub build {
my $self = shift;
my (%params) = @_;
$self->{extruders_count} = 1;
@ -1231,8 +1230,7 @@ sub build {
}
});
}
if (!$params{no_controller})
{
unless ($Slic3r::GUI::Settings->{_}{no_controller}) {
my $optgroup = $page->new_optgroup('USB/Serial connection');
my $line = Slic3r::GUI::OptionsGroup::Line->new(
label => 'Serial port',