diff --git a/source/ChanSort.sln b/source/ChanSort.sln index 83d89a9..9297de6 100644 --- 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 index 77e9e19..c2f29b5 100644 --- 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 index ffb6ea3..3225bed 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.cs.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.cs.resx @@ -138,7 +138,7 @@ Číslo - - Tahoma + + Sloupek: \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.de.resx b/source/ChanSort/Printing/ReportOptionsDialog.de.resx index 03c7a43..f7552fd 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.de.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.de.resx @@ -142,4 +142,7 @@ Name + + Spalten: + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.es.resx b/source/ChanSort/Printing/ReportOptionsDialog.es.resx index d42d2a7..c0e5fd0 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.es.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.es.resx @@ -138,4 +138,7 @@ Opciones de impresión + + Columnas: + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.it.resx b/source/ChanSort/Printing/ReportOptionsDialog.it.resx index 6ef730c..75e5af0 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.it.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.it.resx @@ -121,19 +121,16 @@ Ordina per: - Numero + Numero - Nome + Nome Carattere: - - Tahoma - - Anteprima… + Anteprima... Annulla @@ -141,4 +138,7 @@ Opzioni di stampa + + Colonne: + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.ro.resx b/source/ChanSort/Printing/ReportOptionsDialog.ro.resx index fdfea4b..2c9b96c 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.ro.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.ro.resx @@ -138,7 +138,7 @@ Opțiunile de imprimare - - Tahoma + + Coloane: \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.ru.resx b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx index 2f064c0..a2257ea 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.ru.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx @@ -133,7 +133,7 @@ Шрифт: - Просмотр… + Просмотр... Колонки: diff --git a/source/Translation.xlsx b/source/Translation.xlsx index e426911..0388208 100644 Binary files a/source/Translation.xlsx and b/source/Translation.xlsx differ diff --git a/source/changelog.md b/source/changelog.md index 9b46de2..dfc0b15 100644 --- 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 index d0494c3..8b07992 100644 --- 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