diff --git a/reactos/subsys/system/winefile/Sv.rc b/reactos/subsys/system/winefile/Sv.rc index 6dbbb7288b0..d0cb1e27171 100644 --- a/reactos/subsys/system/winefile/Sv.rc +++ b/reactos/subsys/system/winefile/Sv.rc @@ -33,7 +33,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/cs.rc b/reactos/subsys/system/winefile/cs.rc index e102c9f7c74..7d5bb4c48f8 100644 --- a/reactos/subsys/system/winefile/cs.rc +++ b/reactos/subsys/system/winefile/cs.rc @@ -32,7 +32,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/de.rc b/reactos/subsys/system/winefile/de.rc index 5351be0984b..bb30272f547 100644 --- a/reactos/subsys/system/winefile/de.rc +++ b/reactos/subsys/system/winefile/de.rc @@ -34,7 +34,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/en.rc b/reactos/subsys/system/winefile/en.rc index d262101f14d..7ec3d0e1742 100644 --- a/reactos/subsys/system/winefile/en.rc +++ b/reactos/subsys/system/winefile/en.rc @@ -34,7 +34,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/es.rc b/reactos/subsys/system/winefile/es.rc index 649ec9ee8db..d6adb3232db 100644 --- a/reactos/subsys/system/winefile/es.rc +++ b/reactos/subsys/system/winefile/es.rc @@ -30,7 +30,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/fr.rc b/reactos/subsys/system/winefile/fr.rc index bc9d83d776d..5784f804128 100644 --- a/reactos/subsys/system/winefile/fr.rc +++ b/reactos/subsys/system/winefile/fr.rc @@ -33,7 +33,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/hu.rc b/reactos/subsys/system/winefile/hu.rc index 0293e02f918..7591a291b70 100644 --- a/reactos/subsys/system/winefile/hu.rc +++ b/reactos/subsys/system/winefile/hu.rc @@ -33,7 +33,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/it.rc b/reactos/subsys/system/winefile/it.rc index 95ccd58ce89..2ba5199cde7 100644 --- a/reactos/subsys/system/winefile/it.rc +++ b/reactos/subsys/system/winefile/it.rc @@ -33,7 +33,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/nl.rc b/reactos/subsys/system/winefile/nl.rc index 3367de47131..d7bf79a14fc 100644 --- a/reactos/subsys/system/winefile/nl.rc +++ b/reactos/subsys/system/winefile/nl.rc @@ -29,7 +29,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/pl.rc b/reactos/subsys/system/winefile/pl.rc index cbbb42824d0..815ceedc3cc 100644 --- a/reactos/subsys/system/winefile/pl.rc +++ b/reactos/subsys/system/winefile/pl.rc @@ -33,7 +33,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/pt.rc b/reactos/subsys/system/winefile/pt.rc index e37ade8a2cd..bbaaed77b22 100644 --- a/reactos/subsys/system/winefile/pt.rc +++ b/reactos/subsys/system/winefile/pt.rc @@ -32,7 +32,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/resource.h b/reactos/subsys/system/winefile/resource.h index f4f2f0df12f..a90329e7d14 100644 --- a/reactos/subsys/system/winefile/resource.h +++ b/reactos/subsys/system/winefile/resource.h @@ -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 diff --git a/reactos/subsys/system/winefile/resource.rc b/reactos/subsys/system/winefile/resource.rc index 3b77ffc76fd..c1d15b3826f 100644 --- a/reactos/subsys/system/winefile/resource.rc +++ b/reactos/subsys/system/winefile/resource.rc @@ -22,6 +22,7 @@ IDA_WINEFILE ACCELERATORS DISCARDABLE 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 diff --git a/reactos/subsys/system/winefile/ru.rc b/reactos/subsys/system/winefile/ru.rc index df191e0f4b4..851282c50ed 100644 --- a/reactos/subsys/system/winefile/ru.rc +++ b/reactos/subsys/system/winefile/ru.rc @@ -29,7 +29,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/si.rc b/reactos/subsys/system/winefile/si.rc index 6a59543c706..8ea04a1f00a 100644 --- a/reactos/subsys/system/winefile/si.rc +++ b/reactos/subsys/system/winefile/si.rc @@ -30,7 +30,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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 diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c index 5e6a647388c..9ac5b9c119b 100644 --- a/reactos/subsys/system/winefile/winefile.c +++ b/reactos/subsys/system/winefile/winefile.c @@ -4175,6 +4175,18 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam } 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; diff --git a/reactos/subsys/system/winefile/zh.rc b/reactos/subsys/system/winefile/zh.rc index 1eb8c6694fa..c31af4f7f78 100644 --- a/reactos/subsys/system/winefile/zh.rc +++ b/reactos/subsys/system/winefile/zh.rc @@ -30,7 +30,7 @@ IDM_WINEFILE MENU FIXED IMPURE 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