diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc index a07e86ab542..31bc7372497 100644 --- a/programs/winefile/Cs.rc +++ b/programs/winefile/Cs.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "J&en strom" , 411 MENUITEM "Jen a&dresáø&" , 412 MENUITEM SEPARATOR - MENUITEM "S&louèit" , 414 + MENUITEM "S&louèit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Název" , ID_VIEW_NAME MENUITEM "&V¹echny detaily" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/De.rc b/programs/winefile/De.rc index a32a3c15837..6bdb21a47d7 100644 --- a/programs/winefile/De.rc +++ b/programs/winefile/De.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Nur St&ruktur" , 411 MENUITEM "Nur &Verzeichnis" , 412 MENUITEM SEPARATOR - MENUITEM "&Teilen" , 414 + MENUITEM "&Teilen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "A&lle Dateiangaben" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index 58d84778d0a..8eb19bd2ff6 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -86,7 +86,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc index cbd819dd682..99517df07c6 100644 --- a/programs/winefile/Es.rc +++ b/programs/winefile/Es.rc @@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Árbol &sólo" , 411 MENUITEM "&Directorio sólo" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidir" , 414 + MENUITEM "Di&vidir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "No&mbre" , ID_VIEW_NAME MENUITEM "T&odos los detalles" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index d468af1a1e8..16481b60b73 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Arbre seulement" , 411 MENUITEM "&Répertoire seulement" , 412 MENUITEM SEPARATOR - MENUITEM "&Séparer" , 414 + MENUITEM "&Séparer" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nom" , ID_VIEW_NAME MENUITEM "Tous &les Détails" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Hu.rc b/programs/winefile/Hu.rc index 3829518046a..c87da932895 100644 --- a/programs/winefile/Hu.rc +++ b/programs/winefile/Hu.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Könyvtárfa" , 411 MENUITEM "&Csak mappák" , 412 MENUITEM SEPARATOR - MENUITEM "&Felosztás" , 414 + MENUITEM "&Felosztás" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Név" , ID_VIEW_NAME MENUITEM "&Minden részlet" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index d4a22322e63..db7ab6e37fa 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "So&lo Albero" , 411 MENUITEM "&Solo Directory" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidi" , 414 + MENUITEM "Di&vidi" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Mostra tutti i dettagli sui file" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index 3e36a38e840..f851db78269 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -83,7 +83,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Alleen hierarchie" , 411 MENUITEM "Alleen &mapinhoud" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&litsen" , 414 + MENUITEM "Sp&litsen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Naam" , ID_VIEW_NAME MENUITEM "&Alle details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index 6e3284e3b02..f6cf3e85e10 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "D&rzewo" , 411 MENUITEM "&Katalogi" , 412 MENUITEM SEPARATOR - MENUITEM "&Po³¹cz" , 414 + MENUITEM "&Po³¹cz" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nazwa" , ID_VIEW_NAME MENUITEM "&Wszystkie atrybuty pliku" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index ac20104c80b..3f193ccf508 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -86,7 +86,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "S&omente árvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED @@ -213,7 +213,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "S&omente árvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc index 101620ce3d9..4aab5dc2099 100644 --- a/programs/winefile/Ru.rc +++ b/programs/winefile/Ru.rc @@ -83,7 +83,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Òîëüêî &äåðåâî" , 411 MENUITEM "Òîëüêî &ïàïêà" , 412 MENUITEM SEPARATOR - MENUITEM "Ðàç&áèòü" , 414 + MENUITEM "Ðàç&áèòü" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "È&ìÿ" , ID_VIEW_NAME MENUITEM "Â&ñå ïîäðîáíîñòè î ôàéëå" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Si.rc b/programs/winefile/Si.rc index 385deabbd3a..2dd9053af46 100644 --- a/programs/winefile/Si.rc +++ b/programs/winefile/Si.rc @@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 10f20e1f1ca..2381482684c 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Bara tr&äd", 411 MENUITEM "Bara &mapp", 412 MENUITEM SEPARATOR - MENUITEM "De&la", 414 + MENUITEM "De&la", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Namn", ID_VIEW_NAME MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index 41c78af60d2..5d3f076621f 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "½öÏÔʾĿ¼Ê÷£¨&E£©" , 411 MENUITEM "½öÏÔʾĿ¼ÄÚÈÝ£¨&O£©" , 412 MENUITEM SEPARATOR - MENUITEM "·Ö¸î£¨&L£©" , 414 + MENUITEM "·Ö¸î£¨&L£©" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "ÎļþÃûÃû£¨&N£©" , ID_VIEW_NAME MENUITEM "ÎļþÏêϤÁÐ±í£¨&A£©" , ID_VIEW_ALL_ATTRIBUTES, CHECKED diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 26fdf1060e9..9df21210ecd 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -51,6 +51,7 @@ #define ID_VIEW_SORT_TYPE 405 #define ID_VIEW_SORT_SIZE 406 #define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_SPLIT 414 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index e782f304da3..2771692cbf7 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -181,6 +181,8 @@ LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) /* globals */ WINEFILE_GLOBALS Globals; +static int last_split; + /* some common string constants */ const static TCHAR sEmpty[] = {'\0'}; const static TCHAR sSpace[] = {' ', '\0'}; @@ -3679,8 +3681,6 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { - static int last_split; - ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); ASSERT(child); @@ -3919,6 +3919,14 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam set_sort_order(child, SORT_DATE); break; + case ID_VIEW_SPLIT: { + last_split = child->split_pos; +#ifdef _NO_EXTENSIONS + draw_splitbar(hwnd, last_split); +#endif + SetCapture(hwnd); + break;} + default: return pane_command(pane, LOWORD(wparam)); }