[Commits] [SCM] clawsker branch, master, updated. 1.3.0-6-g3bd34c0

[mones at claws-mail.org]

The branch, master has been updated
       via  3bd34c0a18ef8ae9a26d5bece1441d3402307558 (commit)
       via  4c9eea3f36b37aec3402f76e8de5df049e169725 (commit)
      from  4482693c3be2c747e3fb19e3946ef822975b9484 (commit)

Summary of changes:
 clawsker |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit 3bd34c0a18ef8ae9a26d5bece1441d3402307558
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Dec 21 20:13:01 2018 +0100

    Remove unnecessary parentheses

diff --git a/clawsker b/clawsker
index 48c55b7..22d2fa7 100755
--- 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];
@@ -2094,14 +2094,14 @@ 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 {

commit 4c9eea3f36b37aec3402f76e8de5df049e169725
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Dec 21 20:05:52 2018 +0100

    Rearrange hotkey groups into tabs
    
    And fix the scrolling to top when clicking on a hotkey cell (thanks
    George for reporting on ML).

diff --git a/clawsker b/clawsker
index 4ba365c..48c55b7 100755
--- a/clawsker
+++ b/clawsker
@@ -2188,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() {

-----------------------------------------------------------------------


hooks/post-receive
-- 
Hidden preferences editor for Claws Mail