2023-12-31

- added support for Awox U5600STR TV (dtv_cmdb_2.bin with size of 2691 KB) - fixed digital signature on .exe and .dll files - added missing dll needed for print preview - added partially missing translations for German and Spanish
PredatH0r · Dec 31, 2023 · 97e0850 · 97e0850
1 parent 65f140c
commit 97e0850
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 28 deletions.
diff --git a/source/ChanSort.sln b/source/ChanSort.sln
@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		changelog.md = changelog.md
 		fileformats.md = fileformats.md
 		fileformats_de.md = fileformats_de.md
+		makeDistribZip.cmd = makeDistribZip.cmd
 		..\readme.md = ..\readme.md
 		..\readme_de.md = ..\readme_de.md
 		..\readme_pl.md = ..\readme_pl.md

diff --git a/source/ChanSort/Printing/ReportOptionsDialog.cs b/source/ChanSort/Printing/ReportOptionsDialog.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using ChanSort.Api;
-using ChanSort.Ui.Properties;
 using DevExpress.LookAndFeel;
 using DevExpress.XtraEditors;
 using DevExpress.XtraReports.UI;

diff --git a/source/ChanSort/Printing/ReportOptionsDialog.cs.resx b/source/ChanSort/Printing/ReportOptionsDialog.cs.resx
@@ -138,7 +138,7 @@
   <data name="rbSortByNumber.Properties.Caption" xml:space="preserve">
     <value>Číslo</value>
   </data>
-  <data name="fontEdit1.EditValue" xml:space="preserve">
-    <value>Tahoma</value>
+  <data name="labelControl3.Text" xml:space="preserve">
+    <value>Sloupek:</value>
   </data>
 </root>
diff --git a/source/ChanSort/Printing/ReportOptionsDialog.de.resx b/source/ChanSort/Printing/ReportOptionsDialog.de.resx
@@ -142,4 +142,7 @@
   <data name="rbSortByName.Properties.Caption" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="labelControl3.Text" xml:space="preserve">
+    <value>Spalten:</value>
+  </data>
 </root>
diff --git a/source/ChanSort/Printing/ReportOptionsDialog.es.resx b/source/ChanSort/Printing/ReportOptionsDialog.es.resx
@@ -138,4 +138,7 @@
   <data name="$this.Text" xml:space="preserve">
     <value>Opciones de impresión</value>
   </data>
+  <data name="labelControl3.Text" xml:space="preserve">
+    <value>Columnas:</value>
+  </data>
 </root>
diff --git a/source/ChanSort/Printing/ReportOptionsDialog.it.resx b/source/ChanSort/Printing/ReportOptionsDialog.it.resx
@@ -121,24 +121,24 @@
     <value>Ordina per:</value>
   </data>
   <data name="rbSortByNumber.Properties.Caption" xml:space="preserve">
-    <value>Numero </value>
+    <value>Numero</value>
   </data>
   <data name="rbSortByName.Properties.Caption" xml:space="preserve">
-    <value>Nome </value>
+    <value>Nome</value>
   </data>
   <data name="labelControl2.Text" xml:space="preserve">
     <value>Carattere:</value>
   </data>
-  <data name="fontEdit1.EditValue" xml:space="preserve">
-    <value>Tahoma</value>
-  </data>
   <data name="btnPreview.Text" xml:space="preserve">
-    <value>Anteprima…</value>
+    <value>Anteprima...</value>
   </data>
   <data name="btnCancel.Text" xml:space="preserve">
     <value>Annulla</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Opzioni di stampa</value>
   </data>
+  <data name="labelControl3.Text" xml:space="preserve">
+    <value>Colonne:</value>
+  </data>
 </root>
diff --git a/source/ChanSort/Printing/ReportOptionsDialog.ro.resx b/source/ChanSort/Printing/ReportOptionsDialog.ro.resx
@@ -138,7 +138,7 @@
   <data name="$this.Text" xml:space="preserve">
     <value>Opțiunile de imprimare</value>
   </data>
-  <data name="fontEdit1.EditValue" xml:space="preserve">
-    <value>Tahoma</value>
+  <data name="labelControl3.Text" xml:space="preserve">
+    <value>Coloane:</value>
   </data>
 </root>
diff --git a/source/ChanSort/Printing/ReportOptionsDialog.ru.resx b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx
@@ -133,7 +133,7 @@
     <value>Шрифт:</value>
   </data>
   <data name="btnPreview.Text" xml:space="preserve">
-    <value>Просмотр…</value>
+    <value>Просмотр...</value>
   </data>
   <data name="labelControl3.Text" xml:space="preserve">
     <value>Колонки:</value>

diff --git a/source/Translation.xlsx b/source/Translation.xlsx
diff --git a/source/changelog.md b/source/changelog.md
@@ -1,8 +1,11 @@
 ChanSort Change Log 
 ===================
 
