X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=w32.rc;h=62a0daba258afb9fd9ef9ea69fede47fd08c74ce;hb=5aa9a66de3ca94073dfd36c7ecbeb0cecaca9570;hp=fc3a03a476917d06f9fcec86077f77fe5021a007;hpb=b8bfdd57989b711b79071898d09b81ea38ddcd42;p=privoxy.git
diff --git a/w32.rc b/w32.rc
index fc3a03a4..62a0daba 100644
--- a/w32.rc
+++ b/w32.rc
@@ -5,7 +5,7 @@
* Purpose : Windows GUI resource script.
*
* Copyright : Written by and Copyright (C) 2001-2002 members of
- * the Privoxy team. http://privoxy.org/
+ * 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.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
*
@@ -117,8 +135,13 @@
*
*********************************************************************/
-#include
#include "config.h"
+
+#ifndef STRICT
+#define STRICT
+#endif
+#include
+
#include "w32res.h"
#ifdef __MINGW32__
@@ -150,7 +173,7 @@ 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"
+IDI_IDLE ICON DISCARDABLE "icons/privoxy.ico"
#endif /* Neutral resources */
@@ -216,21 +239,21 @@ BEGIN
BEGIN
MENUITEM "E&xit Privoxy", ID_FILE_EXIT
MENUITEM SEPARATOR
- POPUP "&Options"
+ POPUP "E&dit.."
BEGIN
- MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG
- MENUITEM SEPARATOR
- MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS
- MENUITEM "&Filters...", ID_TOOLS_EDITFILTERS
+ 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_ENABLED, CHECKED
#endif /* def FEATURE_TOGGLE */
- MENUITEM "Show Privoxy &Window", ID_SHOWWINDOW
+ MENUITEM "Show Privoxy &Window", ID_TOGGLE_SHOWWINDOW, CHECKED
END
END
@@ -259,12 +282,12 @@ BEGIN
MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED
MENUITEM SEPARATOR
#endif /* def FEATURE_TOGGLE */
- MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG
- MENUITEM SEPARATOR
- MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS
- MENUITEM "&Filters...", ID_TOOLS_EDITFILTERS
+ 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"