Commit aeea9833 authored by Martin Fuchs's avatar Martin Fuchs Committed by Alexandre Julliard

Display source path in "move file" dialog.

parent a22c767e
...@@ -1597,6 +1597,7 @@ static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, ...@@ -1597,6 +1597,7 @@ static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam,
switch(nmsg) { switch(nmsg) {
case WM_INITDIALOG: case WM_INITDIALOG:
SetWindowLong(hwnd, GWL_USERDATA, lparam); SetWindowLong(hwnd, GWL_USERDATA, lparam);
SetWindowText(GetDlgItem(hwnd, 201), (LPCTSTR)lparam);
return 1; return 1;
case WM_COMMAND: { case WM_COMMAND: {
...@@ -3644,9 +3645,11 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam ...@@ -3644,9 +3645,11 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
case ID_FILE_MOVE: { case ID_FILE_MOVE: {
TCHAR new_name[BUFFER_LEN], old_name[BUFFER_LEN]; TCHAR new_name[BUFFER_LEN], old_name[BUFFER_LEN];
int len; int len, ret;
int ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); get_path(pane->cur, new_name);
ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name);
if (ret != IDOK) if (ret != IDOK)
break; break;
...@@ -3654,12 +3657,10 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam ...@@ -3654,12 +3657,10 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
get_path(pane->cur->up, old_name); get_path(pane->cur->up, old_name);
len = lstrlen(old_name); len = lstrlen(old_name);
if (old_name[len-1]!='\\' && old_name[len-1]!='/') { if (old_name[len-1]!='\\' && old_name[len-1]!='/')
old_name[len++] = '/'; old_name[len++] = '/';
old_name[len] = '\n';
}
lstrcpy(&old_name[len], new_name); lstrcpy(old_name+len, new_name);
lstrcpy(new_name, old_name); lstrcpy(new_name, old_name);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment