diff --git a/cmd/MakeBin.cmd b/cmd/MakeBin.cmd index f2f6505..e8a8530 100644 --- a/cmd/MakeBin.cmd +++ b/cmd/MakeBin.cmd @@ -33,12 +33,13 @@ rmdir %TMP_DIR% /q /s if not exist %TMP_DIR% mkdir %TMP_DIR% xcopy %RELEASE_DIR%\data\* %TMP_DIR%\data\* /y /i /s -xcopy %RELEASE_DIR%\*.exe %TMP_DIR%\* /y /i -xcopy %RELEASE_DIR%\*.dll %TMP_DIR%\* /y /i +xcopy %RELEASE_DIR%\AntiDupl*.exe %TMP_DIR%\* /y /i +xcopy %RELEASE_DIR%\AntiDupl*.dll %TMP_DIR%\* /y /i xcopy %RELEASE_DIR%\AntiDupl.NET.WinForms.runtimeconfig.json %TMP_DIR%\* /y /i erase %TMP_DIR%\data\resources\strings\English.xml /q /s /f erase %TMP_DIR%\data\resources\strings\Russian.xml /q /s /f +erase %TMP_DIR%\AntiDupl.NET.WPF.* /q /s /f if exist %RAR_EXE% ( %RAR_EXE% a -ep1 -s -m5 -r -sfx %OUT_DIR%\AntiDupl.NET-%VERSION%.exe %TMP_DIR% diff --git a/docs/data/help/english/developers.html b/docs/data/help/english/developers.html index 6665ea8..ebaabe8 100644 --- a/docs/data/help/english/developers.html +++ b/docs/data/help/english/developers.html @@ -58,6 +58,9 @@

Developers

  • Yurii Chornyi for the translation into Ukrainian language for version 2.2.11.

    • +

  • +Edi61 for creation of versions 2.3.11-2.3.12. +

    • diff --git a/docs/data/help/russian/developers.html b/docs/data/help/russian/developers.html index 7bec9e6..773642e 100644 --- a/docs/data/help/russian/developers.html +++ b/docs/data/help/russian/developers.html @@ -57,6 +57,9 @@

    Разработчики

  • Юрию Черному за перевод на украинский язык для версии 2.2.11.

    • +

  • + Edi61 за создание версий 2.3.11-2.3.12. +

    • diff --git a/docs/english/download.html b/docs/english/download.html index 740c840..3e0444e 100644 --- a/docs/english/download.html +++ b/docs/english/download.html @@ -17,6 +17,10 @@

    Download

    + + + + diff --git a/docs/english/news.html b/docs/english/news.html index 3ebef3a..f55f0c6 100644 --- a/docs/english/news.html +++ b/docs/english/news.html @@ -8,7 +8,27 @@

    News

    -15/03/2023 - The program AntiDupl.NET-2.3.11. +10/10/2023 - The program AntiDupl.NET-2.3.12. +

    +The following changes were happened in it: +

    + + +

    +03/15/2023 - The program AntiDupl.NET-2.3.11.

    The following changes were happened in it:

    @@ -17,22 +37,22 @@

    News

    Add supporting of HEIC/HEIF image format.

  • - Added Greek, Spanish and French language support + Added Greek, Spanish and French language support.

  • - Implemented new folder picker + Implemented new folder picker.

  • - New feature: drag-select in results grid + New feature: drag-select in results grid.

  • - New button: Open both folders/images + New button: Open both folders/images.

  • - Updated versions of libwebp, openjpeg and libjpeg-turbo + Updated versions of libwebp, openjpeg and libjpeg-turbo.

  • - Fixed bugs + Fixed bugs.

    • diff --git a/docs/russian/download.html b/docs/russian/download.html index cd7c919..96c4562 100644 --- a/docs/russian/download.html +++ b/docs/russian/download.html @@ -17,6 +17,10 @@

    Скачать

    Release date Binary version Size Support of additional languages Source code Size
    10/10/2023AntiDupl.NET-2.3.12.exe 1.9 MbGerman, Chinese, Greek, Spanish and FrenchAntiDupl.NET-2.3.12.zip 4.2 Mb
    15/03/2023 AntiDupl.NET-2.3.11.exe 3.4 Mb Greek, Spanish and French
    + + + + diff --git a/docs/russian/news.html b/docs/russian/news.html index c6b4336..7e16044 100644 --- a/docs/russian/news.html +++ b/docs/russian/news.html @@ -7,6 +7,26 @@

    Новости

    +

    +10.10.2023 - Программа AntiDupl.NET-2.3.12. +

    +В ней произошли следующие изменения: +

    + +

    15.03.2023 - Программа AntiDupl.NET-2.3.11.

    diff --git a/docs/version.xml b/docs/version.xml index 250b908..fb7593e 100644 --- a/docs/version.xml +++ b/docs/version.xml @@ -2,5 +2,5 @@ 2 3 - 11 + 12 \ No newline at end of file diff --git a/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs b/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs index c8c8377..fa16492 100644 --- a/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs +++ b/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs @@ -47,7 +47,7 @@ public AboutProgramForm(CoreLib core) private void InitializeComponent() { - ClientSize = new System.Drawing.Size(350, 400); + ClientSize = new System.Drawing.Size(350, 430); FormBorderStyle = FormBorderStyle.FixedDialog; StartPosition = FormStartPosition.CenterScreen; ShowInTaskbar = false; diff --git a/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs b/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs index a4de9b4..5699878 100644 --- a/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs +++ b/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs @@ -71,7 +71,7 @@ public StartFinishForm(CoreLib core, Options options) private void InitializeComponent() { - ClientSize = new System.Drawing.Size(330, 350); + ClientSize = new System.Drawing.Size(330, 380); FormBorderStyle = FormBorderStyle.FixedDialog; StartPosition = FormStartPosition.CenterScreen; ShowInTaskbar = false; diff --git a/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs index 3b4e0c3..3d1bd39 100644 --- a/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs +++ b/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs @@ -48,7 +48,7 @@ public AboutProgramPanel(CoreLib core) private void InitializeComponent() { - TableLayoutPanel layout = InitFactory.Layout.Create(1, 4, 5, 0); + TableLayoutPanel layout = InitFactory.Layout.Create(1, 5, 5, 0); layout.RowStyles.Add(new RowStyle(SizeType.AutoSize)); layout.RowStyles.Add(new RowStyle(SizeType.AutoSize)); layout.RowStyles.Add(new RowStyle(SizeType.AutoSize)); @@ -59,9 +59,11 @@ private void InitializeComponent() layout.Controls.Add(GetCoopyrightLabel(0), 0, 1); - layout.Controls.Add(GetCoopyrightLabel(1), 0, 2); + layout.Controls.Add(GetCoopyrightLabel(1), 0, 2); + + layout.Controls.Add(GetCoopyrightLabel(2), 0, 3); - layout.Controls.Add(CreateInfoTable(Font), 0, 3); + layout.Controls.Add(CreateInfoTable(Font), 0, 4); Controls.Add(layout); } @@ -73,9 +75,10 @@ private Label GetCoopyrightLabel(int index) { case 0: text = Resources.Strings.Current.AboutProgramPanel_CopyrightLabel0_Text; break; case 1: text = Resources.Strings.Current.AboutProgramPanel_CopyrightLabel1_Text; break; + case 2: text = Resources.Strings.Current.AboutProgramPanel_CopyrightLabel2_Text; break; } Label label = CreateLabel(text, new Font(this.Font.FontFamily, this.Font.Size * 1.2f)); - label.Margin = new Padding(0, (index == 0 ? 10 : 0), 0, (index == 1 ? 10 : 0)); + label.Margin = new Padding(0, (index == 0 ? 10 : 0), 0, (index == 2 ? 10 : 0)); return label; } diff --git a/src/AntiDupl.NET.WinForms/Strings.cs b/src/AntiDupl.NET.WinForms/Strings.cs index 8756773..4344325 100644 --- a/src/AntiDupl.NET.WinForms/Strings.cs +++ b/src/AntiDupl.NET.WinForms/Strings.cs @@ -47,7 +47,8 @@ public Strings() public string WarningMessage_ChangeFileExtension; public string AboutProgramPanel_CopyrightLabel0_Text; - public string AboutProgramPanel_CopyrightLabel1_Text; + public string AboutProgramPanel_CopyrightLabel1_Text; + public string AboutProgramPanel_CopyrightLabel2_Text; public string AboutProgramPanel_ComponentLabel_Text; public string AboutProgramPanel_VersionLabel_Text; diff --git a/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs b/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs index b4f53da..73b1f25 100644 --- a/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs +++ b/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs @@ -44,7 +44,8 @@ static public void CopyTo(Strings s) s.WarningMessage_ChangeFileExtension = "Do you really want to change file extension?"; s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2023 Yermalayeu Ihar, "; - s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2023 Borisov Dmitry."; + s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2023 Borisov Dmitry,"; + s.AboutProgramPanel_CopyrightLabel2_Text = "2023-2023 Edi61."; s.AboutProgramPanel_ComponentLabel_Text = "Component"; s.AboutProgramPanel_VersionLabel_Text = "Version"; diff --git a/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs b/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs index 63554cd..95fd36b 100644 --- a/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs +++ b/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs @@ -44,7 +44,8 @@ static public void CopyTo(Strings s) s.WarningMessage_ChangeFileExtension = "Вы действительно хотите изменить расширение файла?"; s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2023 Ермолаев Игорь,"; - s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2023 Борисов Дмитрий."; + s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2023 Борисов Дмитрий,"; + s.AboutProgramPanel_CopyrightLabel2_Text = "2023-2023 Edi61."; s.AboutProgramPanel_ComponentLabel_Text = "Компонент"; s.AboutProgramPanel_VersionLabel_Text = "Версия"; diff --git a/src/version.txt b/src/version.txt index 1ba605f..b570139 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -2.3.11 \ No newline at end of file +2.3.12 \ No newline at end of file
    Дата выхода Бинарная версия Размер Поддержка дополнительных языков Исходные коды Размер
    10.10.2023AntiDupl.NET-2.3.12.exe 1.9 Mbнемецкий, китайский, греческий, испанский и французскийAntiDupl.NET-2.3.12.zip 4.2 Mb
    15.03.2023 AntiDupl.NET-2.3.11.exe 3.4 Mb греческий, испанский и французский