From: jongfoster Date: Thu, 31 May 2001 21:37:11 +0000 (+0000) Subject: GUI changes to rename "permissions file" to "actions file". X-Git-Tag: v_2_9_9~437 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=8cdcdc439be755cede31e0c3075e4932eba1ba04 GUI changes to rename "permissions file" to "actions file". --- diff --git a/w32.rc b/w32.rc index 834664d9..3c267412 100644 --- a/w32.rc +++ b/w32.rc @@ -31,6 +31,29 @@ * * Revisions : * $Log: w32.rc,v $ + * Revision 1.7 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * * Revision 1.6 2001/05/26 14:15:18 jongfoster * Cosmetic fix: // -> block comment * @@ -131,10 +154,10 @@ BEGIN BEGIN MENUITEM "&Junkbuster...", ID_TOOLS_EDITJUNKBUSTER MENUITEM SEPARATOR - MENUITEM "&Permissions...", ID_TOOLS_EDITPERMISSIONS + MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "&Forward...", ID_TOOLS_EDITFORWARD #ifdef ACL_FILES - MENUITEM "&Access Control Lists...", ID_TOOLS_EDITACLS + MENUITEM "Access &Control Lists...", ID_TOOLS_EDITACLS #endif /* def ACL_FILES */ #ifdef PCRS MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE @@ -178,7 +201,7 @@ BEGIN #endif MENUITEM "&Junkbuster...", ID_TOOLS_EDITJUNKBUSTER MENUITEM SEPARATOR - MENUITEM "&Permissions...", ID_TOOLS_EDITPERMISSIONS + MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "&Forward...", ID_TOOLS_EDITFORWARD #ifdef ACL_FILES MENUITEM "&Access Control Lists...",ID_TOOLS_EDITACLS diff --git a/w32log.c b/w32log.c index 37614dfc..13e84690 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,4 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $"; +const char w32log_rcs[] = "$Id: w32log.c,v 1.9 2001/05/31 17:33:13 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -32,6 +32,10 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.8 2001/05/29 09:50:24 jongfoster Ex * * Revisions : * $Log: w32log.c,v $ + * Revision 1.9 2001/05/31 17:33:13 oes + * + * CRLF -> LF + * * Revision 1.8 2001/05/29 09:50:24 jongfoster * Unified blocklist/imagelist/permissionslist. * File format is still under discussion, but the internal changes @@ -190,7 +194,7 @@ int g_nFontSize = DEFAULT_LOG_FONT_SIZE; /* FIXME: this is a kludge */ -const char * g_permissions_file = NULL; +const char * g_actions_file = NULL; const char * g_forwardfile = NULL; #ifdef ACL_FILES const char * g_aclfile = NULL; @@ -1107,8 +1111,8 @@ void OnLogCommand(int nCommand) EditFile(configfile); break; - case ID_TOOLS_EDITPERMISSIONS: - EditFile(g_permissions_file); + case ID_TOOLS_EDITACTIONS: + EditFile(g_actions_file); break; case ID_TOOLS_EDITFORWARD: @@ -1183,7 +1187,7 @@ void OnLogCommand(int nCommand) void OnLogInitMenu(HMENU hmenu) { /* Only enable editors if there is a file to edit */ - EnableMenuItem(hmenu, ID_TOOLS_EDITPERMISSIONS, MF_BYCOMMAND | (g_permissions_file ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED)); EnableMenuItem(hmenu, ID_TOOLS_EDITFORWARD, MF_BYCOMMAND | (g_forwardfile ? MF_ENABLED : MF_GRAYED)); #ifdef ACL_FILES EnableMenuItem(hmenu, ID_TOOLS_EDITACLS, MF_BYCOMMAND | (g_aclfile ? MF_ENABLED : MF_GRAYED)); diff --git a/w32log.h b/w32log.h index db36556c..c4990273 100644 --- a/w32log.h +++ b/w32log.h @@ -1,6 +1,6 @@ #ifndef _W32LOG_H #define _W32LOG_H -#define W32LOG_H_VERSION "$Id: w32log.h,v 1.2 2001/05/26 00:28:36 jongfoster Exp $" +#define W32LOG_H_VERSION "$Id: w32log.h,v 1.3 2001/05/29 09:50:24 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.h,v $ @@ -34,6 +34,29 @@ * * Revisions : * $Log: w32log.h,v $ + * Revision 1.3 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * * Revision 1.2 2001/05/26 00:28:36 jongfoster * Automatic reloading of config file. * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). @@ -84,7 +107,7 @@ extern int g_nFontSize; /* FIXME: this is a kludge */ -extern const char * g_permissions_file; +extern const char * g_actions_file; extern const char * g_forwardfile; #ifdef ACL_FILES extern const char * g_aclfile; diff --git a/w32res.h b/w32res.h index 78cc0514..c5a7162a 100644 --- a/w32res.h +++ b/w32res.h @@ -1,6 +1,6 @@ #ifndef _W32RES_H #define _W32RES_H -#define W32RES_H_VERSION "$Id: w32res.h,v 1.4 2001/05/26 01:26:34 jongfoster Exp $" +#define W32RES_H_VERSION "$Id: w32res.h,v 1.5 2001/05/29 09:50:24 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32res.h,v $ @@ -34,6 +34,29 @@ * * Revisions : * $Log: w32res.h,v $ + * Revision 1.5 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * * Revision 1.4 2001/05/26 01:26:34 jongfoster * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor. * This #define cannot be set from ./configure - there's no point, it @@ -124,7 +147,7 @@ /* Break these out so they are easier to extend, but keep consecutive */ #define ID_TOOLS_EDITJUNKBUSTER 5000 -#define ID_TOOLS_EDITPERMISSIONS 5001 +#define ID_TOOLS_EDITACTIONS 5001 #define ID_TOOLS_EDITFORWARD 5002 #ifdef ACL_FILES