vitalif
/
Slic3r
mirror of https://github.com/vitalif/Slic3r
1
0
Fork 0
Code Issues Releases Wiki Activity

Reflect external configs in preset menus

degen-loop-screen
Alessandro Ranellucci 2012-06-19 14:47:02 +02:00
parent 35f36e0446
commit 0003c093e3
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/GUI/SkeinPanel.pm
View File

@ -21,11 +21,12 @@ sub new {
my ($parent) = @_;
my $self = $class->SUPER::new($parent, -1);
$self->{options_tabs} = {};
my $tabpanel = Wx::Notebook->new($self, -1, Wx::wxDefaultPosition, Wx::wxDefaultSize, &Wx::wxNB_TOP);
$tabpanel->AddPage(Slic3r::GUI::Plater->new($tabpanel), "Plater");
$tabpanel->AddPage(Slic3r::GUI::Tab::Print->new($tabpanel), "Print settings");
$tabpanel->AddPage(Slic3r::GUI::Tab::Filament->new($tabpanel), "Filament settings");
$tabpanel->AddPage(Slic3r::GUI::Tab::Printer->new($tabpanel), "Printer settings");
$tabpanel->AddPage($self->{options_tabs}{print} = Slic3r::GUI::Tab::Print->new($tabpanel), "Print settings");
$tabpanel->AddPage($self->{options_tabs}{filament} = Slic3r::GUI::Tab::Filament->new($tabpanel), "Filament settings");
$tabpanel->AddPage($self->{options_tabs}{printer} = Slic3r::GUI::Tab::Printer->new($tabpanel), "Printer settings");
my $buttons_sizer;
{
@ -36,7 +37,7 @@ sub new {
$buttons_sizer->Add($slice_button, 0, wxRIGHT, 20);
EVT_BUTTON($self, $slice_button, sub { $self->do_slice });
my $save_button = Wx::Button->new($self, -1, "Save config...");
my $save_button = Wx::Button->new($self, -1, "Export config...");
$buttons_sizer->Add($save_button, 0, wxRIGHT, 5);
EVT_BUTTON($self, $save_button, sub { $self->save_config });
@ -213,6 +214,7 @@ sub load_config {
};
Slic3r::GUI::catch_error($self);
$_->() for values %Slic3r::GUI::OptionsGroup::reload_callbacks;
$_->external_config_loaded($file) for values %{$self->{options_tabs}};
}
$dlg->Destroy;
}

34
lib/Slic3r/GUI/Tab.pm
View File

@ -3,6 +3,7 @@ use strict;
use warnings;
use utf8;
use File::Basename qw(basename);
use List::Util qw(first);
use Wx qw(:sizer :progressdialog);
use Wx::Event qw(EVT_TREE_SEL_CHANGED EVT_CHOICE EVT_BUTTON);
@ -80,7 +81,7 @@ sub new {
Slic3r::Config->load_hash($Slic3r::Defaults, $self->{presets_group}, 1);
$self->{btn_delete_preset}->Disable;
} else {
my $file = "$Slic3r::GUI::datadir/$self->{presets_group}/" . $self->{presets}[$i-1];
my $file = $self->{presets}[$i-1];
if (!-e $file) {
Slic3r::GUI::show_error($self, "The selected preset does not exist anymore ($file).");
return;
@ -94,20 +95,20 @@ sub new {
EVT_BUTTON($self, $self->{btn_save_preset}, sub {
my $i = $self->{presets_choice}->GetSelection;
my $default = $i == 0 ? 'Untitled' : $self->{presets}[$i-1];
my $default = $i == 0 ? 'Untitled' : basename($self->{presets}[$i-1]);
$default =~ s/\.ini$//i;
my $dlg = Slic3r::GUI::SavePresetWindow->new($self,
default => $default,
values => [ map { $_ =~ s/\.ini$//i; $_ } @{$self->{presets}} ],
values => [ map { my $filename = basename($_); $filename =~ /^(.*?)\.ini$/i; $1 } @{$self->{presets}} ],
);
return unless $dlg->ShowModal;
return unless $dlg->ShowModal == &Wx::wxID_OK;
my $file = sprintf "$Slic3r::GUI::datadir/$self->{presets_group}/%s.ini", $dlg->get_name;
Slic3r::Config->save($file, $self->{presets_group});
$self->set_dirty(0);
$self->load_presets;
$self->{presets_choice}->SetSelection(1 + first { $self->{presets}[$_] eq $dlg->get_name . ".ini" } 0 .. $#{$self->{presets}});
$self->{presets_choice}->SetSelection(1 + first { basename($self->{presets}[$_]) eq $dlg->get_name . ".ini" } 0 .. $#{$self->{presets}});
});
return $self;
@ -171,12 +172,30 @@ sub load_presets {
$self->{presets_choice}->Clear;
$self->{presets_choice}->Append("- default -");
foreach my $preset (@presets) {
push @{$self->{presets}}, $preset;
push @{$self->{presets}}, "$Slic3r::GUI::datadir/$self->{presets_group}/$preset";
$preset =~ s/\.ini$//i;
$self->{presets_choice}->Append($preset);
}
}
sub external_config_loaded {
my $self = shift;
my ($file) = @_;
# look for the loaded config among the existing menu items
my $i = first { $self->{presets}[$_] eq $file } 0..$#{$self->{presets}};
if (!$i) {
push @{$self->{presets}}, $file;
my $preset_name = basename($file); # leave the .ini suffix
$self->{presets_choice}->Append($preset_name);
$i = $#{$self->{presets}};
}
$self->{presets_choice}->SetSelection(1 + $i);
$self->set_dirty(0);
$self->{btn_save_preset}->Enable;
$self->{btn_delete_preset}->Disable;
}
package Slic3r::GUI::Tab::Print;
use Wx qw(:sizer :progressdialog);
use Wx::Event qw();
@ -430,13 +449,12 @@ sub new {
EVT_BUTTON($self, &Wx::wxID_OK, sub {
if (($self->{chosen_name} = $combo->GetValue) && $self->{chosen_name} =~ /^[a-z0-9 _-]+$/i) {
$self->EndModal(1);
$self->EndModal(&Wx::wxID_OK);
}
});
$self->SetSizer($sizer);
$sizer->SetSizeHints($self);
$self->SetReturnCode(0);
return $self;
}