Fix missing string and simplify

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index cda416d476ac899529e23533515a29220d9eb143..379116590532051c8068dcd3f2ba2d38087cb432 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -561,7 +561,7 @@ sub new_text_box_for_nchar($$$) {
     my $label = $$hash{$key}[LABEL];
     my @type = split (/,/, $$hash{$key}[TYPE]); # char,minlen,maxlen,width
     my $glabel = Gtk3::Label->new ($label);
-    my $gentry = Gtk3::Entry->new ();
+    my $gentry = Gtk3::Entry->new;
     $gentry->set_max_length($type[2]) if defined ($type[2]);
     my $width = $type[3];
     $width //= $type[2];
@@ -1703,6 +1703,22 @@ sub new_colours_page() {
         '0.0.0',
         '-1',
     ],
+    sslman_w => [
+        'sslmanwin_width',
+        $xl::s{l_win_w},
+        $xl::s{h_win_w},
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '486',
+    ],
+    sslman_h => [
+        'sslmanwin_height',
+        $xl::s{l_win_h},
+        $xl::s{h_win_h},
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+    ],
     plug_w => [
         'pluginswin_width',
         $xl::s{l_win_w},
@@ -1891,11 +1907,15 @@ sub new_winpos_subpage_prefs() {
 }
 
 sub new_winpos_subpage_misc() {
-    return new_grid_pack (3, 8, [
+    return new_grid_pack (4, 11, [
         [ _('Log window') ],
         [ new_text_box_for_int (\%pr::win, 'logw_w', \%HPVALUE),
             new_text_box_for_int (\%pr::win, 'logw_h', \%HPVALUE) ],
         [ '--' ],
+        [ _('SSL manager') ],
+        [ new_text_box_for_int (\%pr::win, 'sslman_w', \%HPVALUE),
+            new_text_box_for_int (\%pr::win, 'sslman_h', \%HPVALUE) ],
+        [ '--' ],
         [ _('Print preview window') ],
         [ new_text_box_for_int (\%pr::win, 'prin_w', \%HPVALUE),
             new_text_box_for_int (\%pr::win, 'prin_h', \%HPVALUE) ],
@@ -2074,19 +2094,19 @@ sub new_plugins_page() {
 }
 
 sub new_hotkeys_list_label {
-    my $renderer = Gtk3::CellRendererText->new ();
+    my $renderer = Gtk3::CellRendererText->new;
     $renderer->set_property('alignment' => 'left');
     $renderer->set_property('editable' => FALSE);
     return $renderer;
 }
 
 sub new_hotkeys_list_hotkey {
-    my $renderer = Gtk3::CellRendererAccel->new ();
+    my $renderer = Gtk3::CellRendererAccel->new;
     $renderer->set_property ('accel-mode' => 'gtk');
     $renderer->set_property ('editable' => TRUE);
     $renderer->signal_connect ('accel-edited' => sub {
         my ($w, $path, $key, $mods, $keycode) = @_;
-        my $accel = Gtk3::Accelerator->name ($key, $mods);
+        my $accel = Gtk3::accelerator_name ($key, $mods);
         my ($model, $iter) = $SELHOTKEY->get_selected ();
         $model->set($iter, C_HOTKEY, "\"$accel\"");
         my $gkey = $model->get_value ($iter, C_GROUP);
@@ -2168,23 +2188,21 @@ sub new_hotkeys_list {
 }
 
 sub new_hotkeys_page() {
-    my $swin = Gtk3::ScrolledWindow->new ();
-    my $vbox = Gtk3::VBox->new (FALSE, 5);
+    my $hkbook = Gtk3::Notebook->new;
+    $hkbook->set_tab_pos ('right');
     foreach my $gkey (sort keys %$HOTKEYS) {
         my $group = $HOTKEYS->{$gkey};
-        # group title
-        my $glabel = new_title ($gkey);
-        $glabel->set_padding (5, 1);
-        $vbox->pack_start ($glabel, FALSE, FALSE, 0);
-        # group key list
         my $keylist = new_hotkeys_list ($gkey, $group);
-        $vbox->pack_start ($keylist, FALSE, FALSE, 0);
+        # prepare scrolled window
+        my $swin = Gtk3::ScrolledWindow->new;
+        $swin->set_border_width (5);
+        $swin->set_shadow_type ('none');
+        $swin->set_policy ('automatic', 'automatic');
+        # add list of keys
+        $swin->add ($keylist);
+        $hkbook->append_page ($swin, new_label ($gkey));
     }
-    $swin->set_border_width (5);
-    $swin->set_shadow_type ('none');
-    $swin->set_policy ('automatic', 'always');
-    $swin->add_with_viewport ($vbox);
-    return $swin;
+    return $hkbook;
 }
 
 sub new_info_page() {
@@ -2228,31 +2246,29 @@ sub get_toolkit_versions {
 }
 
 sub print_version() {
-    print $xl::s{about_title} . "\n";
-    print $xl::s{about_version} . " $VERSION\n";
+    say $xl::s{about_title};
+    say _('Version:') . " $VERSION";
     my $v = get_toolkit_versions ();
     if ($v->{'glib-b'}) {
-        print _("Perl-GLib version {glibv}, built for {glibb}, running with {glibr}.",
+        say _("Perl-GLib version {glibv}, built for {glibb}, running with {glibr}.",
                 glibv => $v->{'glib'},
                 glibb => $v->{'glib-b'},
                 glibr => $v->{'glib-r'});
     } else {
-        print _("Perl-GLib version {glibv}.", glibv => $v->{'glib'});
+        say _("Perl-GLib version {glibv}.", glibv => $v->{'glib'});
     }
-    print "\n";
     if ($v->{'gtk-b'}) {
-        print _("Perl-GTK3 version {gtkv}, built for {gtkb}, running with {gtkr}.",
+        say _("Perl-GTK3 version {gtkv}, built for {gtkb}, running with {gtkr}.",
                 gtkv => $v->{'gtk'},
                 gtkb => $v->{'gtk-b'},
                 gtkr => $v->{'gtk-r'});
     } else {
-        print _("Perl-GTK3 version {gtkv}.", gtkv => $v->{'gtk'});
+        say _("Perl-GTK3 version {gtkv}.", gtkv => $v->{'gtk'});
     }
-    print "\n";
     my $clawsver = ($CLAWSV eq "") ?
                 _("Claws Mail was not found!") :
                 _("Claws Mail returned version {cmv}.", cmv => $CLAWSV);
-    print $clawsver . "\n";
+    say $clawsver;
 }
 
 # the command line help
@@ -2526,7 +2542,6 @@ sub save_rc_preferences {
     my $rc = get_rc_filename ();
     log_message ("Saving preferences to $rc\n");
     return FALSE unless check_rc_file ($rc);
-    return FALSE unless check_claws_not_running ();
     return FALSE unless backup_resource ($rc);
     foreach (keys %PREFS) {
         if (defined $HPVALUE{$_}) {
@@ -2548,7 +2563,6 @@ sub save_ac_preferences {
     my $rc = get_ac_rc_filename ();
     log_message ("Saving account preferences to $rc\n");
     return FALSE unless check_rc_file ($rc);
-    return FALSE unless check_claws_not_running ();
     return FALSE unless backup_resource ($rc);
     foreach my $asect (keys %$ACCOUNTDATA) {
         if ($asect =~ /^Account: (\d+)$/) {
@@ -2567,13 +2581,13 @@ sub save_hk_preferences {
     my $rc = get_menurc_filename ();
     log_message ("Saving hotkey preferences to $rc\n");
     return FALSE unless check_rc_file ($rc);
-    return FALSE unless check_claws_not_running ();
     return FALSE unless backup_resource ($rc);
     save_menurc ($rc, $HOTKEYS);
     return TRUE;
 }
 
 sub save_preferences {
+    return FALSE unless check_claws_not_running ();
     my $result = save_rc_preferences ()
         and save_ac_preferences ()
         and save_hk_preferences ();