Skip to content

Commit

Permalink
Rename "Extended GUI" to "Rotation controls" and simplify it
Browse files Browse the repository at this point in the history
  • Loading branch information
@alranel @lordofhyphens
alranel authored and lordofhyphens committed Nov 25, 2018
1 parent 1802193 commit 40df92a
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 135 deletions.
2 changes: 1 addition & 1 deletion lib/Slic3r/GUI.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ our $Settings = {
tabbed_preset_editors => 1,
show_host => 1,
nudge_val => 1,
extended_gui => 0,
rotation_controls => 'z',
reload_hide_dialog => 0,
reload_behavior => 0
},
Expand Down
2 changes: 1 addition & 1 deletion lib/Slic3r/GUI/ColorScheme.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ sub getSolarized { # add this name to Preferences.pm
$SOLID_BACKGROUNDCOLOR = 1; # Switch between SOLID or FADED background color
my $largeicons = 0; # Default: 0. 1 for large icons-set.

if ($Slic3r::GUI::Settings->{_}{extended_gui} >= 4){
if ($Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz-big'){
$largeicons = 1;
}

Expand Down
175 changes: 49 additions & 126 deletions lib/Slic3r/GUI/Plater.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,12 @@ sub new {
$self->{htoolbar}->AddTool(TB_FEWER, "Fewer", Wx::Bitmap->new($Slic3r::var->("delete.png"), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddSeparator;

if ($Slic3r::GUI::Settings->{_}{extended_gui} >= 2) { # if Toolbar enabled
if ($Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz' || $Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz-big') {
$self->{htoolbar}->AddTool(TB_X90CCW, "90° X ccw", Wx::Bitmap->new($Slic3r::var->(@rotateX90ccwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_X90CW, "90° X cw", Wx::Bitmap->new($Slic3r::var->(@rotateX90cwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_Y90CCW, "90° Y ccw", Wx::Bitmap->new($Slic3r::var->(@rotateY90ccwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_Y90CW, "90° Y cw", Wx::Bitmap->new($Slic3r::var->(@rotateY90cwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_Z90CCW, "90° Z ccw", Wx::Bitmap->new($Slic3r::var->(@rotateZ90ccwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_Z90CW, "90° Z cw", Wx::Bitmap->new($Slic3r::var->(@rotateZ90cwT), wxBITMAP_TYPE_PNG), '');
}
}

$self->{htoolbar}->AddTool(TB_45CCW, "45° ccw", Wx::Bitmap->new($Slic3r::var->(@rotateZ45ccwT), wxBITMAP_TYPE_PNG), '');
$self->{htoolbar}->AddTool(TB_45CW, "45° cw", Wx::Bitmap->new($Slic3r::var->(@rotateZ45cwT), wxBITMAP_TYPE_PNG), '');
Expand Down Expand Up @@ -265,21 +263,16 @@ sub new {
settings => "Settings, Parts, Modifiers and Layers",
);
$self->{btoolbar} = Wx::BoxSizer->new(wxHORIZONTAL);


if ($Slic3r::GUI::Settings->{_}{extended_gui} >= 2) { # if Toolbar enabled
for (qw(add remove reset arrange increase decrease rotateX90ccw rotateX90cw rotateY90ccw rotateY90cw rotateZ90ccw rotateZ90cw rotateZ45ccw rotateZ45cw changescale split cut settings)) {
$self->{"btn_$_"} = Wx::Button->new($self, -1, $tbar_buttons{$_}, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
$self->{btoolbar}->Add($self->{"btn_$_"});
$self->{"btn_$_"}->SetToolTipString($tbar_buttonsToolTip{$_});
}
} else {
for (qw(add remove reset arrange increase decrease rotateZ45ccw rotateZ45cw rotateFace changescale split cut settings)) {
$self->{"btn_$_"} = Wx::Button->new($self, -1, $tbar_buttons{$_}, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
$self->{btoolbar}->Add($self->{"btn_$_"});
$self->{"btn_$_"}->SetToolTipString($tbar_buttonsToolTip{$_});
}


my @buttons = qw(add remove reset arrange increase decrease);
if ($Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz' || $Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz-big') {
push @buttons, qw(rotateX90ccw rotateX90cw rotateY90ccw rotateY90cw rotateZ45ccw rotateZ45cw);
}
push @buttons, qw(changescale split cut settings);
for (@buttons) {
$self->{"btn_$_"} = Wx::Button->new($self, -1, $tbar_buttons{$_}, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
$self->{btoolbar}->Add($self->{"btn_$_"});
$self->{"btn_$_"}->SetToolTipString($tbar_buttonsToolTip{$_});
}
}

Expand Down Expand Up @@ -354,7 +347,7 @@ sub new {
EVT_TOOL($self, TB_ARRANGE, sub { $self->arrange; });
EVT_TOOL($self, TB_MORE, sub { $self->increase; });
EVT_TOOL($self, TB_FEWER, sub { $self->decrease; });
if ($Slic3r::GUI::Settings->{_}{extended_gui} >= 2) { # if Toolbar enabled
if ($Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz' || $Slic3r::GUI::Settings->{_}{rotation_controls} eq 'xyz-big') {
EVT_TOOL($self, TB_X90CW, sub { $_[0]->rotate(-90, X) });
EVT_TOOL($self, TB_X90CCW, sub { $_[0]->rotate(90, X) });
EVT_TOOL($self, TB_Y90CW, sub { $_[0]->rotate(-90, Y) });
Expand Down Expand Up @@ -3180,117 +3173,47 @@ sub object_menu {
$self->center_selected_object_on_bed;
}, undef, 'arrow_in.png');
}
if ($Slic3r::GUI::Settings->{_}{extended_gui} == 1 or $Slic3r::GUI::Settings->{_}{extended_gui} == 3 or $Slic3r::GUI::Settings->{_}{extended_gui} == 5){ # if context enabled
$menu->AppendSeparator();
if ($Slic3r::GUI::Settings->{_}{extended_gui} == 1) {
wxTheApp->append_menu_item($menu, "Rotate 90° clockwise (X)", 'Rotate the selected object by 90° clockwise', sub {
$self->rotate(-90, X);
}, undef, @rotateX90cw);
wxTheApp->append_menu_item($menu, "Rotate 90° counter clockwise (X)", 'Rotate the selected object by 90° counter clockwise', sub {
$self->rotate(90, X);
}, undef, @rotateX90ccw);
wxTheApp->append_menu_item($menu, "Rotate 180° (X)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, X);
}, undef, @rotateX180);
} elsif ($Slic3r::GUI::Settings->{_}{extended_gui} > 1) {
wxTheApp->append_menu_item($menu, "Rotate 180° (X)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, X);
}, undef, @rotateX180);
wxTheApp->append_menu_item($menu, "Rotate around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub {
$self->rotate(undef, X);
}, undef, @rotateX90ccw);
wxTheApp->append_menu_item($menu, "Mirror along X axis", 'Mirror the selected object along the X axis', sub {
$self->mirror(X);
}, undef, @mirrorX);
}
$menu->AppendSeparator();
if ($Slic3r::GUI::Settings->{_}{extended_gui} == 1) {
wxTheApp->append_menu_item($menu, "Rotate 90° clockwise (Y)", 'Rotate the selected object by 90° clockwise', sub {
$self->rotate(-90, Y);
}, undef, @rotateY90cw);
wxTheApp->append_menu_item($menu, "Rotate 90° counter clockwise (Y)", 'Rotate the selected object by 90° counter clockwise', sub {
$self->rotate(90, Y);
}, undef, @rotateY90ccw);
wxTheApp->append_menu_item($menu, "Rotate 180° (Y)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, Y);
}, undef, @rotateY180);
} elsif ($Slic3r::GUI::Settings->{_}{extended_gui} > 1) {
wxTheApp->append_menu_item($menu, "Rotate 180° (Y)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, Y);
}, undef, @rotateY180);
wxTheApp->append_menu_item($menu, "Rotate around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub {
$self->rotate(undef, Y);
}, undef, @rotateY90ccw);
wxTheApp->append_menu_item($menu, "Mirror along Y axis", 'Mirror the selected object along the Y axis', sub {
$self->mirror(Y);
}, undef, @mirrorY);
}
$menu->AppendSeparator();
if ($Slic3r::GUI::Settings->{_}{extended_gui} == 1) {
wxTheApp->append_menu_item($menu, "Rotate 90° clockwise (Z)", 'Rotate the selected object by 90° clockwise', sub {
$self->rotate(-90, Z);
}, undef, @rotateZ90cw);
wxTheApp->append_menu_item($menu, "Rotate 90° counter clockwise (Z)", 'Rotate the selected object by 90° counter clockwise', sub {
$self->rotate(90, Z);
}, undef, @rotateZ90ccw);
wxTheApp->append_menu_item($menu, "Rotate 180° (Z)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, Z);
}, undef, @rotateZ180);
} elsif ($Slic3r::GUI::Settings->{_}{extended_gui} > 1) {
wxTheApp->append_menu_item($menu, "Rotate 180° (Z)", 'Rotate the selected object by 180°', sub {
$self->rotate(180, Z);
}, undef, @rotateZ180);
wxTheApp->append_menu_item($menu, "Rotate around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub {
$self->rotate(undef, Z);
}, undef, @rotateZ90ccw);
wxTheApp->append_menu_item($menu, "Mirror along Z axis", 'Mirror the selected object along the Z axis', sub {
$self->mirror(Z);
}, undef, @mirrorZ);
}
} else {
wxTheApp->append_menu_item($menu, "Rotate 45° clockwise (Z))", 'Rotate the selected object by 45° clockwise', sub {
$self->rotate(-45, Z);
}, undef, @rotateZ90cw);
wxTheApp->append_menu_item($menu, "Rotate 45° counter clockwise (Z))", 'Rotate the selected object by 45° counter clockwise', sub {
$self->rotate(+45, Z);
}, undef, @rotateZ90ccw);

}
wxTheApp->append_menu_item($menu, "Rotate Face to Plane", 'Rotates the selected object to have the selected face parallel with a plane', sub {
$self->rotate_face;
}, undef, 'rotate_face.png');
$menu->AppendSeparator();

# Extended GUI:
# only at option 0,2,4
if ($Slic3r::GUI::Settings->{_}{extended_gui} == 0 or $Slic3r::GUI::Settings->{_}{extended_gui} == 2 or $Slic3r::GUI::Settings->{_}{extended_gui} == 4){
{
my $rotateMenu = Wx::Menu->new;
wxTheApp->append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub {
$self->rotate(undef, X);
}, undef, @rotateX90ccw);
wxTheApp->append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub {
$self->rotate(undef, Y);
}, undef, @rotateY90ccw);
wxTheApp->append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub {
$self->rotate(undef, Z);
}, undef, @rotateZ90ccw);
wxTheApp->append_submenu($menu, "Rotate", 'Rotate the selected object by an arbitrary angle', $rotateMenu, undef, 'textfield.png');
}

{
my $mirrorMenu = Wx::Menu->new;
wxTheApp->append_menu_item($mirrorMenu, "Along X axis", 'Mirror the selected object along the X axis', sub {
$self->mirror(X);
}, undef, @mirrorX);
wxTheApp->append_menu_item($mirrorMenu, "Along Y axis", 'Mirror the selected object along the Y axis', sub {
$self->mirror(Y);
}, undef, @mirrorY);
wxTheApp->append_menu_item($mirrorMenu, "Along Z axis", 'Mirror the selected object along the Z axis', sub {
$self->mirror(Z);
}, undef, @mirrorZ);
wxTheApp->append_submenu($menu, "Mirror", 'Mirror the selected object', $mirrorMenu, undef, 'shape_flip_horizontal.png');
}
{
my $rotateMenu = Wx::Menu->new;
wxTheApp->append_menu_item($rotateMenu, "180° around X axis", 'Rotate the selected object by 180° around X axis', sub {
$self->rotate(180, X);
}, undef, @rotateX90ccw);
wxTheApp->append_menu_item($rotateMenu, "180° around Y axis", 'Rotate the selected object by 180° around Y axis', sub {
$self->rotate(180, Y);
}, undef, @rotateY90ccw);
wxTheApp->append_menu_item($rotateMenu, "180° around Z axis", 'Rotate the selected object by 180° around Z axis', sub {
$self->rotate(180, Z);
}, undef, @rotateZ90ccw);
$rotateMenu->AppendSeparator();
wxTheApp->append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub {
$self->rotate(undef, X);
}, undef, @rotateX90ccw);
wxTheApp->append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub {
$self->rotate(undef, Y);
}, undef, @rotateY90ccw);
wxTheApp->append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub {
$self->rotate(undef, Z);
}, undef, @rotateZ90ccw);
wxTheApp->append_submenu($menu, "Rotate", 'Rotate the selected object', $rotateMenu, undef, 'arrow_rotate_anticlockwise.png');
}

{
my $mirrorMenu = Wx::Menu->new;
wxTheApp->append_menu_item($mirrorMenu, "Along X axis", 'Mirror the selected object along the X axis', sub {
$self->mirror(X);
}, undef, @mirrorX);
wxTheApp->append_menu_item($mirrorMenu, "Along Y axis", 'Mirror the selected object along the Y axis', sub {
$self->mirror(Y);
}, undef, @mirrorY);
wxTheApp->append_menu_item($mirrorMenu, "Along Z axis", 'Mirror the selected object along the Z axis', sub {
$self->mirror(Z);
}, undef, @mirrorZ);
wxTheApp->append_submenu($menu, "Mirror", 'Mirror the selected object', $mirrorMenu, undef, 'shape_flip_horizontal.png');
}

{
Expand Down
14 changes: 7 additions & 7 deletions lib/Slic3r/GUI/Preferences.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ sub new {
width => 180,
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # Extended GUI - Context and/or Toolbar
opt_id => 'extended_gui',
opt_id => 'rotation_controls',
type => 'select',
label => 'Extended GUI: ',
tooltip => 'Choose extended rotate commands in the toolbar and/or in the context menu. If you don\'t use the default color scheme, the themed icons for the toolbar will be used.(Restart of Slic3r required.)',
labels => ['Default', 'Context only', 'Toolbar only', 'Toolbar and Context', 'Toolbar only (big)', 'Toolbar (big) and Context'],
values => [0, 1, 2, 3, 4, 5],
default => $Slic3r::GUI::Settings->{_}{extended_gui},
label => 'Rotation controls in toolbar',
tooltip => 'What rotation controls to show in the toolbar. (Restart of Slic3r required.)',
labels => ['Z only', 'X,Y,Z', 'X,Y,Z (big buttons)'],
values => ['z', 'xyz', 'xyz-big'],
default => $Slic3r::GUI::Settings->{_}{rotation_controls},
width => 180,
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # colorscheme
Expand Down Expand Up @@ -147,7 +147,7 @@ sub new {
sub _accept {
my $self = shift;

if (any { exists $self->{values}{$_} } qw(show_host extended_gui colorscheme)) {
if (any { exists $self->{values}{$_} } qw(show_host rotation_controls colorscheme)) {
Slic3r::GUI::warning_catcher($self)->("You need to restart Slic3r to make the changes effective.");
}

Expand Down

0 comments on commit 40df92a

Please sign in to comment.