diff --git a/lib/Slic3r/GUI/Dashboard.pm b/lib/Slic3r/GUI/Dashboard.pm index 670d156e8..663e95743 100644 --- a/lib/Slic3r/GUI/Dashboard.pm +++ b/lib/Slic3r/GUI/Dashboard.pm @@ -40,20 +40,33 @@ sub new { EVT_LIST_ITEM_SELECTED($self, $self->{list}, \&list_item_selected); EVT_LIST_ITEM_DESELECTED($self, $self->{list}, \&list_item_deselected); - $self->{btn_load} = Wx::Button->new($self, -1, "Add…"); - $self->{btn_remove} = Wx::Button->new($self, -1, "Delete"); - $self->{btn_increase} = Wx::Button->new($self, -1, "+1 copy"); - $self->{btn_decrease} = Wx::Button->new($self, -1, "-1 copy"); - $self->{btn_rotate45cw} = Wx::Button->new($self, -1, "Rotate by 45° (cw)"); - $self->{btn_rotate45ccw} = Wx::Button->new($self, -1, "Rotate by 45° (ccw)"); - $self->{btn_rotate} = Wx::Button->new($self, -1, "Rotate…"); - $self->{btn_reset} = Wx::Button->new($self, -1, "Delete All"); - $self->{btn_arrange} = Wx::Button->new($self, -1, "Autoarrange"); - $self->{btn_changescale} = Wx::Button->new($self, -1, "Change Scale…"); - $self->{btn_split} = Wx::Button->new($self, -1, "Split"); - $self->{btn_export_gcode} = Wx::Button->new($self, -1, "Export G-code…"); + $self->{btn_load} = Wx::Button->new($self, -1, "Add…", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_remove} = Wx::Button->new($self, -1, "Delete", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_increase} = Wx::Button->new($self, -1, "+1 copy", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_decrease} = Wx::Button->new($self, -1, "-1 copy", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_rotate45cw} = Wx::Button->new($self, -1, "Rotate (45° cw)", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_rotate45ccw} = Wx::Button->new($self, -1, "Rotate (45° ccw)", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_rotate} = Wx::Button->new($self, -1, "Rotate…", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_reset} = Wx::Button->new($self, -1, "Delete All", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_arrange} = Wx::Button->new($self, -1, "Autoarrange", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_changescale} = Wx::Button->new($self, -1, "Change Scale…", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_split} = Wx::Button->new($self, -1, "Split", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); + $self->{btn_export_gcode} = Wx::Button->new($self, -1, "Export G-code…", [-1,-1], [-1,-1], &Wx::wxBU_LEFT); $self->{btn_export_gcode}->SetDefault; $self->{btn_export_stl} = Wx::Button->new($self, -1, "Export STL…"); + $self->{btn_load}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/brick_add.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_remove}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/brick_delete.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_increase}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/add.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_decrease}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/delete.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_rotate45cw}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/arrow_rotate_clockwise.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_rotate45ccw}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/arrow_rotate_anticlockwise.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_rotate}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/arrow_rotate_clockwise.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_reset}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/cross.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_arrange}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/bricks.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_changescale}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/arrow_out.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_split}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/shape_ungroup.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_export_gcode}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/layers.png", &Wx::wxBITMAP_TYPE_PNG)); + $self->{btn_export_stl}->SetBitmap(Wx::Bitmap->new("$FindBin::Bin/var/brick_go.png", &Wx::wxBITMAP_TYPE_PNG)); $self->selection_changed(0); $self->object_list_changed; EVT_BUTTON($self, $self->{btn_load}, \&load); @@ -91,7 +104,7 @@ sub new { { my @col1 = qw(load remove reset arrange export_gcode export_stl); my @col2 = qw(increase decrease rotate45cw rotate45ccw rotate changescale split); - my $buttons = Wx::GridBagSizer->new(10, 10); + my $buttons = Wx::GridBagSizer->new(5, 5); $buttons->Add($self->{"btn_$col1[$_]"}, Wx::GBPosition->new($_, 0), Wx::GBSpan->new(1, 1), wxEXPAND | wxALL) for 0..$#col1; $buttons->Add($self->{"btn_$col2[$_]"}, Wx::GBPosition->new($_, 1), Wx::GBSpan->new(1, 1), wxEXPAND | wxALL) diff --git a/var/add.png b/var/add.png new file mode 100755 index 000000000..6332fefea Binary files /dev/null and b/var/add.png differ diff --git a/var/arrow_out.png b/var/arrow_out.png new file mode 100755 index 000000000..2e9bc42be Binary files /dev/null and b/var/arrow_out.png differ diff --git a/var/arrow_rotate_anticlockwise.png b/var/arrow_rotate_anticlockwise.png new file mode 100755 index 000000000..46c75aa85 Binary files /dev/null and b/var/arrow_rotate_anticlockwise.png differ diff --git a/var/arrow_rotate_clockwise.png b/var/arrow_rotate_clockwise.png new file mode 100755 index 000000000..aa65210eb Binary files /dev/null and b/var/arrow_rotate_clockwise.png differ diff --git a/var/brick_add.png b/var/brick_add.png new file mode 100755 index 000000000..fac186bfb Binary files /dev/null and b/var/brick_add.png differ diff --git a/var/brick_delete.png b/var/brick_delete.png new file mode 100755 index 000000000..3a8c37348 Binary files /dev/null and b/var/brick_delete.png differ diff --git a/var/brick_go.png b/var/brick_go.png new file mode 100755 index 000000000..fe0d33567 Binary files /dev/null and b/var/brick_go.png differ diff --git a/var/bricks.png b/var/bricks.png new file mode 100755 index 000000000..0905f933b Binary files /dev/null and b/var/bricks.png differ diff --git a/var/cross.png b/var/cross.png new file mode 100755 index 000000000..1514d51a3 Binary files /dev/null and b/var/cross.png differ diff --git a/var/delete.png b/var/delete.png new file mode 100755 index 000000000..08f249365 Binary files /dev/null and b/var/delete.png differ diff --git a/var/layers.png b/var/layers.png new file mode 100755 index 000000000..00818f636 Binary files /dev/null and b/var/layers.png differ diff --git a/var/shape_ungroup.png b/var/shape_ungroup.png new file mode 100755 index 000000000..3a6f369a5 Binary files /dev/null and b/var/shape_ungroup.png differ