X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32.rc;h=20f6a932b51fd59455594ea99e08a7678aa72c1a;hp=2f3a291b996d6b1207aa0de4fd308452e88583ed;hb=02ae34a9a82af3805b1cb5f09864319d62751b53;hpb=dcccd4b171466114662ad4d5b1d2e017bb579430

diff --git a/w32.rc b/w32.rc
index 2f3a291b..20f6a932 100644
--- a/w32.rc
+++ b/w32.rc
@@ -4,8 +4,8 @@
  *
  * Purpose     :  Windows GUI resource script.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ * Copyright   :  Written by and Copyright (C) 2001-2002 members of
+ *                the Privoxy team.  http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -31,6 +31,24 @@
  *
  * Revisions   :
  *    $Log: w32.rc,v $
+ *    Revision 1.16  2002/03/26 22:57:44  jongfoster
+ *    Web server name should begin www.
+ *
+ *    Revision 1.15  2002/03/24 14:29:25  jongfoster
+ *    Renaming icon file
+ *
+ *    Revision 1.14  2002/03/24 12:07:36  jongfoster
+ *    Consistern name for filters file
+ *
+ *    Revision 1.13  2002/03/24 12:03:47  jongfoster
+ *    Name change
+ *
+ *    Revision 1.12  2001/07/30 22:16:07  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
  *    Revision 1.11  2001/07/21 17:53:41  jongfoster
  *    Adding version information block.
  *
@@ -105,8 +123,13 @@
  *
  *********************************************************************/
 
-#include <windows.h>
 #include "config.h"
+
+#ifndef STRICT
+#define STRICT
+#endif
+#include <windows.h>
+
 #include "w32res.h"
 
 #ifdef __MINGW32__
@@ -129,15 +152,15 @@
  * Icon with lowest ID value placed first to ensure application icon
  * remains consistent on all systems.
  */
-IDI_JUNKBUSTER          ICON    DISCARDABLE     "icons/junkbust.ico"
-IDI_JUNKBUSTER1         ICON    DISCARDABLE     "icons/ico00001.ico"
-IDI_JUNKBUSTER2         ICON    DISCARDABLE     "icons/ico00002.ico"
-IDI_JUNKBUSTER3         ICON    DISCARDABLE     "icons/ico00003.ico"
-IDI_JUNKBUSTER4         ICON    DISCARDABLE     "icons/ico00004.ico"
-IDI_JUNKBUSTER5         ICON    DISCARDABLE     "icons/ico00005.ico"
-IDI_JUNKBUSTER6         ICON    DISCARDABLE     "icons/ico00006.ico"
-IDI_JUNKBUSTER7         ICON    DISCARDABLE     "icons/ico00007.ico"
-IDI_JUNKBUSTER8         ICON    DISCARDABLE     "icons/ico00008.ico"
+IDI_MAINICON            ICON    DISCARDABLE     "icons/privoxy.ico"
+IDI_ANIMATED1           ICON    DISCARDABLE     "icons/ico00001.ico"
+IDI_ANIMATED2           ICON    DISCARDABLE     "icons/ico00002.ico"
+IDI_ANIMATED3           ICON    DISCARDABLE     "icons/ico00003.ico"
+IDI_ANIMATED4           ICON    DISCARDABLE     "icons/ico00004.ico"
+IDI_ANIMATED5           ICON    DISCARDABLE     "icons/ico00005.ico"
+IDI_ANIMATED6           ICON    DISCARDABLE     "icons/ico00006.ico"
+IDI_ANIMATED7           ICON    DISCARDABLE     "icons/ico00007.ico"
+IDI_ANIMATED8           ICON    DISCARDABLE     "icons/ico00008.ico"
 IDI_IDLE                ICON    DISCARDABLE     "icons/idle.ico"
 
 #endif /* Neutral resources */
@@ -175,13 +198,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "The ijbswa team - ijbswa.sourceforge.net\0"
-            VALUE "FileDescription", "JunkBuster\0"
+            VALUE "CompanyName", "The Privoxy team - www.privoxy.org\0"
+            VALUE "FileDescription", "Privoxy\0"
             VALUE "FileVersion", VERSION "\0"
