- remove duplicate properties entry in recycle bin context menu shell extension

- make string "empty recycle bin" translatable
- bug 3289

svn path=/trunk/; revision=34125
This commit is contained in:
Johannes Anderwald 2008-06-27 08:53:55 +00:00
parent 43695ec25d
commit bf27f86d38
30 changed files with 39 additions and 17 deletions

View file

@ -662,6 +662,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Íàñòðîéêè íà ïàïêèòå"
IDS_RECYCLEBIN_LOCATION "Ìÿñòî íà êîø÷åòî"
IDS_RECYCLEBIN_DISKSPACE "Ñâîáîäíî ìÿñòî"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Èçáåðåòå çíà÷å"
IDS_PICK_ICON_FILTER "Ôàéëîâå ñúñ çíà÷åòà(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Èçïúëíèìè ôàéëîâå\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -660,6 +660,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Ordneroptionen"
IDS_RECYCLEBIN_LOCATION "Papierkorbpfad"
IDS_RECYCLEBIN_DISKSPACE "freier Speicher"
IDS_EMPTY_BITBUCKET "Papierkorb leeren"
IDS_PICK_ICON_TITLE "Symbol auswählen"
IDS_PICK_ICON_FILTER "Symboldateien(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Programme\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -661,6 +661,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Opciones de carpetas"
IDS_RECYCLEBIN_LOCATION "Ubicación de la Papelera de reciclaje"
IDS_RECYCLEBIN_DISKSPACE "Espacio disponible"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Seleccione un icono"
IDS_PICK_ICON_FILTER "Archivos de iconos(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -663,6 +663,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Options du dossier"
IDS_RECYCLEBIN_LOCATION "Emplacement de la corbeille"
IDS_RECYCLEBIN_DISKSPACE "Espace disponible"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choisir une icône"
IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Fichiers exécutables\0*.exe\0"

View file

@ -662,6 +662,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -660,8 +660,9 @@ BEGIN
IDS_FOLDER_OPTIONS "Opzioni della cartella"
IDS_RECYCLEBIN_LOCATION "Posizione del Cestino"
IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Scegliere un icona"
IDS_PICK_ICON_FILTER "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_PICK_ICON_FILTER "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "File eseguibili\0*.exe\0"
IDS_DIRECTORY "Cartella"
IDS_VIRTUAL_DRIVER "Virtual Device Driver"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -665,6 +665,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Opcje katalogów"
IDS_RECYCLEBIN_LOCATION "Lokalizacja kosza"
IDS_RECYCLEBIN_DISKSPACE "Pozosta³o wolnego miejsca"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Wybierz ikonê"
IDS_PICK_ICON_FILTER "Pliki ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Programy\0*.exe\0"

View file

@ -661,6 +661,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -661,6 +661,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -657,6 +657,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Ñâîéñòâà ïàïêè"
IDS_RECYCLEBIN_LOCATION "Ðàñïîëîæåíèå Êîðçèíû"
IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê"
IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû\0*.exe\0"

View file

@ -665,6 +665,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Možnosti prieèinka"
IDS_RECYCLEBIN_LOCATION "Umiestnenia Koša" //Recycle Bin Location
IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Súbory ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Spustite¾né súbory\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -659,6 +659,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -660,6 +660,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Âëàñòèâîñò³ ïàïêè"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -660,6 +660,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -660,6 +660,7 @@ BEGIN
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"

View file

@ -680,12 +680,10 @@ static HRESULT WINAPI
RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT indexMenu,
UINT idCmdFirst, UINT idCmdLast, UINT uFlags )
{
RecycleBin * This = impl_from_IContextMenu(iface);
static WCHAR szOpen[] = { 'O','p','e','n',0 };
static WCHAR szEmpty[] = { 'E','m','p','t','y',' ','R','e','c','y','c','l','e',' ','B','i','n',0 };
static WCHAR szProperties[] = { 'P','r','o','p','e','r','t','i','e','s',0 };
WCHAR szBuffer[100];
MENUITEMINFOW mii;
int id = 1;
RecycleBin * This = impl_from_IContextMenu(iface);
TRACE("%p %p %u %u %u %u\n", This,
hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags );
@ -696,7 +694,10 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
memset( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
mii.dwTypeData = (LPWSTR)szOpen;
szBuffer[0] = L'\0';
LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
mii.dwTypeData = (LPWSTR)szBuffer;
mii.cch = strlenW( mii.dwTypeData );
mii.wID = idCmdFirst + id++;
mii.fState = MFS_ENABLED;
@ -707,7 +708,9 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
This->iIdOpen = 1;
mii.fState = MFS_ENABLED;
mii.dwTypeData = (LPWSTR)szEmpty;
szBuffer[0] = L'\0';
LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
mii.cch = strlenW( mii.dwTypeData );
mii.wID = idCmdFirst + id++;
if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii ))
@ -716,16 +719,6 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
return E_FAIL;
}
This->iIdEmpty = 2;
mii.fState = MFS_ENABLED;
mii.dwTypeData = (LPWSTR)szProperties;
mii.cch = strlenW( mii.dwTypeData );
mii.wID = idCmdFirst + id++;
if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii ))
{
TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties");
return E_FAIL;
}
This->iIdProperties = 3;
return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id );
}

View file

@ -132,6 +132,7 @@
#define IDS_INI_FILE 169
#define IDS_LNK_FILE 170
#define IDS_SYS_FILE 171
#define IDS_EMPTY_BITBUCKET 172
/* Note: this string is referenced from the registry */
#define IDS_RECYCLEBIN_FOLDER_NAME 8964