X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32.rc;h=e5b20a418e9bed6a327cfd3eec0f8457ad9d9608;hp=2f3a291b996d6b1207aa0de4fd308452e88583ed;hb=af4000fd934222b7b6043cdd4e19f5ddc2ce99ab;hpb=dcccd4b171466114662ad4d5b1d2e017bb579430 diff --git a/w32.rc b/w32.rc index 2f3a291b..e5b20a41 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,40 @@ * * Revisions : * $Log: w32.rc,v $ + * Revision 1.20 2006/08/18 02:06:25 david__schmidt + * Making icon go back to blue when idle. + * See: bug #967648. + * + * Revision 1.19 2006/07/18 14:48:48 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.17.2.1 2002/08/21 17:58:40 oes + * - Reorder of Win32 menu + * - "Show Privoxy Window" now a toggle + * - Temp kludge to let user and default action file be edited through win32 GUI (FR 592080) + * + * Revision 1.17 2002/03/31 17:19:00 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * 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 +139,13 @@ * *********************************************************************/ -#include #include "config.h" + +#ifndef STRICT +#define STRICT +#endif +#include + #include "w32res.h" #ifdef __MINGW32__ @@ -129,16 +168,16 @@ * 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_IDLE ICON DISCARDABLE "icons/idle.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/privoxy.ico" #endif /* Neutral resources */ @@ -175,13 +214,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 +241,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" + POPUP "E&dit.." BEGIN - MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER - MENUITEM SEPARATOR - MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS - MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE + MENUITEM "&Main Configuration", ID_TOOLS_EDITCONFIG + MENUITEM "&Default Actions", ID_TOOLS_EDITDEFAULTACTIONS + MENUITEM "&User Actions", ID_TOOLS_EDITUSERACTIONS + MENUITEM "&Filters", ID_TOOLS_EDITFILTERS #ifdef FEATURE_TRUST - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST + MENUITEM "&Trust list", 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_TOGGLE_SHOWWINDOW, CHECKED END END @@ -234,7 +273,7 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "&Clear Log", ID_VIEW_CLEARLOG + MENUITEM "&Clear Log\tCtrl+D", ID_VIEW_CLEARLOG MENUITEM SEPARATOR MENUITEM "&Log Messages", ID_VIEW_LOGMESSAGES, CHECKED MENUITEM "Message &Highlighting", ID_VIEW_MESSAGEHIGHLIGHTING, CHECKED @@ -244,26 +283,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 SEPARATOR - MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS - MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE + MENUITEM "Edit Main &Configuration", ID_TOOLS_EDITCONFIG + MENUITEM "Edit &Default Actions", ID_TOOLS_EDITDEFAULTACTIONS + MENUITEM "Edit &User Actions", ID_TOOLS_EDITUSERACTIONS + MENUITEM "Edit &Filters", ID_TOOLS_EDITFILTERS #ifdef FEATURE_TRUST - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST + MENUITEM "Edit &Trust list", 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 @@ -283,6 +322,7 @@ END IDR_ACCELERATOR ACCELERATORS DISCARDABLE BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT + "D", ID_VIEW_CLEARLOG, VIRTKEY, CONTROL, NOINVERT END #endif /* English (U.S.) resources */