-            VALUE "InternalName", "JunkBuster\0"
+            VALUE "InternalName", "Privoxy\0"
             VALUE "LegalCopyright", "Distributed under the GNU GPL\0"
-            VALUE "OriginalFilename", "junkbuster.exe\0"
-            VALUE "ProductName", "JunkBuster\0"
+            VALUE "OriginalFilename", "privoxy.exe\0"
+            VALUE "ProductName", "Privoxy\0"
             VALUE "ProductVersion", VERSION "\0"
         END
     END
@@ -202,23 +225,23 @@ IDR_TRAYMENU MENU DISCARDABLE
 BEGIN
     POPUP "Popup"
     BEGIN
-        MENUITEM "E&xit JunkBuster",   ID_FILE_EXIT
+        MENUITEM "E&xit Privoxy",      ID_FILE_EXIT
         MENUITEM                       SEPARATOR
         POPUP "&Options"
         BEGIN
-            MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
+            MENUITEM "&Configuration...",           ID_TOOLS_EDITCONFIG
             MENUITEM                                SEPARATOR
             MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
-            MENUITEM "Perl &Regexps...",            ID_TOOLS_EDITPERLRE
+            MENUITEM "&Filters...",                 ID_TOOLS_EDITFILTERS
 #ifdef FEATURE_TRUST
             MENUITEM "&Trust...",                   ID_TOOLS_EDITTRUST
 #endif /* def FEATURE_TRUST */
         END
         MENUITEM                              SEPARATOR
 #ifdef FEATURE_TOGGLE
-        MENUITEM "&Enable",                   ID_TOGGLE_IJB, CHECKED
+        MENUITEM "&Enable",                   ID_TOGGLE_ENABLED, CHECKED
 #endif /* def FEATURE_TOGGLE */
-        MENUITEM "Show &JunkBuster Window",   ID_SHOWWINDOW
+        MENUITEM "Show Privoxy &Window",      ID_SHOWWINDOW
     END
 END
 
@@ -244,26 +267,26 @@ BEGIN
     POPUP "&Options"
     BEGIN
 #ifdef FEATURE_TOGGLE
-        MENUITEM "&Enable",                     ID_TOGGLE_IJB, CHECKED
+        MENUITEM "&Enable",                     ID_TOGGLE_ENABLED, CHECKED
         MENUITEM                                SEPARATOR
 #endif /* def FEATURE_TOGGLE */
-        MENUITEM "&Configuration...",           ID_TOOLS_EDITJUNKBUSTER
+        MENUITEM "&Configuration...",           ID_TOOLS_EDITCONFIG
         MENUITEM                                SEPARATOR
         MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
-            MENUITEM "Perl &Regexps...",        ID_TOOLS_EDITPERLRE
+            MENUITEM "&Filters...",             ID_TOOLS_EDITFILTERS
 #ifdef FEATURE_TRUST
             MENUITEM "&Trust...",               ID_TOOLS_EDITTRUST
 #endif /* def FEATURE_TRUST */
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "Junkbuster &FAQ",             ID_HELP_FAQ
-        MENUITEM "Junkbuster &Manual",          ID_HELP_MANUAL
+        MENUITEM "Privoxy &FAQ",                ID_HELP_FAQ
+        MENUITEM "Privoxy &Manual",             ID_HELP_MANUAL
         MENUITEM "GNU &General Public Licence", ID_HELP_GPL
         MENUITEM                                SEPARATOR
-        MENUITEM "Junkbuster Status...",        ID_HELP_STATUS
+        MENUITEM "Privoxy Status...",           ID_HELP_STATUS
         MENUITEM                                SEPARATOR
-        MENUITEM "About Junkbuster...",         ID_HELP_ABOUTJUNKBUSTER
+        MENUITEM "About Privoxy...",            ID_HELP_ABOUT
     END
 END