Use bold label for default account tab

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index 5df31fef939cf868484b8a95459d46d4a0042d87..e657275577012eac608676a1e5fc895aefce7642 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -213,6 +213,8 @@ sub _ {
     l_acc_gtls_pri => _('GnuTLS priority'),
     h_acc_gtls_pri => _('Value to use as GnuTLS priority string if custom priority check is enabled. Otherwise this value is ignored.'),
 
+    l_plu_gpg_alimit => _('Autocompletion limit'),
+    h_plu_gpg_alimit => _('Limits the number of addresses obtained from from keyring through autocompletion. Use 0 to get all matches.'),
     l_plu_lav_burl => _('Base URL'),
     h_plu_lav_burl => _('This is the URL where avatar requests are sent. You can use the one of your own libravatar server, if available.'),
     l_plu_prl_flvb => _('Log level'),
@@ -246,7 +248,7 @@ my $CONFIGDIR = $ENV{HOME} . '/.claws-mail/';
 my $CONFIGRC = 'clawsrc';
 my $ACCOUNTRC = 'accountrc';
 # supported and available plugins lists
-my @PLUGINS = qw(AttRemover Libravatar ManageSieve PerlPlugin);
+my @PLUGINS = qw(AttRemover GPG ManageSieve Libravatar PerlPlugin);
 my @AVPLUGINS = ();
 
 # index constants for preference arrays
@@ -1854,7 +1856,13 @@ sub new_accounts_page() {
     $accbook->set_tab_pos ('right');
     foreach (keys %ACPREFS) {
         my $name = $ACPREFS{$_}{'account_name'};
-        $accbook->append_page (new_account_subpage ($_), $name);
+        my $isdef = ($ACPREFS{$_}{'is_default'} eq '1');
+        my $page = new_account_subpage ($_);
+        $accbook->append_page ($page, $isdef? '<b>' . $name . '</b>': $name);
+        if ($isdef) {
+            my $label = $accbook->get_tab_label ($page);
+            $label->set_use_markup (TRUE);
+        }
     }
     return $accbook;
 }
@@ -1879,6 +1887,16 @@ sub new_accounts_page() {
         '-1',
         'AttRemover',
     ],
+    # GPG
+    gpg_alimit => [
+        'autocompletion_limit',
+        $xl::s{l_plu_gpg_alimit},
+        $xl::s{h_plu_gpg_alimit},
+        'int,0,100',
+        '3.12.0.75',
+        '0',
+        'GPG',
+    ],
     # managesieve
     msv_winw => [
         'manager_win_width',
@@ -1928,6 +1946,11 @@ sub new_plugins_page() {
                           new_text_box_for_int (\%pr::plu, 'arm_winw', $PLHPVALUE{'AttRemover'}),
                           new_text_box_for_int (\%pr::plu, 'arm_winh', $PLHPVALUE{'AttRemover'})),
                      _('Attachment remover'), 'not-packed');
+    $frame{'GPG'} =
+                new_subpage_frame (
+                     new_hbox_pack (
+                          new_text_box_for_int (\%pr::plu, 'gpg_alimit', $PLHPVALUE{'GPG'})),
+                     _('GPG'), 'not-packed');
     $frame{'ManageSieve'} =
                 new_subpage_frame (
                      new_hbox_pack (
@@ -1949,29 +1972,42 @@ sub new_plugins_page() {
     }
     return new_vbox_pack (
                 $frame{'AttRemover'},
+                $frame{'GPG'},
                 $frame{'ManageSieve'},
                 $frame{'Libravatar'},
                 $frame{'PerlPlugin'});
 }
 
 # version info
-sub print_version() {
-    print $xl::s{about_title} . "\n";
-    print $xl::s{about_version} . " $VERSION\n";
-    print "Perl-GLib " . $Glib::VERSION;
+sub get_toolkit_versions {
+    my %versions = ();
+    $versions{'glib'} = $Glib::VERSION;
     # version info stuff appeared in 1.040
     if ($Glib::VERSION >= 1.040) {
-        print _(", built for ") . join(".", Glib->GET_VERSION_INFO)
-              . _(", running with ") . join(".", &Glib::major_version,
-              &Glib::minor_version, &Glib::micro_version);
+        $versions{'glib-b'} = join('.', Glib->GET_VERSION_INFO);
+        $versions{'glib-r'} = join('.',
+            &Glib::major_version, &Glib::minor_version, &Glib::micro_version);
     }
-    print "\n";
-    print "Perl-GTK2 " . $Gtk2::VERSION;
+    $versions{'gtk2'} = $Gtk2::VERSION;
     if ($Gtk2::VERSION >= 1.040) {
-        print _(", built for ") . join(".", Gtk2->GET_VERSION_INFO)
-              . _(", running with ") . join(".", &Gtk2::major_version,
-              &Gtk2::minor_version, &Gtk2::micro_version);
+        $versions{'gtk2-b'} = join('.', Gtk2->GET_VERSION_INFO);
+        $versions{'gtk2-r'} = join('.',
+            &Gtk2::major_version, &Gtk2::minor_version, &Gtk2::micro_version);
     }
+    return \%versions;
+}
+
+sub print_version() {
+    print $xl::s{about_title} . "\n";
+    print $xl::s{about_version} . " $VERSION\n";
+    my $v = get_toolkit_versions ();
+    print "Perl-GLib " . $v->{'glib'};
+    print _(", built for ") . $v->{'glib-b'}
+        . _(", running with ") . $v->{'glib-r'} if $v->{'glib-b'};
+    print "\n";
+    print "Perl-GTK2 " . $v->{'gtk2'};
+    print _(", built for ") . $v->{'gtk2-b'}
+        . _(", running with ") . $v->{'gtk2-r'} if $v->{'gtk2-b'};
     print "\n";
     my $clawsver = ($CLAWSV eq "") ?
                 _("was not found!") :
@@ -1988,11 +2024,12 @@ sub print_help() {
     print _("Syntax:\n");
     print _("  clawsker [options]\n");
     print _("Options:\n");
-    print _("  -h|--help                        Prints this help screen.\n");
-    print _("  -v|--version                     Prints version infos.\n");
-    print _("  -b|--verbose                     More messages on standard output.\n");
     print _("  -a|--alternate-config-dir <dir>  Uses <dir> as Claws Mail config dir.\n");
+    print _("  -b|--verbose                     More messages on standard output.\n");
     print _("  -c|--clawsrc <file>              Uses <file> as full resource name.\n");
+    print _("  -h|--help                        Prints this help screen.\n");
+    print _("  -r|--read-only                   Disables writing changes to disk.\n");
+    print _("  -v|--version                     Prints version infos.\n");
 }
 
 sub parse_command_line {