From a797cda27c6532e1afbaee563b5a1b2f7cf289af Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Sun, 20 Dec 2020 13:52:50 +0100 Subject: [PATCH] Add main window icon and fix key length selection bug --- icons/tinyca.png | Bin 0 -> 6189 bytes icons/tinyca.svg | 69 +++++++++++++++++++++++++++++++++++++++++++++++ lib/GUI.pm | 8 +++--- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 icons/tinyca.png create mode 100644 icons/tinyca.svg diff --git a/icons/tinyca.png b/icons/tinyca.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0261d8d7cf16ca09b26b19c0ae71c5b3917730 GIT binary patch literal 6189 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 Z@pDSuh25oE4*&PIs4MFzRVi47{x5K1- +image/svg+xml + + diff --git a/lib/GUI.pm b/lib/GUI.pm index 2a1f7f1..14ccc2a 100644 --- a/lib/GUI.pm +++ b/lib/GUI.pm @@ -111,6 +111,7 @@ sub new { # initialize main window $self->{'mw'} = Gtk2::Window->new("toplevel"); $self->{'mw'}->set_title("TinyCA2 Management $self->{'version'}"); + $self->{'mw'}->set_icon_from_file("./icons/tinyca.png"); $self->{'mw'}->set_resizable(1); $section = $self->{'init'}->{'cfg'}->{window}; @@ -1366,13 +1367,12 @@ sub show_req_dialog { $radiobox = Gtk2::HBox->new(0, 0); # use config if present main::printd("preparing radiobox for type " . $self->{'CA'}->{'cfg'}->{global}{default_req_type}); - my $bits = \$opts->{'bits'}; if ($self->{'CA'}->{'cfg'}->{global}{default_req_type} eq 'user') { - $bits = $self->{'CA'}->{'cfg'}->{user}{default_bits} // \$opts->{'bits'}; + $opts->{'bits'} = $self->{'CA'}->{'cfg'}->{user}{default_bits} // \$opts->{'bits'}; } elsif ($self->{'CA'}->{'cfg'}->{global}{default_req_type} eq 'server') { - $bits = $self->{'CA'}->{'cfg'}->{server}{default_bits}// \$opts->{'bits'}; + $opts->{'bits'} = $self->{'CA'}->{'cfg'}->{server}{default_bits}// \$opts->{'bits'}; } - _fill_radiobox($radiobox, \$bits, %bit_lengths); + _fill_radiobox($radiobox, \$opts->{'bits'}, %bit_lengths); $reqtable->attach_defaults($radiobox, 1, 2, 13, 14); $label = GUI::HELPERS::create_label(