From 40ceaf53174a263e9ab28e19b09bed9a1fd88263 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Sat, 1 Aug 2009 16:08:42 +0000 Subject: [PATCH] Updated to use new IniFile and UpdateCheck dlls. --- .../{nc_settings.dll => IniFile.dll} | Bin 20480 -> 20480 bytes embroideryReader/Properties/AssemblyInfo.cs | 4 ++-- .../{nc_Updater.dll => UpdateCheck.dll} | Bin 20480 -> 20480 bytes embroideryReader/embroideryReader.csproj | 12 ++++++------ embroideryReader/frmMain.cs | 8 ++++---- embroideryReader/frmSettingsDialog.cs | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename embroideryReader/{nc_settings.dll => IniFile.dll} (60%) rename embroideryReader/{nc_Updater.dll => UpdateCheck.dll} (74%) diff --git a/embroideryReader/nc_settings.dll b/embroideryReader/IniFile.dll similarity index 60% rename from embroideryReader/nc_settings.dll rename to embroideryReader/IniFile.dll index be8efd39cbf12dc7a37d002a912326d06e34ac78..3d859a162da00e4e41fb296f00e1716077b4108f 100644 GIT binary patch literal 20480 zcmeHNYiu0Xbw2ahncd~?%EOgNsfnVc>BpLn6-mj~QdT8OOIe~VN-{}HqRo_Aa);E| z%bnHCP?jplk>OZH8y85L)UZwUzW7j^B7cI;5Oe09d(J)g-0z#NmCtFS1oFPOo9M$UWq0B;L})?%iGn{|=ZJEidENtm z?L#1t)!Ktp{mBrW&N;3#j~wCK2omi40N$o&1m5Qyvus0=eWlZQS#Jby(=$SJpotBW zAp#)+Ap#)+Ap#)+Ap#)+Ap#)+Ap#)+|Bn#(B%iDC@Yz(R2wm&PSu;r_iQJ!`oRhOS zdB$Z22CA1p)F3G%+4HLG8jxPXZG+mPh?BS4Bdg4i&mhS#>RL@ zTmE@wMALP98}u(Sl!~1}vai&U=snaTWZn!Z;=Nm=ou?AfRXX|l9kR~0j%4qQZ!OSZ zmt(73-s!@ymR1c_y~Hgs)QE_-PV_s+L33gB+&yrtcWVrt8e1jz+wlplf4grpVnhO) z5#Q#j5=O+n7Y3VP@mqd3TCVq>6fv0Ad~3R)DVMlU3_Y-_H(NDo!73tMxGrpUPW$+9 z>kVC0*K;6yA8NJl2gznZdVU&=Erbq6j~FnxbE=IjU;6%=rSW!;!=60RH5YwNVe^a`EUm}X&fOb^Ky>si8YnGjff_lU8mGzqu2`;5{E@;HxO zna~}WWy#pos^8h7&n*(3pb+#KpTld{^N_lB!R=dD<*WV}63zGLkzbfi9)NIlcQ8|_ zSxmZOj#lU~)W_pr?z|L(R?9TNSl)RWXwqOze!gj7W#N_6zzX^QVj5UcqIDWz;s0qG z;DYsOfEmB*)}00r4-xt<@W6s#$QK#b;ctQ6h^dc9X0{*WtqSSjp>P@?}V)+T{)U~Q$ASh3ev;o%}sv3J4R|5#<7m9Te6gRV9z zLTukCR*Bxt1{R}q%)oNQ-uZ!}LSkr$Q#KPbbR#OZ9Ch&XFQeHlKsPob&$Z+?_9P3j zraj4YEZ`b@k~VBU+I*-Uj@iTPf1CJpo*KL>R!@r!3>HsAHQIQ8sEL&%DGIZ7QHxbk#AB)fhk$?gbx2ps#PG}F*Qa>j{kj-fYv^D= zSDT`Attz;aI?@|@Cu-v%s9(Ump#gIJppuXVXs`DJZ0jl&|1N z`3JYKKkUO^m$$dNjRQzLn3FoQdzi`oDrm62-VadFI?Quo(h^hKmVns{wYaQhv9SrP z`R9UvMj1ftp9|XjsvGA5MVtlV`PZPOtvn0lw8mW3*QM1bs)QEIQ_<<97LAEv+16`n zO(%gv2A#qtqx(6cujAXt=}FJADvK^_{4h?0X_~s9n4}D5 z5dNvK`_L0(qxcShzll!nK2Wyj!1IHlAf4PKN3qfneIV^1?Bbw8IKJ>+hBzO6K%4QR zPY5j#zkOoe7kaFVt_nQX=rm1Z?fNvG2i+qLNg7q88PHD%`nL21q~8d>gioXSnt&n;jr3QKg0Z{W{kL*_(oUp1uT4nO^NeF}gxurTf6W zQRjN$*Ua54d!D{YgJ{KT-ORmA@6*HZ@@sxAt%sqa&pP)@K@&xDC5T}pV zxn63c{(D*T3f-iA@McfIMWq6`a=>*;hbcv02)M7(IBlSt0e7!74rGqtsKZviiC^c_ zG*jmWX%k)JNddBcDT$c-47MxWB5wO;x-PgYbV!;O@hH)_!acYI9pH?#OkWl`jkJQ^ zVd-JDL09Wf3u%MOv{28frMZ+GSX*uXfk+oQ!0!P;2L&Alou&OEJtpYmf=&xs6x0&* zte_VJeIB$#p8|cF{s1(IK4F>=bYnm#luL*&u5k;^D=*Mhas@rF{07o52>O!p64Jk` zjDxt_s~y>bb{Vf_935Xg8oH$9hB?(68%Vd8ygDdQbTF7X219-=aSOWt|^D`gQe(_-_kt z(N(&x-UR)wdJ8!(D5~^6{Y33TnrpmDKU4RCYLQ!rVfOYN+8BvT@6eWr0h)>IkaCF0 zL!cj`CqTRDW1u?(eVATEx@Fr2--;dUDsTiD_>wFPneDiB=>t*4Cj_T zvo2gE@S)62z)x$*%#Bq%)3K|QrgP4k2MmXnty05E!CpFHxz=3SY~-3G!OSgnAP9Yt3-bu9f1;ogKC3L-~rduYnB5F1|6@!XRZA`+l@MXTas z43*6D#};UEdCv7!C(I=qAy+8du8AlYLr+Aa7*DlGogL$mcJS%%=YpuArYjgo>(z<`yhmxO4?I9K$BhlV z6>ajzvY+J8r-SD)#?c#MoCGkzGRxQ~!(uOc2hV$Eg~tdx-eCMvCmjpJfC?CCp2;JT zFwz|XuE3V;>a2hSJtRhIP(XY{cPw(#&B`LW0J>uplL2Jy0zw|aR5mdvk5$czu+FlnhC_wy8ZPwMT<*Ld{503M7?^WaLyTrDYVPQ?e#wr@$qmEMyXm zvWB2STawz7Tw0ER7za5S4UGGr1Pjsx8(e|RB&sk;#dW>?@f2)vtx$#w zQhHRDqtSN$OSDI^(`d)m19hqyYA;5J-BfgmUkG7XBL!Kh2ubZrsR*}^&8D_0(1kM6 zavD2OZkUV$QtHF{UF{ZhQz@Y=NE8ozK>J|EN~t<1Q1ZP@N)#Q;4dn)NgSaMoK%#rh zT|4LVgF{385A7(L{X6sd2m6cpxn2E3L#6p$rJZx;z^(-x5ybxaK8d=xlf}H2`Rl8h zqgWY=l}v4=%M1++;P!zl!65Sdvr0lDJy;`gq~H~nA0%+R!}Af|g-^*HC!J#Ts9iaD ze%=%l+0+@wewMG_ss4YZT=LiO-o#1zCJs>(lcSTbzy9`jDmSi-{oY@F?9YC7cH$Nn zDD0kb&sF;IKdiilxdc6!~e2AGZXkUW6wQ3gE`AAx@IjeS1rxK&SeB@ z?RkaMnHtynt^NMi$i+`wGj6> zms?Hxw;coif7dsO#1xBr4x&>dMA!Z4S;();e8Y4Cr}tUVgEWEE7#*Xd;Kx88L7Jbh zsXxBeI6KwOP!jGA{09qP%Q=d3NAXIq%BSN;um>oU37ZvKAe+VbO^!=VL0Uwv3waTH z0}IlMkQ2S3;-@&+m_)uKb`pzgSV{<;0sOnY|F@Io#J}F>vHVDN{ZZ8J(!8)!ZK;QS zvg&$#=N4-!cLL=clx+AlNI4q9%ilr#@sr2dS`w}Egnk8WDFeSE_Btlyt##yZD^SKC z(HWfjB{~9~MNy)F)>nyd4=m)IfuC6GR^?@Imd*(49&{MJ473=>X9c=^>yUwuj0YBL zJR`!tV}V`Xld*rbUSaOee)^akM|m5zmw}_#)H(t_CUUs;4_XlzJA1VRKt1VRKt1VRKt1VRKt1VRKt1b&$jz@a_? u|KDi3ul!|hPUw4xK!`wyK!`wyK!`wyK!`wyK!`wyK!`wyK#0I<1pXWIF=%oC literal 20480 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 Ag#Z8m diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 7e90959..03e445d 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -54,5 +54,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.4.0.7")] -[assembly: AssemblyFileVersion("1.4.0.7")] +[assembly: AssemblyVersion("1.4.0.8")] +[assembly: AssemblyFileVersion("1.4.0.8")] diff --git a/embroideryReader/nc_Updater.dll b/embroideryReader/UpdateCheck.dll similarity index 74% rename from embroideryReader/nc_Updater.dll rename to embroideryReader/UpdateCheck.dll index 168f8b7e338ea0ae738c562a4f314e8fb9039f27..ad62a0925768fed2cf5cc3f34e78c18f7b65fd09 100644 GIT binary patch delta 2103 zcmaKtZA?>F7{~voy|=tWTc&`Dv=pQuU<*dpp$3L=;Cv_O2yC-J1>~jJ7EzgknB1BRf{aKT02ITheyQjc#GN1c9wG92B_?2F@GzrYq!lit%X3xP-Kds z+X^T{kxK#|t<;k7vOf)ojy42std2yp$r0^ zIP)0l%-5DBy4KYyfa54|nKewbD?@?i_Qs&Tjmyl&an_EiN^Fh+^u0M=sH)h&x|aU0 z+R4OXk*`f8I(l~Tz)YwiqcMST#N#G%Y2TN6y08cno|oJ$^qxOSW*QO=)FlraYG|L3 zJSUZpC9g`}lT?g)|5VAflGT!L^cXvgH8`th4PP0DjVAmqnWpFg#gab7BBIfyjI++NwP@Q7q>;#mwQ~=gT*q#UQfZwKe^Lxe$}P*09o*#Uhq)skMxX7U2|OZ$-I zG0BsX1CsAbUXUD-93zKuksQT0WIs|QEs`F|Yj7%KJ-CK)`jJh$k3;k;U$g&NWsIo~D_8Ic_mv;1&nT0y%Rzgi;KV6&O?FMYg!4T7?_msTsm8{#LWKn50!bc_JT6 z!M6qu_{c)ZVzkgM!#m`QQmK@zk*voM^%jK5AU-F%F(H1#Lqv*XVG~L((=Kz*uZ%1T z-)8+R=8M2aX&QRw71m<*8_U|joA0wMHzofYJp1gkVeJ-wLuadRJ*qkyydhs%ldrxd zzoE4i2Yi8Gv%kHft-~J(dE4uK*t)4K;O*M$4>X{ny?JAEt51*7JjsLM+sQe`m<1z* zP0Jn#eiONhMV;KC4*}%Ci$+@Q2tlM&p#u$6LR8AoMAkDOHb5=bX|!o&%PY*v2aYv& zGN#Ml8~$S5j(=QNwR6iSweGY%!lT_vE3mB)u$TEe4h5PUn?klrBet#HP?NXaHos0S z&6bp4W+oOaO^BX_Ffsr``8 zO}6p^6K&V-xjn14%G5WJ?M!zWkH?EH?B&NQz`iyVz{P8J>~fA>Sdf|ezhi5i1#LW) dUkZwaCp;rA#YQou`VZda4qHkdBn-GB{so87l6L?A delta 2109 zcmaKt3v5(H6o&t~d+(NRAKPv%rBK>kmeMVyWw*RiDo~&Vssch&2?9dtu23l5vb(%& zphckysMri(HO2rMu|lG?#-uSOqDEtE3=mCroWa0IdVXZlS@T`sFXWNUw5ZilA7)gaGY%(Zvz&5GCl2UabBKJTkPUc)6pT> zMzaerj}93gnIdPVk8X*SQ;+5Wj7*P+q?G6SR&5HKuC^hIME;y5ngz#uJ&W)HC zU^J((59d=EV`Obl(UY_^hSFH>LeK*?Vd}eZGLIPHH!zEe0i-|RFq%u%5|KsRL%4ub zd_JPM;P%Rcapf-rd#QI$g|Jxy#OCyJ-Y*;=Uj28I(%MJ8!TO6CHd!}NI8&#d327yW znK(jL;XNx;6pE8pwg{ltDiQ(lhvk>ohmLQVC`vE_vq&!*$O)R|h|r#mz2w7Msn%Sk zS*P{&c$K43yg@eOgt&@ZaEd(seVVN-zJ3GxjnFQN`$|_$V2b3t4)sPl)e z+gW)eD`Up(qppPq=ZAxv8bZ_2ShupKDOei|MM{DV4cHutMC-$iRU4YZkyveGUFeVS{4UUzdp7ZKuUT#%d)(11*S#`O;qO;GqacBK2$5#@wHFy4|IIe;HUhI0he07P_YtFF)b>pp9F7;1HRPR%XUU|@8$4};UzgG;ABLmqYNlppm zXWp-PkQ)Pm#7R0&1)TDDV5IkcaV0Ex125I)!6knVlsVlfg`XGeL(M6xOY=wm?_7DX hbOQ@*n@}z$bq|Qk$%!nP`pj1Zy3;FubGG{v{smV*l+OSF diff --git a/embroideryReader/embroideryReader.csproj b/embroideryReader/embroideryReader.csproj index aafe5ec..821cff9 100644 --- a/embroideryReader/embroideryReader.csproj +++ b/embroideryReader/embroideryReader.csproj @@ -30,13 +30,9 @@ false - + False - .\nc_settings.dll - - - False - .\nc_Updater.dll + .\IniFile.dll @@ -44,6 +40,10 @@ + + False + .\UpdateCheck.dll + diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 8ddc759..62fc6e5 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -41,7 +41,7 @@ namespace embroideryReader private Pen drawPen = Pens.Black; private Bitmap DrawArea; private PesFile.PesFile design; - private nc_settings.IniFile settings = new nc_settings.IniFile("embroideryreader.ini"); + private NJCrawford.IniFile settings = new NJCrawford.IniFile("embroideryreader.ini"); public frmMain() @@ -54,9 +54,9 @@ namespace embroideryReader { string updateLoc; updateLoc = settings.getValue("update location"); - if (String.IsNullOrEmpty(updateLoc) || updateLoc == "http://www.njcrawford.com/embreader/") + if (String.IsNullOrEmpty(updateLoc) || updateLoc == "http://www.njcrawford.com/embreader/" || updateLoc == "http://www.njcrawford.com/embroidery-reader/") { - settings.setValue("update location", "http://www.njcrawford.com/embroidery-reader/"); + settings.setValue("update location", "http://www.njcrawford.com/embroidery-reader/update.ini"); } if (settings.getValue("background color", "enabled") == "yes") { @@ -241,7 +241,7 @@ namespace embroideryReader private void checkForUpdateToolStripMenuItem_Click(object sender, EventArgs e) { - nc_Updater.IniFileUpdater updater = new nc_Updater.IniFileUpdater(settings.getValue("update location")); + NJCrawford.IniFileUpdater updater = new NJCrawford.IniFileUpdater(settings.getValue("update location")); updater.waitForInfo(); // this shouldn't be able to happen, the update location is checked at form load diff --git a/embroideryReader/frmSettingsDialog.cs b/embroideryReader/frmSettingsDialog.cs index 8805483..547aaf4 100644 --- a/embroideryReader/frmSettingsDialog.cs +++ b/embroideryReader/frmSettingsDialog.cs @@ -36,8 +36,8 @@ namespace embroideryReader public partial class frmSettingsDialog : Form { private bool colorChanged = false; - private nc_settings.IniFile _settings; - public nc_settings.IniFile settings + private NJCrawford.IniFile _settings; + public NJCrawford.IniFile settings { get {