|
From: <ze...@us...> - 2007-04-01 16:24:35
|
Revision: 273
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=273&view=rev
Author: zebons
Date: 2007-04-01 09:24:32 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Section for ANT Updating Item in wrong xml file.
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-04-01 16:24:32 UTC (rev 273)
@@ -29,9 +29,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.2576.34540, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.2548.1824, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Core.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Core.DLL</HintPath>
</Reference>
<Reference Include="Databases, Version=1.0.2548.1828, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -48,9 +48,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=1.0.2576.34538, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=1.0.2548.1816, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Utils.DLL</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-04-01 16:24:32 UTC (rev 273)
@@ -342,14 +342,14 @@
int ItemID;
dlg.Reset();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
- StrUpdItem1 = xmlreader.GetValueAsString("MesFilms", "AntUpdItem1", "");
- StrUpdText1 = xmlreader.GetValueAsString("MesFilms", "AntUpdText1", "");
- StrUpdDflT1 = xmlreader.GetValueAsString("MesFilms", "AntUpdDflT1", "");
- StrUpdItem2 = xmlreader.GetValueAsString("MesFilms", "AntUpdItem2", "");
- StrUpdText2 = xmlreader.GetValueAsString("MesFilms", "AntUpdText2", "");
- StrUpdDflT2 = xmlreader.GetValueAsString("MesFilms", "AntUpdDflT2", "");
+ StrUpdItem1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdItem1", "");
+ StrUpdText1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdText1", "");
+ StrUpdDflT1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdDflT1", "");
+ StrUpdItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdItem2", "");
+ StrUpdText2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdText2", "");
+ StrUpdDflT2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdDflT2", "");
}
dlg.SetHeading(924); // menu
dlg.Add(GUILocalizeStrings.Get(931));//rating
@@ -358,7 +358,7 @@
boolfile = true;
dlg.Add(GUILocalizeStrings.Get(863));//file
}
- if (!(StrUpdItem1 == "(none)"))
+ if (!(StrUpdItem1 == "(none)"))
if (StrUpdText1.Length > 0)
dlg.Add(StrUpdText1); //Specific Item1 label to update
else
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-01 16:24:32 UTC (rev 273)
@@ -224,6 +224,22 @@
AntTSort.Focus();
return;
}
+ if (AntUpdItem1.Text.Length == 0)
+ AntUpdItem1.Text = "(none)";
+ if (!(AntUpdItem1.Text == "(none)") && (AntUpdText1.Text.Length == 0))
+ {
+ System.Windows.Forms.MessageBox.Show("The Button Label is mandatory with the corresponding Update Field Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ AntUpdText1.Focus();
+ return;
+ }
+ if (AntUpdItem2.Text.Length == 0)
+ AntUpdItem2.Text = "(none)";
+ if (!(AntUpdItem2.Text == "(none)") && (AntUpdText2.Text.Length == 0))
+ {
+ System.Windows.Forms.MessageBox.Show("The Button Label is mandatory with the corresponding Update Field Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ AntUpdText2.Focus();
+ return;
+ }
StrDfltSelect = "";
string wAntFilterSign;
if (AntFilterSign1.Text == "#")
@@ -250,19 +266,15 @@
else
StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " '" + AntFilterText2.Text + "' or " + AntFilterItem2.Text + " is null)) AND ";
Verify_Config();
- string currentLanguage = String.Empty;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- {
- currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
- }
- string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
+ //string currentLanguage = String.Empty;
+ //using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ //{
+ // currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
+ //}
+ //string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
if (AntTitle2.Text.Length == 0)
AntTitle2.Text = "(none)";
- if (AntUpdItem1.Text.Length == 0)
- AntUpdItem1.Text = "(none)";
- if (AntUpdItem2.Text.Length == 0)
- AntUpdItem2.Text = "(none)";
if (Config_Dflt.Checked)
{
MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", Config_Name.Text.ToString());
@@ -323,7 +335,7 @@
Config_Name.Items.Add(w_Config_Name);
Config_Name.Text = w_Config_Name;
// Config_Name.ResetText();
- Refresh_Items(false);
+// Refresh_Items(false);
}
private void butPath_Click(object sender, EventArgs e)
@@ -408,7 +420,6 @@
CatalogType.SelectedIndex = 0;
StrDfltSelect = "";
mydivx.Clear();
- Config_Dflt.Checked = false;
View_Dflt_Item.Items.Clear();
View_Dflt_Item.Items.Add("(none)");
View_Dflt_Item.Items.Add("Year");
@@ -416,6 +427,7 @@
View_Dflt_Item.Items.Add("Country");
if (!all)
return;
+ Config_Dflt.Checked = false;
MesFilmsCat.ResetText();
MesFilmsImg.ResetText();
AntStorage.ResetText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|