X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=w32.rc;h=62a0daba258afb9fd9ef9ea69fede47fd08c74ce;hb=04aa89ebca169045e35eca0cdc57600db62b1e09;hp=03525f044a24b6549d64454cd269e8ab871cab5a;hpb=6fad7c1b3c2a9c9d76ad6112f28b0f1db4844952;p=privoxy.git diff --git a/w32.rc b/w32.rc index 03525f04..62a0daba 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,39 @@ * * Revisions : * $Log: w32.rc,v $ + * 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. + * * Revision 1.10 2001/07/19 19:14:19 haroon * - Removed all #ifdef PCRS. The .rc file extension had eluded Andreas. * @@ -102,8 +135,13 @@ * *********************************************************************/ -#include #include "config.h" + +#ifndef STRICT +#define STRICT +#endif +#include + #include "w32res.h" #ifdef __MINGW32__ @@ -126,16 +164,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 */ @@ -172,13 +210,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 @@ -199,23 +237,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 -#ifdef TRUST_FILES - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST -#endif /* def TRUST_FILES */ + 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 list", ID_TOOLS_EDITTRUST +#endif /* def FEATURE_TRUST */ END MENUITEM SEPARATOR -#ifdef TOGGLE - MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED -#endif - MENUITEM "Show &JunkBuster Window", ID_SHOWWINDOW +#ifdef FEATURE_TOGGLE + MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED +#endif /* def FEATURE_TOGGLE */ + MENUITEM "Show Privoxy &Window", ID_TOGGLE_SHOWWINDOW, CHECKED END END @@ -240,27 +278,27 @@ BEGIN END POPUP "&Options" BEGIN -#ifdef TOGGLE - MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED - MENUITEM SEPARATOR -#endif - MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER +#ifdef FEATURE_TOGGLE + MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED MENUITEM SEPARATOR - MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS - MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE -#ifdef TRUST_FILES - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TOGGLE */ + 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 "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 @@ -282,72 +320,4 @@ BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT END -#ifdef WIN_GUI_EDIT - -/* - * Icons - * - * Icon with lowest ID value placed first to ensure application icon - * remains consistent on all systems. - */ -IDI_DENYRULE ICON DISCARDABLE "icons/denyrule.ico" -IDI_ALLOWRULE ICON DISCARDABLE "icons/icon1.ico" - -/* - * Dialog - */ - -IDD_RULES DIALOG DISCARDABLE 0, 0, 239, 225 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Blockers" -FONT 8, "MS Sans Serif" -BEGIN - GROUPBOX "New Rule",IDC_STATIC,5,5,230,55 - LTEXT "For:",IDC_STATIC,10,15,13,8 - EDITTEXT IDC_NEW,10,25,220,12,ES_AUTOHSCROLL - COMBOBOX IDC_ACTION,10,40,75,37,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "C&reate!",IDC_CREATE,90,40,50,14 - GROUPBOX "Rules",IDC_STATIC,5,65,230,135 - CONTROL "List1",IDC_RULES,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | - WS_TABSTOP,10,75,220,100 - PUSHBUTTON "Move &Up",IDC_MOVEUP,10,180,50,14,WS_DISABLED - PUSHBUTTON "Move &Down",IDC_MOVEDOWN,65,180,50,14,WS_DISABLED - PUSHBUTTON "&Delete",IDC_DELETE,120,180,50,14,WS_DISABLED - PUSHBUTTON "&Save",IDC_SAVE,130,205,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,185,205,50,14 -END - - -/* - * DESIGNINFO - */ - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_RULES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 232 - TOPMARGIN, 7 - BOTTOMMARGIN, 218 - END -END -#endif /* def APSTUDIO_INVOKED */ - - -/* - * String Table - */ - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NEW_BLOCKER "Create rule for ""%s""..." -END - - -#endif /* def WIN_GUI_EDIT */ - #endif /* English (U.S.) resources */