Updated to use new IniFile and UpdateCheck dlls.

Branch_1.5.0
Nathan Crawford 2009-08-01 16:08:42 +00:00
rodzic 4a7ea34011
commit 40ceaf5317
6 zmienionych plików z 14 dodań i 14 usunięć

Wyświetl plik

@ -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")]

Wyświetl plik

@ -30,13 +30,9 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="nc_settings, Version=1.0.0.10, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="IniFile, Version=1.2.1.11, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\nc_settings.dll</HintPath>
</Reference>
<Reference Include="nc_Updater, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\nc_Updater.dll</HintPath>
<HintPath>.\IniFile.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@ -44,6 +40,10 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="UpdateCheck, Version=0.2.0.35, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\UpdateCheck.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="frmMain.cs">

Wyświetl plik

@ -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

Wyświetl plik

@ -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
{