diff --git a/source/ChanSort.Api/ChanSort.Api.csproj b/source/ChanSort.Api/ChanSort.Api.csproj index 9e0b56b..11f6e71 100644 --- a/source/ChanSort.Api/ChanSort.Api.csproj +++ b/source/ChanSort.Api/ChanSort.Api.csproj @@ -39,8 +39,6 @@ full x86 prompt - true - true false @@ -50,9 +48,6 @@ pdbonly x86 prompt - true - true - false diff --git a/source/ChanSort.Loader.GlobalClone/GcSerializer.cs b/source/ChanSort.Loader.GlobalClone/GcSerializer.cs index 9a985f4..c5162b8 100644 --- a/source/ChanSort.Loader.GlobalClone/GcSerializer.cs +++ b/source/ChanSort.Loader.GlobalClone/GcSerializer.cs @@ -373,6 +373,7 @@ namespace ChanSort.Loader.GlobalClone if (ch == null) continue; // ignore proxy channels from reference lists var nameBytes = Encoding.UTF8.GetBytes(ch.Name); bool nameNeedsEncoding = nameBytes.Length != ch.Name.Length; + string mapType = ""; foreach (XmlNode node in ch.XmlNode.ChildNodes) { @@ -415,6 +416,13 @@ namespace ChanSort.Loader.GlobalClone case "isUserSelCHNo": node.InnerText = "1"; break; + case "mapType": + mapType = node.InnerText; + break; + case "mapAttr": + if (mapType == "1") + node.InnerText = ((int) ch.Favorites).ToString(); + break; } } } diff --git a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj index 5ff604b..c0715ad 100644 --- a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj +++ b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj @@ -39,8 +39,6 @@ full x86 prompt - true - true false @@ -50,8 +48,6 @@ pdbonly x86 prompt - true - true diff --git a/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj b/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj index 14b1ee3..cd85362 100644 --- a/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj +++ b/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj @@ -39,8 +39,6 @@ full x86 prompt - true - true false @@ -50,8 +48,6 @@ pdbonly x86 prompt - true - true diff --git a/source/Test.Loader.LG/Test.Loader.LG.csproj b/source/Test.Loader.LG/Test.Loader.LG.csproj index 18de772..51a51bd 100644 --- a/source/Test.Loader.LG/Test.Loader.LG.csproj +++ b/source/Test.Loader.LG/Test.Loader.LG.csproj @@ -40,8 +40,6 @@ full x86 prompt - true - true bin\x86\Release\ @@ -50,9 +48,6 @@ pdbonly x86 prompt - true - true - false diff --git a/source/Test.Loader/Test.Loader.csproj b/source/Test.Loader/Test.Loader.csproj index f688c33..fa60bb8 100644 --- a/source/Test.Loader/Test.Loader.csproj +++ b/source/Test.Loader/Test.Loader.csproj @@ -40,9 +40,6 @@ full x86 prompt - false - true - false true @@ -52,7 +49,6 @@ pdbonly x86 prompt - false diff --git a/source/changelog.md b/source/changelog.md index babc1d9..dbae451 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,9 +1,10 @@ ChanSort Change Log =================== -TBA -- Toshiba file detection changed from *.zip to Hotel*.zip -- Samsung J series file detection changed from channel_list_t*.zip to *.zip +2015-11-26 +- Samsung J series: file detection changed from channel_list_t\*.zip to \*.zip +- Toshiba: file detection changed from \*.zip to Hotel\*.zip +- LG GlobalClone: favorites are now saved to the file - Added comment to info screen when opening LG LB/UB series GlobalClone list 2015-10-15 diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd index 61762de..15583cd 100644 --- a/source/makeDistribZip.cmd +++ b/source/makeDistribZip.cmd @@ -1,4 +1,5 @@ @echo off +cd /d %~dp0 set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2% set target=%cd%\..\..\ChanSort_%curdate% set DXversion=15.1 @@ -19,6 +20,7 @@ xcopy /siy debug\ru "%target%\ru" copy ..\readme.md "%target%\readme.txt" copy changelog.md "%target%\changelog.txt" for %%f in (Utils Data Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f +call :CodeSigning cd .. del Website\ChanSort.zip 2>nul @@ -30,6 +32,20 @@ cd %target%\.. pause goto:eof +:CodeSigning +rem ----------------------------- +rem If you want to digitally sign the generated .exe and .dll files, +rem you need to have your code signing certificate installed in the Windows certificate storage +rem ----------------------------- +set signtool="C:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin\signtool.exe" +set oldcd=%cd% +cd %target% +set files=ChanSort.exe ChanSort*.dll de\ChanSort*.dll ru\ChanSort*.dll pt\ChanSort*.dll +%signtool% sign /a /t "http://timestamp.comodoca.com/authenticode" %files% +if errorlevel 1 goto :error +cd %oldcd% +goto:eof + :copyDll echo Copying DevExpress %1 set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.dll" @@ -44,4 +60,8 @@ set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framewo if exist %source% copy %source% "%target%\%2" set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.Core.resources.dll" if exist %source% copy %source% "%target%\%2" +goto:eof + +:error +pause goto:eof \ No newline at end of file