Skip to content

Commit

Permalink
Extended GUI (slic3r#4419)
Browse files Browse the repository at this point in the history 
* Extended GUI - 2nd try.

* Update Preferences.pm

missing comma
  • Loading branch information
@foreachthing @lordofhyphens
foreachthing authored and lordofhyphens committed Oct 14, 2018
1 parent 4b0caf1 commit fd8a330
Show file tree
Hide file tree
Showing 35 changed files with 317 additions and 69 deletions.
1 change: 1 addition & 0 deletions lib/Slic3r/GUI.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ our $Settings = {
tabbed_preset_editors => 1,
show_host => 0,
nudge_val => 1,
extended_gui => 0,
reload_hide_dialog => 0,
reload_behavior => 0
},
Expand Down
70 changes: 69 additions & 1 deletion lib/Slic3r/GUI/ColorScheme.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use POSIX;
use vars qw(@ISA @EXPORT);
use Exporter 'import';
our @ISA = 'Exporter';
our @EXPORT = qw($DEFAULT_COLORSCHEME $SOLID_BACKGROUNDCOLOR @SELECTED_COLOR @HOVER_COLOR @TOP_COLOR @BOTTOM_COLOR @GRID_COLOR @GROUND_COLOR @COLOR_CUTPLANE @COLOR_PARTS @COLOR_INFILL @COLOR_SUPPORT @COLOR_UNKNOWN @BED_COLOR @BED_GRID @BED_SELECTED @BED_OBJECTS @BED_INSTANCE @BED_DRAGGED @BED_CENTER @BED_SKIRT @BED_CLEARANCE @BED_DARK @BACKGROUND255 @TOOL_DARK @TOOL_SUPPORT @TOOL_STEPPERIM @TOOL_INFILL @TOOL_SHADE @TOOL_COLOR @BACKGROUND_COLOR @SPLINE_L_PEN @SPLINE_O_PEN @SPLINE_I_PEN @SPLINE_R_PEN );
our @EXPORT = qw($DEFAULT_COLORSCHEME $SOLID_BACKGROUNDCOLOR @SELECTED_COLOR @HOVER_COLOR @TOP_COLOR @BOTTOM_COLOR @GRID_COLOR @GROUND_COLOR @COLOR_CUTPLANE @COLOR_PARTS @COLOR_INFILL @COLOR_SUPPORT @COLOR_UNKNOWN @BED_COLOR @BED_GRID @BED_SELECTED @BED_OBJECTS @BED_INSTANCE @BED_DRAGGED @BED_CENTER @BED_SKIRT @BED_CLEARANCE @BED_DARK @BACKGROUND255 @TOOL_DARK @TOOL_SUPPORT @TOOL_STEPPERIM @TOOL_INFILL @TOOL_SHADE @TOOL_COLOR @BACKGROUND_COLOR @SPLINE_L_PEN @SPLINE_O_PEN @SPLINE_I_PEN @SPLINE_R_PEN @rotateX90cw @rotateX90ccw @rotateX180 @rotateY90cw @rotateY90ccw @rotateY180 @rotateZ90cw @rotateZ90ccw @rotateZ180 @rotate45cw @rotate45ccw @rotateX90cwT @rotateX90ccwT @rotateY90cwT @rotateY90ccwT @rotateZ90cwT @rotateZ90ccwT @rotateZ45cwT @rotateZ45ccwT @mirrorX @mirrorY @mirrorZ );

# DEFAULT values
our $DEFAULT_COLORSCHEME = 1;
Expand Down Expand Up @@ -45,6 +45,34 @@ our @SPLINE_I_PEN = (255, 0, 0);
our @SPLINE_R_PEN = (5, 120, 160);
our @BED_DARK = (0, 0, 0);

# ICONS for the Context Menu
our @rotateX90cw = "arrow_rotate_x_clockwise.png";
our @rotateX90ccw = "arrow_rotate_x_anticlockwise.png";
our @rotateX180 = "arrow_rotate_x_clockwise.png";
our @rotateY90cw = "arrow_rotate_y_clockwise.png";
our @rotateY90ccw = "arrow_rotate_y_anticlockwise.png";
our @rotateY180 = "arrow_rotate_y_clockwise.png";
our @rotateZ90cw = "arrow_rotate_z_clockwise.png";
our @rotateZ90ccw = "arrow_rotate_z_anticlockwise.png";
our @rotateZ180 = "arrow_rotate_z_clockwise.png";
our @rotate45cw = "arrow_rotate_z_clockwise.png";
our @rotate45ccw = "arrow_rotate_z_anticlockwise.png";
our @mirrorX = 'shape_flip_horizontal_x.png';
our @mirrorY = 'shape_flip_horizontal_y.png';
our @mirrorZ = 'shape_flip_horizontal_z.png';

# ICONS for the Toolbar (might be different)
our @rotateX90cwT = "arrow_rotate_x_clockwise.png";
our @rotateX90ccwT = "arrow_rotate_x_anticlockwise.png";
our @rotateY90cwT = "arrow_rotate_y_clockwise.png";
our @rotateY90ccwT = "arrow_rotate_y_anticlockwise.png";
our @rotateZ90cwT = "arrow_rotate_z_clockwise.png";
our @rotateZ90ccwT = "arrow_rotate_z_anticlockwise.png";
our @rotateZ45cwT = "arrow_rotate_z_clockwise.png";
our @rotateZ45ccwT = "arrow_rotate_z_anticlockwise.png";



# S O L A R I Z E
# # http://ethanschoonover.com/solarized
our @COLOR_BASE03 = (0.00000,0.16863,0.21176);
Expand Down Expand Up @@ -72,6 +100,12 @@ our @COLOR_GREEN = (0.52157,0.60000,0.00000);
sub getSolarized { # add this name to Preferences.pm
$DEFAULT_COLORSCHEME = 0; # DISABLE default color scheme
$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){
$largeicons = 1;
}

@SELECTED_COLOR = @COLOR_MAGENTA; # Color of selected Model
@HOVER_COLOR = @COLOR_VIOLET; # Color when hovering over Model
# @TOP_COLOR = @COLOR_BASE2; # FADE Background color - only used if $SOLID_BACKGROUNDCOLOR = 0
Expand Down Expand Up @@ -112,6 +146,40 @@ sub getSolarized { # add this name to Preferences.pm
@SPLINE_I_PEN = map { ceil($_ * 255) } @COLOR_MAGENTA; # Interactive color
@SPLINE_R_PEN = map { ceil($_ * 255) } @COLOR_VIOLET; # Resulting color

if ($largeicons == 1){ # use large icons
# ICONS for the Toolbar (might be different)
our @rotateX90cwT = 'solarized/arrow_rotate_x_clockwise90.png';
our @rotateX90ccwT = 'solarized/arrow_rotate_x_anticlockwise90.png';
our @rotateY90cwT = 'solarized/arrow_rotate_y_clockwise90.png';
our @rotateY90ccwT = 'solarized/arrow_rotate_y_anticlockwise90.png';
our @rotateZ90cwT = 'solarized/arrow_rotate_z_clockwise90.png';
our @rotateZ90ccwT = 'solarized/arrow_rotate_z_anticlockwise90.png';
our @rotateZ45cwT = 'solarized/arrow_rotate_z_clockwise45.png';
our @rotateZ45ccwT = 'solarized/arrow_rotate_z_anticlockwise45.png';
} else {
# use default or small icons
our @rotateX90cwT = 'solarized/arrow_rotate_x_clockwise90_16.png';
our @rotateX90ccwT = 'solarized/arrow_rotate_x_anticlockwise90_16.png';
our @rotateY90cwT = 'solarized/arrow_rotate_y_clockwise90_16.png';
our @rotateY90ccwT = 'solarized/arrow_rotate_y_anticlockwise90_16.png';
our @rotateZ90cwT = 'solarized/arrow_rotate_z_clockwise90_16.png';
our @rotateZ90ccwT = 'solarized/arrow_rotate_z_anticlockwise90_16.png';
our @rotateZ45cwT = 'solarized/arrow_rotate_z_clockwise45_16.png';
our @rotateZ45ccwT = 'solarized/arrow_rotate_z_anticlockwise45_16.png';
}

our @rotateX90cw = 'solarized/arrow_rotate_x_clockwise90_16.png';
our @rotateX90ccw = 'solarized/arrow_rotate_x_anticlockwise90_16.png';
our @rotateX180 = 'solarized/arrow_rotate_x_180_16.png';
our @rotateY90cw = 'solarized/arrow_rotate_y_clockwise90_16.png';
our @rotateY90ccw = 'solarized/arrow_rotate_y_anticlockwise90_16.png';
our @rotateY180 = 'solarized/arrow_rotate_y_180_16.png';
our @rotateZ90cw = 'solarized/arrow_rotate_z_clockwise90_16.png';
our @rotateZ90ccw = 'solarized/arrow_rotate_z_anticlockwise90_16.png';
our @rotateZ180 = 'solarized/arrow_rotate_z_180_16.png';
our @rotate45cw = 'solarized/arrow_rotate_z_clockwise45_16.png';
our @rotate45ccw = 'solarized/arrow_rotate_z_anticlockwise45_16.png';

}

sub getDefault{
Expand Down
Loading

0 comments on commit fd8a330

Please sign in to comment.