update to 5.26

dave-theunsub · Sep 4, 2018 · 2dccf63 · 2dccf63
1 parent ec3170b
commit 2dccf63
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 168 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,10 +1,12 @@
 CHANGELOG for ClamTk:
 
-5.26 - XXX XX 2017
+5.26 - Aug 25 2018
 ------------------
-        * Remove dependency on gnome-icon-theme-legacy; still
-          using gnome-icon-theme for now
-
+        * UI change to single-click
+        * Update year to 2018; 14th year :)
+        * Updates to the man pages
+        * Update Swedish (sv) language file for Launchpad #1688469
+        * Begin move to https://gitlab.com/dave_m/clamtk
 
 5.25 - Sep 4 2017
 -----------------
@@ -390,7 +392,7 @@ CHANGELOG for ClamTk:
 4.41 - Jun 1 2012
 ------------------
 	* Actually remove File::Find::Rule from ClamTk sources,
-	  which should have been done in 4.40.  This could cause
+	  which should have been done in 4.40. This could cause
 	  problems with Debian-based distros which can remove
 	  unneeded dependencies
 

diff --git a/clamtk b/clamtk
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk.
 # https://dave-theunsub.github.io/clamtk/

diff --git a/clamtk.1.gz b/clamtk.1.gz
diff --git a/lib/Analysis.pm b/lib/Analysis.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/App.pm b/lib/App.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #
@@ -24,7 +24,7 @@ use Encode 'decode';
 
 sub get_TK_version {
     # Stick with %.2f format - 4.50 vice 4.5
-    return '5.25';
+    return '5.26';
 }
 
 sub get_path {

diff --git a/lib/Assistant.pm b/lib/Assistant.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/GUI.pm b/lib/GUI.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #
@@ -219,40 +219,33 @@ sub add_config_panels {
     );
 
     my $view = Gtk2::IconView->new_with_model( $liststore );
-    $view->set_columns( 4 );
+    $view->set_can_focus( FALSE );
     $view->set_column_spacing( 10 );
-    $view->set_row_spacing( 10 );
+    $view->set_columns( 4 );
     $view->set_pixbuf_column( 0 );
+    $view->set_row_spacing( 10 );
+    $view->set_selection_mode( 'single' );
     $view->set_text_column( 1 );
     $view->set_tooltip_column( 2 );
-    $view->set_selection_mode( 'single' );
-    $view->set_can_focus( FALSE );
 
-    my $prefs = ClamTk::Prefs->get_preference( 'Clickings' );
-    if ( $prefs == 2 ) {
-        $view->signal_connect(
-            'item-activated' => \&click,
-            $liststore
-        );
-    } elsif ( $prefs == 1 ) {
-        my $path;
-        $view->signal_connect(
-            'motion-notify-event' => sub {
-                my ( $widget, $event ) = @_;
-                $path = $view->get_path_at_pos( $event->x, $event->y );
-                if ( $path ) {
-                    $view->select_path( $path );
-                } else {
-                    $view->unselect_all();
-                }
-            }
-        );
-        $view->signal_connect(
-            'button-press-event' => sub {
-                press( $path, $liststore );
+    # Set single-click
+    my $path;
+    $view->signal_connect(
+        'motion-notify-event' => sub {
+            my ( $widget, $event ) = @_;
+            $path = $view->get_path_at_pos( $event->x, $event->y );
+            if ( $path ) {
+                $view->select_path( $path );
+            } else {
+                $view->unselect_all();
             }
-        );
-    }
+        }
+    );
+     $view->signal_connect(
+        'button-press-event' => sub {
+            press( $path, $liststore );
+        }
+    );
 
     my @data = (
         {   link        => _( 'Settings' ),
@@ -303,41 +296,33 @@ sub add_update_panels {
     );
 
     my $view = Gtk2::IconView->new_with_model( $liststore );
-    $view->set_columns( 3 );
+    $view->set_can_focus( FALSE );
     $view->set_column_spacing( 10 );
-    $view->set_row_spacing( 10 );
+    $view->set_columns( 3 );
     $view->set_pixbuf_column( 0 );
+    $view->set_row_spacing( 10 );
+    $view->set_selection_mode( 'single' );
     $view->set_text_column( 1 );
     $view->set_tooltip_column( 2 );
-    $view->set_selection_mode( 'single' );
-    $view->set_can_focus( FALSE );
 
-    my $prefs = ClamTk::Prefs->get_preference( 'Clickings' );
-
-    if ( $prefs == 2 ) {
-        $view->signal_connect(
-            'item-activated' => \&click,
-            $liststore
-        );
-    } elsif ( $prefs == 1 ) {
-        my $path;
-        $view->signal_connect(
-            'motion-notify-event' => sub {
-                my ( $widget, $event ) = @_;
-                $path = $view->get_path_at_pos( $event->x, $event->y );
-                if ( $path ) {
-                    $view->select_path( $path );
-                } else {
-                    $view->unselect_all();
-                }
-            }
-        );
-        $view->signal_connect(
-            'button-press-event' => sub {
-                press( $path, $liststore );
+    # Set single-click
+    my $path;
+    $view->signal_connect(
+        'motion-notify-event' => sub {
+            my ( $widget, $event ) = @_;
+            $path = $view->get_path_at_pos( $event->x, $event->y );
+            if ( $path ) {
+                $view->select_path( $path );
+            } else {
+                $view->unselect_all();
             }
-        );
-    }
+        }
+    );
+    $view->signal_connect(
+        'button-press-event' => sub {
+            press( $path, $liststore );
+        }
+    );
 
     my @data = (
         {   link        => _( 'Update' ),
@@ -386,32 +371,24 @@ sub add_history_panels {
     $view->set_selection_mode( 'single' );
     $view->set_can_focus( FALSE );
 
-    my $prefs = ClamTk::Prefs->get_preference( 'Clickings' );
-
-    if ( $prefs == 2 ) {
-        $view->signal_connect(
-            'item-activated' => \&click,
-            $liststore
-        );
-    } elsif ( $prefs == 1 ) {
-        my $path;
-        $view->signal_connect(
-            'motion-notify-event' => sub {
-                my ( $widget, $event ) = @_;
-                $path = $view->get_path_at_pos( $event->x, $event->y );
-                if ( $path ) {
-                    $view->select_path( $path );
-                } else {
-                    $view->unselect_all();
-                }
-            }
-        );
-        $view->signal_connect(
-            'button-press-event' => sub {
-                press( $path, $liststore );
+    # Set single-click
+    my $path;
+    $view->signal_connect(
+        'motion-notify-event' => sub {
+            my ( $widget, $event ) = @_;
+            $path = $view->get_path_at_pos( $event->x, $event->y );
+            if ( $path ) {
+                $view->select_path( $path );
+            } else {
+                $view->unselect_all();
             }
-        );
-    }
+        }
+    );
+    $view->signal_connect(
+        'button-press-event' => sub {
+            press( $path, $liststore );
+        }
+    );
 
     my @data = (
         {   link        => _( 'History' ),
@@ -451,41 +428,32 @@ sub add_analysis_panels {
     );
 
     my $view = Gtk2::IconView->new_with_model( $liststore );
-    $view->set_columns( 3 );
+    $view->set_can_focus( FALSE );
     $view->set_column_spacing( 10 );
-    $view->set_row_spacing( 10 );
+    $view->set_columns( 3 );
     $view->set_pixbuf_column( 0 );
+    $view->set_row_spacing( 10 );
+    $view->set_selection_mode( 'single' );
     $view->set_text_column( 1 );
     $view->set_tooltip_column( 2 );
-    $view->set_selection_mode( 'single' );
-    $view->set_can_focus( FALSE );
-
-    my $prefs = ClamTk::Prefs->get_preference( 'Clickings' );
 
-    if ( $prefs == 2 ) {
-        $view->signal_connect(
-            'item-activated' => \&click,
-            $liststore
-        );
-    } elsif ( $prefs == 1 ) {
-        my $path;
-        $view->signal_connect(
-            'motion-notify-event' => sub {
-                my ( $widget, $event ) = @_;
-                $path = $view->get_path_at_pos( $event->x, $event->y );
-                if ( $path ) {
-                    $view->select_path( $path );
-                } else {
-                    $view->unselect_all();
-                }
+    my $path;
+    $view->signal_connect(
+        'motion-notify-event' => sub {
+            my ( $widget, $event ) = @_;
+            $path = $view->get_path_at_pos( $event->x, $event->y );
+            if ( $path ) {
+                $view->select_path( $path );
+            } else {
+                $view->unselect_all();
             }
-        );
-        $view->signal_connect(
-            'button-press-event' => sub {
-                press( $path, $liststore );
-            }
-        );
-    }
+        }
+    );
+    $view->signal_connect(
+        'button-press-event' => sub {
+            press( $path, $liststore );
+        }
+    );
 
     #<<<
     # For CentOS only:
@@ -776,7 +744,7 @@ sub about {
     $dialog->set_logo( $pixbuf );
     $dialog->set_translator_credits(
         'Please see the website for full listing' );
-    $dialog->set_copyright( "\x{a9} Dave M 2004 - 2017" );
+    $dialog->set_copyright( "\x{a9} Dave M 2004 - 2018" );
     $dialog->set_program_name( 'ClamTk' );
     #$dialog->set_authors( [ 'Dave M', '[email protected]' ] );
     $dialog->set_authors( 'Dave M <[email protected]>' );

diff --git a/lib/History.pm b/lib/History.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/Network.pm b/lib/Network.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #
@@ -28,13 +28,6 @@ my $infobar;               # Gtk2::InfoBar
 sub show_window {
     my $eb = Gtk2::EventBox->new;
 
-    # my $white = Gtk2::Gdk::Color->new( 0xFFFF, 0xFFFF, 0xFFFF );
-    # $eb->modify_bg( 'normal', $white );
-
-    #$eb->override_background_color( 'normal',
-    #    Gtk2::Gdk::RGBA->new( .93, .93, .93, .93 ),
-    #);
-
     my $box = Gtk2::VBox->new( FALSE, 5 );
     $eb->add( $box );
 

diff --git a/lib/Prefs.pm b/lib/Prefs.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #
@@ -198,15 +198,6 @@ sub custom_prefs {
         }
     }
 
-    # Single click or double click in the main iconview.
-    # Since we started with double, stick with it by
-    # default for less aggravation
-    # 1 = single, 2 = double
-    # Clickings = short for Click Settings. I think.
-    if ( !exists $pkg{ Clickings } ) {
-        $pkg{ Clickings } = 2;
-    }
-
     write_all( %pkg );
     return;
 }
@@ -239,7 +230,6 @@ sub legit_key {
         TruncateLog SaveToLog
         Whitelist Update ScanHidden
         Thorough Recursive Mounted
-        Clickings
     );
     return 1 if ( grep { $_[ 0 ] eq $_ } @keys );
 }

diff --git a/lib/Quarantine.pm b/lib/Quarantine.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/Results.pm b/lib/Results.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/Scan.pm b/lib/Scan.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #

diff --git a/lib/Schedule.pm b/lib/Schedule.pm
@@ -1,4 +1,4 @@
-# ClamTk, copyright (C) 2004-2017 Dave M
+# ClamTk, copyright (C) 2004-2018 Dave M
 #
 # This file is part of ClamTk (https://dave-theunsub.github.io/clamtk).
 #