-TBD
+2023-12-31
 - added support for Awox U5600STR TV (dtv_cmdb_2.bin with size of 2691 KB)
+- fixed digital signature on .exe and .dll files
+- added missing dll needed for print preview
+- added partially missing translations for German and Spanish
 
 2023-12-18
 - fixed loading Panasonic tv.db / idtvChannel.bin lists which contain DVB-T2 channels

diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd
@@ -6,14 +6,14 @@ cd /d %~dp0
 set languages=cs de es hu it pl pt ro ru tr
 set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2%
 set target=%cd%\..\..\ChanSort_%curdate%
-set DXversion=23.1
+set DXversion=23.2
 set framework=net48
 set bindir=debug\%framework%
+
 mkdir "%target%" 2>nul
 rem del /s /q "%target%\*"
 xcopy /idy %bindir%\ChanSort.exe* "%target%"
 xcopy /idy %bindir%\ChanSort.*.dll "%target%"
-xcopy /idy %bindir%\ChanSort.ico "%target%"
 xcopy /idy %bindir%\ChanSort.*.ini "%target%"
 
 xcopy /idy %bindir%\Microsoft.*.dll "%target%"
@@ -37,14 +37,14 @@ mkdir "%target%\ReferenceLists" 2>nul
 xcopy /sidy ChanSort\ReferenceLists\* "%target%\ReferenceLists"
 copy /y ..\readme.md "%target%\readme.txt"
 copy /y changelog.md "%target%\changelog.txt"
-for %%f in (Utils Data Data.Desktop DataAccess Drawing Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f
+for %%f in (Data Data.Desktop DataAccess Drawing Pdf Printing Utils XtraBars XtraEditors XtraGrid XtraLayout XtraPrinting XtraReports XtraTreeList) do call :copyDll %%f
 call :CodeSigning
 
 cd ..
 del Website\ChanSort.zip 2>nul
 xcopy /idy readme.* %target%
 cd %target%\..
-"c:\program files\7-Zip\7z.exe" a -tzip ChanSort_%curdate%.zip ChanSort_%curdate%
+"c:\program files\7-Zip\7z.exe" a -tzip -mx9 ChanSort_%curdate%.zip ChanSort_%curdate%
 
 
 pause
@@ -85,28 +85,37 @@ for %%f in (%*) do (
   if errorlevel 1 set todo=!todo! "%%f"
 )
 if "%todo%" == "" goto:skipCodeSigning
-%signtool% sign /a /t "http://timestamp.digicert.com" %todo%
+%signtool% sign /n "ABPro Entwicklungs-, Vertriebs- und Wartungs GmbH" /tr "http://timestamp.digicert.com" /td SHA256 %todo%
 :skipCodeSigning
 goto:eof
 
 :copyDll
 echo Copying DevExpress %1
-set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.dll"
-if exist %source% xcopy /idy %source% "%target%"
-set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.Core.dll"
-if exist %source% xcopy /idy %source% "%target%"
+for %%s in (.dll .Core.dll .Drawing.dll) do call :copyDllFramework %1 %%s
 for %%l in (%languages%) do call :copyLangDll %1 %%l
 goto:eof
 
+:copyDllFramework
+for %%f in (Framework Standard NetCore) do (
+  set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\%%f\DevExpress.%1.v%DXversion%%2"
+  if exist !source! xcopy /iy !source! "%target%" & goto:eof
+)
+goto:eof
+
+
 :copyLangDll
-set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.resources.dll"
-if exist %source% xcopy /idy %source% "%target%\%2"
+for %%s in (.resources.dll .Core.resources.dll) do call :copyLangDllFramework %1 %%s
 set source="c:\daten\downloads\DevExpress\20%DXversion%\DevExpressLocalizedResources_20%DXversion%_%2\DevExpress.%1.v%DXversion%.resources.dll"
-if exist %source% xcopy /idy %source% "%target%\%2"
-set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.Core.resources.dll"
-if exist %source% xcopy /idy %source% "%target%\%2"
+if exist !source! xcopy /idy !source! "%target%\%2"
 set source="c:\daten\downloads\DevExpress\20%DXversion%\DevExpressLocalizedResources_20%DXversion%_%2\DevExpress.%1.v%DXversion%.Core.resources.dll"
-if exist %source% xcopy /idy %source% "%target%\%2"
+if exist !source! xcopy /idy !source! "%target%\%2"
+goto:eof
+
+:copyLangDllFramework
+for %%f in (Framework Standard NetCore) do (
+  set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\%%f\%2\DevExpress.%1.v%DXversion%%2"
+  if exist !source! xcopy /idy !source! "%target%\%2" & goto:eof
+)
 goto:eof
 
 :error