Index: src/ch/FeedbackFileErrorDlg.cpp
===================================================================
diff -u -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -ref2f46d0fc21e0006c7d11b12f94049f4546476e
--- src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
+++ src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision ef2f46d0fc21e0006c7d11b12f94049f4546476e)
@@ -45,7 +45,7 @@
DDX_Control(pDX, IDC_SKIP_BUTTON, m_btnSkip);
DDX_Control(pDX, IDC_CUSTOM_RULES_BUTTON, m_btnCustomRules);
DDX_Control(pDX, IDC_PAUSE_BUTTON, m_btnPause);
- DDX_Control(pDX, IDC_CANCEL_BUTTON, m_btnCancel);
+ DDX_Control(pDX, IDCANCEL, m_btnCancel);
}
BEGIN_MESSAGE_MAP(CFeedbackFileErrorDlg, ictranslate::CLanguageDialog)
@@ -65,27 +65,28 @@
SetIcon(hIcon, FALSE);
AddResizableControl(IDC_HEADER_STATIC, 0.0, 0.0, 0.0, 0.0);
- AddResizableControl(IDC_ERROR_DETAILS_STATIC, 0.0, 0.0, 0.0, 0.0);
- AddResizableControl(IDC_NAMES_STATIC, 0.0, 0.0, 1.0, 0.0);
- AddResizableControl(IDC_FILENAME_EDIT, 0.0, 0.0, 1.0, 1.0);
- AddResizableControl(IDC_SECOND_FILENAME_EDIT, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_OPERATION_STATIC, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_OPERATION_EDIT, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_SYSTEM_ERROR_STATIC, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_SYSTEM_ERROR_EDIT, 0.0, 1.0, 0.0, 0.0);
+ AddResizableControl(IDC_ERROR_DETAILS_STATIC, 0.0, 0.0, 1.0, 1.0);
+ AddResizableControl(IDC_SRC_NAME_STATIC, 0.0, 0.0, 0.0, 0.0);
+ AddResizableControl(IDC_FILENAME_EDIT, 0.0, 0.0, 1.0, 0.0);
+ AddResizableControl(IDC_DST_NAME_STATIC, 0.0, 0.0, 0.0, 0.0);
+ AddResizableControl(IDC_SECOND_FILENAME_EDIT, 0.0, 0.0, 1.0, 0.0);
+ AddResizableControl(IDC_OPERATION_STATIC, 0.0, 0.0, 0.0, 0.0);
+ AddResizableControl(IDC_OPERATION_EDIT, 0.0, 0.0, 1.0, 0.0);
+ AddResizableControl(IDC_SYSTEM_ERROR_STATIC, 0.0, 0.0, 0.0, 0.0);
+ AddResizableControl(IDC_SYSTEM_ERROR_EDIT, 0.0, 0.0, 1.0, 1.0);
- AddResizableControl(IDC_RETRY_BUTTON, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_SKIP_BUTTON, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_CUSTOM_RULES_BUTTON, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDC_PAUSE_BUTTON, 0.0, 1.0, 0.0, 0.0);
- AddResizableControl(IDCANCEL, 0.0, 1.0, 0.0, 0.0);
+ AddResizableControl(IDC_RETRY_BUTTON, 0.34, 1.0, 0.33, 0.0);
+ AddResizableControl(IDC_SKIP_BUTTON, 0.67, 1.0, 0.33, 0.0);
+ AddResizableControl(IDC_CUSTOM_RULES_BUTTON, 0.0, 1.0, 0.34, 0.0);
+ AddResizableControl(IDC_PAUSE_BUTTON, 0.34, 1.0, 0.33, 0.0);
+ AddResizableControl(IDCANCEL, 0.67, 1.0, 0.33, 0.0);
InitializeResizableControls();
// set menus on buttons
HMENU hMenu = GetResManager().LoadMenu(MAKEINTRESOURCE(IDR_ERROR_MASS_RETRY_MENU));
m_menuMassRetry.Attach(hMenu);
- m_btnRetry.m_hMenu = m_menuMassSkip.GetSubMenu(0)->GetSafeHmenu();
+ m_btnRetry.m_hMenu = m_menuMassRetry.GetSubMenu(0)->GetSafeHmenu();
m_btnRetry.m_bDefaultClick = TRUE;
hMenu = GetResManager().LoadMenu(MAKEINTRESOURCE(IDR_ERROR_MASS_SKIP_MENU));
@@ -99,7 +100,7 @@
m_ctlOperationType.SetWindowText(strOperationType);
m_ctlFirstName.SetWindowText(m_strSrcPath);
- m_ctlSecondName.SetWindowText(m_strDstPath);
+ m_ctlSecondName.SetWindowText(m_strDstPath.IsEmpty() ? CString(L"-") : m_strDstPath);
// get system error string
string::TString strError = chcore::TWin32ErrorFormatter::FormatWin32ErrorCode(m_ulSysError, true);
Index: src/ch/ch.rc
===================================================================
diff -u -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -ref2f46d0fc21e0006c7d11b12f94049f4546476e
--- src/ch/ch.rc (.../ch.rc) (revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
+++ src/ch/ch.rc (.../ch.rc) (revision ef2f46d0fc21e0006c7d11b12f94049f4546476e)
@@ -87,17 +87,18 @@
LTEXT "Encountered an error while processing file.",IDC_HEADER_STATIC,7,7,261,8
CONTROL "C&ustom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,7,132,81,14
CONTROL "&Pause",IDC_PAUSE_BUTTON,"MfcButton",WS_TABSTOP,97,132,81,14
- CONTROL "&Cancel",IDC_CANCEL_BUTTON,"MfcButton",WS_TABSTOP,187,132,81,14
+ CONTROL "&Cancel",IDCANCEL,"MfcButton",WS_TABSTOP,187,132,81,14
CONTROL "&Skip",IDC_SKIP_BUTTON,"MfcMenuButton",WS_TABSTOP,187,112,81,14
CONTROL "&Retry",IDC_RETRY_BUTTON,"MfcMenuButton",WS_TABSTOP,97,112,81,14
- EDITTEXT IDC_FILENAME_EDIT,92,40,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- LTEXT "Names:",IDC_NAMES_STATIC,45,40,45,8
- EDITTEXT IDC_OPERATION_EDIT,92,65,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- LTEXT "Operation:",IDC_OPERATION_STATIC,45,65,45,8
- EDITTEXT IDC_SYSTEM_ERROR_EDIT,92,77,169,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- LTEXT "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,45,8
- EDITTEXT IDC_SECOND_FILENAME_EDIT,92,52,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_FILENAME_EDIT,103,40,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ LTEXT "File:",IDC_SRC_NAME_STATIC,45,40,54,8
+ EDITTEXT IDC_OPERATION_EDIT,103,65,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ LTEXT "Operation:",IDC_OPERATION_STATIC,45,65,54,8
+ EDITTEXT IDC_SYSTEM_ERROR_EDIT,103,77,158,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY
+ LTEXT "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,54,8
+ EDITTEXT IDC_SECOND_FILENAME_EDIT,103,52,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
GROUPBOX "Error details",IDC_ERROR_DETAILS_STATIC,7,22,261,86
+ LTEXT "Alternate file:",IDC_DST_NAME_STATIC,45,52,54,8
END
IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23
@@ -1333,7 +1334,7 @@
0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41,
0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761,
0x4f65, 0x526e, 0x6769, 0x7468, "\076"
- IDC_CANCEL_BUTTON, 0x37c, 369, 0
+ IDCANCEL, 0x37c, 369, 0
0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65,
0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69,
Index: src/ch/resource.h
===================================================================
diff -u -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -ref2f46d0fc21e0006c7d11b12f94049f4546476e
--- src/ch/resource.h (.../resource.h) (revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
+++ src/ch/resource.h (.../resource.h) (revision ef2f46d0fc21e0006c7d11b12f94049f4546476e)
@@ -446,9 +446,9 @@
#define IDC_SOURCE_DATE_STATIC 1417
#define IDC_DST_DATE_STATIC 1418
#define IDC_ERROR_DETAILS_STATIC 1423
-#define IDC_NAMES_STATIC 1424
#define IDC_FILENAME_EDIT 1425
#define IDC_LOCATION_STATIC 1426
+#define IDC_NAMES_STATIC2 1426
#define IDC_REQUIRED_SPACE_HDR_STATIC 1427
#define IDC_AVAILABLE_SPACE_HDR_STATIC 1428
#define IDC_DETAILS_STATIC 1429