From 85a022bd10c79e606ab06fc7c1be4de499234229 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Mon, 15 Sep 2014 23:59:02 -0400 Subject: [PATCH] Update to IniFile 2.2 --- embroideryReader/EmbroideryReaderSettings.cs | 208 +++++++------------ embroideryReader/IniFile.dll | Bin 8704 -> 9216 bytes embroideryReader/Translation.cs | 6 +- 3 files changed, 77 insertions(+), 137 deletions(-) diff --git a/embroideryReader/EmbroideryReaderSettings.cs b/embroideryReader/EmbroideryReaderSettings.cs index 073ea9b..1c85071 100644 --- a/embroideryReader/EmbroideryReaderSettings.cs +++ b/embroideryReader/EmbroideryReaderSettings.cs @@ -63,13 +63,6 @@ namespace embroideryReader private const String SETTING_TRANSLATION = "translation"; - // YES and NO are deprecated in favor of TRUE and FALSE - private const String VALUE_YES = "yes"; - private const String VALUE_NO = "no"; - - private const String VALUE_TRUE = "true"; - private const String VALUE_FALSE = "false"; - private const String UPDATE_URL = "http://www.njcrawford.com/updates/embroidery-reader.ini"; private const String SETTINGS_FILENAME = "embroideryreader.ini"; private const String SETTINGS_PATH_COMPANY = "NJCrawford Software"; @@ -95,70 +88,70 @@ namespace embroideryReader // Windows 7. NJCrawford.IniFile oldSettings = new NJCrawford.IniFile(SETTINGS_FILENAME); - if (!String.IsNullOrEmpty(oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED))) + if (oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, -1) != -1) { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED)); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED))) + if (oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, -1) != -1) { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED)); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN))) + if (oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, -1) != -1) { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN)); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE))) + if (oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, -1) != -1) { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE)); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, oldSettings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_FILTER_STITCHES))) + if (oldSettings.getValue(SETTING_FILTER_STITCHES, false)) { - settings.setValue(SETTING_FILTER_STITCHES, oldSettings.getValue(SETTING_FILTER_STITCHES)); + settings.setValue(SETTING_FILTER_STITCHES, oldSettings.getValue(SETTING_FILTER_STITCHES, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_FILTER_STITCHES_THRESHOLD))) + if (oldSettings.getValue(SETTING_FILTER_STITCHES_THRESHOLD, 0.0) > 0.0) { - settings.setValue(SETTING_FILTER_STITCHES_THRESHOLD, oldSettings.getValue(SETTING_FILTER_STITCHES_THRESHOLD)); + settings.setValue(SETTING_FILTER_STITCHES_THRESHOLD, oldSettings.getValue(SETTING_FILTER_STITCHES_THRESHOLD, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_THREAD_THICKNESS))) + if (oldSettings.getValue(SETTING_THREAD_THICKNESS, 0.0) > 0.0) { - settings.setValue(SETTING_THREAD_THICKNESS, oldSettings.getValue(SETTING_THREAD_THICKNESS)); + settings.setValue(SETTING_THREAD_THICKNESS, oldSettings.getValue(SETTING_THREAD_THICKNESS, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_LAST_OPEN_FILE_FOLDER))) + if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_LAST_OPEN_FILE_FOLDER, ""))) { - settings.setValue(SETTING_LAST_OPEN_FILE_FOLDER, oldSettings.getValue(SETTING_LAST_OPEN_FILE_FOLDER)); + settings.setValue(SETTING_LAST_OPEN_FILE_FOLDER, oldSettings.getValue(SETTING_LAST_OPEN_FILE_FOLDER, "")); } - if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION))) + if (!String.IsNullOrEmpty(oldSettings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION, ""))) { - settings.setValue(SETTING_LAST_SAVE_IMAGE_LOCATION, oldSettings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION)); + settings.setValue(SETTING_LAST_SAVE_IMAGE_LOCATION, oldSettings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION, "")); } } // Default to transparency grid enabled - if (String.IsNullOrWhiteSpace(settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE))) + if (String.IsNullOrWhiteSpace(settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, ""))) { - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, VALUE_TRUE); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, true); } // Update deprecated settings - if (settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED) == VALUE_YES) + if (settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, "") == "yes") { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, VALUE_TRUE); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, true); } - else if (settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED) == VALUE_NO) + else { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, VALUE_FALSE); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, false); } // Default language to english - if (String.IsNullOrWhiteSpace(settings.getValue(SETTING_TRANSLATION))) + if (String.IsNullOrWhiteSpace(settings.getValue(SETTING_TRANSLATION, ""))) { settings.setValue(SETTING_TRANSLATION, "English (EN-US)"); } @@ -178,16 +171,11 @@ namespace embroideryReader { get { - return (settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED) == VALUE_TRUE); + return settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, false); } set { - String output = VALUE_FALSE; - if (value) - { - output = VALUE_TRUE; - } - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, output); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_ENABLED, value); } } @@ -195,31 +183,27 @@ namespace embroideryReader { get { - if (backgroundColorEnabled) + if (!backgroundColorEnabled) { - if (frmMain.checkColorFromStrings(settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED), - settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN), - settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE))) - { - return frmMain.makeColorFromStrings(settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED), - settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN), - settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE)); - } - else - { - return System.Drawing.Color.FromKnownColor(System.Drawing.KnownColor.Control); - } + return System.Drawing.Color.FromKnownColor(System.Drawing.KnownColor.Control); } - else + + try + { + return System.Drawing.Color.FromArgb(settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, -1), + settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, -1), + settings.getValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, -1)); + } + catch(ArgumentException argEx) { return System.Drawing.Color.FromKnownColor(System.Drawing.KnownColor.Control); } } set { - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, value.R.ToString()); - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, value.G.ToString()); - settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, value.B.ToString()); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_RED, value.R); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_GREEN, value.G); + settings.setValue(SECTION_BACKGROUND_COLOR, SETTING_BACKGROUND_COLOR_BLUE, value.B); } } @@ -227,16 +211,11 @@ namespace embroideryReader { get { - return (settings.getValue(SETTING_FILTER_STITCHES) == VALUE_TRUE); + return (settings.getValue(SETTING_FILTER_STITCHES, false)); } set { - String output = VALUE_FALSE; - if (value) - { - output = VALUE_TRUE; - } - settings.setValue(SETTING_FILTER_STITCHES, output); + settings.setValue(SETTING_FILTER_STITCHES, value); } } @@ -244,22 +223,16 @@ namespace embroideryReader { get { - double thickness = 5; - if (settings.getValue(SETTING_THREAD_THICKNESS) != null) + double thickness = settings.getValue(SETTING_THREAD_THICKNESS, 5.0); + if (thickness < 1.0) { - if (Double.TryParse(settings.getValue(SETTING_THREAD_THICKNESS), out thickness)) - { - if (thickness < 1) - { - thickness = 1; - } - } + thickness = 1.0; } return thickness; } set { - settings.setValue(SETTING_THREAD_THICKNESS, value.ToString()); + settings.setValue(SETTING_THREAD_THICKNESS, value); } } @@ -267,22 +240,16 @@ namespace embroideryReader { get { - double threshold = 64; - if (settings.getValue(SETTING_FILTER_STITCHES_THRESHOLD) != null) + double threshold = settings.getValue(SETTING_FILTER_STITCHES_THRESHOLD, 64.0); + if (threshold < 10.0) { - if (Double.TryParse(settings.getValue(SETTING_FILTER_STITCHES_THRESHOLD), out threshold)) - { - if (threshold < 10) - { - threshold = 10; - } - } + threshold = 10.0; } return threshold; } set { - settings.setValue(SETTING_FILTER_STITCHES_THRESHOLD, value.ToString()); + settings.setValue(SETTING_FILTER_STITCHES_THRESHOLD, value); } } @@ -290,7 +257,7 @@ namespace embroideryReader { get { - return settings.getValue(SETTING_LAST_OPEN_FILE_FOLDER); + return settings.getValue(SETTING_LAST_OPEN_FILE_FOLDER, ""); } set { @@ -307,7 +274,7 @@ namespace embroideryReader { get { - return settings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION); + return settings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION, ""); } set { @@ -319,17 +286,11 @@ namespace embroideryReader { get { - Int32 retval; - string temp = settings.getValue(SETTING_WINDOW_WIDTH); - if(!Int32.TryParse(temp, out retval)) - { - retval = 300; - } - return retval; + return settings.getValue(SETTING_WINDOW_WIDTH, 300); } set { - settings.setValue(SETTING_WINDOW_WIDTH, value.ToString()); + settings.setValue(SETTING_WINDOW_WIDTH, value); } } @@ -337,17 +298,11 @@ namespace embroideryReader { get { - Int32 retval; - string temp = settings.getValue(SETTING_WINDOW_HEIGHT); - if (!Int32.TryParse(temp, out retval)) - { - retval = 300; - } - return retval; + return settings.getValue(SETTING_WINDOW_HEIGHT, 300); } set { - settings.setValue(SETTING_WINDOW_HEIGHT, value.ToString()); + settings.setValue(SETTING_WINDOW_HEIGHT, value); } } @@ -355,16 +310,11 @@ namespace embroideryReader { get { - return (settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE) == VALUE_TRUE); + return (settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, false)); } set { - String output = VALUE_FALSE; - if (value) - { - output = VALUE_TRUE; - } - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, output); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_ENABLE, value); } } @@ -372,17 +322,11 @@ namespace embroideryReader { get { - Int32 retval; - string temp = settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_SIZE); - if (!Int32.TryParse(temp, out retval)) - { - retval = 5; - } - return retval; + return settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_SIZE, 5); } set { - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_SIZE, value.ToString()); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_SIZE, value); } } @@ -390,31 +334,27 @@ namespace embroideryReader { get { - if (transparencyGridEnabled) + if (!transparencyGridEnabled) { - if (frmMain.checkColorFromStrings(settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_RED), - settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_GREEN), - settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_BLUE))) - { - return frmMain.makeColorFromStrings(settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_RED), - settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_GREEN), - settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_BLUE)); - } - else - { - return System.Drawing.Color.LightGray; - } + return System.Drawing.Color.LightGray; } - else + + try + { + return System.Drawing.Color.FromArgb(settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_RED, -1), + settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_GREEN, -1), + settings.getValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_BLUE, -1)); + } + catch(ArgumentException argEx) { return System.Drawing.Color.LightGray; } } set { - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_RED, value.R.ToString()); - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_GREEN, value.G.ToString()); - settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_BLUE, value.B.ToString()); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_RED, value.R); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_GREEN, value.G); + settings.setValue(SECTION_TRANSPARENCY_GRID, SETTING_TRANSPARENCY_GRID_COLOR_BLUE, value.B); } } @@ -422,7 +362,7 @@ namespace embroideryReader { get { - return settings.getValue(SETTING_TRANSLATION); + return settings.getValue(SETTING_TRANSLATION, ""); } set { diff --git a/embroideryReader/IniFile.dll b/embroideryReader/IniFile.dll index 7e4a1de0516cf51a9cf8aa6fc763c52cdb7184c0..533fda30ae112ca50740dee1459c66a12d9b16a2 100644 GIT binary patch delta 3593 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 SEB}u2Ueh_N;1-*Vy8Z`*EnbWO delta 3033 zcmZWr3v67)6}|J`ytn_2*Xz%&ZQ@;T96ztU8#|8i+KxjKT(cp_gxH~WF(s?i3FhPH z?wW`;n03?;C4Aag1FmQqDS@bhHl?7nQ7s`s)sGq~RYDX&T0~Q|6^*LWkCakAB|S6y zvUZB4IdjjwcV_Orb3Oa!v-5+;j&ywZ>T^5E`MXG3+{b)Gbx@ck<)<0UF^tU^fQ27t zgJ+<-wL~eRFT}(C-9&yU+F@uAajjj9vlcIpLKVZP6OXbs)*#NY78VolvZm-oxhwv% z7#bOLI!SaSK*YpCLyy>@g@V^>c}6s&TRK8XiapwQBkQ#TP;om#SFX5H zpD!Q|Gi(<8;wb#<#fwIwDE*V+4o+|4K!Yfxg7cMDs|9vFTy(nu=*^sgmuX)IIgjvX z?A4Ik(`Mc!Nuwljv+)i)1_?o!jdv>1JsvRK9y<=LuWi!I<048+Q^heezpBi(oB42g zqfMs6ny}1H0K$Bws&>pqk-T9;bA`AnX38hUkYRZcq!Y2(H;m+yH*1AvIM2y4Yt~wb z$^CK`ubU0U7HL85j-_-zb6hG4Wn1zWjvnm;N2FkCRtPI?OF}CkUyI-^T%gygfH}GM zvn%wH1y`)o-LjUbcu~{m)TRd{=24|mDN~kK(jan2Q=?hPz%1#lHk`C#rPU7J9(9Z< z5U*xhUih1K8Z0@a)z0CfxTf<`jgoyb!WuLqm#LTt9g!LITjcH%0e5XtZRsya8#@Yyb@#rO7mVqZ-au4Hn1* zAbV<_K({fwo7S)Fv)*Ck?pbcN-c6F1yDjYU$aWKNx|`Yc;$wFw>k%nW)|7GB8F9d~ zhV_b*o}pqd6rPYPz?4kxpS?3a(m$;)l}@HP77hTZE~(Xitlhb=d(FJy##b`K6r z^?U3-%pu=^nrp{8D?G4C9XeUIcfg~edwr^vRTl-+Y8kG}W8+=%qDbNyZwu0U%`4OU z#9L19W}i&Y_6-5g`C>4>1?(69@g=TSAnuRA*yrDVRq>dAOIkLD%iaidF0gv3QyO3hy7W z(e zQuvCp{zaE3x_Az_uZ7D6Pjaa`sqoJV|EtUqL+W<|#bVGZ`iY|ivLFVe0J5l{&B)gc zr=Vh4#oWl7(*k*+uV+KR_zGOhw!t?A4Wk}*8|{c;Lt3QcR0&N^vBUH%%E@S^%<4%i zQZx=vI!tFMjsq-*y-dwuV-EWjB@x~+hdoQ{aQvSfb^**y8FVz!A^HP#Bg7+UR>_EM zL`qX@Bs(0bW?PZcL)Wn4x2~Z-y@p*bvr#Opz#~U=kg{x)R?#8F4%4ly8x>nDvvCU3 za}FEBfz|YN`DUr(M^)c2R8Drwoj~M2rAXobP^0;>=Blg~D1RMSAh&o-;S($Hvp#Zv z&GBDkajHi6tqMDV#Zl^2WQ)RW3U5<5t}v%?3V0WNS;=2fcu?U{;FsuW;5~E-xRsu# zU+OmScls>7M1RvC#K*~}`XO4PAb%7+B;_iq=5gqOMUX~*8ffwFK_xLt?R*vsx)t_e z*%EzD;V^#{^6h*baG3ubxSKaCO|#q%$9ojw02RtCe}jHP52<|~;cp|L$ARbRY5p$o z`}~hojM6#2m0rh!QJ7!m4+7r?F3}_WeK`G#U#14N-4baAV@u>WT&w{B1=uA@7^ASt zpqD6R#DN)DFR4Ax(~uEn=V`l9$Ns7IPvh;`$kOPLXMpwe1D5_GCFDeH3cHk{A5TY` zZd95Pg?G?9(A=^1P9E;ZYc#H*uMobF^gW{EF#)JrkaMulpy>@iQww5;zv^z4GyK^eRK7P kMhB&-Q#{pp3L*EzPB{ERtjm!?@eefW#U6iW3mvZi0bPOT{Qv*} diff --git a/embroideryReader/Translation.cs b/embroideryReader/Translation.cs index fa0eefd..56891e0 100644 --- a/embroideryReader/Translation.cs +++ b/embroideryReader/Translation.cs @@ -144,12 +144,12 @@ namespace embroideryReader public String GetTranslatedString(StringID sid) { string retval; - retval = translationFile.getValue(sid.ToString()); + retval = translationFile.getValue(sid.ToString(), (String)null); // Check the default translation if string is not found in the loaded translation if (retval == null) { - retval = defaultFile.getValue(sid.ToString()); + retval = defaultFile.getValue(sid.ToString(), (String)null); } // If it's not found in the default, return a placeholder string @@ -169,7 +169,7 @@ namespace embroideryReader for (StringID sid = (StringID)0; sid < StringID.TOTAL_COUNT; sid++) { - if (translationFile.getValue(sid.ToString()) == null) + if (translationFile.getValue(sid.ToString(), (String)null) == null) { retval = false; break;