mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 02:25:17 +00:00
display source path in "move file" dialog
svn path=/trunk/; revision=15260
This commit is contained in:
parent
6ff7821b69
commit
37de341023
1 changed files with 7 additions and 6 deletions
|
@ -1645,6 +1645,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: {
|
||||||
|
@ -3713,9 +3714,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;
|
||||||
|
|
||||||
|
@ -3723,12 +3726,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue