Skip to content

Custom icon adjustment in Drawing Tool #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Photon89 merged 7 commits into from
Jan 4, 2026
Merged

Custom icon adjustment in Drawing Tool #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb556ed
Work on custom icon adjustment in Drawing Tool started
Photon89 Jan 4, 2026
b46b16d
Added GUI setting for choosing between dark and light icons for the D…
Photon89 Jan 4, 2026
e411071
Implement automatic choice of custom icons in the Drawing Tool
Photon89 Jan 4, 2026
23befec
Convert duplicate icons to symlinks
Photon89 Jan 4, 2026
a698ac7
Pass only one icon choice relate argument instead of three to drawing…
Photon89 Jan 4, 2026
2bedbbe
small refactor of light/dark icons
DarthGandalf Jan 4, 2026
482ee0a
simplify symlinks
DarthGandalf Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 103 additions & 27 deletions bin/shutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ my $delay_status;
my $delay_vlabel;
my $delay;
my $delete_on_close_active;
my $drawing_tool_auto_icons_active;
my $drawing_tool_dark_icons_active;
my $drawing_tool_light_icons_active;
my $filename;
my $fname_autocopy_active;
my $fs_active;
Expand Down Expand Up @@ -811,19 +814,23 @@ sub STARTUP {
my $file_vbox = Gtk3::VBox->new(FALSE, 0);
my $save_vbox = Gtk3::VBox->new(FALSE, 0);
my $capture_vbox = Gtk3::VBox->new(FALSE, 0);

my $scale_box = Gtk3::HBox->new(FALSE, 0);
my $filetype_box = Gtk3::HBox->new(FALSE, 0);
my $filename_box = Gtk3::HBox->new(FALSE, 0);
my $saveDir_box = Gtk3::HBox->new(FALSE, 0);
my $save_ask_box = Gtk3::HBox->new(FALSE, 0);
my $save_no_box = Gtk3::HBox->new(FALSE, 0);
my $save_auto_box = Gtk3::HBox->new(FALSE, 0);
my $no_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $image_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $fname_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $delay_box = Gtk3::HBox->new(FALSE, 0);
my $cursor_box = Gtk3::HBox->new(FALSE, 0);
my $drawing_tool_icons_vbox = Gtk3::VBox->new(FALSE, 0);

my $scale_box = Gtk3::HBox->new(FALSE, 0);
my $filetype_box = Gtk3::HBox->new(FALSE, 0);
my $filename_box = Gtk3::HBox->new(FALSE, 0);
my $saveDir_box = Gtk3::HBox->new(FALSE, 0);
my $save_ask_box = Gtk3::HBox->new(FALSE, 0);
my $save_no_box = Gtk3::HBox->new(FALSE, 0);
my $save_auto_box = Gtk3::HBox->new(FALSE, 0);
my $no_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $image_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $fname_autocopy_box = Gtk3::HBox->new(FALSE, 0);
my $delay_box = Gtk3::HBox->new(FALSE, 0);
my $cursor_box = Gtk3::HBox->new(FALSE, 0);
my $drawing_tool_light_icons_box = Gtk3::HBox->new(FALSE, 0);
my $drawing_tool_dark_icons_box = Gtk3::HBox->new(FALSE, 0);
my $drawing_tool_auto_icons_box = Gtk3::HBox->new(FALSE, 0);

#actions
my $actions_vbox = Gtk3::VBox->new(FALSE, 0);
Expand Down Expand Up @@ -1130,6 +1137,13 @@ sub STARTUP {
$capture_frame->set_label_widget($capture_frame_label);
$capture_frame->set_shadow_type('none');

my $drawing_tool_frame_label = Gtk3::Label->new;
$drawing_tool_frame_label->set_markup("<b>" . $d->get("Drawing Tool") . "</b>");

my $drawing_tool_frame = Gtk3::Frame->new();
$drawing_tool_frame->set_label_widget($drawing_tool_frame_label);
$drawing_tool_frame->set_shadow_type('none');

my $sel_capture_frame_label = Gtk3::Label->new;
$sel_capture_frame_label->set_markup("<b>" . $d->get("Selection Capture") . "</b>");

Expand Down Expand Up @@ -1476,6 +1490,43 @@ sub STARTUP {
#end - cursor
#--------------------------------------

#drawing tool custom icons
#--------------------------------------
$drawing_tool_light_icons_active = Gtk3::RadioButton->new_with_label(undef, $d->get("Use light icons in the Drawing Tool, for dark themes"));
$drawing_tool_light_icons_box->pack_start($drawing_tool_light_icons_active, FALSE, TRUE, 12);

$drawing_tool_light_icons_active->set_tooltip_text($d->get("Use light icons in the Drawing Tool (for dark backgrounds)"));

$drawing_tool_dark_icons_active = Gtk3::RadioButton->new_with_label($drawing_tool_light_icons_active, $d->get("Use dark icons in the Drawing Tool, for light themes"));
$drawing_tool_dark_icons_box->pack_start($drawing_tool_dark_icons_active, FALSE, TRUE, 12);

$drawing_tool_dark_icons_active->set_tooltip_text($d->get("Use dark icons in the Drawing Tool (for light backgrounds)"));

$drawing_tool_auto_icons_active = Gtk3::RadioButton->new_with_label($drawing_tool_light_icons_active, $d->get("Automatically detect which icons to use in the Drawing Tool"));
$drawing_tool_auto_icons_box->pack_start($drawing_tool_auto_icons_active, FALSE, TRUE, 12);

$drawing_tool_auto_icons_active->set_tooltip_text($d->get("Automatically detect which icons to use in the Drawing Tool (guess the background color)"));

#default state
$drawing_tool_light_icons_active->set_active(FALSE);
$drawing_tool_dark_icons_active->set_active(FALSE);
$drawing_tool_auto_icons_active->set_active(TRUE);

if (defined $settings_xml->{'general'}->{'drawing_tool_light_icons'}) {
$drawing_tool_light_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_light_icons'});
}

if (defined $settings_xml->{'general'}->{'drawing_tool_dark_icons'}) {
$drawing_tool_dark_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_dark_icons'});
}

if (defined $settings_xml->{'general'}->{'drawing_tool_auto_icons'}) {
$drawing_tool_auto_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_auto_icons'});
}

#end - drawing tool custom icons
#--------------------------------------

#program
#--------------------------------------
my $model = fct_get_program_model();
Expand Down Expand Up @@ -1527,7 +1578,7 @@ sub STARTUP {

#im_colors
#--------------------------------------
$combobox_im_colors = Gtk3::ComboBoxText->new;
$combobox_im_colors = Gtk3::ComboBoxText->new;
$combobox_im_colors->insert_text(0, $d->get("16 colors - (4bit) "));
$combobox_im_colors->insert_text(1, $d->get("64 colors - (6bit) "));
$combobox_im_colors->insert_text(2, $d->get("256 colors - (8bit) "));
Expand Down Expand Up @@ -2415,6 +2466,11 @@ sub STARTUP {
$capture_vbox->pack_start($delay_box, TRUE, TRUE, 3);
$capture_frame->add($capture_vbox);

$drawing_tool_icons_vbox->pack_start($drawing_tool_light_icons_box, TRUE, TRUE, 3);
$drawing_tool_icons_vbox->pack_start($drawing_tool_dark_icons_box, TRUE, TRUE, 3);
$drawing_tool_icons_vbox->pack_start($drawing_tool_auto_icons_box, TRUE, TRUE, 3);
$drawing_tool_frame->add($drawing_tool_icons_vbox);

#all labels = one size
$scale_label->set_alignment(0, 0.5);
$filetype_label->set_alignment(0, 0.5);
Expand All @@ -2427,9 +2483,10 @@ sub STARTUP {
$sg_main->add_widget($filename_label);
$sg_main->add_widget($saveDir_label);

$vbox_basic->pack_start($file_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($save_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($capture_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($file_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($save_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($capture_frame, FALSE, TRUE, 3);
$vbox_basic->pack_start($drawing_tool_frame, FALSE, TRUE, 3);
$vbox_basic->set_border_width(5);

#settings actions tab
Expand Down Expand Up @@ -4643,15 +4700,17 @@ sub STARTUP {

#~ print "Pfad ".$saveDir_button->get_filename()."\n";
#~ print "Pfad ".$saveDir_button->get_uri()."\n";
$settings{'general'}->{'save_auto'} = $save_auto_active->get_active();
$settings{'general'}->{'save_ask'} = $save_ask_active->get_active();
$settings{'general'}->{'save_no'} = $save_no_active->get_active();
$settings{'general'}->{'image_autocopy'} = $image_autocopy_active->get_active();
$settings{'general'}->{'fname_autocopy'} = $fname_autocopy_active->get_active();
$settings{'general'}->{'no_autocopy'} = $no_autocopy_active->get_active();
$settings{'general'}->{'cursor'} = $cursor_active->get_active();
$settings{'general'}->{'delay'} = $delay->get_value();

$settings{'general'}->{'save_auto'} = $save_auto_active->get_active();
$settings{'general'}->{'save_ask'} = $save_ask_active->get_active();
$settings{'general'}->{'save_no'} = $save_no_active->get_active();
$settings{'general'}->{'image_autocopy'} = $image_autocopy_active->get_active();
$settings{'general'}->{'fname_autocopy'} = $fname_autocopy_active->get_active();
$settings{'general'}->{'no_autocopy'} = $no_autocopy_active->get_active();
$settings{'general'}->{'cursor'} = $cursor_active->get_active();
$settings{'general'}->{'delay'} = $delay->get_value();
$settings{'general'}->{'drawing_tool_light_icons'} = $drawing_tool_light_icons_active->get_active();
$settings{'general'}->{'drawing_tool_dark_icons'} = $drawing_tool_dark_icons_active->get_active();
$settings{'general'}->{'drawing_tool_auto_icons'} = $drawing_tool_auto_icons_active->get_active();
#wrksp -> submenu
if ($x11_supported) {
$settings{'general'}->{'current_monitor_active'} = $current_monitor_active->get_active;
Expand Down Expand Up @@ -4867,6 +4926,10 @@ sub STARTUP {
$cursor_active->set_active($settings_xml->{'general'}->{'cursor'});
$delay->set_value($settings_xml->{'general'}->{'delay'});

$drawing_tool_light_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_light_icons'});
$drawing_tool_dark_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_dark_icons'});
$drawing_tool_auto_icons_active->set_active($settings_xml->{'general'}->{'drawing_tool_auto_icons'});

#FIXME
#this is a dirty hack to force the setting to be enabled in session tab
#at the moment i simply dont know why the filechooser "caches" the old value
Expand Down Expand Up @@ -6011,11 +6074,24 @@ sub STARTUP {
}

#open drawing tool

my $drawing_tool_icons;

if ($drawing_tool_light_icons_active->get_active()) {
$drawing_tool_icons = "light";
} elsif ($drawing_tool_dark_icons_active->get_active()) {
$drawing_tool_icons = "dark";
} elsif ($drawing_tool_auto_icons_active->get_active()) {
$drawing_tool_icons = "auto";
}


foreach my $key (@draw_array) {
my $drawing_tool = Shutter::Draw::DrawingTool->new($sc);
$drawing_tool->show(
$session_screens{$key}->{'long'}, $session_screens{$key}->{'filetype'}, $session_screens{$key}->{'mime_type'},
$session_screens{$key}->{'name'}, $session_screens{$key}->{'is_unsaved'}, \%session_screens
$session_screens{$key}->{'name'}, $session_screens{$key}->{'is_unsaved'}, \%session_screens,
$drawing_tool_icons
);
}

Expand Down
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/cursor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/cursor
Binary file added share/shutter/resources/icons/drawing_tool_dark/draw-arrow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-backtext.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-backtext.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-callouts.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-callouts.png
Binary file added share/shutter/resources/icons/drawing_tool_dark/draw-censor.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-ellipse.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-ellipse.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-eraser.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-eraser.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-freehand.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-freehand.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-highlighter.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-highlighter.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-image.svg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-image.svg
Binary file added share/shutter/resources/icons/drawing_tool_dark/draw-line.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-locked.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-locked.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-lower.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-lower.png
Binary file added share/shutter/resources/icons/drawing_tool_dark/draw-number.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-pixelize.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-pixelize.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-pointer.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-pointer.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-raise.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-raise.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-rectangle.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-rectangle.png
Binary file added share/shutter/resources/icons/drawing_tool_dark/draw-text.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/draw-unlocked.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/draw-unlocked.png
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/objects
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/objects
1 change: 1 addition & 0 deletions share/shutter/resources/icons/drawing_tool_dark/transform-crop.png
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../drawing_tool/transform-crop.png
24 changes: 21 additions & 3 deletions share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,11 @@ sub show {
$self->{_name} = shift;
$self->{_is_unsaved} = shift;
$self->{_import_hash} = shift;
my $icon_theme = shift;

#gettext
$self->{_d} = $self->{_sc}->get_gettext;

#define own icons
$self->{_dicons} = $self->{_sc}->get_root . "/share/shutter/resources/icons/drawing_tool";
$self->{_icons} = $self->{_sc}->get_root . "/share/shutter/resources/icons";

#MAIN WINDOW
#-------------------------------------------------
Expand Down Expand Up @@ -241,6 +239,26 @@ sub show {
$self->{_lp} = Shutter::Pixbuf::Load->new($self->{_sc}, $self->{_drawing_window});
$self->{_lp_ne} = Shutter::Pixbuf::Load->new($self->{_sc}, $self->{_drawing_window}, TRUE);

#define own icons
if ($icon_theme eq 'auto') {
# Heuristic to detect whether GTK theme is light or dark
my $context = $self->{_drawing_window}->get_style_context();
my $bg = $context->get_background_color('normal');
my $avg_color = ($bg->red + $bg->green + $bg->blue) / 3.0;
if ($avg_color > 0.5) {
$icon_theme = 'dark';
} else {
$icon_theme = 'light';
}
}
if ($icon_theme eq 'dark') {
$self->{_dicons} = $self->{_sc}->get_root . "/share/shutter/resources/icons/drawing_tool";
} else {
$self->{_dicons} = $self->{_sc}->get_root . "/share/shutter/resources/icons/drawing_tool_dark";
}

$self->{_icons} = $self->{_sc}->get_root . "/share/shutter/resources/icons";

#setup cursor-hash
#
#cursors borrowed from inkscape
Expand Down