X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=w32.rc;h=c936b3f98c6b56ec5643eab80fa4e1aa3ef5f364;hb=7cc8a2e93881e34d2695c21c2f302a07f110c5cd;hp=c8c09af7da1ddf92f50da169c032af5d4a3d9ebc;hpb=375061cb39433e194051236d59d496815cc8db9e;p=privoxy.git

diff --git a/w32.rc b/w32.rc
index c8c09af7..c936b3f9 100644
--- a/w32.rc
+++ b/w32.rc
@@ -1,6 +1,6 @@
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/w32.rc,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/Attic/w32.rc,v $
  *
  * Purpose     :  Windows GUI resource script.
  *
@@ -31,6 +31,17 @@
  *
  * Revisions   :
  *    $Log: w32.rc,v $
+ *    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
  *
@@ -120,8 +131,13 @@
  *
  *********************************************************************/
 
-#include <windows.h>
 #include "config.h"
+
+#ifndef STRICT
+#define STRICT
+#endif
+#include <windows.h>
+
 #include "w32res.h"
 
 #ifdef __MINGW32__
@@ -219,21 +235,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
 
@@ -262,12 +278,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"