Modified: trunk/reactos/subsys/system/winefile/Sv.rc
Modified: trunk/reactos/subsys/system/winefile/cs.rc
Modified: trunk/reactos/subsys/system/winefile/de.rc
Modified: trunk/reactos/subsys/system/winefile/en.rc
Modified: trunk/reactos/subsys/system/winefile/es.rc
Modified: trunk/reactos/subsys/system/winefile/fr.rc
Modified: trunk/reactos/subsys/system/winefile/hu.rc
Modified: trunk/reactos/subsys/system/winefile/it.rc
Modified: trunk/reactos/subsys/system/winefile/nl.rc
Modified: trunk/reactos/subsys/system/winefile/pl.rc
Modified: trunk/reactos/subsys/system/winefile/pt.rc
Modified: trunk/reactos/subsys/system/winefile/resource.h
Modified: trunk/reactos/subsys/system/winefile/resource.rc
Modified: trunk/reactos/subsys/system/winefile/ru.rc
Modified: trunk/reactos/subsys/system/winefile/si.rc
Modified: trunk/reactos/subsys/system/winefile/winefile.c
Modified: trunk/reactos/subsys/system/winefile/zh.rc
--- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -33,7 +33,7 @@
MENUITEM "&Flytta...\tF7", ID_FILE_MOVE
MENUITEM "&Kopiera...\tF8", ID_FILE_COPY
MENUITEM "&I urklipp...\tF9", 118
- MENUITEM "&Ta bort\tDel", 108
+ MENUITEM "&Ta bort\tDel", ID_FILE_DELETE
MENUITEM "&Byt namn...", 109
MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -32,7 +32,7 @@
MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE
MENUITEM "&KopÝrovat...\tF8" , ID_FILE_COPY
MENUITEM "&Ve schrßnce...\tF9" , 118
- MENUITEM "&Smazat\tDel" , 108
+ MENUITEM "&Smazat\tDel" , ID_FILE_DELETE
MENUITEM "P°&ejmenovat..." , 109
MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -34,7 +34,7 @@
MENUITEM "&Verschieben...\tF7" , ID_FILE_MOVE
MENUITEM "&Kopieren...\tF8" , ID_FILE_COPY
MENUITEM "&In Zwischenablage...\tF9" , 118
- MENUITEM "&L÷schen\tEntf" , 108
+ MENUITEM "&L÷schen\tEntf" , ID_FILE_DELETE
MENUITEM "&Umbenennen..." , 109
MENUITEM "&Eigenschaften...\tAlt+Eingabetaste" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -34,7 +34,7 @@
MENUITEM "&Move...\tF7" , ID_FILE_MOVE
MENUITEM "&Copy...\tF8" , ID_FILE_COPY
MENUITEM "&In Clipboard...\tF9" , 118
- MENUITEM "&Delete\tDel" , 108
+ MENUITEM "&Delete\tDel" , ID_FILE_DELETE
MENUITEM "Re&name..." , 109
MENUITEM "Propert&ies...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -30,7 +30,7 @@
MENUITEM "Mo&ver...\tF7" , ID_FILE_MOVE
MENUITEM "&Copiar...\tF8" , ID_FILE_COPY
MENUITEM "E&n portapapeles...\tF9" , 118
- MENUITEM "&Eliminar\tDel" , 108
+ MENUITEM "&Eliminar\tDel" , ID_FILE_DELETE
MENUITEM "&Renombrar..." , 109
MENUITEM "&Propiedades...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -33,7 +33,7 @@
MENUITEM "&DÚplacer...\tF7" , ID_FILE_MOVE
MENUITEM "&Copier...\tF8" , ID_FILE_COPY
MENUITEM "P&resse-Papiers...\tF9" , 118
- MENUITEM "&Effacer\tDel" , 108
+ MENUITEM "&Effacer\tDel" , ID_FILE_DELETE
MENUITEM "Re&nommer..." , 109
MENUITEM "&PropriÚtÚs...\tAlt+Entree" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -33,7 +33,7 @@
MENUITEM "?t&helyezÚs...\tF7" , ID_FILE_MOVE
MENUITEM "&Mßsolßs...\tF8" , ID_FILE_COPY
MENUITEM "&Vßg¾lapon...\tF9" , 118
- MENUITEM "&T÷rlÚs\tDel" , 108
+ MENUITEM "&T÷rlÚs\tDel" , ID_FILE_DELETE
MENUITEM "?t&nevezÚs..." , 109
MENUITEM "T&ulajdonsßgok...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -33,7 +33,7 @@
MENUITEM "&Sposta...\tF7" , ID_FILE_MOVE
MENUITEM "&Copia...\tF8" , ID_FILE_COPY
MENUITEM "&Negli Appunti...\tF9" , 118
- MENUITEM "&Cancella\tDel" , 108
+ MENUITEM "&Cancella\tDel" , ID_FILE_DELETE
MENUITEM "Ri&nomina..." , 109
MENUITEM "Propri&etÓ...\tAlt+Invio" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -29,7 +29,7 @@
MENUITEM "&Verplaatsen...\tF7" , ID_FILE_MOVE
MENUITEM "&KopiÙren...\tF8" , ID_FILE_COPY
MENUITEM "Naar &klembord...\tF9" , 118
- MENUITEM "Ver&wijderen\tDel" , 108
+ MENUITEM "Ver&wijderen\tDel" , ID_FILE_DELETE
MENUITEM "&Naam wijzigen..." , 109
MENUITEM "&Eigenschappen...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -33,7 +33,7 @@
MENUITEM "&Przenie£...\tF7" , ID_FILE_MOVE
MENUITEM "&Kopiuj...\tF8" , ID_FILE_COPY
MENUITEM "W s&chowku...\tF9" , 118
- MENUITEM "&Usu±\tDel" , 108
+ MENUITEM "&Usu±\tDel" , ID_FILE_DELETE
MENUITEM "&Zmie± nazwÛ..." , 109
MENUITEM "Ustawie&nia...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -32,7 +32,7 @@
MENUITEM "&Mover...\tF7" , ID_FILE_MOVE
MENUITEM "&Copiar...\tF8" , ID_FILE_COPY
MENUITEM "&In Clipboard...\tF9" , 118
- MENUITEM "E&xcluir\tDel" , 108
+ MENUITEM "E&xcluir\tDel" , ID_FILE_DELETE
MENUITEM "Re&nomear..." , 109
MENUITEM "&Propriedades...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
@@ -160,7 +160,7 @@
MENUITEM "&Mover...\tF7" , ID_FILE_MOVE
MENUITEM "&Copiar...\tF8" , ID_FILE_COPY
MENUITEM "&Na Area de Transferencia...\tF9" , 118
- MENUITEM "E&xcluir\tDel" , 108
+ MENUITEM "E&xcluir\tDel" , ID_FILE_DELETE
MENUITEM "Re&nomear..." , 109
MENUITEM "&Propriedades...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 11:42:46 UTC (rev 15655)
@@ -44,6 +44,7 @@
#define ID_EXECUTE 105
#define ID_FILE_MOVE 106
#define ID_FILE_COPY 107
+#define ID_FILE_DELETE 108
#define ID_FILE_EXIT 115
#define ID_FORMAT_DISK 203
#define ID_CONNECT_NETWORK_DRIVE 252
--- trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -22,6 +22,7 @@
VK_F5, ID_REFRESH, VIRTKEY, NOINVERT
VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT
VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT
+ VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT
VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT
#ifndef _NO_EXTENSIONS
"X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT
--- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -29,7 +29,7 @@
MENUITEM "&¤ÕÕýÕ±?Þ?³...\tF7" , ID_FILE_MOVE
MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8" , ID_FILE_COPY
MENUITEM "&? ß¾¶Õ ¯ßýÕÝÓ...\tF9" , 118
- MENUITEM "&ËõÓÙÞ?³\tDel" , 108
+ MENUITEM "&ËõÓÙÞ?³\tDel" , ID_FILE_DELETE
MENUITEM "¤ÕÕÞýÕݯÔÓ?³..." , 109
MENUITEM "ÐÔ¯Ú±?ÔÓ...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -30,7 +30,7 @@
MENUITEM "&Move...\tF7" , ID_FILE_MOVE
MENUITEM "&Copy...\tF8" , ID_FILE_COPY
MENUITEM "&In Clipboard...\tF9" , 118
- MENUITEM "&Delete\tDel" , 108
+ MENUITEM "&Delete\tDel" , ID_FILE_DELETE
MENUITEM "Re&name..." , 109
MENUITEM "Propert&ies...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR
--- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 11:42:46 UTC (rev 15655)
@@ -4175,6 +4175,18 @@
}
break;}
+ case ID_FILE_DELETE: {
+ TCHAR path[BUFFER_LEN];
+ SHFILEOPSTRUCT shfo = {hwnd, FO_DELETE, path};
+
+ get_path(pane->cur, path);
+
+ path[lstrlen(path)+1] = '\0';
+
+ if (!SHFileOperation(&shfo))
+ refresh_child(child);
+ break;}
+
case ID_VIEW_SORT_NAME:
set_sort_order(child, SORT_NAME);
break;
--- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 09:58:47 UTC (rev 15654)
+++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 11:42:46 UTC (rev 15655)
@@ -30,7 +30,7 @@
MENUITEM "Êã»ú¿&Mú®...\tF7" , ID_FILE_MOVE
MENUITEM "©?Íãú¿&Cú®...\tF8" , ID_FILE_COPY
MENUITEM "??Ë??¶?¨?Õú¿&Iú®...\tF9" , 118
- MENUITEM "?¥?²ú¿&Dú®\tDel" , 108
+ MENUITEM "?¥?²ú¿&Dú®\tDel" , ID_FILE_DELETE
MENUITEM "©??¹ú¿&Nú®..." , 109
MENUITEM "?¶ðÈú¿&Iú®...\tAlt+Enter" , ID_EDIT_PROPERTIES
MENUITEM SEPARATOR