X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32.rc;h=03525f044a24b6549d64454cd269e8ab871cab5a;hp=834664d9365e6b060d20368b329f96822efd19de;hb=54388a0cf5c8858e4134f2013198d05f19d60150;hpb=12f52e6af55d51d4b268af7956d97c772eebbb5c

diff --git a/w32.rc b/w32.rc
index 834664d9..03525f04 100644
--- a/w32.rc
+++ b/w32.rc
@@ -31,6 +31,39 @@
  *
  * Revisions   :
  *    $Log: w32.rc,v $
+ *    Revision 1.10  2001/07/19 19:14:19  haroon
+ *    -  Removed all #ifdef PCRS. The .rc file extension had eluded Andreas.
+ *
+ *    Revision 1.9  2001/06/07 23:08:54  jongfoster
+ *    Forward and ACL edit options removed.
+ *    Config edit option renamed from "&Junkbuster" to "&Configuration".
+ *
+ *    Revision 1.8  2001/05/31 21:37:11  jongfoster
+ *    GUI changes to rename "permissions file" to "actions file".
+ *
+ *    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
  *
@@ -117,6 +150,47 @@ IDI_IDLE                ICON    DISCARDABLE     "icons/idle.ico"
 #pragma code_page(1252)
 #endif /* def _WIN32 */
 
+/*
+ * File Version
+ */
+#ifndef _MAC
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_POINT,0
+ PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_POINT,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "The ijbswa team - ijbswa.sourceforge.net\0"
+            VALUE "FileDescription", "JunkBuster\0"
+            VALUE "FileVersion", VERSION "\0"
+            VALUE "InternalName", "JunkBuster\0"
+            VALUE "LegalCopyright", "Distributed under the GNU GPL\0"
+            VALUE "OriginalFilename", "junkbuster.exe\0"
+            VALUE "ProductName", "JunkBuster\0"
+            VALUE "ProductVersion", VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif /* ndef _MAC */
+
+
 /*
  * Menus
  */
@@ -129,16 +203,10 @@ BEGIN
         MENUITEM                       SEPARATOR
         POPUP "&Options"
         BEGIN
-            MENUITEM "&Junkbuster...",              ID_TOOLS_EDITJUNKBUSTER
+            MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
             MENUITEM                                SEPARATOR
-            MENUITEM "&Permissions...",             ID_TOOLS_EDITPERMISSIONS
-            MENUITEM "&Forward...",                 ID_TOOLS_EDITFORWARD
-#ifdef ACL_FILES
-            MENUITEM "&Access Control Lists...",    ID_TOOLS_EDITACLS
-#endif /* def ACL_FILES */
-#ifdef PCRS
+            MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",            ID_TOOLS_EDITPERLRE
-#endif /* def PCRS */
 #ifdef TRUST_FILES
             MENUITEM "&Trust...",                   ID_TOOLS_EDITTRUST
 #endif /* def TRUST_FILES */
@@ -176,16 +244,10 @@ BEGIN
         MENUITEM "&Enable",                     ID_TOGGLE_IJB, CHECKED
         MENUITEM                                SEPARATOR
 #endif
-        MENUITEM "&Junkbuster...",              ID_TOOLS_EDITJUNKBUSTER
+        MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
         MENUITEM                                SEPARATOR
-        MENUITEM "&Permissions...",             ID_TOOLS_EDITPERMISSIONS
-        MENUITEM "&Forward...",                 ID_TOOLS_EDITFORWARD
-#ifdef ACL_FILES
-            MENUITEM "&Access Control Lists...",ID_TOOLS_EDITACLS
-#endif /* def ACL_FILES */
-#ifdef PCRS
+        MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
             MENUITEM "Perl &Regexps...",        ID_TOOLS_EDITPERLRE
-#endif /* def PCRS */
 #ifdef TRUST_FILES
             MENUITEM "&Trust...",               ID_TOOLS_EDITTRUST
 #endif /* def TRUST_FILES */
@@ -284,6 +346,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_NEW_BLOCKER         "Create rule for ""%s""..."
 END
+
+
 #endif /* def WIN_GUI_EDIT */
 
 #endif /* English (U.S.) resources */