[popfile-commit] engine/Platform MSWin32.pm,1.11,1.12

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/Platform
In directory sc8-pr-cvs1:/tmp/cvs-serv8332/Platform

Modified Files:
	MSWin32.pm 
Log Message:
MAKE POPFILE BE A TRUE EXE ON WINDOWS
ADDED ATTACHMENT PSEUDOWORDS

Makefile:

At rules for making a variety of POPFile executables:

popfile.exe         Loader that picks one of the following four to run:
    popfileif.exe       Run POPFile in foreground with a tray icon
    popfileib.exe       Run POPFile in background with a tray icon
    popfilef.exe        Run POPFile in the foreground
    popfileb.exe        Run POPFile in the background

Each executable is built with either PerlTray (for those with system
tray icons) or PerlApp (for those with no icon).

popfile-tray.pl:

Equivalent of popfile.pl but with hooks for use by PerlTray for 
showing the icon and handling the popup menu.

popfile-windows.pl:

This is the small wrapper that becomes popfile.exe and decides which
version of POPFile to load.

languages/English.msg:

Added the message for the console output option and to warn the user
that the change isn't going to take affect until the next restart.

Platform/MSWin32.pm:

This just contains code now for handling the options windows_trayicon
and windows_console.

Classifier/Bayes.pm:

Removed the second blessing of ourselves because it was not needed.

Classifier/MailParse.pm:

Added pseudowords for attachment names and attachment extensions via a
patch that was submitted.

POPFile/Loader.pm:

New public function module_config() allows a user of the loader to access
configuration items without knowing the internals of Loader.

popfilew.pl:

Removed.  This file is replaced by popfile-windows.pl.

















Index: MSWin32.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MSWin32.pm	12 Sep 2003 00:34:36 -0000	1.11
--- MSWin32.pm	19 Sep 2003 20:18:52 -0000	1.12
***************
*** 63,66 ****
--- 63,67 ----
  
      $self->config_( 'trayicon', 1 );
+     $self->config_( 'console',  0 );
  
      $self->register_configuration_item_( 'configuration',
***************
*** 68,71 ****
--- 69,76 ----
                                           $self );
  
+     $self->register_configuration_item_( 'configuration',
+                                          'windows_console',
+                                          $self );
+ 
      return 1;
  }
***************
*** 110,113 ****
--- 115,138 ----
      }
  
+     if ( $name eq 'windows_console' ) {
+         $body .= "<span class=\"configurationLabel\">$$language{Windows_Console}:</span><br />\n";
+         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
+ 
+         if ( $self->config_( 'console' ) == 0 ) {
+             $body .= "<form action=\"/configuration\">\n";
+             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
+             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowConsoleOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
+             $body .= "<input type=\"hidden\" name=\"windows_console\" value=\"1\" />\n";
+             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
+         } else {
+             $body .= "<form action=\"/configuration\">\n";
+             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
+             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowConsoleOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
+             $body .= "<input type=\"hidden\" name=\"windows_console\" value=\"0\" />\n";
+             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
+         }
+         $body .= "</td></tr></table>\n";
+     }
+ 
      return $body;
  }
***************
*** 132,145 ****
          if ( defined($$form{windows_trayicon}) ) {
              $self->config_( 'trayicon', $$form{windows_trayicon} );
  
!             if ( $$form{windows_trayicon} == 0 ) {
!                 $self->{hideicon__} = Win32::API->new( "Platform/POPFileIcon.dll", "HideIcon", "", "N" );
!                 $self->{hideicon__}->Call();
!                 undef $self->{hideicon__};
! 	    }
          }
      }
  
!     return '';
  }
  
--- 157,172 ----
          if ( defined($$form{windows_trayicon}) ) {
              $self->config_( 'trayicon', $$form{windows_trayicon} );
+             return $$language{Windows_NextTime};
+         }
+     }
  
!     if ( $name eq 'windows_console' ) {
!         if ( defined($$form{windows_console}) ) {
!             $self->config_( 'console', $$form{windows_console} );
!             return $$language{Windows_NextTime};
          }
      }
  
!    return '';
  }