From 4ad381d8959ba11a2991e6001464d367dd4054ab Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 4 Apr 2004 03:41:07 +0000 Subject: [PATCH] shell-extension-20040403 Fix missing resource strings for Symbolic Links and error strings (english only) --- .../client_exp/lang/en_US/afs_shl_ext.rc | 12 ++++++ src/WINNT/client_exp/resource.h | 43 ++++++++++--------- src/WINNT/client_exp/shell_ext.cpp | 9 ++-- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc b/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc index 57b325f623..0933ba43a3 100644 --- a/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc @@ -633,6 +633,18 @@ BEGIN IDS_REALLY_REMOVE_SYMLINK "Are you sure you want to remove the selected Symbolic Link?" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYMBOLICLINK_ADD "&Add" + IDS_SYMBOLICLINK_EDIT "&Edit..." + IDS_SYMBOLICLINK_REMOVE "&Remove" + IDS_SYMBOLIC_LINK_ITEM "Symbolic &Link" + IDS_UNABLE_TO_CREATE_SYMBOLIC_LINK "Unable to create symbolic link: %o." + IDS_UNABLE_TO_SET_CURRENT_DIRECTORY "Unable to set current directory." + IDS_CURRENT_DIRECTORY_PATH_TOO_LONG "Current directory pathname is too long." + IDS_CLEANACL_ERROR "Error Cleaning ACL(s)" +END + STRINGTABLE DISCARDABLE BEGIN AFX_IDS_APP_TITLE "AFS Client" diff --git a/src/WINNT/client_exp/resource.h b/src/WINNT/client_exp/resource.h index 82c47be32b..702eab9351 100644 --- a/src/WINNT/client_exp/resource.h +++ b/src/WINNT/client_exp/resource.h @@ -126,25 +126,27 @@ #define IDS_CURRENT_DIRECTORY_PATH_TOO_LONG 134 #define IDS_CLEANACL_ERROR 135 -#define IDM_AUTHENTICATION 901 -#define IDM_ACL_SET 902 -#define IDM_VOLUME_PROPERTIES 903 -#define IDM_VOLUMEPARTITION_UPDATENAMEIDTABLE 904 -#define IDM_MOUNTPOINT_SHOW 905 -#define IDM_MOUNTPOINT_REMOVE 906 -#define IDM_MOUNTPOINT_MAKE 907 -#define IDM_FLUSH 908 -#define IDM_FLUSH_VOLUME 909 -#define IDM_SHOW_SERVER 910 -#define IDM_SHOWCELL 911 -#define IDM_SERVER_STATUS 912 -#define IDM_SYMBOLICLINK_REMOVE 913 -#define IDM_SYMBOLICLINK_ADD 914 -#define IDM_SUBMOUNTS 915 -#define IDM_ACL_CLEAN 916 +#define IDM_AUTHENTICATION 0 +#define IDM_ACL_SET 1 +#define IDM_VOLUME_PROPERTIES 2 +#define IDM_VOLUMEPARTITION_UPDATENAMEIDTABLE 3 +#define IDM_MOUNTPOINT_SHOW 4 +#define IDM_MOUNTPOINT_REMOVE 5 +#define IDM_MOUNTPOINT_MAKE 6 +#define IDM_FLUSH 7 +#define IDM_FLUSH_VOLUME 8 +#define IDM_SHOW_SERVER 9 +#define IDM_SHOWCELL 10 +#define IDM_SERVER_STATUS 11 +#define IDM_SYMBOLICLINK_REMOVE 12 +#define IDM_SYMBOLICLINK_ADD 13 +#define IDM_SUBMOUNTS 14 +#define IDM_ACL_CLEAN 15 +#define IDM_SUBMOUNTS_EDIT 16 +#define IDM_REMOVE_SYMLINK 17 + #define ID_GET_TOKENS 917 #define ID_DISCARD_TOKENS 918 -#define IDM_SUBMOUNTS_EDIT 919 #define IDD_KLOG_DIALOG 920 #define IDR_MENU_FILE 930 #define IDD_VOLUME_INFO 931 @@ -168,7 +170,9 @@ #define IDD_UNLOG_DIALOG 954 #define IDD_ADD_SUBMOUNT 955 #define IDD_SYMBOLICLINK_ADD 956 -#define IDM_REMOVE_SYMLINK 957 +#define ID_REMOVE_SYMLINK 957 +#define ID_SYMBOLICLINK_ADD 958 +#define ID_SYMBOLICLINK_REMOVE 959 #define IDC_LIST 1001 #define IDC_PASSWORD 1002 #define IDC_OFFLINE_MSG 1003 @@ -255,9 +259,6 @@ #define IDC_STATIC_CONTROL2 1084 #define IDC_SHARE_NAME 1085 #define IDC_PATH_NAME 1086 -#define ID_REMOVE_SYMLINK 32828 -#define ID_SYMBOLICLINK_ADD 59195 -#define ID_SYMBOLICLINK_REMOVE 59196 // Next default values for new objects diff --git a/src/WINNT/client_exp/shell_ext.cpp b/src/WINNT/client_exp/shell_ext.cpp index 832e26a711..afe3325495 100644 --- a/src/WINNT/client_exp/shell_ext.cpp +++ b/src/WINNT/client_exp/shell_ext.cpp @@ -237,11 +237,10 @@ STDMETHODIMP CShellExt::XMenuExt::QueryContextMenu(HMENU hMenu,UINT indexMenu, HMENU hSymbolicMenu = CreatePopupMenu(); int indexSymbolicMenu = 0; ::InsertMenu(hSymbolicMenu, indexSymbolicMenu++, MF_STRING | MF_BYPOSITION, idCmdFirst + IDM_SYMBOLICLINK_ADD, GetMessageString(IDS_SYMBOLICLINK_ADD)); - // ::InsertMenu(hSymbolicMenu, indexSymbolicMenu++, MF_STRING | MF_BYPOSITION, idCmdFirst + IDM_SYMBOLICLINK_EDIT, GetMessageString(IDS_SYMBOLICLINK_EDIT)); - ::InsertMenu(hSymbolicMenu, indexSymbolicMenu++, MF_STRING | MF_BYPOSITION, idCmdFirst + IDM_SYMBOLICLINK_REMOVE, GetMessageString(IDS_SYMBOLICLINK_REMOVE)); - - ::EnableMenuItem(hSymbolicMenu,1,((pThis->m_bIsSymlink)?MF_ENABLED:MF_GRAYED)|MF_BYPOSITION); - // ::EnableMenuItem(hSymbolicMenu,2,((pThis->m_bIsSymlink)?MF_ENABLED:MF_GRAYED)|MF_BYPOSITION); + // ::InsertMenu(hSymbolicMenu, indexSymbolicMenu, MF_STRING | MF_BYPOSITION, idCmdFirst + IDM_SYMBOLICLINK_EDIT, GetMessageString(IDS_SYMBOLICLINK_EDIT)); + // ::EnableMenuItem(hSymbolicMenu,indexSymbolicMenu++,((pThis->m_bIsSymlink)?MF_ENABLED:MF_GRAYED)|MF_BYPOSITION); + ::InsertMenu(hSymbolicMenu, indexSymbolicMenu, MF_STRING | MF_BYPOSITION, idCmdFirst + IDM_SYMBOLICLINK_REMOVE, GetMessageString(IDS_SYMBOLICLINK_REMOVE)); + ::EnableMenuItem(hSymbolicMenu,indexSymbolicMenu++,((pThis->m_bIsSymlink)?MF_ENABLED:MF_GRAYED)|MF_BYPOSITION); ::InsertMenu(hAfsMenu, indexAfsMenu++, MF_STRING | MF_BYPOSITION | MF_POPUP, (UINT)hSymbolicMenu, GetMessageString(IDS_SYMBOLIC_LINK_ITEM)); // The Submounts menu has been removed because the AFS tray icon