Merge pull request #2174 from akruphi/explain_move_symlinks_fix1683

Move dialog: explaining dirs processing slowly depend on symlink combobox
elfmz · Apr 21, 2024 · 47a5092 · 47a5092
2 parents 33f1269 + d6b7c44
commit 47a5092
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/far2l/bootstrap/scripts/farlang.templ.m4 b/far2l/bootstrap/scripts/farlang.templ.m4
@@ -3765,6 +3765,17 @@ upd:"Always copy target &file"
 "Копіювати як &файл"
 "Капіяваць як &файл"
 
+LinkCopyMoveExplainText
+" ('умно' && 'как файл': всегда каталоги медленно, пофайлово)"
+" ('smartly' && 'target': always process dirs slowly by each file)"
+upd:" ('smartly' && 'target': always process dirs slowly by each file)"
+upd:" ('smartly' && 'target': always process dirs slowly by each file)"
+upd:" ('smartly' && 'target': always process dirs slowly by each file)"
+upd:" ('smartly' && 'target': always process dirs slowly by each file)"
+upd:" ('smartly' && 'target': always process dirs slowly by each file)"
+" ('розумно' && 'як файл': завжди каталоги повільно, пофайлово)"
+" ('разумна' && 'як файл': заўсёды каталогі павольна, пафайлава)"
+
 CopySparseFiles
 "Создавать &разреженные файлы"
 "Produce &sparse files"

diff --git a/far2l/src/copy.cpp b/far2l/src/copy.cpp
@@ -164,6 +164,7 @@ enum enumShellCopy
 	ID_SC_USECOW,
 	ID_SC_COPYSYMLINK_TEXT,
 	ID_SC_COPYSYMLINK_COMBO,
+	ID_SC_COPYSYMLINK_EXPLAIN_TEXT,
 	ID_SC_SEPARATOR3,
 	ID_SC_USEFILTER,
 	ID_SC_SEPARATOR4,
@@ -633,7 +634,8 @@ ShellCopy::ShellCopy(Panel *SrcPanel,		// исходная панель (акт
 	 *** Prepare Dialog Controls
 	 ***********************************************************************
 	 */
-	int DLG_HEIGHT = 19, DLG_WIDTH = 76;
+	int msh = Move ? 1 : 0;
+	int DLG_HEIGHT = 19 + msh, DLG_WIDTH = 76;
 
 	DialogDataEx CopyDlgData[] = {
 		{DI_DOUBLEBOX, 3,  1,  (SHORT)(DLG_WIDTH - 4), (SHORT)(DLG_HEIGHT - 2), {}, 0, Msg::CopyDlgTitle},
@@ -650,13 +652,14 @@ ShellCopy::ShellCopy(Panel *SrcPanel,		// исходная панель (акт
 		{DI_CHECKBOX,  5,  11, 0,  11, {}, 0, Msg::CopyUseCOW},
 		{DI_TEXT,      5,  12, 0,  12, {}, 0, Msg::CopySymLinkText},
 		{DI_COMBOBOX,  29, 12, 70, 12, {}, DIF_DROPDOWNLIST | DIF_LISTNOAMPERSAND | DIF_LISTWRAPMODE, L""},
-		{DI_TEXT,      3,  13, 0,  13, {}, DIF_SEPARATOR, L""},
-		{DI_CHECKBOX,  5,  14, 0,  14, {UseFilter ? BSTATE_CHECKED : BSTATE_UNCHECKED}, DIF_AUTOMATION, Msg::CopyUseFilter},
-		{DI_TEXT,      3,  15, 0,  15, {}, DIF_SEPARATOR, L""},
-		{DI_BUTTON,    0,  16, 0,  16, {}, DIF_DEFAULT | DIF_CENTERGROUP, Msg::CopyDlgCopy},
-		{DI_BUTTON,    0,  16, 0,  16, {}, DIF_CENTERGROUP | DIF_BTNNOCLOSE, Msg::CopyDlgTree},
-		{DI_BUTTON,    0,  16, 0,  16, {}, DIF_CENTERGROUP | DIF_BTNNOCLOSE | DIF_AUTOMATION | (UseFilter ? 0 : DIF_DISABLE), Msg::CopySetFilter},
-		{DI_BUTTON,    0,  16, 0,  16, {}, DIF_CENTERGROUP, Msg::CopyDlgCancel                          },
+		{DI_TEXT,      5,  13, 0,  13, {}, DIF_HIDDEN, Msg::LinkCopyMoveExplainText},
+		{DI_TEXT,      3,  (SHORT)(13 + msh), 0,  (SHORT)(13 + msh), {}, DIF_SEPARATOR, L""},
+		{DI_CHECKBOX,  5,  (SHORT)(14 + msh), 0,  (SHORT)(14 + msh), {UseFilter ? BSTATE_CHECKED : BSTATE_UNCHECKED}, DIF_AUTOMATION, Msg::CopyUseFilter},
+		{DI_TEXT,      3,  (SHORT)(15 + msh), 0,  (SHORT)(15 + msh), {}, DIF_SEPARATOR, L""},
+		{DI_BUTTON,    0,  (SHORT)(16 + msh), 0,  (SHORT)(16 + msh), {}, DIF_DEFAULT | DIF_CENTERGROUP, Msg::CopyDlgCopy},
+		{DI_BUTTON,    0,  (SHORT)(16 + msh), 0,  (SHORT)(16 + msh), {}, DIF_CENTERGROUP | DIF_BTNNOCLOSE, Msg::CopyDlgTree},
+		{DI_BUTTON,    0,  (SHORT)(16 + msh), 0,  (SHORT)(16 + msh), {}, DIF_CENTERGROUP | DIF_BTNNOCLOSE | DIF_AUTOMATION | (UseFilter ? 0 : DIF_DISABLE), Msg::CopySetFilter},
+		{DI_BUTTON,    0,  (SHORT)(16 + msh), 0,  (SHORT)(16 + msh), {}, DIF_CENTERGROUP, Msg::CopyDlgCancel},
 		{DI_TEXT,      5,  2,  0,  2,  {}, DIF_SHOWAMPERSAND, L""}
 	};
 	MakeDialogItemsEx(CopyDlgData, CopyDlg);
@@ -697,6 +700,7 @@ ShellCopy::ShellCopy(Panel *SrcPanel,		// исходная панель (акт
 		{
 			CopyDlg[ID_SC_MULTITARGET].Selected = 0;
 			CopyDlg[ID_SC_MULTITARGET].Flags|= DIF_DISABLE;
+			CopyDlg[ID_SC_COPYSYMLINK_EXPLAIN_TEXT].Flags = DIF_DISABLE;
 		}
 		//		else // секция про копирование
 		//		{