From 9dd5497819023a5bd91cbe47dd5666564ac28514 Mon Sep 17 00:00:00 2001 From: RattyDAVE Date: Wed, 19 Dec 2018 21:14:32 +0000 Subject: [PATCH 1/3] Update gb_astra282E_sky.txt Updated Channel List --- .../ReferenceLists/gb_astra282E_sky.txt | 898 +++++++++--------- 1 file changed, 432 insertions(+), 466 deletions(-) diff --git a/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt b/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt index 5b38664..520081b 100644 --- a/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt +++ b/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt @@ -1,466 +1,432 @@ -1;BBC One HD;2-2050-6941 -2;BBC Two HD;2-2050-6940 -3;ITV HD;2-2066-21000 -4;Channel 4 HD;2-2068-21200 -5;Channel 5;2-2057-7701 -6;Sky1;2-2021-4701 -7;Sky1 +1;2-2021-1403 -8;Sky2;2-2026-4752 -9;Sky Atlantic;2-2023-5711 -10;Sky Atlantic+1;2-2011-1413 -11;Sky Living;2-2026-5715 -12;Sky Living+1;2-2023-5712 -13;Real Lives;2-2025-6030 -14;Real Lives+1;2-2007-6025 -15;Lifetime;2-2026-5716 -16;Lifetime+1;2-2316-53525 -17;AMC from BT;2-2065-50315 -18;ITV +1;2-2053-10155 -19;ITV2;2-2044-10070 -20;ITV2+1;2-2053-10165 -21;ITV3;2-2054-10260 -22;ITV3+1;2-2054-10261 -23;ITV4;2-2044-10072 -24;ITV4+1;2-2044-10073 -25;ITV Encore;2-2053-10135 -26;ITV Encore+1;2-2054-10265 -27;ITVBe;2-2044-10075 -28;ITVBe+1;2-2053-10139 -29;E4;2-2042-8305 -30;E4+1;2-2042-8300 -31;BBC Four HD;2-2061-8931 -32;Pick;2-2026-4751 -33;Pick+1;2-2026-5107 -34;Channel 5+1;2-2057-7720 -35;Channel 5+24;2-2057-7716 -36;5 USA;2-2057-7710 -37;5 USA +1;2-2057-7711 -38;5STAR;2-2057-7715 -39;5STAR +1;2-2057-7717 -40;Spike;2-2057-7730 -41;Syfy;2-2109-52250 -42;Syfy +1;2-2109-52280 -43;Universal;2-2109-52255 -44;Universal+1;2-2109-52220 -45;FOX;2-2021-5515 -46;FOX+;2-2023-5402 -47;Channel 4 +1;2-2042-8311 -48;More4;2-2042-8340 -49;More4 +1;2-2041-9230 -50;4seven;2-2068-21250 -51;ComedyCentral;2-2021-6040 -52;ComedyCent+1;2-2069-51083 -53;ComedyXtra;2-2069-51086 -54;ComedyXtra+1;2-2069-51087 -55;CBS Action;2-2112-55209 -56;CBS Drama;2-2112-50903 -57;CBS Reality;2-2112-55214 -58;CBS Reality+1;2-2112-55217 -59;horror channel;2-2112-55202 -60;horror ch+1;2-2112-55218 -61;True Ent;2-2110-53375 -62;True Drama;2-2110-53380 -63;tru TV;2-2096-54101 -64;True Crime;2-2113-53700 -65;True Crime +1;2-2110-53305 -66;tru TV+1;2-2116-52525 -67;ShowBiz TV;2-2113-53730 -68;Sony Channel;2-2096-54113 -69;Sony Chnl +1;2-2313-53271 -70;W;2-2022-6520 -71;W +1;2-2093-7615 -72;GOLD;2-2022-6504 -73;GOLD +1;2-2093-7605 -74;Dave;2-2022-6506 -75;Dave ja vu;2-2093-7624 -76;Drama;2-2022-6522 -77;alibi;2-2022-6521 -78;alibi +1;2-2093-7630 -79;Challenge;2-2007-6031 -80;Challenge+1;2-2007-6026 -81;DMAX;2-2097-52415 -82;DMAX+1;2-2097-52420 -83;E!;2-2313-53215 -84;E! +1;2-2313-53276 -85;London Live;2-2090-50892 -86;YourTV;2-2116-52540 -87;QUEST;2-2009-6211 -88;QUEST+1;2-2097-52430 -89;PBS America;2-2109-52225 -90;My Channel;2-2095-55118 -91;BEN;2-2089-54223 -92;BET:BlackEntTv;2-2069-51081 -93;Discovery;2-2009-6201 -94;Discovery+1;2-2009-6204 -95;TLC;2-2009-6233 -96;TLC+1;2-2097-52446 -97;TLC+2;2-2097-52455 -98;Disc.History;2-2009-6207 -99;Disc.History+1;2-2097-52435 -100;Disc.Turbo;2-2009-6209 -101;Disc.Science;2-2009-6206 -102;Disc.Sci+1;2-2097-52410 -103;ID;2-2097-52400 -104;ID+1;2-2097-52426 -105;Animal Planet;2-2009-6202 -106;Animal Plnt+1;2-2097-52405 -107;Nat Geo;2-2025-4805 -108;Nat Geo+1hr;2-2025-4806 -109;Nat Geo Wild;2-2025-4807 -110;Crime+Inv;2-2025-4802 -111;Crime+Inv +1;2-2116-52530 -112;History;2-2025-4653 -113;History +1 hour;2-2025-5003 -114;H2;2-2025-5721 -115;Eden;2-2022-6502 -116;Eden+1;2-2093-7610 -117;YESTERDAY;2-2022-6505 -118;YESTERDAY+1;2-2093-7650 -119;The Box;2-2031-12005 -120;4Music;2-2031-12000 -121;CAPITAL TV;2-2095-55112 -122;Chart Show TV;2-2110-53365 -123;Box Hits;2-2031-12020 -124;Chilled TV;2-2095-55114 -125;Starz TV;2-2110-53335 -126;Keep It Country;2-2105-52065 -127;HeyDay;2-2316-53598 -128;VIVA;2-2010-7009 -129;KISS;2-2031-12010 -130;Flava;2-2110-53300 -131;Chartshw Dnce;2-2110-53315 -132;Clubland TV;2-2095-55113 -133;Channel AKA;2-2107-52107 -134;Vintage TV;2-2107-52180 -135;Heart TV;2-2095-55111 -136;Magic;2-2113-53720 -137;NOW Music;2-2105-52010 -138;Heat;2-2113-53715 -139;The Vault;2-2110-53355 -140;Kerrang!;2-2031-12015 -141;Scuzz;2-2110-53310 -142;VH1;2-2010-7002 -143;MTV Music +1;2-2010-7013 -144;MTV;2-2010-7001 -145;MTV+1;2-2010-7005 -146;MTV MUSIC;2-2069-51093 -147;MTV HITS;2-2010-7006 -148;MTV BASE;2-2010-7007 -149;MTV DANCE;2-2010-7014 -150;MTV CLASSIC;2-2010-7008 -151;MTV ROCKS;2-2010-7003 -152;CBeebies HD;2-2061-8932 -153;CBBC HD;2-2050-6952 -154;CITV;2-2044-10071 -155;Cartoon Netwrk;2-2067-50200 -156;CN+1;2-2067-50215 -157;Cartoonito;2-2021-5521 -158;Boomerang;2-2067-50205 -159;Boomerang +1;2-2067-50210 -160;Nickelodeon;2-2029-5560 -161;Nickelodeon+1;2-2029-5561 -162;Nicktoons;2-2029-5562 -163;Nick Jr.;2-2029-5563 -164;Nick Jr+1;2-2069-51090 -165;Nick Jr Too;2-2069-51089 -166;Disney Chnl;2-2011-9102 -167;Disney Chnl+1;2-2011-9105 -168;Disney Junior;2-2011-9103 -169;Disney Junior+;2-2011-9106 -170;Disney XD;2-2011-9101 -171;Disney XD+1;2-2011-9104 -172;Kix;2-2110-53350 -173;Kix+1;2-2110-53360 -174;POP;2-2110-53340 -175;POP+1;2-2110-53370 -176;Tiny Pop;2-2110-53330 -177;Tiny Pop +1;2-2110-53345 -178;BabyTV;2-2029-5564 -179;Sky Premiere;2-2012-4404 -180;Sky Prem+1;2-2012-4405 -181;Sky Disney ;2-2012-4308 -182;Sky Hits;2-2021-5720 -183;Sky Family;2-2012-4403 -184;Sky Comedy;2-2012-4303 -185;SkyDramaRom;2-2012-5502 -186;Sky ScFi/Horror;2-2012-4304 -187;Sky Action;2-2012-4302 -188;Sky Thriller;2-2012-4406 -189;HarryPotter;2-2012-5650 -190;Sky Select;2-2012-4306 -191;Film4;2-2041-9220 -192;Film4 +1;2-2041-9225 -193;TCM;2-2023-5714 -194;TCM+1;2-2107-52175 -195;True Movies 1;2-2110-53320 -196;True Movies 2;2-2110-53325 -197;Movies 24;2-2109-52265 -198;Movies 24+;2-2109-52270 -199;movies4men;2-2071-51116 -200;mov4men+1;2-2071-51118 -201;Sony Movies;2-2071-51117 -202;Sony Movies+1;2-2071-51119 -203;TalkingPictures;2-2103-50440 -204;Nollywood;2-2089-54217 -205;Sky Sports 1;2-2021-4221 -206;Sky Sports 2;2-2026-5505 -207;Sky Sports 3;2-2021-4219 -208;Sky Sports 4;2-2023-5401 -209;Sky Sports 5;2-2011-1326 -210;Sky Sports F1;2-2021-1306 -211;Sky Sp NewsHQ;2-2023-4909 -212;BT Sport 1;2-2112-55250 -213;BT Sport 2;2-2065-50376 -214;BT Sport Europe;2-2112-55260 -215;BT Sport//ESPN;2-2065-50381 -216;Eurosport 1;2-2023-5713 -217;Eurosport 2;2-2023-5009 -218;BoxNation;2-2096-54120 -219;MOTORS TV UK;2-2065-50325 -220;Racing UK;2-2071-51120 -221;At The Races;2-2025-4804 -222;Bike;2-2109-52290 -223;MUTV;2-2025-4808 -224;Chelsea TV;2-2026-5717 -225;Notts TV;2-2089-54214 -226;LFCTV;2-2007-3846 -227;Setanta Ireland;2-2071-51122 -228;Setanta Sports1;2-2071-51112 -229;Premier Sports;2-2071-51113 -230;Subscription HD;0-0-0 -231;BT Sport 1 HD;2-2408-50660 -232;BT Sport 2 HD;2-2408-50665 -233;BT Sport EurHD;2-2408-50680 -234;BTSpt//ESPNHD;2-2113-53795 -235;BoxNation HD;2-2018-7100 -236;CNN HD;2-2067-50290 -237;Racing UK HD;2-2092-55272 -238;Setanta HD;2-2106-53154 -239;Premier HD;2-2106-53153 -240;BBC NEWS HD;2-2061-8921 -241;Sky News;2-2026-4704 -242;BBC Parliament;2-2046-10307 -243;Euronews;2-2089-54224 -244;Bloomberg;2-2116-52550 -245;CNBC;2-2090-50882 -246;CNN;2-2067-50220 -247;FOX News;2-2025-4801 -248;CCTV News;2-2089-54216 -249;NDTV 24x7;2-2095-55116 -250;RT HD;2-2106-53148 -251;NHK World HD;2-2106-53147 -252;CNC World;2-2116-52580 -253;FRANCE Eng;2-2116-52570 -254;ARISE News;2-2090-50890 -255;Sky Arts ;2-2021-5719 -256;Discovery Shed;2-2097-52440 -257;Home & Health;2-2009-6208 -258;Home&Health+;2-2097-52450 -259;Home;2-2022-6501 -260;Home+1;2-2093-7600 -261;Really;2-2022-6523 -262;Good Food;2-2022-6508 -263;Good Food +1;2-2093-7626 -264;Food Network;2-2116-52500 -265;Food Netwrk+1;2-2116-52510 -266;Travel Channel;2-2096-54102 -267;Travel Ch +1;2-2107-52100 -268;holiday+cruise;2-2102-54056 -269;Horse & Country;2-2096-54140 -270;BBC One Lon;2-2045-6301 -271;BBC Two Eng;2-2045-6302 -272;ITV;2-2044-10060 -273;Channel 4;2-2041-9211 -274;BBC Four;2-2045-6316 -275;Kids;0-0-0 -276;CBeebies;2-2045-6318 -277;CBBC;2-2048-10352 -278;News;0-0-0 -279;BBC NEWS;2-2048-10358 -280;FRANCE Eng;2-2116-52570 -281;RT;2-2096-54115 -282;Psychic Today;2-2112-55226 -283;Keep It Country;2-2105-52065 -284;Showcase;2-2316-53598 -285;Showcase 3;2-2313-53210 -286;Property Show;2-2105-52005 -287;FrontRunner;2-2105-52006 -288;Made In Bristol;2-2113-53710 -289;Made In Cardiff;2-2113-53725 -290;Made In Leeds;2-2113-53740 -291;Made In Tn&Wr;2-2103-50430 -292;Forces TV;2-2007-6033 -293;Community;2-2026-4753 -294;FoTV;2-2105-52016 -295;Fashion One;2-2104-55395 -296;Wellbeing;2-2094-22610 -297;QVC;2-2013-6600 -298;QVC Extra;2-2013-6601 -299;QVC Beauty;2-2013-6603 -300;QVC Style;2-2013-6602 -301;GR SHOP;2-2095-9531 -302;High Street TV;2-2095-55102 -303;High Street TV 2;2-2112-55213 -304;High Street TV 3;2-2095-55104 -305;Ideal World;2-2109-52232 -306;Ideal Extra;2-2109-52233 -307;Create & Craft;2-2109-52234 -308;Craft Extra;2-2109-52235 -309;Craft Channel;2-2105-52096 -310;TJC;2-2316-53520 -311;TJC Choice;2-2105-52070 -312;Jewelry Maker;2-2113-53705 -313;Gems TV;2-2116-52520 -314;Rocks & Co 1;2-2095-9533 -315;JML Direct;2-2096-54150 -316;Hochanda;2-2095-9537 -317;The Mall;2-2102-54057 -318;Tristar;2-2096-54175 -319;TV Warehouse;2-2096-54180 -320;Retail TV;2-2096-54103 -321;Best Direct;2-2096-54112 -322;Thane;2-2316-53530 -323;The Dept Store;2-2102-54058 -324;PaversShoes.tv;2-2065-50313 -325;V Channel;2-2103-50425 -326;Indian;0-0-0 -327;Aastha;2-2095-55110 -328;AAJ TAK;2-2096-54165 -329;UMP Movies;2-2089-54218 -330;B4U Movies;2-2108-52134 -331;B4U Music;2-2108-52135 -332;Brit Asia TV;2-2316-53588 -333;Sikh Channel;2-2095-55108 -334;COLORS;2-2105-52050 -335;SONY SAB;2-2096-54107 -336;SONY MAX;2-2105-52001 -337;SONY TV Asia;2-2018-7150 -338;Akaal Channel;2-2089-54215 -339;Star Plus;2-2107-52108 -340;Star Life OK;2-2107-52185 -341;Star GOLD;2-2107-52113 -342;Star Utsav;2-2107-52112 -343;PTC PUNJABI;2-2095-55117 -344;Rishtey;2-2107-52103 -345;ABP News;2-2096-54167 -346;Times Now;2-2103-50400 -347;News18;2-2316-53545 -348;&tv HD;2-2092-55271 -349;&TV;2-2103-50480 -350;Venus TV;2-2090-50884 -351;Zee Cinema;2-2103-50465 -352;Zee TV;2-2103-50460 -353;Zee Punjabi;2-2103-50475 -354;Zing;2-2103-50470 -355;Bengali;0-0-0 -356;ATN Bangla UK;2-2094-22601 -357;Bangla TV;2-2092-55275 -358;CHSTV;2-2065-50300 -359;Channel i;2-2090-50891 -360;Pakistani;0-0-0 -361;ARY Digital;2-2103-50415 -362;ARY News;2-2316-53505 -363;Dunya News;2-2116-52515 -364;Ahlebait TV;2-2094-22603 -365;Ahlulbayt TV;2-2105-52080 -366;DM Plus TV;2-2089-54219 -367;NTV;2-2089-54221 -368;GEO TV;2-2096-54185 -369;GEO TEZ;2-2095-55115 -370;GEO News;2-2103-50405 -371;Samaa;2-2103-50435 -372;PTV Prime;2-2089-54212 -373;PTV Global;2-2090-50883 -374;TV 99;2-2105-52085 -375;HUM EUROPE;2-2094-22605 -376;Arabian;0-0-0 -377;Abu Dhabi TV;2-2089-54227 -378;TV Record HD;2-2099-55405 -379;TV Record;2-2095-9535 -380;Al Arabiya;2-2109-52285 -381;SkyNws Arabia;2-2029-4645 -382;Others;0-0-0 -383;British Muslim;2-2089-54225 -384;Hidayat TV;2-2090-50885 -385;Safeer TV;2-2107-52170 -386;OH TV;2-2094-22602 -387;Sangat;2-2095-9536 -388;Madani Chnl;2-2090-50887 -389;AIT Int'l;2-2089-54220 -390;Vox Africa;2-2090-50888 -391;Channels 24;2-2107-52102 -392;ABN TV;2-2107-52111 -393;TV5 MONDE;2-2116-52575 -394;PCNE Chinese;2-2108-52118 -395;propeller;2-2112-55270 -396;BON TV;2-2105-52075 -397;Islam Channel;2-2316-53515 -398;Islam Ch Urdu;2-2108-52119 -399;TV One;2-2089-54226 -400;TVC News;2-2090-50895 -401;TVC News +1;2-2090-50881 -402;BBC Interactive Channels;0-0-0 -403;BBC RB 1;2-2045-6390 -404;BBC Regional Channels;0-0-0 -405;BBC One HD;2-2050-6941 -406;BBC One ScotHD;2-2061-8901 -407;BBC One Wal HD;2-2061-8911 -408;BBC One NI HD;2-2050-6943 -409;BBC One CI;2-2045-6361 -410;BBC One E Mid;2-2046-10305 -411;BBC One East E;2-2046-10306 -412;BBC One East W;2-2045-6351 -413;BBC One Lon;2-2045-6301 -414;BBC One NE&C;2-2047-6471 -415;BBC One N West;2-2047-6441 -416;BBC One NI;2-2048-10361 -417;BBC One Oxford;2-2048-10356 -418;BBC One S East;2-2047-6461 -419;BBC One S West;2-2048-10354 -420;BBC One Scot;2-2047-6421 -421;BBC One South;2-2048-10353 -422;BBC One W Mid;2-2046-10301 -423;BBC One Wales;2-2046-10311 -424;BBC One West;2-2045-6341 -425;BBC One Yorks;2-2047-6451 -426;BBC One Yk&Li;2-2046-10303 -427;BBC Two HD;2-2050-6940 -428;BBC Two Eng;2-2045-6302 -429;BBC Two NI;2-2048-10362 -430;BBC Two Scot;2-2047-6422 -431;BBC Two Wales;2-2046-10312 -432;ITVHD London;2-2066-21000 -433;ITVHD Granada;2-2063-20740 -434;ITV Wales HD;2-2063-20730 -435;ITVHD Meridian;2-2066-21020 -436;ITVHD Central;2-2066-21030 -437;ITV London;2-2044-10060 -438;ITV Meridian;2-2053-10150 -439;ITV Meridian;2-2053-10140 -440;ITV Anglia;2-2044-10090 -441;ITV Central;2-2044-10100 -442;ITV Granada;2-2044-10080 -443;ITV Westcountry;2-2054-10200 -444;ITV Wales;2-2059-12150 -445;ITV Border;2-2053-10120 -446;ITV Tyne Tees;2-2053-10130 -447;ITV Yorkshire;2-2053-10160 -448;ITV Calendar;2-2059-12120 -449;ITV Anglia;2-2059-12110 -450;ITV Meridian;2-2059-12101 -451;ITV Border;2-2059-12130 -452;ITV Central;2-2059-12145 -453;ITV +1 London;2-2053-10155 -454;ITV +1 Central;2-2053-10145 -455;ITV +1 Granada;2-2054-10255 -456;ITV +1 Wales;2-2059-12155 -457;ITV +1 Calendar;2-2059-12165 -458;ITV +1 Tyne Tees;2-2059-12105 -459;ITV +1 Westcountry;2-2053-10125 -460;STV;2-2054-10221 -461;STV;2-2054-10225 -462;ITV HD;2-2063-20750 -463;ITV HD ;2-2066-21010 -464;ITV HD ;2-2066-21040 -465;MUTV HD;2-2104-55390 -466;Astra Ultra HD Demo;2-2038-7400 +100;BBC RB1;2-2045-6390 +101;BBC One HD;2-2050-6941 +103;BBC Two HD;2-2050-6940 +104;ITV HD ;2-2064-20840 +105;Channel 4 HD;2-2068-21200 +106;Sky One HD;2-2016-3275 +107;Sky Witness HD;2-2025-3928 +108;Sky Atlantic HD;2-2025-3853 +109;W HD;2-2027-3925 +110;Xmas GOLDHD;2-2020-6513 +111;Channel 5 HD;2-2057-7750 +112;ComedyCentHD;2-2020-3856 +113;Universal HD;2-2002-3880 +114;SYFY HD;2-2002-3884 +115;Dave HD;2-2002-3922 +116;BBC Four HD;2-2061-8931 +117;London Live;2-2090-50892 +118;ITV2;2-2044-10070 +119;ITV3;2-2054-10260 +120;ITV4;2-2044-10072 +128;5STAR;2-2057-7715 +131;ITVBe;2-2044-10075 +132;alibi HD;2-2020-3923 +133;Christmas Food;2-2022-6508 +135;E4;2-2041-9241 +136;More4;2-2056-8340 +137;4seven;2-2068-21250 +139;4Music;2-2100-6720 +141;5 USA;2-2057-7710 +142;Really;2-2022-6523 +143;Drama;2-2022-6522 +144;QUEST HD;2-2116-52580 +145;Challenge;2-2012-6160 +146;CBS Reality;2-2112-55214 +147;CBS Drama;2-2112-50903 +148;CBS Justice;2-2112-55209 +149;Quest Red;2-2035-6214 +150;5Spike;2-2057-7730 +152;Pick;2-2026-4751 +153;Paramount;2-2111-53290 +155;YESTERDAY;2-2022-6505 +157;Sony Crime;2-2110-53385 +158;Home;2-2022-6501 +159;5SELECT;2-2057-7716 +160;PBS America;2-2116-52505 +161;Disc.Turbo;2-2035-6209 +168;YourTV;2-2112-55270 +172;Food Network;2-2116-52500 +173;Together;2-2026-4753 +175;BEN;2-2089-54223 +179;True Ent;2-2110-53375 +180;tru TV;2-2110-53305 +182;GN TV;2-2098-53525 +184;Horse & Country;2-2096-54140 +185;propeller;2-2097-52102 +187;BLAZE;2-2065-50350 +189;Property Show;2-2097-52109 +191;mytv;2-2095-55118 +192;CLTV;2-2098-53598 +193;Vox Africa;2-2090-50888 +194;BET:BlackEntTv;2-2069-51081 +198;Travel Channel;2-2096-54102 +199;Cruise Channel;2-2102-54056 +203;ITV+1;2-2044-10091 +204;Channel 4+1;2-2056-8311 +205;Channel 5+1;2-2057-7720 +206;Sky One+1;2-2021-1403 +207;Sky Witness+1;2-2021-6110 +208;Sky Atlantic+1;2-2023-1413 +209;W+1;2-2093-7615 +210;Xmas GOLD+1;2-2093-7605 +212;ComedyCent+1;2-2069-51083 +213;Universal+1;2-2109-52220 +214;SYFY+1;2-2109-52280 +215;Dave ja vu;2-2093-7624 +218;ITV2+1;2-2053-10165 +219;ITV3+1;2-2054-10261 +220;ITV4+1;2-2044-10073 +228;5STAR+1;2-2057-7717 +231;ITVBe+1;2-2053-10139 +232;alibi+1;2-2093-7630 +233;Xmas Food+1;2-2093-7626 +235;E4+1;2-2056-8300 +236;More4+1;2-2041-9230 +241;5USA+1;2-2057-7711 +244;QUEST+1;2-2035-6215 +245;Challenge+1;2-2007-6026 +246;CBS Reality+1;2-2112-55217 +249;Quest Red+1;2-2035-6211 +250;5Spike+1;2-2057-7731 +252;Pick+1;2-2026-5107 +257;Sony Crime+1;2-2110-53390 +258;Home+1;2-2093-7600 +261;Disc.Turbo+1;2-2062-52455 +272;Food Netwrk+1;2-2116-52510 +279;True Ent+1;2-2110-53380 +280;truTV+1;2-2110-53300 +298;Travel Ch+1;2-2098-53505 +301;SkyPremiereHD;2-2016-3821 +312;Sky Prem+1;2-2012-4405 +313;Film4;2-2041-9220 +314;Film4+1;2-2056-8341 +317;horror channel;2-2112-55202 +318;horror ch+1;2-2112-55218 +319;True Christmas;2-2110-53320 +320;TrueChrstms+1;2-2110-53325 +321;Sony Movies;2-2110-53315 +322;Sony Movies+1;2-2110-53355 +324;mov4men+1;2-2110-53365 +325;movies4men;2-2110-53310 +327;Retro Movies;2-2089-54217 +328;TalkingPictures;2-2094-22606 +329;ROK;2-2096-54171 +330;ROK+1;2-2095-55150 +350;MTV MUSIC;2-2010-7012 +351;MTV BASE;2-2010-7007 +352;MTV HITS;2-2010-7006 +353;MTV OMG;2-2010-7009 +354;Club MTV;2-2010-7014 +355;VH1 Christmas;2-2010-7003 +356;MTV XMAS;2-2010-7008 +357;MTV MUSIC+1;2-2010-7013 +358;Box Upfront;2-2100-6724 +359;The Box;2-2100-6722 +360;Box Hits;2-2100-6723 +361;KISS;2-2100-6725 +362;Magic;2-2100-6721 +363;Kerrang!;2-2100-6726 +364;Chart Show TV;2-2109-52290 +365;The Vault;2-2109-52295 +366;Christmas Hits;2-2109-52285 +368;NOW 90s;2-2095-55114 +369;Starz TV;2-2116-52515 +371;NOW XMAS;2-2098-53550 +372;Clubland TV;2-2095-55113 +373;Total Country;2-2097-52107 +376;Keep It Country;2-2065-50331 +401;SkySpMainEvHD;2-2008-3630 +402;SkySp PL HD;2-2039-3927 +403;SkySp F'ball HD;2-2039-3843 +404;SkySpCricketHD;2-2029-3913 +405;SkySp Golf HD;2-2039-3827 +406;SkySp F1 HD;2-2034-3835 +407;SkySp ActionHD;2-2034-3822 +408;SkySp Darts HD;2-2008-3858 +409;SkySp News HD;2-2039-3882 +410;Eurosport 1 HD;2-2008-3804 +411;Eurosport 2 HD;2-2008-3918 +412;Premier 1 HD;2-2106-53153 +413;BT Sport 1 HD;2-2114-50660 +414;BT Sport 2 HD;2-2113-53785 +415;At The Races;2-2032-3932 +417;BT Sport 3 HD;2-2114-50680 +418;MUTV HD;2-2092-55274 +419;Chelsea TV HD;2-2029-3271 +421;eir Sport 1 HD;2-2092-55275 +422;eir Sport 2 HD;2-2106-53152 +423;BTSpt//ESPNHD;2-2113-53795 +424;FreeSports;2-2116-52556 +427;BoxNation;2-2111-53205 +431;FrontRunner;2-2097-52111 +433;GINXeSportsTV;2-2012-6122 +435;Premier Sports 2;2-2100-6704 +450;Forces TV;2-2007-6033 +451;Insight HD;2-2091-22310 +452;FAME TV;2-2089-54211 +453;YANGA!;2-2095-55105 +454;AIT Int'l;2-2089-54220 +455;Showcase;2-2065-50305 +490;BTSptBoxOffHD;2-2113-53797 +491;SkySpBoxOff;2-2023-4906 +492;SkySpBoxOffHD;2-2025-1035 +493;ITV Box Off HD;2-2064-20825 +501;Sky News;2-2026-4704 +502;Bloomberg HD;2-2104-55392 +503;BBC NEWS HD;2-2061-8921 +504;BBC Parliament;2-2046-10307 +505;CNBC;2-2090-50882 +506;CNN HD;2-2103-50290 +507;NHK World HD;2-2106-53147 +508;Euronews;2-2089-54224 +509;CGTN;2-2089-54216 +510;NDTV 24x7;2-2095-55116 +511;RT HD;2-2106-53148 +512;FRANCE 24 HD;2-2116-52570 +513;Al Jazeera HD;2-2099-55415 +515;TVC News;2-2090-50895 +516;TRT World HD;2-2092-55273 +517;Oireachtas TV;2-2011-5541 +518;Channels 24;2-2098-53510 +519;Arise News;2-2067-50400 +520;News18;2-2067-50455 +521;RTÉ News Now;2-2011-5542 +522;Arirang TV HD;2-2106-53150 +560;Psychic Today;2-2111-53216 +580;GOD Channel;2-2096-54113 +581;revelation;2-2108-52127 +582;TBN UK;2-2108-52124 +583;DAYSTAR HD;2-2104-55305 +584;Inspiration TV;2-2065-50390 +585;LOVEWORLD TV;2-2065-50340 +586;Gospel Channel;2-2098-53535 +587;Word Network;2-2094-22610 +588;EWTN Catholic;2-2108-52136 +589;Faith World TV;2-2094-22607 +590;KICC TV;2-2094-22608 +591;Believe TV;2-2067-50465 +593;SonLife;2-2098-53560 +594;Faith UK;2-2067-50450 +595;Hillsong;2-2065-50345 +601;Cartoon Net HD;2-2027-3871 +603;Boomerang HD;2-2024-3625 +604;NickelodeonHD;2-2020-3869 +605;Nickelodeon+1;2-2023-6114 +606;Nicktoons;2-2026-5536 +607;Disney Jnr HD;2-2027-3873 +608;Disney Junior+;2-2011-9106 +609;Disney Chnl HD;2-2027-3875 +610;Disney Chnl+1;2-2011-9105 +611;Disney XD HD;2-2020-3627 +612;Disney XD+1;2-2011-9104 +613;CBBC HD;2-2050-6952 +614;CBeebies HD;2-2061-8932 +615;Nick Jr. HD;2-2039-3270 +616;POP;2-2110-53340 +617;Tiny Pop;2-2110-53330 +618;Boomerang+1;2-2103-50210 +619;Cartoonito;2-2103-50225 +620;Nick Jr.Too;2-2069-51089 +621;CITV;2-2044-10071 +622;BabyTV;2-2011-6104 +623;RTÉjr;2-2011-5543 +624;Tiny Pop+1;2-2110-53345 +625;POP+1;2-2110-53370 +626;POP Max;2-2110-53350 +627;POP Max+1;2-2110-53360 +628;Nick Jr+1;2-2069-51090 +640;Cartoon Netwrk;2-2103-50200 +641;Boomerang;2-2103-50205 +642;Nickelodeon;2-2069-51091 +643;Disney Junior;2-2011-9103 +644;Disney Chnl;2-2011-9102 +645;Disney XD;2-2011-9101 +646;CBBC;2-2048-10352 +647;CBeebies;2-2045-6318 +648;Nick Jr.;2-2069-51088 +660;QVC;2-2091-22304 +661;JML Direct;2-2096-54150 +662;TJC;2-2098-53520 +663;QVC Style;2-2091-22302 +664;Ideal World;2-2098-53545 +665;Gems TV;2-2116-52520 +666;High Street TV 1;2-2096-54175 +667;Retail TV;2-2096-54103 +668;High Street TV 2;2-2095-55102 +669;Best Direct;2-2096-54112 +670;Primal Cure;2-2089-54230 +671;Ideal Extra;2-2098-53555 +673;Hochanda;2-2095-9537 +674;JewelleryMaker;2-2065-50310 +675;High Street TV 4;2-2095-55104 +676;High Street TV 3;2-2112-55213 +677;TV Warehouse;2-2096-54180 +678;QVC Beauty;2-2091-22303 +679;PaversShoes.tv;2-2065-50313 +680;Thane;2-2098-53530 +681;Juwelo UK;2-2095-9533 +682;QVC Xmas;2-2091-22301 +683;Create & Craft;2-2098-53565 +684;Craft Extra;2-2098-53540 +685;Shop Now;2-2102-54058 +686;Price Crash;2-2102-54057 +687;Sewing Quarter;2-2095-9531 +688;Cruise1st.tv;2-2089-54228 +701;B4U Movies;2-2090-50896 +702;B4U Music;2-2090-50890 +703;SONY TV HD;2-2028-4030 +704;Star Bharat;2-2097-52185 +705;Star Plus HD;2-2028-3803 +707;COLORS HD;2-2104-55300 +708;mta-muslim tv;2-2108-52123 +709;Zee TV HD;2-2002-3631 +710;Zing;2-2007-5561 +711;Zee Cinema;2-2007-5559 +712;JUS Punjabi;2-2102-54063 +713;AAJ TAK;2-2096-54165 +714;MATV National;2-2067-50495 +715;Abu Dhabi TV;2-2100-6701 +716;&TV;2-2102-54062 +718;RishteyCine;2-2097-52180 +719;SONY MAX HD;2-2027-4031 +720;HUM Masala;2-2094-22617 +721;Hidayat TV;2-2090-50885 +722;Record TV HD;2-2104-55310 +723;GEO News;2-2067-50405 +724;PTV Global;2-2090-50883 +725;New Vision TV;2-2067-50497 +726;Venus TV;2-2090-50884 +727;Islam TV;2-2105-52090 +728;Islam Channel;2-2067-50415 +729;Star GOLD HD;2-2003-4032 +730;SONY SAB;2-2096-54107 +731;GEO TV;2-2096-54185 +732;Noor TV;2-2095-55109 +733;ABP News;2-2096-54167 +734;Peace TV;2-2108-52135 +735;PTC PUNJABI;2-2095-55117 +736;SONY MIX;2-2096-54120 +737;GEO Kahani;2-2095-55115 +739;IQRA TV;2-2105-52091 +740;92 News;2-2094-22615 +741;Rishtey;2-2097-52103 +742;Islam Ch Urdu;2-2108-52119 +743;Brit Asia TV;2-2067-50460 +744;IQRA BANGLA;2-2105-52092 +745;Ahlebait TV;2-2094-22603 +746;ATN Bangla UK;2-2094-22601 +747;Madani Chnl;2-2090-50887 +748;Sikh Channel;2-2065-50335 +749;Peace TV Urdu;2-2108-52138 +751;Ahlulbayt TV;2-2065-50325 +752;Samaa;2-2067-50435 +753;Takbeer TV;2-2098-53558 +754;Living Foodz;2-2007-5558 +755;Sangat;2-2095-9536 +756;Aastha;2-2095-55110 +758;SkyNws Arabia;2-2023-5532 +759;TV 99;2-2094-22614 +760;Akaal Channel;2-2071-51128 +761;HUM EUROPE;2-2094-22605 +762;British Muslim;2-2089-54225 +763;Safeer TV;2-2097-52170 +764;TV One;2-2089-54226 +765;Dunya News;2-2067-50490 +767;Channel 44;2-2071-51116 +769;Eman Channel;2-2097-52140 +770;KTV;2-2065-50300 +771;Aplus TV;2-2094-22613 +773;iON TV;2-2094-22616 +774;ARY Family;2-2067-50470 +775;Kanshi TV;2-2097-52106 +776;MTV Beats;2-2026-4024 +777;VTV;2-2090-50886 +778;Sanskar;2-2067-50475 +779;A1TV;2-2071-51117 +780;Iran Int'l HD;2-2099-55400 +781;NTAI;2-2096-54145 +782;HUM News;2-2094-22618 +783;PTV Prime;2-2095-55108 +784;Grace TV;2-2089-54227 +801;BBC One Lon;2-2045-6301 +802;BBC Two Eng;2-2045-6302 +803;ITV;2-2044-10080 +804;Channel 4;2-2056-8320 +805;Channel 5;2-2057-7701 +806;Sky One ;2-2026-4750 +807;Sky Witness;2-2026-5715 +808;Sky Atlantic ;2-2023-4901 +809;W;2-2022-6520 +810;ChristmasGOLD;2-2022-6504 +812;ComedyCentral;2-2069-51084 +813;Universal;2-2109-52255 +814;SYFY;2-2109-52250 +815;Dave;2-2022-6506 +816;BBC Four;2-2045-6316 +826;alibi;2-2093-7656 +842;Sky Premiere;2-2012-4404 +855;SkySpMainEv;2-2023-4255 +856;SkySp PL;2-2026-4095 +857;SkySp F'ball;2-2023-3838 +858;SkySpCricket;2-2026-5505 +859;SkySp Golf;2-2023-4206 +860;SkySp F1;2-2021-1306 +861;SkySp Action;2-2021-4219 +862;SkySp Darts;2-2021-3839 +863;SkySp News HD;2-2034-3629 +864;Eurosport 1;2-2023-5713 +865;Eurosport 2;2-2023-5009 +866;QUEST;2-2035-6213 +867;BT Sport 1;2-2112-55205 +868;BT Sport 2;2-2111-53280 +869;BT Sport 3;2-2112-55211 +870;MUTV;2-2007-5560 +871;eir Sport 2;2-2071-51112 +872;BT Sport//ESPN;2-2111-53285 +873;eir Sport 1;2-2071-51111 +877;BBC NEWS;2-2048-10358 +878;CNN;2-2103-50220 +879;RT;2-2096-54115 +880;Al Jazeera Eng;2-2065-50395 +882;SONY TV;2-2096-54101 +883;Star Plus;2-2097-52108 +884;COLORS;2-2097-52105 +885;Zee TV;2-2102-54061 +886;SONY MAX;2-2097-52100 +887;Star GOLD;2-2097-52113 +888;At The Races;2-2111-53210 +889;TRT World;2-2090-50881 +900;TVXpaypernight;2-2102-54054 +901;Adult Channel;2-2089-54213 +902;Xpanded TV;2-2094-22609 +903;Television X;2-2102-54050 +904;TVXpornstars;2-2102-54053 +905;TVXPPN2;2-2102-54052 +906;Babenation;2-2097-52112 +907;xrated40+;2-2102-54055 +908;Get Lucky TV;2-2111-53215 +909;Lucky Star;2-2098-53516 +912;Studio 66;2-2111-53200 +913;babes&brazzers;2-2090-50880 +915;XXX Petite;2-2019-4023 +916;XXX Girl Girl;2-2019-4021 +917;XXX Cougars;2-2019-4020 +918;XXXOfficeGirls;2-2019-4025 +919;XXX 18&Dirty;2-2019-5703 +920;XXXDrs&Nurses;2-2019-5704 +921;XXX Mums;2-2019-6100 +922;Climax;2-2090-50894 +923;Xpanded TV2;2-2094-22604 +924;XXX Brits;2-2019-5730 +925;Studio 66 2;2-2067-50440 +926;Studio 66 3;2-2067-50445 +940;Chat Box;2-2067-50485 +1900;U2MON;2-2032-9009 +1901;Astra UHD Demo;2-2038-7400 +1902;Astra UHD Demo;2-2038-7401 +1903;SES UHD Demo;2-2038-7402 +1904;Ultra HD;2-2003-9000 +1905;Ultra HD;2-2032-9002 +1906;Ultra HD;2-2032-9012 +1907;Ultra HD;2-2003-9051 +1909;U1MON;2-2003-9006 From 98acb03b52dd871a27e2c6573bc5ed1276bad698 Mon Sep 17 00:00:00 2001 From: hbeham Date: Tue, 5 Feb 2019 19:30:47 +0100 Subject: [PATCH 2/3] - upgraded to DevExpress 18.2 - hide VPID and APID columns for Panasonic (no data provided) - Samsung J lists could have a \0 character at the end of a unicode16 string, which caused "Copy to Excel" to truncate the text - Fixed new-version check to work with github (only supports TLS 1.2 and newer now, not SSL 3.0) - added pull-request with GB Sky reference channel list --- source/ChanSort.Api/Model/ChannelList.cs | 3 + .../ChanSort.Loader.LG.csproj | 14 +- .../PresetProgramNrDialog.resx | 34 +- source/ChanSort.Loader.LG/TvSettingsForm.resx | 46 +- .../ChanSort.Loader.Panasonic/Serializer.cs | 6 + .../ChanSort.Loader.SamsungJ/DbSerializer.cs | 5 +- source/ChanSort/AboutForm.resx | 42 +- source/ChanSort/ActionBox.resx | 14 +- source/ChanSort/ActionImages.resx | 4 +- source/ChanSort/ChanSort.csproj | 48 +- source/ChanSort/CharsetForm.resx | 32 +- source/ChanSort/GlobalImageCollection.resx | 4 +- source/ChanSort/MainForm.cs | 9 + source/ChanSort/MainForm.de.resx | 12 +- source/ChanSort/MainForm.pt.resx | 16 +- source/ChanSort/MainForm.resx | 380 +++++++-------- .../Printing/ReportOptionsDialog.resx | 24 +- .../ChanSort/Properties/Settings.Designer.cs | 4 +- source/ChanSort/Properties/licenses.licx | 6 - source/ChanSort/ReferenceListForm.resx | 94 ++-- .../ReferenceLists/gb_astra282E_sky.txt | 448 +++++++++++++++++- source/ChanSort/UpdateCheck.cs | 27 +- source/ChanSort/WaitForm1.resx | 4 +- source/ChanSort/app.config | 50 +- 24 files changed, 896 insertions(+), 430 deletions(-) diff --git a/source/ChanSort.Api/Model/ChannelList.cs b/source/ChanSort.Api/Model/ChannelList.cs index 207581b..3dc73cf 100644 --- a/source/ChanSort.Api/Model/ChannelList.cs +++ b/source/ChanSort.Api/Model/ChannelList.cs @@ -13,11 +13,14 @@ namespace ChanSort.Api private int duplicateUidCount; private int duplicateProgNrCount; + public static List DefaultVisibleColumns { get; set; } // initialized by MainForm + public ChannelList(SignalSource source, string caption) { this.SignalSource = source; this.ShortCaption = caption; this.FirstProgramNumber = (source & SignalSource.Digital) != 0 ? 1 : 0; + this.VisibleColumnFieldNames = DefaultVisibleColumns; } public string ShortCaption { get; } diff --git a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj index 93b60ab..dcea51f 100644 --- a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj +++ b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ChanSort.Loader.LG ChanSort.Loader.LG - v4.0 + v4.5.2 512 @@ -24,6 +24,7 @@ prompt 4 true + false pdbonly @@ -32,6 +33,7 @@ TRACE prompt 4 + false true @@ -44,6 +46,7 @@ false true true + false bin\x86\Release\ @@ -54,11 +57,12 @@ prompt false true + false - - - + + + diff --git a/source/ChanSort.Loader.LG/PresetProgramNrDialog.resx b/source/ChanSort.Loader.LG/PresetProgramNrDialog.resx index ac74e01..6aa9051 100644 --- a/source/ChanSort.Loader.LG/PresetProgramNrDialog.resx +++ b/source/ChanSort.Loader.LG/PresetProgramNrDialog.resx @@ -121,8 +121,8 @@ Top, Left, Right - - + + Vertical @@ -143,7 +143,7 @@ labelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -157,7 +157,7 @@ Tahoma, 8.25pt, style=Bold - + Vertical @@ -176,7 +176,7 @@ labelControl3 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -190,7 +190,7 @@ Tahoma, 8.25pt, style=Bold - + Vertical @@ -209,7 +209,7 @@ labelControl4 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -220,7 +220,7 @@ Top, Left, Right - + Vertical @@ -239,7 +239,7 @@ labelControl5 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -250,7 +250,7 @@ Top, Left, Right - + Vertical @@ -269,7 +269,7 @@ labelControl6 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -280,7 +280,7 @@ Top, Left, Right - + Vertical @@ -299,7 +299,7 @@ labelControl7 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -353,7 +353,7 @@ btnOk - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -364,7 +364,7 @@ Top, Left, Right - + Vertical @@ -383,7 +383,7 @@ labelControl2 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -410,6 +410,6 @@ PresetProgramNrDialog - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.resx b/source/ChanSort.Loader.LG/TvSettingsForm.resx index f291de6..e8ab68d 100644 --- a/source/ChanSort.Loader.LG/TvSettingsForm.resx +++ b/source/ChanSort.Loader.LG/TvSettingsForm.resx @@ -139,7 +139,7 @@ cbHbbTv - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOption @@ -166,7 +166,7 @@ cbCustomCountry - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOption @@ -177,8 +177,8 @@ 72, 29 - - + + Combo @@ -191,7 +191,7 @@ comboBoxEdit1 - DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOption @@ -215,7 +215,7 @@ labelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOption @@ -242,7 +242,7 @@ grpOption - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -269,7 +269,7 @@ btnOk - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -296,7 +296,7 @@ btnCancel - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -304,8 +304,8 @@ 2 - - + + Vertical @@ -324,7 +324,7 @@ labelControl3 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpHotelMode @@ -348,7 +348,7 @@ labelControl2 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpHotelMode @@ -375,7 +375,7 @@ cbDtvUpdate - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpHotelMode @@ -402,7 +402,7 @@ cbHotelMode - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpHotelMode @@ -429,7 +429,7 @@ grpHotelMode - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -456,7 +456,7 @@ cbAutoChannelUpdate - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpSetup @@ -483,7 +483,7 @@ grpSetup - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -491,7 +491,7 @@ 5 - + Vertical @@ -510,7 +510,7 @@ labelControl4 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpInformation @@ -537,7 +537,7 @@ grpInformation - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -567,7 +567,7 @@ lblHotelMenuAutoDetect - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -594,6 +594,6 @@ TvSettingsForm - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort.Loader.Panasonic/Serializer.cs b/source/ChanSort.Loader.Panasonic/Serializer.cs index c973303..0f6f42e 100644 --- a/source/ChanSort.Loader.Panasonic/Serializer.cs +++ b/source/ChanSort.Loader.Panasonic/Serializer.cs @@ -319,6 +319,12 @@ namespace ChanSort.Loader.Panasonic this.DataRoot.AddChannelList(this.dvbsChannels); this.DataRoot.AddChannelList(this.satipChannels); this.DataRoot.AddChannelList(this.freesatChannels); + + foreach (var list in this.DataRoot.ChannelLists) + { + list.VisibleColumnFieldNames.Remove("VideoPid"); + list.VisibleColumnFieldNames.Remove("AudioPid"); + } } #endregion diff --git a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs b/source/ChanSort.Loader.SamsungJ/DbSerializer.cs index 210eea2..b2cbe13 100644 --- a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs +++ b/source/ChanSort.Loader.SamsungJ/DbSerializer.cs @@ -192,7 +192,8 @@ namespace ChanSort.Loader.SamsungJ // 171027 - ohuseyinoglu: For user-defined satellites, the direction may be -1 // (and not just 1 for "E", 0 for "W") int dir = r.GetInt32(3); - sat.OrbitalPosition = $"{pos / 10}.{pos % 10}{(dir == 1 ? "E" : dir == 0 ? "W" : "")}"; sat.Name = ReadUtf16(r, 1); + sat.OrbitalPosition = $"{pos / 10}.{pos % 10}{(dir == 1 ? "E" : dir == 0 ? "W" : "")}"; + sat.Name = ReadUtf16(r, 1); this.DataRoot.AddSatellite(sat); } } @@ -386,7 +387,7 @@ namespace ChanSort.Loader.SamsungJ return null; byte[] nameBytes = new byte[200]; int nameLen = (int)r.GetBytes(fieldIndex, 0, nameBytes, 0, nameBytes.Length); - return Encoding.BigEndianUnicode.GetString(nameBytes, 0, nameLen); + return Encoding.BigEndianUnicode.GetString(nameBytes, 0, nameLen).Replace("\0", ""); // remove trailing \0 characters found in Samsung "_T_..." channel list } #endregion diff --git a/source/ChanSort/AboutForm.resx b/source/ChanSort/AboutForm.resx index 1142766..6c42294 100644 --- a/source/ChanSort/AboutForm.resx +++ b/source/ChanSort/AboutForm.resx @@ -117,8 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + Vertical @@ -139,7 +139,7 @@ lblWebsite - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -170,7 +170,7 @@ lnkDownload - DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -194,7 +194,7 @@ gcPlugins - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a horst@beham.biz @@ -215,7 +215,7 @@ lnkEmail - DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -223,7 +223,7 @@ 7 - + Vertical @@ -242,7 +242,7 @@ lblAuthor - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -250,7 +250,7 @@ 6 - + Vertical @@ -269,7 +269,7 @@ lblLicense - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -299,7 +299,7 @@ lnkLicense - DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -307,7 +307,7 @@ 4 - + Vertical @@ -326,7 +326,7 @@ lblCredits - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -350,7 +350,7 @@ txtCredits - DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -377,7 +377,7 @@ btnClose - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -401,7 +401,7 @@ txtAuthor - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -428,30 +428,30 @@ gvPlugins - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colPlugin - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colDisplayText - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFileTypes - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a AboutForm - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort/ActionBox.resx b/source/ChanSort/ActionBox.resx index 6b74a0b..e4ce23a 100644 --- a/source/ChanSort/ActionBox.resx +++ b/source/ChanSort/ActionBox.resx @@ -125,8 +125,8 @@ Tahoma, 9pt - - + + Vertical @@ -146,7 +146,7 @@ lblMessage - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -160,8 +160,8 @@ 32, 32 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxMi4yLCBWZXJzaW9uPTEyLjIu OC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT @@ -459,12 +459,12 @@ imageCollection1 - DevExpress.Utils.ImageCollection, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ImageCollection, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ActionBoxDialog - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort/ActionImages.resx b/source/ChanSort/ActionImages.resx index 67c6af0..e37e0ca 100644 --- a/source/ChanSort/ActionImages.resx +++ b/source/ChanSort/ActionImages.resx @@ -120,8 +120,8 @@ 349, 503 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu NS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE diff --git a/source/ChanSort/ChanSort.csproj b/source/ChanSort/ChanSort.csproj index 8ba3738..a9aea06 100644 --- a/source/ChanSort/ChanSort.csproj +++ b/source/ChanSort/ChanSort.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties ChanSort.Ui ChanSort - v4.0 + v4.5.2 512 @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -33,6 +34,7 @@ TRACE prompt 4 + false true @@ -43,6 +45,7 @@ prompt false false + false bin\Release\ @@ -53,49 +56,50 @@ prompt false false + false app.ico - + False - - + + False - + False - + False - - + + False - - + + False - + False - + False - + False - - - - - - - - + + + + + + + + diff --git a/source/ChanSort/CharsetForm.resx b/source/ChanSort/CharsetForm.resx index 3a28b8b..97956d8 100644 --- a/source/ChanSort/CharsetForm.resx +++ b/source/ChanSort/CharsetForm.resx @@ -138,13 +138,13 @@ btnCancel - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 433, 446 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a CharsetForm @@ -178,12 +178,12 @@ 0 - - + + Center - - + + None @@ -196,7 +196,7 @@ Top, Right - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Fill @@ -211,10 +211,10 @@ $this - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colName @@ -256,7 +256,7 @@ gcCharset - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Default character set for my country @@ -271,7 +271,7 @@ 353, 6 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 75, 23 @@ -331,7 +331,7 @@ btnOk - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 433, 483 @@ -340,17 +340,17 @@ 142 - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a True - - + + Default - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a True diff --git a/source/ChanSort/GlobalImageCollection.resx b/source/ChanSort/GlobalImageCollection.resx index 438360a..aa2a747 100644 --- a/source/ChanSort/GlobalImageCollection.resx +++ b/source/ChanSort/GlobalImageCollection.resx @@ -120,8 +120,8 @@ 17, 17 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNy4xLCBWZXJzaW9uPTE3LjEu Ny4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index ddbd6f7..c084bf5 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -97,6 +97,15 @@ namespace ChanSort.Ui View.View.Default = new View.View(); View.View.Default.CreateActionBox = msg => new ActionBoxDialog(msg); + + var defaultColumns = new List(); + foreach (GridColumn col in this.gviewRight.Columns) + { + if (col.Visible) + defaultColumns.Add(col.FieldName); + } + + ChannelList.DefaultVisibleColumns = defaultColumns; } #endregion diff --git a/source/ChanSort/MainForm.de.resx b/source/ChanSort/MainForm.de.resx index a09d129..c6581f2 100644 --- a/source/ChanSort/MainForm.de.resx +++ b/source/ChanSort/MainForm.de.resx @@ -556,8 +556,8 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. 333, 17 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4yLCBWZXJzaW9uPTE1 LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -567,7 +567,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. Xxl+0wEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4yLCBWZXJzaW9uPTE1 LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -577,7 +577,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. KphCYAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4yLCBWZXJzaW9uPTE1 LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -587,7 +587,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. ZMgcwAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4yLCBWZXJzaW9uPTE1 LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -597,7 +597,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus. WIeWYGkVXQEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4yLCBWZXJzaW9uPTE1 LjIuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA diff --git a/source/ChanSort/MainForm.pt.resx b/source/ChanSort/MainForm.pt.resx index 9f635f3..0056e30 100644 --- a/source/ChanSort/MainForm.pt.resx +++ b/source/ChanSort/MainForm.pt.resx @@ -62,9 +62,9 @@ - - - + + + Novo Pos @@ -329,8 +329,8 @@ Tipo serviço - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -340,7 +340,7 @@ Xxl+0wEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -350,7 +350,7 @@ KphCYAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -360,7 +360,7 @@ ZMgcwAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index 84530bf..05b282f 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -189,15 +189,15 @@ False - - + + Combo - - + + RegEx @@ -254,7 +254,7 @@ False - + Numeric @@ -267,7 +267,7 @@ gridLeft - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOutputList @@ -297,7 +297,7 @@ lblHotkeyLeft - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOutputList @@ -333,7 +333,7 @@ pageProgNr - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tabSubList @@ -351,7 +351,7 @@ tabSubList - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpSubList @@ -381,7 +381,7 @@ grpSubList - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -638,8 +638,8 @@ Tools - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -649,7 +649,7 @@ Xxl+0wEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -659,7 +659,7 @@ KphCYAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -669,7 +669,7 @@ ZMgcwAEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -679,7 +679,7 @@ WIeWYGkVXQEL - + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNy4xLCBWZXJzaW9uPTE3 LjEuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA @@ -702,7 +702,7 @@ barDockControlTop - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -723,7 +723,7 @@ barDockControlBottom - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -744,7 +744,7 @@ barDockControlLeft - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -765,7 +765,7 @@ barDockControlRight - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -782,8 +782,8 @@ swap - - + + Default @@ -796,7 +796,7 @@ rbInsertSwap - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -823,7 +823,7 @@ rbInsertAfter - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -847,7 +847,7 @@ rbInsertBefore - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -877,7 +877,7 @@ cbCloseGap - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -901,7 +901,7 @@ lblInsertMode - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -928,7 +928,7 @@ picDonate - DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -952,7 +952,7 @@ pageEmpty - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tabChannelList @@ -970,7 +970,7 @@ tabChannelList - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -978,7 +978,7 @@ 6 - + Vertical @@ -1000,7 +1000,7 @@ lblSetProgramNr - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -1011,13 +1011,13 @@ 437, 5 - + OK \d{1,4} - + RegEx @@ -1030,7 +1030,7 @@ txtSetSlot - DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpTopPanel @@ -1054,7 +1054,7 @@ grpTopPanel - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -1078,73 +1078,73 @@ gviewLeft - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colIndex1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutServiceType - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutSlot - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutName - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutFav - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a repositoryItemCheckedComboBoxEdit1 - DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colUid1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutLock - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutSkip - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOutHide - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a repositoryItemTextEdit1 - DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a globalImageCollection1 @@ -1156,685 +1156,685 @@ gviewRight - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colIndex - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSlotOld - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSlotNew - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSource - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colPrNr - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colName - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colShortName - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFavorites - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a repositoryItemCheckedComboBoxEdit2 - DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colLock - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSkip - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colHidden - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colEncrypted - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colServiceType - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colServiceTypeName - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFreqInMhz - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colChannelOrTransponder - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSatellite - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNetworkId - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colTransportStreamId - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colServiceId - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colVideoPid - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colAudioPid - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSymbolRate - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colPolarity - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNetworkName - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNetworkOperator - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colProvider - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colUid - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colLogicalIndex - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSignalSource - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colDebug - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a barManager1 - DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a bar1 - DevExpress.XtraBars.Bar, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Bar, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFile - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miOpen - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miReload - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRestoreOriginal - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFileInformation - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSave - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSaveAs - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miOpenReferenceFile - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miAddFromRefList - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSaveReferenceFile - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miExcelExport - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miPrint - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miQuit - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRecentFiles - DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miEdit - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miAddChannel - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRemove - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRenameChannel - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSort - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRenum - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRenumFavByPrNr - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuFavSet - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavASet - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavBSet - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavCSet - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavDSet - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavESet - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuFavUnset - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavAUnset - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavBUnset - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavCUnset - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavDUnset - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miFavEUnset - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miLockOn - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miLockOff - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSkipOn - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSkipOff - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miHideOn - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miHideOff - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a barSubItem2 - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miTvSettings - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miCleanupChannels - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuOptions - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a barSubItem1 - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miEnglish - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miGerman - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miPortuguese - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRussian - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miCzech - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRomanian - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuCharset - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miCharsetForm - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miIsoCharSets - DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miShowWarningsAfterLoad - DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miAllowEditPredefinedLists - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuAccessibility - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuGotoChannelList - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuInputSource - DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuGotoFavList - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuFavList - DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavList0 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavListA - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavListB - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavListC - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavListD - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miSelectFavListE - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miGotoLeftFilter - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miGotoLeftList - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miRightListFilter - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miGotoRightList - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a mnuHelp - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miWiki - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miOpenWebsite - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miAbout - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miMoveUp - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a miMoveDown - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a defaultLookAndFeel1 - DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a splashScreenManager1 - DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a popupContext - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a timerEditDelay @@ -1846,19 +1846,19 @@ popupInputSource - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a popupFavList - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a MainForm - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 01/23/2018 21:33:41 @@ -1885,7 +1885,7 @@ btnToggleLock - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -1912,7 +1912,7 @@ btnToggleFavE - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -1939,7 +1939,7 @@ btnToggleFavD - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -1966,7 +1966,7 @@ btnToggleFavC - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -1993,7 +1993,7 @@ btnToggleFavB - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2020,7 +2020,7 @@ btnToggleFavA - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2053,7 +2053,7 @@ btnClearLeftFilter - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2080,7 +2080,7 @@ btnRenum - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2107,7 +2107,7 @@ btnDown - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2134,7 +2134,7 @@ btnUp - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2161,7 +2161,7 @@ btnRemoveLeft - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlEditControls @@ -2185,7 +2185,7 @@ pnlEditControls - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOutputList @@ -2212,7 +2212,7 @@ grpOutputList - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a splitContainerControl1.Panel1 @@ -2307,13 +2307,13 @@ False - + Combo - + RegEx @@ -2563,7 +2563,7 @@ gridRight - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpInputList @@ -2593,7 +2593,7 @@ lblHotkeyRight - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpInputList @@ -2632,7 +2632,7 @@ specific provider, satellite or country lists. lblPredefinedList - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a panelControl3 @@ -2659,7 +2659,7 @@ specific provider, satellite or country lists. btnRemoveRight - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a panelControl3 @@ -2689,7 +2689,7 @@ specific provider, satellite or country lists. btnAddAll - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a panelControl3 @@ -2722,7 +2722,7 @@ specific provider, satellite or country lists. btnClearRightFilter - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a panelControl3 @@ -2749,7 +2749,7 @@ specific provider, satellite or country lists. btnAdd - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a panelControl3 @@ -2773,7 +2773,7 @@ specific provider, satellite or country lists. panelControl3 - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpInputList @@ -2800,7 +2800,7 @@ specific provider, satellite or country lists. grpInputList - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a splitContainerControl1.Panel2 @@ -2824,7 +2824,7 @@ specific provider, satellite or country lists. splitContainerControl1 - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this diff --git a/source/ChanSort/Printing/ReportOptionsDialog.resx b/source/ChanSort/Printing/ReportOptionsDialog.resx index 8f39453..7ae0152 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.resx @@ -135,7 +135,7 @@ labelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -162,7 +162,7 @@ rbSortByNumber - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -186,7 +186,7 @@ rbSortByName - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -210,7 +210,7 @@ labelControl2 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -228,8 +228,8 @@ 106, 52 - - + + Combo @@ -242,7 +242,7 @@ fontEdit1 - DevExpress.XtraEditors.FontEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.FontEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -269,7 +269,7 @@ btnPreview - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -296,7 +296,7 @@ btnCancel - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -313,7 +313,7 @@ 266, 52 - + Combo @@ -329,7 +329,7 @@ spinFontSize - DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -356,6 +356,6 @@ ReportOptionsDialog - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort/Properties/Settings.Designer.cs b/source/ChanSort/Properties/Settings.Designer.cs index 93e9e8d..7d8ffb2 100644 --- a/source/ChanSort/Properties/Settings.Designer.cs +++ b/source/ChanSort/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18052 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace ChanSort.Ui.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/source/ChanSort/Properties/licenses.licx b/source/ChanSort/Properties/licenses.licx index d3c5dcd..e69de29 100644 --- a/source/ChanSort/Properties/licenses.licx +++ b/source/ChanSort/Properties/licenses.licx @@ -1,6 +0,0 @@ -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/source/ChanSort/ReferenceListForm.resx b/source/ChanSort/ReferenceListForm.resx index cc5b30c..40c7e71 100644 --- a/source/ChanSort/ReferenceListForm.resx +++ b/source/ChanSort/ReferenceListForm.resx @@ -135,7 +135,7 @@ labelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl1 @@ -153,8 +153,8 @@ 132, 36 - - + + Ellipsis @@ -172,8 +172,8 @@ True - - + + MiddleCenter @@ -201,7 +201,7 @@ edFile - DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl1 @@ -209,7 +209,7 @@ 3 - + Vertical @@ -230,7 +230,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl2 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl1 @@ -257,7 +257,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) rbAuto - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl2 @@ -284,7 +284,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) rbManual - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl2 @@ -308,7 +308,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl3 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -319,7 +319,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) 123, 33 - + Combo @@ -332,7 +332,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) comboSource - DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -343,7 +343,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) 123, 7 - + Combo @@ -356,7 +356,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) comboTarget - DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -380,7 +380,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl4 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -404,7 +404,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbTv - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -428,7 +428,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbRadio - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -452,7 +452,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl5 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -460,7 +460,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) 19 - + Vertical @@ -479,7 +479,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl6 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -493,7 +493,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) 123, 134 - + Combo @@ -527,7 +527,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) comboPrNr - DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -554,7 +554,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbConsecutive - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -578,7 +578,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbIp - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -602,7 +602,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbSat - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -626,7 +626,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl11 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -650,7 +650,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbAntenna - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -674,7 +674,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbCable - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -698,7 +698,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl9 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -722,7 +722,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbAnalog - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -746,7 +746,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) cbDigital - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -770,7 +770,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) lblTargetInfo - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -794,7 +794,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) lblSourceInfo - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -818,7 +818,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) labelControl7 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -845,7 +845,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) btnApply - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpManual @@ -872,7 +872,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) grpManual - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl2 @@ -899,7 +899,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) btnOk - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -926,7 +926,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) btnClose - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -953,7 +953,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) linkWiki - DevExpress.XtraEditors.HyperlinkLabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.HyperlinkLabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl1 @@ -977,7 +977,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) groupControl1 - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -988,7 +988,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...) Tahoma, 12pt - + Vertical @@ -1008,7 +1008,7 @@ This step can be repeated as needed. labelControl10 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl2 @@ -1016,7 +1016,7 @@ This step can be repeated as needed. 0 - + Vertical @@ -1036,7 +1036,7 @@ This step can be repeated as needed. labelControl8 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupControl2 @@ -1060,7 +1060,7 @@ This step can be repeated as needed. groupControl2 - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -1087,6 +1087,6 @@ This step can be repeated as needed. ReferenceListForm - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt b/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt index 520081b..eb1bcf2 100644 --- a/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt +++ b/source/ChanSort/ReferenceLists/gb_astra282E_sky.txt @@ -1,24 +1,33 @@ 100;BBC RB1;2-2045-6390 101;BBC One HD;2-2050-6941 -103;BBC Two HD;2-2050-6940 -104;ITV HD ;2-2064-20840 -105;Channel 4 HD;2-2068-21200 +102;BBC Two HD;2-2050-6940 +103;ITV HD ;2-2064-20840 +104;Channel 4 HD;2-2068-21200 +105;Channel 5 HD;2-2057-7750 106;Sky One HD;2-2016-3275 107;Sky Witness HD;2-2025-3928 108;Sky Atlantic HD;2-2025-3853 109;W HD;2-2027-3925 110;Xmas GOLDHD;2-2020-6513 -111;Channel 5 HD;2-2057-7750 +111;Dave;2-2022-6506 112;ComedyCentHD;2-2020-3856 113;Universal HD;2-2002-3880 114;SYFY HD;2-2002-3884 -115;Dave HD;2-2002-3922 116;BBC Four HD;2-2061-8931 117;London Live;2-2090-50892 118;ITV2;2-2044-10070 119;ITV3;2-2054-10260 120;ITV4;2-2044-10072 +121;SkySp Mix HD;2-2034-3273 +122;Sky Arts HD;2-2025-3964 +123;E! HD;2-2002-3908 +124;FOX HD;2-2025-3962 +125;Discovery HD;2-2025-3622 +126;MTV HD;2-2020-3904 +127;ComedyXtra;2-2069-51086 128;5STAR;2-2057-7715 +129;Nat Geo HD;2-2020-3832 +130;History HD;2-2028-3886 131;ITVBe;2-2044-10075 132;alibi HD;2-2020-3923 133;Christmas Food;2-2022-6508 @@ -26,6 +35,7 @@ 136;More4;2-2056-8340 137;4seven;2-2068-21250 139;4Music;2-2100-6720 +140;TLC HD;2-2024-3970 141;5 USA;2-2057-7710 142;Really;2-2022-6523 143;Drama;2-2022-6522 @@ -36,29 +46,45 @@ 148;CBS Justice;2-2112-55209 149;Quest Red;2-2035-6214 150;5Spike;2-2057-7730 +151;Sky Two;2-2026-4752 152;Pick;2-2026-4751 153;Paramount;2-2111-53290 155;YESTERDAY;2-2022-6505 +156;Crime+Inv HD;2-2028-3888 157;Sony Crime;2-2110-53385 158;Home;2-2022-6501 159;5SELECT;2-2057-7716 160;PBS America;2-2116-52505 161;Disc.Turbo;2-2035-6209 +162;AnimalPlnt HD;2-2024-3626 +163;H2;2-2007-5551 +164;Lifetime HD;2-2029-3920 +165;NatGeoWild HD;2-2028-3885 +166;Eden;2-2022-6502 +167;Disc.Science;2-2035-6206 168;YourTV;2-2112-55270 +169;BBC ALBA;2-2047-6423 +170;Real Lives;2-2012-5556 +171;Disc.History;2-2035-6207 172;Food Network;2-2116-52500 173;Together;2-2026-4753 +174;VH1;2-2010-7002 175;BEN;2-2089-54223 +178;DMAX;2-2062-52415 179;True Ent;2-2110-53375 180;tru TV;2-2110-53305 182;GN TV;2-2098-53525 +183;VICE;2-2007-5115 184;Horse & Country;2-2096-54140 185;propeller;2-2097-52102 +186;AMC from BTHD;2-2114-50665 187;BLAZE;2-2065-50350 189;Property Show;2-2097-52109 191;mytv;2-2095-55118 192;CLTV;2-2098-53598 193;Vox Africa;2-2090-50888 194;BET:BlackEntTv;2-2069-51081 +197;Discovery Shed;2-2062-52440 198;Travel Channel;2-2096-54102 199;Cruise Channel;2-2102-54056 203;ITV+1;2-2044-10091 @@ -76,12 +102,19 @@ 218;ITV2+1;2-2053-10165 219;ITV3+1;2-2054-10261 220;ITV4+1;2-2044-10073 +224;FOX+1;2-2023-5402 +225;YESTERDAY+1;2-2093-7650 +226;MTV+1;2-2010-7005 +227;ComedyXtra+1;2-2069-51087 228;5STAR+1;2-2057-7717 +229;Nat Geo+1;2-2007-5553 +230;History+1;2-2007-5550 231;ITVBe+1;2-2053-10139 232;alibi+1;2-2093-7630 233;Xmas Food+1;2-2093-7626 235;E4+1;2-2056-8300 236;More4+1;2-2041-9230 +240;TLC+1;2-2062-52446 241;5USA+1;2-2057-7711 244;QUEST+1;2-2035-6215 245;Challenge+1;2-2007-6026 @@ -89,25 +122,47 @@ 249;Quest Red+1;2-2035-6211 250;5Spike+1;2-2057-7731 252;Pick+1;2-2026-5107 +256;Crime+Inv+1;2-2007-6011 257;Sony Crime+1;2-2110-53390 258;Home+1;2-2093-7600 261;Disc.Turbo+1;2-2062-52455 +262;Animal Plnt+1;2-2062-52405 +264;Lifetime+1;2-2021-6118 +266;Eden+1;2-2093-7610 +267;Disc.Sci+1;2-2062-52410 +270;Real Lives+1;2-2007-6025 +271;Disc.History+1;2-2062-52435 272;Food Netwrk+1;2-2116-52510 +278;DMAX+1;2-2062-52420 279;True Ent+1;2-2110-53380 280;truTV+1;2-2110-53300 298;Travel Ch+1;2-2098-53505 301;SkyPremiereHD;2-2016-3821 +302;SkyDCHeroesHD;2-2025-3963 +303;SkyChristmsHD;2-2024-3816 +304;Sky Disney HD;2-2024-3900 +305;Sky Family HD;2-2016-3818 +306;Sky Action HD;2-2028-3814 +307;Sky Comedy HD;2-2024-3819 +308;Sky Thriller HD;2-2016-3862 +309;Sky Greats HD;2-2024-3815 +310;Sky ScFi/HorHD;2-2024-3817 +311;Sky Select HD;2-2016-3901 312;Sky Prem+1;2-2012-4405 313;Film4;2-2041-9220 314;Film4+1;2-2056-8341 +315;TCM HD;2-2027-3906 +316;TCM+1;2-2097-52175 317;horror channel;2-2112-55202 318;horror ch+1;2-2112-55218 319;True Christmas;2-2110-53320 320;TrueChrstms+1;2-2110-53325 321;Sony Movies;2-2110-53315 322;Sony Movies+1;2-2110-53355 +323;movies4men;2-2110-53310 324;mov4men+1;2-2110-53365 -325;movies4men;2-2110-53310 +325;Christmas 24;2-2109-52265 +326;Christmas 24+;2-2109-52270 327;Retro Movies;2-2089-54217 328;TalkingPictures;2-2094-22606 329;ROK;2-2096-54171 @@ -157,16 +212,19 @@ 422;eir Sport 2 HD;2-2106-53152 423;BTSpt//ESPNHD;2-2113-53795 424;FreeSports;2-2116-52556 +425;LFCTV HD;2-2002-3845 +426;Racing TV HD;2-2092-55272 427;BoxNation;2-2111-53205 431;FrontRunner;2-2097-52111 433;GINXeSportsTV;2-2012-6122 -435;Premier Sports 2;2-2100-6704 +435;Premier 2;2-2100-6704 450;Forces TV;2-2007-6033 451;Insight HD;2-2091-22310 452;FAME TV;2-2089-54211 453;YANGA!;2-2095-55105 454;AIT Int'l;2-2089-54220 455;Showcase;2-2065-50305 +456;ABN TV;2-2089-54229 490;BTSptBoxOffHD;2-2113-53797 491;SkySpBoxOff;2-2023-4906 492;SkySpBoxOffHD;2-2025-1035 @@ -277,6 +335,7 @@ 703;SONY TV HD;2-2028-4030 704;Star Bharat;2-2097-52185 705;Star Plus HD;2-2028-3803 +706;PCNE Chinese;2-2108-52118 707;COLORS HD;2-2104-55300 708;mta-muslim tv;2-2108-52123 709;Zee TV HD;2-2002-3631 @@ -303,7 +362,7 @@ 731;GEO TV;2-2096-54185 732;Noor TV;2-2095-55109 733;ABP News;2-2096-54167 -734;Peace TV;2-2108-52135 +734;CHSTV;2-2094-22602 735;PTC PUNJABI;2-2095-55117 736;SONY MIX;2-2096-54120 737;GEO Kahani;2-2095-55115 @@ -324,6 +383,7 @@ 754;Living Foodz;2-2007-5558 755;Sangat;2-2095-9536 756;Aastha;2-2095-55110 +757;NTV;2-2089-54221 758;SkyNws Arabia;2-2023-5532 759;TV 99;2-2094-22614 760;Akaal Channel;2-2071-51128 @@ -358,13 +418,42 @@ 808;Sky Atlantic ;2-2023-4901 809;W;2-2022-6520 810;ChristmasGOLD;2-2022-6504 +811;Dave HD;2-2002-3922 812;ComedyCentral;2-2069-51084 813;Universal;2-2109-52255 814;SYFY;2-2109-52250 -815;Dave;2-2022-6506 -816;BBC Four;2-2045-6316 +816;ITV2 HD;2-2063-20710 +817;ITV3 HD;2-2066-21050 +818;ITV4 HD;2-2066-21060 +819;SkySp Mix;2-2026-4093 +820;Sky Arts ;2-2021-5719 +821;FOX;2-2021-5515 +822;225;2-2035-6201 +823;MTV;2-2010-7001 +824;Nat Geo;2-2007-5552 +825;History;2-2007-5549 826;alibi;2-2093-7656 +829;E4 HD;2-2008-3876 +830;More4 HD;2-2029-3272 +831;TLC;2-2035-6205 +834;E!;2-2109-52225 +835;Crime+Inv;2-2007-5554 +836;Animal Planet;2-2035-6202 +838;Lifetime;2-2026-5716 +839;Nat Geo Wild;2-2007-5555 +840;AMC from BT;2-2112-55207 842;Sky Premiere;2-2012-4404 +843;Sky DC Heroes;2-2021-5720 +844;Sky Christmas;2-2012-5502 +845;TCM;2-2103-50230 +846;Sky Family;2-2012-4403 +847;Sky Action;2-2012-4302 +848;Sky Comedy;2-2012-4303 +849;Sky Thriller;2-2012-4406 +850;Sky Greats;2-2012-5650 +851;Sky ScFi/Horror;2-2012-4304 +852;Sky Select;2-2012-4306 +853;Film4 HD;2-2008-3274 855;SkySpMainEv;2-2023-4255 856;SkySp PL;2-2026-4095 857;SkySp F'ball;2-2023-3838 @@ -384,6 +473,7 @@ 871;eir Sport 2;2-2071-51112 872;BT Sport//ESPN;2-2111-53285 873;eir Sport 1;2-2071-51111 +874;Racing TV;2-2071-51120 877;BBC NEWS;2-2048-10358 878;CNN;2-2103-50220 879;RT;2-2096-54115 @@ -421,6 +511,8 @@ 925;Studio 66 2;2-2067-50440 926;Studio 66 3;2-2067-50445 940;Chat Box;2-2067-50485 +994;Sky AtlanticVIP;2-2012-4108 +995;SkyAtlntcVIPHD;2-2002-4103 1900;U2MON;2-2032-9009 1901;Astra UHD Demo;2-2038-7400 1902;Astra UHD Demo;2-2038-7401 @@ -429,4 +521,340 @@ 1905;Ultra HD;2-2032-9002 1906;Ultra HD;2-2032-9012 1907;Ultra HD;2-2003-9051 +1908;SES UHD Demo;2-2038-7402 1909;U1MON;2-2003-9006 +1910;6703;2-2100-6703 +2770;5493;2-2011-5493 +2771;RTÉ One;2-2011-5537 +2772;RTÉ2;2-2011-5538 +2773;TG4;2-2011-5539 +2774;RTÉ One+1;2-2011-5540 +2775;ITV Encore HD;2-2064-20820 +2776;alibi;2-2022-6521 +2777;SkySp PL;2-2026-1312 +2778;SkySpCricket;2-2026-1342 +2779;SkySp F'ball;2-2026-3841 +2780;SkySp F'ball;2-2026-3855 +2781;At The Races;2-2026-4225 +2782;Sky Two;2-2026-5533 +2783;Virgin Three;2-2026-5534 +2784;SkySp Mix;2-2026-6150 +2785;ITV Encore+1;2-2054-10265 +2786;E4;2-2056-8306 +2787;Channel 4;2-2056-8325 +2788;Film4;2-2056-8350 +2789;ID;2-2062-52400 +2790;ID+1;2-2062-52426 +2791;HomeHealth+1;2-2062-52450 +2792;eir Sport 2 HD;2-2106-53154 +2795;BT Sport 1;2-2112-55250 +2796;55251;2-2112-55251 +2797;50368;2-2112-55252 +2798;BT Sport 3;2-2112-55260 +2799;50342;2-2112-55261 +2800;50343;2-2112-55262 +2801;BT Sport 1 HD;2-2114-50661 +2802;50662;2-2114-50662 +2803;50663;2-2114-50663 +2804;BT Sport 3 HD;2-2114-50681 +2805;50682;2-2114-50682 +2806;50683;2-2114-50683 +2807;eir Sport 1 HD;2-2092-55276 +2808;Birmingham TV;2-2094-22611 +2809;Liverpool TV;2-2094-22612 +2810;Bristol TV;2-2094-22622 +2811;Cardiff TV;2-2094-22623 +2812;Leeds TV;2-2094-22624 +2813;Tyne & Wear TV;2-2094-22625 +2814;TG4 HD;2-2002-3276 +2816;SkySp Darts HD;2-2008-3940 +2817;MTV;2-2010-7010 +2819;Sky Disney;2-2012-4308 +2820;Virgin Two HD;2-2016-3820 +2821;RTÉ2 HD;2-2028-3624 +2822;RTÉ One HD;2-2028-3921 +2823;At The Races;2-2032-3933 +2824;SkySp ActionHD;2-2034-3824 +2825;SkySp F1 HD;2-2034-3836 +2826;Sky News HD;2-2034-3854 +2827;SkySpCricketHD;2-2034-3878 +2828;SkySpCricketHD;2-2034-3915 +2829;SkySp Mix HD;2-2034-4092 +2830;More4;2-2041-9231 +2831;Channel 4+1;2-2041-9245 +2832;E4+1;2-2041-9250 +2833;ITV Encore;2-2053-10135 +2834;Nicktoons;2-2069-51082 +2835;ComedyCent+1;2-2069-51085 +2836;Nick Jr.Too;2-2069-51092 +2837;MTV MUSIC;2-2069-51093 +2838;eir Sport 1;2-2071-51122 +2839;eir Sport 2;2-2071-51123 +2840;51125;2-2071-51125 +2841;51126;2-2071-51126 +2842;E!;2-2109-52230 +2843;Universal;2-2109-52260 +2844;At The Races;2-2111-53211 +2850;BT Sport 2;2-2111-53281 +2851;BT Sport//ESPN;2-2111-53286 +2853;BT Sport 2 HD;2-2113-53786 +2854;BT Sport 1 HD;2-2113-53790 +2855;BT Sport 2 HD;2-2113-53791 +2856;BT Sport 3 HD;2-2113-53792 +2857;BTSpt//ESPNHD;2-2113-53796 +2858;TRP 1;59-2315-10600 +2859;Dave;2-2093-7620 +2860;ChristmasGOLD;2-2093-7655 +2861;W;2-2093-7657 +2862;CN+1;2-2103-50215 +2864;Virgin Two;2-2007-3615 +2865;Virgin One+1;2-2007-9604 +2894;SkySp F1;2-2021-1307 +2895;SkySp PL;2-2021-1326 +2896;SkySp Darts;2-2021-3842 +2897;SkySp Darts;2-2021-3859 +2898;SkySp Darts;2-2021-4205 +2899;SkySpMainEv;2-2021-4214 +2900;SkySpMainEv;2-2021-4216 +2901;SkySp Action;2-2021-4511 +2902;Sky One;2-2021-4701 +2903;Virgin One;2-2021-4760 +2904;ComedyXtra;2-2021-5535 +2905;SkySp PL;2-2021-5557 +2906;Sky One;2-2021-5718 +2907;Sky Witness;2-2021-6036 +2908;ComedyCentral;2-2021-6040 +2909;Nick Jr.;2-2021-6116 +2910;SkySp F'ball;2-2023-3848 +2911;SkySp News;2-2023-4211 +2912;SkySp Golf;2-2023-4233 +2913;SkySp News;2-2023-4907 +2914;SkySp News;2-2023-4909 +2915;SkySp News;2-2023-4910 +2916;SkySpMainEv;2-2023-4914 +2918;S1Test;2-2023-5309 +2919;SkySp Golf;2-2023-5401 +2920;SkySp Golf;2-2023-5404 +2921;Sky Atlantic;2-2023-5711 +2922;Sky Witness+1;2-2023-5712 +2923;Nickelodeon;2-2023-6112 +2924;Sky One HD;2-2025-3861 +2925;Sky One HD;2-2025-3865 +2926;Sky News HD;2-2025-3961 +2927;Virgin One HD;2-2027-3628 +2928;Xmas Food HD;2-2027-3867 +2929;SkySp Darts HD;2-2029-3945 +2930;SkySpMainEvHD;2-2029-4003 +2931;SkySp PL HD;2-2029-4040 +2932;SkySp PL HD;2-2029-4094 +2933;Discovery+1;2-2035-6204 +2934;Home & Health;2-2035-6208 +2935;Discovery;2-2035-6210 +2936;ID;2-2035-6212 +2937;TLC;2-2035-6233 +2938;SkySpMainEvHD;2-2039-3802 +2939;SkySpMainEvHD;2-2039-3877 +2940;SkySp News HD;2-2039-3917 +2941;SkySp Golf HD;2-2039-3926 +2942;SkySp F'ball HD;2-2039-3939 +2943;SkySp PL HD;2-2039-4029 +2944;H1Test;2-2039-9008 +2945;BBC Four;2-2045-6316 +2946;ITV;2-2044-10060 +2948;ITV;2-2044-10090 +2949;ITV;2-2044-10100 +2950;ITV+1;2-2044-10101 +2951;BBC One W Mid;2-2046-10301 +2952;BBC One Yk&Li;2-2046-10303 +2953;BBC One E Mid;2-2046-10305 +2954;BBC One East E;2-2046-10306 +2955;BBC One Wales;2-2046-10311 +2956;BBC Two Wales;2-2046-10312 +2957;ETV5;2-2046-10321 +2958;BBC One South;2-2048-10353 +2959;BBC One S West;2-2048-10354 +2960;BBC One Oxford;2-2048-10356 +2961;BBC One NI;2-2048-10361 +2962;BBC Two NI;2-2048-10362 +2963;ETV6;2-2048-10371 +2964;CBBC;2-2048-10372 +2965;BBC One NI;2-2048-10392 +2966;BBC Two NI;2-2048-10393 +2967;BBC Two Wal HD;2-2050-6912 +2968;BBC One NI HD;2-2050-6943 +2969;6945;2-2050-6945 +2970;BBC Two HD;2-2050-6960 +2971;BBC One HD;2-2050-6961 +2972;BBC One NI HD;2-2050-6963 +2973;CBBC HD;2-2050-6972 +2974;ITV;2-2054-10200 +2975;STV;2-2054-10210 +2976;STV;2-2054-10220 +2977;STV;2-2054-10221 +2978;STV;2-2054-10225 +2979;UTV;2-2054-10230 +2980;UTV+1;2-2054-10231 +2981;ITV;2-2054-10240 +2982;ITV+1;2-2054-10255 +2983;Channel 4+1;2-2056-8312 +2984;Channel 4+1;2-2056-8314 +2985;Channel 4+1;2-2056-8316 +2986;e4;2-2056-9208 +2987;STV HD;2-2064-20800 +2988;UTV HD;2-2064-20810 +2989;20826;2-2064-20826 +2990;ITV HD;2-2064-20850 +2991;ITV HD;2-2066-21000 +2992;ITV HD;2-2066-21020 +2993;ITV HD;2-2066-21030 +2994;ITV HD ;2-2066-21040 +2996;52126;2-2108-52126 +2997;53355;2-2110-52558 +2998;53310;2-2110-53270 +2999;53390;2-2110-53271 +3000;53365;2-2110-55201 +3001;CBS Reality;2-2112-55216 +3002;S4C;2-2112-55295 +3003;Peace TV;2-2108-52135 +3005;Sky;2-2012-4505 +3006;Sky Intro;2-2012-4515 +3007;Sky Intro;2-2012-4525 +3008;Sky Intro;2-2012-5004 +3009;___4109;2-2012-47000 +3010;___4110;2-2012-48000 +3011; (sub b +1000);2-2012-49000 +3014;Drama;2-2022-25111 +3015;Really;2-2022-25112 +3016;Sky News;2-2026-4706 +3017;Sky Intro;2-2032-1002 +3018;4567;2-2032-4567 +3019;Channel 4;2-2041-9211 +3020;Channel 4;2-2041-9212 +3021;Channel 4;2-2041-9213 +3022;Channel 4;2-2041-9214 +3023;Channel 4;2-2041-9216 +3024;c4 l;2-2041-9281 +3025;3001;2-2045-3001 +3026;3002;2-2045-3002 +3027;3003;2-2045-3003 +3028;3004;2-2045-3004 +3029;3005;2-2045-3005 +3030;ETV1;2-2045-6306 +3031;BBC One Lon;2-2045-6321 +3032;BBC Two Eng;2-2045-6322 +3033;BBC Four;2-2045-6336 +3034;CBeebies;2-2045-6338 +3035;BBC One West;2-2045-6341 +3036;BBC One East W;2-2045-6351 +3037;BBC One CI;2-2045-6361 +3038;6391;2-2045-6391 +3039;ETV2;2-2047-6407 +3040;BBC One Scot;2-2047-6421 +3041;BBC Two Scot;2-2047-6422 +3042;BBC ALBA;2-2047-6424 +3043;BBC One N West;2-2047-6441 +3044;BBC One Yorks;2-2047-6451 +3045;BBC One S East;2-2047-6461 +3046;BBC One NE&C;2-2047-6471 +3047;ITV Border;2-2053-10120 +3048;ITV+1;2-2053-10125 +3049;ITV;2-2053-10130 +3050;ITV;2-2053-10140 +3051;ITV+1;2-2053-10145 +3052;ITV;2-2053-10150 +3053;ITV+1;2-2053-10155 +3054;ITV;2-2053-10160 +3055;ITV;2-2059-12101 +3056;ITV+1;2-2059-12105 +3057;ITV;2-2059-12110 +3058;ITV;2-2059-12120 +3059;ITV;2-2059-12130 +3060;ITV;2-2059-12145 +3061;ITV Wales;2-2059-12150 +3062;ITV+1;2-2059-12155 +3063;ITV+1;2-2059-12165 +3064;ITV;2-2059-12170 +3065;ITV+1;2-2059-12175 +3066;BBC One ScotHD;2-2061-8901 +3067;BBC One Wal HD;2-2061-8911 +3068;BBC Four HD;2-2061-8951 +3069;CBeebies HD;2-2061-8952 +3070;ITV Wales HD;2-2063-20730 +3071;ITV HD;2-2063-20740 +3072;ITV HD;2-2063-20750 +3073;ITV HD;2-2063-20760 +3074;ITV HD;2-2063-20770 +3075;V Channel;2-2067-50425 +3076;51110;2-2071-51110 +3077;S4C HD;2-2109-52296 +3081;Fashion One;59-2315-10552 +3085;Notts TV;2-2089-54214 +3086;TVC News+1;2-2089-54218 +3087;DM Plus TV;2-2089-54219 +3090;Heart TV;2-2095-55111 +3091;CAPITAL TV;2-2095-55112 +3092;3100;2-2003-3100 +3093;Sky Insider HD;2-2003-3101 +3094;Challenge;2-2007-6031 +3095;1007;2-2021-1007 +3096;4205;2-2021-4220 +3097;1008;2-2023-1008 +3098;4206;2-2023-5403 +3099;5503;2-2023-5503 +3100;Pick;2-2023-5530 +3101;SkySp F'ball HD;2-2029-3942 +3102;SkySp ActionHD;2-2029-4001 +3103;SkySp Golf HD;2-2029-4004 +3104;SkySp PL HD;2-2029-4011 +3105;SkySp News HD;2-2029-4036 +3106;SkySp F1 HD;2-2029-4202 +3965;BT Sport Extra 1;2-2112-55215 +3966;BT Sport Mosaic;2-2112-55219 +3967;SYFY HD;2-2002-3898 +3968;Club MTV;2-2012-3895 +3969;BT Sport Extra 2;2-2111-53220 +3970;BT Sport Extra 3;2-2111-53230 +3971;BT Sport Extra 4;2-2111-53240 +3972;BT Sport Extra 5;2-2111-53250 +3973;BT Sport Extra 6;2-2111-53260 +3974;BT Sport Mosaic 2;2-2111-53297 +3975;TCM;2-2003-3801 +3976;Sports Active;2-2019-1291 +3977;Sports Active;2-2019-1292 +3978;Sports Active;2-2019-1293 +3979;Sports Active;2-2019-1294 +3980;Sports Active;2-2019-1295 +3981;Sports Active;2-2019-1296 +3982;Sports Active;2-2019-1297 +3983;Sports Active;2-2019-1298 +3984;Sports Active;2-2019-1299 +3985;Sports Active;2-2019-5411 +3986;Sports Active;2-2019-5421 +3987;Sports Active;2-2019-5422 +3988;Sports Active;2-2019-5423 +3989;Sports Active;2-2019-5424 +3990;Sports Active;2-2019-5425 +3991;Sports Active;2-2019-5426 +3992;Sports Active;2-2019-5427 +3993;Sports Active;2-2019-5428 +3994;Sports Active;2-2019-5429 +3995;Sports Active;2-2019-5471 +3996;Sports Active;2-2019-5472 +3997;Sports Active;2-2019-5473 +3998;Sports Active;2-2019-5474 +3999;Sports Active;2-2019-5475 +4000;Sports Active;2-2019-5476 +4001;Sports Active;2-2019-5477 +4002;Sports Active;2-2019-5478 +4003;Sports Active;2-2019-5479 +4004;S1 Test;2-2023-5308 +4005;ITVi Stream 44;2-2044-10079 +4006;IEPG data 1;2-2004-4189 +4007;Sky Shop;2-2016-8458 +4008;Get Sky Products;2-2016-8459 +4009;FreesatSSU;59-2315-10502 +4010;10529 (Freesat 5);59-2315-10529 +4011;Freesat Info;59-2315-10530 +4012;D1 DAB;59-2315-10585 +4013;SDL nATL;59-2315-10590 +4014;talkSPORT Dist;59-2315-10595 \ No newline at end of file diff --git a/source/ChanSort/UpdateCheck.cs b/source/ChanSort/UpdateCheck.cs index 7ced3ef..ef5c121 100644 --- a/source/ChanSort/UpdateCheck.cs +++ b/source/ChanSort/UpdateCheck.cs @@ -1,4 +1,6 @@ -using System.Net; +using System; +using System.Net; +using System.Net.Security; using System.Threading; using ChanSort.Ui.Properties; using DevExpress.XtraEditors; @@ -7,7 +9,7 @@ namespace ChanSort.Ui { class UpdateCheck { - private const string UpdateUrl = "http://github.com/PredatH0r/ChanSort/releases"; + private const string UpdateUrl = "https://github.com/PredatH0r/ChanSort/releases"; private const string SearchString = "ChanSort_"; public static void CheckForNewVersion() @@ -31,11 +33,26 @@ namespace ChanSort.Ui private string GetLatestVersion() { string response; - using (WebClient client = new WebClient()) + + var oldCallback = ServicePointManager.ServerCertificateValidationCallback; + var oldProtocol = ServicePointManager.SecurityProtocol; + try { - client.Proxy = null; // prevent a 1min wait/timeout by a .NET bug - response = client.DownloadString(UpdateUrl); + //Change SSL checks so that all checks pass + //ServicePointManager.ServerCertificateValidationCallback = delegate { return true; }; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; + using (WebClient client = new WebClient()) + { + client.Proxy = null; // prevent a 1min wait/timeout by a .NET bug + response = client.DownloadString(UpdateUrl); + } } + finally + { + //ServicePointManager.ServerCertificateValidationCallback = oldCallback; + ServicePointManager.SecurityProtocol = oldProtocol; + } + int start = response.IndexOf(SearchString); if (start >= 0) { diff --git a/source/ChanSort/WaitForm1.resx b/source/ChanSort/WaitForm1.resx index 5682d5e..cfe8321 100644 --- a/source/ChanSort/WaitForm1.resx +++ b/source/ChanSort/WaitForm1.resx @@ -145,7 +145,7 @@ 0, 14, 0, 14 - DevExpress.XtraWaitForm.WaitForm, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraWaitForm.WaitForm, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a WaitForm1 @@ -227,7 +227,7 @@ Horizontal - DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Horizontal diff --git a/source/ChanSort/app.config b/source/ChanSort/app.config index a3d3919..afc2aab 100644 --- a/source/ChanSort/app.config +++ b/source/ChanSort/app.config @@ -6,7 +6,7 @@
- + 0 @@ -15,37 +15,37 @@ 0 - + - + - + - + - + - + - + - + - + - + - + False @@ -54,13 +54,13 @@ 0, 0 - + - + - + 0 @@ -81,34 +81,34 @@ True - + - + - + - + - + - + - + - + - + - + Tahoma From e73cc381f786d461257d6ef89db8f0408d314965 Mon Sep 17 00:00:00 2001 From: hbeham Date: Tue, 5 Feb 2019 20:03:47 +0100 Subject: [PATCH 3/3] fixed build settings for .NET 4.5.2 --- source/ChanSort/UpdateCheck.cs | 2 -- source/Test.Loader.LG/Test.Loader.LG.csproj | 8 ++++++-- source/Test.Loader.LG/app.config | 2 +- source/Test.Loader/Test.Loader.csproj | 8 ++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/source/ChanSort/UpdateCheck.cs b/source/ChanSort/UpdateCheck.cs index ef5c121..0cc65f6 100644 --- a/source/ChanSort/UpdateCheck.cs +++ b/source/ChanSort/UpdateCheck.cs @@ -34,7 +34,6 @@ namespace ChanSort.Ui { string response; - var oldCallback = ServicePointManager.ServerCertificateValidationCallback; var oldProtocol = ServicePointManager.SecurityProtocol; try { @@ -49,7 +48,6 @@ namespace ChanSort.Ui } finally { - //ServicePointManager.ServerCertificateValidationCallback = oldCallback; ServicePointManager.SecurityProtocol = oldProtocol; } diff --git a/source/Test.Loader.LG/Test.Loader.LG.csproj b/source/Test.Loader.LG/Test.Loader.LG.csproj index 51a51bd..6b7eb56 100644 --- a/source/Test.Loader.LG/Test.Loader.LG.csproj +++ b/source/Test.Loader.LG/Test.Loader.LG.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ Properties Test.Loader.LG Test.Loader.LG - v4.0 + v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -32,6 +33,7 @@ TRACE prompt 4 + false true @@ -40,6 +42,7 @@ full x86 prompt + false bin\x86\Release\ @@ -48,6 +51,7 @@ pdbonly x86 prompt + false diff --git a/source/Test.Loader.LG/app.config b/source/Test.Loader.LG/app.config index e365603..de82893 100644 --- a/source/Test.Loader.LG/app.config +++ b/source/Test.Loader.LG/app.config @@ -1,3 +1,3 @@ - + diff --git a/source/Test.Loader/Test.Loader.csproj b/source/Test.Loader/Test.Loader.csproj index a1a01b1..000d5ef 100644 --- a/source/Test.Loader/Test.Loader.csproj +++ b/source/Test.Loader/Test.Loader.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ Properties Test.Loader Test.Loader - v4.0 + v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -32,6 +33,7 @@ TRACE prompt 4 + false true @@ -41,6 +43,7 @@ x86 prompt true + false bin\x86\Release\ @@ -49,6 +52,7 @@ pdbonly x86 prompt + false