You can subscribe to this list here.
2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
From: <moi...@us...> - 2007-03-25 20:46:39
|
Revision: 222 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=222&view=rev Author: moiristo Date: 2007-03-25 13:46:35 -0700 (Sun, 25 Mar 2007) Log Message: ----------- Version 0.8, a standalone version (separated from the ExternalPlayers DLL) Added README Modified Paths: -------------- trunk/plugins/VideoLAN/VideoLanPlugin.cs Added Paths: ----------- trunk/plugins/VideoLAN/Properties/ trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs trunk/plugins/VideoLAN/README.txt trunk/plugins/VideoLAN/VideoLAN.csproj trunk/plugins/VideoLAN/VideoLAN.sln trunk/plugins/VideoLAN/VideoLAN.suo trunk/plugins/VideoLAN/bin/ trunk/plugins/VideoLAN/bin/AXVLC.dll trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll Removed Paths: ------------- trunk/plugins/VideoLAN/VlcControl/ Added: trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs 2007-03-25 20:46:35 UTC (rev 222) @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("VideoLAN")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("VideoLAN")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2007")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("1d212193-b17a-43da-a2e0-9af68a029598")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Added: trunk/plugins/VideoLAN/README.txt =================================================================== --- trunk/plugins/VideoLAN/README.txt (rev 0) +++ trunk/plugins/VideoLAN/README.txt 2007-03-25 20:46:35 UTC (rev 222) @@ -0,0 +1,40 @@ +VideoLAN External Player Plugin (25-03-2007) + +This plugin can send video/audio to the VLC engine (natively). Its strengths are that it handles m4 extensions (needed for Apple video podcasts), +it can handle UDP streams (supported by some STB's and certain IPTV services) and it can buffer the signal, +so web streams can be viewed without lag. It also supports recording, timeshifting, seeking; in fact anything VLC +supports. + + +-----Installation----- + +1) Make sure you installed the latest version of VLC from www.videolan.org. + Copy 'libvlc.dll' from '\<VLC root directory>\VLC' to the MP root folder + +2) Go to /Release/Plugins/ExternalPlayers and copy the VideoLAN.dll to your /Plugins/ExternalPlayers folder + + The VLC plugin is the same as was used by early versions of the Dreambox plugin. + The adjustments made should not cause any trouble for users using that plugin. + +3) Enable the VideoLan plugin in the MP configuration, configure it if necessary, + and configure the IPTV plugin. + + +-----Version history----- + +0.8 +- Extracted VideoLAN from the ExternalPlayers library; it is now a standalone plugin available in the MP Plugin SVN + +0.7 +- Switched from ActiveX to a native C# library +- More action support, like big/medium/short step forward/backword, ability to make screenshots, DVD menu handling, audio/subtitle track rotation... +- Recording support (A Record-action in MP starts/stops the recording). It stores the recordings in /<MP root folder/vlciptv/. +- Removed the logo when not playing streams (which was actually caused by the activeX control) + +0.6: +- Fixed configuration not being written to file, because the Config class doesn't like text such as + udp://,http://. Now you only need to specify the protocol, e.g. udp,http,... +- Some bugfixes + +0.1-0.5: +- Initial release from Zipperzip (this is also in the MP SVN) Added: trunk/plugins/VideoLAN/VideoLAN.csproj =================================================================== --- trunk/plugins/VideoLAN/VideoLAN.csproj (rev 0) +++ trunk/plugins/VideoLAN/VideoLAN.csproj 2007-03-25 20:46:35 UTC (rev 222) @@ -0,0 +1,106 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{6AED9B8D-2C18-4217-9823-3C1A60E70B78}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>VideoLAN</RootNamespace> + <AssemblyName>VideoLAN</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="AxInterop.AXVLC, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>bin\AxInterop.AXVLC.dll</HintPath> + </Reference> + <Reference Include="AXVLC, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>bin\AXVLC.dll</HintPath> + </Reference> + <Reference Include="Core, Version=1.0.2586.6922, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\trunk\mediaportal\xbmc\bin\Release\Core.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + <Reference Include="Utils, Version=1.0.2586.6921, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\trunk\mediaportal\xbmc\bin\Release\Utils.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="ConfigurationForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="InnerVlcWindow.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="InnerVlcWindow.designer.cs"> + <DependentUpon>InnerVlcWindow.cs</DependentUpon> + </Compile> + <Compile Include="IPlayer.cs" /> + <Compile Include="NativeLibVlc.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="VideoLanControl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="VideoLanControl.designer.cs"> + <DependentUpon>VideoLanControl.cs</DependentUpon> + </Compile> + <Compile Include="VideoLanPlugin.cs" /> + <Compile Include="VlcUserControl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="VlcUserControl.designer.cs"> + <DependentUpon>VlcUserControl.cs</DependentUpon> + </Compile> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="ConfigurationForm.resx"> + <DependentUpon>ConfigurationForm.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="InnerVlcWindow.resx"> + <DependentUpon>InnerVlcWindow.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="VideoLanControl.resx"> + <DependentUpon>VideoLanControl.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="VlcUserControl.resx"> + <DependentUpon>VlcUserControl.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/plugins/VideoLAN/VideoLAN.sln =================================================================== --- trunk/plugins/VideoLAN/VideoLAN.sln (rev 0) +++ trunk/plugins/VideoLAN/VideoLAN.sln 2007-03-25 20:46:35 UTC (rev 222) @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoLAN", "VideoLAN.csproj", "{6AED9B8D-2C18-4217-9823-3C1A60E70B78}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/plugins/VideoLAN/VideoLAN.suo =================================================================== (Binary files differ) Property changes on: trunk/plugins/VideoLAN/VideoLAN.suo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/plugins/VideoLAN/VideoLanPlugin.cs =================================================================== --- trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-03-24 17:01:55 UTC (rev 221) +++ trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-03-25 20:46:35 UTC (rev 222) @@ -53,17 +53,17 @@ public override string PlayerName { - get { return "VideoLan"; } + get { return "VideoLAN"; } } public override string AuthorName { - get { return "ZipperZip/Moiristo"; } + get { return "Moiristo"; } } public override string VersionNumber { - get { return "0.7"; } + get { return "0.8"; } } public override string[] GetAllSupportedExtensions() Added: trunk/plugins/VideoLAN/bin/AXVLC.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/VideoLAN/bin/AXVLC.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-24 17:01:57
|
Revision: 221 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=221&view=rev Author: dukus Date: 2007-03-24 10:01:55 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-24 16:34:07 UTC (rev 220) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-24 17:01:55 UTC (rev 221) @@ -269,6 +269,7 @@ this.pictureBox1.Size = new System.Drawing.Size(375, 49); this.pictureBox1.TabIndex = 4; this.pictureBox1.TabStop = false; + this.pictureBox1.Visible = false; // // button5 // Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-24 16:34:07 UTC (rev 220) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-24 17:01:55 UTC (rev 221) @@ -126,129 +126,129 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAEUATIBewH/ARUBOAGBAf8BFQE8AYgB/wEWAUIBmQH/ARYBQwGfAf8BFgFJ - AbAB/wEWAUsBtgH/ARcBSwG2Af8BFwFLAbYB/wEXAUsBtgH/ARcBSwG2Af8BFwFLAbYB/wEXAUsBtgH/ - ARcBSwG2Af8BFgFHAaoB/wEWAUMBnwH/ARYBQQGWAf8BFQE8AYgB/wEVATYBgQH/ARQBMQF4Af//AKEA - ARYBQAGTAf8BGQFMAbYB/wEeAVIBuAH/ASIBVgG7Af8BJwFaAb8B/wErAV8BwwH/ATABYwHHAf8BNQFo - AcoB/wE5AW0BzgH/AT4BcgHRAf8BQwF2AdQB/wFHAXsB1wH/AUsBfwHaAf8BTgGBAdwB/wFRAYEB3gH/ - AVUBgQHgAf8BVgGBAeEB/wFXAYEB4gH/AVcBgQHiAf8BVgGBAeEB/wFUAYEB4AH/AVEBgQHeAf8BTAGA - AdoB/wFHAXoB1gH/AT8BcwHRAf8BNgFqAcsB/wEgAVQBvAH/ARYBPwGQAf//AI0AARYBQQGWAf8BHQFP - AbMB/wEoAVoBtwH/ASwBXgG8Af8BLwFiAcEB/wEyAWUBxQH/ATUBaQHJAf8BOAFsAc0B/wE7AW8BzwH/ - AT8BcgHRAf8BQgF1AdMB/wFFAXgB1QH/AUgBewHXAf8BSwF/AdoB/wFOAYEB3AH/AVEBgQHeAf8BVAGB - AeAB/wFXAYEB4gH/AVsBgQHkAf8BXgGBAeYB/wFhAYIB6QH/AWQBhQHrAf8BZwGIAe0B/wFqAYsB7wH/ - AW0BjgHxAf8BcAGSAfMB/wFzAZQB9QH/AXMBlAH1Af8BOgFtAc4B/wEVAUABkwH//wCJAAEYAUsBswH/ - ASQBVgGwAf8BKAFaAbUB/wErAV0BugH/AS8BYQG/Af8BMgFkAcMB/wE1AWgByAH/ATgBbAHMAf8BOwFv - Ac8B/wE+AXIB0QH/AUEBdQHTAf8BRQF4AdUB/wFIAXsB1wH/AUsBfgHZAf8BTgGBAdwB/wFRAYEB3gH/ - AVQBgQHgAf8BVwGBAeIB/wFaAYEB5AH/AV0BgQHmAf8BYQGCAegB/wFkAYUB6gH/AWcBiAHsAf8BagGL - Ae8B/wFtAY4B8QH/AXABkQHzAf8BcwGUAfUB/wF2AZcB9wH/AXUBlgH2Af8BIgFWAb4B//8AiQABGwFN - Aa8B/wEkAVUBrgH/ASgBWQGzAf8BKwFdAbgB/wEuAWABvQH/ATEBZAHBAf8BNAFnAcYB/wE4AWsBygH/ - ATsBbgHOAf8BPgFxAdAB/wFBAXUB0wH/AUQBeAHVAf8BRwF7AdcB/wFKAX4B2QH/AU0BgQHbAf8BUAGB - Ad0B/wFUAYEB3wH/AVcBgQHhAf8BWgGBAeQB/wFdAYEB5gH/AWABgQHoAf8BYwGEAeoB/wFmAYcB7AH/ - AWkBigHuAf8BbAGNAfAB/wFvAZAB8gH/AXEBkwH0Af8BcwGUAfUB/wF0AZUB9gH/ATsBbwHOAf//AIkA - ARwBTgGsAf8BJAFUAawB/wEnAVgBsQH/ASsBXAG2Af8BLgFfAbsB/wExAWMBvwH/ATQBZgHEAf8BNwFq - AcgB/wE6AW4BzQH/AT0BcQHQAf8BQAF0AdIB/wFEAXcB1AH/AUcBegHWAf8BSgF9AdkB/wFNAYAB2wH/ - AVABgQHdAf8BUwGBAd8B/wFWAYEB4QH/AVkBgQHjAf8BXAGBAeUB/wFfAYEB5wH/AWIBgwHpAf8BZQGG - AesB/wFoAYkB7QH/AWoBjAHvAf8BbQGOAfEB/wFvAZAB8gH/AXEBkgHzAf8BcQGTAfQB/wFEAXgB1QH/ - /wCFAAEVATUBgQH/AR0BTQGpAf8BIwFTAakB/wEmAVcBrwH/ASkBWwG0Af8BLQFeAbkB/wEwAWIBvQH/ - ATMBZgHCAf8BNgFpAcYB/wE5AWwBywH/AT0BcAHPAf8BQAFzAdIB/wFDAXYB1AH/AUYBeQHWAf8BSQF8 - AdgB/wFMAX8B2gH/AU8BgQHcAf8BSwF/Ad4B/wE9AXUB2wH/AU8BgQHfAf8BQwF9Ad8B/wFVAYEB5wH/ - AXABjgHrAf8BVAGBAeoB/wFmAYcB7AH/AWkBigHuAf8BawGMAe8B/wFtAY4B8QH/AW4BjwHxAf8BbgGQ - AfIB/wFLAX8B2gH/ARUBNQGBAf//AIEAARUBOgGCAf8BIQFQAacB/wEiAVIBpwH/ASUBVgGsAf8BKQFa - AbIB/wEsAV0BtwH/ATABYQG7Af8BMwFlAcAB/wE2AWgBxAH/ATkBbAHJAf8BPAFvAc0B/wE/AXIB0QH/ - AUIBdQHTAf8BRQF4AdUB/wFIAXsB1wH/AUsBfgHZAf8BTgGBAdsB/wFCAXgB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BZgGGAesB/wFeAYEB6wH/AWYBiAHsAf8BaAGKAe4B/wFqAYsB7wH/AWsBjAHvAf8BawGN - AfAB/wFRAYEB3gH/ARUBOgGCAf//AIEAARUBPgGNAf8BSgFxAbMB/wE7AWUBrgH/ASYBVQGqAf8BKAFY - Aa8B/wErAVwBtAH/AS8BYAG5Af8BMgFjAb4B/wE1AWcBwgH/ATgBagHHAf8BOwFuAcsB/wE+AXEBzwH/ - AUEBdAHSAf8BRAF3AdUB/wFHAXoB1wH/AUoBfQHZAf8BRgF7AdsB/wEkAWUB1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BQAF9AeYB/wFYAYEB6wH/AWYBhwHsAf8BZwGIAe0B/wFoAYkB7QH/AWkBigHuAf8BVgGB - AeEB/wEVAT4BjgH//wCBAAEWAUMBnwH/AVkBfAG1Af8BVgF6AbYB/wFFAW4BtAH/ASEBUwGtAf8BKgFb - AbIB/wEtAV4BtwH/ATEBYgG7Af8BNAFlAcAB/wE3AWkBxAH/AToBbAHJAf8BPQFwAc0B/wFAAXMB0QH/ - AUIBdgHUAf8BRgF5AdYB/wE+AXYB1wH/AUkBegHdAf8BdgGLAecF/wFjAYIB4wH/AS8BbAHbAf8BMAFu - Ad0B/wGJAakB7wn/AXoBlgHsAf8BXwGEAeoB/wFkAYYB6wH/AWUBhwHsAf8BZgGHAewB/wFZAYEB4wH/ - ARYBQwGfAf//AIEAARcBRQGkAf8BbwGBAbsB/wFdAYABtwH/AVcBfAG4Af8BSQFzAbUB/wEjAVQBrwH/ - ASwBXQG0Af8BLwFgAbkB/wEzAWQBvgH/ATYBZwHCAf8BOQFrAcYB/wE7AW4BygH/AT4BcQHOAf8BQQF1 - AdIB/wFEAXgB1QH/ATYBbQHSAf8B2wHlAfUF/wG/AdIB9QH/ATIBbQHYAf8BVAGBAeAB/wFXAYEB4QH/ - ATEBbwHfAf8C/gH9Af8B5AHqAfwB/wFkAYcB6gH/AWABggHoAf8BYgGDAekB/wFiAYQB6gH/AWMBhAHq - Af8BWwGBAeQB/wEWAUUBpQH//wCBAAEbAU0BtQH/AYEBigHCAf8BZQGBAbkB/wFeAYEBuQH/AV8BgAG+ - Af8BPwFqAbUB/wEnAVcBsQH/AS4BXwG2Af8BMQFiAbsB/wE0AWYBwAH/ATEBYQHEAf8BIgFaAcIB/wEw - AWYBygH/ATQBaQHQAf8BQgF2AdMB/wEtAWgB1gH/AYMBowHmBf8BrwHHAe8B/wEzAW4B2QH/AVIBgQHe - Af8BVQGBAeAB/wE0AW8B2wH/AfQB+AH9Af8BWwGBAeoB/wFIAYEB5QH/AV4BgQHmAf8BXwGBAecB/wFf - AYEB6AH/AWABgQHoAf8BWwGBAeUB/wEWAUsBtgH//wCBAAEeAVABtQH/AYMBmQHIAf8BawGBAboB/wFm - AYEBugH/AWABgQG7Af8BYAGBAb8B/wEhAVYBsAH/ASwBXQG0Af8BLwFhAbgB/wEzAWQBvQH/ASABVwG7 - Af8ByAHUAfEF/wESAUwBwQH/AR0BWgHJAf8BdQGJAd8B/wFlAYEB3gH/ATMBbgHUBf8BLQFoAdYB/wE2 - AW4B2QH/ATQBbwHaAf8BUQGBAeIF/wHUAeEB9AH/AU8BgQHjAf8BWwGBAeQB/wFcAYEB5QH/AV0BgQHm - Af8BXQGBAeYB/wFbAYEB5QH/ARcBSwG1Af//AIEAASEBUgG1Af8BlAGmAc4B/wFyAYEBuwH/AW0BgQG7 - Af8BZwGBAbwB/wFoAYEBwAH/AUABZgG0Af8BFwFMAasB/wE0AWMBuQH/ARIBQwGsAf8BEgE2Aa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFEAXwB4gH/AVgBgQHi - Af8BWQGBAeMB/wFaAYEB4wH/AVoBgQHkAf8BWgGBAeQB/wEXAUsBtgH//wCBAAEkAVUBtgH/AaMBswHU - Af8BeQGCAbwB/wF0AYEBvQH/AW4BgQG9Af8BawGBAb0B/wFUAXsBugH/AR8BUAGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATsBcQHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEhAWMB1wH/AUEBeQHfAf8BTAGAAd8B/wFV - AYEB4AH/AVYBgQHhAf8BVwGBAeEB/wFXAYEB4gH/AVcBgQHiAf8BFwFLAbYB//8AgQABJgFWAbcB/wGy - Ab8B2gH/AX8BhwG8Af8BewGEAb4B/wF1AYEBvgH/AW8BgQG/Af8BcAGBAcIB/wElAVUBrA3/AZYBrgHg - Af8BKwFdAb4B/wESAUkBvAH/AVABfQHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BSwF/AdcB/wFN - AX8B2AH/Ae0B8wH9Af8BYQGBAeEB/wFEAXoB2wH/AVABgQHdAf8BUQGBAd4B/wFSAYEB3wH/AVMBgQHf - Af8BVAGBAeAB/wFUAYEB4AH/AVQBgQHgAf8BGAFMAbYB//8AgQABJgFWAbcB/wHAAcsB4QH/AYEBjAG+ - Af8BgQGJAb8B/wF8AYYBvwH/AXYBgQHAAf8BdwGEAcAB/wESATsBmQH/AZIBqAHXBf8BfgGLAdEB/wES - AUgBrQH/ASsBXwG/Af8BMwFkAcIB/wEqAWEBwQH/ARIBTgHDAf8B5wHvAfoJ/wHiAeoB9wH/ASoBZAHP - Af8BNgFwAdcB/wE9AXUB2QH/AUwBfwHaAf8BTQGBAdsB/wFOAYEB3AH/AVABgQHdAf8BUAGBAd0B/wFR - AYEB3gH/AVEBgQHeAf8BUQGBAd4B/wEXAUsBtgH//wCBAAElAVUBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AYEBiwHBAf8BfQGHAcEB/wF2AYIBvgH/AUkBdAGxCf8BEgE3AaIB/wEnAWEBtwH/ATIBYwG7 - Af8BNQFmAb8B/wE4AWkBwwH/ASoBYAHCAf8BXQGBAdMJ/wE+AXMB1AH/ATsBcQHVAf8BRgF5AdYB/wFI - AXsB1wH/AUkBfQHYAf8BSgF+AdkB/wFMAX8B2gH/AU0BgAHbAf8BTQGBAdsB/wFOAYEB3AH/AU4BgQHc - Af8BTgGBAdwB/wEXAUsBtgH//wCBAAEiAVMBtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BegGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BEgE8AaIB/wEtAV4BtAH/ATABYQG4Af8BMwFkAbwB/wE1 - AWcBwAH/ATEBZgHEAf8BIQFcAcQF/wG4AckB7wH/ARMBUgHJAf8BPgFwAdIB/wFDAXcB1AH/AUUBeAHV - Af8BRgF6AdYB/wFIAXsB1wH/AUkBfAHYAf8BSgF9AdkB/wFKAX4B2QH/AUsBfwHaAf8BSwF/AdoB/wFK - AX0B2QH/ARcBSwG1Af//AIEAAR0BUAG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGB - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wESATMBmwH/ASsBXAGwAf8BLgFfAbUB/wEwAWIBuQH/ - ATMBZAG9Af8BKQFeAcEB/wFBAXEByAn/AXQBhwHeAf8BLwFlAdEB/wFBAXQB0wH/AUIBdgHTAf8BRAF3 - AdUB/wFFAXgB1QH/AUYBeQHWAf8BRwF6AdcB/wFIAXsB1wH/AUgBfAHYAf8BSQF8AdgB/wFFAXkB1gH/ - ARYBSgG2Af//AIEAARcBRQGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AYEBigHAAf8BYQGBAbUB/wHIAdIB6AX/ATwBZQGuAf8BEgFHAaUB/wEsAVwBsQH/AS4BXwG1Af8BJwFe - AbkB/wESAUUBsQH/AbkBxQHsDf8BJQFeAcgB/wE+AXIB0QH/AUABcwHSAf8BQQF1AdMB/wFCAXYB0wH/ - AUMBdwHUAf8BRAF4AdUB/wFFAXgB1QH/AUUBeQHWAf8BRgF5AdYB/wFAAXQB0gH/ARYBRAGiAf//AIEA - ARYBQwGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BeAGE - Ab4B/wG3AcYB4wn/AUUBbAG0Af8BEgEyAZsB/wESATwBogH/ARIBPgGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUkBeQHLAf8BbgGCAdUB/wErAWABxgH/ATsBbwHOAf8BPQFxAdAB/wE+AXIB0QH/AT8BcwHSAf8BQAF0 - AdIB/wFBAXUB0wH/AUIBdQHTAf8BQgF2AdMB/wFDAXYB1AH/ATsBbwHPAf8BFgFDAZ8B//8AgQABFQE9 + ASADAAEBAQABIAYAAUAqAAEVATMBfAH/ARYBOQGBAf8BFgE9AYgB/wEXAUMBmQH/ARcBRAGfAf8BFwFK + AbAB/wEXAUwBtgH/ARgBTAG2Af8BGAFMAbYB/wEYAUwBtgH/ARgBTAG2Af8BGAFMAbYB/wEYAUwBtgH/ + ARgBTAG2Af8BFwFIAaoB/wEXAUQBnwH/ARcBQgGWAf8BFgE9AYgB/wEWATcBgQH/ARUBMgF5Af//AKEA + ARcBQQGTAf8BGgFNAbYB/wEfAVMBuAH/ASMBVwG7Af8BKAFbAb8B/wEsAWABwwH/ATEBZAHHAf8BNgFp + AcoB/wE6AW4BzgH/AT8BcwHRAf8BRAF3AdQB/wFIAXwB1wH/AUwBgAHaAf8BTwGBAdwB/wFSAYEB3gH/ + AVYBgQHgAf8BVwGBAeEB/wFYAYEB4gH/AVgBgQHiAf8BVwGBAeEB/wFVAYEB4AH/AVIBgQHeAf8BTQGB + AdoB/wFIAXsB1gH/AUABdAHRAf8BNwFrAcsB/wEhAVUBvAH/ARcBQAGQAf//AI0AARcBQgGWAf8BHgFQ + AbMB/wEpAVsBtwH/AS0BXwG8Af8BMAFjAcEB/wEzAWYBxQH/ATYBagHJAf8BOQFtAc0B/wE8AXABzwH/ + AUABcwHRAf8BQwF2AdMB/wFGAXkB1QH/AUkBfAHXAf8BTAGAAdoB/wFPAYEB3AH/AVIBgQHeAf8BVQGB + AeAB/wFYAYEB4gH/AVwBgQHkAf8BXwGBAeYB/wFiAYIB6QH/AWUBhQHrAf8BaAGIAe0B/wFrAYsB7wH/ + AW4BjgHxAf8BcQGSAfMB/wF0AZQB9QH/AXQBlAH1Af8BOwFuAc4B/wEWAUEBkwH//wCJAAEZAUwBswH/ + ASUBVwGwAf8BKQFbAbUB/wEsAV4BugH/ATABYgG/Af8BMwFlAcMB/wE2AWkByAH/ATkBbQHMAf8BPAFw + Ac8B/wE/AXMB0QH/AUIBdgHTAf8BRgF5AdUB/wFJAXwB1wH/AUwBfwHZAf8BTwGBAdwB/wFSAYEB3gH/ + AVUBgQHgAf8BWAGBAeIB/wFbAYEB5AH/AV4BgQHmAf8BYgGCAegB/wFlAYUB6gH/AWgBiAHsAf8BawGL + Ae8B/wFuAY4B8QH/AXEBkQHzAf8BdAGUAfUB/wF3AZcB9wH/AXYBlgH2Af8BIwFXAb4B//8AiQABHAFO + Aa8B/wElAVYBrgH/ASkBWgGzAf8BLAFeAbgB/wEvAWEBvQH/ATIBZQHBAf8BNQFoAcYB/wE5AWwBygH/ + ATwBbwHOAf8BPwFyAdAB/wFCAXYB0wH/AUUBeQHVAf8BSAF8AdcB/wFLAX8B2QH/AU4BgQHbAf8BUQGB + Ad0B/wFVAYEB3wH/AVgBgQHhAf8BWwGBAeQB/wFeAYEB5gH/AWEBgQHoAf8BZAGEAeoB/wFnAYcB7AH/ + AWoBigHuAf8BbQGNAfAB/wFwAZAB8gH/AXIBkwH0Af8BdAGUAfUB/wF1AZUB9gH/ATwBcAHOAf//AIkA + AR0BTwGsAf8BJQFVAawB/wEoAVkBsQH/ASwBXQG2Af8BLwFgAbsB/wEyAWQBvwH/ATUBZwHEAf8BOAFr + AcgB/wE7AW8BzQH/AT4BcgHQAf8BQQF1AdIB/wFFAXgB1AH/AUgBewHWAf8BSwF+AdkB/wFOAYEB2wH/ + AVEBgQHdAf8BVAGBAd8B/wFXAYEB4QH/AVoBgQHjAf8BXQGBAeUB/wFgAYEB5wH/AWMBgwHpAf8BZgGG + AesB/wFpAYkB7QH/AWsBjAHvAf8BbgGOAfEB/wFwAZAB8gH/AXIBkgHzAf8BcgGTAfQB/wFFAXkB1QH/ + /wCFAAEWATYBgQH/AR4BTgGpAf8BJAFUAakB/wEnAVgBrwH/ASoBXAG0Af8BLgFfAbkB/wExAWMBvQH/ + ATQBZwHCAf8BNwFqAcYB/wE6AW0BywH/AT4BcQHPAf8BQQF0AdIB/wFEAXcB1AH/AUcBegHWAf8BSgF9 + AdgB/wFNAYAB2gH/AVABgQHcAf8BTAGAAd4B/wE+AXYB2wH/AVABgQHfAf8BRAF+Ad8B/wFWAYEB5wH/ + AXEBjgHrAf8BVQGBAeoB/wFnAYcB7AH/AWoBigHuAf8BbAGMAe8B/wFuAY4B8QH/AW8BjwHxAf8BbwGQ + AfIB/wFMAYAB2gH/ARYBNgGBAf//AIEAARYBOwGCAf8BIgFRAacB/wEjAVMBpwH/ASYBVwGsAf8BKgFb + AbIB/wEtAV4BtwH/ATEBYgG7Af8BNAFmAcAB/wE3AWkBxAH/AToBbQHJAf8BPQFwAc0B/wFAAXMB0QH/ + AUMBdgHTAf8BRgF5AdUB/wFJAXwB1wH/AUwBfwHZAf8BTwGBAdsB/wFDAXkB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BZwGGAesB/wFfAYEB6wH/AWcBiAHsAf8BaQGKAe4B/wFrAYsB7wH/AWwBjAHvAf8BbAGN + AfAB/wFSAYEB3gH/ARYBOwGCAf//AIEAARYBPwGNAf8BSwFyAbMB/wE8AWYBrgH/AScBVgGqAf8BKQFZ + Aa8B/wEsAV0BtAH/ATABYQG5Af8BMwFkAb4B/wE2AWgBwgH/ATkBawHHAf8BPAFvAcsB/wE/AXIBzwH/ + AUIBdQHSAf8BRQF4AdUB/wFIAXsB1wH/AUsBfgHZAf8BRwF8AdsB/wElAWYB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BQQF+AeYB/wFZAYEB6wH/AWcBhwHsAf8BaAGIAe0B/wFpAYkB7QH/AWoBigHuAf8BVwGB + AeEB/wEWAT8BjgH//wCBAAEXAUQBnwH/AVoBfQG1Af8BVwF7AbYB/wFGAW8BtAH/ASIBVAGtAf8BKwFc + AbIB/wEuAV8BtwH/ATIBYwG7Af8BNQFmAcAB/wE4AWoBxAH/ATsBbQHJAf8BPgFxAc0B/wFBAXQB0QH/ + AUMBdwHUAf8BRwF6AdYB/wE/AXcB1wH/AUoBewHdAf8BdwGLAecF/wFkAYIB4wH/ATABbQHbAf8BMQFv + Ad0B/wGJAakB7wn/AXsBlgHsAf8BYAGEAeoB/wFlAYYB6wH/AWYBhwHsAf8BZwGHAewB/wFaAYEB4wH/ + ARcBRAGfAf//AIEAARgBRgGkAf8BcAGBAbsB/wFeAYEBtwH/AVgBfQG4Af8BSgF0AbUB/wEkAVUBrwH/ + AS0BXgG0Af8BMAFhAbkB/wE0AWUBvgH/ATcBaAHCAf8BOgFsAcYB/wE8AW8BygH/AT8BcgHOAf8BQgF2 + AdIB/wFFAXkB1QH/ATcBbgHSAf8B2wHlAfUF/wG/AdIB9QH/ATMBbgHYAf8BVQGBAeAB/wFYAYEB4QH/ + ATIBcAHfAf8C/gH9Af8B5AHqAfwB/wFlAYcB6gH/AWEBggHoAf8BYwGDAekB/wFjAYQB6gH/AWQBhAHq + Af8BXAGBAeQB/wEXAUYBpQH//wCBAAEcAU4BtQH/AYEBigHCAf8BZgGBAbkB/wFfAYEBuQH/AWABgQG+ + Af8BQAFrAbUB/wEoAVgBsQH/AS8BYAG2Af8BMgFjAbsB/wE1AWcBwAH/ATIBYgHEAf8BIwFbAcIB/wEx + AWcBygH/ATUBagHQAf8BQwF3AdMB/wEuAWkB1gH/AYMBowHmBf8BrwHHAe8B/wE0AW8B2QH/AVMBgQHe + Af8BVgGBAeAB/wE1AXAB2wH/AfQB+AH9Af8BXAGBAeoB/wFJAYEB5QH/AV8BgQHmAf8BYAGBAecB/wFg + AYEB6AH/AWEBgQHoAf8BXAGBAeUB/wEXAUwBtgH//wCBAAEfAVEBtQH/AYMBmQHIAf8BbAGBAboB/wFn + AYEBugH/AWEBgQG7Af8BYQGBAb8B/wEiAVcBsAH/AS0BXgG0Af8BMAFiAbgB/wE0AWUBvQH/ASEBWAG7 + Af8ByAHUAfEF/wETAU0BwQH/AR4BWwHJAf8BdgGJAd8B/wFmAYEB3gH/ATQBbwHUBf8BLgFpAdYB/wE3 + AW8B2QH/ATUBcAHaAf8BUgGBAeIF/wHUAeEB9AH/AVABgQHjAf8BXAGBAeQB/wFdAYEB5QH/AV4BgQHm + Af8BXgGBAeYB/wFcAYEB5QH/ARgBTAG1Af//AIEAASIBUwG1Af8BlAGmAc4B/wFzAYEBuwH/AW4BgQG7 + Af8BaAGBAbwB/wFpAYEBwAH/AUEBZwG0Af8BGAFNAasB/wE1AWQBuQH/ARMBRAGsAf8BEwE3Aa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFFAX0B4gH/AVkBgQHi + Af8BWgGBAeMB/wFbAYEB4wH/AVsBgQHkAf8BWwGBAeQB/wEYAUwBtgH//wCBAAElAVYBtgH/AaMBswHU + Af8BegGCAbwB/wF1AYEBvQH/AW8BgQG9Af8BbAGBAb0B/wFVAXwBugH/ASABUQGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATwBcgHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEiAWQB1wH/AUIBegHfAf8BTQGBAd8B/wFW + AYEB4AH/AVcBgQHhAf8BWAGBAeEB/wFYAYEB4gH/AVgBgQHiAf8BGAFMAbYB//8AgQABJwFXAbcB/wGy + Ab8B2gH/AYABhwG8Af8BfAGEAb4B/wF2AYEBvgH/AXABgQG/Af8BcQGBAcIB/wEmAVYBrA3/AZYBrgHg + Af8BLAFeAb4B/wETAUoBvAH/AVEBfgHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BTAGAAdcB/wFO + AYAB2AH/Ae0B8wH9Af8BYgGBAeEB/wFFAXsB2wH/AVEBgQHdAf8BUgGBAd4B/wFTAYEB3wH/AVQBgQHf + Af8BVQGBAeAB/wFVAYEB4AH/AVUBgQHgAf8BGQFNAbYB//8AgQABJwFXAbcB/wHAAcsB4QH/AYEBjAG+ + Af8BgQGJAb8B/wF9AYYBvwH/AXcBgQHAAf8BeAGEAcAB/wETATwBmQH/AZIBqAHXBf8BfwGLAdEB/wET + AUkBrQH/ASwBYAG/Af8BNAFlAcIB/wErAWIBwQH/ARMBTwHDAf8B5wHvAfoJ/wHiAeoB9wH/ASsBZQHP + Af8BNwFxAdcB/wE+AXYB2QH/AU0BgAHaAf8BTgGBAdsB/wFPAYEB3AH/AVEBgQHdAf8BUQGBAd0B/wFS + AYEB3gH/AVIBgQHeAf8BUgGBAd4B/wEYAUwBtgH//wCBAAEmAVYBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AYEBiwHBAf8BfgGHAcEB/wF3AYIBvgH/AUoBdQGxCf8BEwE4AaIB/wEoAWIBtwH/ATMBZAG7 + Af8BNgFnAb8B/wE5AWoBwwH/ASsBYQHCAf8BXgGBAdMJ/wE/AXQB1AH/ATwBcgHVAf8BRwF6AdYB/wFJ + AXwB1wH/AUoBfgHYAf8BSwF/AdkB/wFNAYAB2gH/AU4BgQHbAf8BTgGBAdsB/wFPAYEB3AH/AU8BgQHc + Af8BTwGBAdwB/wEYAUwBtgH//wCBAAEjAVQBtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BewGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BEwE9AaIB/wEuAV8BtAH/ATEBYgG4Af8BNAFlAbwB/wE2 + AWgBwAH/ATIBZwHEAf8BIgFdAcQF/wG4AckB7wH/ARQBUwHJAf8BPwFxAdIB/wFEAXgB1AH/AUYBeQHV + Af8BRwF7AdYB/wFJAXwB1wH/AUoBfQHYAf8BSwF+AdkB/wFLAX8B2QH/AUwBgAHaAf8BTAGAAdoB/wFL + AX4B2QH/ARgBTAG1Af//AIEAAR4BUQG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGB + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wETATQBmwH/ASwBXQGwAf8BLwFgAbUB/wExAWMBuQH/ + ATQBZQG9Af8BKgFfAcEB/wFCAXIByAn/AXUBhwHeAf8BMAFmAdEB/wFCAXUB0wH/AUMBdwHTAf8BRQF4 + AdUB/wFGAXkB1QH/AUcBegHWAf8BSAF7AdcB/wFJAXwB1wH/AUkBfQHYAf8BSgF9AdgB/wFGAXoB1gH/ + ARcBSwG2Af//AIEAARgBRgGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AYEBigHAAf8BYgGBAbUB/wHIAdIB6AX/AT0BZgGuAf8BEwFIAaUB/wEtAV0BsQH/AS8BYAG1Af8BKAFf + AbkB/wETAUYBsQH/AbkBxQHsDf8BJgFfAcgB/wE/AXMB0QH/AUEBdAHSAf8BQgF2AdMB/wFDAXcB0wH/ + AUQBeAHUAf8BRQF5AdUB/wFGAXkB1QH/AUYBegHWAf8BRwF6AdYB/wFBAXUB0gH/ARcBRQGiAf//AIEA + ARcBRAGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BeQGE + Ab4B/wG3AcYB4wn/AUYBbQG0Af8BEwEzAZsB/wETAT0BogH/ARMBPwGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUoBegHLAf8BbwGCAdUB/wEsAWEBxgH/ATwBcAHOAf8BPgFyAdAB/wE/AXMB0QH/AUABdAHSAf8BQQF1 + AdIB/wFCAXYB0wH/AUMBdgHTAf8BQwF3AdMB/wFEAXcB1AH/ATwBcAHPAf8BFwFEAZ8B//8AgQABFgE+ AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BEgEwAasB/wEiAVkBvQH/AS4BYgHFAf8BNwFqAcgB/wE5AWwBywH/AToBbgHOAf8BOwFv - Ac8B/wE8AXAB0AH/AT0BcQHQAf8BPgFyAdEB/wE/AXMB0QH/AT8BcwHSAf8BQAFzAdIB/wE2AWoBywH/ - ARUBPQGLAf//AIEAARUBOgGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AXABgQG8Af8BEgEeAYUB/wHrAfAB9Qn/AakBuwHhCf8BcgGC - Ac4B/wEqAV0BvQH/ATMBZQHBAf8BNQFnAcUB/wE2AWkByAH/ATcBawHLAf8BOQFsAc0B/wE6AW0BzgH/ - ATsBbgHOAf8BOwFvAc8B/wE8AXABzwH/ATwBcAHQAf8BPQFxAdAB/wExAWQBxwH/ARUBOgGBAf//AIEA - ARQBNAGAAf8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BfgGHAcQB/wHQAdwB7QX/AUIBbAGwAf8BEgEjAZUB/wEWAUwBqQH/ - AakBuAHhAf8BEwFJAa0B/wEeAVUBswH/ASoBXAG9Af8BKwFeAcEB/wEtAWYBxAH/ATUBaAHHAf8BNgFp - AcoB/wE3AWsBzAH/ATgBawHMAf8BOQFsAc0B/wE5AW0BzQH/AToBbQHNAf8BOgFtAc4B/wEsAV8BxAH/ - ARUBNAGAAf//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AYEBjQHIAf8BcwGC - AcEB/wFpAYEBwwH/AV8BgQHEAf8BYQGBAcUB/wFjAYEBxQH/AV4BgQHGAf8BWQGBAcYB/wFPAXwByQH/ - AUcBdQHJAf8BQgFyAcsB/wE9AW8BywH/ATgBawHLAf8BNgFpAcsB/wE2AWoBywH/ATcBagHMAf8BNwFr - AcwB/wEnAVoBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BEwExAasB/wEjAVoBvQH/AS8BYwHFAf8BOAFrAcgB/wE6AW0BywH/ATsBbwHOAf8BPAFw + Ac8B/wE9AXEB0AH/AT4BcgHQAf8BPwFzAdEB/wFAAXQB0QH/AUABdAHSAf8BQQF0AdIB/wE3AWsBywH/ + ARYBPgGLAf//AIEAARYBOwGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AXEBgQG8Af8BEwEfAYUB/wHrAfAB9Qn/AakBuwHhCf8BcwGC + Ac4B/wErAV4BvQH/ATQBZgHBAf8BNgFoAcUB/wE3AWoByAH/ATgBbAHLAf8BOgFtAc0B/wE7AW4BzgH/ + ATwBbwHOAf8BPAFwAc8B/wE9AXEBzwH/AT0BcQHQAf8BPgFyAdAB/wEyAWUBxwH/ARYBOwGBAf//AIEA + ARUBNQGBAf8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BfwGHAcQB/wHQAdwB7QX/AUMBbQGwAf8BEwEkAZUB/wEXAU0BqQH/ + AakBuAHhAf8BFAFKAa0B/wEfAVYBswH/ASsBXQG9Af8BLAFfAcEB/wEuAWcBxAH/ATYBaQHHAf8BNwFq + AcoB/wE4AWwBzAH/ATkBbAHMAf8BOgFtAc0B/wE6AW4BzQH/ATsBbgHNAf8BOwFuAc4B/wEtAWABxAH/ + ARYBNQGBAf//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AYEBjQHIAf8BdAGC + AcEB/wFqAYEBwwH/AWABgQHEAf8BYgGBAcUB/wFkAYEBxQH/AV8BgQHGAf8BWgGBAcYB/wFQAX0ByQH/ + AUgBdgHJAf8BQwFzAcsB/wE+AXABywH/ATkBbAHLAf8BNwFqAcsB/wE3AWsBywH/ATgBawHMAf8BOAFs + AcwB/wEoAVsBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AYEBiwHGAf8BfgGHAcYB/wF0AYIBxwH/AW4BgQHHAf8BaAGBAccB/wFiAYEBxwH/AVwBgQHIAf8BVgF/ - AcgB/wFQAXsByQH/AUoBdwHKAf8BRAFzAcoB/wE9AW4BywH/ATcBagHKAf8BNAFnAckB/wE0AWgBygH/ - ATQBaAHKAf8BIgFWAb0B//8AiQABbgGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AYEBiwHGAf8BfwGHAcYB/wF1AYIBxwH/AW8BgQHHAf8BaQGBAccB/wFjAYEBxwH/AV0BgQHIAf8BVwGA + AcgB/wFRAXwByQH/AUsBeAHKAf8BRQF0AcoB/wE+AW8BywH/ATgBawHKAf8BNQFoAckB/wE1AWkBygH/ + ATUBaQHKAf8BIwFXAb0B//8AiQABbwGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGBAZAByAH/AYEBiwHHAf8BewGHAccB/wF0AYIBxwH/AW4BgQHHAf8BZwGBAccB/wFhAYEBxwH/ - AVsBgQHIAf8BVQF+AcgB/wFPAXoByQH/AUgBdQHJAf8BQgFxAcoB/wE7AWwBygH/ATUBaAHJAf8BMQFl - AcgB/wExAWUByAH/AR0BUQG6Af//AIkAAS0BXAG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AYEBiwHHAf8BfAGHAccB/wF1AYIBxwH/AW8BgQHHAf8BaAGBAccB/wFiAYEBxwH/ + AVwBgQHIAf8BVgF/AcgB/wFQAXsByQH/AUkBdgHJAf8BQwFyAcoB/wE8AW0BygH/ATYBaQHJAf8BMgFm + AcgB/wEyAWYByAH/AR4BUgG6Af//AIkAAS4BXQG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AYEBiwHHAf8BegGGAccB/wF0AYIBxwH/AW0BgQHHAf8BZwGB - AccB/wFhAYEBxwH/AVoBgQHHAf8BVAF9AcgB/wFNAXkByAH/AUcBdAHIAf8BQAFvAckB/wE5AWsByAH/ - ATMBZQHHAf8BLAFgAcQB/wEXAUoBswH//wCJAAEUATcBgQH/AWwBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AYEBiwHHAf8BewGGAccB/wF1AYIBxwH/AW4BgQHHAf8BaAGB + AccB/wFiAYEBxwH/AVsBgQHHAf8BVQF+AcgB/wFOAXoByAH/AUgBdQHIAf8BQQFwAckB/wE6AWwByAH/ + ATQBZgHHAf8BLQFhAcQB/wEYAUsBswH//wCJAAEVATgBgQH/AW0BgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGBAYwBxQH/AX8BiQHGAf8BegGGAccB/wFzAYEBxwH/ - AWwBgQHGAf8BZgGBAcYB/wFgAYEBxgH/AVkBgAHHAf8BUwF7AccB/wFMAXcBxwH/AUUBcgHIAf8BPgFu - AcgB/wE0AWUBxQH/ARwBUAG5Af8BFAEzAX4B//8AjQABFQE3AYEB/wEqAVoBugH/AWYBgQHMAf8BgQGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGBAYwBxQH/AYABiQHGAf8BewGGAccB/wF0AYEBxwH/ + AW0BgQHGAf8BZwGBAcYB/wFhAYEBxgH/AVoBgQHHAf8BVAF8AccB/wFNAXgBxwH/AUYBcwHIAf8BPwFv + AcgB/wE1AWYBxQH/AR0BUQG5Af8BFQE0AX8B//8AjQABFgE4AYEB/wErAVsBugH/AWcBgQHMAf8BgQGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BgQGN - AcwB/wFwAYEByQH/AV0BgQHFAf8BSgF0AcIB/wE/AWsBwAH/ATQBYwG+Af8BKwFcAb0B/wEjAVUBugH/ - ARgBTAG2Af8BFAE0AYEB//8ApQABFQE2AYEB/wEVATwBiAH/ARYBQQGWAf8BFgFDAZ8B/wEWAUgBrQH/ - ARcBSwG2Af8BFgFLAbYB/wEZAUwBtgH/ARoBTQG2Af8BGgFNAbYB/wEYAUsBtgH/ARYBSwG2Af8BFwFL - AbYB/wEWAUYBpwH/ARYBQwGfAf8BFgE/AZAB/wEVATsBhQH/ARUBNQGBAf//AJ0AAUIBTQE+BwABPgMA + AcwB/wFxAYEByQH/AV4BgQHFAf8BSwF1AcIB/wFAAWwBwAH/ATUBZAG+Af8BLAFdAb0B/wEkAVYBugH/ + ARkBTQG2Af8BFQE1AYEB//8ApQABFgE3AYEB/wEWAT0BiAH/ARcBQgGWAf8BFwFEAZ8B/wEXAUkBrQH/ + ARgBTAG2Af8BFwFMAbYB/wEaAU0BtgH/ARsBTgG2Af8BGwFOAbYB/wEZAUwBtgH/ARcBTAG2Af8BGAFM + AbYB/wEXAUcBpwH/ARcBRAGfAf8BFwFAAZAB/wEWATwBhQH/ARYBNgGBAf//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-24 16:34:19
|
Revision: 220 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=220&view=rev Author: dukus Date: 2007-03-24 09:34:07 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Control panel lists text formating Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx Modified: trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-03-24 13:47:34 UTC (rev 219) +++ trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-03-24 16:34:07 UTC (rev 220) @@ -32,7 +32,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> + <OutputPath>..\..\mediaportal\xbmc\bin\Release\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -47,9 +47,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.2587.35999, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Core, Version=1.0.2639.17703, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>D:\Program Files\Team MediaPortal\MediaPortal\Core.DLL</HintPath> + <HintPath>..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath> </Reference> <Reference Include="ICSharpCode.SharpZipLib, Version=0.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"> <SpecificVersion>False</SpecificVersion> @@ -63,9 +63,9 @@ <Reference Include="System.Management" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="Utils, Version=1.0.2595.36012, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Utils, Version=2.1.2639.17702, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>D:\Program Files\Team MediaPortal\MediaPortal\Utils.DLL</HintPath> + <HintPath>..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-24 13:47:34 UTC (rev 219) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-24 16:34:07 UTC (rev 220) @@ -22,6 +22,8 @@ public string txt_EULA = String.Empty; public string txt_log = String.Empty; public string txt_readme = String.Empty; + public bool isNew = false; + public bool isUpdated = false; public bool containsSkin = false; public bool isValid = false; public List<string> SkinList; @@ -33,6 +35,8 @@ txt_readme = String.Empty; containsSkin = false; isValid = false; + isNew = false; + isUpdated = false; SkinList = new List<string>(); InstallableSkinList = new List<string>(); @@ -255,6 +259,26 @@ //LoadFromFile(); } + public void Compare(MPInstallHelper mp) + { + foreach (MPpackageStruct pk in this.lst) + { + pk.isNew = true; + } + foreach (MPpackageStruct pk in mp.lst) + { + int idx=this.IndexOf(pk); + if (idx > -1) + { + if (((MPpackageStruct)this.lst[idx])._intalerStruct.Version.CompareTo(pk._intalerStruct.Version)>0) + ((MPpackageStruct)this.lst[idx]).isUpdated = true; + ((MPpackageStruct)this.lst[idx]).isNew = false; + + }else + ((MPpackageStruct)this.lst[idx]).isNew = true; + } + } + public void Add(MPpackageStruct pk) { for (int i = 0; i < lst.Count; i++) Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-24 13:47:34 UTC (rev 219) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-24 16:34:07 UTC (rev 220) @@ -48,6 +48,7 @@ this.comboBox2 = new System.Windows.Forms.ComboBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.button5 = new System.Windows.Forms.Button(); this.listView2 = new System.Windows.Forms.ListView(); this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); @@ -57,9 +58,11 @@ this.columnHeader10 = new System.Windows.Forms.ColumnHeader(); this.label1 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // listView1 @@ -208,6 +211,7 @@ this.button6.TabIndex = 8; this.button6.Text = "Find updates"; this.button6.UseVisualStyleBackColor = true; + this.button6.Visible = false; // // label2 // @@ -244,6 +248,7 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.pictureBox1); this.tabPage2.Controls.Add(this.button5); this.tabPage2.Controls.Add(this.listView2); this.tabPage2.Controls.Add(this.label1); @@ -257,6 +262,14 @@ this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.Enter += new System.EventHandler(this.tabPage2_Enter); // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(303, 278); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(375, 49); + this.pictureBox1.TabIndex = 4; + this.pictureBox1.TabStop = false; + // // button5 // this.button5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -333,6 +346,12 @@ this.comboBox1.TabIndex = 0; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + this.contextMenuStrip1.Text = "Is plugin"; + // // controlp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -349,6 +368,7 @@ this.tabPage1.PerformLayout(); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } @@ -382,5 +402,7 @@ private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.ColumnHeader columnHeader10; private System.Windows.Forms.Button button6; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-24 13:47:34 UTC (rev 219) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-24 16:34:07 UTC (rev 220) @@ -6,7 +6,9 @@ using System.Data; using System.Drawing; using System.Text; +using System.Reflection; using System.Windows.Forms; +using MediaPortal.GUI.Library; using MediaPortal.Configuration; namespace MPInstaler @@ -22,6 +24,7 @@ public controlp() { InitializeComponent(); + //pictureBox1.Load("http://webmaster.extra.hu/banner/extra134x77.gif"); } private void button2_Click(object sender, EventArgs e) @@ -53,6 +56,8 @@ imageList1.Images.Add(pk._intalerStruct.Logo); item1.ImageIndex = imageList1.Images.Count - 1; } + if (pk.isNew) item1.ForeColor = Color.Red; + if (pk.isUpdated) item1.ForeColor = Color.BlueViolet; item1.ToolTipText = pk._intalerStruct.Description; item1.SubItems.Add(pk._intalerStruct.Author); item1.SubItems.Add(pk._intalerStruct.Version); @@ -210,6 +215,7 @@ if (File.Exists(temp_file)) { lst_online.LoadFromFile(temp_file); + lst_online.Compare(lst); LoadToListview(lst_online, listView2); } else MessageBox.Show("File read error"); @@ -392,7 +398,59 @@ } } } + + private void LoadPlugins(string pluginFile) + { + try + { + Assembly pluginAssembly = Assembly.LoadFrom(pluginFile); + + if (pluginAssembly != null) + { + Type[] exportedTypes = pluginAssembly.GetExportedTypes(); + + foreach (Type type in exportedTypes) + { + if (type.IsAbstract) + { + continue; + } + if (type.GetInterface("MediaPortal.GUI.Library.ISetupForm") != null) + { + try + { + // + // Create instance of the current type + // + object pluginObject = Activator.CreateInstance(type); + ISetupForm pluginForm = pluginObject as ISetupForm; + + if (pluginForm != null) + { + //ItemTag tag = new ItemTag(); + //tag.SetupForm = pluginForm; + //tag.DLLName = pluginFile.Substring(pluginFile.LastIndexOf(@"\") + 1); + //tag.windowId = pluginForm.GetWindowId(); + //loadedPlugins.Add(tag); + } + } + catch (Exception setupFormException) + { + MessageBox.Show("Exception in plugin SetupForm loading :{0}", setupFormException.Message); + + } + } + } + } + } + catch (Exception unknownException) + { + MessageBox.Show("Exception in plugin loading :{0}", unknownException.Message); + } + } + } + public class ListViewGroupSorter : IComparer { private SortOrder order; Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-24 13:47:34 UTC (rev 219) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-24 16:34:07 UTC (rev 220) @@ -126,134 +126,137 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAERAS8BeAH/ARIBNQGBAf8BEgE5AYgB/wETAT8BmQH/ARMBQAGfAf8BEwFG - AbAB/wETAUgBtgH/ARQBSAG2Af8BFAFIAbYB/wEUAUgBtgH/ARQBSAG2Af8BFAFIAbYB/wEUAUgBtgH/ - ARQBSAG2Af8BEwFEAaoB/wETAUABnwH/ARMBPgGWAf8BEgE5AYgB/wESATMBgQH/AREBLgF1Af//AKEA - ARMBPQGTAf8BFgFJAbYB/wEbAU8BuAH/AR8BUwG7Af8BJAFXAb8B/wEoAVwBwwH/AS0BYAHHAf8BMgFl - AcoB/wE2AWoBzgH/ATsBbwHRAf8BQAFzAdQB/wFEAXgB1wH/AUgBfAHaAf8BSwF/AdwB/wFOAYEB3gH/ - AVIBgQHgAf8BUwGBAeEB/wFUAYEB4gH/AVQBgQHiAf8BUwGBAeEB/wFRAYEB4AH/AU4BgQHeAf8BSQF9 - AdoB/wFEAXcB1gH/ATwBcAHRAf8BMwFnAcsB/wEdAVEBvAH/ARMBPAGQAf//AI0AARMBPgGWAf8BGgFM - AbMB/wElAVcBtwH/ASkBWwG8Af8BLAFfAcEB/wEvAWIBxQH/ATIBZgHJAf8BNQFpAc0B/wE4AWwBzwH/ - ATwBbwHRAf8BPwFyAdMB/wFCAXUB1QH/AUUBeAHXAf8BSAF8AdoB/wFLAX4B3AH/AU4BgQHeAf8BUQGB - AeAB/wFUAYEB4gH/AVgBgQHkAf8BWwGBAeYB/wFeAYIB6QH/AWEBhQHrAf8BZAGIAe0B/wFnAYsB7wH/ - AWoBjgHxAf8BbQGSAfMB/wFwAZQB9QH/AXABlAH1Af8BNwFqAc4B/wESAT0BkwH//wCJAAEVAUgBswH/ - ASEBUwGwAf8BJQFXAbUB/wEoAVoBugH/ASwBXgG/Af8BLwFhAcMB/wEyAWUByAH/ATUBaQHMAf8BOAFs - Ac8B/wE7AW8B0QH/AT4BcgHTAf8BQgF1AdUB/wFFAXgB1wH/AUgBewHZAf8BSwF+AdwB/wFOAYEB3gH/ - AVEBgQHgAf8BVAGBAeIB/wFXAYEB5AH/AVoBgQHmAf8BXgGCAegB/wFhAYUB6gH/AWQBiAHsAf8BZwGL - Ae8B/wFqAY4B8QH/AW0BkQHzAf8BcAGUAfUB/wFzAZcB9wH/AXIBlgH2Af8BHwFTAb4B//8AiQABGAFK - Aa8B/wEhAVIBrgH/ASUBVgGzAf8BKAFaAbgB/wErAV0BvQH/AS4BYQHBAf8BMQFkAcYB/wE1AWgBygH/ - ATgBawHOAf8BOwFuAdAB/wE+AXIB0wH/AUEBdQHVAf8BRAF4AdcB/wFHAXsB2QH/AUoBfgHbAf8BTQGB - Ad0B/wFRAYEB3wH/AVQBgQHhAf8BVwGBAeQB/wFaAYEB5gH/AV0BgQHoAf8BYAGEAeoB/wFjAYcB7AH/ - AWYBigHuAf8BaQGNAfAB/wFsAZAB8gH/AW4BkwH0Af8BcAGUAfUB/wFxAZUB9gH/ATgBbAHOAf//AIkA - ARkBSwGsAf8BIQFRAawB/wEkAVUBsQH/ASgBWQG2Af8BKwFcAbsB/wEuAWABvwH/ATEBYwHEAf8BNAFn - AcgB/wE3AWsBzQH/AToBbgHQAf8BPQFxAdIB/wFBAXQB1AH/AUQBdwHWAf8BRwF6AdkB/wFKAX0B2wH/ - AU0BgAHdAf8BUAGBAd8B/wFTAYEB4QH/AVYBgQHjAf8BWQGBAeUB/wFcAYEB5wH/AV8BgwHpAf8BYgGG - AesB/wFlAYkB7QH/AWcBjAHvAf8BagGOAfEB/wFsAZAB8gH/AW4BkgHzAf8BbgGTAfQB/wFBAXUB1QH/ - /wCFAAESATIBgAH/ARoBSgGpAf8BIAFQAakB/wEjAVQBrwH/ASYBWAG0Af8BKgFbAbkB/wEtAV8BvQH/ - ATABYwHCAf8BMwFmAcYB/wE2AWkBywH/AToBbQHPAf8BPQFwAdIB/wFAAXMB1AH/AUMBdgHWAf8BRgF5 - AdgB/wFJAXwB2gH/AUwBfwHcAf8BSAF8Ad4B/wE6AXIB2wH/AUwBgQHfAf8BQAF6Ad8B/wFSAYEB5wH/ - AW0BjgHrAf8BUQGBAeoB/wFjAYcB7AH/AWYBigHuAf8BaAGMAe8B/wFqAY4B8QH/AWsBjwHxAf8BawGQ - AfIB/wFIAXwB2gH/ARIBMgGAAf//AIEAARIBNwGCAf8BHgFNAacB/wEfAU8BpwH/ASIBUwGsAf8BJgFX - AbIB/wEpAVoBtwH/AS0BXgG7Af8BMAFiAcAB/wEzAWUBxAH/ATYBaQHJAf8BOQFsAc0B/wE8AW8B0QH/ - AT8BcgHTAf8BQgF1AdUB/wFFAXgB1wH/AUgBewHZAf8BSwF+AdsB/wE/AXUB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BYwGGAesB/wFbAYEB6wH/AWMBiAHsAf8BZQGKAe4B/wFnAYsB7wH/AWgBjAHvAf8BaAGN - AfAB/wFOAYEB3gH/ARIBNwGCAf//AIEAARIBOwGNAf8BRwFuAbMB/wE4AWIBrgH/ASMBUgGqAf8BJQFV - Aa8B/wEoAVkBtAH/ASwBXQG5Af8BLwFgAb4B/wEyAWQBwgH/ATUBZwHHAf8BOAFrAcsB/wE7AW4BzwH/ - AT4BcQHSAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BQwF4AdsB/wEhAWIB1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BPQF6AeYB/wFVAYEB6wH/AWMBhwHsAf8BZAGIAe0B/wFlAYkB7QH/AWYBigHuAf8BUwGB - AeEB/wESATsBjgH//wCBAAETAUABnwH/AVYBeQG1Af8BUwF3AbYB/wFCAWsBtAH/AR4BUAGtAf8BJwFY - AbIB/wEqAVsBtwH/AS4BXwG7Af8BMQFiAcAB/wE0AWYBxAH/ATcBaQHJAf8BOgFtAc0B/wE9AXAB0QH/ - AT8BcwHUAf8BQwF2AdYB/wE7AXMB1wH/AUYBdwHdAf8BcwGLAecF/wFgAYIB4wH/ASwBaQHbAf8BLQFr - Ad0B/wGJAakB7wn/AXcBlgHsAf8BXAGEAeoB/wFhAYYB6wH/AWIBhwHsAf8BYwGHAewB/wFWAYEB4wH/ - ARMBQAGfAf//AIEAARQBQgGkAf8BbAGBAbsB/wFaAX0BtwH/AVQBeQG4Af8BRgFwAbUB/wEgAVEBrwH/ - ASkBWgG0Af8BLAFdAbkB/wEwAWEBvgH/ATMBZAHCAf8BNgFoAcYB/wE4AWsBygH/ATsBbgHOAf8BPgFy - AdIB/wFBAXUB1QH/ATMBagHSAf8B2wHlAfUF/wG/AdIB9QH/AS8BagHYAf8BUQGBAeAB/wFUAYEB4QH/ - AS4BbAHfAf8C/gH9Af8B5AHqAfwB/wFhAYcB6gH/AV0BggHoAf8BXwGDAekB/wFfAYQB6gH/AWABhAHq - Af8BWAGBAeQB/wETAUIBpQH//wCBAAEYAUoBtQH/AX8BigHCAf8BYgGBAbkB/wFbAX4BuQH/AVwBfQG+ - Af8BPAFnAbUB/wEkAVQBsQH/ASsBXAG2Af8BLgFfAbsB/wExAWMBwAH/AS4BXgHEAf8BHwFXAcIB/wEt - AWMBygH/ATEBZgHQAf8BPwFzAdMB/wEqAWUB1gH/AYMBowHmBf8BrwHHAe8B/wEwAWsB2QH/AU8BgQHe - Af8BUgGBAeAB/wExAWwB2wH/AfQB+AH9Af8BWAGBAeoB/wFFAX4B5QH/AVsBgQHmAf8BXAGBAecB/wFc - AYEB6AH/AV0BgQHoAf8BWAGBAeUB/wETAUgBtgH//wCBAAEbAU0BtQH/AYMBmQHIAf8BaAGBAboB/wFj - AYEBugH/AV0BgAG7Af8BXQGAAb8B/wEeAVMBsAH/ASkBWgG0Af8BLAFeAbgB/wEwAWEBvQH/AR0BVAG7 - Af8ByAHUAfEF/wEPAUkBwQH/ARoBVwHJAf8BcgGJAd8B/wFiAYEB3gH/ATABawHUBf8BKgFlAdYB/wEz - AWsB2QH/ATEBbAHaAf8BTgGBAeIF/wHUAeEB9AH/AUwBgQHjAf8BWAGBAeQB/wFZAYEB5QH/AVoBgQHm - Af8BWgGBAeYB/wFYAYEB5QH/ARQBSAG1Af//AIEAAR4BTwG1Af8BlAGmAc4B/wFvAYEBuwH/AWoBgQG7 - Af8BZAGBAbwB/wFlAYEBwAH/AT0BYwG0Af8BFAFJAasB/wExAWABuQH/AQ8BQAGsAf8BDwEzAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFBAXkB4gH/AVUBgQHi - Af8BVgGBAeMB/wFXAYEB4wH/AVcBgQHkAf8BVwGBAeQB/wEUAUgBtgH//wCBAAEhAVIBtgH/AaMBswHU - Af8BdgGCAbwB/wFxAYEBvQH/AWsBgQG9Af8BaAGBAb0B/wFRAXgBugH/ARwBTQGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATgBbgHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEeAWAB1wH/AT4BdgHfAf8BSQF9Ad8B/wFS - AYEB4AH/AVMBgQHhAf8BVAGBAeEB/wFUAYEB4gH/AVQBgQHiAf8BFAFIAbYB//8AgQABIwFTAbcB/wGy - Ab8B2gH/AXwBhwG8Af8BeAGEAb4B/wFyAYEBvgH/AWwBgQG/Af8BbQGBAcIB/wEiAVIBrA3/AZYBrgHg - Af8BKAFaAb4B/wEPAUYBvAH/AU0BegHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BSAF8AdcB/wFK - AXwB2AH/Ae0B8wH9Af8BXgGBAeEB/wFBAXcB2wH/AU0BgQHdAf8BTgGBAd4B/wFPAYEB3wH/AVABgQHf - Af8BUQGBAeAB/wFRAYEB4AH/AVEBgQHgAf8BFQFJAbYB//8AgQABIwFTAbcB/wHAAcsB4QH/AYEBjAG+ - Af8BfgGJAb8B/wF5AYYBvwH/AXMBgQHAAf8BdAGEAcAB/wEPATgBmQH/AZIBqAHXBf8BewGLAdEB/wEP - AUUBrQH/ASgBXAG/Af8BMAFhAcIB/wEnAV4BwQH/AQ8BSwHDAf8B5wHvAfoJ/wHiAeoB9wH/AScBYQHP - Af8BMwFtAdcB/wE6AXIB2QH/AUkBfAHaAf8BSgF+AdsB/wFLAX8B3AH/AU0BgAHdAf8BTQGBAd0B/wFO - AYEB3gH/AU4BgQHeAf8BTgGBAd4B/wEUAUgBtgH//wCBAAEiAVIBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AYABiwHBAf8BegGHAcEB/wFzAYIBvgH/AUYBcQGxCf8BDwE0AaIB/wEkAV4BtwH/AS8BYAG7 - Af8BMgFjAb8B/wE1AWYBwwH/AScBXQHCAf8BWgGBAdMJ/wE7AXAB1AH/ATgBbgHVAf8BQwF2AdYB/wFF - AXgB1wH/AUYBegHYAf8BRwF7AdkB/wFJAXwB2gH/AUoBfQHbAf8BSgF+AdsB/wFLAX4B3AH/AUsBfwHc - Af8BSwF/AdwB/wEUAUgBtgH//wCBAAEfAVABtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BdwGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDwE5AaIB/wEqAVsBtAH/AS0BXgG4Af8BMAFhAbwB/wEy - AWQBwAH/AS4BYwHEAf8BHgFZAcQF/wG4AckB7wH/ARABTwHJAf8BOwFtAdIB/wFAAXQB1AH/AUIBdQHV - Af8BQwF3AdYB/wFFAXgB1wH/AUYBeQHYAf8BRwF6AdkB/wFHAXsB2QH/AUgBfAHaAf8BSAF8AdoB/wFH - AXoB2QH/ARQBSAG1Af//AIEAARoBTQG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGB - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEPATABmwH/ASgBWQGwAf8BKwFcAbUB/wEtAV8BuQH/ - ATABYQG9Af8BJgFbAcEB/wE+AW4ByAn/AXEBhwHeAf8BLAFiAdEB/wE+AXEB0wH/AT8BcwHTAf8BQQF0 - AdUB/wFCAXUB1QH/AUMBdgHWAf8BRAF3AdcB/wFFAXgB1wH/AUUBeQHYAf8BRgF5AdgB/wFCAXYB1gH/ - ARMBRwG2Af//AIEAARQBQgGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AYABigHAAf8BXgGAAbUB/wHIAdIB6AX/ATkBYgGuAf8BDwFEAaUB/wEpAVkBsQH/ASsBXAG1Af8BJAFb - AbkB/wEPAUIBsQH/AbkBxQHsDf8BIgFbAcgB/wE7AW8B0QH/AT0BcAHSAf8BPgFyAdMB/wE/AXMB0wH/ - AUABdAHUAf8BQQF1AdUB/wFCAXUB1QH/AUIBdgHWAf8BQwF2AdYB/wE9AXEB0gH/ARMBQQGiAf//AIEA - ARMBQAGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BdQGE - Ab4B/wG3AcYB4wn/AUIBaQG0Af8BDwEvAZsB/wEPATkBogH/AQ8BOwGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUYBdgHLAf8BawGCAdUB/wEoAV0BxgH/ATgBbAHOAf8BOgFuAdAB/wE7AW8B0QH/ATwBcAHSAf8BPQFx - AdIB/wE+AXIB0wH/AT8BcgHTAf8BPwFzAdMB/wFAAXMB1AH/ATgBbAHPAf8BEwFAAZ8B//8AgQABEgE6 + ASADAAEBAQABIAYAAUAqAAEUATIBewH/ARUBOAGBAf8BFQE8AYgB/wEWAUIBmQH/ARYBQwGfAf8BFgFJ + AbAB/wEWAUsBtgH/ARcBSwG2Af8BFwFLAbYB/wEXAUsBtgH/ARcBSwG2Af8BFwFLAbYB/wEXAUsBtgH/ + ARcBSwG2Af8BFgFHAaoB/wEWAUMBnwH/ARYBQQGWAf8BFQE8AYgB/wEVATYBgQH/ARQBMQF4Af//AKEA + ARYBQAGTAf8BGQFMAbYB/wEeAVIBuAH/ASIBVgG7Af8BJwFaAb8B/wErAV8BwwH/ATABYwHHAf8BNQFo + AcoB/wE5AW0BzgH/AT4BcgHRAf8BQwF2AdQB/wFHAXsB1wH/AUsBfwHaAf8BTgGBAdwB/wFRAYEB3gH/ + AVUBgQHgAf8BVgGBAeEB/wFXAYEB4gH/AVcBgQHiAf8BVgGBAeEB/wFUAYEB4AH/AVEBgQHeAf8BTAGA + AdoB/wFHAXoB1gH/AT8BcwHRAf8BNgFqAcsB/wEgAVQBvAH/ARYBPwGQAf//AI0AARYBQQGWAf8BHQFP + AbMB/wEoAVoBtwH/ASwBXgG8Af8BLwFiAcEB/wEyAWUBxQH/ATUBaQHJAf8BOAFsAc0B/wE7AW8BzwH/ + AT8BcgHRAf8BQgF1AdMB/wFFAXgB1QH/AUgBewHXAf8BSwF/AdoB/wFOAYEB3AH/AVEBgQHeAf8BVAGB + AeAB/wFXAYEB4gH/AVsBgQHkAf8BXgGBAeYB/wFhAYIB6QH/AWQBhQHrAf8BZwGIAe0B/wFqAYsB7wH/ + AW0BjgHxAf8BcAGSAfMB/wFzAZQB9QH/AXMBlAH1Af8BOgFtAc4B/wEVAUABkwH//wCJAAEYAUsBswH/ + ASQBVgGwAf8BKAFaAbUB/wErAV0BugH/AS8BYQG/Af8BMgFkAcMB/wE1AWgByAH/ATgBbAHMAf8BOwFv + Ac8B/wE+AXIB0QH/AUEBdQHTAf8BRQF4AdUB/wFIAXsB1wH/AUsBfgHZAf8BTgGBAdwB/wFRAYEB3gH/ + AVQBgQHgAf8BVwGBAeIB/wFaAYEB5AH/AV0BgQHmAf8BYQGCAegB/wFkAYUB6gH/AWcBiAHsAf8BagGL + Ae8B/wFtAY4B8QH/AXABkQHzAf8BcwGUAfUB/wF2AZcB9wH/AXUBlgH2Af8BIgFWAb4B//8AiQABGwFN + Aa8B/wEkAVUBrgH/ASgBWQGzAf8BKwFdAbgB/wEuAWABvQH/ATEBZAHBAf8BNAFnAcYB/wE4AWsBygH/ + ATsBbgHOAf8BPgFxAdAB/wFBAXUB0wH/AUQBeAHVAf8BRwF7AdcB/wFKAX4B2QH/AU0BgQHbAf8BUAGB + Ad0B/wFUAYEB3wH/AVcBgQHhAf8BWgGBAeQB/wFdAYEB5gH/AWABgQHoAf8BYwGEAeoB/wFmAYcB7AH/ + AWkBigHuAf8BbAGNAfAB/wFvAZAB8gH/AXEBkwH0Af8BcwGUAfUB/wF0AZUB9gH/ATsBbwHOAf//AIkA + ARwBTgGsAf8BJAFUAawB/wEnAVgBsQH/ASsBXAG2Af8BLgFfAbsB/wExAWMBvwH/ATQBZgHEAf8BNwFq + AcgB/wE6AW4BzQH/AT0BcQHQAf8BQAF0AdIB/wFEAXcB1AH/AUcBegHWAf8BSgF9AdkB/wFNAYAB2wH/ + AVABgQHdAf8BUwGBAd8B/wFWAYEB4QH/AVkBgQHjAf8BXAGBAeUB/wFfAYEB5wH/AWIBgwHpAf8BZQGG + AesB/wFoAYkB7QH/AWoBjAHvAf8BbQGOAfEB/wFvAZAB8gH/AXEBkgHzAf8BcQGTAfQB/wFEAXgB1QH/ + /wCFAAEVATUBgQH/AR0BTQGpAf8BIwFTAakB/wEmAVcBrwH/ASkBWwG0Af8BLQFeAbkB/wEwAWIBvQH/ + ATMBZgHCAf8BNgFpAcYB/wE5AWwBywH/AT0BcAHPAf8BQAFzAdIB/wFDAXYB1AH/AUYBeQHWAf8BSQF8 + AdgB/wFMAX8B2gH/AU8BgQHcAf8BSwF/Ad4B/wE9AXUB2wH/AU8BgQHfAf8BQwF9Ad8B/wFVAYEB5wH/ + AXABjgHrAf8BVAGBAeoB/wFmAYcB7AH/AWkBigHuAf8BawGMAe8B/wFtAY4B8QH/AW4BjwHxAf8BbgGQ + AfIB/wFLAX8B2gH/ARUBNQGBAf//AIEAARUBOgGCAf8BIQFQAacB/wEiAVIBpwH/ASUBVgGsAf8BKQFa + AbIB/wEsAV0BtwH/ATABYQG7Af8BMwFlAcAB/wE2AWgBxAH/ATkBbAHJAf8BPAFvAc0B/wE/AXIB0QH/ + AUIBdQHTAf8BRQF4AdUB/wFIAXsB1wH/AUsBfgHZAf8BTgGBAdsB/wFCAXgB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BZgGGAesB/wFeAYEB6wH/AWYBiAHsAf8BaAGKAe4B/wFqAYsB7wH/AWsBjAHvAf8BawGN + AfAB/wFRAYEB3gH/ARUBOgGCAf//AIEAARUBPgGNAf8BSgFxAbMB/wE7AWUBrgH/ASYBVQGqAf8BKAFY + Aa8B/wErAVwBtAH/AS8BYAG5Af8BMgFjAb4B/wE1AWcBwgH/ATgBagHHAf8BOwFuAcsB/wE+AXEBzwH/ + AUEBdAHSAf8BRAF3AdUB/wFHAXoB1wH/AUoBfQHZAf8BRgF7AdsB/wEkAWUB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BQAF9AeYB/wFYAYEB6wH/AWYBhwHsAf8BZwGIAe0B/wFoAYkB7QH/AWkBigHuAf8BVgGB + AeEB/wEVAT4BjgH//wCBAAEWAUMBnwH/AVkBfAG1Af8BVgF6AbYB/wFFAW4BtAH/ASEBUwGtAf8BKgFb + AbIB/wEtAV4BtwH/ATEBYgG7Af8BNAFlAcAB/wE3AWkBxAH/AToBbAHJAf8BPQFwAc0B/wFAAXMB0QH/ + AUIBdgHUAf8BRgF5AdYB/wE+AXYB1wH/AUkBegHdAf8BdgGLAecF/wFjAYIB4wH/AS8BbAHbAf8BMAFu + Ad0B/wGJAakB7wn/AXoBlgHsAf8BXwGEAeoB/wFkAYYB6wH/AWUBhwHsAf8BZgGHAewB/wFZAYEB4wH/ + ARYBQwGfAf//AIEAARcBRQGkAf8BbwGBAbsB/wFdAYABtwH/AVcBfAG4Af8BSQFzAbUB/wEjAVQBrwH/ + ASwBXQG0Af8BLwFgAbkB/wEzAWQBvgH/ATYBZwHCAf8BOQFrAcYB/wE7AW4BygH/AT4BcQHOAf8BQQF1 + AdIB/wFEAXgB1QH/ATYBbQHSAf8B2wHlAfUF/wG/AdIB9QH/ATIBbQHYAf8BVAGBAeAB/wFXAYEB4QH/ + ATEBbwHfAf8C/gH9Af8B5AHqAfwB/wFkAYcB6gH/AWABggHoAf8BYgGDAekB/wFiAYQB6gH/AWMBhAHq + Af8BWwGBAeQB/wEWAUUBpQH//wCBAAEbAU0BtQH/AYEBigHCAf8BZQGBAbkB/wFeAYEBuQH/AV8BgAG+ + Af8BPwFqAbUB/wEnAVcBsQH/AS4BXwG2Af8BMQFiAbsB/wE0AWYBwAH/ATEBYQHEAf8BIgFaAcIB/wEw + AWYBygH/ATQBaQHQAf8BQgF2AdMB/wEtAWgB1gH/AYMBowHmBf8BrwHHAe8B/wEzAW4B2QH/AVIBgQHe + Af8BVQGBAeAB/wE0AW8B2wH/AfQB+AH9Af8BWwGBAeoB/wFIAYEB5QH/AV4BgQHmAf8BXwGBAecB/wFf + AYEB6AH/AWABgQHoAf8BWwGBAeUB/wEWAUsBtgH//wCBAAEeAVABtQH/AYMBmQHIAf8BawGBAboB/wFm + AYEBugH/AWABgQG7Af8BYAGBAb8B/wEhAVYBsAH/ASwBXQG0Af8BLwFhAbgB/wEzAWQBvQH/ASABVwG7 + Af8ByAHUAfEF/wESAUwBwQH/AR0BWgHJAf8BdQGJAd8B/wFlAYEB3gH/ATMBbgHUBf8BLQFoAdYB/wE2 + AW4B2QH/ATQBbwHaAf8BUQGBAeIF/wHUAeEB9AH/AU8BgQHjAf8BWwGBAeQB/wFcAYEB5QH/AV0BgQHm + Af8BXQGBAeYB/wFbAYEB5QH/ARcBSwG1Af//AIEAASEBUgG1Af8BlAGmAc4B/wFyAYEBuwH/AW0BgQG7 + Af8BZwGBAbwB/wFoAYEBwAH/AUABZgG0Af8BFwFMAasB/wE0AWMBuQH/ARIBQwGsAf8BEgE2Aa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFEAXwB4gH/AVgBgQHi + Af8BWQGBAeMB/wFaAYEB4wH/AVoBgQHkAf8BWgGBAeQB/wEXAUsBtgH//wCBAAEkAVUBtgH/AaMBswHU + Af8BeQGCAbwB/wF0AYEBvQH/AW4BgQG9Af8BawGBAb0B/wFUAXsBugH/AR8BUAGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATsBcQHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEhAWMB1wH/AUEBeQHfAf8BTAGAAd8B/wFV + AYEB4AH/AVYBgQHhAf8BVwGBAeEB/wFXAYEB4gH/AVcBgQHiAf8BFwFLAbYB//8AgQABJgFWAbcB/wGy + Ab8B2gH/AX8BhwG8Af8BewGEAb4B/wF1AYEBvgH/AW8BgQG/Af8BcAGBAcIB/wElAVUBrA3/AZYBrgHg + Af8BKwFdAb4B/wESAUkBvAH/AVABfQHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BSwF/AdcB/wFN + AX8B2AH/Ae0B8wH9Af8BYQGBAeEB/wFEAXoB2wH/AVABgQHdAf8BUQGBAd4B/wFSAYEB3wH/AVMBgQHf + Af8BVAGBAeAB/wFUAYEB4AH/AVQBgQHgAf8BGAFMAbYB//8AgQABJgFWAbcB/wHAAcsB4QH/AYEBjAG+ + Af8BgQGJAb8B/wF8AYYBvwH/AXYBgQHAAf8BdwGEAcAB/wESATsBmQH/AZIBqAHXBf8BfgGLAdEB/wES + AUgBrQH/ASsBXwG/Af8BMwFkAcIB/wEqAWEBwQH/ARIBTgHDAf8B5wHvAfoJ/wHiAeoB9wH/ASoBZAHP + Af8BNgFwAdcB/wE9AXUB2QH/AUwBfwHaAf8BTQGBAdsB/wFOAYEB3AH/AVABgQHdAf8BUAGBAd0B/wFR + AYEB3gH/AVEBgQHeAf8BUQGBAd4B/wEXAUsBtgH//wCBAAElAVUBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AYEBiwHBAf8BfQGHAcEB/wF2AYIBvgH/AUkBdAGxCf8BEgE3AaIB/wEnAWEBtwH/ATIBYwG7 + Af8BNQFmAb8B/wE4AWkBwwH/ASoBYAHCAf8BXQGBAdMJ/wE+AXMB1AH/ATsBcQHVAf8BRgF5AdYB/wFI + AXsB1wH/AUkBfQHYAf8BSgF+AdkB/wFMAX8B2gH/AU0BgAHbAf8BTQGBAdsB/wFOAYEB3AH/AU4BgQHc + Af8BTgGBAdwB/wEXAUsBtgH//wCBAAEiAVMBtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BegGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BEgE8AaIB/wEtAV4BtAH/ATABYQG4Af8BMwFkAbwB/wE1 + AWcBwAH/ATEBZgHEAf8BIQFcAcQF/wG4AckB7wH/ARMBUgHJAf8BPgFwAdIB/wFDAXcB1AH/AUUBeAHV + Af8BRgF6AdYB/wFIAXsB1wH/AUkBfAHYAf8BSgF9AdkB/wFKAX4B2QH/AUsBfwHaAf8BSwF/AdoB/wFK + AX0B2QH/ARcBSwG1Af//AIEAAR0BUAG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGB + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wESATMBmwH/ASsBXAGwAf8BLgFfAbUB/wEwAWIBuQH/ + ATMBZAG9Af8BKQFeAcEB/wFBAXEByAn/AXQBhwHeAf8BLwFlAdEB/wFBAXQB0wH/AUIBdgHTAf8BRAF3 + AdUB/wFFAXgB1QH/AUYBeQHWAf8BRwF6AdcB/wFIAXsB1wH/AUgBfAHYAf8BSQF8AdgB/wFFAXkB1gH/ + ARYBSgG2Af//AIEAARcBRQGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AYEBigHAAf8BYQGBAbUB/wHIAdIB6AX/ATwBZQGuAf8BEgFHAaUB/wEsAVwBsQH/AS4BXwG1Af8BJwFe + AbkB/wESAUUBsQH/AbkBxQHsDf8BJQFeAcgB/wE+AXIB0QH/AUABcwHSAf8BQQF1AdMB/wFCAXYB0wH/ + AUMBdwHUAf8BRAF4AdUB/wFFAXgB1QH/AUUBeQHWAf8BRgF5AdYB/wFAAXQB0gH/ARYBRAGiAf//AIEA + ARYBQwGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BeAGE + Ab4B/wG3AcYB4wn/AUUBbAG0Af8BEgEyAZsB/wESATwBogH/ARIBPgGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUkBeQHLAf8BbgGCAdUB/wErAWABxgH/ATsBbwHOAf8BPQFxAdAB/wE+AXIB0QH/AT8BcwHSAf8BQAF0 + AdIB/wFBAXUB0wH/AUIBdQHTAf8BQgF2AdMB/wFDAXYB1AH/ATsBbwHPAf8BFgFDAZ8B//8AgQABFQE9 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BDwEtAasB/wEfAVYBvQH/ASsBXwHFAf8BNAFnAcgB/wE2AWkBywH/ATcBawHOAf8BOAFs - Ac8B/wE5AW0B0AH/AToBbgHQAf8BOwFvAdEB/wE8AXAB0QH/ATwBcAHSAf8BPQFwAdIB/wEzAWcBywH/ - ARIBOgGLAf//AIEAARIBNwGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AW0BgQG8Af8BDwEbAYUB/wHrAfAB9Qn/AakBuwHhCf8BbwGC - Ac4B/wEnAVoBvQH/ATABYgHBAf8BMgFkAcUB/wEzAWYByAH/ATQBaAHLAf8BNgFpAc0B/wE3AWoBzgH/ - ATgBawHOAf8BOAFsAc8B/wE5AW0BzwH/ATkBbQHQAf8BOgFuAdAB/wEuAWEBxwH/ARIBNwGBAf//AIEA - AREBMQF9Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BewGHAcQB/wHQAdwB7QX/AT8BaQGwAf8BDwEgAZUB/wETAUkBqQH/ - AakBuAHhAf8BEAFGAa0B/wEbAVIBswH/AScBWQG9Af8BKAFbAcEB/wEqAWMBxAH/ATIBZQHHAf8BMwFm - AcoB/wE0AWgBzAH/ATUBaAHMAf8BNgFpAc0B/wE2AWoBzQH/ATcBagHNAf8BNwFqAc4B/wEpAVwBxAH/ - ARIBMQF9Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AYABjQHIAf8BcAGC - AcEB/wFmAYEBwwH/AVwBgQHEAf8BXgGBAcUB/wFgAYEBxQH/AVsBgQHGAf8BVgF/AcYB/wFMAXkByQH/ - AUQBcgHJAf8BPwFvAcsB/wE6AWwBywH/ATUBaAHLAf8BMwFmAcsB/wEzAWcBywH/ATQBZwHMAf8BNAFo - AcwB/wEkAVcBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BEgEwAasB/wEiAVkBvQH/AS4BYgHFAf8BNwFqAcgB/wE5AWwBywH/AToBbgHOAf8BOwFv + Ac8B/wE8AXAB0AH/AT0BcQHQAf8BPgFyAdEB/wE/AXMB0QH/AT8BcwHSAf8BQAFzAdIB/wE2AWoBywH/ + ARUBPQGLAf//AIEAARUBOgGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AXABgQG8Af8BEgEeAYUB/wHrAfAB9Qn/AakBuwHhCf8BcgGC + Ac4B/wEqAV0BvQH/ATMBZQHBAf8BNQFnAcUB/wE2AWkByAH/ATcBawHLAf8BOQFsAc0B/wE6AW0BzgH/ + ATsBbgHOAf8BOwFvAc8B/wE8AXABzwH/ATwBcAHQAf8BPQFxAdAB/wExAWQBxwH/ARUBOgGBAf//AIEA + ARQBNAGAAf8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BfgGHAcQB/wHQAdwB7QX/AUIBbAGwAf8BEgEjAZUB/wEWAUwBqQH/ + AakBuAHhAf8BEwFJAa0B/wEeAVUBswH/ASoBXAG9Af8BKwFeAcEB/wEtAWYBxAH/ATUBaAHHAf8BNgFp + AcoB/wE3AWsBzAH/ATgBawHMAf8BOQFsAc0B/wE5AW0BzQH/AToBbQHNAf8BOgFtAc4B/wEsAV8BxAH/ + ARUBNAGAAf//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AYEBjQHIAf8BcwGC + AcEB/wFpAYEBwwH/AV8BgQHEAf8BYQGBAcUB/wFjAYEBxQH/AV4BgQHGAf8BWQGBAcYB/wFPAXwByQH/ + AUcBdQHJAf8BQgFyAcsB/wE9AW8BywH/ATgBawHLAf8BNgFpAcsB/wE2AWoBywH/ATcBagHMAf8BNwFr + AcwB/wEnAVoBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AYEBiwHGAf8BewGHAcYB/wFxAYIBxwH/AWsBgQHHAf8BZQGBAccB/wFfAYEBxwH/AVkBgAHIAf8BUwF8 - AcgB/wFNAXgByQH/AUcBdAHKAf8BQQFwAcoB/wE6AWsBywH/ATQBZwHKAf8BMQFkAckB/wExAWUBygH/ - ATEBZQHKAf8BHwFTAb0B//8AiQABawGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AYEBiwHGAf8BfgGHAcYB/wF0AYIBxwH/AW4BgQHHAf8BaAGBAccB/wFiAYEBxwH/AVwBgQHIAf8BVgF/ + AcgB/wFQAXsByQH/AUoBdwHKAf8BRAFzAcoB/wE9AW4BywH/ATcBagHKAf8BNAFnAckB/wE0AWgBygH/ + ATQBaAHKAf8BIgFWAb0B//8AiQABbgGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGBAZAByAH/AX4BiwHHAf8BeAGHAccB/wFxAYIBxwH/AWsBgQHHAf8BZAGBAccB/wFeAYEBxwH/ - AVgBfwHIAf8BUgF7AcgB/wFMAXcByQH/AUUBcgHJAf8BPwFuAcoB/wE4AWkBygH/ATIBZQHJAf8BLgFi - AcgB/wEuAWIByAH/ARoBTgG6Af//AIkAASoBWQG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AYEBiwHHAf8BewGHAccB/wF0AYIBxwH/AW4BgQHHAf8BZwGBAccB/wFhAYEBxwH/ + AVsBgQHIAf8BVQF+AcgB/wFPAXoByQH/AUgBdQHJAf8BQgFxAcoB/wE7AWwBygH/ATUBaAHJAf8BMQFl + AcgB/wExAWUByAH/AR0BUQG6Af//AIkAAS0BXAG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AX4BiwHHAf8BdwGGAccB/wFxAYIBxwH/AWoBgQHHAf8BZAGB - AccB/wFeAYEBxwH/AVcBfgHHAf8BUQF6AcgB/wFKAXYByAH/AUQBcQHIAf8BPQFsAckB/wE2AWgByAH/ - ATABYgHHAf8BKQFdAcQB/wEUAUcBswH//wCJAAERATQBgQH/AWkBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AYEBiwHHAf8BegGGAccB/wF0AYIBxwH/AW0BgQHHAf8BZwGB + AccB/wFhAYEBxwH/AVoBgQHHAf8BVAF9AcgB/wFNAXkByAH/AUcBdAHIAf8BQAFvAckB/wE5AWsByAH/ + ATMBZQHHAf8BLAFgAcQB/wEXAUoBswH//wCJAAEUATcBgQH/AWwBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGBAYwBxQH/AXwBiQHGAf8BdwGGAccB/wFwAYEBxwH/ - AWkBgQHGAf8BYwGBAcYB/wFdAYEBxgH/AVYBfQHHAf8BUAF4AccB/wFJAXQBxwH/AUIBbwHIAf8BOwFr - AcgB/wExAWIBxQH/ARkBTQG5Af8BEQEwAXsB//8AjQABEgE0AYEB/wEnAVcBugH/AWMBgQHMAf8BgQGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGBAYwBxQH/AX8BiQHGAf8BegGGAccB/wFzAYEBxwH/ + AWwBgQHGAf8BZgGBAcYB/wFgAYEBxgH/AVkBgAHHAf8BUwF7AccB/wFMAXcBxwH/AUUBcgHIAf8BPgFu + AcgB/wE0AWUBxQH/ARwBUAG5Af8BFAEzAX4B//8AjQABFQE3AYEB/wEqAVoBugH/AWYBgQHMAf8BgQGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfwGN - AcwB/wFtAYEByQH/AVoBgAHFAf8BRwFxAcIB/wE8AWgBwAH/ATEBYAG+Af8BKAFZAb0B/wEgAVIBugH/ - ARUBSQG2Af8BEQExAX4B//8ApQABEgEzAYEB/wESATkBiAH/ARMBPgGWAf8BEwFAAZ8B/wETAUUBrQH/ - ARQBSAG2Af8BEwFIAbYB/wEWAUkBtgH/ARcBSgG2Af8BFwFKAbYB/wEVAUgBtgH/ARMBSAG2Af8BFAFI - AbYB/wETAUMBpwH/ARMBQAGfAf8BEwE8AZAB/wESATgBhQH/ARIBMgGAAf//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BgQGN + AcwB/wFwAYEByQH/AV0BgQHFAf8BSgF0AcIB/wE/AWsBwAH/ATQBYwG+Af8BKwFcAb0B/wEjAVUBugH/ + ARgBTAG2Af8BFAE0AYEB//8ApQABFQE2AYEB/wEVATwBiAH/ARYBQQGWAf8BFgFDAZ8B/wEWAUgBrQH/ + ARcBSwG2Af8BFgFLAbYB/wEZAUwBtgH/ARoBTQG2Af8BGgFNAbYB/wEYAUsBtgH/ARYBSwG2Af8BFwFL + AbYB/wEWAUYBpwH/ARYBQwGfAf8BFgE/AZAB/wEVATsBhQH/ARUBNQGBAf//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL </value> </data> + <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>122, 17</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-03-24 14:12:27
|
Revision: 219 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=219&view=rev Author: and-81 Date: 2007-03-24 06:47:34 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs Modified: trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-24 13:38:10 UTC (rev 218) +++ trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-24 13:47:34 UTC (rev 219) @@ -97,7 +97,7 @@ TvBusinessLayer layer = new TvBusinessLayer(); - RunAtStart = Convert.ToBoolean(layer.GetSetting("ComSkipLauncher_RunAtStart", "False").Value); + RunAtStart = Convert.ToBoolean(layer.GetSetting("ComSkipLauncher_RunAtStart", "True").Value); Program = layer.GetSetting("ComSkipLauncher_Program", ComSkipLauncher.DefaultProgram).Value; Parameters = layer.GetSetting("ComSkipLauncher_Parameters", ComSkipLauncher.DefaultParameters).Value; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-03-24 13:38:14
|
Revision: 218 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=218&view=rev Author: and-81 Date: 2007-03-24 06:38:10 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Removed Paths: ------------- trunk/plugins/ComSkipLauncher TVE2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-24 12:57:03
|
Revision: 217 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=217&view=rev Author: dukus Date: 2007-03-24 05:56:46 -0700 (Sat, 24 Mar 2007) Log Message: ----------- First attempt to implement a support for DVDProfiler Modified Paths: -------------- trunk/plugins/MyFilms/MesFilms.cs trunk/plugins/MyFilms/MesFilms.csproj trunk/plugins/MyFilms/MesFilms.suo trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs trunk/plugins/MyFilms/MesFilmsSetup.cs Added Paths: ----------- trunk/plugins/MyFilms/CatalogConverter.cs Added: trunk/plugins/MyFilms/CatalogConverter.cs =================================================================== --- trunk/plugins/MyFilms/CatalogConverter.cs (rev 0) +++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-24 12:56:46 UTC (rev 217) @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.IO; +using System.Xml; + +namespace MesFilms +{ + class CatalogConverter + { + public Dictionary<string, string> ProfilerDict; + + public CatalogConverter() + { + ProfilerDict = new Dictionary<string, string>(); + ProfilerDict.Add("Title", "OriginalTitle"); + ProfilerDict.Add("SortTitle", "TranslatedTitle"); + ProfilerDict.Add("SortTitle1", "FormattedTitle"); + ProfilerDict.Add("CollectionNumber", "Number"); + ProfilerDict.Add("Rating", "Rating"); + ProfilerDict.Add("Year", "Year"); + ProfilerDict.Add("RunningTime", "Length"); + ProfilerDict.Add("Actors", "Actors"); + ProfilerDict.Add("Genres", "Category"); + ProfilerDict.Add("Credits", "Director"); + ProfilerDict.Add("Overview", "Description"); + ProfilerDict.Add("Picture", "Picture"); + } + + public string ConvertProfiler(string source) + { + string destFile = Path.GetTempPath()+@"\"+"AntTempFile.xml"; + XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default); + destXml.Formatting = Formatting.Indented; + destXml.WriteStartDocument(); + //destXml.WriteStartElement("AntMovieCatalog"); + //destXml.WriteAttributeString("Format","35"); + //destXml.WriteAttributeString("Version", "3.5.0 (2005-05-29)"); + //destXml.WriteAttributeString("Date", "5/4/2006 7:25:51 PM"); + //destXml.WriteEndElement(); + destXml.WriteStartElement("Catalog"); + destXml.WriteElementString("Properties", ""); + destXml.WriteStartElement("Contents"); + try + { + XmlDocument doc = new XmlDocument(); + doc.Load(source); + XmlNodeList dvdList = doc.DocumentElement.SelectNodes("/Collection/DVD"); + foreach (XmlNode nodeDVD in dvdList) + { + destXml.WriteStartElement("Movie"); + XmlNode nodeID = nodeDVD.SelectSingleNode("ID"); + XmlNode nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber"); + XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title"); + XmlNode nodeRating = nodeDVD.SelectSingleNode("Rating"); + XmlNode nodeYear = nodeDVD.SelectSingleNode("ProductionYear"); + XmlNode nodeDuration = nodeDVD.SelectSingleNode("RunningTime"); + XmlNode nodeOverview = nodeDVD.SelectSingleNode("Overview"); + + string genre = String.Empty; + XmlNodeList genreList = nodeDVD.SelectNodes("Genres/Genre"); + foreach (XmlNode nodeGenre in genreList) + { + if (genre.Length > 0) genre += " / "; + genre += nodeGenre.InnerText; + } + string cast = String.Empty; + XmlNodeList actorsList = nodeDVD.SelectNodes("Actors/Actor"); + foreach (XmlNode nodeActor in actorsList) + { + string firstname = String.Empty; + string lastname = String.Empty; + string role = String.Empty; + XmlNode nodeFirstName = nodeActor.SelectSingleNode("FirstName"); + XmlNode nodeLastName = nodeActor.SelectSingleNode("LastName"); + XmlNode nodeRole = nodeActor.SelectSingleNode("Role"); + if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText; + if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText; + if (nodeRole != null && nodeRole.InnerText != null) role = nodeRole.InnerText; + string line = String.Format("{0} {1} as {2}\n", firstname, lastname, role); + cast += line; + } + + string credits = String.Empty; + XmlNodeList creditsList = nodeDVD.SelectNodes("Credits/Credit"); + foreach (XmlNode nodeCredit in creditsList) + { + string firstname = String.Empty; + string lastname = String.Empty; + XmlNode nodeFirstName = nodeCredit.SelectSingleNode("FirstName"); + XmlNode nodeLastName = nodeCredit.SelectSingleNode("LastName"); + XmlNode nodeType = nodeCredit.SelectSingleNode("CreditSubtype"); + if (nodeType != null && nodeType.InnerText != null && nodeType.InnerText == "Director") + { + if (credits.Length > 0) credits += " / "; + if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText; + if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText; + credits += String.Format("{0} {1}", firstname, lastname); + } + } + //rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg"; + if (nodeNumber != null && nodeNumber.InnerText != null) + WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText); + else + WriteAntAtribute(destXml, "CollectionNumber", nodeNumber.InnerText); + WriteAntAtribute(destXml, "Title", nodeTitle.InnerText); + WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText); + WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText); + WriteAntAtribute(destXml, "Rating","0" ); + WriteAntAtribute(destXml, "Year", nodeYear.InnerText); + WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText); + WriteAntAtribute(destXml, "Genres", genre); + WriteAntAtribute(destXml, "Credits", credits); + WriteAntAtribute(destXml, "Actors", cast); + WriteAntAtribute(destXml, "Picture", nodeID.InnerText.Trim() + "f.jpg"); + if (nodeOverview != null && nodeOverview.InnerText != null) + WriteAntAtribute(destXml, "Overview", nodeOverview.InnerText); + else + WriteAntAtribute(destXml, "Overview", ""); + + destXml.WriteEndElement(); + } + + } + catch + { + return""; + } + destXml.WriteEndElement(); + destXml.WriteEndElement(); + destXml.Close(); + return destFile; + } + + private void WriteAntAtribute(XmlTextWriter tw,string key, string value) + { + string at=""; + if (ProfilerDict.TryGetValue(key, out at)) + { + tw.WriteAttributeString(at, value); + } + } + } + +} Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-03-24 10:39:53 UTC (rev 216) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-24 12:56:46 UTC (rev 217) @@ -1111,6 +1111,15 @@ StrViewItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewItem2", ""); StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", ""); StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", ""); + switch (xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "")) + { + case "0": + break; + case "1": + CatalogConverter cv = new CatalogConverter(); + StrFileXml = cv.ConvertProfiler(StrFileXml); + break; + } StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", ""); StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", ""); StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", ""); Modified: trunk/plugins/MyFilms/MesFilms.csproj =================================================================== --- trunk/plugins/MyFilms/MesFilms.csproj 2007-03-24 10:39:53 UTC (rev 216) +++ trunk/plugins/MyFilms/MesFilms.csproj 2007-03-24 12:56:46 UTC (rev 217) @@ -63,6 +63,7 @@ <DependentUpon>AntMovieCatalog.xsd</DependentUpon> </Compile> <Compile Include="AssemblyInfo.cs" /> + <Compile Include="CatalogConverter.cs" /> <Compile Include="CString.cs" /> <Compile Include="MesFilms.cs" /> <Compile Include="MesFilmsDetail.cs" /> Modified: trunk/plugins/MyFilms/MesFilms.suo =================================================================== (Binary files differ) Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-24 10:39:53 UTC (rev 216) +++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-24 12:56:46 UTC (rev 217) @@ -155,6 +155,8 @@ this.Config_Name = new System.Windows.Forms.ComboBox(); this.label12 = new System.Windows.Forms.Label(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.label13 = new System.Windows.Forms.Label(); + this.CatalogType = new System.Windows.Forms.ComboBox(); this.ButSave = new System.Windows.Forms.Button(); this.groupBox8 = new System.Windows.Forms.GroupBox(); this.View_Dflt_Item = new System.Windows.Forms.ComboBox(); @@ -176,9 +178,9 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(7, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(144, 13); + this.label1.Size = new System.Drawing.Size(93, 13); this.label1.TabIndex = 0; - this.label1.Text = "Ant Movie Catalog File (XML)"; + this.label1.Text = "Catalog File (XML)"; // // MesFilmsCat // @@ -223,9 +225,9 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(7, 48); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(119, 13); + this.label2.Size = new System.Drawing.Size(100, 13); this.label2.TabIndex = 3; - this.label2.Text = "Ant Picture Path (IMG) "; + this.label2.Text = "Picture Path (IMG) "; // // ButQuit // @@ -741,6 +743,8 @@ // // groupBox7 // + this.groupBox7.Controls.Add(this.label13); + this.groupBox7.Controls.Add(this.CatalogType); this.groupBox7.Controls.Add(this.ButSave); this.groupBox7.Controls.Add(this.groupBox8); this.groupBox7.Controls.Add(this.ButDelet); @@ -772,6 +776,28 @@ this.groupBox7.TabStop = false; this.groupBox7.Text = "Config Infos"; // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(490, 22); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(70, 13); + this.label13.TabIndex = 42; + this.label13.Text = "Catalog Type"; + // + // CatalogType + // + this.CatalogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CatalogType.FormattingEnabled = true; + this.CatalogType.Items.AddRange(new object[] { + "Ant Movie Catalog", + "DVD Profiler"}); + this.CatalogType.Location = new System.Drawing.Point(566, 21); + this.CatalogType.Name = "CatalogType"; + this.CatalogType.Size = new System.Drawing.Size(235, 21); + this.CatalogType.TabIndex = 41; + this.CatalogType.SelectedIndexChanged += new System.EventHandler(this.CatalogType_SelectedIndexChanged); + // // ButSave // this.ButSave.Location = new System.Drawing.Point(496, 432); @@ -934,6 +960,8 @@ private ComboBox AntFilterComb; private ComboBox AntFilterSign2; private TextBox TitleDelim; + private Label label13; + private ComboBox CatalogType; } } \ No newline at end of file Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-24 10:39:53 UTC (rev 216) +++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-24 12:56:46 UTC (rev 217) @@ -53,7 +53,7 @@ AntItem1.Items.Add("(none)"); AntItem2.Items.Add("(none)"); AntItem3.Items.Add("(none)"); - + CatalogType.SelectedIndex = 0; foreach (DataColumn dc in ds.Movie.Columns) { // if (dc.Expression.Equals("")) @@ -272,7 +272,7 @@ if (MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", "") == Config_Name.Text) MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config"); } - + MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "CatalogType", CatalogType.SelectedIndex.ToString()); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntCatalog", MesFilmsCat.Text.ToString()); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntPicture", MesFilmsImg.Text.ToString()); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntStorage", AntStorage.Text.ToString()); @@ -355,6 +355,7 @@ private void Config_Name_SelectedIndexChanged(object sender, EventArgs e) { Refresh_Items(); + CatalogType.SelectedIndex = Convert.ToInt16(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CatalogType", "0")); MesFilmsCat.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntCatalog", ""); MesFilmsImg.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntPicture", ""); AntStorage.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntStorage", ""); @@ -402,6 +403,7 @@ } private void Refresh_Items() { + CatalogType.SelectedIndex = 0; MesFilmsCat.ResetText(); MesFilmsImg.ResetText(); AntStorage.ResetText(); @@ -465,6 +467,7 @@ MessageBoxIcon.Question); if (dialogResult == DialogResult.Yes) { + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CatalogType"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntCatalog"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage"); @@ -573,9 +576,17 @@ if (reader != null) { reader.Close(); - - mydivx.ReadXml(MesFilmsCat.Text); - + + switch (CatalogType.SelectedIndex) + { + case 0: + mydivx.ReadXml(MesFilmsCat.Text); + break; + case 1: + CatalogConverter cc = new CatalogConverter(); + mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text)); + break; + } DataRow[] movies = mydivx.Movie.Select(StrDfltSelect + AntTitle1.Text + " not like ''"); if (mydivx.Movie.Count > 0) if (movies.Length > 0) @@ -604,5 +615,22 @@ MesFilmsCat.Focus(); } } + + private void CatalogType_SelectedIndexChanged(object sender, EventArgs e) + { + switch( CatalogType.SelectedIndex) + { + case 0: + break; + case 1: + break; + } + } + + private void button1_Click(object sender, EventArgs e) + { + CatalogConverter cc = new CatalogConverter(); + cc.ConvertProfiler(MesFilmsCat.Text); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-03-24 10:39:57
|
Revision: 216 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=216&view=rev Author: saamand Date: 2007-03-24 03:39:53 -0700 (Sat, 24 Mar 2007) Log Message: ----------- Version 0.18 Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs trunk/plugins/MyLyrics/LyricsEngine/Setup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs =================================================================== (Binary files differ) Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -33,19 +33,24 @@ private int noOfLyricsNotFound; private bool m_StopSearches = false; - public static event EventHandler StopTheSearchAndAbort = null; ArrayList threadList = new ArrayList(); + ArrayList suspendedThreadList = new ArrayList(); // Main thread sets this event to stop LyricController ManualResetEvent m_EventStop_LyricController; + // The LyricController sets this when all lyricSearch threads have been aborted + ManualResetEvent m_EventStopped_LyricController; + private string[] lyricsSites; internal static bool ALLOW_ALL_TO_SEARCH = false; + + public LyricsController(ILyricForm mainForm, ManualResetEvent eventStopThread, string[] lyricSites, bool allowAllToSearch) @@ -59,6 +64,8 @@ ALLOW_ALL_TO_SEARCH = allowAllToSearch; + ArrayList easySitesArrayList = new ArrayList(); + // If search all, then include all if (allowAllToSearch) { @@ -66,20 +73,20 @@ } else { - ArrayList tempArrayList = new ArrayList(); foreach (string site in lyricSites) { if (Setup.IsMember(site)) { - tempArrayList.Add(site); + easySitesArrayList.Add(site); } } - this.lyricsSites = (string[])tempArrayList.ToArray(typeof(string)); + this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string)); } LyricSearch.LyricsSites = lyricsSites; m_EventStop_LyricController = eventStopThread; + m_EventStopped_LyricController = new ManualResetEvent(false); LyricSearch.Abort = false; } @@ -90,10 +97,10 @@ // check if thread is cancelled while (true) { - Thread.Sleep(500); + Thread.Sleep(100); // check if thread is cancelled - if (m_EventStop_LyricController.WaitOne(0, true)) + if (m_EventStop_LyricController.WaitOne()) { // clean-up operations may be placed here for (int i=0; i<threadList.Count; i++) @@ -111,6 +118,8 @@ stillThreadsAlive = true; } } + + m_EventStopped_LyricController.Set(); break; } } @@ -135,9 +144,6 @@ stillThreadsAlive = true; } } - - Thread.Sleep(100); - finishThread("", "", "The search has ended.", ""); } @@ -146,15 +152,14 @@ if (lyricsSites.Length > 0) { // create worker thread instance - ThreadStart siteThreadInstance = delegate + ThreadStart easySitesThreadInstance = delegate { - LyricSearch lyricSearch = new LyricSearch(this); - lyricSearch.setLyricInfo(artist, title); - lyricSearch.Run(); + LyricSearch lyricSearch_EasySites = new LyricSearch(this, artist, title); + lyricSearch_EasySites.Run(); }; - Thread lyricSearchThread = new Thread(siteThreadInstance); - lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; + Thread lyricSearchThread = new Thread(easySitesThreadInstance); + lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; // looks nice in Output window lyricSearchThread.IsBackground = true; lyricSearchThread.Start(); threadList.Add(lyricSearchThread); @@ -170,6 +175,7 @@ internal void statusUpdate(string artist, string title, string site, bool lyricFound) { + //LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + artist + " - " + title + " - " + site + " - " +lyricFound.ToString() ); if (lyricFound) ++noOfLyricsFound; else @@ -206,7 +212,13 @@ public void finishThread(String artist, String title, String message, String site) { + m_StopSearches = true; m_EventStop_LyricController.Set(); + + while (!m_EventStopped_LyricController.WaitOne(Timeout.Infinite, true)) + { + Thread.Sleep(50); + } m_Form.ThreadFinished = new Object[] { artist, title, message, site }; } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-24 10:39:53 UTC (rev 216) @@ -125,7 +125,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>::copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent> + <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent> <PreBuildEvent> </PreBuildEvent> </PropertyGroup> Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -3,28 +3,24 @@ using System.Text; using System.IO; using System.Diagnostics; +using System.Net; namespace LyricsEngine.LyricSites { class EvilLabs { string lyric = ""; - LyricSearch lyricSearch = null; + bool complete = false; public string Lyric { get { return lyric; } } - public EvilLabs(LyricSearch lyricSearch, string artist, string title) + public EvilLabs(string artist, string title) { - this.lyricSearch = lyricSearch; if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "EvilLabs(" + artist + ", " + title + ")"); - bool thisMayBeTheCorrectLyric = true; - System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); - string lyricTemp = ""; - artist = LyricUtil.removeFeatComment(artist); LyricUtil.trimForParenthesis(ref artist); artist = artist.Replace(" ", "+"); @@ -33,39 +29,36 @@ title = title.Replace(" ", "+"); string urlString = "http://www.evillabs.sk/lyrics/" + artist + "+-+" + title; - System.Net.WebClient client = new System.Net.WebClient(); - System.Byte[] bytes = null; + WebClient client = new WebClient(); + Uri uri = new Uri(urlString); + client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod); + client.OpenReadAsync(uri); - try + while (complete == false) { - bytes = client.DownloadData(urlString); + System.Threading.Thread.Sleep(100); } - catch (System.Net.WebException) - { - //return false; - } - finally - { - client.Dispose(); - } + } - int byteIndex = 0; - while (byteIndex < bytes.Length && lyricSearch.SearchHasEnded == false) + private void callbackMethod(object sender, OpenReadCompletedEventArgs e) + { + bool thisMayBeTheCorrectLyric = true; + System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); + StringBuilder lyricTemp = new StringBuilder(); + + WebClient client = (WebClient)sender; + Stream reply = null; + StreamReader sr = null; + + try { - lyricTemp += System.Char.ConvertFromUtf32(bytes[byteIndex]); - ++byteIndex; - } + reply = (Stream)e.Result; + sr = new StreamReader(reply); - MemoryStream memoryStream = new MemoryStream(System.Text.Encoding.Default.GetBytes(lyricTemp)); - - if (memoryStream != null) - { string line = ""; int noOfLinesCount = 0; - System.IO.StreamReader sr = new System.IO.StreamReader(memoryStream); - while (line.IndexOf("</style>") == -1) { if (sr.EndOfStream || ++noOfLinesCount > 300) @@ -91,6 +84,23 @@ } } } + catch (System.Reflection.TargetInvocationException) + { + lyric = "Not found"; + } + finally + { + if (sr != null) + { + sr.Close(); + } + + if (reply != null) + { + reply.Close(); + } + } + complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -3,28 +3,24 @@ using System.Text; using System.IO; using System.Diagnostics; +using System.Net; namespace LyricsEngine.LyricSites { class HotLyrics { string lyric = ""; - LyricSearch lyricSearch = null; + bool complete = false; public string Lyric { get { return lyric; } } - public HotLyrics(LyricSearch lyricSearch, string artist, string title) + public HotLyrics(string artist, string title) { - this.lyricSearch = lyricSearch; if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")"); - bool thisMayBeTheCorrectLyric = true; - System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); - StringBuilder lyricTemp = new StringBuilder(); - artist = LyricUtil.removeFeatComment(artist); LyricUtil.trimForParenthesis(ref artist); artist = LyricUtil.capatalizeString(artist); @@ -97,30 +93,36 @@ string urlString = "http://www.hotlyrics.net/lyrics/" + firstLetter + "/" + artist + "/" + title + ".html"; - System.Net.WebClient client = new System.Net.WebClient(); - Stream stream = null; + WebClient client = new WebClient(); - try + Uri uri = new Uri(urlString); + client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod); + client.OpenReadAsync(uri); + + while (complete == false) { - stream = client.OpenRead(urlString); + System.Threading.Thread.Sleep(100); } - catch (System.Net.WebException) - { - //return false; - } - finally - { - client.Dispose(); - } + } + private void callbackMethod(object sender, OpenReadCompletedEventArgs e) + { + bool thisMayBeTheCorrectLyric = true; + System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); + StringBuilder lyricTemp = new StringBuilder(); - if (stream != null) + WebClient client = (WebClient)sender; + Stream reply = null; + StreamReader sr = null; + + try { + reply = (Stream)e.Result; + sr = new StreamReader(reply); + string line = ""; + int noOfLinesCount = 0; - System.IO.StreamReader sr = new System.IO.StreamReader(stream); - //sr.BaseStream.Position = 18000; - while (line.IndexOf("GOOGLE END") == -1) { if (sr.EndOfStream) @@ -173,8 +175,24 @@ lyric = "Not found"; } } - sr.Close(); } + catch (System.Reflection.TargetInvocationException) + { + lyric = "Not found"; + } + finally + { + if (sr != null) + { + sr.Close(); + } + + if (reply != null) + { + reply.Close(); + } + } + complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -3,28 +3,24 @@ using System.Text; using System.IO; using System.Diagnostics; +using System.Net; namespace LyricsEngine.LyricSites { class Lyrics007 { string lyric = ""; - LyricSearch lyricSearch = null; + bool complete = false; public string Lyric { get { return lyric; } } - public Lyrics007(LyricSearch lyricSearch, string artist, string title) + public Lyrics007(string artist, string title) { - this.lyricSearch = lyricSearch; if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "Lyrics007(" + artist + ", " + title + ")"); - bool thisMayBeTheCorrectLyric = true; - System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); - StringBuilder lyricTemp = new StringBuilder(); - artist = LyricUtil.removeFeatComment(artist); LyricUtil.trimForParenthesis(ref artist); artist = artist.Replace("#", ""); @@ -36,31 +32,37 @@ string urlString = "http://www.lyrics007.com/" + artist + " Lyrics/" + title + " Lyrics.html"; - System.Net.WebClient client = new System.Net.WebClient(); - Stream stream = null; + WebClient client = new WebClient(); - try + Uri uri = new Uri(urlString); + client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod); + client.OpenReadAsync(uri); + + while (complete == false) { - stream = client.OpenRead(urlString); + System.Threading.Thread.Sleep(100); } - catch (System.Net.WebException) - { - //return false; - } - finally - { - client.Dispose(); - } + } - if (stream != null) + private void callbackMethod(object sender, OpenReadCompletedEventArgs e) + { + bool thisMayBeTheCorrectLyric = true; + System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); + StringBuilder lyricTemp = new StringBuilder(); + + WebClient client = (WebClient)sender; + Stream reply = null; + StreamReader sr = null; + + try { + reply = (Stream)e.Result; + sr = new StreamReader(reply); + string line = ""; int noOfLinesCount = 0; - System.IO.StreamReader sr = new System.IO.StreamReader(stream); - - // 1. Find beginning of lyric while (line.IndexOf("<td>Song: <strong>") == -1 && line.IndexOf("polyphonic ringtone to your cell phone") == -1) { if (sr.EndOfStream || ++noOfLinesCount > 300) @@ -74,7 +76,6 @@ } } - // 2. If start of lyric found, then continue with work if (thisMayBeTheCorrectLyric) { lyricTemp = new StringBuilder(); @@ -119,8 +120,24 @@ lyric = "Not found"; } } - sr.Close(); } + catch (System.Reflection.TargetInvocationException) + { + lyric = "Not found"; + } + finally + { + if (sr != null) + { + sr.Close(); + } + + if (reply != null) + { + reply.Close(); + } + } + complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -3,28 +3,24 @@ using System.Text; using System.IO; using System.Diagnostics; +using System.Net; namespace LyricsEngine.LyricSites { class LyricsOnDemand { string lyric = ""; - LyricSearch lyricSearch = null; + bool complete = false; public string Lyric { get { return lyric; } } - public LyricsOnDemand(LyricSearch lyricSearch, string artist, string title) + public LyricsOnDemand(string artist, string title) { - this.lyricSearch = lyricSearch; if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "LyricsOnDemand(" + artist + ", " + title + ")"); - bool thisMayBeTheCorrectLyric = true; - System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); - StringBuilder lyricTemp = new StringBuilder(); - artist = LyricUtil.removeFeatComment(artist); LyricUtil.trimForParenthesis(ref artist); LyricUtil.deleteSpecificChars(ref artist); @@ -67,30 +63,36 @@ string urlString = "http://www.lyricsondemand.com/" + firstLetter + "/" + artist + "lyrics/" + title + "lyrics.html"; - System.Net.WebClient client = new System.Net.WebClient(); - System.Byte[] bytes = null; - Stream stream = null; + WebClient client = new WebClient(); - try + Uri uri = new Uri(urlString); + client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod); + client.OpenReadAsync(uri); + + while (complete == false) { - stream = client.OpenRead(urlString); + System.Threading.Thread.Sleep(100); } - catch (System.Net.WebException) + } + + private void callbackMethod(object sender, OpenReadCompletedEventArgs e) + { + bool thisMayBeTheCorrectLyric = true; + System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); + StringBuilder lyricTemp = new StringBuilder(); + + WebClient client = (WebClient)sender; + Stream reply = null; + StreamReader sr = null; + + try { - //return false; - } - finally - { - client.Dispose(); - } + reply = (Stream)e.Result; + sr = new StreamReader(reply); - if (stream != null) - { string line = ""; int noOfLinesCount = 0; - System.IO.StreamReader sr = new System.IO.StreamReader(stream); - while (line.IndexOf(@"<font size=""2"" face=""Verdana"">") == -1) { if (sr.EndOfStream || ++noOfLinesCount > 300) @@ -144,8 +146,24 @@ lyric = "Not found"; } } - sr.Close(); } + catch (System.Reflection.TargetInvocationException) + { + lyric = "Not found"; + } + finally + { + if (sr != null) + { + sr.Close(); + } + + if (reply != null) + { + reply.Close(); + } + } + complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -3,28 +3,24 @@ using System.Text; using System.IO; using System.Diagnostics; +using System.Net; namespace LyricsEngine.LyricSites { class SeekLyrics { string lyric = ""; - LyricSearch lyricSearch = null; + bool complete = false; public string Lyric { get { return lyric; } } - public SeekLyrics(LyricSearch lyricSearch, string artist, string title) + public SeekLyrics(string artist, string title) { - this.lyricSearch = lyricSearch; if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")"); - bool thisMayBeTheCorrectLyric = true; - System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); - StringBuilder lyricTemp = new StringBuilder(); - artist = LyricUtil.removeFeatComment(artist); LyricUtil.trimForParenthesis(ref artist); artist = artist.Replace(" ", "-"); @@ -71,43 +67,36 @@ string urlString = "http://www.seeklyrics.com/lyrics/" + artist + "/" + title + ".html"; - System.Net.WebClient client = new System.Net.WebClient(); - System.Byte[] bytes = null; + WebClient client = new WebClient(); - try + Uri uri = new Uri(urlString); + client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod); + client.OpenReadAsync(uri); + + while (complete == false) { - bytes = client.DownloadData(urlString); + System.Threading.Thread.Sleep(100); } - catch (System.Net.WebException) - { - //return false; - } - finally - { - client.Dispose(); - } + } + private void callbackMethod(object sender, OpenReadCompletedEventArgs e) + { + bool thisMayBeTheCorrectLyric = true; + System.Collections.ArrayList strLyric = new System.Collections.ArrayList(); + StringBuilder lyricTemp = new StringBuilder(); + + WebClient client = (WebClient)sender; + Stream reply = null; + StreamReader sr = null; - - if (bytes != null) + try { - int byteIndex = 3900; + reply = (Stream)e.Result; + sr = new StreamReader(reply); - while (byteIndex < bytes.Length && lyricSearch.SearchHasEnded == false) - { - lyricTemp.Append(System.Char.ConvertFromUtf32(bytes[byteIndex])); - ++byteIndex; - } + string line = ""; + int noOfLinesCount = 0; - MemoryStream memoryStream = new MemoryStream(System.Text.Encoding.Default.GetBytes(lyricTemp.ToString())); - - if (memoryStream != null) - { - string line = ""; - int noOfLinesCount = 0; - - System.IO.StreamReader sr = new System.IO.StreamReader(memoryStream); - while (line.IndexOf("<pre>") == -1) { if (sr.EndOfStream || ++noOfLinesCount > 300) @@ -170,8 +159,24 @@ lyric = "Not found"; } } + } + catch (System.Reflection.TargetInvocationException) + { + lyric = "Not found"; + } + finally + { + if (sr != null) + { + sr.Close(); } + + if (reply != null) + { + reply.Close(); + } } + complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -26,7 +26,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17")] +[assembly: AssemblyVersion("0.18")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -9,11 +9,11 @@ public static string[] BatchSearchSites = new string[4] { "LyricWiki", - //"EvilLabs", "Lyrics007", "LyricsOnDemand", - "HotLyrics" - //"SeekLyrics" + "HotLyrics"/*, + "EvilLabs", + "SeekLyrics"*/ }; Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-24 03:36:12 UTC (rev 215) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-24 10:39:53 UTC (rev 216) @@ -35,28 +35,35 @@ this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox(); this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.cbEvilLabs = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel(); + this.trackBar = new System.Windows.Forms.TrackBar(); + this.lbSpeed = new MediaPortal.UserInterface.Controls.MPLabel(); + this.rdDefault = new System.Windows.Forms.RadioButton(); + this.rbUserDefined = new System.Windows.Forms.RadioButton(); this.tbNote = new MediaPortal.UserInterface.Controls.MPLabel(); - this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.cbEvilLabs = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.tabPageDatabase = new MediaPortal.UserInterface.Controls.MPTabPage(); - this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox(); - this.btImportAll = new MediaPortal.UserInterface.Controls.MPButton(); - this.btCancel = new MediaPortal.UserInterface.Controls.MPButton(); - this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbGenerel = new MediaPortal.UserInterface.Controls.MPGroupBox(); + this.tbLimit = new MediaPortal.UserInterface.Controls.MPTextBox(); + this.lbSongsLimit = new MediaPortal.UserInterface.Controls.MPLabel(); + this.lbSongsLimitNote = new MediaPortal.UserInterface.Controls.MPLabel(); this.cbSearchOnlyForMarkedSongs = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbDisregardSongWithLyricInTag = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbDisregardVariousArtist = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbDisregardSongsWithNoLyric = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbMarkSongsWithNoLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbDisconsiderTitlesWithLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.lbSongsLimitNote = new MediaPortal.UserInterface.Controls.MPLabel(); - this.tbLimit = new MediaPortal.UserInterface.Controls.MPTextBox(); - this.lbSongsLimit = new MediaPortal.UserInterface.Controls.MPLabel(); + this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox(); + this.btImportAll = new MediaPortal.UserInterface.Controls.MPButton(); + this.btCancel = new MediaPortal.UserInterface.Controls.MPButton(); + this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbMessages = new MediaPortal.UserInterface.Controls.MPGroupBox(); this.lbMessage = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbProgress = new MediaPortal.UserInterface.Controls.MPGroupBox(); @@ -91,9 +98,12 @@ this.tabPageSetup.SuspendLayout(); this.mpGroupBox2.SuspendLayout(); this.gbLyricSites.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); this.tabPageDatabase.SuspendLayout(); + this.gbGenerel.SuspendLayout(); this.mpGroupBox1.SuspendLayout(); - this.gbGenerel.SuspendLayout(); this.gbMessages.SuspendLayout(); this.gbProgress.SuspendLayout(); this.gbMusicDBSearchStats.SuspendLayout(); @@ -107,7 +117,7 @@ this.tabControl.Location = new System.Drawing.Point(7, 12); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(534, 494); + this.tabControl.Size = new System.Drawing.Size(557, 494); this.tabControl.TabIndex = 1; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // @@ -116,7 +126,7 @@ this.tabPageLyricsDatabase.Location = new System.Drawing.Point(4, 22); this.tabPageLyricsDatabase.Name = "tabPageLyricsDatabase"; this.tabPageLyricsDatabase.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLyricsDatabase.Size = new System.Drawing.Size(526, 468); + this.tabPageLyricsDatabase.Size = new System.Drawing.Size(549, 468); this.tabPageLyricsDatabase.TabIndex = 1; this.tabPageLyricsDatabase.Text = "Lyrics database"; this.tabPageLyricsDatabase.UseVisualStyleBackColor = true; @@ -128,9 +138,9 @@ this.tabPageSetup.Location = new System.Drawing.Point(4, 22); this.tabPageSetup.Name = "tabPageSetup"; this.tabPageSetup.Padding = new System.Windows.Forms.Padding(3); - this.tabPageSetup.Size = new System.Drawing.Size(526, 468); + this.tabPageSetup.Size = new System.Drawing.Size(549, 468); this.tabPageSetup.TabIndex = 2; - this.tabPageSetup.Text = "General setup"; + this.tabPageSetup.Text = "Settings"; this.tabPageSetup.UseVisualStyleBackColor = true; // // mpGroupBox2 @@ -139,12 +149,12 @@ this.mpGroupBox2.Controls.Add(this.tbPluginName); this.mpGroupBox2.Controls.Add(this.lbPluginName); this.mpGroupBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.mpGroupBox2.Location = new System.Drawing.Point(4, 6); + this.mpGroupBox2.Location = new System.Drawing.Point(5, 5); this.mpGroupBox2.Name = "mpGroupBox2"; - this.mpGroupBox2.Size = new System.Drawing.Size(510, 63); + this.mpGroupBox2.Size = new System.Drawing.Size(538, 63); this.mpGroupBox2.TabIndex = 29; this.mpGroupBox2.TabStop = false; - this.mpGroupBox2.Text = "Lyric sites to search"; + this.mpGroupBox2.Text = "Basic settings"; // // tbPluginName // @@ -167,192 +177,256 @@ // // gbLyricSites // - this.gbLyricSites.AutoSize = true; - this.gbLyricSites.Controls.Add(this.cbHotLyrics); + this.gbLyricSites.Controls.Add(this.groupBox2); + this.gbLyricSites.Controls.Add(this.groupBox1); + this.gbLyricSites.Controls.Add(this.rdDefault); + this.gbLyricSites.Controls.Add(this.rbUserDefined); this.gbLyricSites.Controls.Add(this.tbNote); - this.gbLyricSites.Controls.Add(this.cbSeekLyrics); - this.gbLyricSites.Controls.Add(this.cbLyricsOnDemand); - this.gbLyricSites.Controls.Add(this.cbLyrics007); - this.gbLyricSites.Controls.Add(this.cbEvilLabs); - this.gbLyricSites.Controls.Add(this.cbLyricWiki); this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.gbLyricSites.Location = new System.Drawing.Point(4, 75); + this.gbLyricSites.Location = new System.Drawing.Point(5, 74); this.gbLyricSites.Name = "gbLyricSites"; - this.gbLyricSites.Size = new System.Drawing.Size(510, 125); + this.gbLyricSites.Size = new System.Drawing.Size(538, 202); this.gbLyricSites.TabIndex = 28; this.gbLyricSites.TabStop = false; - this.gbLyricSites.Text = "Lyric sites to search"; + this.gbLyricSites.Text = "Lyrics sites settings"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.cbLyrics007); + this.groupBox2.Controls.Add(this.cbLyricWiki); + this.groupBox2.Controls.Add(this.cbEvilLabs); + this.groupBox2.Controls.Add(this.cbLyricsOnDemand); + this.groupBox2.Controls.Add(this.cbHotLyrics); + this.groupBox2.Controls.Add(this.cbSeekLyrics); + this.groupBox2.Location = new System.Drawing.Point(272, 72); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(258, 100); + this.groupBox2.TabIndex = 28; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "User specific mode"; + // + // cbLyrics007 + // + this.cbLyrics007.AutoSize = true; + this.cbLyrics007.Checked = true; + this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbLyrics007.Location = new System.Drawing.Point(17, 48); + this.cbLyrics007.Name = "cbLyrics007"; + this.cbLyrics007.Size = new System.Drawing.Size(72, 17); + this.cbLyrics007.TabIndex = 4; + this.cbLyrics007.Text = "Lyrics 007"; + this.cbLyrics007.UseVisualStyleBackColor = true; + // + // cbLyricWiki + // + this.cbLyricWiki.AutoSize = true; + this.cbLyricWiki.Checked = true; + this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbLyricWiki.Location = new System.Drawing.Point(17, 71); + this.cbLyricWiki.Name = "cbLyricWiki"; + this.cbLyricWiki.Size = new System.Drawing.Size(67, 17); + this.cbLyricWiki.TabIndex = 2; + this.cbLyricWiki.Text = "LyricWiki"; + this.cbLyricWiki.UseVisualStyleBackColor = true; + // + // cbEvilLabs + // + this.cbEvilLabs.AutoSize = true; + this.cbEvilLabs.Checked = true; + this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbEvilLabs.Location = new System.Drawing.Point(145, 71); + this.cbEvilLabs.Name = "cbEvilLabs"; + this.cbEvilLabs.Size = new System.Drawing.Size(67, 17); + this.cbEvilLabs.TabIndex = 3; + this.cbEvilLabs.Text = "Evil Labs"; + this.cbEvilLabs.UseVisualStyleBackColor = true; + // + // cbLyricsOnDemand + // + this.cbLyricsOnDemand.AutoSize = true; + this.cbLyricsOnDemand.Checked = true; + this.cbLyricsOnDemand.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbLyricsOnDemand.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbLyricsOnDemand.Location = new System.Drawing.Point(17, 26); + this.cbLyricsOnDemand.Name = "cbLyricsOnDemand"; + this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17); + this.cbLyricsOnDemand.TabIndex = 5; + this.cbLyricsOnDemand.Text = "Lyrics OnDemand"; + this.cbLyricsOnDemand.UseVisualStyleBackColor = true; + // // cbHotLyrics // this.cbHotLyrics.AutoSize = true; this.cbHotLyrics.Checked = true; this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbHotLyrics.Location = new System.Drawing.Point(148, 21); + this.cbHotLyrics.Location = new System.Drawing.Point(145, 26); this.cbHotLyrics.Name = "cbHotLyrics"; this.cbHotLyrics.Size = new System.Drawing.Size(71, 17); this.cbHotLyrics.TabIndex = 7; this.cbHotLyrics.Text = "Hot Lyrics"; this.cbHotLyrics.UseVisualStyleBackColor = true; // - // tbNote - // - this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tbNote.Location = new System.Drawing.Point(13, 91); - this.tbNote.Name = "tbNote"; - this.tbNote.Size = new System.Drawing.Size(377, 18); - this.tbNote.TabIndex = 19; - this.tbNote.Text = "(Seek Lyrics and Evil Labs are currently disabled due to instable servers)"; - // // cbSeekLyrics // this.cbSeekLyrics.AutoSize = true; this.cbSeekLyrics.Checked = true; this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbSeekLyrics.Location = new System.Drawing.Point(148, 43); + this.cbSeekLyrics.Location = new System.Drawing.Point(145, 48); this.cbSeekLyrics.Name = "cbSeekLyrics"; this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17); this.cbSeekLyrics.TabIndex = 6; this.cbSeekLyrics.Text = "Seek Lyrics"; this.cbSeekLyrics.UseVisualStyleBackColor = true; // - // cbLyricsOnDemand + // groupBox1 // - this.cbLyricsOnDemand.AutoSize = true; - this.cbLyricsOnDemand.Checked = true; - this.cbLyricsOnDemand.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbLyricsOnDemand.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbLyricsOnDemand.Location = new System.Drawing.Point(16, 43); - this.cbLyricsOnDemand.Name = "cbLyricsOnDemand"; - this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17); - this.cbLyricsOnDemand.TabIndex = 5; - this.cbLyricsOnDemand.Text = "Lyrics OnDemand"; - this.cbLyricsOnDemand.UseVisualStyleBackColor = true; + this.groupBox1.Controls.Add(this.mpLabel2); + this.groupBox1.Controls.Add(this.trackBar); + this.groupBox1.Controls.Add(this.lbSpeed); + this.groupBox1.Location = new System.Drawing.Point(6, 72); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(260, 100); + this.groupBox1.TabIndex = 27; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Default mode"; // - // cbLyrics007 + // mpLabel2 // - this.cbLyrics007.AutoSize = true; - this.cbLyrics007.Checked = true; - this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbLyrics007.Location = new System.Drawing.Point(16, 66); - this.cbLyrics007.Name = "cbLyrics007"; - this.cbLyrics007.Size = new System.Drawing.Size(72, 17); - this.cbLyrics007.TabIndex = 4; - this.cbLyrics007.Text = "Lyrics 007"; - this.cbLyrics007.UseVisualStyleBackColor = true; + this.mpLabel2.AutoSize = true; + this.mpLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mpLabel2.Location = new System.Drawing.Point(187, 25); + this.mpLabel2.Name = "mpLabel2"; + this.mpLabel2.Size = new System.Drawing.Size(43, 13); + this.mpLabel2.TabIndex = 26; + this.mpLabel2.Text = "Hit ratio"; // - // cbEvilLabs + // trackBar // - this.cbEvilLabs.AutoSize = true; - this.cbEvilLabs.Checked = true; - this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbEvilLabs.Location = new System.Drawing.Point(148, 66); - this.cbEvilLabs.Name = "cbEvilLabs"; - this.cbEvilLabs.Size = new System.Drawing.Size(67, 17); - this.cbEvilLabs.TabIndex = 3; - this.cbEvilLabs.Text = "Evil Labs"; - this.cbEvilLabs.UseVisualStyleBackColor = true; + this.trackBar.BackColor = System.Drawing.SystemColors.Control; + this.trackBar.LargeChange = 3; + this.trackBar.Location = new System.Drawing.Point(36, 42); + this.trackBar.Maximum = 3; + this.trackBar.Name = "trackBar"; + this.trackBar.Size = new System.Drawing.Size(185, 45); + this.trackBar.TabIndex = 25; + this.trackBar.TickStyle = System.Windows.Forms.TickStyle.Both; + this.trackBar.Value = 2; + this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll); // - // cbLyricWiki + // lbSpeed // - this.cbLyricWiki.AutoSize = true; - this.cbLyricWiki.Checked = true; - this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbLyricWiki.Location = new System.Drawing.Point(16, 21); - this.cbLyricWiki.Name = "cbLyricWiki"; - this.cbLyricWiki.Size = new System.Drawing.Size(67, 17); - this.cbLyricWiki.TabIndex = 2; - this.cbLyricWiki.Text = "LyricWiki"; - this.cbLyricWiki.UseVisualStyleBackColor = true; + this.lbSpeed.AutoSize = true; + this.lbSpeed.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbSpeed.Location = new System.Drawing.Point(29, 25); + this.lbSpeed.Name = "lbSpeed"; + this.lbSpeed.Size = new System.Drawing.Size(38, 13); + this.lbSpeed.TabIndex = 24; + this.lbSpeed.Text = "Speed"; // + // rdDefault + // + this.rdDefault.AutoSize = true; + this.rdDefault.Location = new System.Drawing.Point(16, 23); + this.rdDefault.Name = "rdDefault"; + this.rdDefault.Size = new System.Drawing.Size(88, 17); + this.rdDefault.TabIndex = 23; + this.rdDefault.Text = "Default mode"; + this.rdDefault.UseVisualStyleBackColor = true; + this.rdDefault.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged); + // + // rbUserDefined + // + this.rbUserDefined.AutoSize = true; + this.rbUserDefined.Location = new System.Drawing.Point(16, 46); + this.rbUserDefined.Name = "rbUserDefined"; + this.rbUserDefined.Size = new System.Drawing.Size(115, 17); + this.rbUserDefined.TabIndex = 22; + this.rbUserDefined.Text = "User specific mode"; + this.rbUserDefined.UseVisualStyleBackColor = true; + // + // tbNote + // + this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbNote.Location = new System.Drawing.Point(13, 178); + this.tbNote.Margin = new System.Windows.Forms.Padding(0); + this.tbNote.Name = "tbNote"; + this.tbNote.Size = new System.Drawing.Size(377, 18); + this.tbNote.TabIndex = 19; + this.tbNote.Text = "Seek Lyrics and Evil Labs should currently not be used due to instable servers"; + // // tabPageDatabase // + this.tabPageDatabase.Controls.Add(this.gbGenerel); this.tabPageDatabase.Controls.Add(this.mpGroupBox1); - this.tabPageDatabase.Controls.Add(this.gbGenerel); this.tabPageDatabase.Controls.Add(this.gbMessages); this.tabPageDatabase.Controls.Add(this.gbProgress); this.tabPageDatabase.Controls.Add(this.gbMusicDBSearchStats); this.tabPageDatabase.Location = new System.Drawing.Point(4, 22); this.tabPageDatabase.Name = "tabPageDatabase"; this.tabPageDatabase.Padding = new System.Windows.Forms.Padding(3); - this.tabPageDatabase.Size = new System.Drawing.Size(526, 468); + this.tabPageDatabase.Size = new System.Drawing.Size(549, 468); this.tabPageDatabase.TabIndex = 2; - this.tabPageDatabase.Text = "Search music database"; + this.tabPageDatabase.Text = "Music database search"; this.tabPageDatabase.UseVisualStyleBackColor = true; // - // mpGroupBox1 - // - this.mpGroupBox1.Controls.Add(this.btImportAll); - this.mpGroupBox1.Controls.Add(this.btCancel); - this.mpGroupBox1.Controls.Add(this.mpLabel3); - this.mpGroupBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.mpGroupBox1.Location = new System.Drawing.Point(2, 133); - this.mpGroupBox1.Name = "mpGroupBox1"; - this.mpGroupBox1.Size = new System.Drawing.Size(509, 53); - this.mpGroupBox1.TabIndex = 32; - this.mpGroupBox1.TabStop = false; - this.mpGroupBox1.Text = "Search music database"; - // - // btImportAll - // - this.btImportAll.Location = new System.Drawing.Point(338, 19); - this.btImportAll.Name = "btImportAll"; - this.btImportAll.Size = new System.Drawing.Size(78, 23); - this.btImportAll.TabIndex = 32; - this.btImportAll.Text = "Start"; - this.btImportAll.UseVisualStyleBackColor = true; - this.btImportAll.Click += new System.EventHandler(this.btImportAll_Click); - // - // btCancel - // - this.btCancel.Enabled = false; - this.btCancel.Location = new System.Drawing.Point(422, 19); - this.btCancel.Name = "btCancel"; - this.btCancel.Size = new System.Drawing.Size(78, 23); - this.btCancel.TabIndex = 33; - this.btCancel.Text = "Stop"; - this.btCancel.UseVisualStyleBackColor = true; - this.btCancel.Click += new System.EventHandler(this.btCancel_Click); - // - // mpLabel3 - // - this.mpLabel3.AutoSize = true; - this.mpLabel3.Location = new System.Drawing.Point(12, 16); - this.mpLabel3.Name = "mpLabel3"; - this.mpLabel3.Size = new System.Drawing.Size(304, 26); - this.mpLabel3.TabIndex = 12; - this.mpLabel3.Text = "Press \'Start\' to fetch lyrics matching content of music database.\r\nPress \'Stop\' t" + - "o stop an ongoing lyrics search."; - // // gbGenerel // + this.gbGenerel.Controls.Add(this.tbLimit); + this.gbGenerel.Controls.Add(this.lbSongsLimit); + this.gbGenerel.Controls.Add(this.lbSongsLimitNote); this.gbGenerel.Controls.Add(this.cbSearchOnlyForMarkedSongs); this.gbGenerel.Controls.Add(this.cbDisregardSongWithLyricInTag); this.gbGenerel.Controls.Add(this.cbDisregardVariousArtist); this.gbGenerel.Controls.Add(this.cbDisregardSongsWithNoLyric); this.gbGenerel.Controls.Add(this.cbMarkSongsWithNoLyrics); this.gbGenerel.Controls.Add(this.cbDisconsiderTitlesWithLyrics); - this.gbGenerel.Controls.Add(this.lbSongsLimitNote); - this.gbGenerel.Controls.Add(this.tbLimit); - this.gbGenerel.Controls.Add(this.lbSongsLimit); this.gbGenerel.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.gbGenerel.Location = new System.Drawing.Point(3, 6); + this.gbGenerel.Location = new System.Drawing.Point(5, 5); this.gbGenerel.Name = "gbGenerel"; - this.gbGenerel.Size = new System.Drawing.Size(509, 121); - this.gbGenerel.TabIndex = 32; + this.gbGenerel.Size = new System.Drawing.Size(538, 121); + this.gbGenerel.TabIndex = 35; this.gbGenerel.TabStop = false; this.gbGenerel.Text = "Music database search setup"; // + // tbLimit + // + this.tbLimit.BorderColor = System.Drawing.Color.Empty; + this.tbLimit.Location = new System.Drawing.Point(162, 21); + this.tbLimit.MaxLength = 6; + this.tbLimit.Name = "tbLimit"; + this.tbLimit.Size = new System.Drawing.Size(44, 20); + this.tbLimit.TabIndex = 37; + this.tbLimit.Text = "1000"; + this.tbLimit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // lbSongsLimit + // + this.lbSongsLimit.AutoSize = true; + this.lbSongsLimit.Location = new System.Drawing.Point(16, 24); + this.lbSongsLimit.Name = "lbSongsLimit"; + this.lbSongsLimit.Size = new System.Drawing.Size(139, 13); + this.lbSongsLimit.TabIndex = 38; + this.lbSongsLimit.Text = "Top limit of songs to search:"; + // + // lbSongsLimitNote + // + this.lbSongsLimitNote.AutoSize = true; + this.lbSongsLimitNote.Location = new System.Drawing.Point(212, 24); + this.lbSongsLimitNote.Name = "lbSongsLimitNote"; + this.lbSongsLimitNote.Size = new System.Drawing.Size(82, 13); + this.lbSongsLimitNote.TabIndex = 39; + this.lbSongsLimitNote.Text = "(1000 is default)"; + // // cbSearchOnlyForMarkedSongs // this.cbSearchOnlyForMarkedSongs.AutoSize = true; this.cbSearchOnlyForMarkedSongs.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(245, 91); + this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(270, 97); this.cbSearchOnlyForMarkedSongs.Name = "cbSearchOnlyForMarkedSongs"; this.cbSearchOnlyForMarkedSongs.Size = new System.Drawing.Size(232, 17); this.cbSearchOnlyForMarkedSongs.TabIndex = 19; @@ -366,7 +440,7 @@ this.cbDisregardSongWithLyricInTag.Checked = true; this.cbDisregardSongWithLyricInTag.CheckState = System.Windows.Forms.CheckState.Checked; this.cbDisregardSongWithLyricInTag.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbDisregardSongWithLyricInTag.Location = new System.Drawing.Point(15, 68); + this.cbDisregardSongWithLyricInTag.Location = new System.Drawing.Point(15, 74); this.cbDisregardSongWithLyricInTag.Name = "cbDisregardSongWithLyricInTag"; this.cbDisregardSongWithLyricInTag.Size = new System.Drawing.Size(202, 17); this.cbDisregardSongWithLyricInTag.TabIndex = 18; @@ -379,7 +453,7 @@ this.cbDisregardVariousArtist.Checked = true; this.cbDisregardVariousArtist.CheckState = System.Windows.Forms.CheckState.Checked; this.cbDisregardVariousArtist.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbDisregardVariousArtist.Location = new System.Drawing.Point(15, 91); + this.cbDisregardVariousArtist.Location = new System.Drawing.Point(15, 97); this.cbDisregardVariousArtist.Name = "cbDisregardVariousArtist"; this.cbDisregardVariousArtist.Size = new System.Drawing.Size(191, 17); this.cbDisregardVariousArtist.TabIndex = 17; @@ -392,7 +466,7 @@ this.cbDisregardSongsWithNoLyric.Checked = true; this.cbDisregardSongsWithNoLyric.CheckState = System.Windows.Forms.CheckState.Checked; this.cbDisregardSongsWithNoLyric.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(245, 68); + this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(270, 74); this.cbDisregardSongsWithNoLyric.Name = "cbDisregardSongsWithNoLyric"; this.cbDisregardSongsWithNoLyric.Size = new System.Drawing.Size(246, 17); this.cbDisregardSongsWithNoLyric.TabIndex = 16; @@ -405,7 +479,7 @@ this.cbMarkSongsWithNoLyrics.Checked = true; this.cbMarkSongsWithNoLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbMarkSongsWithNoLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(245, 45); + this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(270, 51); this.cbMarkSongsWithNoLyrics.Name = "cbMarkSongsWithNoLyrics"; this.cbMarkSongsWithNoLyrics.Size = new System.Drawing.Size(224, 17); this.cbMarkSongsWithNoLyrics.TabIndex = 15; @@ -418,58 +492,73 @@ this.cbDisconsiderTitlesWithLyrics.Checked = true; this.cbDisconsiderTitlesWithLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbDisconsiderTitlesWithLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbDisconsiderTitlesWithLyrics.Location = new System.Drawing.Point(15, 45); + this.cbDisconsiderTitlesWithLyrics.Location = new System.Drawing.Point(15, 51); this.cbDisconsiderTitlesWithLyrics.Name = "cbDisconsiderTitlesWithLyrics"; this.cbDisconsiderTitlesWithLyrics.Size = new System.Drawing.Size(201, 17); this.cbDisconsiderTitlesWithLyrics.TabIndex... [truncated message content] |
From: <an...@us...> - 2007-03-24 03:36:17
|
Revision: 215 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=215&view=rev Author: and-81 Date: 2007-03-23 20:36:12 -0700 (Fri, 23 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ComSkipLauncher TVE2/Configuration.cs trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-23 15:15:17 UTC (rev 214) +++ trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-24 03:36:12 UTC (rev 215) @@ -23,7 +23,8 @@ {2} = Recorded filename (w/o path or extension) {3} = Recorded file path {4} = Current date -{5} = Current time"; +{5} = Current time +{6} = Channel name"; #endregion Constants Modified: trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-23 15:15:17 UTC (rev 214) +++ trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-24 03:36:12 UTC (rev 215) @@ -27,7 +27,8 @@ {2} = Recorded filename (w/o path or extension) {3} = Recorded file path {4} = Current date -{5} = Current time"; +{5} = Current time +{6} = Channel name"; #endregion Constants This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <moi...@us...> - 2007-03-23 15:15:20
|
Revision: 214 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=214&view=rev Author: moiristo Date: 2007-03-23 08:15:17 -0700 (Fri, 23 Mar 2007) Log Message: ----------- Version 0.8: Lists all emissions, logo's, changed plugin name Modified Paths: -------------- trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj trunk/plugins/UitzendingGemist/UitGemist/UitGemistPlugin.cs trunk/plugins/UitzendingGemist/UitGemist.suo Added Paths: ----------- trunk/plugins/UitzendingGemist/UitGemist/NLSecondScreen.cs trunk/plugins/UitzendingGemist/UitGemist/TienGemist.cs trunk/plugins/UitzendingGemist/UitGemist/TienSecondScreen.cs trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak Removed Paths: ------------- trunk/plugins/UitzendingGemist/UitGemist/SecondScreen.cs Modified: trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs 2007-03-23 13:29:45 UTC (rev 213) +++ trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -9,6 +9,7 @@ using MediaPortal.Dialogs; using MediaPortal.Playlists; using System.Xml; +using System.Xml.XPath; using System.IO; namespace MediaPortal.GUI.UitGemist @@ -42,7 +43,7 @@ #endregion #region Variables - private String MainUrlBody = String.Empty; + private String MainUrlBody = String.Empty; private StringCollection Names = new StringCollection(); private StringCollection Urls = new StringCollection(); @@ -64,6 +65,7 @@ private bool ViewMoetJeZien = false; public static ShowWaitCursor wc = new ShowWaitCursor(); + public static String xmlFile = @"http://player.omroep.nl/xml/metaplayer.xml.php"; #endregion public override int GetID @@ -148,7 +150,7 @@ if (ViewFavorieten) { //SecondScreen.ViewVideo = true; - SecondScreen.Url = FavUrlsSecondScreen[facadeview.SelectedListItemIndex]; + NLSecondScreen.Url = FavUrlsSecondScreen[facadeview.SelectedListItemIndex]; GUIWindowManager.ActivateWindow(6801); } else if (ViewMoetJeZien) @@ -160,7 +162,7 @@ } else { - SecondScreen.Url = UrlsSecondScreen[facadeview.SelectedListItemIndex]; + NLSecondScreen.Url = UrlsSecondScreen[facadeview.SelectedListItemIndex]; GUIWindowManager.ActivateWindow(6801); } } @@ -278,18 +280,38 @@ public static string GetPlayUrl(string url) { - string page = wc.GetUrl(url, true); - Log.Debug(""+page.Length); - Regex r = new Regex(@"src=.(?<url>.*?\.asf)", RegexOptions.Multiline); + string result = ""; + string queryString = url.Substring(url.IndexOf('?')); + url = xmlFile + queryString; - Match m = r.Match(page); - Log.Debug(""+m.Success); - url = m.Groups[1].Value; - Log.Debug("url length:" + url.Length); - Log.Debug(url); - url = url.Replace(".rm", ".asf"); - url = ConvertString(url); - return url; + string xml = wc.GetXML(url); + //Regex r = new Regex(@"src=.(?<url>.*?\.asf)", RegexOptions.Multiline); + + //Match m = r.Match(page); + //Log.Debug(""+m.Success); + //url = m.Groups[1].Value; + //Log.Debug("url length:" + url.Length); + //Log.Debug(url); + //url = url.Replace(".rm", ".asf"); + //url = ConvertString(url); + try + { + XPathDocument document = new XPathDocument(new System.IO.StringReader(xml)); + XPathNavigator navigator = document.CreateNavigator(); + XPathExpression stream; + if(ShowWaitCursor.getBroadBand()) stream = XPathExpression.Compile("//streams/stream[@compressie_kwaliteit='bb' and @compressie_formaat='wmv']"); //returns node + else stream = XPathExpression.Compile("//streams/stream[@compressie_kwaliteit='sb' and @compressie_formaat='wmv']"); //returns node + + XPathNavigator node = navigator.SelectSingleNode(stream); + result = node.Value; + } + catch (XmlException e) + { + Log.Info("UitGemist: XML error for url '" + url + "'. Details follow."); + Log.Info("UitGemist: Line number: " + e.LineNumber + ":"); + Log.Info(e.StackTrace); + } + return result; } /// <summary> /// Fills the facadeview with item Added: trunk/plugins/UitzendingGemist/UitGemist/NLSecondScreen.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/NLSecondScreen.cs (rev 0) +++ trunk/plugins/UitzendingGemist/UitGemist/NLSecondScreen.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,227 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Text; +using System.Text.RegularExpressions; +using MediaPortal.GUI.Library; +using MediaPortal.Player; +using MediaPortal.Dialogs; +using MediaPortal.Playlists; + +namespace MediaPortal.GUI.UitGemist +{ + public class NLSecondScreen: GUIWindow + { + //#region SkinControlAttributes + [SkinControlAttribute(10)] + protected GUIListControl listview = null; + [SkinControlAttribute(3)] + protected GUIImage image = null; + //[SkinControlAttribute(3)] + //protected GUIImage imgPrgramma = null; + //[SkinControlAttribute(4)] + //protected GUILabelControl lblGenre = null; + //[SkinControlAttribute(5)] + //protected GUILabelControl lblOmroep = null; + //[SkinControlAttribute(6)] + //protected GUISelectButtonControl btnRubriek = null; + //#endregion + + public static string Url = string.Empty; + public static bool ViewVideo = false; + private string imageurl = string.Empty; + private StringCollection Datum = new StringCollection(); + private StringCollection Omschrijving = new StringCollection(); + private StringCollection Views = new StringCollection(); + private StringCollection Waardering = new StringCollection(); + private StringCollection StreamUrl = new StringCollection(); + + public override int GetID + { + get + { + return 6801; + } + set + { + base.GetID = value; + } + } + + public override bool Init() + { + return Load(GUIGraphicsContext.Skin + @"\UitGemist2.xml"); + } + + protected override void OnPageLoad() + { + if (ViewVideo) + { + NLGemist.wc.GetUrl("http://www.uitzendinggemist.nl"); + GetInfo(Url); + ViewVideo = false; + } + else + { + GetInfo(Url); + } + Showlist(); + base.OnPageLoad(); + } + + protected override void OnPageDestroy(int new_windowId) + { + image.FileName = GUIGraphicsContext.Skin + @"\media\background.png"; + base.OnPageDestroy(new_windowId); + } + + protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) + { + if (control == listview) + { + string mmsurl = string.Empty; + mmsurl = NLGemist.GetPlayUrl(StreamUrl[listview.SelectedListItemIndex]); + if (g_Player.Play(mmsurl)) + { + GUIGraphicsContext.IsFullScreenVideo = true; + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO); + ViewVideo = true; + } + } + base.OnClicked(controlId, control, actionType); + } + + public override bool OnMessage(GUIMessage message) + { + if (message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS || message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED) + { + if (listview.SelectedListItemIndex != -1) + { + GUIPropertyManager.SetProperty("#rating", Waardering[listview.SelectedListItemIndex]); + GUIPropertyManager.SetProperty("#plotoutline", Omschrijving[listview.SelectedListItemIndex]); + } + } + return base.OnMessage(message); + } + + private void GetInfo(string url) + { + Datum.Clear(); + Views.Clear(); + Omschrijving.Clear(); + Waardering.Clear(); + StreamUrl.Clear(); + + string result = NLGemist.wc.GetUrl(url, true); + result = NLGemist.ConvertString(result); + + //get image + Match m = Regex.Match(result, @"<img\ssrc=.(http://www.omroep.nl/u/.*?.png)"); + imageurl = m.Groups[1].Value; + image.FileName = NLGemist.wc.DownloadImage(imageurl); + + //get Programma-Naam + m = Regex.Match(result, @"<title>(.*?)</title>"); + GUIPropertyManager.SetProperty("#title", m.Groups[1].Value); + + //get Programma-omschrijving + m = Regex.Match(result, @"<p\sstyle=.margin-top.5px..>(.*?)<", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#plot", m.Groups[1].Value); + + //get Genre + m = Regex.Match(result, @"genre</b>.*?title=.(.*?).>", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#genre", m.Groups[1].Value); + + // get Omproep + m = Regex.Match(result, @"omroep</b>.*?title=.(.*?).>", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#credits", m.Groups[1].Value); + + // get Afleveringen + bool moreEmissions = false; + GetAfleveringen(result, out moreEmissions); + + if (moreEmissions) + { + string series2url = url.Replace(@"/index.php/serie", @"/index.php/serie2"); + GetAfleveringen(NLGemist.wc.GetUrl(series2url, true), out moreEmissions); + } + } + + private void GetAfleveringen(string page, out bool hasMoreEmissions) + { + Match m = Regex.Match(page, @"tbody\sid=.afleveringen.>(.*?)</tbody>", RegexOptions.Singleline); + if (m.Success) + { + string afleveringen = m.Groups[1].Value; + + //get datum + MatchCollection mc = Regex.Matches(afleveringen, @"(\d{2}-\d{2}-\d{4})</td>"); + foreach (Match m1 in mc) + { + Datum.Add(m1.Groups[1].Value); + } + + //get omschrijving + mc = Regex.Matches(afleveringen, @"(.*?).<a\shref=./index"); + foreach (Match m1 in mc) + { + Omschrijving.Add(m1.Groups[1].Value); + } + + //get views + mc = Regex.Matches(afleveringen, @"right.>(\d.*)</td>"); + foreach (Match m1 in mc) + { + Views.Add(m1.Groups[1].Value); + } + + //get waardering + mc = Regex.Matches(afleveringen, @">(\d\.\d)<"); + foreach (Match m1 in mc) + { + double r = double.Parse(m1.Groups[1].Value); + r = r * 2; + r = r / 10; + Waardering.Add(r.ToString()); + } + + //get stream-url + mc = Regex.Matches(afleveringen, @"(http://player.omroep.nl/.*?).\s"); + foreach (Match m1 in mc) + { + StreamUrl.Add(m1.Groups[1].Value); + } + } + + m = Regex.Match(page, @"meer afleveringen", RegexOptions.Singleline); + if (m.Success) hasMoreEmissions = true; + else hasMoreEmissions = false; + } + + private void Showlist() + { + listview.Clear(); + int i = 0; + while(i<Datum.Count) + { + GUIListItem item = new GUIListItem(); + item.IconImage = "defaultVideo.png"; + item.Label = Datum[i]; + item.Label2 = "Views: "+Views[i]; + listview.Add(item); + i++; + } + } + + + + + + + + + + + + } +} Deleted: trunk/plugins/UitzendingGemist/UitGemist/SecondScreen.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/SecondScreen.cs 2007-03-23 13:29:45 UTC (rev 213) +++ trunk/plugins/UitzendingGemist/UitGemist/SecondScreen.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -1,211 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Text; -using System.Text.RegularExpressions; -using MediaPortal.GUI.Library; -using MediaPortal.Player; -using MediaPortal.Dialogs; -using MediaPortal.Playlists; - -namespace MediaPortal.GUI.UitGemist -{ - public class SecondScreen: GUIWindow - { - //#region SkinControlAttributes - [SkinControlAttribute(10)] - protected GUIListControl listview = null; - [SkinControlAttribute(3)] - protected GUIImage image = null; - //[SkinControlAttribute(3)] - //protected GUIImage imgPrgramma = null; - //[SkinControlAttribute(4)] - //protected GUILabelControl lblGenre = null; - //[SkinControlAttribute(5)] - //protected GUILabelControl lblOmroep = null; - //[SkinControlAttribute(6)] - //protected GUISelectButtonControl btnRubriek = null; - //#endregion - - public static string Url = string.Empty; - public static bool ViewVideo = false; - private string imageurl = string.Empty; - private StringCollection Datum = new StringCollection(); - private StringCollection Omschrijving = new StringCollection(); - private StringCollection Views = new StringCollection(); - private StringCollection Waardering = new StringCollection(); - private StringCollection StreamUrl = new StringCollection(); - - public override int GetID - { - get - { - return 6801; - } - set - { - base.GetID = value; - } - } - - public override bool Init() - { - return Load(GUIGraphicsContext.Skin + @"\UitGemist2.xml"); - } - - protected override void OnPageLoad() - { - if (ViewVideo) - { - NLGemist.wc.GetUrl("http://www.uitzendinggemist.nl"); - GetInfo(Url); - ViewVideo = false; - } - else - { - GetInfo(Url); - } - Showlist(); - base.OnPageLoad(); - } - - protected override void OnPageDestroy(int new_windowId) - { - image.FileName = GUIGraphicsContext.Skin + @"\media\background.png"; - base.OnPageDestroy(new_windowId); - } - - protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) - { - if (control == listview) - { - string mmsurl = string.Empty; - mmsurl = NLGemist.GetPlayUrl(StreamUrl[listview.SelectedListItemIndex]); - GUIGraphicsContext.IsFullScreenVideo = true; - GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO); - g_Player.FullScreen = true; - ViewVideo = true; - g_Player.Play(mmsurl); - } - base.OnClicked(controlId, control, actionType); - } - - public override bool OnMessage(GUIMessage message) - { - if (message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS || message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED) - { - if (listview.SelectedListItemIndex != -1) - { - GUIPropertyManager.SetProperty("#rating", Waardering[listview.SelectedListItemIndex]); - GUIPropertyManager.SetProperty("#plotoutline", Omschrijving[listview.SelectedListItemIndex]); - } - } - return base.OnMessage(message); - } - - private void GetInfo(string url) - { - Datum.Clear(); - Views.Clear(); - Omschrijving.Clear(); - Waardering.Clear(); - StreamUrl.Clear(); - - string result = NLGemist.wc.GetUrl(url, true); - result = NLGemist.ConvertString(result); - - //get image - Match m = Regex.Match(result, @"<img\ssrc=.(http://gids.omroep.nl.*?.png)"); - imageurl = m.Groups[1].Value; - image.FileName = NLGemist.wc.DownloadImage(imageurl); - - //get Programma-Naam - m = Regex.Match(result, @"<title>(.*?)</title>"); - GUIPropertyManager.SetProperty("#title", m.Groups[1].Value); - - //get Programma-omschrijving - m = Regex.Match(result, @"<p\sstyle=.margin-top.5px..>(.*?)<", RegexOptions.Singleline); - GUIPropertyManager.SetProperty("#plot", m.Groups[1].Value); - - //get Genre - m = Regex.Match(result, @"genre</b>.*?title=.(.*?).>", RegexOptions.Singleline); - GUIPropertyManager.SetProperty("#genre", m.Groups[1].Value); - - // get Omproep - m = Regex.Match(result, @"omroep</b>.*?title=.(.*?).>", RegexOptions.Singleline); - GUIPropertyManager.SetProperty("#credits", m.Groups[1].Value); - - // get Afleveringen - m = Regex.Match(result, @"tbody\sid=.afleveringen.>(.*?)</tbody>", RegexOptions.Singleline); - if (m.Success) - { - string afleveringen = m.Groups[1].Value; - - //get datum - MatchCollection mc = Regex.Matches(afleveringen, @"(\d{2}-\d{2}-\d{4})</td>"); - foreach (Match m1 in mc) - { - Datum.Add(m1.Groups[1].Value); - } - - //get omschrijving - mc = Regex.Matches(afleveringen, @"(.*?).<a\shref=./index"); - foreach (Match m1 in mc) - { - Omschrijving.Add(m1.Groups[1].Value); - } - - //get views - mc = Regex.Matches(afleveringen, @"right.>(\d.*)</td>"); - foreach (Match m1 in mc) - { - Views.Add(m1.Groups[1].Value); - } - - //get waardering - mc = Regex.Matches(afleveringen, @">(\d\.\d)<"); - foreach (Match m1 in mc) - { - double r = double.Parse(m1.Groups[1].Value); - r = r * 2; - r = r / 10; - Waardering.Add(r.ToString()); - } - - //get stream-url - mc = Regex.Matches(afleveringen, @"(http://player.omroep.nl/.*?).\s"); - foreach (Match m1 in mc) - { - StreamUrl.Add(m1.Groups[1].Value); - } - - } - } - - private void Showlist() - { - listview.Clear(); - int i = 0; - while(i<Datum.Count) - { - GUIListItem item = new GUIListItem(); - item.IconImage = "defaultVideo.png"; - item.Label = Datum[i]; - item.Label2 = "Views: "+Views[i]; - listview.Add(item); - i++; - } - } - - - - - - - - - - - - } -} Modified: trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs 2007-03-23 13:29:45 UTC (rev 213) +++ trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -137,12 +137,12 @@ secondRequest.ContentType = postType; secondRequest.CookieContainer = new CookieContainer(); - Cookie c = new Cookie(); - c.Domain = "player.omroep.nl"; - c.Name = "player_instellingen"; - c.Value = "formaat:wmv&kwaliteit:bb"; + //Cookie c = new Cookie(); + //c.Domain = "player.omroep.nl"; + //c.Name = "player_instellingen"; + //c.Value = "formaat:wmv&kwaliteit:bb"; - secondRequest.CookieContainer.Add(c); + //secondRequest.CookieContainer.Add(c); CookieCollection cookies = firstResponse.Cookies; secondRequest.CookieContainer.Add(cookies); Added: trunk/plugins/UitzendingGemist/UitGemist/TienGemist.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/TienGemist.cs (rev 0) +++ trunk/plugins/UitzendingGemist/UitGemist/TienGemist.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,395 @@ +using System; +using System.Collections; +using System.Collections.Specialized; +using System.Text; +using System.Text.RegularExpressions; +using MediaPortal.GUI.Library; +using MediaPortal.Player; +using MediaPortal.Util; +using MediaPortal.Dialogs; +using MediaPortal.Playlists; +using System.Xml; +using System.Xml.XPath; +using System.IO; + +namespace MediaPortal.GUI.UitGemist +{ + struct Program + { + public string name; + public string ep; + public string date; + public string link; + } + + public class TienGemist : GUIWindow + { + #region SkinControlAttributes + [SkinControlAttribute(50)] + protected GUIFacadeControl facadeview = null; + [SkinControlAttribute(2)] + protected GUIButtonControl btnFavoriet = null; + [SkinControlAttribute(3)] + protected GUIButtonControl btnTopFifty = null; + [SkinControlAttribute(4)] + protected GUIButtonControl btnPrograms = null; + + + #endregion + + #region Variables + private String MainUrlBody = String.Empty; + + private ArrayList progs = new ArrayList(); + private ArrayList favs = new ArrayList(); + private int FavCount = 0; + + private bool ViewFavorieten = false; + private bool ViewTopFifty = false; + + public static ShowWaitCursor wc = new ShowWaitCursor(); + public static String rootUrl = @"http://www.tien.tv"; + public static String rootPage = rootUrl + @"/web/show/id=54585/langid=43"; + #endregion + + public override int GetID + { + get + { + return 6803; + } + set + { + base.GetID = value; + } + } + + public override bool Init() + { + return Load(GUIGraphicsContext.Skin + @"\TienGemist.xml"); + } + + public override void OnAction(Action action) + { + if (action.wID == Action.ActionType.ACTION_PLAY) + { + string mmsurl = string.Empty; + int index = facadeview.SelectedListItemIndex; + if (ViewFavorieten) + { + mmsurl = GetPlayUrl(((Program) favs[index]).link); + } + else + { + mmsurl = GetPlayUrl(((Program)progs[index]).link); + } + + PlayUitzending(mmsurl); + } + + base.OnAction(action); + } + + protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) + { + if (control == btnFavoriet) + { + ShowList(favs); + ViewFavorieten = true; + } + if (control == btnTopFifty) + { + ShowTopFifty(); + } + if (control == btnPrograms) + { + GetUitzendingen(); + } + if (control == facadeview) + { + TienSecondScreen.Url = ((Program) favs[facadeview.SelectedListItemIndex]).link; + GUIWindowManager.ActivateWindow(6804); + } + base.OnClicked(controlId, control, actionType); + } + + public override bool OnMessage(GUIMessage message) + { + return base.OnMessage(message); + } + + + protected override void OnPageLoad() + { + LoadFavorietenXML(); + if (ViewFavorieten) + { + ViewFavorieten = true; + ShowList(favs); + } + else if (progs.Count <= 0 || ViewTopFifty == true) + { + ShowTopFifty(); + } + else + { + ShowList(progs); + } + base.OnPageLoad(); + } + + protected override void OnPageDestroy(int new_windowId) + { + MainUrlBody = string.Empty; + SaveFavorietenXML(); + favs.Clear(); + base.OnPageDestroy(new_windowId); + } + + protected override void OnShowContextMenu() + { + if (ViewFavorieten) return; + + GUIListItem item = facadeview.SelectedListItem; + + GUIDialogMenu menu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU); + menu.Reset(); + menu.SetHeading("Extra Opties:"); + if (ViewFavorieten == false) + menu.Add("Toevoegen aan favorieten."); + if (ViewFavorieten == true) + menu.Add("Verwijderen van favorieten."); + menu.DoModal(GetID); + if (menu.SelectedId == -1) return; + if (menu.SelectedLabelText == "Toevoegen aan favorieten.") + { + favs.Add(progs[facadeview.SelectedListItemIndex]); + } + if (menu.SelectedLabelText == "Verwijderen van favorieten.") + { + favs.RemoveAt(facadeview.SelectedListItemIndex); + ShowList(favs); + } + base.OnShowContextMenu(); + } + + private void GetUitzendingen() + { + progs.Clear(); + ViewFavorieten = false; + + string result = wc.GetXML(rootPage); + try + { + XPathDocument document = new XPathDocument(new System.IO.StringReader(result)); + XPathNavigator navigator = document.CreateNavigator(); + XPathExpression programs = XPathExpression.Compile("//select[name='selector_2']//option"); //returns nodeset with rows per program + + + XPathNodeIterator nodes = navigator.Select(programs); + while (nodes.MoveNext()) + { + XPathNavigator node = nodes.Current; + Program p = new Program(); + p.name = node.SelectSingleNode(".").Value; + p.link = node.SelectSingleNode("./@value").Value; + progs.Add(p); + } + } + catch (XmlException e) + { + Log.Info("UitGemist: Invalid xml document '" + rootPage + "'. Details follow."); + Log.Info("UitGemist: Line number: " + e.LineNumber + ":"); + Log.Info(e.StackTrace); + } + + ShowList(progs); + } + + private void GetUitzending(string url) + { + progs.Clear(); + ViewFavorieten = false; + + string result = wc.GetXML(url); + try + { + XPathDocument document = new XPathDocument(new System.IO.StringReader(result)); + XPathNavigator navigator = document.CreateNavigator(); + XPathExpression programs = XPathExpression.Compile("//table[class='Program']//tr"); //returns nodeset with rows per program + + + XPathNodeIterator nodes = navigator.Select(programs); + while (nodes.MoveNext()) + { + XPathNavigator node = nodes.Current; + Program p = new Program(); + p.name = node.SelectSingleNode("./td[1]/h1").Value; + p.ep = node.SelectSingleNode("./td[1]/h2").Value; + p.date = node.SelectSingleNode("./td[2]/h2").Value; + p.link = node.SelectSingleNode("./td[2]/a/@href").Value; + progs.Add(p); + } + } + catch (XmlException e) + { + Log.Info("UitGemist: Invalid xml document '" + url + "'. Details follow."); + Log.Info("UitGemist: Line number: " + e.LineNumber + ":"); + Log.Info(e.StackTrace); + } + + ShowList(progs); + } + + public static string GetPlayUrl(string url) + { + string page = wc.GetUrl(url); + Regex r = new Regex(@"var url =.(?<url>.*?);", RegexOptions.Multiline); + + Match m = r.Match(page); + Log.Debug("" + m.Success); + url = m.Groups[1].Value; + Log.Debug("url length:" + url.Length); + Log.Debug(url); + url = ConvertString(url); + + return url; + } + /// <summary> + /// Fills the facadeview with item + /// </summary> + /// <param name="names">labels for the items</param> + private void ShowList(ArrayList progs) + { + ViewTopFifty = false; + facadeview.View = GUIFacadeControl.ViewMode.List; + facadeview.Clear(); + foreach (Object o in progs) + { + Program p = (Program)o; + GUIListItem item = new GUIListItem(); + item.Label = p.name; + if(p.ep != null) item.Label2 = p.ep; + if(p.date != null) item.Label3 = p.date; + item.IsFolder = true; + Util.Utils.SetDefaultIcons(item); + facadeview.Add(item); + } + focusFacade(); + } + + /// <summary> + /// Converts a string with wrong characters and replaces those with the good ones + /// </summary> + /// <param name="convertstring">input string</param> + /// <returns>converted string</returns> + public static string ConvertString(string convertstring) + { + convertstring = convertstring.Replace("&", "&"); + convertstring = convertstring.Replace("'", "'"); + convertstring = convertstring.Replace("é", "\xE9"); + convertstring = convertstring.Replace("ö", "\xF6"); + convertstring = convertstring.Replace("ë", "\xEB"); + convertstring = convertstring.Replace("ü", "\xFC"); + convertstring.Trim(); + return convertstring; + } + + /// <summary> + /// Error Dialog + /// </summary> + /// <param name="text">error text</param> + private void ShowDialog(string text) + { + GUIDialogOK dialog = new GUIDialogOK(); + dialog.SetHeading("Error"); + dialog.SetLine(1, text); + dialog.DoModal(GetID); + } + + /// <summary> + /// Save the favorites + /// </summary> + private void SaveFavorietenXML() + { + string dir = Directory.GetCurrentDirectory(); + + File.Delete(dir + @"\UitGemistFav.xml"); + using (MediaPortal.Profile.Settings writer = new MediaPortal.Profile.Settings(dir + @"\UitGemistFav.xml", false)) + { + writer.Clear(); + int i = 0; + foreach (Object o in favs) + { + Program p = (Program)o; + writer.SetValue(i.ToString(), "ProgrammaNaam", p.name); + writer.SetValue(i.ToString(), "ProgrammaUrl", p.link); + i++; + } + while (i < FavCount) + { + writer.SetValue(i.ToString(), "ProgrammaNaam", ""); + writer.SetValue(i.ToString(), "PorgrammaUrl", ""); + i++; + } + } + } + + /// <summary> + /// Load the favorites + /// </summary> + private void LoadFavorietenXML() + { + string dir = Directory.GetCurrentDirectory(); + using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(dir + @"\UitGemistFav.xml", false)) + { + int i = 0; + while (i != 100) + { + string result = reader.GetValueAsString(i.ToString(), "ProgrammaNaam", ""); + if (result.Equals("")) + { + FavCount = i - 1; + return; + } + else + { + Program p = new Program(); + p.name = reader.GetValue(i.ToString(), "ProgrammaNaam"); + p.link = reader.GetValue(i.ToString(), "ProgrammaUrl"); + favs.Add(p); + i++; + } + } + } + } + + /// <summary> + /// Shows the last 50 added items + /// </summary> + private void ShowTopFifty() + { + GetUitzending(rootPage); + } + + private void PlayUitzending(string url) + { + if (g_Player.Play(url)) + { + GUIGraphicsContext.IsFullScreenVideo = true; + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO); + } + } + + private void focusFacade() + { + if (facadeview.Count > 0 && !facadeview.Focus) GUIControl.FocusControl(GUIWindowManager.ActiveWindow, facadeview.GetID); + else if (facadeview.Count == 0) GUIControl.FocusControl(GUIWindowManager.ActiveWindow, btnFavoriet.GetID); + } + + } + + + + +} \ No newline at end of file Added: trunk/plugins/UitzendingGemist/UitGemist/TienSecondScreen.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/TienSecondScreen.cs (rev 0) +++ trunk/plugins/UitzendingGemist/UitGemist/TienSecondScreen.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,211 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Text; +using System.Text.RegularExpressions; +using MediaPortal.GUI.Library; +using MediaPortal.Player; +using MediaPortal.Dialogs; +using MediaPortal.Playlists; + +namespace MediaPortal.GUI.UitGemist +{ + public class TienSecondScreen: GUIWindow + { + //#region SkinControlAttributes + [SkinControlAttribute(10)] + protected GUIListControl listview = null; + [SkinControlAttribute(3)] + protected GUIImage image = null; + //[SkinControlAttribute(3)] + //protected GUIImage imgPrgramma = null; + //[SkinControlAttribute(4)] + //protected GUILabelControl lblGenre = null; + //[SkinControlAttribute(5)] + //protected GUILabelControl lblOmroep = null; + //[SkinControlAttribute(6)] + //protected GUISelectButtonControl btnRubriek = null; + //#endregion + + public static string Url = string.Empty; + public static bool ViewVideo = false; + private string imageurl = string.Empty; + private StringCollection Datum = new StringCollection(); + private StringCollection Omschrijving = new StringCollection(); + private StringCollection Views = new StringCollection(); + private StringCollection Waardering = new StringCollection(); + private StringCollection StreamUrl = new StringCollection(); + + public override int GetID + { + get + { + return 6804; + } + set + { + base.GetID = value; + } + } + + public override bool Init() + { + return Load(GUIGraphicsContext.Skin + @"\TienGemist2.xml"); + } + + protected override void OnPageLoad() + { + if (ViewVideo) + { + NLGemist.wc.GetUrl("http://www.uitzendinggemist.nl"); + GetInfo(Url); + ViewVideo = false; + } + else + { + GetInfo(Url); + } + Showlist(); + base.OnPageLoad(); + } + + protected override void OnPageDestroy(int new_windowId) + { + image.FileName = GUIGraphicsContext.Skin + @"\media\background.png"; + base.OnPageDestroy(new_windowId); + } + + protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) + { + if (control == listview) + { + string mmsurl = string.Empty; + mmsurl = NLGemist.GetPlayUrl(StreamUrl[listview.SelectedListItemIndex]); + GUIGraphicsContext.IsFullScreenVideo = true; + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO); + g_Player.FullScreen = true; + ViewVideo = true; + g_Player.Play(mmsurl); + } + base.OnClicked(controlId, control, actionType); + } + + public override bool OnMessage(GUIMessage message) + { + if (message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS || message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED) + { + if (listview.SelectedListItemIndex != -1) + { + GUIPropertyManager.SetProperty("#rating", Waardering[listview.SelectedListItemIndex]); + GUIPropertyManager.SetProperty("#plotoutline", Omschrijving[listview.SelectedListItemIndex]); + } + } + return base.OnMessage(message); + } + + private void GetInfo(string url) + { + Datum.Clear(); + Views.Clear(); + Omschrijving.Clear(); + Waardering.Clear(); + StreamUrl.Clear(); + + string result = NLGemist.wc.GetUrl(url, true); + result = NLGemist.ConvertString(result); + + //get image + Match m = Regex.Match(result, @"<img\ssrc=.(http://gids.omroep.nl.*?.png)"); + imageurl = m.Groups[1].Value; + image.FileName = NLGemist.wc.DownloadImage(imageurl); + + //get Programma-Naam + m = Regex.Match(result, @"<title>(.*?)</title>"); + GUIPropertyManager.SetProperty("#title", m.Groups[1].Value); + + //get Programma-omschrijving + m = Regex.Match(result, @"<p\sstyle=.margin-top.5px..>(.*?)<", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#plot", m.Groups[1].Value); + + //get Genre + m = Regex.Match(result, @"genre</b>.*?title=.(.*?).>", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#genre", m.Groups[1].Value); + + // get Omproep + m = Regex.Match(result, @"omroep</b>.*?title=.(.*?).>", RegexOptions.Singleline); + GUIPropertyManager.SetProperty("#credits", m.Groups[1].Value); + + // get Afleveringen + m = Regex.Match(result, @"tbody\sid=.afleveringen.>(.*?)</tbody>", RegexOptions.Singleline); + if (m.Success) + { + string afleveringen = m.Groups[1].Value; + + //get datum + MatchCollection mc = Regex.Matches(afleveringen, @"(\d{2}-\d{2}-\d{4})</td>"); + foreach (Match m1 in mc) + { + Datum.Add(m1.Groups[1].Value); + } + + //get omschrijving + mc = Regex.Matches(afleveringen, @"(.*?).<a\shref=./index"); + foreach (Match m1 in mc) + { + Omschrijving.Add(m1.Groups[1].Value); + } + + //get views + mc = Regex.Matches(afleveringen, @"right.>(\d.*)</td>"); + foreach (Match m1 in mc) + { + Views.Add(m1.Groups[1].Value); + } + + //get waardering + mc = Regex.Matches(afleveringen, @">(\d\.\d)<"); + foreach (Match m1 in mc) + { + double r = double.Parse(m1.Groups[1].Value); + r = r * 2; + r = r / 10; + Waardering.Add(r.ToString()); + } + + //get stream-url + mc = Regex.Matches(afleveringen, @"(http://player.omroep.nl/.*?).\s"); + foreach (Match m1 in mc) + { + StreamUrl.Add(m1.Groups[1].Value); + } + + } + } + + private void Showlist() + { + listview.Clear(); + int i = 0; + while(i<Datum.Count) + { + GUIListItem item = new GUIListItem(); + item.IconImage = "defaultVideo.png"; + item.Label = Datum[i]; + item.Label2 = "Views: "+Views[i]; + listview.Add(item); + i++; + } + } + + + + + + + + + + + + } +} Modified: trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj 2007-03-23 13:29:45 UTC (rev 213) +++ trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj 2007-03-23 15:15:17 UTC (rev 214) @@ -29,7 +29,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.2560.37327, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Core, Version=1.0.2586.6922, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> </Reference> @@ -42,20 +42,22 @@ <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="Utils, Version=1.0.2560.37325, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Utils, Version=1.0.2586.6921, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> + <Compile Include="TienSecondScreen.cs" /> <Compile Include="RTLGemist.cs" /> - <Compile Include="SecondScreen.cs" /> + <Compile Include="NLSecondScreen.cs" /> <Compile Include="ConfigurationForm.cs"> <SubType>Form</SubType> </Compile> <Compile Include="ConfigurationForm.Designer.cs"> <DependentUpon>ConfigurationForm.cs</DependentUpon> </Compile> + <Compile Include="TienGemist.cs" /> <Compile Include="UitGemistMain.cs" /> <Compile Include="UitGemistPlugin.cs" /> <Compile Include="NLGemist.cs" /> @@ -77,6 +79,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>xcopy $(TargetPath) D:\MediaPortal\trunk\mediaportal\xbmc\bin\Release\plugins\windows\$(TargetFileName) /y</PostBuildEvent> + <PostBuildEvent>xcopy $(TargetPath) D:\MediaPortal\trunk\mediaportal\xbmc\bin\Release\plugins\windows /y</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/UitzendingGemist/UitGemist/UitGemistPlugin.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/UitGemistPlugin.cs 2007-03-23 13:29:45 UTC (rev 213) +++ trunk/plugins/UitzendingGemist/UitGemist/UitGemistPlugin.cs 2007-03-23 15:15:17 UTC (rev 214) @@ -37,7 +37,7 @@ // Returns the name of the plugin which is shown in the plugin menu public string PluginName() { - return "Uitzending Gemist"; + return "TV Gemist"; } // Returns the description of the plugin is shown in the plugin menu Modified: trunk/plugins/UitzendingGemist/UitGemist.suo =================================================================== (Binary files differ) Added: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak (rev 0) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml.bak 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,52 @@ +<window> + <id>6802</id> + <defaultcontrol>50</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:RTLGemist</define> +<controls> + <import>common.window.xml</import> + <control> + <type>image</type> + <description>BackGround</description> + <id>1</id> + <posX>0</posX> + <posY>0</posY> + <width>720</width> + <height>576</height> + <texture>background3.png</texture> + </control> + <control> + <type>group</type> + <description>group element</description> + <animation>FlyInFromLeft</animation> + <layout>StackLayout</layout> + <posX>5</posX> + <posY>125</posY> + <control> + <description>Favorieten</description> + <type>button</type> + <id>2</id> + <label>Favorieten</label> + <onup>17</onup> + <ondown>3</ondown> + </control> + <control> + <description>Top Tien</description> + <type>button</type> + <id>3</id> + <label>Top Tien</label> + <onup>2</onup> + <ondown>4</ondown> + </control> + <control> + <description>Programma's</description> + <type>button</type> + <id>4</id> + <label>Programma's</label> + <onup>3</onup> + <ondown>2</ondown> + </control> + </control> + <import>common.facade.xml</import> +</controls> +</window> \ No newline at end of file Added: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak (rev 0) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml.bak 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,127 @@ +<window> + <id>6800</id> + <defaultcontrol>50</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:UitGemist</define> +<controls> + <import>common.window.xml</import> + <control> + <type>image</type> + <description>BackGround</description> + <id>1</id> + <posX>0</posX> + <posY>0</posY> + <width>720</width> + <height>576</height> + <texture>background3.png</texture> + </control> + <control> + <type>group</type> + <description>group element</description> + <animation>FlyInFromLeft</animation> + <layout>StackLayout</layout> + <posX>5</posX> + <posY>125</posY> + <control> + <description>Favorieten</description> + <type>button</type> + <id>2</id> + <label>Favorieten</label> + <onup>17</onup> + <ondown>3</ondown> + </control> + <control> + <type>selectbutton</type> + <description>Letter button</description> + <id>3</id> + <label>Titel</label> + <onup>2</onup> + <ondown>4</ondown> + </control> + <control> + <type>selectbutton</type> + <description>Letter button</description> + <id>4</id> + <label>Dag</label> + <onup>3</onup> + <ondown>5</ondown> + </control> + <control> + <type>selectbutton</type> + <description>Letter button</description> + <id>5</id> + <label>Net/zender</label> + <onup>4</onup> + <ondown>6</ondown> + </control> + <control> + <type>selectbutton</type> + <description>Letter button</description> + <id>6</id> + <label>Omroep</label> + <onup>5</onup> + <ondown>7</ondown> + </control> + <control> + <type>selectbutton</type> + <description>Letter button</description> + <id>7</id> + <label>Genre</label> + <onup>6</onup> + <ondown>8</ondown> + </control> + <control> + <description>Moet je Zien</description> + <type>button</type> + <id>8</id> + <label>Moet je zien</label> + <onup>7</onup> + <onright>50</onright> + <ondown>50</ondown> + </control> + <control> + <type>group</type> + <description>group element</description> + <control> + <type>imagelist</type> + <id>11</id> + <posX>550</posX> + <posY>350</posY> + <width>100</width> + <height>32</height> + <textureWidth>16</textureWidth> + <textureHeight>16</textureHeight> + <subitems> + <subitem>greystar.png</subitem> + <subitem>star.png</subitem> + </subitems> + <orientation>horizontal</orientation> + <align>left</align> + <percentage>#rating</percentage> + </control> + <control> + <type>textboxscrollup</type> + <description>Programma-info</description> + <id>12</id> + <posX>260</posX> + <posY>380</posY> + <width>375</width> + <height>100</height> + <label>#plot</label> + <textcolor>ffffffff</textcolor> + <font>font12</font> + </control> + <control> + <description>Bekeken</description> + <type>label</type> + <id>13</id> + <posX>260</posX> + <posY>350</posY> + <label>#votes keer bekeken</label> + <textcolor>ffffffff</textcolor> + </control> + </control> + </control> + <import>common.facade.xml</import> +</controls> +</window> \ No newline at end of file Added: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak (rev 0) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml.bak 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,136 @@ +<window> + <id>6801</id> + <defaultcontrol>10</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:Programma</define> + <controls> + <import>common.window.xml</import> + <control> + <type>image</type> + <description>BackGround</description> + <id>9</id> + <posX>0</posX> + <posY>0</posY> + <width>720</width> + <height>576</height> + <texture>background.png</texture> + </control> + <control> + <type>group</type> + <description>group element</description> + <animation>FlyInFromTop</animation> + <control> + <type>image</type> + <description>Program image</description> + <id>3</id> + <posX>60</posX> + <posY>125</posY> + <width>100</width> + <height>75</height> + <texture>background.png</texture> + </control> + <control> + <description>Naam van gekozen programma</description> + <type>label</type> + <id>2</id> + <posX>170</posX> + <posY>105</posY> + <label>#title</label> + </control> + <control> + <description>Genre</description> + <type>label</type> + <id>0</id> + <posX>555</posX> + <posY>120</posY> + <label>Genre</label> + <textcolor>ffffffff</textcolor> + </control> + <control> + <description>Display wich genre</description> + <type>label</type> + <id>4</id> + <posX>555</posX> + <posY>138</posY> + <label>#genre</label> + </control> + <control> + <description>Omroep</description> + <type>label</type> + <id>8</id> + <posX>555</posX> + <posY>162</posY> + <label>Omroep</label> + <textcolor>ffffffff</textcolor> + </control> + <control> + <description>Display which omroep</description> + <type>label</type> + <id>5</id> + <posX>555</posX> + <posY>180</posY> + <label>#credits</label> + </control> + <control> + <type>imagelist</type> + <id>7</id> + <posX>555</posX> + <posY>205</posY> + <width>100</width> + <height>32</height> + <textureWidth>16</textureWidth> + <textureHeight>16</textureHeight> + <subitems> + <subitem>greystar.png</subitem> + <subitem>star.png</subitem> + </subitems> + <orientation>horizontal</orientation> + <align>left</align> + <percentage>#rating</percentage> + </control> + <control> + <type>textboxscrollup</type> + <description>Programma-info</description> + <id>6</id> + <posX>170</posX> + <posY>125</posY> + <width>375</width> + <height>105</height> + <label>#plot</label> + <font>font12</font> + <textcolor>ffffffff</textcolor> + </control> + <control> + <description>afleveringen</description> + <type>listcontrol</type> + <id>10</id> + <posX>170</posX> + <posY>240</posY> + <width>485</width> + <height>200</height> + <textXOff>10</textXOff> + <textYOff>2</textYOff> + <textXOff2>420</textXOff2> + <textYOff2>2</textYOff2> + <spaceBetweenItems>5</spaceBetweenItems> + <textureHeight>25</textureHeight> + <keepaspectratio>no</keepaspectratio> + <font2>font10</font2> + <font3>font10</font3> + <onup>17</onup> + </control> + <control> + <type>textboxscrollup</type> + <description>Programma-info</description> + <id>1</id> + <posX>170</posX> + <posY>400</posY> + <width>375</width> + <height>100</height> + <label>#plotoutline</label> + <font>font12</font> + <textcolor>ffffffff</textcolor> + </control> + </control> + </controls> +</window> Added: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak (rev 0) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml.bak 2007-03-23 15:15:17 UTC (rev 214) @@ -0,0 +1,58 @@ +<window> + <id>6799</id> + <defaultcontrol>2</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:UitzendingGemist</define> + <define>#header.image:</define> + <define>#header.hover:hover_uitgemist.png</define> + + <controls> + <import>common.window.xml</import> + <control> + <description>BackGround</description> + <type>image</type> + <id>1</id> + <posX>0</posX> + <posY>0</posY> + <texture>background.png</texture> + </control> + <control> + <type>group</type> + <description>group element</description> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> + <layout>StackLayout</layout> + <posX>80</posX> + <posY>120</posY> + + <!-- topmost item needs an onup with a value of 17 for topbar to work --> + <control> + <description>UitzendingGemist.nl</description> + <type>button</type> + <id>2</id> + <width>575</width> + <height>90</height> + <textureNoFocus>nlgemist.png</textureNoFocus> + <textureFocus>hover_nlgemist.png</textureFocus> + <onup>17</onup> + </control> + + <!-- last item needs an ondown with a value of 2 to support wraparound --> + <control> + <description>RTL Gemist</description> + <type>button</type> + <id>3</id> + <width>575</width> + <height>90</height> + <textXOff>10</textXOff> + <textYOff>5</textYOff> + <textureNoFocus>rtlgemist.png</textureNoFocus> + <textureFocus>hover_rtlgemist.png</textureFocus> + <ondown>2</ondown> + </control> + + </control> + </controls> +</window> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-03-23 13:29:46
|
Revision: 213 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=213&view=rev Author: and-81 Date: 2007-03-23 06:29:45 -0700 (Fri, 23 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs trunk/plugins/ComSkipLauncher TVE2/Configuration.cs trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs Modified: trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs 2007-03-23 04:43:45 UTC (rev 212) +++ trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs 2007-03-23 13:29:45 UTC (rev 213) @@ -28,9 +28,9 @@ #region Members - bool _runAtStart; - string _program; - string _parameters; + bool _runAtStart = false; + string _program = DefaultProgram; + string _parameters = DefaultParameters; #endregion Members @@ -42,19 +42,15 @@ LoadSettings(); - if (_runAtStart) - Recorder.OnTvRecordingStarted += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted); - else - Recorder.OnTvRecordingEnded += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded); + Recorder.OnTvRecordingStarted += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted); + Recorder.OnTvRecordingEnded += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded); } public void Stop() { Log.Info("ComSkipLauncher: Stop"); - if (_runAtStart) - Recorder.OnTvRecordingStarted -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted); - else - Recorder.OnTvRecordingEnded -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded); + Recorder.OnTvRecordingStarted -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted); + Recorder.OnTvRecordingEnded -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded); } #endregion @@ -74,15 +70,15 @@ LoadSettings(); Configuration configuration = new Configuration(); - configuration.RunAtStart = _runAtStart; - configuration.Program = _program; - configuration.Parameters = _parameters; + configuration.RunAtStart = _runAtStart; + configuration.Program = _program; + configuration.Parameters = _parameters; if (configuration.ShowDialog() == DialogResult.OK) { - _runAtStart = configuration.RunAtStart; - _program = configuration.Program; - _parameters = configuration.Parameters; + _runAtStart = configuration.RunAtStart; + _program = configuration.Program; + _parameters = configuration.Parameters; SaveSettings(); } @@ -102,13 +98,17 @@ { Log.Debug("ComSkipLauncher: Recorder_OnTvRecordingStarted {0}", recordingFilename); + if (!_runAtStart) + return; + try { - string parameters = ProcessParameters(_parameters, recordingFilename); + string parameters = ProcessParameters(_parameters, recordingFilename, recording.Channel); Log.Info( - "ComSkipLauncher: Recording started ({0}), launching program ({1} {2}) ...", + "ComSkipLauncher: Recording started ({0} on {1}), launching program ({2} {3}) ...", recordingFilename, + recording.Channel, _program, parameters ); @@ -124,13 +124,17 @@ { Log.Debug("ComSkipLauncher: Recorder_OnTvRecordingEnded {0}", recordingFilename); + if (_runAtStart) + return; + try { - string parameters = ProcessParameters(_parameters, recordingFilename); + string parameters = ProcessParameters(_parameters, recordingFilename, recording.Channel); Log.Info( - "ComSkipLauncher: Recording ended ({0}), launching program ({1} {2}) ...", + "ComSkipLauncher: Recording ended ({0} on {1}), launching program ({2} {3}) ...", recordingFilename, + recording.Channel, _program, parameters ); @@ -156,6 +160,10 @@ } catch (Exception ex) { + _runAtStart = false; + _program = DefaultProgram; + _parameters = DefaultParameters; + Log.Error("ComSkipLauncher: {0}", ex.Message); } } @@ -176,7 +184,7 @@ } } - internal static string ProcessParameters(string input, string fileName) + internal static string ProcessParameters(string input, string fileName, string channel) { string output = String.Empty; @@ -189,7 +197,8 @@ Path.GetFileNameWithoutExtension(fileName), // {2} = Recorded filename (w/o path or extension) Path.GetDirectoryName(fileName), // {3} = Recorded file path DateTime.Now.ToShortDateString(), // {4} = Current date - DateTime.Now.ToShortTimeString() // {5} = Current time + DateTime.Now.ToShortTimeString(), // {5} = Current time + channel // {6} = Channel name ); } catch (Exception ex) Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-23 04:43:45 UTC (rev 212) +++ trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-23 13:29:45 UTC (rev 213) @@ -91,7 +91,7 @@ try { - string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text); + string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text, "test"); ComSkipLauncher.LaunchProcess(program, parameters, Path.GetDirectoryName(program), ProcessWindowStyle.Normal); } Modified: trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs 2007-03-23 04:43:45 UTC (rev 212) +++ trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs 2007-03-23 13:29:45 UTC (rev 213) @@ -30,9 +30,9 @@ #region Members - bool _runAtStart; - string _program; - string _parameters; + bool _runAtStart = true; + string _program = DefaultProgram; + string _parameters = DefaultParameters; #endregion Members @@ -104,22 +104,18 @@ try { TvServerEventArgs tvEvent = (TvServerEventArgs)eventArgs; - string parameters; + string parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName, tvEvent.channel.Name); if (tvEvent.EventType == TvServerEventType.RecordingStarted && _runAtStart) { - parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName); + Log.Info("ComSkipLauncher: Recording started ({0} on {1}), launching program ({2} {3}) ...", tvEvent.Recording.FileName, tvEvent.channel.Name, _program, parameters); - Log.Info("ComSkipLauncher: Recording started ({0}), launching program ({1} {2}) ...", tvEvent.Recording.FileName, _program, parameters); - LaunchProcess(_program, parameters, Path.GetDirectoryName(tvEvent.Recording.FileName), ProcessWindowStyle.Hidden); } else if (tvEvent.EventType == TvServerEventType.RecordingEnded && !_runAtStart) { - parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName); + Log.Info("ComSkipLauncher: Recording ended ({0} on {1}), launching program ({2} {3}) ...", tvEvent.Recording.FileName, tvEvent.channel.Name, _program, parameters); - Log.Info("ComSkipLauncher: Recording ended ({0}), launching program ({1} {2}) ...", tvEvent.Recording.FileName, _program, parameters); - LaunchProcess(_program, parameters, Path.GetDirectoryName(tvEvent.Recording.FileName), ProcessWindowStyle.Hidden); } } @@ -141,11 +137,15 @@ } catch (Exception ex) { + _runAtStart = true; + _program = DefaultProgram; + _parameters = DefaultParameters; + Log.Error("ComSkipLauncher - LoadSettings(): {0}", ex.Message); } } - internal static string ProcessParameters(string input, string fileName) + internal static string ProcessParameters(string input, string fileName, string channel) { string output = String.Empty; @@ -158,7 +158,8 @@ Path.GetFileNameWithoutExtension(fileName), // {2} = Recorded filename (w/o path or extension) Path.GetDirectoryName(fileName), // {3} = Recorded file path DateTime.Now.ToShortDateString(), // {4} = Current date - DateTime.Now.ToShortTimeString() // {5} = Current time + DateTime.Now.ToShortTimeString(), // {5} = Current time + channel // {6} = Channel name ); } catch (Exception ex) Modified: trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs =================================================================== --- trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-23 04:43:45 UTC (rev 212) +++ trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-23 13:29:45 UTC (rev 213) @@ -122,7 +122,7 @@ try { - string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text); + string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text, "test"); ComSkipLauncher.LaunchProcess(program, parameters, Path.GetDirectoryName(program), ProcessWindowStyle.Normal); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-03-23 04:43:46
|
Revision: 212 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=212&view=rev Author: and-81 Date: 2007-03-22 21:43:45 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs Modified: trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs =================================================================== --- trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs 2007-03-23 04:43:28 UTC (rev 211) +++ trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs 2007-03-23 04:43:45 UTC (rev 212) @@ -45,8 +45,6 @@ static ExternalChannelConfig[] _externalChannelConfigs; - TvServerEventHandler _eventHandler; - #endregion Variables #region Properties @@ -103,15 +101,12 @@ LoadExternalConfigs(); - ITvServerEvent events = GlobalServiceProvider.Instance.Get<ITvServerEvent>(); - _eventHandler = new TvServerEventHandler(events_OnTvServerEvent); - events.OnTvServerEvent += _eventHandler; + GlobalServiceProvider.Instance.Get<ITvServerEvent>().OnTvServerEvent += new TvServerEventHandler(events_OnTvServerEvent); } public void Stop() { - ITvServerEvent events = GlobalServiceProvider.Instance.Get<ITvServerEvent>(); - events.OnTvServerEvent -= _eventHandler; + GlobalServiceProvider.Instance.Get<ITvServerEvent>().OnTvServerEvent -= new TvServerEventHandler(events_OnTvServerEvent); } [CLSCompliant(false)] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-03-23 04:43:35
|
Revision: 211 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=211&view=rev Author: and-81 Date: 2007-03-22 21:43:28 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs trunk/plugins/MCEReplacement/MCEReplacement.cs Modified: trunk/plugins/MCEReplacement/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-03-22 17:21:30 UTC (rev 210) +++ trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-03-23 04:43:28 UTC (rev 211) @@ -377,7 +377,7 @@ //if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel) //return; - listBoxMacro.Items.Add(MCEReplacement.SetMapCommandPrefix + ""); + listBoxMacro.Items.Add(MCEReplacement.SetMapCommandPrefix + "TOGGLE"); } else if (selected == SetMouseModeText) { Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs =================================================================== --- trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-03-22 17:21:30 UTC (rev 210) +++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-03-23 04:43:28 UTC (rev 211) @@ -391,13 +391,13 @@ #region ISetupForm methods - public bool CanEnable() { return true; } - public bool HasSetup() { return true; } - public string PluginName() { return "MCE Replacement"; } - public bool DefaultEnabled() { return true; } - public int GetWindowId() { return 0; } - public string Author() { return "and-81"; } - public string Description() { return "Replaces MediaPortal's native MCE remote control support"; } + public bool CanEnable() { return true; } + public bool HasSetup() { return true; } + public string PluginName() { return "MCE Replacement"; } + public bool DefaultEnabled() { return true; } + public int GetWindowId() { return 0; } + public string Author() { return "and-81"; } + public string Description() { return "Replaces MediaPortal's native MCE remote control support"; } public void ShowPlugin() { @@ -649,8 +649,6 @@ } else if (MouseModeActive) { - //int x = Cursor.Position.X; - //int y = Cursor.Position.Y; int distance = MouseModeStep; if (MouseModeAcceleration) @@ -659,22 +657,18 @@ switch ((RemoteButton)button) { case RemoteButton.Up: - //Cursor.Position = new Point(x, y - distance); Mouse.Move(0, -distance, false); return true; case RemoteButton.Down: - //Cursor.Position = new Point(x, y + distance); Mouse.Move(0, distance, false); return true; case RemoteButton.Left: - //Cursor.Position = new Point(x - distance, y); Mouse.Move(-distance, 0, false); return true; case RemoteButton.Right: - //Cursor.Position = new Point(x + distance, y); Mouse.Move(distance, 0, false); return true; @@ -895,7 +889,6 @@ return; } } - } static void ShowNotifyDialog(string heading, string text, int timeout) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-22 17:21:39
|
Revision: 210 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=210&view=rev Author: dukus Date: 2007-03-22 10:21:30 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Tool tip in control panel Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-22 17:17:11 UTC (rev 209) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-22 17:21:30 UTC (rev 210) @@ -81,6 +81,7 @@ this.listView1.Location = new System.Drawing.Point(3, 0); this.listView1.MultiSelect = false; this.listView1.Name = "listView1"; + this.listView1.ShowItemToolTips = true; this.listView1.Size = new System.Drawing.Size(685, 277); this.listView1.SmallImageList = this.imageList1; this.listView1.TabIndex = 0; @@ -281,6 +282,7 @@ this.listView2.FullRowSelect = true; this.listView2.Location = new System.Drawing.Point(7, 48); this.listView2.Name = "listView2"; + this.listView2.ShowItemToolTips = true; this.listView2.Size = new System.Drawing.Size(672, 220); this.listView2.TabIndex = 2; this.listView2.UseCompatibleStateImageBehavior = false; Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-22 17:17:11 UTC (rev 209) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-22 17:21:30 UTC (rev 210) @@ -53,6 +53,7 @@ imageList1.Images.Add(pk._intalerStruct.Logo); item1.ImageIndex = imageList1.Images.Count - 1; } + item1.ToolTipText = pk._intalerStruct.Description; item1.SubItems.Add(pk._intalerStruct.Author); item1.SubItems.Add(pk._intalerStruct.Version); item1.SubItems.Add(Path.GetFileName(pk.FileName)); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-22 17:17:11 UTC (rev 209) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-22 17:21:30 UTC (rev 210) @@ -126,129 +126,129 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAEQAS4BdwH/AREBNAGBAf8BEQE4AYgB/wESAT4BmQH/ARIBPwGfAf8BEgFF - AbAB/wESAUcBtgH/ARMBRwG2Af8BEwFHAbYB/wETAUcBtgH/ARMBRwG2Af8BEwFHAbYB/wETAUcBtgH/ - ARMBRwG2Af8BEgFDAaoB/wESAT8BnwH/ARIBPQGWAf8BEQE4AYgB/wERATIBgQH/ARABLQF0Af//AKEA - ARIBPAGTAf8BFQFIAbYB/wEaAU4BuAH/AR4BUgG7Af8BIwFWAb8B/wEnAVsBwwH/ASwBXwHHAf8BMQFk - AcoB/wE1AWkBzgH/AToBbgHRAf8BPwFyAdQB/wFDAXcB1wH/AUcBewHaAf8BSgF+AdwB/wFNAYEB3gH/ - AVEBgQHgAf8BUgGBAeEB/wFTAYEB4gH/AVMBgQHiAf8BUgGBAeEB/wFQAYEB4AH/AU0BgAHeAf8BSAF8 - AdoB/wFDAXYB1gH/ATsBbwHRAf8BMgFmAcsB/wEcAVABvAH/ARIBOwGQAf//AI0AARIBPQGWAf8BGQFL - AbMB/wEkAVYBtwH/ASgBWgG8Af8BKwFeAcEB/wEuAWEBxQH/ATEBZQHJAf8BNAFoAc0B/wE3AWsBzwH/ - ATsBbgHRAf8BPgFxAdMB/wFBAXQB1QH/AUQBdwHXAf8BRwF7AdoB/wFKAX0B3AH/AU0BgQHeAf8BUAGB - AeAB/wFTAYEB4gH/AVcBgQHkAf8BWgGBAeYB/wFdAYIB6QH/AWABhQHrAf8BYwGIAe0B/wFmAYsB7wH/ - AWkBjgHxAf8BbAGSAfMB/wFvAZQB9QH/AW8BlAH1Af8BNgFpAc4B/wERATwBkwH//wCJAAEUAUcBswH/ - ASABUgGwAf8BJAFWAbUB/wEnAVkBugH/ASsBXQG/Af8BLgFgAcMB/wExAWQByAH/ATQBaAHMAf8BNwFr - Ac8B/wE6AW4B0QH/AT0BcQHTAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BSgF9AdwB/wFNAYAB3gH/ - AVABgQHgAf8BUwGBAeIB/wFWAYEB5AH/AVkBgQHmAf8BXQGCAegB/wFgAYUB6gH/AWMBiAHsAf8BZgGL - Ae8B/wFpAY4B8QH/AWwBkQHzAf8BbwGUAfUB/wFyAZcB9wH/AXEBlgH2Af8BHgFSAb4B//8AiQABFwFJ - Aa8B/wEgAVEBrgH/ASQBVQGzAf8BJwFZAbgB/wEqAVwBvQH/AS0BYAHBAf8BMAFjAcYB/wE0AWcBygH/ - ATcBagHOAf8BOgFtAdAB/wE9AXEB0wH/AUABdAHVAf8BQwF3AdcB/wFGAXoB2QH/AUkBfQHbAf8BTAGA - Ad0B/wFQAYEB3wH/AVMBgQHhAf8BVgGBAeQB/wFZAYEB5gH/AVwBgQHoAf8BXwGEAeoB/wFiAYcB7AH/ - AWUBigHuAf8BaAGNAfAB/wFrAZAB8gH/AW0BkwH0Af8BbwGUAfUB/wFwAZUB9gH/ATcBawHOAf//AIkA - ARgBSgGsAf8BIAFQAawB/wEjAVQBsQH/AScBWAG2Af8BKgFbAbsB/wEtAV8BvwH/ATABYgHEAf8BMwFm - AcgB/wE2AWoBzQH/ATkBbQHQAf8BPAFwAdIB/wFAAXMB1AH/AUMBdgHWAf8BRgF5AdkB/wFJAXwB2wH/ - AUwBfwHdAf8BTwGBAd8B/wFSAYEB4QH/AVUBgQHjAf8BWAGBAeUB/wFbAYEB5wH/AV4BgwHpAf8BYQGG - AesB/wFkAYkB7QH/AWYBjAHvAf8BaQGOAfEB/wFrAZAB8gH/AW0BkgHzAf8BbQGTAfQB/wFAAXQB1QH/ - /wCFAAERATEBfwH/ARkBSQGpAf8BHwFPAakB/wEiAVMBrwH/ASUBVwG0Af8BKQFaAbkB/wEsAV4BvQH/ - AS8BYgHCAf8BMgFlAcYB/wE1AWgBywH/ATkBbAHPAf8BPAFvAdIB/wE/AXIB1AH/AUIBdQHWAf8BRQF4 - AdgB/wFIAXsB2gH/AUsBfgHcAf8BRwF7Ad4B/wE5AXEB2wH/AUsBgQHfAf8BPwF5Ad8B/wFRAYEB5wH/ - AWwBjgHrAf8BUAGBAeoB/wFiAYcB7AH/AWUBigHuAf8BZwGMAe8B/wFpAY4B8QH/AWoBjwHxAf8BagGQ - AfIB/wFHAXsB2gH/AREBMQF/Af//AIEAAREBNgGCAf8BHQFMAacB/wEeAU4BpwH/ASEBUgGsAf8BJQFW - AbIB/wEoAVkBtwH/ASwBXQG7Af8BLwFhAcAB/wEyAWQBxAH/ATUBaAHJAf8BOAFrAc0B/wE7AW4B0QH/ - AT4BcQHTAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BSgF9AdsB/wE+AXQB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BYgGGAesB/wFaAYEB6wH/AWIBiAHsAf8BZAGKAe4B/wFmAYsB7wH/AWcBjAHvAf8BZwGN - AfAB/wFNAYEB3gH/AREBNgGCAf//AIEAAREBOgGNAf8BRgFtAbMB/wE3AWEBrgH/ASIBUQGqAf8BJAFU - Aa8B/wEnAVgBtAH/ASsBXAG5Af8BLgFfAb4B/wExAWMBwgH/ATQBZgHHAf8BNwFqAcsB/wE6AW0BzwH/ - AT0BcAHSAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BQgF3AdsB/wEgAWEB1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BPAF5AeYB/wFUAYEB6wH/AWIBhwHsAf8BYwGIAe0B/wFkAYkB7QH/AWUBigHuAf8BUgGB - AeEB/wERAToBjgH//wCBAAESAT8BnwH/AVUBeAG1Af8BUgF2AbYB/wFBAWoBtAH/AR0BTwGtAf8BJgFX - AbIB/wEpAVoBtwH/AS0BXgG7Af8BMAFhAcAB/wEzAWUBxAH/ATYBaAHJAf8BOQFsAc0B/wE8AW8B0QH/ - AT4BcgHUAf8BQgF1AdYB/wE6AXIB1wH/AUUBdgHdAf8BcgGLAecF/wFfAYIB4wH/ASsBaAHbAf8BLAFq - Ad0B/wGJAakB7wn/AXYBlgHsAf8BWwGEAeoB/wFgAYYB6wH/AWEBhwHsAf8BYgGHAewB/wFVAYEB4wH/ - ARIBPwGfAf//AIEAARMBQQGkAf8BawGBAbsB/wFZAXwBtwH/AVMBeAG4Af8BRQFvAbUB/wEfAVABrwH/ - ASgBWQG0Af8BKwFcAbkB/wEvAWABvgH/ATIBYwHCAf8BNQFnAcYB/wE3AWoBygH/AToBbQHOAf8BPQFx - AdIB/wFAAXQB1QH/ATIBaQHSAf8B2wHlAfUF/wG/AdIB9QH/AS4BaQHYAf8BUAGBAeAB/wFTAYEB4QH/ - AS0BawHfAf8C/gH9Af8B5AHqAfwB/wFgAYcB6gH/AVwBggHoAf8BXgGDAekB/wFeAYQB6gH/AV8BhAHq - Af8BVwGBAeQB/wESAUEBpQH//wCBAAEXAUkBtQH/AX4BigHCAf8BYQGBAbkB/wFaAX0BuQH/AVsBfAG+ - Af8BOwFmAbUB/wEjAVMBsQH/ASoBWwG2Af8BLQFeAbsB/wEwAWIBwAH/AS0BXQHEAf8BHgFWAcIB/wEs - AWIBygH/ATABZQHQAf8BPgFyAdMB/wEpAWQB1gH/AYMBowHmBf8BrwHHAe8B/wEvAWoB2QH/AU4BgQHe - Af8BUQGBAeAB/wEwAWsB2wH/AfQB+AH9Af8BVwGBAeoB/wFEAX0B5QH/AVoBgQHmAf8BWwGBAecB/wFb - AYEB6AH/AVwBgQHoAf8BVwGBAeUB/wESAUcBtgH//wCBAAEaAUwBtQH/AYMBmQHIAf8BZwGBAboB/wFi - AYEBugH/AVwBfwG7Af8BXAF/Ab8B/wEdAVIBsAH/ASgBWQG0Af8BKwFdAbgB/wEvAWABvQH/ARwBUwG7 - Af8ByAHUAfEF/wEOAUgBwQH/ARkBVgHJAf8BcQGJAd8B/wFhAYEB3gH/AS8BagHUBf8BKQFkAdYB/wEy - AWoB2QH/ATABawHaAf8BTQGBAeIF/wHUAeEB9AH/AUsBgQHjAf8BVwGBAeQB/wFYAYEB5QH/AVkBgQHm - Af8BWQGBAeYB/wFXAYEB5QH/ARMBRwG1Af//AIEAAR0BTgG1Af8BlAGmAc4B/wFuAYEBuwH/AWkBgQG7 - Af8BYwGBAbwB/wFkAYEBwAH/ATwBYgG0Af8BEwFIAasB/wEwAV8BuQH/AQ4BPwGsAf8BDgEyAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFAAXgB4gH/AVQBgQHi - Af8BVQGBAeMB/wFWAYEB4wH/AVYBgQHkAf8BVgGBAeQB/wETAUcBtgH//wCBAAEgAVEBtgH/AaMBswHU - Af8BdQGCAbwB/wFwAYEBvQH/AWoBgQG9Af8BZwGBAb0B/wFQAXcBugH/ARsBTAGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATcBbQHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEdAV8B1wH/AT0BdQHfAf8BSAF8Ad8B/wFR - AYEB4AH/AVIBgQHhAf8BUwGBAeEB/wFTAYEB4gH/AVMBgQHiAf8BEwFHAbYB//8AgQABIgFSAbcB/wGy - Ab8B2gH/AXsBhwG8Af8BdwGEAb4B/wFxAYEBvgH/AWsBgQG/Af8BbAGBAcIB/wEhAVEBrA3/AZYBrgHg - Af8BJwFZAb4B/wEOAUUBvAH/AUwBeQHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRwF7AdcB/wFJ - AXsB2AH/Ae0B8wH9Af8BXQGBAeEB/wFAAXYB2wH/AUwBgAHdAf8BTQGBAd4B/wFOAYEB3wH/AU8BgQHf - Af8BUAGBAeAB/wFQAYEB4AH/AVABgQHgAf8BFAFIAbYB//8AgQABIgFSAbcB/wHAAcsB4QH/AYEBjAG+ - Af8BfQGJAb8B/wF4AYYBvwH/AXIBgQHAAf8BcwGEAcAB/wEOATcBmQH/AZIBqAHXBf8BegGLAdEB/wEO - AUQBrQH/AScBWwG/Af8BLwFgAcIB/wEmAV0BwQH/AQ4BSgHDAf8B5wHvAfoJ/wHiAeoB9wH/ASYBYAHP - Af8BMgFsAdcB/wE5AXEB2QH/AUgBewHaAf8BSQF9AdsB/wFKAX4B3AH/AUwBfwHdAf8BTAGAAd0B/wFN - AYAB3gH/AU0BgQHeAf8BTQGBAd4B/wETAUcBtgH//wCBAAEhAVEBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AX8BiwHBAf8BeQGHAcEB/wFyAYIBvgH/AUUBcAGxCf8BDgEzAaIB/wEjAV0BtwH/AS4BXwG7 - Af8BMQFiAb8B/wE0AWUBwwH/ASYBXAHCAf8BWQGBAdMJ/wE6AW8B1AH/ATcBbQHVAf8BQgF1AdYB/wFE - AXcB1wH/AUUBeQHYAf8BRgF6AdkB/wFIAXsB2gH/AUkBfAHbAf8BSQF9AdsB/wFKAX0B3AH/AUoBfgHc - Af8BSgF+AdwB/wETAUcBtgH//wCBAAEeAU8BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BdgGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDgE4AaIB/wEpAVoBtAH/ASwBXQG4Af8BLwFgAbwB/wEx - AWMBwAH/AS0BYgHEAf8BHQFYAcQF/wG4AckB7wH/AQ8BTgHJAf8BOgFsAdIB/wE/AXMB1AH/AUEBdAHV - Af8BQgF2AdYB/wFEAXcB1wH/AUUBeAHYAf8BRgF5AdkB/wFGAXoB2QH/AUcBewHaAf8BRwF7AdoB/wFG - AXkB2QH/ARMBRwG1Af//AIEAARkBTAG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGA - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEOAS8BmwH/AScBWAGwAf8BKgFbAbUB/wEsAV4BuQH/ - AS8BYAG9Af8BJQFaAcEB/wE9AW0ByAn/AXABhwHeAf8BKwFhAdEB/wE9AXAB0wH/AT4BcgHTAf8BQAFz - AdUB/wFBAXQB1QH/AUIBdQHWAf8BQwF2AdcB/wFEAXcB1wH/AUQBeAHYAf8BRQF4AdgB/wFBAXUB1gH/ - ARIBRgG2Af//AIEAARMBQQGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AX8BigHAAf8BXQF/AbUB/wHIAdIB6AX/ATgBYQGuAf8BDgFDAaUB/wEoAVgBsQH/ASoBWwG1Af8BIwFa - AbkB/wEOAUEBsQH/AbkBxQHsDf8BIQFaAcgB/wE6AW4B0QH/ATwBbwHSAf8BPQFxAdMB/wE+AXIB0wH/ - AT8BcwHUAf8BQAF0AdUB/wFBAXQB1QH/AUEBdQHWAf8BQgF1AdYB/wE8AXAB0gH/ARIBQAGiAf//AIEA - ARIBPwGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BdAGE - Ab4B/wG3AcYB4wn/AUEBaAG0Af8BDgEuAZsB/wEOATgBogH/AQ4BOgGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUUBdQHLAf8BagGCAdUB/wEnAVwBxgH/ATcBawHOAf8BOQFtAdAB/wE6AW4B0QH/ATsBbwHSAf8BPAFw - AdIB/wE9AXEB0wH/AT4BcQHTAf8BPgFyAdMB/wE/AXIB1AH/ATcBawHPAf8BEgE/AZ8B//8AgQABEQE5 + ASADAAEBAQABIAYAAUAqAAERAS8BeAH/ARIBNQGBAf8BEgE5AYgB/wETAT8BmQH/ARMBQAGfAf8BEwFG + AbAB/wETAUgBtgH/ARQBSAG2Af8BFAFIAbYB/wEUAUgBtgH/ARQBSAG2Af8BFAFIAbYB/wEUAUgBtgH/ + ARQBSAG2Af8BEwFEAaoB/wETAUABnwH/ARMBPgGWAf8BEgE5AYgB/wESATMBgQH/AREBLgF1Af//AKEA + ARMBPQGTAf8BFgFJAbYB/wEbAU8BuAH/AR8BUwG7Af8BJAFXAb8B/wEoAVwBwwH/AS0BYAHHAf8BMgFl + AcoB/wE2AWoBzgH/ATsBbwHRAf8BQAFzAdQB/wFEAXgB1wH/AUgBfAHaAf8BSwF/AdwB/wFOAYEB3gH/ + AVIBgQHgAf8BUwGBAeEB/wFUAYEB4gH/AVQBgQHiAf8BUwGBAeEB/wFRAYEB4AH/AU4BgQHeAf8BSQF9 + AdoB/wFEAXcB1gH/ATwBcAHRAf8BMwFnAcsB/wEdAVEBvAH/ARMBPAGQAf//AI0AARMBPgGWAf8BGgFM + AbMB/wElAVcBtwH/ASkBWwG8Af8BLAFfAcEB/wEvAWIBxQH/ATIBZgHJAf8BNQFpAc0B/wE4AWwBzwH/ + ATwBbwHRAf8BPwFyAdMB/wFCAXUB1QH/AUUBeAHXAf8BSAF8AdoB/wFLAX4B3AH/AU4BgQHeAf8BUQGB + AeAB/wFUAYEB4gH/AVgBgQHkAf8BWwGBAeYB/wFeAYIB6QH/AWEBhQHrAf8BZAGIAe0B/wFnAYsB7wH/ + AWoBjgHxAf8BbQGSAfMB/wFwAZQB9QH/AXABlAH1Af8BNwFqAc4B/wESAT0BkwH//wCJAAEVAUgBswH/ + ASEBUwGwAf8BJQFXAbUB/wEoAVoBugH/ASwBXgG/Af8BLwFhAcMB/wEyAWUByAH/ATUBaQHMAf8BOAFs + Ac8B/wE7AW8B0QH/AT4BcgHTAf8BQgF1AdUB/wFFAXgB1wH/AUgBewHZAf8BSwF+AdwB/wFOAYEB3gH/ + AVEBgQHgAf8BVAGBAeIB/wFXAYEB5AH/AVoBgQHmAf8BXgGCAegB/wFhAYUB6gH/AWQBiAHsAf8BZwGL + Ae8B/wFqAY4B8QH/AW0BkQHzAf8BcAGUAfUB/wFzAZcB9wH/AXIBlgH2Af8BHwFTAb4B//8AiQABGAFK + Aa8B/wEhAVIBrgH/ASUBVgGzAf8BKAFaAbgB/wErAV0BvQH/AS4BYQHBAf8BMQFkAcYB/wE1AWgBygH/ + ATgBawHOAf8BOwFuAdAB/wE+AXIB0wH/AUEBdQHVAf8BRAF4AdcB/wFHAXsB2QH/AUoBfgHbAf8BTQGB + Ad0B/wFRAYEB3wH/AVQBgQHhAf8BVwGBAeQB/wFaAYEB5gH/AV0BgQHoAf8BYAGEAeoB/wFjAYcB7AH/ + AWYBigHuAf8BaQGNAfAB/wFsAZAB8gH/AW4BkwH0Af8BcAGUAfUB/wFxAZUB9gH/ATgBbAHOAf//AIkA + ARkBSwGsAf8BIQFRAawB/wEkAVUBsQH/ASgBWQG2Af8BKwFcAbsB/wEuAWABvwH/ATEBYwHEAf8BNAFn + AcgB/wE3AWsBzQH/AToBbgHQAf8BPQFxAdIB/wFBAXQB1AH/AUQBdwHWAf8BRwF6AdkB/wFKAX0B2wH/ + AU0BgAHdAf8BUAGBAd8B/wFTAYEB4QH/AVYBgQHjAf8BWQGBAeUB/wFcAYEB5wH/AV8BgwHpAf8BYgGG + AesB/wFlAYkB7QH/AWcBjAHvAf8BagGOAfEB/wFsAZAB8gH/AW4BkgHzAf8BbgGTAfQB/wFBAXUB1QH/ + /wCFAAESATIBgAH/ARoBSgGpAf8BIAFQAakB/wEjAVQBrwH/ASYBWAG0Af8BKgFbAbkB/wEtAV8BvQH/ + ATABYwHCAf8BMwFmAcYB/wE2AWkBywH/AToBbQHPAf8BPQFwAdIB/wFAAXMB1AH/AUMBdgHWAf8BRgF5 + AdgB/wFJAXwB2gH/AUwBfwHcAf8BSAF8Ad4B/wE6AXIB2wH/AUwBgQHfAf8BQAF6Ad8B/wFSAYEB5wH/ + AW0BjgHrAf8BUQGBAeoB/wFjAYcB7AH/AWYBigHuAf8BaAGMAe8B/wFqAY4B8QH/AWsBjwHxAf8BawGQ + AfIB/wFIAXwB2gH/ARIBMgGAAf//AIEAARIBNwGCAf8BHgFNAacB/wEfAU8BpwH/ASIBUwGsAf8BJgFX + AbIB/wEpAVoBtwH/AS0BXgG7Af8BMAFiAcAB/wEzAWUBxAH/ATYBaQHJAf8BOQFsAc0B/wE8AW8B0QH/ + AT8BcgHTAf8BQgF1AdUB/wFFAXgB1wH/AUgBewHZAf8BSwF+AdsB/wE/AXUB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BYwGGAesB/wFbAYEB6wH/AWMBiAHsAf8BZQGKAe4B/wFnAYsB7wH/AWgBjAHvAf8BaAGN + AfAB/wFOAYEB3gH/ARIBNwGCAf//AIEAARIBOwGNAf8BRwFuAbMB/wE4AWIBrgH/ASMBUgGqAf8BJQFV + Aa8B/wEoAVkBtAH/ASwBXQG5Af8BLwFgAb4B/wEyAWQBwgH/ATUBZwHHAf8BOAFrAcsB/wE7AW4BzwH/ + AT4BcQHSAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BQwF4AdsB/wEhAWIB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BPQF6AeYB/wFVAYEB6wH/AWMBhwHsAf8BZAGIAe0B/wFlAYkB7QH/AWYBigHuAf8BUwGB + AeEB/wESATsBjgH//wCBAAETAUABnwH/AVYBeQG1Af8BUwF3AbYB/wFCAWsBtAH/AR4BUAGtAf8BJwFY + AbIB/wEqAVsBtwH/AS4BXwG7Af8BMQFiAcAB/wE0AWYBxAH/ATcBaQHJAf8BOgFtAc0B/wE9AXAB0QH/ + AT8BcwHUAf8BQwF2AdYB/wE7AXMB1wH/AUYBdwHdAf8BcwGLAecF/wFgAYIB4wH/ASwBaQHbAf8BLQFr + Ad0B/wGJAakB7wn/AXcBlgHsAf8BXAGEAeoB/wFhAYYB6wH/AWIBhwHsAf8BYwGHAewB/wFWAYEB4wH/ + ARMBQAGfAf//AIEAARQBQgGkAf8BbAGBAbsB/wFaAX0BtwH/AVQBeQG4Af8BRgFwAbUB/wEgAVEBrwH/ + ASkBWgG0Af8BLAFdAbkB/wEwAWEBvgH/ATMBZAHCAf8BNgFoAcYB/wE4AWsBygH/ATsBbgHOAf8BPgFy + AdIB/wFBAXUB1QH/ATMBagHSAf8B2wHlAfUF/wG/AdIB9QH/AS8BagHYAf8BUQGBAeAB/wFUAYEB4QH/ + AS4BbAHfAf8C/gH9Af8B5AHqAfwB/wFhAYcB6gH/AV0BggHoAf8BXwGDAekB/wFfAYQB6gH/AWABhAHq + Af8BWAGBAeQB/wETAUIBpQH//wCBAAEYAUoBtQH/AX8BigHCAf8BYgGBAbkB/wFbAX4BuQH/AVwBfQG+ + Af8BPAFnAbUB/wEkAVQBsQH/ASsBXAG2Af8BLgFfAbsB/wExAWMBwAH/AS4BXgHEAf8BHwFXAcIB/wEt + AWMBygH/ATEBZgHQAf8BPwFzAdMB/wEqAWUB1gH/AYMBowHmBf8BrwHHAe8B/wEwAWsB2QH/AU8BgQHe + Af8BUgGBAeAB/wExAWwB2wH/AfQB+AH9Af8BWAGBAeoB/wFFAX4B5QH/AVsBgQHmAf8BXAGBAecB/wFc + AYEB6AH/AV0BgQHoAf8BWAGBAeUB/wETAUgBtgH//wCBAAEbAU0BtQH/AYMBmQHIAf8BaAGBAboB/wFj + AYEBugH/AV0BgAG7Af8BXQGAAb8B/wEeAVMBsAH/ASkBWgG0Af8BLAFeAbgB/wEwAWEBvQH/AR0BVAG7 + Af8ByAHUAfEF/wEPAUkBwQH/ARoBVwHJAf8BcgGJAd8B/wFiAYEB3gH/ATABawHUBf8BKgFlAdYB/wEz + AWsB2QH/ATEBbAHaAf8BTgGBAeIF/wHUAeEB9AH/AUwBgQHjAf8BWAGBAeQB/wFZAYEB5QH/AVoBgQHm + Af8BWgGBAeYB/wFYAYEB5QH/ARQBSAG1Af//AIEAAR4BTwG1Af8BlAGmAc4B/wFvAYEBuwH/AWoBgQG7 + Af8BZAGBAbwB/wFlAYEBwAH/AT0BYwG0Af8BFAFJAasB/wExAWABuQH/AQ8BQAGsAf8BDwEzAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFBAXkB4gH/AVUBgQHi + Af8BVgGBAeMB/wFXAYEB4wH/AVcBgQHkAf8BVwGBAeQB/wEUAUgBtgH//wCBAAEhAVIBtgH/AaMBswHU + Af8BdgGCAbwB/wFxAYEBvQH/AWsBgQG9Af8BaAGBAb0B/wFRAXgBugH/ARwBTQGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATgBbgHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEeAWAB1wH/AT4BdgHfAf8BSQF9Ad8B/wFS + AYEB4AH/AVMBgQHhAf8BVAGBAeEB/wFUAYEB4gH/AVQBgQHiAf8BFAFIAbYB//8AgQABIwFTAbcB/wGy + Ab8B2gH/AXwBhwG8Af8BeAGEAb4B/wFyAYEBvgH/AWwBgQG/Af8BbQGBAcIB/wEiAVIBrA3/AZYBrgHg + Af8BKAFaAb4B/wEPAUYBvAH/AU0BegHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BSAF8AdcB/wFK + AXwB2AH/Ae0B8wH9Af8BXgGBAeEB/wFBAXcB2wH/AU0BgQHdAf8BTgGBAd4B/wFPAYEB3wH/AVABgQHf + Af8BUQGBAeAB/wFRAYEB4AH/AVEBgQHgAf8BFQFJAbYB//8AgQABIwFTAbcB/wHAAcsB4QH/AYEBjAG+ + Af8BfgGJAb8B/wF5AYYBvwH/AXMBgQHAAf8BdAGEAcAB/wEPATgBmQH/AZIBqAHXBf8BewGLAdEB/wEP + AUUBrQH/ASgBXAG/Af8BMAFhAcIB/wEnAV4BwQH/AQ8BSwHDAf8B5wHvAfoJ/wHiAeoB9wH/AScBYQHP + Af8BMwFtAdcB/wE6AXIB2QH/AUkBfAHaAf8BSgF+AdsB/wFLAX8B3AH/AU0BgAHdAf8BTQGBAd0B/wFO + AYEB3gH/AU4BgQHeAf8BTgGBAd4B/wEUAUgBtgH//wCBAAEiAVIBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AYABiwHBAf8BegGHAcEB/wFzAYIBvgH/AUYBcQGxCf8BDwE0AaIB/wEkAV4BtwH/AS8BYAG7 + Af8BMgFjAb8B/wE1AWYBwwH/AScBXQHCAf8BWgGBAdMJ/wE7AXAB1AH/ATgBbgHVAf8BQwF2AdYB/wFF + AXgB1wH/AUYBegHYAf8BRwF7AdkB/wFJAXwB2gH/AUoBfQHbAf8BSgF+AdsB/wFLAX4B3AH/AUsBfwHc + Af8BSwF/AdwB/wEUAUgBtgH//wCBAAEfAVABtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BdwGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDwE5AaIB/wEqAVsBtAH/AS0BXgG4Af8BMAFhAbwB/wEy + AWQBwAH/AS4BYwHEAf8BHgFZAcQF/wG4AckB7wH/ARABTwHJAf8BOwFtAdIB/wFAAXQB1AH/AUIBdQHV + Af8BQwF3AdYB/wFFAXgB1wH/AUYBeQHYAf8BRwF6AdkB/wFHAXsB2QH/AUgBfAHaAf8BSAF8AdoB/wFH + AXoB2QH/ARQBSAG1Af//AIEAARoBTQG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGB + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEPATABmwH/ASgBWQGwAf8BKwFcAbUB/wEtAV8BuQH/ + ATABYQG9Af8BJgFbAcEB/wE+AW4ByAn/AXEBhwHeAf8BLAFiAdEB/wE+AXEB0wH/AT8BcwHTAf8BQQF0 + AdUB/wFCAXUB1QH/AUMBdgHWAf8BRAF3AdcB/wFFAXgB1wH/AUUBeQHYAf8BRgF5AdgB/wFCAXYB1gH/ + ARMBRwG2Af//AIEAARQBQgGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AYABigHAAf8BXgGAAbUB/wHIAdIB6AX/ATkBYgGuAf8BDwFEAaUB/wEpAVkBsQH/ASsBXAG1Af8BJAFb + AbkB/wEPAUIBsQH/AbkBxQHsDf8BIgFbAcgB/wE7AW8B0QH/AT0BcAHSAf8BPgFyAdMB/wE/AXMB0wH/ + AUABdAHUAf8BQQF1AdUB/wFCAXUB1QH/AUIBdgHWAf8BQwF2AdYB/wE9AXEB0gH/ARMBQQGiAf//AIEA + ARMBQAGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BdQGE + Ab4B/wG3AcYB4wn/AUIBaQG0Af8BDwEvAZsB/wEPATkBogH/AQ8BOwGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUYBdgHLAf8BawGCAdUB/wEoAV0BxgH/ATgBbAHOAf8BOgFuAdAB/wE7AW8B0QH/ATwBcAHSAf8BPQFx + AdIB/wE+AXIB0wH/AT8BcgHTAf8BPwFzAdMB/wFAAXMB1AH/ATgBbAHPAf8BEwFAAZ8B//8AgQABEgE6 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BDgEsAasB/wEeAVUBvQH/ASoBXgHFAf8BMwFmAcgB/wE1AWgBywH/ATYBagHOAf8BNwFr - Ac8B/wE4AWwB0AH/ATkBbQHQAf8BOgFuAdEB/wE7AW8B0QH/ATsBbwHSAf8BPAFvAdIB/wEyAWYBywH/ - AREBOQGLAf//AIEAAREBNgGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWwBgQG8Af8BDgEaAYUB/wHrAfAB9Qn/AakBuwHhCf8BbgGC - Ac4B/wEmAVkBvQH/AS8BYQHBAf8BMQFjAcUB/wEyAWUByAH/ATMBZwHLAf8BNQFoAc0B/wE2AWkBzgH/ - ATcBagHOAf8BNwFrAc8B/wE4AWwBzwH/ATgBbAHQAf8BOQFtAdAB/wEtAWABxwH/AREBNgGBAf//AIEA - ARABMAF8Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BegGHAcQB/wHQAdwB7QX/AT4BaAGwAf8BDgEfAZUB/wESAUgBqQH/ - AakBuAHhAf8BDwFFAa0B/wEaAVEBswH/ASYBWAG9Af8BJwFaAcEB/wEpAWIBxAH/ATEBZAHHAf8BMgFl - AcoB/wEzAWcBzAH/ATQBZwHMAf8BNQFoAc0B/wE1AWkBzQH/ATYBaQHNAf8BNgFpAc4B/wEoAVsBxAH/ - AREBMAF8Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX8BjQHIAf8BbwGC - AcEB/wFlAYEBwwH/AVsBgQHEAf8BXQGBAcUB/wFfAYEBxQH/AVoBgAHGAf8BVQF+AcYB/wFLAXgByQH/ - AUMBcQHJAf8BPgFuAcsB/wE5AWsBywH/ATQBZwHLAf8BMgFlAcsB/wEyAWYBywH/ATMBZgHMAf8BMwFn - AcwB/wEjAVYBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BDwEtAasB/wEfAVYBvQH/ASsBXwHFAf8BNAFnAcgB/wE2AWkBywH/ATcBawHOAf8BOAFs + Ac8B/wE5AW0B0AH/AToBbgHQAf8BOwFvAdEB/wE8AXAB0QH/ATwBcAHSAf8BPQFwAdIB/wEzAWcBywH/ + ARIBOgGLAf//AIEAARIBNwGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AW0BgQG8Af8BDwEbAYUB/wHrAfAB9Qn/AakBuwHhCf8BbwGC + Ac4B/wEnAVoBvQH/ATABYgHBAf8BMgFkAcUB/wEzAWYByAH/ATQBaAHLAf8BNgFpAc0B/wE3AWoBzgH/ + ATgBawHOAf8BOAFsAc8B/wE5AW0BzwH/ATkBbQHQAf8BOgFuAdAB/wEuAWEBxwH/ARIBNwGBAf//AIEA + AREBMQF9Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BewGHAcQB/wHQAdwB7QX/AT8BaQGwAf8BDwEgAZUB/wETAUkBqQH/ + AakBuAHhAf8BEAFGAa0B/wEbAVIBswH/AScBWQG9Af8BKAFbAcEB/wEqAWMBxAH/ATIBZQHHAf8BMwFm + AcoB/wE0AWgBzAH/ATUBaAHMAf8BNgFpAc0B/wE2AWoBzQH/ATcBagHNAf8BNwFqAc4B/wEpAVwBxAH/ + ARIBMQF9Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AYABjQHIAf8BcAGC + AcEB/wFmAYEBwwH/AVwBgQHEAf8BXgGBAcUB/wFgAYEBxQH/AVsBgQHGAf8BVgF/AcYB/wFMAXkByQH/ + AUQBcgHJAf8BPwFvAcsB/wE6AWwBywH/ATUBaAHLAf8BMwFmAcsB/wEzAWcBywH/ATQBZwHMAf8BNAFo + AcwB/wEkAVcBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AYABiwHGAf8BegGHAcYB/wFwAYIBxwH/AWoBgQHHAf8BZAGBAccB/wFeAYEBxwH/AVgBfwHIAf8BUgF7 - AcgB/wFMAXcByQH/AUYBcwHKAf8BQAFvAcoB/wE5AWoBywH/ATMBZgHKAf8BMAFjAckB/wEwAWQBygH/ - ATABZAHKAf8BHgFSAb0B//8AiQABagGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AYEBiwHGAf8BewGHAcYB/wFxAYIBxwH/AWsBgQHHAf8BZQGBAccB/wFfAYEBxwH/AVkBgAHIAf8BUwF8 + AcgB/wFNAXgByQH/AUcBdAHKAf8BQQFwAcoB/wE6AWsBywH/ATQBZwHKAf8BMQFkAckB/wExAWUBygH/ + ATEBZQHKAf8BHwFTAb0B//8AiQABawGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGBAZAByAH/AX0BiwHHAf8BdwGHAccB/wFwAYIBxwH/AWoBgQHHAf8BYwGBAccB/wFdAYEBxwH/ - AVcBfgHIAf8BUQF6AcgB/wFLAXYByQH/AUQBcQHJAf8BPgFtAcoB/wE3AWgBygH/ATEBZAHJAf8BLQFh - AcgB/wEtAWEByAH/ARkBTQG6Af//AIkAASkBWAG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AX4BiwHHAf8BeAGHAccB/wFxAYIBxwH/AWsBgQHHAf8BZAGBAccB/wFeAYEBxwH/ + AVgBfwHIAf8BUgF7AcgB/wFMAXcByQH/AUUBcgHJAf8BPwFuAcoB/wE4AWkBygH/ATIBZQHJAf8BLgFi + AcgB/wEuAWIByAH/ARoBTgG6Af//AIkAASoBWQG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AX0BiwHHAf8BdgGGAccB/wFwAYIBxwH/AWkBgQHHAf8BYwGB - AccB/wFdAYEBxwH/AVYBfQHHAf8BUAF5AcgB/wFJAXUByAH/AUMBcAHIAf8BPAFrAckB/wE1AWcByAH/ - AS8BYQHHAf8BKAFcAcQB/wETAUYBswH//wCJAAEQATMBgQH/AWgBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AX4BiwHHAf8BdwGGAccB/wFxAYIBxwH/AWoBgQHHAf8BZAGB + AccB/wFeAYEBxwH/AVcBfgHHAf8BUQF6AcgB/wFKAXYByAH/AUQBcQHIAf8BPQFsAckB/wE2AWgByAH/ + ATABYgHHAf8BKQFdAcQB/wEUAUcBswH//wCJAAERATQBgQH/AWkBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGAAYwBxQH/AXsBiQHGAf8BdgGGAccB/wFvAYEBxwH/ - AWgBgQHGAf8BYgGBAcYB/wFcAYEBxgH/AVUBfAHHAf8BTwF3AccB/wFIAXMBxwH/AUEBbgHIAf8BOgFq - AcgB/wEwAWEBxQH/ARgBTAG5Af8BEAEvAXoB//8AjQABEQEzAYEB/wEmAVYBugH/AWIBgQHMAf8BgQGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGBAYwBxQH/AXwBiQHGAf8BdwGGAccB/wFwAYEBxwH/ + AWkBgQHGAf8BYwGBAcYB/wFdAYEBxgH/AVYBfQHHAf8BUAF4AccB/wFJAXQBxwH/AUIBbwHIAf8BOwFr + AcgB/wExAWIBxQH/ARkBTQG5Af8BEQEwAXsB//8AjQABEgE0AYEB/wEnAVcBugH/AWMBgQHMAf8BgQGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfgGN - AcwB/wFsAYEByQH/AVkBfwHFAf8BRgFwAcIB/wE7AWcBwAH/ATABXwG+Af8BJwFYAb0B/wEfAVEBugH/ - ARQBSAG2Af8BEAEwAX0B//8ApQABEQEyAYEB/wERATgBiAH/ARIBPQGWAf8BEgE/AZ8B/wESAUQBrQH/ - ARMBRwG2Af8BEgFHAbYB/wEVAUgBtgH/ARYBSQG2Af8BFgFJAbYB/wEUAUcBtgH/ARIBRwG2Af8BEwFH - AbYB/wESAUIBpwH/ARIBPwGfAf8BEgE7AZAB/wERATcBhQH/AREBMQF/Af//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfwGN + AcwB/wFtAYEByQH/AVoBgAHFAf8BRwFxAcIB/wE8AWgBwAH/ATEBYAG+Af8BKAFZAb0B/wEgAVIBugH/ + ARUBSQG2Af8BEQExAX4B//8ApQABEgEzAYEB/wESATkBiAH/ARMBPgGWAf8BEwFAAZ8B/wETAUUBrQH/ + ARQBSAG2Af8BEwFIAbYB/wEWAUkBtgH/ARcBSgG2Af8BFwFKAbYB/wEVAUgBtgH/ARMBSAG2Af8BFAFI + AbYB/wETAUMBpwH/ARMBQAGfAf8BEwE8AZAB/wESATgBhQH/ARIBMgGAAf//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-22 17:17:43
|
Revision: 209 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=209&view=rev Author: dukus Date: 2007-03-22 10:17:11 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Skin selector Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-22 17:17:11 UTC (rev 209) @@ -44,7 +44,7 @@ return; } saveFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*"; - if (Path.GetFileName(proiect_file_name) == "Untitled") + if (Path.GetFileName(proiect_file_name) == "Untitled"||String.IsNullOrEmpty(proiect_file_name.Trim())) { _struct.AddFileList(bossview); if (saveFileDialog1.ShowDialog(this) == DialogResult.OK) Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-22 17:17:11 UTC (rev 209) @@ -22,12 +22,19 @@ public string txt_EULA = String.Empty; public string txt_log = String.Empty; public string txt_readme = String.Empty; + public bool containsSkin = false; public bool isValid = false; + public List<string> SkinList; + public List<string> InstallableSkinList; public MPpackageStruct() { txt_EULA = String.Empty; txt_log = String.Empty; txt_readme = String.Empty; + containsSkin = false; + isValid = false; + SkinList = new List<string>(); + InstallableSkinList = new List<string>(); } @@ -97,7 +104,7 @@ if (fl.Type == MPinstalerStruct.SKIN_TYPE || fl.Type == MPinstalerStruct.SKIN_MEDIA_TYPE) { if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName) - && ze.Name.Contains(@"\"+fl.SubType+@"\")) + && ze.Name.Contains(@"\" + fl.SubType + @"\") && InstallableSkinList.Contains(fl.SubType)) { return true; } @@ -220,6 +227,20 @@ //MessageBox.Show(ex.Message+ex.StackTrace); isValid = false; } + if (isValid) + { + SkinList.Clear(); + InstallableSkinList.Clear(); + foreach (MPIFileList fl in _intalerStruct.FileList) + { + if (fl.Type == MPinstalerStruct.SKIN_TYPE || fl.Type == MPinstalerStruct.SKIN_MEDIA_TYPE) + { + if (!SkinList.Contains(fl.SubType)) + SkinList.Add(fl.SubType); + containsSkin = true; + } + } + } } } Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-22 17:17:11 UTC (rev 209) @@ -82,6 +82,7 @@ this.listView1.MultiSelect = false; this.listView1.Name = "listView1"; this.listView1.Size = new System.Drawing.Size(685, 277); + this.listView1.SmallImageList = this.imageList1; this.listView1.TabIndex = 0; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-22 17:17:11 UTC (rev 209) @@ -126,129 +126,129 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAEPAS0BdgH/ARABMwGBAf8BEAE3AYgB/wERAT0BmQH/AREBPgGfAf8BEQFE - AbAB/wERAUYBtgH/ARIBRgG2Af8BEgFGAbYB/wESAUYBtgH/ARIBRgG2Af8BEgFGAbYB/wESAUYBtgH/ - ARIBRgG2Af8BEQFCAaoB/wERAT4BnwH/AREBPAGWAf8BEAE3AYgB/wEQATEBgQH/AQ8BLAFzAf//AKEA - AREBOwGTAf8BFAFHAbYB/wEZAU0BuAH/AR0BUQG7Af8BIgFVAb8B/wEmAVoBwwH/ASsBXgHHAf8BMAFj - AcoB/wE0AWgBzgH/ATkBbQHRAf8BPgFxAdQB/wFCAXYB1wH/AUYBegHaAf8BSQF9AdwB/wFMAYAB3gH/ - AVABgQHgAf8BUQGBAeEB/wFSAYEB4gH/AVIBgQHiAf8BUQGBAeEB/wFPAYEB4AH/AUwBfwHeAf8BRwF7 - AdoB/wFCAXUB1gH/AToBbgHRAf8BMQFlAcsB/wEbAU8BvAH/AREBOgGQAf//AI0AAREBPAGWAf8BGAFK - AbMB/wEjAVUBtwH/AScBWQG8Af8BKgFdAcEB/wEtAWABxQH/ATABZAHJAf8BMwFnAc0B/wE2AWoBzwH/ - AToBbQHRAf8BPQFwAdMB/wFAAXMB1QH/AUMBdgHXAf8BRgF6AdoB/wFJAXwB3AH/AUwBgAHeAf8BTwGB - AeAB/wFSAYEB4gH/AVYBgQHkAf8BWQGBAeYB/wFcAYIB6QH/AV8BhQHrAf8BYgGIAe0B/wFlAYsB7wH/ - AWgBjgHxAf8BawGSAfMB/wFuAZQB9QH/AW4BlAH1Af8BNQFoAc4B/wEQATsBkwH//wCJAAETAUYBswH/ - AR8BUQGwAf8BIwFVAbUB/wEmAVgBugH/ASoBXAG/Af8BLQFfAcMB/wEwAWMByAH/ATMBZwHMAf8BNgFq - Ac8B/wE5AW0B0QH/ATwBcAHTAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BSQF8AdwB/wFMAX8B3gH/ - AU8BgQHgAf8BUgGBAeIB/wFVAYEB5AH/AVgBgQHmAf8BXAGCAegB/wFfAYUB6gH/AWIBiAHsAf8BZQGL - Ae8B/wFoAY4B8QH/AWsBkQHzAf8BbgGUAfUB/wFxAZcB9wH/AXABlgH2Af8BHQFRAb4B//8AiQABFgFI - Aa8B/wEfAVABrgH/ASMBVAGzAf8BJgFYAbgB/wEpAVsBvQH/ASwBXwHBAf8BLwFiAcYB/wEzAWYBygH/ - ATYBaQHOAf8BOQFsAdAB/wE8AXAB0wH/AT8BcwHVAf8BQgF2AdcB/wFFAXkB2QH/AUgBfAHbAf8BSwF/ - Ad0B/wFPAYEB3wH/AVIBgQHhAf8BVQGBAeQB/wFYAYEB5gH/AVsBgQHoAf8BXgGEAeoB/wFhAYcB7AH/ - AWQBigHuAf8BZwGNAfAB/wFqAZAB8gH/AWwBkwH0Af8BbgGUAfUB/wFvAZUB9gH/ATYBagHOAf//AIkA - ARcBSQGsAf8BHwFPAawB/wEiAVMBsQH/ASYBVwG2Af8BKQFaAbsB/wEsAV4BvwH/AS8BYQHEAf8BMgFl - AcgB/wE1AWkBzQH/ATgBbAHQAf8BOwFvAdIB/wE/AXIB1AH/AUIBdQHWAf8BRQF4AdkB/wFIAXsB2wH/ - AUsBfgHdAf8BTgGBAd8B/wFRAYEB4QH/AVQBgQHjAf8BVwGBAeUB/wFaAYEB5wH/AV0BgwHpAf8BYAGG - AesB/wFjAYkB7QH/AWUBjAHvAf8BaAGOAfEB/wFqAZAB8gH/AWwBkgHzAf8BbAGTAfQB/wE/AXMB1QH/ - /wCFAAEQATABfgH/ARgBSAGpAf8BHgFOAakB/wEhAVIBrwH/ASQBVgG0Af8BKAFZAbkB/wErAV0BvQH/ - AS4BYQHCAf8BMQFkAcYB/wE0AWcBywH/ATgBawHPAf8BOwFuAdIB/wE+AXEB1AH/AUEBdAHWAf8BRAF3 - AdgB/wFHAXoB2gH/AUoBfQHcAf8BRgF6Ad4B/wE4AXAB2wH/AUoBgQHfAf8BPgF4Ad8B/wFQAYEB5wH/ - AWsBjgHrAf8BTwGBAeoB/wFhAYcB7AH/AWQBigHuAf8BZgGMAe8B/wFoAY4B8QH/AWkBjwHxAf8BaQGQ - AfIB/wFGAXoB2gH/ARABMAF+Af//AIEAARABNQGCAf8BHAFLAacB/wEdAU0BpwH/ASABUQGsAf8BJAFV - AbIB/wEnAVgBtwH/ASsBXAG7Af8BLgFgAcAB/wExAWMBxAH/ATQBZwHJAf8BNwFqAc0B/wE6AW0B0QH/ - AT0BcAHTAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BSQF8AdsB/wE9AXMB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BYQGGAesB/wFZAYEB6wH/AWEBiAHsAf8BYwGKAe4B/wFlAYsB7wH/AWYBjAHvAf8BZgGN - AfAB/wFMAYAB3gH/ARABNQGCAf//AIEAARABOQGNAf8BRQFsAbMB/wE2AWABrgH/ASEBUAGqAf8BIwFT - Aa8B/wEmAVcBtAH/ASoBWwG5Af8BLQFeAb4B/wEwAWIBwgH/ATMBZQHHAf8BNgFpAcsB/wE5AWwBzwH/ - ATwBbwHSAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BQQF2AdsB/wEfAWAB1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BOwF4AeYB/wFTAYEB6wH/AWEBhwHsAf8BYgGIAe0B/wFjAYkB7QH/AWQBigHuAf8BUQGB - AeEB/wEQATkBjgH//wCBAAERAT4BnwH/AVQBdwG1Af8BUQF1AbYB/wFAAWkBtAH/ARwBTgGtAf8BJQFW - AbIB/wEoAVkBtwH/ASwBXQG7Af8BLwFgAcAB/wEyAWQBxAH/ATUBZwHJAf8BOAFrAc0B/wE7AW4B0QH/ - AT0BcQHUAf8BQQF0AdYB/wE5AXEB1wH/AUQBdQHdAf8BcQGLAecF/wFeAYIB4wH/ASoBZwHbAf8BKwFp - Ad0B/wGJAakB7wn/AXUBlgHsAf8BWgGEAeoB/wFfAYYB6wH/AWABhwHsAf8BYQGHAewB/wFUAYEB4wH/ - AREBPgGfAf//AIEAARIBQAGkAf8BagGBAbsB/wFYAXsBtwH/AVIBdwG4Af8BRAFuAbUB/wEeAU8BrwH/ - AScBWAG0Af8BKgFbAbkB/wEuAV8BvgH/ATEBYgHCAf8BNAFmAcYB/wE2AWkBygH/ATkBbAHOAf8BPAFw - AdIB/wE/AXMB1QH/ATEBaAHSAf8B2wHlAfUF/wG/AdIB9QH/AS0BaAHYAf8BTwGBAeAB/wFSAYEB4QH/ - ASwBagHfAf8C/gH9Af8B5AHqAfwB/wFfAYcB6gH/AVsBggHoAf8BXQGDAekB/wFdAYQB6gH/AV4BhAHq - Af8BVgGBAeQB/wERAUABpQH//wCBAAEWAUgBtQH/AX0BigHCAf8BYAGBAbkB/wFZAXwBuQH/AVoBewG+ - Af8BOgFlAbUB/wEiAVIBsQH/ASkBWgG2Af8BLAFdAbsB/wEvAWEBwAH/ASwBXAHEAf8BHQFVAcIB/wEr - AWEBygH/AS8BZAHQAf8BPQFxAdMB/wEoAWMB1gH/AYMBowHmBf8BrwHHAe8B/wEuAWkB2QH/AU0BgQHe - Af8BUAGBAeAB/wEvAWoB2wH/AfQB+AH9Af8BVgGBAeoB/wFDAXwB5QH/AVkBgQHmAf8BWgGBAecB/wFa - AYEB6AH/AVsBgQHoAf8BVgGBAeUB/wERAUYBtgH//wCBAAEZAUsBtQH/AYMBmQHIAf8BZgGBAboB/wFh - AYEBugH/AVsBfgG7Af8BWwF+Ab8B/wEcAVEBsAH/AScBWAG0Af8BKgFcAbgB/wEuAV8BvQH/ARsBUgG7 - Af8ByAHUAfEF/wENAUcBwQH/ARgBVQHJAf8BcAGJAd8B/wFgAYEB3gH/AS4BaQHUBf8BKAFjAdYB/wEx - AWkB2QH/AS8BagHaAf8BTAGBAeIF/wHUAeEB9AH/AUoBgAHjAf8BVgGBAeQB/wFXAYEB5QH/AVgBgQHm - Af8BWAGBAeYB/wFWAYEB5QH/ARIBRgG1Af//AIEAARwBTQG1Af8BlAGmAc4B/wFtAYEBuwH/AWgBgQG7 - Af8BYgGBAbwB/wFjAYEBwAH/ATsBYQG0Af8BEgFHAasB/wEvAV4BuQH/AQ0BPgGsAf8BDQExAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGAAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE/AXcB4gH/AVMBgQHi - Af8BVAGBAeMB/wFVAYEB4wH/AVUBgQHkAf8BVQGBAeQB/wESAUYBtgH//wCBAAEfAVABtgH/AaMBswHU - Af8BdAGCAbwB/wFvAYEBvQH/AWkBgQG9Af8BZgGBAb0B/wFPAXYBugH/ARoBSwGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATYBbAHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEcAV4B1wH/ATwBdAHfAf8BRwF7Ad8B/wFQ - AYEB4AH/AVEBgQHhAf8BUgGBAeEB/wFSAYEB4gH/AVIBgQHiAf8BEgFGAbYB//8AgQABIQFRAbcB/wGy - Ab8B2gH/AXoBhwG8Af8BdgGEAb4B/wFwAYEBvgH/AWoBgQG/Af8BawGBAcIB/wEgAVABrA3/AZYBrgHg - Af8BJgFYAb4B/wENAUQBvAH/AUsBeAHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRgF6AdcB/wFI - AXoB2AH/Ae0B8wH9Af8BXAGBAeEB/wE/AXUB2wH/AUsBfwHdAf8BTAGAAd4B/wFNAYEB3wH/AU4BgQHf - Af8BTwGBAeAB/wFPAYEB4AH/AU8BgQHgAf8BEwFHAbYB//8AgQABIQFRAbcB/wHAAcsB4QH/AYEBjAG+ - Af8BfAGJAb8B/wF3AYYBvwH/AXEBgQHAAf8BcgGEAcAB/wENATYBmQH/AZIBqAHXBf8BeQGLAdEB/wEN - AUMBrQH/ASYBWgG/Af8BLgFfAcIB/wElAVwBwQH/AQ0BSQHDAf8B5wHvAfoJ/wHiAeoB9wH/ASUBXwHP - Af8BMQFrAdcB/wE4AXAB2QH/AUcBegHaAf8BSAF8AdsB/wFJAX0B3AH/AUsBfgHdAf8BSwF/Ad0B/wFM - AX8B3gH/AUwBgAHeAf8BTAGAAd4B/wESAUYBtgH//wCBAAEgAVABtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AX4BiwHBAf8BeAGHAcEB/wFxAYIBvgH/AUQBbwGxCf8BDQEyAaIB/wEiAVwBtwH/AS0BXgG7 - Af8BMAFhAb8B/wEzAWQBwwH/ASUBWwHCAf8BWAGBAdMJ/wE5AW4B1AH/ATYBbAHVAf8BQQF0AdYB/wFD - AXYB1wH/AUQBeAHYAf8BRQF5AdkB/wFHAXoB2gH/AUgBewHbAf8BSAF8AdsB/wFJAXwB3AH/AUkBfQHc - Af8BSQF9AdwB/wESAUYBtgH//wCBAAEdAU4BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BdQGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDQE3AaIB/wEoAVkBtAH/ASsBXAG4Af8BLgFfAbwB/wEw - AWIBwAH/ASwBYQHEAf8BHAFXAcQF/wG4AckB7wH/AQ4BTQHJAf8BOQFrAdIB/wE+AXIB1AH/AUABcwHV - Af8BQQF1AdYB/wFDAXYB1wH/AUQBdwHYAf8BRQF4AdkB/wFFAXkB2QH/AUYBegHaAf8BRgF6AdoB/wFF - AXgB2QH/ARIBRgG1Af//AIEAARgBSwG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF/ - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wENAS4BmwH/ASYBVwGwAf8BKQFaAbUB/wErAV0BuQH/ - AS4BXwG9Af8BJAFZAcEB/wE8AWwByAn/AW8BhwHeAf8BKgFgAdEB/wE8AW8B0wH/AT0BcQHTAf8BPwFy - AdUB/wFAAXMB1QH/AUEBdAHWAf8BQgF1AdcB/wFDAXYB1wH/AUMBdwHYAf8BRAF3AdgB/wFAAXQB1gH/ - AREBRQG2Af//AIEAARIBQAGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AX4BigHAAf8BXAF+AbUB/wHIAdIB6AX/ATcBYAGuAf8BDQFCAaUB/wEnAVcBsQH/ASkBWgG1Af8BIgFZ - AbkB/wENAUABsQH/AbkBxQHsDf8BIAFZAcgB/wE5AW0B0QH/ATsBbgHSAf8BPAFwAdMB/wE9AXEB0wH/ - AT4BcgHUAf8BPwFzAdUB/wFAAXMB1QH/AUABdAHWAf8BQQF0AdYB/wE7AW8B0gH/AREBPwGiAf//AIEA - AREBPgGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcwGE - Ab4B/wG3AcYB4wn/AUABZwG0Af8BDQEtAZsB/wENATcBogH/AQ0BOQGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUQBdAHLAf8BaQGCAdUB/wEmAVsBxgH/ATYBagHOAf8BOAFsAdAB/wE5AW0B0QH/AToBbgHSAf8BOwFv - AdIB/wE8AXAB0wH/AT0BcAHTAf8BPQFxAdMB/wE+AXEB1AH/ATYBagHPAf8BEQE+AZ8B//8AgQABEAE4 + ASADAAEBAQABIAYAAUAqAAEQAS4BdwH/AREBNAGBAf8BEQE4AYgB/wESAT4BmQH/ARIBPwGfAf8BEgFF + AbAB/wESAUcBtgH/ARMBRwG2Af8BEwFHAbYB/wETAUcBtgH/ARMBRwG2Af8BEwFHAbYB/wETAUcBtgH/ + ARMBRwG2Af8BEgFDAaoB/wESAT8BnwH/ARIBPQGWAf8BEQE4AYgB/wERATIBgQH/ARABLQF0Af//AKEA + ARIBPAGTAf8BFQFIAbYB/wEaAU4BuAH/AR4BUgG7Af8BIwFWAb8B/wEnAVsBwwH/ASwBXwHHAf8BMQFk + AcoB/wE1AWkBzgH/AToBbgHRAf8BPwFyAdQB/wFDAXcB1wH/AUcBewHaAf8BSgF+AdwB/wFNAYEB3gH/ + AVEBgQHgAf8BUgGBAeEB/wFTAYEB4gH/AVMBgQHiAf8BUgGBAeEB/wFQAYEB4AH/AU0BgAHeAf8BSAF8 + AdoB/wFDAXYB1gH/ATsBbwHRAf8BMgFmAcsB/wEcAVABvAH/ARIBOwGQAf//AI0AARIBPQGWAf8BGQFL + AbMB/wEkAVYBtwH/ASgBWgG8Af8BKwFeAcEB/wEuAWEBxQH/ATEBZQHJAf8BNAFoAc0B/wE3AWsBzwH/ + ATsBbgHRAf8BPgFxAdMB/wFBAXQB1QH/AUQBdwHXAf8BRwF7AdoB/wFKAX0B3AH/AU0BgQHeAf8BUAGB + AeAB/wFTAYEB4gH/AVcBgQHkAf8BWgGBAeYB/wFdAYIB6QH/AWABhQHrAf8BYwGIAe0B/wFmAYsB7wH/ + AWkBjgHxAf8BbAGSAfMB/wFvAZQB9QH/AW8BlAH1Af8BNgFpAc4B/wERATwBkwH//wCJAAEUAUcBswH/ + ASABUgGwAf8BJAFWAbUB/wEnAVkBugH/ASsBXQG/Af8BLgFgAcMB/wExAWQByAH/ATQBaAHMAf8BNwFr + Ac8B/wE6AW4B0QH/AT0BcQHTAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BSgF9AdwB/wFNAYAB3gH/ + AVABgQHgAf8BUwGBAeIB/wFWAYEB5AH/AVkBgQHmAf8BXQGCAegB/wFgAYUB6gH/AWMBiAHsAf8BZgGL + Ae8B/wFpAY4B8QH/AWwBkQHzAf8BbwGUAfUB/wFyAZcB9wH/AXEBlgH2Af8BHgFSAb4B//8AiQABFwFJ + Aa8B/wEgAVEBrgH/ASQBVQGzAf8BJwFZAbgB/wEqAVwBvQH/AS0BYAHBAf8BMAFjAcYB/wE0AWcBygH/ + ATcBagHOAf8BOgFtAdAB/wE9AXEB0wH/AUABdAHVAf8BQwF3AdcB/wFGAXoB2QH/AUkBfQHbAf8BTAGA + Ad0B/wFQAYEB3wH/AVMBgQHhAf8BVgGBAeQB/wFZAYEB5gH/AVwBgQHoAf8BXwGEAeoB/wFiAYcB7AH/ + AWUBigHuAf8BaAGNAfAB/wFrAZAB8gH/AW0BkwH0Af8BbwGUAfUB/wFwAZUB9gH/ATcBawHOAf//AIkA + ARgBSgGsAf8BIAFQAawB/wEjAVQBsQH/AScBWAG2Af8BKgFbAbsB/wEtAV8BvwH/ATABYgHEAf8BMwFm + AcgB/wE2AWoBzQH/ATkBbQHQAf8BPAFwAdIB/wFAAXMB1AH/AUMBdgHWAf8BRgF5AdkB/wFJAXwB2wH/ + AUwBfwHdAf8BTwGBAd8B/wFSAYEB4QH/AVUBgQHjAf8BWAGBAeUB/wFbAYEB5wH/AV4BgwHpAf8BYQGG + AesB/wFkAYkB7QH/AWYBjAHvAf8BaQGOAfEB/wFrAZAB8gH/AW0BkgHzAf8BbQGTAfQB/wFAAXQB1QH/ + /wCFAAERATEBfwH/ARkBSQGpAf8BHwFPAakB/wEiAVMBrwH/ASUBVwG0Af8BKQFaAbkB/wEsAV4BvQH/ + AS8BYgHCAf8BMgFlAcYB/wE1AWgBywH/ATkBbAHPAf8BPAFvAdIB/wE/AXIB1AH/AUIBdQHWAf8BRQF4 + AdgB/wFIAXsB2gH/AUsBfgHcAf8BRwF7Ad4B/wE5AXEB2wH/AUsBgQHfAf8BPwF5Ad8B/wFRAYEB5wH/ + AWwBjgHrAf8BUAGBAeoB/wFiAYcB7AH/AWUBigHuAf8BZwGMAe8B/wFpAY4B8QH/AWoBjwHxAf8BagGQ + AfIB/wFHAXsB2gH/AREBMQF/Af//AIEAAREBNgGCAf8BHQFMAacB/wEeAU4BpwH/ASEBUgGsAf8BJQFW + AbIB/wEoAVkBtwH/ASwBXQG7Af8BLwFhAcAB/wEyAWQBxAH/ATUBaAHJAf8BOAFrAc0B/wE7AW4B0QH/ + AT4BcQHTAf8BQQF0AdUB/wFEAXcB1wH/AUcBegHZAf8BSgF9AdsB/wE+AXQB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BYgGGAesB/wFaAYEB6wH/AWIBiAHsAf8BZAGKAe4B/wFmAYsB7wH/AWcBjAHvAf8BZwGN + AfAB/wFNAYEB3gH/AREBNgGCAf//AIEAAREBOgGNAf8BRgFtAbMB/wE3AWEBrgH/ASIBUQGqAf8BJAFU + Aa8B/wEnAVgBtAH/ASsBXAG5Af8BLgFfAb4B/wExAWMBwgH/ATQBZgHHAf8BNwFqAcsB/wE6AW0BzwH/ + AT0BcAHSAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BQgF3AdsB/wEgAWEB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BPAF5AeYB/wFUAYEB6wH/AWIBhwHsAf8BYwGIAe0B/wFkAYkB7QH/AWUBigHuAf8BUgGB + AeEB/wERAToBjgH//wCBAAESAT8BnwH/AVUBeAG1Af8BUgF2AbYB/wFBAWoBtAH/AR0BTwGtAf8BJgFX + AbIB/wEpAVoBtwH/AS0BXgG7Af8BMAFhAcAB/wEzAWUBxAH/ATYBaAHJAf8BOQFsAc0B/wE8AW8B0QH/ + AT4BcgHUAf8BQgF1AdYB/wE6AXIB1wH/AUUBdgHdAf8BcgGLAecF/wFfAYIB4wH/ASsBaAHbAf8BLAFq + Ad0B/wGJAakB7wn/AXYBlgHsAf8BWwGEAeoB/wFgAYYB6wH/AWEBhwHsAf8BYgGHAewB/wFVAYEB4wH/ + ARIBPwGfAf//AIEAARMBQQGkAf8BawGBAbsB/wFZAXwBtwH/AVMBeAG4Af8BRQFvAbUB/wEfAVABrwH/ + ASgBWQG0Af8BKwFcAbkB/wEvAWABvgH/ATIBYwHCAf8BNQFnAcYB/wE3AWoBygH/AToBbQHOAf8BPQFx + AdIB/wFAAXQB1QH/ATIBaQHSAf8B2wHlAfUF/wG/AdIB9QH/AS4BaQHYAf8BUAGBAeAB/wFTAYEB4QH/ + AS0BawHfAf8C/gH9Af8B5AHqAfwB/wFgAYcB6gH/AVwBggHoAf8BXgGDAekB/wFeAYQB6gH/AV8BhAHq + Af8BVwGBAeQB/wESAUEBpQH//wCBAAEXAUkBtQH/AX4BigHCAf8BYQGBAbkB/wFaAX0BuQH/AVsBfAG+ + Af8BOwFmAbUB/wEjAVMBsQH/ASoBWwG2Af8BLQFeAbsB/wEwAWIBwAH/AS0BXQHEAf8BHgFWAcIB/wEs + AWIBygH/ATABZQHQAf8BPgFyAdMB/wEpAWQB1gH/AYMBowHmBf8BrwHHAe8B/wEvAWoB2QH/AU4BgQHe + Af8BUQGBAeAB/wEwAWsB2wH/AfQB+AH9Af8BVwGBAeoB/wFEAX0B5QH/AVoBgQHmAf8BWwGBAecB/wFb + AYEB6AH/AVwBgQHoAf8BVwGBAeUB/wESAUcBtgH//wCBAAEaAUwBtQH/AYMBmQHIAf8BZwGBAboB/wFi + AYEBugH/AVwBfwG7Af8BXAF/Ab8B/wEdAVIBsAH/ASgBWQG0Af8BKwFdAbgB/wEvAWABvQH/ARwBUwG7 + Af8ByAHUAfEF/wEOAUgBwQH/ARkBVgHJAf8BcQGJAd8B/wFhAYEB3gH/AS8BagHUBf8BKQFkAdYB/wEy + AWoB2QH/ATABawHaAf8BTQGBAeIF/wHUAeEB9AH/AUsBgQHjAf8BVwGBAeQB/wFYAYEB5QH/AVkBgQHm + Af8BWQGBAeYB/wFXAYEB5QH/ARMBRwG1Af//AIEAAR0BTgG1Af8BlAGmAc4B/wFuAYEBuwH/AWkBgQG7 + Af8BYwGBAbwB/wFkAYEBwAH/ATwBYgG0Af8BEwFIAasB/wEwAV8BuQH/AQ4BPwGsAf8BDgEyAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGBAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wFAAXgB4gH/AVQBgQHi + Af8BVQGBAeMB/wFWAYEB4wH/AVYBgQHkAf8BVgGBAeQB/wETAUcBtgH//wCBAAEgAVEBtgH/AaMBswHU + Af8BdQGCAbwB/wFwAYEBvQH/AWoBgQG9Af8BZwGBAb0B/wFQAXcBugH/ARsBTAGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATcBbQHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEdAV8B1wH/AT0BdQHfAf8BSAF8Ad8B/wFR + AYEB4AH/AVIBgQHhAf8BUwGBAeEB/wFTAYEB4gH/AVMBgQHiAf8BEwFHAbYB//8AgQABIgFSAbcB/wGy + Ab8B2gH/AXsBhwG8Af8BdwGEAb4B/wFxAYEBvgH/AWsBgQG/Af8BbAGBAcIB/wEhAVEBrA3/AZYBrgHg + Af8BJwFZAb4B/wEOAUUBvAH/AUwBeQHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRwF7AdcB/wFJ + AXsB2AH/Ae0B8wH9Af8BXQGBAeEB/wFAAXYB2wH/AUwBgAHdAf8BTQGBAd4B/wFOAYEB3wH/AU8BgQHf + Af8BUAGBAeAB/wFQAYEB4AH/AVABgQHgAf8BFAFIAbYB//8AgQABIgFSAbcB/wHAAcsB4QH/AYEBjAG+ + Af8BfQGJAb8B/wF4AYYBvwH/AXIBgQHAAf8BcwGEAcAB/wEOATcBmQH/AZIBqAHXBf8BegGLAdEB/wEO + AUQBrQH/AScBWwG/Af8BLwFgAcIB/wEmAV0BwQH/AQ4BSgHDAf8B5wHvAfoJ/wHiAeoB9wH/ASYBYAHP + Af8BMgFsAdcB/wE5AXEB2QH/AUgBewHaAf8BSQF9AdsB/wFKAX4B3AH/AUwBfwHdAf8BTAGAAd0B/wFN + AYAB3gH/AU0BgQHeAf8BTQGBAd4B/wETAUcBtgH//wCBAAEhAVEBtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AX8BiwHBAf8BeQGHAcEB/wFyAYIBvgH/AUUBcAGxCf8BDgEzAaIB/wEjAV0BtwH/AS4BXwG7 + Af8BMQFiAb8B/wE0AWUBwwH/ASYBXAHCAf8BWQGBAdMJ/wE6AW8B1AH/ATcBbQHVAf8BQgF1AdYB/wFE + AXcB1wH/AUUBeQHYAf8BRgF6AdkB/wFIAXsB2gH/AUkBfAHbAf8BSQF9AdsB/wFKAX0B3AH/AUoBfgHc + Af8BSgF+AdwB/wETAUcBtgH//wCBAAEeAU8BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BdgGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDgE4AaIB/wEpAVoBtAH/ASwBXQG4Af8BLwFgAbwB/wEx + AWMBwAH/AS0BYgHEAf8BHQFYAcQF/wG4AckB7wH/AQ8BTgHJAf8BOgFsAdIB/wE/AXMB1AH/AUEBdAHV + Af8BQgF2AdYB/wFEAXcB1wH/AUUBeAHYAf8BRgF5AdkB/wFGAXoB2QH/AUcBewHaAf8BRwF7AdoB/wFG + AXkB2QH/ARMBRwG1Af//AIEAARkBTAG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wGA + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEOAS8BmwH/AScBWAGwAf8BKgFbAbUB/wEsAV4BuQH/ + AS8BYAG9Af8BJQFaAcEB/wE9AW0ByAn/AXABhwHeAf8BKwFhAdEB/wE9AXAB0wH/AT4BcgHTAf8BQAFz + AdUB/wFBAXQB1QH/AUIBdQHWAf8BQwF2AdcB/wFEAXcB1wH/AUQBeAHYAf8BRQF4AdgB/wFBAXUB1gH/ + ARIBRgG2Af//AIEAARMBQQGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AX8BigHAAf8BXQF/AbUB/wHIAdIB6AX/ATgBYQGuAf8BDgFDAaUB/wEoAVgBsQH/ASoBWwG1Af8BIwFa + AbkB/wEOAUEBsQH/AbkBxQHsDf8BIQFaAcgB/wE6AW4B0QH/ATwBbwHSAf8BPQFxAdMB/wE+AXIB0wH/ + AT8BcwHUAf8BQAF0AdUB/wFBAXQB1QH/AUEBdQHWAf8BQgF1AdYB/wE8AXAB0gH/ARIBQAGiAf//AIEA + ARIBPwGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BdAGE + Ab4B/wG3AcYB4wn/AUEBaAG0Af8BDgEuAZsB/wEOATgBogH/AQ4BOgGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUUBdQHLAf8BagGCAdUB/wEnAVwBxgH/ATcBawHOAf8BOQFtAdAB/wE6AW4B0QH/ATsBbwHSAf8BPAFw + AdIB/wE9AXEB0wH/AT4BcQHTAf8BPgFyAdMB/wE/AXIB1AH/ATcBawHPAf8BEgE/AZ8B//8AgQABEQE5 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BDQErAasB/wEdAVQBvQH/ASkBXQHFAf8BMgFlAcgB/wE0AWcBywH/ATUBaQHOAf8BNgFq - Ac8B/wE3AWsB0AH/ATgBbAHQAf8BOQFtAdEB/wE6AW4B0QH/AToBbgHSAf8BOwFuAdIB/wExAWUBywH/ - ARABOAGLAf//AIEAARABNQGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWsBgQG8Af8BDQEZAYUB/wHrAfAB9Qn/AakBuwHhCf8BbQGC - Ac4B/wElAVgBvQH/AS4BYAHBAf8BMAFiAcUB/wExAWQByAH/ATIBZgHLAf8BNAFnAc0B/wE1AWgBzgH/ - ATYBaQHOAf8BNgFqAc8B/wE3AWsBzwH/ATcBawHQAf8BOAFsAdAB/wEsAV8BxwH/ARABNQGBAf//AIEA - AQ8BLwF7Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BeQGHAcQB/wHQAdwB7QX/AT0BZwGwAf8BDQEeAZUB/wERAUcBqQH/ - AakBuAHhAf8BDgFEAa0B/wEZAVABswH/ASUBVwG9Af8BJgFZAcEB/wEoAWEBxAH/ATABYwHHAf8BMQFk - AcoB/wEyAWYBzAH/ATMBZgHMAf8BNAFnAc0B/wE0AWgBzQH/ATUBaAHNAf8BNQFoAc4B/wEnAVoBxAH/ - ARABLwF7Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX4BjQHIAf8BbgGC - AcEB/wFkAYEBwwH/AVoBgQHEAf8BXAGBAcUB/wFeAYEBxQH/AVkBfwHGAf8BVAF9AcYB/wFKAXcByQH/ - AUIBcAHJAf8BPQFtAcsB/wE4AWoBywH/ATMBZgHLAf8BMQFkAcsB/wExAWUBywH/ATIBZQHMAf8BMgFm - AcwB/wEiAVUBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BDgEsAasB/wEeAVUBvQH/ASoBXgHFAf8BMwFmAcgB/wE1AWgBywH/ATYBagHOAf8BNwFr + Ac8B/wE4AWwB0AH/ATkBbQHQAf8BOgFuAdEB/wE7AW8B0QH/ATsBbwHSAf8BPAFvAdIB/wEyAWYBywH/ + AREBOQGLAf//AIEAAREBNgGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWwBgQG8Af8BDgEaAYUB/wHrAfAB9Qn/AakBuwHhCf8BbgGC + Ac4B/wEmAVkBvQH/AS8BYQHBAf8BMQFjAcUB/wEyAWUByAH/ATMBZwHLAf8BNQFoAc0B/wE2AWkBzgH/ + ATcBagHOAf8BNwFrAc8B/wE4AWwBzwH/ATgBbAHQAf8BOQFtAdAB/wEtAWABxwH/AREBNgGBAf//AIEA + ARABMAF8Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BegGHAcQB/wHQAdwB7QX/AT4BaAGwAf8BDgEfAZUB/wESAUgBqQH/ + AakBuAHhAf8BDwFFAa0B/wEaAVEBswH/ASYBWAG9Af8BJwFaAcEB/wEpAWIBxAH/ATEBZAHHAf8BMgFl + AcoB/wEzAWcBzAH/ATQBZwHMAf8BNQFoAc0B/wE1AWkBzQH/ATYBaQHNAf8BNgFpAc4B/wEoAVsBxAH/ + AREBMAF8Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX8BjQHIAf8BbwGC + AcEB/wFlAYEBwwH/AVsBgQHEAf8BXQGBAcUB/wFfAYEBxQH/AVoBgAHGAf8BVQF+AcYB/wFLAXgByQH/ + AUMBcQHJAf8BPgFuAcsB/wE5AWsBywH/ATQBZwHLAf8BMgFlAcsB/wEyAWYBywH/ATMBZgHMAf8BMwFn + AcwB/wEjAVYBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AX8BiwHGAf8BeQGHAcYB/wFvAYIBxwH/AWkBgQHHAf8BYwGBAccB/wFdAYEBxwH/AVcBfgHIAf8BUQF6 - AcgB/wFLAXYByQH/AUUBcgHKAf8BPwFuAcoB/wE4AWkBywH/ATIBZQHKAf8BLwFiAckB/wEvAWMBygH/ - AS8BYwHKAf8BHQFRAb0B//8AiQABaQGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AYABiwHGAf8BegGHAcYB/wFwAYIBxwH/AWoBgQHHAf8BZAGBAccB/wFeAYEBxwH/AVgBfwHIAf8BUgF7 + AcgB/wFMAXcByQH/AUYBcwHKAf8BQAFvAcoB/wE5AWoBywH/ATMBZgHKAf8BMAFjAckB/wEwAWQBygH/ + ATABZAHKAf8BHgFSAb0B//8AiQABagGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGBAZAByAH/AXwBiwHHAf8BdgGHAccB/wFvAYIBxwH/AWkBgQHHAf8BYgGBAccB/wFcAYEBxwH/ - AVYBfQHIAf8BUAF5AcgB/wFKAXUByQH/AUMBcAHJAf8BPQFsAcoB/wE2AWcBygH/ATABYwHJAf8BLAFg - AcgB/wEsAWAByAH/ARgBTAG6Af//AIkAASgBVwG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AX0BiwHHAf8BdwGHAccB/wFwAYIBxwH/AWoBgQHHAf8BYwGBAccB/wFdAYEBxwH/ + AVcBfgHIAf8BUQF6AcgB/wFLAXYByQH/AUQBcQHJAf8BPgFtAcoB/wE3AWgBygH/ATEBZAHJAf8BLQFh + AcgB/wEtAWEByAH/ARkBTQG6Af//AIkAASkBWAG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AXwBiwHHAf8BdQGGAccB/wFvAYIBxwH/AWgBgQHHAf8BYgGB - AccB/wFcAYEBxwH/AVUBfAHHAf8BTwF4AcgB/wFIAXQByAH/AUIBbwHIAf8BOwFqAckB/wE0AWYByAH/ - AS4BYAHHAf8BJwFbAcQB/wESAUUBswH//wCJAAEPATIBgQH/AWcBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AX0BiwHHAf8BdgGGAccB/wFwAYIBxwH/AWkBgQHHAf8BYwGB + AccB/wFdAYEBxwH/AVYBfQHHAf8BUAF5AcgB/wFJAXUByAH/AUMBcAHIAf8BPAFrAckB/wE1AWcByAH/ + AS8BYQHHAf8BKAFcAcQB/wETAUYBswH//wCJAAEQATMBgQH/AWgBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF/AYwBxQH/AXoBiQHGAf8BdQGGAccB/wFuAYEBxwH/ - AWcBgQHGAf8BYQGBAcYB/wFbAYABxgH/AVQBewHHAf8BTgF2AccB/wFHAXIBxwH/AUABbQHIAf8BOQFp - AcgB/wEvAWABxQH/ARcBSwG5Af8BDwEuAXkB//8AjQABEAEyAYEB/wElAVUBugH/AWEBgQHMAf8BgAGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wGAAYwBxQH/AXsBiQHGAf8BdgGGAccB/wFvAYEBxwH/ + AWgBgQHGAf8BYgGBAcYB/wFcAYEBxgH/AVUBfAHHAf8BTwF3AccB/wFIAXMBxwH/AUEBbgHIAf8BOgFq + AcgB/wEwAWEBxQH/ARgBTAG5Af8BEAEvAXoB//8AjQABEQEzAYEB/wEmAVYBugH/AWIBgQHMAf8BgQGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfQGN - AcwB/wFrAYEByQH/AVgBfgHFAf8BRQFvAcIB/wE6AWYBwAH/AS8BXgG+Af8BJgFXAb0B/wEeAVABugH/ - ARMBRwG2Af8BDwEvAXwB//8ApQABEAExAYEB/wEQATcBiAH/AREBPAGWAf8BEQE+AZ8B/wERAUMBrQH/ - ARIBRgG2Af8BEQFGAbYB/wEUAUcBtgH/ARUBSAG2Af8BFQFIAbYB/wETAUYBtgH/AREBRgG2Af8BEgFG - AbYB/wERAUEBpwH/AREBPgGfAf8BEQE6AZAB/wEQATYBhQH/ARABMAF+Af//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfgGN + AcwB/wFsAYEByQH/AVkBfwHFAf8BRgFwAcIB/wE7AWcBwAH/ATABXwG+Af8BJwFYAb0B/wEfAVEBugH/ + ARQBSAG2Af8BEAEwAX0B//8ApQABEQEyAYEB/wERATgBiAH/ARIBPQGWAf8BEgE/AZ8B/wESAUQBrQH/ + ARMBRwG2Af8BEgFHAbYB/wEVAUgBtgH/ARYBSQG2Af8BFgFJAbYB/wEUAUcBtgH/ARIBRwG2Af8BEwFH + AbYB/wESAUIBpwH/ARIBPwGfAf8BEgE7AZAB/wERATcBhQH/AREBMQF/Af//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-22 17:17:11 UTC (rev 209) @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wizard_1)); this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.listBox1 = new System.Windows.Forms.ListBox(); this.progressBar2 = new System.Windows.Forms.ProgressBar(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); @@ -41,11 +42,11 @@ this.button_back = new System.Windows.Forms.Button(); this.button_next = new System.Windows.Forms.Button(); this.button_cancel = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.skinlister = new System.Windows.Forms.CheckedListBox(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -58,11 +59,23 @@ this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.title_label); this.panel1.Controls.Add(this.richTextBox1); + this.panel1.Controls.Add(this.skinlister); this.panel1.Location = new System.Drawing.Point(165, 0); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(334, 298); this.panel1.TabIndex = 0; // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.Location = new System.Drawing.Point(267, 4); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(64, 64); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 6; + this.pictureBox2.TabStop = false; + this.pictureBox2.Visible = false; + // // listBox1 // this.listBox1.FormattingEnabled = true; @@ -164,16 +177,14 @@ this.button_cancel.UseVisualStyleBackColor = true; this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); // - // pictureBox2 + // skinlister // - this.pictureBox2.BackColor = System.Drawing.Color.Transparent; - this.pictureBox2.Location = new System.Drawing.Point(267, 4); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(64, 64); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 6; - this.pictureBox2.TabStop = false; - this.pictureBox2.Visible = false; + this.skinlister.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.skinlister.FormattingEnabled = true; + this.skinlister.Location = new System.Drawing.Point(14, 74); + this.skinlister.Name = "skinlister"; + this.skinlister.Size = new System.Drawing.Size(247, 210); + this.skinlister.TabIndex = 7; // // wizard_1 // @@ -193,9 +204,9 @@ this.Text = "wizard_1"; this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -215,5 +226,6 @@ private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.ListBox listBox1; private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.CheckedListBox skinlister; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-22 07:08:06 UTC (rev 208) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-22 17:17:11 UTC (rev 209) @@ -38,9 +38,11 @@ case 1: { this.Text = "MediaPortal extension instaler"; + skinlister.Items.Clear(); button_back.Visible = false; progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = false; listBox1.Items.Clear(); listBox1.Visible = false; label2.Visible = false; @@ -65,6 +67,7 @@ label2.Visible = true; progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = false; listBox1.Visible = false; label2.Text = "License Agreement"; button_next.Text = "I Agree"; @@ -78,6 +81,7 @@ label2.Visible = true; progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = false; listBox1.Visible = false; label2.Text = "Change log"; button_next.Text = "Next"; @@ -90,6 +94,7 @@ { progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = false; listBox1.Visible = false; label2.Visible = true; label2.Text = "Read me"; @@ -102,18 +107,25 @@ { progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = true; listBox1.Visible = false; label2.Visible = true; label2.Text = "Select skin"; button_next.Text = "Next"; button_back.Visible = true; richTextBox1.Visible = false; + skinlister.Items.Clear(); + foreach (string sk in package.SkinList) + { + skinlister.Items.Add(sk, true); + } break; } case 6: { progressBar1.Visible = false; progressBar2.Visible = false; + skinlister.Visible = false; listBox1.Visible = false; label2.Visible = true; label2.Text = "Instaling ..."; @@ -129,7 +141,12 @@ } case 7: { - label2.Visible = true; + for (int i = 0; i < skinlister.Items.Count; i++) + { + if (skinlister.GetItemChecked(i)) + package.InstallableSkinList.Add(skinlister.Items[i].ToString()); + } + label2.Visible = true; progressBar1.Visible = true; progressBar2.Visible = true; listBox1.Visible = true; ; @@ -199,8 +216,11 @@ } break; case 5: + if (!package.containsSkin) + { step += m; test_next_step(m); + } break; default: break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-22 07:08:23
|
Revision: 208 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=208&view=rev Author: zebons Date: 2007-03-22 00:08:06 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Change Icon on Control Panel Window suppress unuse function in controlp.cs Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-21 20:20:16 UTC (rev 207) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-22 07:08:06 UTC (rev 208) @@ -43,6 +43,7 @@ this.button4 = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.button6 = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.comboBox2 = new System.Windows.Forms.ComboBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); @@ -56,7 +57,6 @@ this.columnHeader10 = new System.Windows.Forms.ColumnHeader(); this.label1 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.button6 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -198,6 +198,15 @@ this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.Enter += new System.EventHandler(this.tabPage1_Enter); // + // button6 + // + this.button6.Location = new System.Drawing.Point(250, 294); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(105, 23); + this.button6.TabIndex = 8; + this.button6.Text = "Find updates"; + this.button6.UseVisualStyleBackColor = true; + // // label2 // this.label2.AutoSize = true; @@ -321,25 +330,16 @@ this.comboBox1.TabIndex = 0; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // - // button6 - // - this.button6.Location = new System.Drawing.Point(250, 294); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(105, 23); - this.button6.TabIndex = 8; - this.button6.Text = "Find updates"; - this.button6.UseVisualStyleBackColor = true; - // // controlp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(696, 366); this.Controls.Add(this.tabControl1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "controlp"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Control panel"; - this.Shown += new System.EventHandler(this.controlp_Shown); this.Load += new System.EventHandler(this.controlp_Load); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-21 20:20:16 UTC (rev 207) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-22 07:08:06 UTC (rev 208) @@ -36,11 +36,6 @@ lst.LoadFromFile(); LoadToListview(); } - private void controlp_Shown(object sender, EventArgs e) - { - - } - public void LoadToListview() { LoadToListview(lst, listView1); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-21 20:20:16 UTC (rev 207) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-22 07:08:06 UTC (rev 208) @@ -126,132 +126,150 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAEOASwBdQH/AQ8BMgGBAf8BDwE2AYgB/wEQATwBmQH/ARABPQGfAf8BEAFD - AbAB/wEQAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/ - AREBRQG2Af8BEAFBAaoB/wEQAT0BnwH/ARABOwGWAf8BDwE2AYgB/wEPATABgAH/AQ4BKwFyAf//AKEA - ARABOgGTAf8BEwFGAbYB/wEYAUwBuAH/ARwBUAG7Af8BIQFUAb8B/wElAVkBwwH/ASoBXQHHAf8BLwFi - AcoB/wEzAWcBzgH/ATgBbAHRAf8BPQFwAdQB/wFBAXUB1wH/AUUBeQHaAf8BSAF8AdwB/wFLAX8B3gH/ - AU8BgQHgAf8BUAGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BUAGBAeEB/wFOAYEB4AH/AUsBfgHeAf8BRgF6 - AdoB/wFBAXQB1gH/ATkBbQHRAf8BMAFkAcsB/wEaAU4BvAH/ARABOQGQAf//AI0AARABOwGWAf8BFwFJ - AbMB/wEiAVQBtwH/ASYBWAG8Af8BKQFcAcEB/wEsAV8BxQH/AS8BYwHJAf8BMgFmAc0B/wE1AWkBzwH/ - ATkBbAHRAf8BPAFvAdMB/wE/AXIB1QH/AUIBdQHXAf8BRQF5AdoB/wFIAXsB3AH/AUsBfwHeAf8BTgGB - AeAB/wFRAYEB4gH/AVUBgQHkAf8BWAGBAeYB/wFbAYIB6QH/AV4BhQHrAf8BYQGIAe0B/wFkAYsB7wH/ - AWcBjgHxAf8BagGSAfMB/wFtAZQB9QH/AW0BlAH1Af8BNAFnAc4B/wEPAToBkwH//wCJAAESAUUBswH/ - AR4BUAGwAf8BIgFUAbUB/wElAVcBugH/ASkBWwG/Af8BLAFeAcMB/wEvAWIByAH/ATIBZgHMAf8BNQFp - Ac8B/wE4AWwB0QH/ATsBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdwB/wFLAX4B3gH/ - AU4BgQHgAf8BUQGBAeIB/wFUAYEB5AH/AVcBgQHmAf8BWwGCAegB/wFeAYUB6gH/AWEBiAHsAf8BZAGL - Ae8B/wFnAY4B8QH/AWoBkQHzAf8BbQGUAfUB/wFwAZcB9wH/AW8BlgH2Af8BHAFQAb4B//8AiQABFQFH - Aa8B/wEeAU8BrgH/ASIBUwGzAf8BJQFXAbgB/wEoAVoBvQH/ASsBXgHBAf8BLgFhAcYB/wEyAWUBygH/ - ATUBaAHOAf8BOAFrAdAB/wE7AW8B0wH/AT4BcgHVAf8BQQF1AdcB/wFEAXgB2QH/AUcBewHbAf8BSgF+ - Ad0B/wFOAYEB3wH/AVEBgQHhAf8BVAGBAeQB/wFXAYEB5gH/AVoBgQHoAf8BXQGEAeoB/wFgAYcB7AH/ - AWMBigHuAf8BZgGNAfAB/wFpAZAB8gH/AWsBkwH0Af8BbQGUAfUB/wFuAZUB9gH/ATUBaQHOAf//AIkA - ARYBSAGsAf8BHgFOAawB/wEhAVIBsQH/ASUBVgG2Af8BKAFZAbsB/wErAV0BvwH/AS4BYAHEAf8BMQFk - AcgB/wE0AWgBzQH/ATcBawHQAf8BOgFuAdIB/wE+AXEB1AH/AUEBdAHWAf8BRAF3AdkB/wFHAXoB2wH/ - AUoBfQHdAf8BTQGAAd8B/wFQAYEB4QH/AVMBgQHjAf8BVgGBAeUB/wFZAYEB5wH/AVwBgwHpAf8BXwGG - AesB/wFiAYkB7QH/AWQBjAHvAf8BZwGOAfEB/wFpAZAB8gH/AWsBkgHzAf8BawGTAfQB/wE+AXIB1QH/ - /wCFAAEPAS8BfQH/ARcBRwGpAf8BHQFNAakB/wEgAVEBrwH/ASMBVQG0Af8BJwFYAbkB/wEqAVwBvQH/ - AS0BYAHCAf8BMAFjAcYB/wEzAWYBywH/ATcBagHPAf8BOgFtAdIB/wE9AXAB1AH/AUABcwHWAf8BQwF2 - AdgB/wFGAXkB2gH/AUkBfAHcAf8BRQF5Ad4B/wE3AW8B2wH/AUkBgAHfAf8BPQF3Ad8B/wFPAYEB5wH/ - AWoBjgHrAf8BTgGBAeoB/wFgAYcB7AH/AWMBigHuAf8BZQGMAe8B/wFnAY4B8QH/AWgBjwHxAf8BaAGQ - AfIB/wFFAXkB2gH/AQ8BLwF9Af//AIEAAQ8BNAGCAf8BGwFKAacB/wEcAUwBpwH/AR8BUAGsAf8BIwFU - AbIB/wEmAVcBtwH/ASoBWwG7Af8BLQFfAcAB/wEwAWIBxAH/ATMBZgHJAf8BNgFpAc0B/wE5AWwB0QH/ - ATwBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdsB/wE8AXIB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BYAGGAesB/wFYAYEB6wH/AWABiAHsAf8BYgGKAe4B/wFkAYsB7wH/AWUBjAHvAf8BZQGN - AfAB/wFLAX8B3gH/AQ8BNAGCAf//AIEAAQ8BOAGNAf8BRAFrAbMB/wE1AV8BrgH/ASABTwGqAf8BIgFS - Aa8B/wElAVYBtAH/ASkBWgG5Af8BLAFdAb4B/wEvAWEBwgH/ATIBZAHHAf8BNQFoAcsB/wE4AWsBzwH/ - ATsBbgHSAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BQAF1AdsB/wEeAV8B1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BOgF3AeYB/wFSAYEB6wH/AWABhwHsAf8BYQGIAe0B/wFiAYkB7QH/AWMBigHuAf8BUAGB - AeEB/wEPATgBjgH//wCBAAEQAT0BnwH/AVMBdgG1Af8BUAF0AbYB/wE/AWgBtAH/ARsBTQGtAf8BJAFV - AbIB/wEnAVgBtwH/ASsBXAG7Af8BLgFfAcAB/wExAWMBxAH/ATQBZgHJAf8BNwFqAc0B/wE6AW0B0QH/ - ATwBcAHUAf8BQAFzAdYB/wE4AXAB1wH/AUMBdAHdAf8BcAGLAecF/wFdAYIB4wH/ASkBZgHbAf8BKgFo - Ad0B/wGJAakB7wn/AXQBlgHsAf8BWQGEAeoB/wFeAYYB6wH/AV8BhwHsAf8BYAGHAewB/wFTAYEB4wH/ - ARABPQGfAf//AIEAAREBPwGkAf8BaQGBAbsB/wFXAXoBtwH/AVEBdgG4Af8BQwFtAbUB/wEdAU4BrwH/ - ASYBVwG0Af8BKQFaAbkB/wEtAV4BvgH/ATABYQHCAf8BMwFlAcYB/wE1AWgBygH/ATgBawHOAf8BOwFv - AdIB/wE+AXIB1QH/ATABZwHSAf8B2wHlAfUF/wG/AdIB9QH/ASwBZwHYAf8BTgGBAeAB/wFRAYEB4QH/ - ASsBaQHfAf8C/gH9Af8B5AHqAfwB/wFeAYcB6gH/AVoBggHoAf8BXAGDAekB/wFcAYQB6gH/AV0BhAHq - Af8BVQGBAeQB/wEQAT8BpQH//wCBAAEVAUcBtQH/AXwBigHCAf8BXwGAAbkB/wFYAXsBuQH/AVkBegG+ - Af8BOQFkAbUB/wEhAVEBsQH/ASgBWQG2Af8BKwFcAbsB/wEuAWABwAH/ASsBWwHEAf8BHAFUAcIB/wEq - AWABygH/AS4BYwHQAf8BPAFwAdMB/wEnAWIB1gH/AYMBowHmBf8BrwHHAe8B/wEtAWgB2QH/AUwBgAHe - Af8BTwGBAeAB/wEuAWkB2wH/AfQB+AH9Af8BVQGBAeoB/wFCAXsB5QH/AVgBgQHmAf8BWQGBAecB/wFZ - AYEB6AH/AVoBgQHoAf8BVQGBAeUB/wEQAUUBtgH//wCBAAEYAUoBtQH/AYMBmQHIAf8BZQGBAboB/wFg - AYABugH/AVoBfQG7Af8BWgF9Ab8B/wEbAVABsAH/ASYBVwG0Af8BKQFbAbgB/wEtAV4BvQH/ARoBUQG7 - Af8ByAHUAfEF/wEMAUYBwQH/ARcBVAHJAf8BbwGJAd8B/wFfAYEB3gH/AS0BaAHUBf8BJwFiAdYB/wEw - AWgB2QH/AS4BaQHaAf8BSwGBAeIF/wHUAeEB9AH/AUkBfwHjAf8BVQGBAeQB/wFWAYEB5QH/AVcBgQHm - Af8BVwGBAeYB/wFVAYEB5QH/AREBRQG1Af//AIEAARsBTAG1Af8BlAGmAc4B/wFsAYEBuwH/AWcBgQG7 - Af8BYQGBAbwB/wFiAYEBwAH/AToBYAG0Af8BEQFGAasB/wEuAV0BuQH/AQwBPQGsAf8BDAEwAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF/AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE+AXYB4gH/AVIBgQHi - Af8BUwGBAeMB/wFUAYEB4wH/AVQBgQHkAf8BVAGBAeQB/wERAUUBtgH//wCBAAEeAU8BtgH/AaMBswHU - Af8BcwGCAbwB/wFuAYEBvQH/AWgBgQG9Af8BZQGBAb0B/wFOAXUBugH/ARkBSgGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATUBawHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEbAV0B1wH/ATsBcwHfAf8BRgF6Ad8B/wFP - AYEB4AH/AVABgQHhAf8BUQGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BEQFFAbYB//8AgQABIAFQAbcB/wGy - Ab8B2gH/AXkBhwG8Af8BdQGEAb4B/wFvAYEBvgH/AWkBgQG/Af8BagGBAcIB/wEfAU8BrA3/AZYBrgHg - Af8BJQFXAb4B/wEMAUMBvAH/AUoBdwHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRQF5AdcB/wFH - AXkB2AH/Ae0B8wH9Af8BWwGBAeEB/wE+AXQB2wH/AUoBfgHdAf8BSwF/Ad4B/wFMAYAB3wH/AU0BgQHf - Af8BTgGBAeAB/wFOAYEB4AH/AU4BgQHgAf8BEgFGAbYB//8AgQABIAFQAbcB/wHAAcsB4QH/AYABjAG+ - Af8BewGJAb8B/wF2AYYBvwH/AXABgQHAAf8BcQGEAcAB/wEMATUBmQH/AZIBqAHXBf8BeAGLAdEB/wEM - AUIBrQH/ASUBWQG/Af8BLQFeAcIB/wEkAVsBwQH/AQwBSAHDAf8B5wHvAfoJ/wHiAeoB9wH/ASQBXgHP - Af8BMAFqAdcB/wE3AW8B2QH/AUYBeQHaAf8BRwF7AdsB/wFIAXwB3AH/AUoBfQHdAf8BSgF+Ad0B/wFL - AX4B3gH/AUsBfwHeAf8BSwF/Ad4B/wERAUUBtgH//wCBAAEfAU8BtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AX0BiwHBAf8BdwGHAcEB/wFwAYIBvgH/AUMBbgGxCf8BDAExAaIB/wEhAVsBtwH/ASwBXQG7 - Af8BLwFgAb8B/wEyAWMBwwH/ASQBWgHCAf8BVwGBAdMJ/wE4AW0B1AH/ATUBawHVAf8BQAFzAdYB/wFC - AXUB1wH/AUMBdwHYAf8BRAF4AdkB/wFGAXkB2gH/AUcBegHbAf8BRwF7AdsB/wFIAXsB3AH/AUgBfAHc - Af8BSAF8AdwB/wERAUUBtgH//wCBAAEcAU0BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BdAGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDAE2AaIB/wEnAVgBtAH/ASoBWwG4Af8BLQFeAbwB/wEv - AWEBwAH/ASsBYAHEAf8BGwFWAcQF/wG4AckB7wH/AQ0BTAHJAf8BOAFqAdIB/wE9AXEB1AH/AT8BcgHV - Af8BQAF0AdYB/wFCAXUB1wH/AUMBdgHYAf8BRAF3AdkB/wFEAXgB2QH/AUUBeQHaAf8BRQF5AdoB/wFE - AXcB2QH/AREBRQG1Af//AIEAARcBSgG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF+ - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEMAS0BmwH/ASUBVgGwAf8BKAFZAbUB/wEqAVwBuQH/ - AS0BXgG9Af8BIwFYAcEB/wE7AWsByAn/AW4BhwHeAf8BKQFfAdEB/wE7AW4B0wH/ATwBcAHTAf8BPgFx - AdUB/wE/AXIB1QH/AUABcwHWAf8BQQF0AdcB/wFCAXUB1wH/AUIBdgHYAf8BQwF2AdgB/wE/AXMB1gH/ - ARABRAG2Af//AIEAAREBPwGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AX0BigHAAf8BWwF9AbUB/wHIAdIB6AX/ATYBXwGuAf8BDAFBAaUB/wEmAVYBsQH/ASgBWQG1Af8BIQFY - AbkB/wEMAT8BsQH/AbkBxQHsDf8BHwFYAcgB/wE4AWwB0QH/AToBbQHSAf8BOwFvAdMB/wE8AXAB0wH/ - AT0BcQHUAf8BPgFyAdUB/wE/AXIB1QH/AT8BcwHWAf8BQAFzAdYB/wE6AW4B0gH/ARABPgGiAf//AIEA - ARABPQGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcgGE - Ab4B/wG3AcYB4wn/AT8BZgG0Af8BDAEsAZsB/wEMATYBogH/AQwBOAGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUMBcwHLAf8BaAGCAdUB/wElAVoBxgH/ATUBaQHOAf8BNwFrAdAB/wE4AWwB0QH/ATkBbQHSAf8BOgFu - AdIB/wE7AW8B0wH/ATwBbwHTAf8BPAFwAdMB/wE9AXAB1AH/ATUBaQHPAf8BEAE9AZ8B//8AgQABDwE3 + ASADAAEBAQABIAYAAUAqAAEPAS0BdgH/ARABMwGBAf8BEAE3AYgB/wERAT0BmQH/AREBPgGfAf8BEQFE + AbAB/wERAUYBtgH/ARIBRgG2Af8BEgFGAbYB/wESAUYBtgH/ARIBRgG2Af8BEgFGAbYB/wESAUYBtgH/ + ARIBRgG2Af8BEQFCAaoB/wERAT4BnwH/AREBPAGWAf8BEAE3AYgB/wEQATEBgQH/AQ8BLAFzAf//AKEA + AREBOwGTAf8BFAFHAbYB/wEZAU0BuAH/AR0BUQG7Af8BIgFVAb8B/wEmAVoBwwH/ASsBXgHHAf8BMAFj + AcoB/wE0AWgBzgH/ATkBbQHRAf8BPgFxAdQB/wFCAXYB1wH/AUYBegHaAf8BSQF9AdwB/wFMAYAB3gH/ + AVABgQHgAf8BUQGBAeEB/wFSAYEB4gH/AVIBgQHiAf8BUQGBAeEB/wFPAYEB4AH/AUwBfwHeAf8BRwF7 + AdoB/wFCAXUB1gH/AToBbgHRAf8BMQFlAcsB/wEbAU8BvAH/AREBOgGQAf//AI0AAREBPAGWAf8BGAFK + AbMB/wEjAVUBtwH/AScBWQG8Af8BKgFdAcEB/wEtAWABxQH/ATABZAHJAf8BMwFnAc0B/wE2AWoBzwH/ + AToBbQHRAf8BPQFwAdMB/wFAAXMB1QH/AUMBdgHXAf8BRgF6AdoB/wFJAXwB3AH/AUwBgAHeAf8BTwGB + AeAB/wFSAYEB4gH/AVYBgQHkAf8BWQGBAeYB/wFcAYIB6QH/AV8BhQHrAf8BYgGIAe0B/wFlAYsB7wH/ + AWgBjgHxAf8BawGSAfMB/wFuAZQB9QH/AW4BlAH1Af8BNQFoAc4B/wEQATsBkwH//wCJAAETAUYBswH/ + AR8BUQGwAf8BIwFVAbUB/wEmAVgBugH/ASoBXAG/Af8BLQFfAcMB/wEwAWMByAH/ATMBZwHMAf8BNgFq + Ac8B/wE5AW0B0QH/ATwBcAHTAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BSQF8AdwB/wFMAX8B3gH/ + AU8BgQHgAf8BUgGBAeIB/wFVAYEB5AH/AVgBgQHmAf8BXAGCAegB/wFfAYUB6gH/AWIBiAHsAf8BZQGL + Ae8B/wFoAY4B8QH/AWsBkQHzAf8BbgGUAfUB/wFxAZcB9wH/AXABlgH2Af8BHQFRAb4B//8AiQABFgFI + Aa8B/wEfAVABrgH/ASMBVAGzAf8BJgFYAbgB/wEpAVsBvQH/ASwBXwHBAf8BLwFiAcYB/wEzAWYBygH/ + ATYBaQHOAf8BOQFsAdAB/wE8AXAB0wH/AT8BcwHVAf8BQgF2AdcB/wFFAXkB2QH/AUgBfAHbAf8BSwF/ + Ad0B/wFPAYEB3wH/AVIBgQHhAf8BVQGBAeQB/wFYAYEB5gH/AVsBgQHoAf8BXgGEAeoB/wFhAYcB7AH/ + AWQBigHuAf8BZwGNAfAB/wFqAZAB8gH/AWwBkwH0Af8BbgGUAfUB/wFvAZUB9gH/ATYBagHOAf//AIkA + ARcBSQGsAf8BHwFPAawB/wEiAVMBsQH/ASYBVwG2Af8BKQFaAbsB/wEsAV4BvwH/AS8BYQHEAf8BMgFl + AcgB/wE1AWkBzQH/ATgBbAHQAf8BOwFvAdIB/wE/AXIB1AH/AUIBdQHWAf8BRQF4AdkB/wFIAXsB2wH/ + AUsBfgHdAf8BTgGBAd8B/wFRAYEB4QH/AVQBgQHjAf8BVwGBAeUB/wFaAYEB5wH/AV0BgwHpAf8BYAGG + AesB/wFjAYkB7QH/AWUBjAHvAf8BaAGOAfEB/wFqAZAB8gH/AWwBkgHzAf8BbAGTAfQB/wE/AXMB1QH/ + /wCFAAEQATABfgH/ARgBSAGpAf8BHgFOAakB/wEhAVIBrwH/ASQBVgG0Af8BKAFZAbkB/wErAV0BvQH/ + AS4BYQHCAf8BMQFkAcYB/wE0AWcBywH/ATgBawHPAf8BOwFuAdIB/wE+AXEB1AH/AUEBdAHWAf8BRAF3 + AdgB/wFHAXoB2gH/AUoBfQHcAf8BRgF6Ad4B/wE4AXAB2wH/AUoBgQHfAf8BPgF4Ad8B/wFQAYEB5wH/ + AWsBjgHrAf8BTwGBAeoB/wFhAYcB7AH/AWQBigHuAf8BZgGMAe8B/wFoAY4B8QH/AWkBjwHxAf8BaQGQ + AfIB/wFGAXoB2gH/ARABMAF+Af//AIEAARABNQGCAf8BHAFLAacB/wEdAU0BpwH/ASABUQGsAf8BJAFV + AbIB/wEnAVgBtwH/ASsBXAG7Af8BLgFgAcAB/wExAWMBxAH/ATQBZwHJAf8BNwFqAc0B/wE6AW0B0QH/ + AT0BcAHTAf8BQAFzAdUB/wFDAXYB1wH/AUYBeQHZAf8BSQF8AdsB/wE9AXMB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BYQGGAesB/wFZAYEB6wH/AWEBiAHsAf8BYwGKAe4B/wFlAYsB7wH/AWYBjAHvAf8BZgGN + AfAB/wFMAYAB3gH/ARABNQGCAf//AIEAARABOQGNAf8BRQFsAbMB/wE2AWABrgH/ASEBUAGqAf8BIwFT + Aa8B/wEmAVcBtAH/ASoBWwG5Af8BLQFeAb4B/wEwAWIBwgH/ATMBZQHHAf8BNgFpAcsB/wE5AWwBzwH/ + ATwBbwHSAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BQQF2AdsB/wEfAWAB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BOwF4AeYB/wFTAYEB6wH/AWEBhwHsAf8BYgGIAe0B/wFjAYkB7QH/AWQBigHuAf8BUQGB + AeEB/wEQATkBjgH//wCBAAERAT4BnwH/AVQBdwG1Af8BUQF1AbYB/wFAAWkBtAH/ARwBTgGtAf8BJQFW + AbIB/wEoAVkBtwH/ASwBXQG7Af8BLwFgAcAB/wEyAWQBxAH/ATUBZwHJAf8BOAFrAc0B/wE7AW4B0QH/ + AT0BcQHUAf8BQQF0AdYB/wE5AXEB1wH/AUQBdQHdAf8BcQGLAecF/wFeAYIB4wH/ASoBZwHbAf8BKwFp + Ad0B/wGJAakB7wn/AXUBlgHsAf8BWgGEAeoB/wFfAYYB6wH/AWABhwHsAf8BYQGHAewB/wFUAYEB4wH/ + AREBPgGfAf//AIEAARIBQAGkAf8BagGBAbsB/wFYAXsBtwH/AVIBdwG4Af8BRAFuAbUB/wEeAU8BrwH/ + AScBWAG0Af8BKgFbAbkB/wEuAV8BvgH/ATEBYgHCAf8BNAFmAcYB/wE2AWkBygH/ATkBbAHOAf8BPAFw + AdIB/wE/AXMB1QH/ATEBaAHSAf8B2wHlAfUF/wG/AdIB9QH/AS0BaAHYAf8BTwGBAeAB/wFSAYEB4QH/ + ASwBagHfAf8C/gH9Af8B5AHqAfwB/wFfAYcB6gH/AVsBggHoAf8BXQGDAekB/wFdAYQB6gH/AV4BhAHq + Af8BVgGBAeQB/wERAUABpQH//wCBAAEWAUgBtQH/AX0BigHCAf8BYAGBAbkB/wFZAXwBuQH/AVoBewG+ + Af8BOgFlAbUB/wEiAVIBsQH/ASkBWgG2Af8BLAFdAbsB/wEvAWEBwAH/ASwBXAHEAf8BHQFVAcIB/wEr + AWEBygH/AS8BZAHQAf8BPQFxAdMB/wEoAWMB1gH/AYMBowHmBf8BrwHHAe8B/wEuAWkB2QH/AU0BgQHe + Af8BUAGBAeAB/wEvAWoB2wH/AfQB+AH9Af8BVgGBAeoB/wFDAXwB5QH/AVkBgQHmAf8BWgGBAecB/wFa + AYEB6AH/AVsBgQHoAf8BVgGBAeUB/wERAUYBtgH//wCBAAEZAUsBtQH/AYMBmQHIAf8BZgGBAboB/wFh + AYEBugH/AVsBfgG7Af8BWwF+Ab8B/wEcAVEBsAH/AScBWAG0Af8BKgFcAbgB/wEuAV8BvQH/ARsBUgG7 + Af8ByAHUAfEF/wENAUcBwQH/ARgBVQHJAf8BcAGJAd8B/wFgAYEB3gH/AS4BaQHUBf8BKAFjAdYB/wEx + AWkB2QH/AS8BagHaAf8BTAGBAeIF/wHUAeEB9AH/AUoBgAHjAf8BVgGBAeQB/wFXAYEB5QH/AVgBgQHm + Af8BWAGBAeYB/wFWAYEB5QH/ARIBRgG1Af//AIEAARwBTQG1Af8BlAGmAc4B/wFtAYEBuwH/AWgBgQG7 + Af8BYgGBAbwB/wFjAYEBwAH/ATsBYQG0Af8BEgFHAasB/wEvAV4BuQH/AQ0BPgGsAf8BDQExAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wGAAZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE/AXcB4gH/AVMBgQHi + Af8BVAGBAeMB/wFVAYEB4wH/AVUBgQHkAf8BVQGBAeQB/wESAUYBtgH//wCBAAEfAVABtgH/AaMBswHU + Af8BdAGCAbwB/wFvAYEBvQH/AWkBgQG9Af8BZgGBAb0B/wFPAXYBugH/ARoBSwGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATYBbAHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEcAV4B1wH/ATwBdAHfAf8BRwF7Ad8B/wFQ + AYEB4AH/AVEBgQHhAf8BUgGBAeEB/wFSAYEB4gH/AVIBgQHiAf8BEgFGAbYB//8AgQABIQFRAbcB/wGy + Ab8B2gH/AXoBhwG8Af8BdgGEAb4B/wFwAYEBvgH/AWoBgQG/Af8BawGBAcIB/wEgAVABrA3/AZYBrgHg + Af8BJgFYAb4B/wENAUQBvAH/AUsBeAHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRgF6AdcB/wFI + AXoB2AH/Ae0B8wH9Af8BXAGBAeEB/wE/AXUB2wH/AUsBfwHdAf8BTAGAAd4B/wFNAYEB3wH/AU4BgQHf + Af8BTwGBAeAB/wFPAYEB4AH/AU8BgQHgAf8BEwFHAbYB//8AgQABIQFRAbcB/wHAAcsB4QH/AYEBjAG+ + Af8BfAGJAb8B/wF3AYYBvwH/AXEBgQHAAf8BcgGEAcAB/wENATYBmQH/AZIBqAHXBf8BeQGLAdEB/wEN + AUMBrQH/ASYBWgG/Af8BLgFfAcIB/wElAVwBwQH/AQ0BSQHDAf8B5wHvAfoJ/wHiAeoB9wH/ASUBXwHP + Af8BMQFrAdcB/wE4AXAB2QH/AUcBegHaAf8BSAF8AdsB/wFJAX0B3AH/AUsBfgHdAf8BSwF/Ad0B/wFM + AX8B3gH/AUwBgAHeAf8BTAGAAd4B/wESAUYBtgH//wCBAAEgAVABtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AX4BiwHBAf8BeAGHAcEB/wFxAYIBvgH/AUQBbwGxCf8BDQEyAaIB/wEiAVwBtwH/AS0BXgG7 + Af8BMAFhAb8B/wEzAWQBwwH/ASUBWwHCAf8BWAGBAdMJ/wE5AW4B1AH/ATYBbAHVAf8BQQF0AdYB/wFD + AXYB1wH/AUQBeAHYAf8BRQF5AdkB/wFHAXoB2gH/AUgBewHbAf8BSAF8AdsB/wFJAXwB3AH/AUkBfQHc + Af8BSQF9AdwB/wESAUYBtgH//wCBAAEdAU4BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BdQGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDQE3AaIB/wEoAVkBtAH/ASsBXAG4Af8BLgFfAbwB/wEw + AWIBwAH/ASwBYQHEAf8BHAFXAcQF/wG4AckB7wH/AQ4BTQHJAf8BOQFrAdIB/wE+AXIB1AH/AUABcwHV + Af8BQQF1AdYB/wFDAXYB1wH/AUQBdwHYAf8BRQF4AdkB/wFFAXkB2QH/AUYBegHaAf8BRgF6AdoB/wFF + AXgB2QH/ARIBRgG1Af//AIEAARgBSwG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF/ + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wENAS4BmwH/ASYBVwGwAf8BKQFaAbUB/wErAV0BuQH/ + AS4BXwG9Af8BJAFZAcEB/wE8AWwByAn/AW8BhwHeAf8BKgFgAdEB/wE8AW8B0wH/AT0BcQHTAf8BPwFy + AdUB/wFAAXMB1QH/AUEBdAHWAf8BQgF1AdcB/wFDAXYB1wH/AUMBdwHYAf8BRAF3AdgB/wFAAXQB1gH/ + AREBRQG2Af//AIEAARIBQAGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AX4BigHAAf8BXAF+AbUB/wHIAdIB6AX/ATcBYAGuAf8BDQFCAaUB/wEnAVcBsQH/ASkBWgG1Af8BIgFZ + AbkB/wENAUABsQH/AbkBxQHsDf8BIAFZAcgB/wE5AW0B0QH/ATsBbgHSAf8BPAFwAdMB/wE9AXEB0wH/ + AT4BcgHUAf8BPwFzAdUB/wFAAXMB1QH/AUABdAHWAf8BQQF0AdYB/wE7AW8B0gH/AREBPwGiAf//AIEA + AREBPgGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcwGE + Ab4B/wG3AcYB4wn/AUABZwG0Af8BDQEtAZsB/wENATcBogH/AQ0BOQGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUQBdAHLAf8BaQGCAdUB/wEmAVsBxgH/ATYBagHOAf8BOAFsAdAB/wE5AW0B0QH/AToBbgHSAf8BOwFv + AdIB/wE8AXAB0wH/AT0BcAHTAf8BPQFxAdMB/wE+AXEB1AH/ATYBagHPAf8BEQE+AZ8B//8AgQABEAE4 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BDAEqAasB/wEcAVMBvQH/ASgBXAHFAf8BMQFkAcgB/wEzAWYBywH/ATQBaAHOAf8BNQFp - Ac8B/wE2AWoB0AH/ATcBawHQAf8BOAFsAdEB/wE5AW0B0QH/ATkBbQHSAf8BOgFtAdIB/wEwAWQBywH/ - AQ8BNwGLAf//AIEAAQ8BNAGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWoBgQG8Af8BDAEYAYUB/wHrAfAB9Qn/AakBuwHhCf8BbAGC - Ac4B/wEkAVcBvQH/AS0BXwHBAf8BLwFhAcUB/wEwAWMByAH/ATEBZQHLAf8BMwFmAc0B/wE0AWcBzgH/ - ATUBaAHOAf8BNQFpAc8B/wE2AWoBzwH/ATYBagHQAf8BNwFrAdAB/wErAV4BxwH/AQ8BNAGBAf//AIEA - AQ4BLgF6Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BeAGHAcQB/wHQAdwB7QX/ATwBZgGwAf8BDAEdAZUB/wEQAUYBqQH/ - AakBuAHhAf8BDQFDAa0B/wEYAU8BswH/ASQBVgG9Af8BJQFYAcEB/wEnAWABxAH/AS8BYgHHAf8BMAFj - AcoB/wExAWUBzAH/ATIBZQHMAf8BMwFmAc0B/wEzAWcBzQH/ATQBZwHNAf8BNAFnAc4B/wEmAVkBxAH/ - AQ8BLgF6Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX0BjQHIAf8BbQGC - AcEB/wFjAYEBwwH/AVkBgQHEAf8BWwGAAcUB/wFdAYEBxQH/AVgBfgHGAf8BUwF8AcYB/wFJAXYByQH/ - AUEBbwHJAf8BPAFsAcsB/wE3AWkBywH/ATIBZQHLAf8BMAFjAcsB/wEwAWQBywH/ATEBZAHMAf8BMQFl - AcwB/wEhAVQBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BDQErAasB/wEdAVQBvQH/ASkBXQHFAf8BMgFlAcgB/wE0AWcBywH/ATUBaQHOAf8BNgFq + Ac8B/wE3AWsB0AH/ATgBbAHQAf8BOQFtAdEB/wE6AW4B0QH/AToBbgHSAf8BOwFuAdIB/wExAWUBywH/ + ARABOAGLAf//AIEAARABNQGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWsBgQG8Af8BDQEZAYUB/wHrAfAB9Qn/AakBuwHhCf8BbQGC + Ac4B/wElAVgBvQH/AS4BYAHBAf8BMAFiAcUB/wExAWQByAH/ATIBZgHLAf8BNAFnAc0B/wE1AWgBzgH/ + ATYBaQHOAf8BNgFqAc8B/wE3AWsBzwH/ATcBawHQAf8BOAFsAdAB/wEsAV8BxwH/ARABNQGBAf//AIEA + AQ8BLwF7Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BeQGHAcQB/wHQAdwB7QX/AT0BZwGwAf8BDQEeAZUB/wERAUcBqQH/ + AakBuAHhAf8BDgFEAa0B/wEZAVABswH/ASUBVwG9Af8BJgFZAcEB/wEoAWEBxAH/ATABYwHHAf8BMQFk + AcoB/wEyAWYBzAH/ATMBZgHMAf8BNAFnAc0B/wE0AWgBzQH/ATUBaAHNAf8BNQFoAc4B/wEnAVoBxAH/ + ARABLwF7Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX4BjQHIAf8BbgGC + AcEB/wFkAYEBwwH/AVoBgQHEAf8BXAGBAcUB/wFeAYEBxQH/AVkBfwHGAf8BVAF9AcYB/wFKAXcByQH/ + AUIBcAHJAf8BPQFtAcsB/wE4AWoBywH/ATMBZgHLAf8BMQFkAcsB/wExAWUBywH/ATIBZQHMAf8BMgFm + AcwB/wEiAVUBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AX4BiwHGAf8BeAGHAcYB/wFuAYIBxwH/AWgBgQHHAf8BYgGBAccB/wFcAYEBxwH/AVYBfQHIAf8BUAF5 - AcgB/wFKAXUByQH/AUQBcQHKAf8BPgFtAcoB/wE3AWgBywH/ATEBZAHKAf8BLgFhAckB/wEuAWIBygH/ - AS4BYgHKAf8BHAFQAb0B//8AiQABaAGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AX8BiwHGAf8BeQGHAcYB/wFvAYIBxwH/AWkBgQHHAf8BYwGBAccB/wFdAYEBxwH/AVcBfgHIAf8BUQF6 + AcgB/wFLAXYByQH/AUUBcgHKAf8BPwFuAcoB/wE4AWkBywH/ATIBZQHKAf8BLwFiAckB/wEvAWMBygH/ + AS8BYwHKAf8BHQFRAb0B//8AiQABaQGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGBAZAByAH/AXsBiwHHAf8BdQGHAccB/wFuAYIBxwH/AWgBgQHHAf8BYQGBAccB/wFbAYEBxwH/ - AVUBfAHIAf8BTwF4AcgB/wFJAXQByQH/AUIBbwHJAf8BPAFrAcoB/wE1AWYBygH/AS8BYgHJAf8BKwFf - AcgB/wErAV8ByAH/ARcBSwG6Af//AIkAAScBVgG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AXwBiwHHAf8BdgGHAccB/wFvAYIBxwH/AWkBgQHHAf8BYgGBAccB/wFcAYEBxwH/ + AVYBfQHIAf8BUAF5AcgB/wFKAXUByQH/AUMBcAHJAf8BPQFsAcoB/wE2AWcBygH/ATABYwHJAf8BLAFg + AcgB/wEsAWAByAH/ARgBTAG6Af//AIkAASgBVwG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wGAAY8BxwH/AXsBiwHHAf8BdAGGAccB/wFuAYIBxwH/AWcBgQHHAf8BYQGB - AccB/wFbAYABxwH/AVQBewHHAf8BTgF3AcgB/wFHAXMByAH/AUEBbgHIAf8BOgFpAckB/wEzAWUByAH/ - AS0BXwHHAf8BJgFaAcQB/wERAUQBswH//wCJAAEOATEBgQH/AWYBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGBAY8BxwH/AXwBiwHHAf8BdQGGAccB/wFvAYIBxwH/AWgBgQHHAf8BYgGB + AccB/wFcAYEBxwH/AVUBfAHHAf8BTwF4AcgB/wFIAXQByAH/AUIBbwHIAf8BOwFqAckB/wE0AWYByAH/ + AS4BYAHHAf8BJwFbAcQB/wESAUUBswH//wCJAAEPATIBgQH/AWcBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF+AYwBxQH/AXkBiQHGAf8BdAGGAccB/wFtAYEBxwH/ - AWYBgQHGAf8BYAGBAcYB/wFaAX8BxgH/AVMBegHHAf8BTQF1AccB/wFGAXEBxwH/AT8BbAHIAf8BOAFo - AcgB/wEuAV8BxQH/ARYBSgG5Af8BDgEtAXgB//8AjQABDwExAYEB/wEkAVQBugH/AWABgQHMAf8BfwGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF/AYwBxQH/AXoBiQHGAf8BdQGGAccB/wFuAYEBxwH/ + AWcBgQHGAf8BYQGBAcYB/wFbAYABxgH/AVQBewHHAf8BTgF2AccB/wFHAXIBxwH/AUABbQHIAf8BOQFp + AcgB/wEvAWABxQH/ARcBSwG5Af8BDwEuAXkB//8AjQABEAEyAYEB/wElAVUBugH/AWEBgQHMAf8BgAGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfAGN - AcwB/wFqAYEByQH/AVcBfQHFAf8BRAFuAcIB/wE5AWUBwAH/AS4BXQG+Af8BJQFWAb0B/wEdAU8BugH/ - ARIBRgG2Af8BDgEuAXsB//8ApQABDwEwAYAB/wEPATYBiAH/ARABOwGWAf8BEAE9AZ8B/wEQAUIBrQH/ - AREBRQG2Af8BEAFFAbYB/wETAUYBtgH/ARQBRwG2Af8BFAFHAbYB/wESAUUBtgH/ARABRQG2Af8BEQFF - AbYB/wEQAUABpwH/ARABPQGfAf8BEAE5AZAB/wEPATUBhQH/AQ8BLwF9Af//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfQGN + AcwB/wFrAYEByQH/AVgBfgHFAf8BRQFvAcIB/wE6AWYBwAH/AS8BXgG+Af8BJgFXAb0B/wEeAVABugH/ + ARMBRwG2Af8BDwEvAXwB//8ApQABEAExAYEB/wEQATcBiAH/AREBPAGWAf8BEQE+AZ8B/wERAUMBrQH/ + ARIBRgG2Af8BEQFGAbYB/wEUAUcBtgH/ARUBSAG2Af8BFQFIAbYB/wETAUYBtgH/AREBRgG2Af8BEgFG + AbYB/wERAUEBpwH/AREBPgGfAf8BEQE6AZAB/wEQATYBhQH/ARABMAF+Af//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL </value> </data> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-21 20:39:38
|
Revision: 207 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=207&view=rev Author: dukus Date: 2007-03-21 13:20:16 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Show logo in control panele Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-21 17:53:54 UTC (rev 206) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-21 20:20:16 UTC (rev 207) @@ -5,6 +5,7 @@ using System.IO; using System.Net; using System.Xml; +using System.Drawing; using ICSharpCode.SharpZipLib.Zip; using System.Windows.Forms; using MediaPortal.Configuration; @@ -378,7 +379,25 @@ pkg._intalerStruct.UpdateURL = nodefile.SelectSingleNode("URL").InnerText; XmlNode grup_node = nodefile.SelectSingleNode("Group"); if (grup_node != null) - pkg._intalerStruct.Group = grup_node.InnerText; + pkg._intalerStruct.Group = grup_node.InnerText; + XmlNode node_logo = nodefile.SelectSingleNode("Logo"); + if (node_logo != null) + { + byte[] buffer = Convert.FromBase64String(node_logo.InnerText); + string t = Path.GetTempFileName(); + FileStream fs = new FileStream(t, FileMode.Create); + fs.Write(buffer, 0, buffer.Length); + fs.Close(); + pkg._intalerStruct.Logo = Image.FromFile(t, true); + try + { + File.Delete(t); + } + catch (Exception) + { + + } + } XmlNode node_des = nodefile.SelectSingleNode("Description"); XmlNodeList uninstallList = nodefile.SelectNodes("Uninstall/FileInfo"); foreach (XmlNode un in uninstallList) Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-21 17:53:54 UTC (rev 206) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-03-21 20:20:16 UTC (rev 207) @@ -53,6 +53,11 @@ { MPpackageStruct pk = (MPpackageStruct)mpih.lst[i]; ListViewItem item1 = new ListViewItem(pk._intalerStruct.Name, 0); + if (pk._intalerStruct.Logo != null) + { + imageList1.Images.Add(pk._intalerStruct.Logo); + item1.ImageIndex = imageList1.Images.Count - 1; + } item1.SubItems.Add(pk._intalerStruct.Author); item1.SubItems.Add(pk._intalerStruct.Version); item1.SubItems.Add(Path.GetFileName(pk.FileName)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mab...@us...> - 2007-03-21 17:59:41
|
Revision: 206 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=206&view=rev Author: mablebee Date: 2007-03-21 10:53:54 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Added Paths: ----------- trunk/plugins/autostart/ trunk/plugins/autostart/AutoStart.cs trunk/plugins/autostart/AutoStart.csproj trunk/plugins/autostart/AutoStartConfig.Designer.cs trunk/plugins/autostart/AutoStartConfig.cs trunk/plugins/autostart/AutoStartConfig.resx trunk/plugins/autostart/Properties/ trunk/plugins/autostart/Properties/AssemblyInfo.cs trunk/plugins/autostart/Properties/Resources.Designer.cs trunk/plugins/autostart/Properties/Resources.resx trunk/plugins/autostart/Resources/ trunk/plugins/autostart/Resources/mplogo.gif trunk/plugins/autostart/bin/ trunk/plugins/autostart/bin/Debug/ trunk/plugins/autostart/bin/Debug/AutoStart.dll trunk/plugins/autostart/bin/Debug/AutoStart.pdb trunk/plugins/autostart/bin/Debug/AxInterop.WMPLib.dll trunk/plugins/autostart/bin/Debug/Bass.Net.dll trunk/plugins/autostart/bin/Debug/BassRegistration.dll trunk/plugins/autostart/bin/Debug/Core.DLL trunk/plugins/autostart/bin/Debug/DirectShowLib.dll trunk/plugins/autostart/bin/Debug/ICSharpCode.SharpZipLib.dll trunk/plugins/autostart/bin/Debug/Interop.WMPLib.dll trunk/plugins/autostart/bin/Debug/MediaPortal.Support.dll trunk/plugins/autostart/bin/Debug/MediaPortal.Support.pdb trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3D.dll trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3DX.dll trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.dll trunk/plugins/autostart/bin/Debug/Utils.DLL trunk/plugins/autostart/bin/Debug/edtftpnet-1.2.2.dll trunk/plugins/autostart/bin/Release/ trunk/plugins/autostart/bin/Release/AutoStart.dll trunk/plugins/autostart/bin/Release/AutoStart.pdb trunk/plugins/autostart/bin/Release/AxInterop.WMPLib.dll trunk/plugins/autostart/bin/Release/Bass.Net.dll trunk/plugins/autostart/bin/Release/BassRegistration.dll trunk/plugins/autostart/bin/Release/Core.DLL trunk/plugins/autostart/bin/Release/DirectShowLib.dll trunk/plugins/autostart/bin/Release/ICSharpCode.SharpZipLib.dll trunk/plugins/autostart/bin/Release/Interop.WMPLib.dll trunk/plugins/autostart/bin/Release/MediaPortal.Support.dll trunk/plugins/autostart/bin/Release/MediaPortal.Support.pdb trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3D.dll trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3DX.dll trunk/plugins/autostart/bin/Release/Microsoft.DirectX.dll trunk/plugins/autostart/bin/Release/Utils.dll trunk/plugins/autostart/bin/Release/edtftpnet-1.2.2.dll trunk/plugins/autostart/obj/ trunk/plugins/autostart/obj/AutoStart.csproj.FileList.txt trunk/plugins/autostart/obj/Debug/ trunk/plugins/autostart/obj/Debug/AutoStart.csproj.GenerateResource.Cache trunk/plugins/autostart/obj/Debug/AutoStart.dll trunk/plugins/autostart/obj/Debug/AutoStart.pdb trunk/plugins/autostart/obj/Debug/AutoStartConfig.ConfigAutoStart.resources trunk/plugins/autostart/obj/Debug/TempPE/ trunk/plugins/autostart/obj/Release/ trunk/plugins/autostart/obj/Release/AutoStart.csproj.GenerateResource.Cache trunk/plugins/autostart/obj/Release/AutoStart.dll trunk/plugins/autostart/obj/Release/AutoStart.pdb trunk/plugins/autostart/obj/Release/AutoStartConfig.ConfigAutoStart.resources trunk/plugins/autostart/obj/Release/ClassLibrary1.Properties.Resources.resources trunk/plugins/autostart/obj/Release/Refactor/ trunk/plugins/autostart/obj/Release/ResolveAssemblyReference.cache trunk/plugins/autostart/obj/Release/TempPE/ trunk/plugins/autostart/obj/Release/TempPE/Properties.Resources.Designer.cs.dll Added: trunk/plugins/autostart/AutoStart.cs =================================================================== --- trunk/plugins/autostart/AutoStart.cs (rev 0) +++ trunk/plugins/autostart/AutoStart.cs 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,175 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Windows.Forms; +using MediaPortal.Util; +using MediaPortal.Profile; +using MediaPortal.Services; +using MediaPortal.Configuration; +using MediaPortal.GUI.Library; +using MediaPortal.Player; +using AutoStartConfig; + +/* AutoStart Generation II + * + * Author: Martin Werner + * + * Version 1.0: 2007-03-19 + * ------------------------- + * Basic functionallity as Process Plugin + * Startup-Choices (TV, Weather, Audio, Video, ...) from available window handles + * Configuration Dialog and settings via mediaportal.xml + * + * Version 1.1: 2007-03-20 + * ------------------------- + * Code cleanup, commenting for better readability + * + *--------------------------------------------------------------------------- + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +namespace AutoStart +{ + public class AutoStart : IPlugin, ISetupForm + { + #region vars + + ILog _epgLog; + String l_startwhat = ""; + + #endregion + + #region Ctor + public AutoStart() + { + } + #endregion + + #region IPlugin members + + public void Stop() + { + } + + public void Start() + { + // setup logging + ServiceProvider services = GlobalServiceProvider.Instance; + _epgLog = services.Get<ILog>(); + + // load settings + using (Settings reader = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + l_startwhat = reader.GetValue("autostart", "startscreen"); + } + + Log.Info("AutoStart: started"); + + // Let's see if we could read out something from settings - if so let's try to launch it + if (l_startwhat.Length > 0) + { + Log.Info("AutoStart: Enumerating Windows {0}", l_startwhat); + + Array nativeWindowsList = Enum.GetValues(typeof(GUIWindow.Window)); + foreach (GUIWindow.Window wnd in nativeWindowsList) + { + if (String.Compare(l_startwhat,wnd.ToString()) == 0) + { + // Yep, is a valid window we can try to launch :-) + + // if (Recorder.IsRecording()) <-- maybe we'll need to take care of this sometime... + + GUIWindowManager.ActivateWindow((int)wnd); + Log.Info("AutoStart: Launching Window {0}", (int)wnd); + } + } + } + } + + #endregion + + #region ISetupForm Members + + public string PluginName() + { + return "AutoStart"; + } + + public string Description() + { + return "AutoStart Plugin for MediaPortal"; + } + + public string Author() + { + return "mablebee"; + } + + public void ShowPlugin() + { + // Configure this plugin + ConfigAutoStart l_form = new ConfigAutoStart(); + l_form.Show(); + } + + public bool DefaultEnabled() + { + return false; + } + + public bool CanEnable() + { + return true; + } + + public int GetWindowId() + { + return 47110815; + } + + public bool HasSetup() + { + return true; + } + + /// <summary> + /// If the plugin should have it's own button on the main menu of MediaPortal then it + /// should return true to this method, otherwise if it should not be on home + /// it should return false + /// </summary> + /// <param name="strButtonText">text the button should have</param> + /// <param name="strButtonImage">image for the button, or empty for default</param> + /// <param name="strButtonImageFocus">image for the button, or empty for default</param> + /// <param name="strPictureImage">subpicture for the button or empty for none</param> + /// <returns>true : plugin needs it's own button on home + /// false : plugin does not need it's own button on home</returns> + + public bool GetHome(out string strButtonText, out string strButtonImage, + out string strButtonImageFocus, out string strPictureImage) + { + strButtonText = String.Empty; + strButtonImage = String.Empty; + strButtonImageFocus = String.Empty; + strPictureImage = String.Empty; + return false; + } + + #endregion + } +} Added: trunk/plugins/autostart/AutoStart.csproj =================================================================== --- trunk/plugins/autostart/AutoStart.csproj (rev 0) +++ trunk/plugins/autostart/AutoStart.csproj 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,82 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{9A71624D-ABAE-4D49-B05D-F1C83DE77C07}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>ClassLibrary1</RootNamespace> + <AssemblyName>AutoStart</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="Core, Version=1.0.2634.1793, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\..\..\Programme\Team MediaPortal\MediaPortal\Core.DLL</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + <Reference Include="Utils, Version=2.1.2634.1787, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\..\..\Programme\Team MediaPortal\MediaPortal\Utils.DLL</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="AutoStart.cs" /> + <Compile Include="AutoStartConfig.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="AutoStartConfig.Designer.cs"> + <DependentUpon>AutoStartConfig.cs</DependentUpon> + </Compile> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="AutoStartConfig.resx"> + <SubType>Designer</SubType> + <DependentUpon>AutoStartConfig.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="Properties\Resources.resx"> + <SubType>Designer</SubType> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> + <None Include="Resources\mplogo.gif" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/plugins/autostart/AutoStartConfig.Designer.cs =================================================================== --- trunk/plugins/autostart/AutoStartConfig.Designer.cs (rev 0) +++ trunk/plugins/autostart/AutoStartConfig.Designer.cs 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,121 @@ +namespace AutoStartConfig +{ + partial class ConfigAutoStart + { + /// <summary> + /// Erforderliche Designervariable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Verwendete Ressourcen bereinigen. + /// </summary> + /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Windows Form-Designer generierter Code + + /// <summary> + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// </summary> + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.buttonOK = new System.Windows.Forms.Button(); + this.butCancel = new System.Windows.Forms.Button(); + this.f_combobox = new System.Windows.Forms.ComboBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.SystemColors.Window; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(66, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Startup with:"; + // + // buttonOK + // + this.buttonOK.Location = new System.Drawing.Point(142, 142); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(75, 23); + this.buttonOK.TabIndex = 2; + this.buttonOK.Text = "&OK"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.button1_Click); + // + // butCancel + // + this.butCancel.Location = new System.Drawing.Point(61, 142); + this.butCancel.Name = "butCancel"; + this.butCancel.Size = new System.Drawing.Size(75, 23); + this.butCancel.TabIndex = 3; + this.butCancel.Text = "&Cancel"; + this.butCancel.UseVisualStyleBackColor = true; + this.butCancel.Click += new System.EventHandler(this.butCancel_Click); + // + // f_combobox + // + this.f_combobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.f_combobox.FormattingEnabled = true; + this.f_combobox.Items.AddRange(new object[] { + "DVD", + "Radio", + "TV", + "Videos"}); + this.f_combobox.Location = new System.Drawing.Point(84, 6); + this.f_combobox.Name = "f_combobox"; + this.f_combobox.Size = new System.Drawing.Size(192, 21); + this.f_combobox.Sorted = true; + this.f_combobox.TabIndex = 4; + // + // pictureBox1 + // + this.pictureBox1.Image = global::ClassLibrary1.Properties.Resources.mplogo; + this.pictureBox1.Location = new System.Drawing.Point(-33, -17); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(420, 290); + this.pictureBox1.TabIndex = 6; + this.pictureBox1.TabStop = false; + // + // ConfigAutoStart + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Window; + this.ClientSize = new System.Drawing.Size(288, 185); + this.Controls.Add(this.f_combobox); + this.Controls.Add(this.butCancel); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox1); + this.Name = "ConfigAutoStart"; + this.Text = "AutoStart Configuration"; + this.Load += new System.EventHandler(this.AutoStartConfig_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.Button butCancel; + private System.Windows.Forms.ComboBox f_combobox; + private System.Windows.Forms.PictureBox pictureBox1; + } +} \ No newline at end of file Added: trunk/plugins/autostart/AutoStartConfig.cs =================================================================== --- trunk/plugins/autostart/AutoStartConfig.cs (rev 0) +++ trunk/plugins/autostart/AutoStartConfig.cs 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; +using MediaPortal.Util; +using MediaPortal.Profile; +using MediaPortal.UserInterface.Controls; +using MediaPortal.Services; +using MediaPortal.Configuration; +using MediaPortal.GUI.Library; + +namespace AutoStartConfig +{ + public partial class ConfigAutoStart : Form + { + ILog _epgLog; + + public ConfigAutoStart() + { + InitializeComponent(); + + // setup logging + ServiceProvider services = GlobalServiceProvider.Instance; + _epgLog = services.Get<ILog>(); + + Array nativeWindowsList = Enum.GetValues(typeof(GUIWindow.Window)); + + f_combobox.Items.Clear(); + + foreach (GUIWindow.Window wnd in nativeWindowsList) + { + String l_itemtoadd; + + l_itemtoadd = wnd.ToString().Substring(7); + + // Lets get rid of some unneeded windows for the combobox + if (((l_itemtoadd.IndexOf("SETTINGS") != -1) || + (l_itemtoadd.IndexOf("STATUS") != -1) || + (l_itemtoadd.IndexOf("_") != -1) || + (l_itemtoadd.IndexOf("INVALID") != -1) || + (l_itemtoadd.IndexOf("DIALOG") != -1) || + (l_itemtoadd.IndexOf("WIZARD") != -1)) == false) + { + // Add Windows Handles to List + f_combobox.Items.Add(l_itemtoadd); + //Log.Info("AutoStartConfig: Found Windows {0}", wnd.ToString()); + } + } + } + + private void AutoStartConfig_Load(object sender, EventArgs e) + { + LoadSettings(); + } + + private void SaveSettings() + { + // save settings + using (Settings writer = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + writer.SetValue("autostart","startscreen","WINDOW_"+f_combobox.SelectedItem.ToString()); + } + } + + + private void LoadSettings() + { + // load settings + using (Settings reader = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + String l_setting = reader.GetValue("autostart", "startscreen"); + Log.Info("AutoStartConfig: Loaded Config-Value {0}", l_setting); + + f_combobox.SelectedIndex = f_combobox.FindString(l_setting.Substring(7)); + + } + } + private void button1_Click(object sender, EventArgs e) + { + SaveSettings(); + Close(); + } + + private void butCancel_Click(object sender, EventArgs e) + { + // Closing without saving... + Close(); + } + + + } +} \ No newline at end of file Added: trunk/plugins/autostart/AutoStartConfig.resx =================================================================== --- trunk/plugins/autostart/AutoStartConfig.resx (rev 0) +++ trunk/plugins/autostart/AutoStartConfig.resx 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file Added: trunk/plugins/autostart/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/autostart/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/autostart/Properties/AssemblyInfo.cs 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die mit einer Assembly verknüpft sind. +[assembly: AssemblyTitle("ClassLibrary1")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ClassLibrary1")] +[assembly: AssemblyCopyright("Copyright © 2007")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("3aa97c20-f35a-4ded-b3f1-3bb3236339ca")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern +// übernehmen, indem Sie "*" eingeben: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Added: trunk/plugins/autostart/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/autostart/Properties/Resources.Designer.cs (rev 0) +++ trunk/plugins/autostart/Properties/Resources.Designer.cs 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,70 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.42 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace ClassLibrary1.Properties { + using System; + + + /// <summary> + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// </summary> + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ClassLibrary1.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static System.Drawing.Bitmap mplogo { + get { + object obj = ResourceManager.GetObject("mplogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} Added: trunk/plugins/autostart/Properties/Resources.resx =================================================================== --- trunk/plugins/autostart/Properties/Resources.resx (rev 0) +++ trunk/plugins/autostart/Properties/Resources.resx 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="mplogo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mplogo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> +</root> \ No newline at end of file Added: trunk/plugins/autostart/Resources/mplogo.gif =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/Resources/mplogo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/AutoStart.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/AutoStart.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/AutoStart.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/AutoStart.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/AxInterop.WMPLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/AxInterop.WMPLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Bass.Net.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Bass.Net.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/BassRegistration.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/BassRegistration.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Core.DLL =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Core.DLL ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/DirectShowLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/DirectShowLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/ICSharpCode.SharpZipLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/ICSharpCode.SharpZipLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Interop.WMPLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Interop.WMPLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/MediaPortal.Support.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/MediaPortal.Support.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/MediaPortal.Support.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/MediaPortal.Support.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3D.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3D.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3DX.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.Direct3DX.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Microsoft.DirectX.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/Utils.DLL =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/Utils.DLL ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Debug/edtftpnet-1.2.2.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Debug/edtftpnet-1.2.2.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/AutoStart.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/AutoStart.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/AutoStart.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/AutoStart.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/AxInterop.WMPLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/AxInterop.WMPLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Bass.Net.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Bass.Net.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/BassRegistration.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/BassRegistration.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Core.DLL =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Core.DLL ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/DirectShowLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/DirectShowLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/ICSharpCode.SharpZipLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/ICSharpCode.SharpZipLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Interop.WMPLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Interop.WMPLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/MediaPortal.Support.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/MediaPortal.Support.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/MediaPortal.Support.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/MediaPortal.Support.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3D.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3D.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3DX.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.Direct3DX.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Microsoft.DirectX.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/Utils.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/Utils.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/bin/Release/edtftpnet-1.2.2.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/bin/Release/edtftpnet-1.2.2.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/AutoStart.csproj.FileList.txt =================================================================== --- trunk/plugins/autostart/obj/AutoStart.csproj.FileList.txt (rev 0) +++ trunk/plugins/autostart/obj/AutoStart.csproj.FileList.txt 2007-03-21 17:53:54 UTC (rev 206) @@ -0,0 +1,43 @@ +obj\Release\ResolveAssemblyReference.cache +bin\Release\AutoStart.dll +bin\Release\AutoStart.pdb +bin\Release\Core.DLL +bin\Release\Microsoft.DirectX.Direct3DX.dll +bin\Release\Microsoft.DirectX.Direct3D.dll +bin\Release\Microsoft.DirectX.dll +bin\Release\DirectShowLib.dll +bin\Release\Utils.dll +bin\Release\edtftpnet-1.2.2.dll +bin\Release\Interop.WMPLib.dll +bin\Release\MediaPortal.Support.dll +bin\Release\ICSharpCode.SharpZipLib.dll +bin\Release\BassRegistration.dll +bin\Release\Bass.Net.dll +bin\Release\AxInterop.WMPLib.dll +bin\Release\MediaPortal.Support.pdb +obj\Release\AutoStart.dll +obj\Release\AutoStart.pdb +obj\Release\AutoStart.csproj.GenerateResource.Cache +obj\Release\AutoStartConfig.ConfigAutoStart.resources +bin\Debug\AutoStart.dll +bin\Debug\AutoStart.pdb +bin\Debug\Core.DLL +bin\Debug\Utils.DLL +bin\Debug\Microsoft.DirectX.Direct3DX.dll +bin\Debug\Microsoft.DirectX.dll +bin\Debug\DirectShowLib.dll +bin\Debug\Microsoft.DirectX.Direct3D.dll +bin\Debug\edtftpnet-1.2.2.dll +bin\Debug\Interop.WMPLib.dll +bin\Debug\MediaPortal.Support.dll +bin\Debug\ICSharpCode.SharpZipLib.dll +bin\Debug\BassRegistration.dll +bin\Debug\Bass.Net.dll +bin\Debug\AxInterop.WMPLib.dll +bin\Debug\MediaPortal.Support.pdb +obj\Debug\ResolveAssemblyReference.cache +obj\Debug\AutoStartConfig.ConfigAutoStart.resources +obj\Debug\AutoStart.csproj.GenerateResource.Cache +obj\Debug\AutoStart.dll +obj\Debug\AutoStart.pdb +obj\Release\ClassLibrary1.Properties.Resources.resources Added: trunk/plugins/autostart/obj/Debug/AutoStart.csproj.GenerateResource.Cache =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Debug/AutoStart.csproj.GenerateResource.Cache ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Debug/AutoStart.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Debug/AutoStart.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Debug/AutoStart.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Debug/AutoStart.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Debug/AutoStartConfig.ConfigAutoStart.resources =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Debug/AutoStartConfig.ConfigAutoStart.resources ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/AutoStart.csproj.GenerateResource.Cache =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/AutoStart.csproj.GenerateResource.Cache ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/AutoStart.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/AutoStart.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/AutoStart.pdb =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/AutoStart.pdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/AutoStartConfig.ConfigAutoStart.resources =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/AutoStartConfig.ConfigAutoStart.resources ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/ClassLibrary1.Properties.Resources.resources =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/ClassLibrary1.Properties.Resources.resources ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/ResolveAssemblyReference.cache =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/ResolveAssemblyReference.cache ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/autostart/obj/Release/TempPE/Properties.Resources.Designer.cs.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/autostart/obj/Release/TempPE/Properties.Resources.Designer.cs.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-21 12:22:59
|
Revision: 205 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=205&view=rev Author: zebons Date: 2007-03-21 05:22:57 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Avoid double values when adding all languages. Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-21 07:20:31 UTC (rev 204) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-21 12:22:57 UTC (rev 205) @@ -102,6 +102,7 @@ this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); + this.listView1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); // // columnHeader1 // @@ -161,6 +162,7 @@ this.listView2.TabIndex = 9; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; + this.listView2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView2_MouseDoubleClick); // // columnHeader4 // Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-21 07:20:31 UTC (rev 204) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-21 12:22:57 UTC (rev 205) @@ -142,6 +142,10 @@ private void button5_Click(object sender, EventArgs e) { + add_reference_value(); + } + private void add_reference_value() + { foreach (ListViewItem it in listView2.SelectedItems) { ListViewItem item1 = new ListViewItem(it.SubItems[0].Text, 0); @@ -172,7 +176,11 @@ textBox1.Focus(); return; } - string message = "The value '" + textBox2.Text + "' will be used for ID " + textBox1.Text + " as default value. Do you confirm ?"; + string message = "The value '" + textBox2.Text + "' will be used for ID " + textBox1.Text + " as default value."; + if (!(languageComboBox.Text == "English")) + message = message + " Caution : an English value should be better as default value ! Do you confirm ?"; + else + message = message + " Do you confirm ?"; string caption = "Confirmation"; MessageBoxButtons buttons = MessageBoxButtons.YesNo; DialogResult result; @@ -197,18 +205,9 @@ break; } if (idx > -1) - { update_listview1(mplh.Language[idx].dwCode, mplh.Language[idx].mapSting, lg); - - ListViewItem item1 = new ListViewItem(mplh.Language[idx].dwCode, 0); - item1.SubItems.Add(mplh.Language[idx].mapSting); - item1.SubItems.Add(lg); - listView1.Items.AddRange(new ListViewItem[] { item1 }); - } else - { update_listview1(textBox1.Text, textBox2.Text, lg); - } } } } @@ -223,7 +222,16 @@ // listView1.Items.Remove(listView1.SelectedItems[0]); } } - + private void listView1_MouseClick(object sender, MouseEventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; + textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; + languageComboBox.Text = listView1.SelectedItems[0].SubItems[2].Text; + // listView1.Items.Remove(listView1.SelectedItems[0]); + } + } private void button8_Click(object sender, EventArgs e) { listView1.Items.Clear(); @@ -238,10 +246,18 @@ break; } } - ListViewItem item1 = new ListViewItem(wid, 0); - item1.SubItems.Add(wval); - item1.SubItems.Add(wlang); - listView1.Items.AddRange(new ListViewItem[] { item1 }); + // if (!modify) + // { + ListViewItem item1 = new ListViewItem(wid, 0); + item1.SubItems.Add(wval); + item1.SubItems.Add(wlang); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + // } } + + private void listView2_MouseDoubleClick(object sender, MouseEventArgs e) + { + add_reference_value(); + } } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-21 07:20:33
|
Revision: 204 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=204&view=rev Author: zebons Date: 2007-03-21 00:20:31 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Language modifications : add a default value for all MP languages Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-21 07:20:31 UTC (rev 204) @@ -39,7 +39,6 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.button3 = new System.Windows.Forms.Button(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); this.listView2 = new System.Windows.Forms.ListView(); this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); @@ -47,13 +46,15 @@ this.button6 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); + this.languageComboBox2 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(25, 279); + this.button1.Location = new System.Drawing.Point(12, 291); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(65, 21); this.button1.TabIndex = 0; @@ -65,7 +66,7 @@ // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(216, 279); + this.button2.Location = new System.Drawing.Point(180, 291); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(65, 21); this.button2.TabIndex = 1; @@ -81,7 +82,6 @@ this.languageComboBox.Name = "languageComboBox"; this.languageComboBox.Size = new System.Drawing.Size(168, 21); this.languageComboBox.TabIndex = 2; - this.languageComboBox.SelectedIndexChanged += new System.EventHandler(this.languageComboBox_SelectedIndexChanged); // // listView1 // @@ -138,7 +138,7 @@ // this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button3.Location = new System.Drawing.Point(571, 291); + this.button3.Location = new System.Drawing.Point(545, 302); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(65, 21); this.button3.TabIndex = 6; @@ -146,16 +146,6 @@ this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // - // comboBox1 - // - this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(13, 306); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(371, 21); - this.comboBox1.TabIndex = 8; - // // listView2 // this.listView2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -167,7 +157,7 @@ this.listView2.HideSelection = false; this.listView2.Location = new System.Drawing.Point(434, 12); this.listView2.Name = "listView2"; - this.listView2.Size = new System.Drawing.Size(227, 261); + this.listView2.Size = new System.Drawing.Size(227, 235); this.listView2.TabIndex = 9; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; @@ -196,7 +186,7 @@ // this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button6.Location = new System.Drawing.Point(113, 279); + this.button6.Location = new System.Drawing.Point(83, 291); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(76, 21); this.button6.TabIndex = 11; @@ -208,7 +198,7 @@ // this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button7.Location = new System.Drawing.Point(479, 291); + this.button7.Location = new System.Drawing.Point(322, 291); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(65, 21); this.button7.TabIndex = 12; @@ -220,7 +210,7 @@ // this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button8.Location = new System.Drawing.Point(302, 279); + this.button8.Location = new System.Drawing.Point(251, 291); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(65, 21); this.button8.TabIndex = 13; @@ -228,17 +218,37 @@ this.button8.UseVisualStyleBackColor = true; this.button8.Click += new System.EventHandler(this.button8_Click); // + // languageComboBox2 + // + this.languageComboBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.languageComboBox2.FormattingEnabled = true; + this.languageComboBox2.Location = new System.Drawing.Point(517, 253); + this.languageComboBox2.Name = "languageComboBox2"; + this.languageComboBox2.Size = new System.Drawing.Size(144, 21); + this.languageComboBox2.TabIndex = 14; + this.languageComboBox2.SelectedIndexChanged += new System.EventHandler(this.languageComboBox2_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(433, 256); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(78, 13); + this.label1.TabIndex = 15; + this.label1.Text = "Ref. Language"; + // // Form2 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(673, 335); + this.Controls.Add(this.label1); + this.Controls.Add(this.languageComboBox2); this.Controls.Add(this.button8); this.Controls.Add(this.button7); this.Controls.Add(this.button6); this.Controls.Add(this.button5); this.Controls.Add(this.listView2); - this.Controls.Add(this.comboBox1); this.Controls.Add(this.button3); this.Controls.Add(this.textBox2); this.Controls.Add(this.textBox1); @@ -269,7 +279,6 @@ private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Button button3; private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.ListView listView2; private System.Windows.Forms.Button button5; private System.Windows.Forms.ColumnHeader columnHeader4; @@ -277,5 +286,7 @@ private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button8; + private System.Windows.Forms.ComboBox languageComboBox2; + private System.Windows.Forms.Label label1; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-20 19:00:01 UTC (rev 203) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-21 07:20:31 UTC (rev 204) @@ -50,45 +50,40 @@ { fileName = fileName.Substring(0, 1).ToUpper() + fileName.Substring(1); languageComboBox.Items.Add(fileName); + languageComboBox2.Items.Add(fileName); // Check language file to user region language if (fileName.ToLower() == strLongLanguage.ToLower()) { - languageComboBox.Text = fileName; + languageComboBox2.Text = fileName; bExactLanguageFound = true; } else if (!bExactLanguageFound && (fileName.ToLower() == strShortLanguage.ToLower())) { - languageComboBox.Text = fileName; + languageComboBox2.Text = fileName; } } } } } - if (languageComboBox.Text == "") + if (languageComboBox2.Text == "") { - languageComboBox.Text = "English"; + languageComboBox2.Text = "English"; } } private void button1_Click(object sender, EventArgs e) { - for (int i = 0; i < listView1.Items.Count; i++) + if (textBox1.Text.Length == 0) { - if ((languageComboBox.Text == listView1.Items[i].SubItems[2].Text) && (textBox1.Text == listView1.SelectedItems[i].SubItems[0].Text)) - { - listView1.SelectedItems[i].SubItems[1].Text = textBox2.Text; - return; - } + MessageBox.Show("ID is mandatory !", "Stop"); + textBox1.Focus(); + return; } - ListViewItem item1 = new ListViewItem(textBox1.Text, 0); - item1.SubItems.Add(textBox2.Text); - item1.SubItems.Add(languageComboBox.Text); - listView1.Items.AddRange(new ListViewItem[] { item1 }); + update_listview1(textBox1.Text, textBox2.Text, languageComboBox.Text); + } - } - private void button2_Click(object sender, EventArgs e) { foreach (int index in listView1.SelectedIndices) @@ -107,11 +102,11 @@ item1.SubItems.Add(lg.language); listView1.Items.AddRange(new ListViewItem[] { item1 }); } - comboBox1.Items.Clear(); - foreach (LanguageString lg in deflang.Language) - { - comboBox1.Items.Add(lg.dwCode+" - " + lg.mapSting); - } + //comboBox1.Items.Clear(); + //foreach (LanguageString lg in deflang.Language) + //{ + // comboBox1.Items.Add(lg.dwCode+" - " + lg.mapSting); + //} load_lang(); } @@ -139,9 +134,9 @@ this.Close(); } - private void languageComboBox_SelectedIndexChanged(object sender, EventArgs e) + private void languageComboBox2_SelectedIndexChanged(object sender, EventArgs e) { - lang.Load(languageComboBox.Text); + lang.Load(languageComboBox2.Text); load_lang(); } @@ -151,7 +146,7 @@ { ListViewItem item1 = new ListViewItem(it.SubItems[0].Text, 0); item1.SubItems.Add(it.SubItems[1].Text); - item1.SubItems.Add(languageComboBox.Text); + item1.SubItems.Add(languageComboBox2.Text); listView1.Items.AddRange(new ListViewItem[] { item1 }); } } @@ -171,6 +166,23 @@ private void button6_Click(object sender, EventArgs e) { + if (textBox1.Text.Length == 0) + { + MessageBox.Show("ID is mandatory ! You have to give the refence value first !", "Stop"); + textBox1.Focus(); + return; + } + string message = "The value '" + textBox2.Text + "' will be used for ID " + textBox1.Text + " as default value. Do you confirm ?"; + string caption = "Confirmation"; + MessageBoxButtons buttons = MessageBoxButtons.YesNo; + DialogResult result; + + // Displays the MessageBox. + + result = MessageBox.Show(message, caption, buttons); + + if(result == DialogResult.No) + return; MPLanguageHelper mplh = new MPLanguageHelper(); foreach (string lg in languageComboBox.Items) { @@ -186,11 +198,17 @@ } if (idx > -1) { + update_listview1(mplh.Language[idx].dwCode, mplh.Language[idx].mapSting, lg); + ListViewItem item1 = new ListViewItem(mplh.Language[idx].dwCode, 0); item1.SubItems.Add(mplh.Language[idx].mapSting); item1.SubItems.Add(lg); listView1.Items.AddRange(new ListViewItem[] { item1 }); } + else + { + update_listview1(textBox1.Text, textBox2.Text, lg); + } } } } @@ -210,5 +228,20 @@ { listView1.Items.Clear(); } - } + private void update_listview1(string wid, string wval, string wlang) + { + for (int i = 0; i < listView1.Items.Count; i++) + { + if ((wlang == listView1.Items[i].SubItems[2].Text) && (wid == listView1.Items[i].SubItems[0].Text)) + { + listView1.Items.RemoveAt(i); + break; + } + } + ListViewItem item1 = new ListViewItem(wid, 0); + item1.SubItems.Add(wval); + item1.SubItems.Add(wlang); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + } + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-20 19:26:33
|
Revision: 200 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=200&view=rev Author: zebons Date: 2007-03-20 10:36:32 -0700 (Tue, 20 Mar 2007) Log Message: ----------- Language modifications : When clic on Add button, modify if entry exist in the list, add in other case. Double clic on an existing entry don't remove that entry anymore. Change the design of the main window. Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs trunk/plugins/mpinstaler/MPInstaler/start_form.resx Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-20 16:50:17 UTC (rev 199) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-20 17:36:32 UTC (rev 200) @@ -53,7 +53,7 @@ // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(19, 279); + this.button1.Location = new System.Drawing.Point(13, 279); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(65, 21); this.button1.TabIndex = 0; @@ -65,7 +65,7 @@ // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(589, 279); + this.button2.Location = new System.Drawing.Point(177, 279); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(65, 21); this.button2.TabIndex = 1; @@ -102,7 +102,6 @@ this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); - this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); // // columnHeader1 // @@ -139,7 +138,7 @@ // this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button3.Location = new System.Drawing.Point(399, 279); + this.button3.Location = new System.Drawing.Point(473, 291); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(65, 21); this.button3.TabIndex = 6; @@ -151,7 +150,7 @@ // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(494, 279); + this.button4.Location = new System.Drawing.Point(569, 291); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(65, 21); this.button4.TabIndex = 7; @@ -209,7 +208,7 @@ // this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button6.Location = new System.Drawing.Point(103, 279); + this.button6.Location = new System.Drawing.Point(84, 279); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(76, 21); this.button6.TabIndex = 11; @@ -221,7 +220,7 @@ // this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button7.Location = new System.Drawing.Point(304, 279); + this.button7.Location = new System.Drawing.Point(319, 279); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(65, 21); this.button7.TabIndex = 12; @@ -233,7 +232,7 @@ // this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button8.Location = new System.Drawing.Point(209, 279); + this.button8.Location = new System.Drawing.Point(248, 279); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(65, 21); this.button8.TabIndex = 13; Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-20 16:50:17 UTC (rev 199) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-20 17:36:32 UTC (rev 200) @@ -74,6 +74,14 @@ private void button1_Click(object sender, EventArgs e) { + for (int i = 0; i < listView1.Items.Count; i++) + { + if ((languageComboBox.Text == listView1.Items[i].SubItems[2].Text) && (textBox1.Text == listView1.SelectedItems[i].SubItems[0].Text)) + { + listView1.SelectedItems[i].SubItems[1].Text = textBox2.Text; + return; + } + } ListViewItem item1 = new ListViewItem(textBox1.Text, 0); item1.SubItems.Add(textBox2.Text); item1.SubItems.Add(languageComboBox.Text); @@ -81,11 +89,6 @@ } - private void listView1_SelectedIndexChanged(object sender, EventArgs e) - { - - } - private void button2_Click(object sender, EventArgs e) { foreach (int index in listView1.SelectedIndices) @@ -168,9 +171,9 @@ private void button6_Click(object sender, EventArgs e) { + MPLanguageHelper mplh = new MPLanguageHelper(); foreach (string lg in languageComboBox.Items) { - MPLanguageHelper mplh = new MPLanguageHelper(); mplh.Load(lg); if (mplh.isLoaded) { @@ -199,7 +202,7 @@ textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; languageComboBox.Text = listView1.SelectedItems[0].SubItems[2].Text; - listView1.Items.Remove(listView1.SelectedItems[0]); +// listView1.Items.Remove(listView1.SelectedItems[0]); } } Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 16:50:17 UTC (rev 199) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:36:32 UTC (rev 200) @@ -33,14 +33,13 @@ this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.button4 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 // - this.button1.Location = new System.Drawing.Point(86, 50); + this.button1.Location = new System.Drawing.Point(162, 55); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(121, 32); + this.button1.Size = new System.Drawing.Size(109, 32); this.button1.TabIndex = 0; this.button1.Text = "Create package"; this.button1.UseVisualStyleBackColor = true; @@ -48,9 +47,9 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(86, 118); + this.button2.Location = new System.Drawing.Point(162, 119); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(121, 32); + this.button2.Size = new System.Drawing.Size(109, 32); this.button2.TabIndex = 1; this.button2.Text = "Install package"; this.button2.UseVisualStyleBackColor = true; @@ -58,9 +57,9 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(86, 184); + this.button3.Location = new System.Drawing.Point(162, 178); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(121, 32); + this.button3.Size = new System.Drawing.Size(109, 32); this.button3.TabIndex = 2; this.button3.Text = "Control panel"; this.button3.UseVisualStyleBackColor = true; @@ -70,28 +69,18 @@ // this.openFileDialog1.Filter = "MPI files|*.mpi|ZIP files|*.zip|All files|*.*"; // - // button4 - // - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button4.Location = new System.Drawing.Point(254, 231); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(26, 23); - this.button4.TabIndex = 3; - this.button4.Text = "X"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // // start_form // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(292, 266); - this.Controls.Add(this.button4); this.Controls.Add(this.button3); this.Controls.Add(this.button2); this.Controls.Add(this.button1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Name = "start_form"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.ResumeLayout(false); @@ -104,6 +93,5 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.Button button4; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.resx 2007-03-20 16:50:17 UTC (rev 199) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.resx 2007-03-20 17:36:32 UTC (rev 200) @@ -123,70 +123,745 @@ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> - /9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYa - HSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgo - KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAEKAUwDASIAAhEBAxEB/8QA - HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh - MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW - V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG - x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF - BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV - YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE - hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq - 8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDzTFKBSilxX0xwiYopaUUAJijFOApcUANxRin4oAoAbijFPxRi - gBmKXFP20YoAbilxTsUAUANxS4p+KXFADAKXFPxRtoAZilxTwtG2mBHilxUm2jbQBHijFS7aNtAEWKNt - S7aNtAEW32o21Lto20ARbaNtS7aXbQBDijFTbaNlAEO2jbU2yl20AQ7aNtTbaNtAEO2jbU22k20ARYox - Uu2k20ARYoxUu2k20AUhS0ClpAJS4paUUAApRQBSgUAAFKBSgUoFMBMUAU8ClxQA0CjbTwKXFADMUbak - 20u2gBgWlC0/bTgtAEe2l21KEpQlAEQWlC1MEpQlMCDbS7an2UbKAIdtG2p9lG2gZDso2VPto2UCINtG - 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 + z+n6zburq/PVH7oy0aNzW... [truncated message content] |
From: <ze...@us...> - 2007-03-20 19:07:11
|
Revision: 203 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=203&view=rev Author: zebons Date: 2007-03-20 12:00:01 -0700 (Tue, 20 Mar 2007) Log Message: ----------- add a Name control before build function Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Build dialog.resx trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/Form1.resx trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.resx trunk/plugins/mpinstaler/MPInstaler/OptionForm.Designer.cs trunk/plugins/mpinstaler/MPInstaler/OptionForm.resx trunk/plugins/mpinstaler/MPInstaler/SkinSelect.Designer.cs trunk/plugins/mpinstaler/MPInstaler/SkinSelect.resx trunk/plugins/mpinstaler/MPInstaler/download_form.Designer.cs trunk/plugins/mpinstaler/MPInstaler/download_form.resx trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs trunk/plugins/mpinstaler/MPInstaler/start_form.resx Modified: trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Build_dialog)); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); @@ -121,9 +122,11 @@ this.Controls.Add(this.button1); this.Controls.Add(this.label1); this.Controls.Add(this.textBox1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Build_dialog"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Build"; this.Load += new System.EventHandler(this.Build_dialog_Load); this.ResumeLayout(false); Modified: trunk/plugins/mpinstaler/MPInstaler/Build dialog.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Build dialog.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Build dialog.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -120,4 +120,22 @@ <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -76,6 +77,9 @@ this.textt_comboBox1 = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.tabPage_Advanced = new System.Windows.Forms.TabPage(); + this.button_browse = new System.Windows.Forms.Button(); + this.label11 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tabPage_Proiect = new System.Windows.Forms.TabPage(); this.proiectt_textBox6 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); @@ -95,19 +99,16 @@ this.tabPage_Other = new System.Windows.Forms.TabPage(); this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label11 = new System.Windows.Forms.Label(); - this.button_browse = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.tabPage_Skin.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage_Text.SuspendLayout(); this.tabPage_Advanced.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage_Proiect.SuspendLayout(); this.tabPage_Thumbs.SuspendLayout(); this.tabPage_Other.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // menuStrip1 @@ -505,6 +506,35 @@ this.tabPage_Advanced.Text = "Advanced Properties"; this.tabPage_Advanced.UseVisualStyleBackColor = true; // + // button_browse + // + this.button_browse.Location = new System.Drawing.Point(0, 94); + this.button_browse.Name = "button_browse"; + this.button_browse.Size = new System.Drawing.Size(67, 23); + this.button_browse.TabIndex = 2; + this.button_browse.Text = "Browse..."; + this.button_browse.UseVisualStyleBackColor = true; + this.button_browse.Click += new System.EventHandler(this.button_browse_Click); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(3, 10); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(37, 13); + this.label11.TabIndex = 1; + this.label11.Text = "Logo :"; + // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(3, 26); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(64, 64); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + this.pictureBox1.LoadCompleted += new System.ComponentModel.AsyncCompletedEventHandler(this.pictureBox1_LoadCompleted); + // // tabPage_Proiect // this.tabPage_Proiect.Controls.Add(this.proiectt_textBox6); @@ -702,35 +732,6 @@ this.label8.TabIndex = 0; this.label8.Text = "Directory (relative) :"; // - // pictureBox1 - // - this.pictureBox1.Location = new System.Drawing.Point(3, 26); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(64, 64); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - this.pictureBox1.LoadCompleted += new System.ComponentModel.AsyncCompletedEventHandler(this.pictureBox1_LoadCompleted); - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(3, 10); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(37, 13); - this.label11.TabIndex = 1; - this.label11.Text = "Logo :"; - // - // button_browse - // - this.button_browse.Location = new System.Drawing.Point(0, 94); - this.button_browse.Name = "button_browse"; - this.button_browse.Size = new System.Drawing.Size(67, 23); - this.button_browse.TabIndex = 2; - this.button_browse.Text = "Browse..."; - this.button_browse.UseVisualStyleBackColor = true; - this.button_browse.Click += new System.EventHandler(this.button_browse_Click); - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -739,9 +740,12 @@ this.Controls.Add(this.bossview); this.Controls.Add(this.tabControl1); this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; + this.MaximizeBox = false; this.Name = "Form1"; - this.Text = "Form1"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Create Package"; this.Load += new System.EventHandler(this.Form1_Load); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); @@ -753,13 +757,13 @@ this.tabPage_Text.PerformLayout(); this.tabPage_Advanced.ResumeLayout(false); this.tabPage_Advanced.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage_Proiect.ResumeLayout(false); this.tabPage_Proiect.PerformLayout(); this.tabPage_Thumbs.ResumeLayout(false); this.tabPage_Thumbs.PerformLayout(); this.tabPage_Other.ResumeLayout(false); this.tabPage_Other.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -35,15 +35,11 @@ } } - private void button1_Click(object sender, EventArgs e) - { - } - private void sToolStripMenuItem_Click(object sender, EventArgs e) { if (proiectt_textBox1.Text.Length == 0) { - MessageBox.Show("Name is mandatory !","Stop"); + MessageBox.Show("Name is mandatory !", "Stop"); proiectt_textBox1.Focus(); return; } @@ -54,11 +50,11 @@ if (saveFileDialog1.ShowDialog(this) == DialogResult.OK) { proiect_file_name = saveFileDialog1.FileName; - _struct.SaveToFile(proiect_file_name); + _struct.SaveToFile(proiect_file_name); } - } else _struct.SaveToFile(proiect_file_name); + } + else _struct.SaveToFile(proiect_file_name); } - private void windowToolStripMenuItem_Click(object sender, EventArgs e) { addplugin(1); @@ -266,6 +262,12 @@ private void buildToolStripMenuItem_Click(object sender, EventArgs e) { + if (proiectt_textBox1.Text.Length == 0) + { + MessageBox.Show("Name is mandatory !", "Stop"); + proiectt_textBox1.Focus(); + return; + } sToolStripMenuItem_Click(sender, e); Build_dialog buildfrm = new Build_dialog(this._struct); buildfrm.ShowDialog(); @@ -313,9 +315,7 @@ _struct.SaveToFile(proiect_file_name); this.Text = proiect_file_name; } - } - private void Form1_Load(object sender, EventArgs e) { tabControl1.Controls.Clear(); Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -129,4 +129,22 @@ <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>397, 17</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form2)); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.languageComboBox = new System.Windows.Forms.ComboBox(); @@ -38,7 +39,6 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.listView2 = new System.Windows.Forms.ListView(); this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); @@ -53,7 +53,7 @@ // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(13, 279); + this.button1.Location = new System.Drawing.Point(25, 279); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(65, 21); this.button1.TabIndex = 0; @@ -65,7 +65,7 @@ // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(177, 279); + this.button2.Location = new System.Drawing.Point(216, 279); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(65, 21); this.button2.TabIndex = 1; @@ -138,7 +138,7 @@ // this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button3.Location = new System.Drawing.Point(473, 291); + this.button3.Location = new System.Drawing.Point(571, 291); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(65, 21); this.button3.TabIndex = 6; @@ -146,18 +146,6 @@ this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // - // button4 - // - this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(569, 291); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(65, 21); - this.button4.TabIndex = 7; - this.button4.Text = "Close"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // // comboBox1 // this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -208,7 +196,7 @@ // this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button6.Location = new System.Drawing.Point(84, 279); + this.button6.Location = new System.Drawing.Point(113, 279); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(76, 21); this.button6.TabIndex = 11; @@ -220,7 +208,7 @@ // this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button7.Location = new System.Drawing.Point(319, 279); + this.button7.Location = new System.Drawing.Point(479, 291); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(65, 21); this.button7.TabIndex = 12; @@ -232,7 +220,7 @@ // this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button8.Location = new System.Drawing.Point(248, 279); + this.button8.Location = new System.Drawing.Point(302, 279); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(65, 21); this.button8.TabIndex = 13; @@ -251,7 +239,6 @@ this.Controls.Add(this.button5); this.Controls.Add(this.listView2); this.Controls.Add(this.comboBox1); - this.Controls.Add(this.button4); this.Controls.Add(this.button3); this.Controls.Add(this.textBox2); this.Controls.Add(this.textBox1); @@ -259,7 +246,10 @@ this.Controls.Add(this.languageComboBox); this.Controls.Add(this.button2); this.Controls.Add(this.button1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; this.Name = "Form2"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "String Editor"; this.Load += new System.EventHandler(this.Form2_Load); this.ResumeLayout(false); @@ -278,7 +268,6 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.ColumnHeader columnHeader3; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.ListView listView2; Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -117,4 +117,22 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/OptionForm.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/OptionForm.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/OptionForm.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionForm)); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.textBox1 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); @@ -96,8 +97,11 @@ this.Controls.Add(this.label1); this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; this.Name = "OptionForm"; - this.Text = "OptionForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Options"; this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/plugins/mpinstaler/MPInstaler/OptionForm.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/OptionForm.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/OptionForm.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -120,4 +120,22 @@ <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/SkinSelect.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/SkinSelect.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/SkinSelect.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -28,39 +28,41 @@ /// </summary> private void InitializeComponent() { - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.button1 = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // comboBox1 - // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(12, 12); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(318, 21); - this.comboBox1.TabIndex = 0; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(129, 62); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 1; - this.button1.Text = "OK"; - this.button1.UseVisualStyleBackColor = true; - // - // SkinSelect - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(342, 97); - this.Controls.Add(this.button1); - this.Controls.Add(this.comboBox1); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "SkinSelect"; - this.Text = "Select Skin"; - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SkinSelect)); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(12, 12); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(318, 21); + this.comboBox1.TabIndex = 0; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(129, 62); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + // + // SkinSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(342, 97); + this.Controls.Add(this.button1); + this.Controls.Add(this.comboBox1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "SkinSelect"; + this.Text = "Select Skin"; + this.ResumeLayout(false); } Modified: trunk/plugins/mpinstaler/MPInstaler/SkinSelect.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/SkinSelect.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/SkinSelect.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -117,4 +117,22 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/download_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/download_form.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/download_form.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(download_form)); this.button1 = new System.Windows.Forms.Button(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.label1 = new System.Windows.Forms.Label(); @@ -67,10 +68,11 @@ this.Controls.Add(this.label1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.button1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "download_form"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Download"; this.Shown += new System.EventHandler(this.download_form_Shown); this.ResumeLayout(false); Modified: trunk/plugins/mpinstaler/MPInstaler/download_form.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/download_form.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/download_form.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -117,4 +117,22 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 19:00:01 UTC (rev 203) @@ -81,6 +81,8 @@ this.Controls.Add(this.button1); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; this.Name = "start_form"; this.RightToLeft = System.Windows.Forms.RightToLeft.No; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.resx 2007-03-20 17:57:17 UTC (rev 202) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.resx 2007-03-20 19:00:01 UTC (rev 203) @@ -864,4 +864,21 @@ 8Y+SDf8oRqv0/8cqZefX2QimEUzjNZANr4H/B1JuLo2Vu9vcAAAAAElFTkSuQmCC </value> </data> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAd3cAAAAHd3AAAAAAAAAAB4iIcAAAeIh3AAAAAAAAAHiIiIcAB4iIiHAAAAAA + AACIiIiIAAiIiIiAAAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAAAAAAACIiIiIAAiIiIiA + AAAAAAAAiIiIiAAIiIiIgAAAAAAAAIiIiIgACIiIiIAAB3d3cACIiIiIAAiIiIiAAHiIiHcAiIiIiAAI + iIiIgAeIiIiHcIiIiIgACIiIiIAIiIj4iHCIiIiIAAiIiIiAeIiP/4iAiIiIiAAIiIiIgHiIj/iIgPiI + iIgAD4iIiIAIiIiIiID4iIiIAA+IiIhwD4iIiIhwD4iIhwAA+IiIcAD4iIiIcAD//4AAAA//+AAAD/iI + gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////// + ///h/D//gPAf/4BwD/8AYA//ACAH/wAgB/8AIAf/ACAH/wAgBwcAIAQBACAEAAAgAAAAIAAAACAAAAAg + AAAAIAAAAGAIAABgCACA8BwBwfg+B////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-20 18:51:36
|
Revision: 202 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=202&view=rev Author: zebons Date: 2007-03-20 10:57:17 -0700 (Tue, 20 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:53:54 UTC (rev 201) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:57:17 UTC (rev 202) @@ -84,6 +84,7 @@ this.Name = "start_form"; this.RightToLeft = System.Windows.Forms.RightToLeft.No; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "MediaPortal Plugin Instaler"; this.ResumeLayout(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-03-20 18:51:34
|
Revision: 201 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=201&view=rev Author: zebons Date: 2007-03-20 10:53:54 -0700 (Tue, 20 Mar 2007) Log Message: ----------- Main window design Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:36:32 UTC (rev 200) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-20 17:53:54 UTC (rev 201) @@ -37,7 +37,7 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(162, 55); + this.button1.Location = new System.Drawing.Point(153, 50); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(109, 32); this.button1.TabIndex = 0; @@ -47,7 +47,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(162, 119); + this.button2.Location = new System.Drawing.Point(153, 100); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(109, 32); this.button2.TabIndex = 1; @@ -57,7 +57,7 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(162, 178); + this.button3.Location = new System.Drawing.Point(153, 150); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(109, 32); this.button3.TabIndex = 2; @@ -74,14 +74,15 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); - this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(292, 266); + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.ClientSize = new System.Drawing.Size(292, 249); this.Controls.Add(this.button3); this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.DoubleBuffered = true; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Name = "start_form"; + this.RightToLeft = System.Windows.Forms.RightToLeft.No; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.ResumeLayout(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-03-20 16:50:23
|
Revision: 199 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=199&view=rev Author: saamand Date: 2007-03-20 09:50:17 -0700 (Tue, 20 Mar 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj trunk/plugins/MyLyrics/LyricsEngine/Setup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/LyricsEngine Tester.cs Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs =================================================================== (Binary files differ) Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -27,67 +27,60 @@ private ILyricForm m_Form; // status - private static int noOfLyricsToSearch; - private static int noOfLyricsSearched; - private static int noOfLyricsFound; - private static int noOfLyricsNotFound; + private int noOfLyricsToSearch; + private int noOfLyricsSearched; + private int noOfLyricsFound; + private int noOfLyricsNotFound; private bool m_StopSearches = false; public static event EventHandler StopTheSearchAndAbort = null; ArrayList threadList = new ArrayList(); - ArrayList suspendedThreadList = new ArrayList(); - // Main thread sets this event to stop LyricController ManualResetEvent m_EventStop_LyricController; - // LyricController sets this event when it is stopped - ManualResetEvent m_EventStopped_LyricController; - // Main thread sets this event to pause all LyricSearches - public ManualResetEvent m_EventStop_LyricSearches; - // Variables related to GoogleSites - private ArrayList m_GoogleLicenseKeysUsed = new ArrayList(); - private string m_GoogleLicenseKey = ""; - private bool m_noMoreValidLicenseKeys = false; - int m_managedThreadId = -1; + private string[] lyricsSites; - // Lyric sites - private string[] lyricSites; - private string[] eastSites; + internal static bool ALLOW_ALL_TO_SEARCH = false; + + public LyricsController(ILyricForm mainForm, - ManualResetEvent eventStopThread, ManualResetEvent eventThreadStopped, - string[] lyricSites) + ManualResetEvent eventStopThread, + string[] lyricSites, bool allowAllToSearch) { this.m_Form = mainForm; - LyricsController.noOfLyricsToSearch = 1; - LyricsController.noOfLyricsSearched = 0; - LyricsController.noOfLyricsFound = 0; - LyricsController.noOfLyricsNotFound = 0; + noOfLyricsToSearch = 1; + noOfLyricsSearched = 0; + noOfLyricsFound = 0; + noOfLyricsNotFound = 0; - this.lyricSites = lyricSites; + ALLOW_ALL_TO_SEARCH = allowAllToSearch; - ArrayList easySitesArrayList = new ArrayList(); - - foreach (string site in lyricSites) + // If search all, then include all + if (allowAllToSearch) { - if (Setup.IsMemberOfEasySites(site)) + this.lyricsSites = lyricSites; + } + else + { + ArrayList tempArrayList = new ArrayList(); + foreach (string site in lyricSites) { - easySitesArrayList.Add(site); + if (Setup.IsMember(site)) + { + tempArrayList.Add(site); + } } + this.lyricsSites = (string[])tempArrayList.ToArray(typeof(string)); } - eastSites = (string[])easySitesArrayList.ToArray(typeof(string)); - LyricSearch.EasySites = eastSites; + + LyricSearch.LyricsSites = lyricsSites; - // initialize events m_EventStop_LyricController = eventStopThread; - m_EventStopped_LyricController = eventThreadStopped; - m_EventStop_LyricSearches = new ManualResetEvent(false); - m_EventStop_LyricSearches.Set(); - LyricSearch.Abort = false; } @@ -118,7 +111,6 @@ stillThreadsAlive = true; } } - m_EventStopped_LyricController.Set(); break; } } @@ -144,58 +136,33 @@ } } - Thread.Sleep(500); + Thread.Sleep(100); - // inform main thread that this thread stopped - m_EventStopped_LyricController.Set(); finishThread("", "", "The search has ended.", ""); } - public void updateManualResetEvents(ManualResetEvent eventStopThread, ManualResetEvent eventThreadStopped) - { - this.m_EventStop_LyricController = eventStopThread; - this.m_EventStopped_LyricController = eventThreadStopped; - } - public void addNewLyricSearch(string artist, string title) { - if (eastSites.Length > 0) + if (lyricsSites.Length > 0) { // create worker thread instance - ThreadStart easySitesThreadInstance = delegate + ThreadStart siteThreadInstance = delegate { - - LyricSearch lyricSearch_EasySites = new LyricSearch(m_EventStop_LyricController, m_EventStopped_LyricController, this); - lyricSearch_EasySites.setLyricInfo(artist, title); - lyricSearch_EasySites.Run(); + LyricSearch lyricSearch = new LyricSearch(this); + lyricSearch.setLyricInfo(artist, title); + lyricSearch.Run(); }; - Thread lyricSearchThread = new Thread(easySitesThreadInstance); - lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; // looks nice in Output window + Thread lyricSearchThread = new Thread(siteThreadInstance); + lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; lyricSearchThread.IsBackground = true; lyricSearchThread.Start(); threadList.Add(lyricSearchThread); } } - public void suspendAllSearchThreadsExceptMe(int managedThreadId) - { - //// clean-up operations may be placed here - //for (int i = 0; i < threadList.Count; i++) - //{ - // if (((Thread)threadList[i]).ManagedThreadId != managedThreadId) - // ((Thread)threadList[i]).Suspend(); - //} - m_managedThreadId = managedThreadId; - m_EventStop_LyricSearches.Reset(); - } - public void resumeAllSearchThreads() - { - m_EventStop_LyricSearches.Reset(); - } - internal void updateString(String message, String site) { m_Form.UpdateString = new Object[] { message, site }; @@ -203,7 +170,6 @@ internal void statusUpdate(string artist, string title, string site, bool lyricFound) { - //LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + artist + " - " + title + " - " + site + " - " +lyricFound.ToString() ); if (lyricFound) ++noOfLyricsFound; else @@ -213,7 +179,7 @@ m_Form.UpdateStatus = new Object[] { noOfLyricsToSearch, noOfLyricsSearched, noOfLyricsFound, noOfLyricsNotFound }; - if (noOfLyricsSearched >= noOfLyricsToSearch) + if ((noOfLyricsSearched >= noOfLyricsToSearch) && ALLOW_ALL_TO_SEARCH == false) { finishThread(artist, title, "All songs have been searched!", site); } @@ -241,7 +207,6 @@ public void finishThread(String artist, String title, String message, String site) { m_EventStop_LyricController.Set(); - m_EventStopped_LyricController.Set(); m_Form.ThreadFinished = new Object[] { artist, title, message, site }; } @@ -250,12 +215,6 @@ m_Form.ThreadException = s; } - public string GoogleLicenseKey - { - get { return m_GoogleLicenseKey; } - set { m_GoogleLicenseKey = value; } - } - public bool StopSearches { get { return m_StopSearches; } @@ -263,41 +222,20 @@ if (value == true) { m_StopSearches = true; - m_EventStop_LyricSearches.Reset(); LyricSearch.Abort = true; //StopTheSearchAndAbort.Invoke(this, EventArgs.Empty); } else { m_StopSearches = false; - m_EventStop_LyricSearches.Set(); LyricSearch.Abort = false; } } } - public ArrayList GoogleLicenseKeysUsed - { - get { return m_GoogleLicenseKeysUsed; } - } - - public void addToGoogleLicenseKeysUsed(string key) - { - if (!m_GoogleLicenseKeysUsed.Contains(key)) - { - m_GoogleLicenseKeysUsed.Add(key); - } - } - public int NoOfLyricsToSearch { - set { LyricsController.noOfLyricsToSearch = value; } + set { noOfLyricsToSearch = value; } } - - public bool NoMoreValidLicenseKeys - { - get { return m_noMoreValidLicenseKeys; } - set { m_noMoreValidLicenseKeys = value; } - } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-20 16:50:17 UTC (rev 199) @@ -125,7 +125,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent> + <PostBuildEvent>::copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent> <PreBuildEvent> </PreBuildEvent> </PropertyGroup> Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -6,7 +6,7 @@ { public static class Setup { - public static string[] EasySites = new string[4] + public static string[] BatchSearchSites = new string[4] { "LyricWiki", //"EvilLabs", @@ -20,24 +20,19 @@ public static string[] AllSites() { ArrayList allSites = new ArrayList(); - allSites.AddRange(EasySites); + allSites.AddRange(BatchSearchSites); string[] allSitesArray = (string[])allSites.ToArray(typeof(string)); return allSitesArray; } public static bool IsMember(string value) { - return System.Array.IndexOf<string>(Setup.EasySites, value) != -1; + return System.Array.IndexOf<string>(Setup.BatchSearchSites, value) != -1; } - public static bool IsMemberOfEasySites(string value) - { - return System.Array.IndexOf<string>(Setup.EasySites, value) != -1; - } - public static int NoOfSites() { - return EasySites.Length; + return BatchSearchSites.Length; } } } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -68,7 +68,6 @@ // events used to stop worker thread ManualResetEvent m_EventStopThread; - ManualResetEvent m_EventThreadStopped; // Track info string m_artist = ""; @@ -95,7 +94,6 @@ public GUIMyLyrics() { m_EventStopThread = new ManualResetEvent(false); - m_EventThreadStopped = new ManualResetEvent(false); GetID = (int)GUIMyLyrics.WINDOW_MYLYRICS; @@ -193,8 +191,8 @@ startingScrollSpeedVertical = GUIGraphicsContext.ScrollSpeedVertical; GUIGraphicsContext.ScrollSpeedVertical = 1; - LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log, logName)); - //LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log, logName)); + LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName)); + //LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName)); LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics opens"); return true; } @@ -302,13 +300,13 @@ m_sitesToSearch = (string[])sitesToSearch.ToArray(typeof(string)); // Deserialize lyrics and marked database, and save references in LyricsDB - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName); FileStream fs = new FileStream(path, FileMode.Open); BinaryFormatter bf = new BinaryFormatter(); LyricsDB = (LyricsDatabase)bf.Deserialize(fs); fs.Close(); - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName); fs = new FileStream(path, FileMode.Open); LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs); fs.Close(); @@ -326,7 +324,6 @@ private void findLyric(MusicTag tag) { m_EventStopThread.Reset(); - m_EventThreadStopped.Reset(); GUIControl.ClearControl(GetID, (int)Controls.CONTROL_Lyric); GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, ""); @@ -351,7 +348,7 @@ // 1) + 2) Check if LRC in music tag or Database - string lyricText = MyLyrics.MyLyricsUtil.LookUpLyricInDatabase(LyricsDB, m_artist, m_title); + string lyricText = MyLyrics.DatabaseUtil.LookUpLyricInDatabase(LyricsDB, m_artist, m_title); if ((!tag.Lyrics.Equals("") && (lrc = new LRC.SimpleLRC(m_artist, m_title, tag.Lyrics)).IsValid) || (!lyricText.Equals("") && (lrc = new LRC.SimpleLRC(m_artist, m_title, lyricText)).IsValid)) @@ -418,7 +415,7 @@ { lyricsFound = false; - lc = new LyricsController(this, m_EventStopThread, m_EventThreadStopped, m_sitesToSearch); + lc = new LyricsController(this, m_EventStopThread, m_sitesToSearch, false); // create worker thread instance ThreadStart job = delegate { @@ -429,8 +426,6 @@ m_LyricControllerThread.Name = "lyricSearch Thread"; // looks nice in Output window m_LyricControllerThread.Start(); - lc.GoogleLicenseKey = m_GoogleLicenseKeys[m_GoogleLicenseKeyIndex]; - lc.addNewLyricSearch(m_artist, m_title); } } @@ -515,11 +510,11 @@ string capArtist = LyricUtil.capatalizeString(m_artist); string capTitle = LyricUtil.capatalizeString(m_title); - if (MyLyricsUtil.isTrackInLyricsDatabase(LyricsDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_NOT_FOUND)) + if (DatabaseUtil.IsTrackInLyricsDatabase(LyricsDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_NOT_FOUND)) { - LyricsDB.Add(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, m_LyricText, site)); + LyricsDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, m_LyricText, site)); - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName); using (FileStream fs = new FileStream(path, FileMode.Open)) { BinaryFormatter bf = new BinaryFormatter(); @@ -529,11 +524,11 @@ } } - if (MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_MARKED)) + if (DatabaseUtil.IsTrackInLyricsMarkedDatabase(LyricsMarkedDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_MARKED)) { - LyricsMarkedDB.Remove(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle)); + LyricsMarkedDB.Remove(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle)); - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName); using (FileStream fs = new FileStream(path, FileMode.Open)) { BinaryFormatter bf = new BinaryFormatter(); @@ -556,25 +551,6 @@ m_LyricControllerThread = null; lc = null; - - //// wait when thread will stop or finish - //while (m_LyricControllerThread.IsAlive) - //{ - // // We cannot use here infinite wait because our thread - // // makes syncronous calls to main form, this will cause deadlock. - // // Instead of this we wait for event some appropriate time - // // (and by the way give time to worker thread) and - // // process events. These events may contain Invoke calls. - // if (WaitHandle.WaitAll( - // (new ManualResetEvent[] { m_EventThreadStopped }), - // 100, - // true)) - // { - // break; - // } - - // Application.DoEvents(); - //} } } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -34,9 +34,9 @@ this.mpGroupBox2 = new MediaPortal.UserInterface.Controls.MPGroupBox(); this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox(); this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel(); - this.tbNote = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox(); this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.tbNote = new MediaPortal.UserInterface.Controls.MPLabel(); this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox(); @@ -107,7 +107,7 @@ this.tabControl.Location = new System.Drawing.Point(7, 12); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(528, 494); + this.tabControl.Size = new System.Drawing.Size(534, 494); this.tabControl.TabIndex = 1; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // @@ -116,7 +116,7 @@ this.tabPageLyricsDatabase.Location = new System.Drawing.Point(4, 22); this.tabPageLyricsDatabase.Name = "tabPageLyricsDatabase"; this.tabPageLyricsDatabase.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLyricsDatabase.Size = new System.Drawing.Size(520, 468); + this.tabPageLyricsDatabase.Size = new System.Drawing.Size(526, 468); this.tabPageLyricsDatabase.TabIndex = 1; this.tabPageLyricsDatabase.Text = "Lyrics database"; this.tabPageLyricsDatabase.UseVisualStyleBackColor = true; @@ -128,7 +128,7 @@ this.tabPageSetup.Location = new System.Drawing.Point(4, 22); this.tabPageSetup.Name = "tabPageSetup"; this.tabPageSetup.Padding = new System.Windows.Forms.Padding(3); - this.tabPageSetup.Size = new System.Drawing.Size(520, 468); + this.tabPageSetup.Size = new System.Drawing.Size(526, 468); this.tabPageSetup.TabIndex = 2; this.tabPageSetup.Text = "General setup"; this.tabPageSetup.UseVisualStyleBackColor = true; @@ -165,15 +165,6 @@ this.lbPluginName.TabIndex = 14; this.lbPluginName.Text = "Plugin name:"; // - // tbNote - // - this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tbNote.Location = new System.Drawing.Point(13, 91); - this.tbNote.Name = "tbNote"; - this.tbNote.Size = new System.Drawing.Size(377, 18); - this.tbNote.TabIndex = 19; - this.tbNote.Text = "(Seek Lyrics and Evil Labs are currently disabled due to instable servers)"; - // // gbLyricSites // this.gbLyricSites.AutoSize = true; @@ -205,6 +196,15 @@ this.cbHotLyrics.Text = "Hot Lyrics"; this.cbHotLyrics.UseVisualStyleBackColor = true; // + // tbNote + // + this.tbNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbNote.Location = new System.Drawing.Point(13, 91); + this.tbNote.Name = "tbNote"; + this.tbNote.Size = new System.Drawing.Size(377, 18); + this.tbNote.TabIndex = 19; + this.tbNote.Text = "(Seek Lyrics and Evil Labs are currently disabled due to instable servers)"; + // // cbSeekLyrics // this.cbSeekLyrics.AutoSize = true; @@ -280,7 +280,7 @@ this.tabPageDatabase.Location = new System.Drawing.Point(4, 22); this.tabPageDatabase.Name = "tabPageDatabase"; this.tabPageDatabase.Padding = new System.Windows.Forms.Padding(3); - this.tabPageDatabase.Size = new System.Drawing.Size(520, 468); + this.tabPageDatabase.Size = new System.Drawing.Size(526, 468); this.tabPageDatabase.TabIndex = 2; this.tabPageDatabase.Text = "Search music database"; this.tabPageDatabase.UseVisualStyleBackColor = true; @@ -702,7 +702,7 @@ // // btSave // - this.btSave.Location = new System.Drawing.Point(358, 512); + this.btSave.Location = new System.Drawing.Point(363, 512); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(78, 23); this.btSave.TabIndex = 16; @@ -712,7 +712,7 @@ // // btClose // - this.btClose.Location = new System.Drawing.Point(442, 512); + this.btClose.Location = new System.Drawing.Point(447, 512); this.btClose.Name = "btClose"; this.btClose.Size = new System.Drawing.Size(78, 23); this.btClose.TabIndex = 99; @@ -732,7 +732,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(537, 537); + this.ClientSize = new System.Drawing.Size(548, 536); this.ControlBox = false; this.Controls.Add(this.btClose); this.Controls.Add(this.tabControl); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -37,7 +37,6 @@ // events used to stop worker thread ManualResetEvent m_EventStopThread; - ManualResetEvent m_EventThreadStopped; // Delegates public delegate void DelegateStringUpdate(String message, String site); @@ -88,13 +87,6 @@ private Queue lyricConfigInfosQueue; string[] sitesToSearchArray = null; - // Database settings - internal static LyricsDatabase LyricsDB = null; - internal static LyricsDatabase LyricsMarkedDB = null; - internal const string LyricsDBName = "LyricsDatabaseV2.db"; - internal const string LyricsMarkedDBName = "LyricsMarkedDatabaseV2.db"; - internal const string LyricsXMLName = "Lyrics.xml"; - // Timer variables int hour = 0; int min = 0; @@ -104,8 +96,6 @@ // log information private string log; - private string logName = "MyLyrics.log"; - private string logBatchFileName = "MyLyricsBatch.log"; private string logFullFileName = ""; private int lastShownLyricsTitles = 0; @@ -116,8 +106,8 @@ public MyLyricsSetup() { - LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log, logName)); - //LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log)); + LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, MyLyricsSettings.LogName)); + //LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log)); #region Initialize GUI and class InitializeComponent(); @@ -184,7 +174,7 @@ #endregion #region Serialzie/deserialize lyricsdatabases - string lyricsXMLpath = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Base, LyricsXMLName); + string lyricsXMLpath = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Base, MyLyricsSettings.LyricsXMLName); FileInfo lyricsXMLfileInfo = new FileInfo(lyricsXMLpath); @@ -192,7 +182,7 @@ if (lyricsXMLfileInfo.Exists) { - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); FileInfo fileInfo = new FileInfo(path); // .. but only if it hasn't already been converted @@ -201,7 +191,7 @@ if (MessageBox.Show(this, "Your database will have to be upgraded to work with this version\r\nUpgrade now?", "Upgrade lyricsdatabase", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) { ConvertFromXMLtoLyricsDatabase convertFromXMLtoLyricsDatabase = new ConvertFromXMLtoLyricsDatabase(); - LyricsDB = convertFromXMLtoLyricsDatabase.Convert(lyricsXMLpath); + MyLyricsSettings.LyricsDB = convertFromXMLtoLyricsDatabase.Convert(lyricsXMLpath); // Create file to save the database to FileStream fs = new FileStream(path, FileMode.Create); @@ -210,14 +200,14 @@ BinaryFormatter bf = new BinaryFormatter(); // Use the BinaryFormatter object to serialize the database to the file - bf.Serialize(fs, LyricsDB); + bf.Serialize(fs, MyLyricsSettings.LyricsDB); fs.Close(); // Create likewise a database for the remainingLyrics - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName); fs = new FileStream(path, FileMode.Create); - LyricsMarkedDB = new LyricsDatabase(); - bf.Serialize(fs, LyricsMarkedDB); + MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsMarkedDB); // Close the file fs.Close(); @@ -234,26 +224,26 @@ // If no Lyrics.xml present in base, then create new serialized databases else { - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); FileInfo fileInfo = new FileInfo(path); // .. but only if the databases hasn't been created if (fileInfo.Exists == false) { - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); // Serialize empty LyricsDatabase if no lyrics.xml present FileStream fs = new FileStream(path, FileMode.Create); BinaryFormatter bf = new BinaryFormatter(); - LyricsDB = new LyricsDatabase(); - bf.Serialize(fs, LyricsDB); + MyLyricsSettings.LyricsDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsDB); fs.Close(); // Serialize empty LyricsMarkedDatabase - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName); fs = new FileStream(path, FileMode.Create); - LyricsMarkedDB = new LyricsDatabase(); - bf.Serialize(fs, LyricsMarkedDB); + MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsMarkedDB); fs.Close(); } else @@ -262,7 +252,7 @@ } } - MyLyricsSetup_LyricsLibrary.CurrentDB = LyricsDB; + MyLyricsSetup_LyricsLibrary.CurrentDB = MyLyricsSettings.LyricsDB; #endregion lyricsLibraryUC.updateLyricsTree(); @@ -375,14 +365,13 @@ lbTotalSongs2.Text = m_TotalTitles.ToString(); m_EventStopThread = new ManualResetEvent(false); - m_EventThreadStopped = new ManualResetEvent(false); m_noOfMessages = 0; m_noOfCurrentlySearches = 0; btImportAll.Enabled = false; - logFullFileName = Config.GetFile(Config.Dir.Log, logBatchFileName); + logFullFileName = Config.GetFile(Config.Dir.Log, MyLyricsSettings.LogBatchFileName); //if file is not found, create a new xml file if (!System.IO.File.Exists(logFullFileName)) @@ -409,7 +398,7 @@ if (m_SearchOnlyMarkedSongs) { - progressBar.Maximum = LyricsMarkedDB.Count; + progressBar.Maximum = MyLyricsSettings.LyricsMarkedDB.Count; } else { @@ -453,7 +442,6 @@ sitesToSearchArray = (string[])sitesToSearch.ToArray(typeof(string)); m_EventStopThread.Reset(); - m_EventThreadStopped.Reset(); bgWorkerSearch.RunWorkerAsync(); @@ -479,16 +467,8 @@ string capArtist = LyricUtil.capatalizeString(m_artist); string capTitle = LyricUtil.capatalizeString(m_track); - if (MyLyricsUtil.isTrackInLyricsDatabase(LyricsDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_NOT_FOUND)) - { - LyricsDB.Add(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, m_LyricText, site)); - } + DatabaseUtil.WriteToLyricsDatabase(MyLyricsSettings.LyricsDB, MyLyricsSettings.LyricsMarkedDB, capArtist, capTitle, lyricStrings, site); - if (MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_MARKED)) - { - LyricsMarkedDB.Remove(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle)); - } - StreamReader sr = File.OpenText(logFullFileName); log = sr.ReadToEnd(); sr.Close(); @@ -512,9 +492,9 @@ string capArtist = LyricUtil.capatalizeString(artist); string capTitle = LyricUtil.capatalizeString(title); - if (m_MarkSongsWhenNoLyricFound && MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB ,capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_NOT_FOUND)) + if (m_MarkSongsWhenNoLyricFound && DatabaseUtil.IsTrackInLyricsMarkedDatabase(MyLyricsSettings.LyricsMarkedDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_NOT_FOUND)) { - LyricsMarkedDB.Add(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, "", "")); + MyLyricsSettings.LyricsMarkedDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, "", "")); } m_SongsWithMark += 1; @@ -551,9 +531,7 @@ if (lc != null) { lc.StopSearches = true; - // Save databases to disc - SerializeDB(LyricsDB); - SerializeDB(LyricsMarkedDB); + DatabaseUtil.SerializeDBs(); lyricsLibraryUC.updateLyricsTree(); } bgWorkerSearch.CancelAsync(); @@ -677,24 +655,24 @@ string capArtist = LyricUtil.capatalizeString(tag.Artist); string capTitle = LyricUtil.capatalizeString(tag.Title); - if (MyLyricsUtil.isTrackInLyricsDatabase(LyricsDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_NOT_FOUND)) + if (DatabaseUtil.IsTrackInLyricsDatabase(MyLyricsSettings.LyricsDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_NOT_FOUND)) { - LyricsDB.Add(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, tag.Lyrics, "Tag")); + MyLyricsSettings.LyricsDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, tag.Lyrics, "Tag")); } - if (MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB, capArtist, capTitle).Equals(MyLyricsUtil.LYRIC_MARKED)) + if (DatabaseUtil.IsTrackInLyricsMarkedDatabase(MyLyricsSettings.LyricsMarkedDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_MARKED)) { - LyricsMarkedDB.Remove(MyLyricsUtil.CorrectKeyFormat(capArtist, capTitle)); + MyLyricsSettings.LyricsMarkedDB.Remove(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle)); } } else { - int status = MyLyricsUtil.isTrackInLyricsDatabase(LyricsDB, song.Artist, song.Title); + int status = DatabaseUtil.IsTrackInLyricsDatabase(MyLyricsSettings.LyricsDB, song.Artist, song.Title); bool isTrackInLyricsMarkedDatabase = true; - if (!m_DisregardKnownLyric && status.Equals(MyLyricsUtil.LYRIC_FOUND) - || (!m_DisregardMarkedLyric && ((isTrackInLyricsMarkedDatabase = MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB, song.Artist, song.Title).Equals(MyLyricsUtil.LYRIC_MARKED)) || status.Equals(MyLyricsUtil.LYRIC_MARKED))) - || (status.Equals(MyLyricsUtil.LYRIC_NOT_FOUND) && !MyLyricsUtil.isTrackInLyricsMarkedDatabase(LyricsMarkedDB, song.Artist, song.Title).Equals(MyLyricsUtil.LYRIC_MARKED))) + if (!m_DisregardKnownLyric && status.Equals(DatabaseUtil.LYRIC_FOUND) + || (!m_DisregardMarkedLyric && ((isTrackInLyricsMarkedDatabase = DatabaseUtil.IsTrackInLyricsMarkedDatabase(MyLyricsSettings.LyricsMarkedDB, song.Artist, song.Title).Equals(DatabaseUtil.LYRIC_MARKED)) || status.Equals(DatabaseUtil.LYRIC_MARKED))) + || (status.Equals(DatabaseUtil.LYRIC_NOT_FOUND) && !DatabaseUtil.IsTrackInLyricsMarkedDatabase(MyLyricsSettings.LyricsMarkedDB, song.Artist, song.Title).Equals(DatabaseUtil.LYRIC_MARKED))) { songNotKnown = 1; @@ -711,7 +689,7 @@ m_SongsToSearch = lyricConfigInfosQueue.Count; bgWorkerSearch.ReportProgress(songNotKnown); } - else if (status.Equals(MyLyricsUtil.LYRIC_FOUND)) + else if (status.Equals(DatabaseUtil.LYRIC_FOUND)) { m_SongsWithLyric += 1; } @@ -726,7 +704,7 @@ } else { - foreach (KeyValuePair<string, LyricsItem> kvp in LyricsMarkedDB) + foreach (KeyValuePair<string, LyricsItem> kvp in MyLyricsSettings.LyricsMarkedDB) { int songNotKnown = 1; if (++m_SongsNotKnown > m_Limit) @@ -753,7 +731,7 @@ if (lyricConfigInfosQueue.Count > 0) { // start running the lyricController - lc = new LyricsController(this, m_EventStopThread, m_EventThreadStopped, sitesToSearchArray); + lc = new LyricsController(this, m_EventStopThread, sitesToSearchArray, false); lc.NoOfLyricsToSearch = lyricConfigInfosQueue.Count; ThreadStart runLyricController = delegate @@ -839,37 +817,9 @@ m_LyricControllerThread = null; } - internal static void SerializeDB(LyricsDatabase ldb) - { - string path = ""; - if (ldb.Equals(LyricsDB)) - { - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); - } - else if (ldb.Equals(LyricsMarkedDB)) - { - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); - } - - // Create file to save the database to - using (FileStream fs = new FileStream(path, FileMode.Open)) - { - // Create a BinaryFormatter object to perform the serialization - BinaryFormatter bf = new BinaryFormatter(); - - ldb.SetLastModified(); - - // Use the BinaryFormatter object to serialize the database to the file - bf.Serialize(fs, ldb); - - // Close the file - fs.Close(); - } - } - private void DeserializeBothDB() { - string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); // Open database to read data from FileStream fs = new FileStream(path, FileMode.Open); @@ -878,14 +828,14 @@ BinaryFormatter bf = new BinaryFormatter(); // Use the BinaryFormatter object to deserialize the database - LyricsDB = (LyricsDatabase)bf.Deserialize(fs); + MyLyricsSettings.LyricsDB = (LyricsDatabase)bf.Deserialize(fs); fs.Close(); // Deserialize LyricsRemainingDatabase - path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName); + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName); fs = new FileStream(path, FileMode.Open); - LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs); + MyLyricsSettings.LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs); fs.Close(); } @@ -937,8 +887,8 @@ { if (tabControl.SelectedIndex == 0) { - if ((MyLyricsSetup_LyricsLibrary.CurrentDB.Equals(LyricsDB) && LyricsDB.Count != lastShownLyricsTitles) - || (MyLyricsSetup_LyricsLibrary.CurrentDB.Equals(LyricsMarkedDB) && LyricsMarkedDB.Count != lastShownMarkedLyricsTitles)) + if ((MyLyricsSetup_LyricsLibrary.CurrentDB.Equals(MyLyricsSettings.LyricsDB) && MyLyricsSettings.LyricsDB.Count != lastShownLyricsTitles) + || (MyLyricsSetup_LyricsLibrary.CurrentDB.Equals(MyLyricsSettings.LyricsMarkedDB) && MyLyricsSettings.LyricsMarkedDB.Count != lastShownMarkedLyricsTitles)) { lyricsLibraryUC.updateLyricsTree(); } @@ -946,8 +896,8 @@ } else { - lastShownLyricsTitles = LyricsDB.Count; - lastShownMarkedLyricsTitles = LyricsMarkedDB.Count; + lastShownLyricsTitles = MyLyricsSettings.LyricsDB.Count; + lastShownMarkedLyricsTitles = MyLyricsSettings.LyricsMarkedDB.Count; } } } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -37,6 +37,7 @@ this.btResetLyricsDatabase = new System.Windows.Forms.Button(); this.lbResetDatabase = new MediaPortal.UserInterface.Controls.MPLabel(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); + this.btSearchSingle = new MediaPortal.UserInterface.Controls.MPButton(); this.gbLibrary.SuspendLayout(); this.gbResetDatabase.SuspendLayout(); this.SuspendLayout(); @@ -44,10 +45,10 @@ // btSave // this.btSave.Enabled = false; - this.btSave.Location = new System.Drawing.Point(218, 301); + this.btSave.Location = new System.Drawing.Point(224, 303); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(75, 23); - this.btSave.TabIndex = 6; + this.btSave.TabIndex = 7; this.btSave.Text = "&Save"; this.btSave.UseVisualStyleBackColor = true; this.btSave.Click += new System.EventHandler(this.btSave_Click); @@ -83,6 +84,7 @@ // // gbLibrary // + this.gbLibrary.Controls.Add(this.btSearchSingle); this.gbLibrary.Controls.Add(this.lbSource); this.gbLibrary.Controls.Add(this.comboDatabase); this.gbLibrary.Controls.Add(this.lbDatabase); @@ -111,9 +113,9 @@ // lbSource // this.lbSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbSource.Location = new System.Drawing.Point(357, 297); + this.lbSource.Location = new System.Drawing.Point(386, 297); this.lbSource.Name = "lbSource"; - this.lbSource.Size = new System.Drawing.Size(142, 15); + this.lbSource.Size = new System.Drawing.Size(113, 15); this.lbSource.TabIndex = 28; this.lbSource.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -128,7 +130,7 @@ this.comboDatabase.Location = new System.Drawing.Point(85, 15); this.comboDatabase.Name = "comboDatabase"; this.comboDatabase.Size = new System.Drawing.Size(144, 21); - this.comboDatabase.TabIndex = 27; + this.comboDatabase.TabIndex = 1; this.comboDatabase.SelectedIndexChanged += new System.EventHandler(this.comboDatabase_SelectedIndexChanged); // // lbDatabase @@ -156,7 +158,7 @@ this.btImportDirs.Location = new System.Drawing.Point(95, 330); this.btImportDirs.Name = "btImportDirs"; this.btImportDirs.Size = new System.Drawing.Size(75, 23); - this.btImportDirs.TabIndex = 24; + this.btImportDirs.TabIndex = 5; this.btImportDirs.Text = "Import &dirs"; this.btImportDirs.UseVisualStyleBackColor = true; this.btImportDirs.Click += new System.EventHandler(this.btImportDIRS_Click); @@ -178,8 +180,8 @@ this.tbLyrics.Multiline = true; this.tbLyrics.Name = "tbLyrics"; this.tbLyrics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.tbLyrics.Size = new System.Drawing.Size(296, 213); - this.tbLyrics.TabIndex = 5; + this.tbLyrics.Size = new System.Drawing.Size(291, 213); + this.tbLyrics.TabIndex = 6; this.tbLyrics.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbLyrics_KeyUp); // // lbSongs @@ -232,7 +234,7 @@ this.treeView.Location = new System.Drawing.Point(14, 81); this.treeView.Name = "treeView"; this.treeView.Size = new System.Drawing.Size(200, 213); - this.treeView.TabIndex = 1; + this.treeView.TabIndex = 2; this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect); // // gbResetDatabase @@ -283,6 +285,16 @@ "erns [Artist]-[Title].txt and *.lrc will be included to the lyrics database."; this.folderBrowserDialog1.ShowNewFolderButton = false; // + // btSearchSingle + // + this.btSearchSingle.Location = new System.Drawing.Point(224, 330); + this.btSearchSingle.Name = "btSearchSingle"; + this.btSearchSingle.Size = new System.Drawing.Size(75, 23); + this.btSearchSingle.TabIndex = 8; + this.btSearchSingle.Text = "&Find"; + this.btSearchSingle.UseVisualStyleBackColor = true; + this.btSearchSingle.Click += new System.EventHandler(this.btSearchSingle_Click); + // // MyLyricsSetup_LyricsLibrary // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -324,5 +336,6 @@ private System.ComponentModel.IContainer components; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; internal System.Windows.Forms.TreeView treeView; + internal MediaPortal.UserInterface.Controls.MPButton btSearchSingle; } } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -144,12 +144,12 @@ { LyricsItem item = new LyricsItem(artist, title, lyrics, site); - if (MyLyricsUtil.isTrackInLyricsDatabase(CurrentDB, artist, title).Equals(MyLyricsUtil.LYRIC_NOT_FOUND)) + if (DatabaseUtil.IsTrackInLyricsDatabase(CurrentDB, artist, title).Equals(DatabaseUtil.LYRIC_NOT_FOUND)) { - CurrentDB.Add(MyLyricsUtil.CorrectKeyFormat(artist, title), item); + CurrentDB.Add(DatabaseUtil.CorrectKeyFormat(artist, title), item); AddSong(item); treeView.Update(); - MyLyricsSetup.SerializeDB(CurrentDB); + DatabaseUtil.SerializeDB(CurrentDB); return true; } else @@ -184,8 +184,8 @@ treeView.Update(); // remove title from database - CurrentDB.Remove(MyLyricsUtil.CorrectKeyFormat(artist, title)); - MyLyricsSetup.SerializeDB(CurrentDB); + CurrentDB.Remove(DatabaseUtil.CorrectKeyFormat(artist, title)); + DatabaseUtil.SerializeDB(CurrentDB); } private bool isSelectedLyricALRC() @@ -200,7 +200,7 @@ m_CurrentArtist = artist; m_CurrentTitle = LyricUtil.capatalizeString(title); - string lyricsText = (string)CurrentDB[MyLyricsUtil.CorrectKeyFormat(artist, title)].Lyrics; + string lyricsText = (string)CurrentDB[DatabaseUtil.CorrectKeyFormat(artist, title)].Lyrics; LRC.SimpleLRC lrc = new LRC.SimpleLRC(artist, title, lyricsText); if (lrc.IsValid) @@ -216,13 +216,14 @@ return false; } - internal void updateInfo() + public void updateInfo() { m_CurrentArtist = ""; m_CurrentTitle = ""; tbLyrics.Text = ""; lbTitle.Text = ""; lbSource.Text = ""; + lbLRCTest.Text = ""; tbLyrics.Enabled = false; @@ -237,7 +238,7 @@ m_CurrentArtist = LyricUtil.capatalizeString(artist); m_CurrentTitle = LyricUtil.capatalizeString(title); - LyricsItem item = CurrentDB[MyLyricsUtil.CorrectKeyFormat(m_CurrentArtist, m_CurrentTitle)]; + LyricsItem item = CurrentDB[DatabaseUtil.CorrectKeyFormat(m_CurrentArtist, m_CurrentTitle)]; string lyricsText = item.Lyrics; lyricsText = LyricsEngine.LyricUtil.ReturnEnvironmentNewLine(lyricsText); @@ -289,7 +290,7 @@ private void btSave_Click(object sender, EventArgs e) { - CurrentDB[MyLyricsUtil.CorrectKeyFormat(LyricUtil.capatalizeString(m_CurrentArtist), LyricUtil.capatalizeString(m_CurrentTitle))].Lyrics = tbLyrics.Text; + CurrentDB[DatabaseUtil.CorrectKeyFormat(LyricUtil.capatalizeString(m_CurrentArtist), LyricUtil.capatalizeString(m_CurrentTitle))].Lyrics = tbLyrics.Text; btSave.Enabled = false; } @@ -586,7 +587,7 @@ { resetFields(); currentDBIndex = 0; - CurrentDB = MyLyricsSetup.LyricsDB; + CurrentDB = MyLyricsSettings.LyricsDB; btImportFiles.Enabled = true; btImportDirs.Enabled = true; updateLyricsTree(); @@ -595,7 +596,7 @@ { resetFields(); currentDBIndex = 1; - CurrentDB = MyLyricsSetup.LyricsMarkedDB; + CurrentDB = MyLyricsSettings.LyricsMarkedDB; btImportFiles.Enabled = false; btImportDirs.Enabled = false; updateLyricsTree(); @@ -606,14 +607,14 @@ { if (MessageBox.Show(this, "Are you sure the Lyrics database should be deleted?", "Delete Lyrics database", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) { - string path = MediaPortal.Util.Config.GetFolder(MediaPortal.Util.Config.Dir.Database) + "\\" + MyLyricsSetup.LyricsDBName; + string path = MediaPortal.Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsDBName; FileStream fs = new FileStream(path, FileMode.Create); BinaryFormatter bf = new BinaryFormatter(); - MyLyricsSetup.LyricsDB = new LyricsDatabase(); - bf.Serialize(fs, MyLyricsSetup.LyricsDB); + MyLyricsSettings.LyricsDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsDB); fs.Close(); - CurrentDB = MyLyricsSetup.LyricsDB; + CurrentDB = MyLyricsSettings.LyricsDB; comboDatabase.SelectedIndex = 0; updateLyricsTree(); updateInfo(); @@ -625,18 +626,36 @@ { if (MessageBox.Show(this, "Are you sure you want to delete the database with marked titles?", "Delete title database", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) { - string path = MediaPortal.Util.Config.GetFolder(MediaPortal.Util.Config.Dir.Database) + "\\" + MyLyricsSetup.LyricsMarkedDBName; + string path = MediaPortal.Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsMarkedDBName; FileStream fs = new FileStream(path, FileMode.Create); BinaryFormatter bf = new BinaryFormatter(); - MyLyricsSetup.LyricsMarkedDB = new LyricsDatabase(); - bf.Serialize(fs, MyLyricsSetup.LyricsMarkedDB); + MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsMarkedDB); fs.Close(); - CurrentDB = MyLyricsSetup.LyricsMarkedDB; + CurrentDB = MyLyricsSettings.LyricsMarkedDB; comboDatabase.SelectedIndex = 1; updateLyricsTree(); updateInfo(); } } + + private void btSearchSingle_Click(object sender, EventArgs e) + { + string artist = ""; + string title = ""; + + if (treeView.SelectedNode != null) + { + title = treeView.SelectedNode.Text; + + if (treeView.SelectedNode.Parent != null) + { + artist = treeView.SelectedNode.Parent.Text; + } + } + + MyLyricsSetup_SearchTitleDialog std = new MyLyricsSetup_SearchTitleDialog(this, artist, title); + } } } Modified: trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/LyricsEngine Tester.cs =================================================================== --- trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/LyricsEngine Tester.cs 2007-03-19 20:32:28 UTC (rev 198) +++ trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/LyricsEngine Tester.cs 2007-03-20 16:50:17 UTC (rev 199) @@ -39,7 +39,6 @@ // events used to stop worker thread ManualResetEvent m_EventStopThread; - ManualResetEvent m_EventThreadStopped; private int START_XPOS = 0; private int START_YPOS = 450; @@ -66,7 +65,6 @@ // initialize events m_EventStopThread = new ManualResetEvent(false); - m_EventThreadStopped = new ManualResetEvent(false); noOfLyricSites = Setup.NoOfSites(); lyricSiteArray = new LyricSiteTestUC[noOfLyricSites]; @@ -127,7 +125,6 @@ } m_EventStopThread.Reset(); - m_EventThreadStopped.Reset(); ArrayList sites = new ArrayList(); @@ -140,7 +137,7 @@ } } - LyricsController lc = new LyricsController(this, m_EventStopThread, m_EventThreadStopped, (string[])sites.ToArray(typeof(string))); + LyricsController lc = new LyricsController(this, m_EventStopThread, (string[])sites.ToArray(typeof(string)), false); ThreadStart job = delegate { @@ -148,8 +145,6 @@ lc.Run(); }; - lc.GoogleLicenseKey = tbLicenseKey.Text; - m_LyricControllerThread = new Thread(job); m_LyricControllerThread.Start(); } @@ -445,11 +440,9 @@ m_EventStopThread.Reset(); - m_EventThreadStopped.Reset(); + LyricsController lc = new LyricsController(this, m_EventStopThread, Setup.AllSites(), true); - LyricsController lc = new LyricsController(this, m_EventStopThread, m_EventThreadStopped, Setup.AllSites()); - // create worker thread instance ThreadStart job = delegate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-03-19 20:39:28
|
Revision: 198 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=198&view=rev Author: dukus Date: 2007-03-19 13:32:28 -0700 (Mon, 19 Mar 2007) Log Message: ----------- More advanced language editor. Logo properties. Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs Removed Paths: ------------- trunk/plugins/mpinstaler/MPInstaler.suo Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -75,7 +75,7 @@ this.tabPage_Text = new System.Windows.Forms.TabPage(); this.textt_comboBox1 = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); - this.tabPage_Language = new System.Windows.Forms.TabPage(); + this.tabPage_Advanced = new System.Windows.Forms.TabPage(); this.tabPage_Proiect = new System.Windows.Forms.TabPage(); this.proiectt_textBox6 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); @@ -95,14 +95,19 @@ this.tabPage_Other = new System.Windows.Forms.TabPage(); this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label11 = new System.Windows.Forms.Label(); + this.button_browse = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.tabPage_Skin.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage_Text.SuspendLayout(); + this.tabPage_Advanced.SuspendLayout(); this.tabPage_Proiect.SuspendLayout(); this.tabPage_Thumbs.SuspendLayout(); this.tabPage_Other.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // menuStrip1 @@ -444,7 +449,7 @@ this.tabControl1.Controls.Add(this.tabPage_Plugin); this.tabControl1.Controls.Add(this.tabPage_Skin); this.tabControl1.Controls.Add(this.tabPage_Text); - this.tabControl1.Controls.Add(this.tabPage_Language); + this.tabControl1.Controls.Add(this.tabPage_Advanced); this.tabControl1.Controls.Add(this.tabPage_Proiect); this.tabControl1.Controls.Add(this.tabPage_Thumbs); this.tabControl1.Controls.Add(this.tabPage_Other); @@ -488,14 +493,17 @@ this.label1.TabIndex = 0; this.label1.Text = "Type:"; // - // tabPage_Language + // tabPage_Advanced // - this.tabPage_Language.Location = new System.Drawing.Point(4, 22); - this.tabPage_Language.Name = "tabPage_Language"; - this.tabPage_Language.Size = new System.Drawing.Size(643, 120); - this.tabPage_Language.TabIndex = 3; - this.tabPage_Language.Text = "Properties"; - this.tabPage_Language.UseVisualStyleBackColor = true; + this.tabPage_Advanced.Controls.Add(this.button_browse); + this.tabPage_Advanced.Controls.Add(this.label11); + this.tabPage_Advanced.Controls.Add(this.pictureBox1); + this.tabPage_Advanced.Location = new System.Drawing.Point(4, 22); + this.tabPage_Advanced.Name = "tabPage_Advanced"; + this.tabPage_Advanced.Size = new System.Drawing.Size(643, 120); + this.tabPage_Advanced.TabIndex = 3; + this.tabPage_Advanced.Text = "Advanced Properties"; + this.tabPage_Advanced.UseVisualStyleBackColor = true; // // tabPage_Proiect // @@ -694,6 +702,35 @@ this.label8.TabIndex = 0; this.label8.Text = "Directory (relative) :"; // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(3, 26); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(64, 64); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + this.pictureBox1.LoadCompleted += new System.ComponentModel.AsyncCompletedEventHandler(this.pictureBox1_LoadCompleted); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(3, 10); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(37, 13); + this.label11.TabIndex = 1; + this.label11.Text = "Logo :"; + // + // button_browse + // + this.button_browse.Location = new System.Drawing.Point(0, 94); + this.button_browse.Name = "button_browse"; + this.button_browse.Size = new System.Drawing.Size(67, 23); + this.button_browse.TabIndex = 2; + this.button_browse.Text = "Browse..."; + this.button_browse.UseVisualStyleBackColor = true; + this.button_browse.Click += new System.EventHandler(this.button_browse_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -714,12 +751,15 @@ this.tabControl1.ResumeLayout(false); this.tabPage_Text.ResumeLayout(false); this.tabPage_Text.PerformLayout(); + this.tabPage_Advanced.ResumeLayout(false); + this.tabPage_Advanced.PerformLayout(); this.tabPage_Proiect.ResumeLayout(false); this.tabPage_Proiect.PerformLayout(); this.tabPage_Thumbs.ResumeLayout(false); this.tabPage_Thumbs.PerformLayout(); this.tabPage_Other.ResumeLayout(false); this.tabPage_Other.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -764,7 +804,7 @@ private System.Windows.Forms.TabPage tabPage_Plugin; private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage_Text; - private System.Windows.Forms.TabPage tabPage_Language; + private System.Windows.Forms.TabPage tabPage_Advanced; private System.Windows.Forms.TabPage tabPage_Proiect; private System.Windows.Forms.ColumnHeader columnHeader6; private System.Windows.Forms.ToolStripMenuItem textToolStripMenuItem; @@ -793,6 +833,9 @@ private System.Windows.Forms.TextBox proiectt_textBox5; private System.Windows.Forms.TextBox proiectt_textBox6; private System.Windows.Forms.Label label10; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Button button_browse; + private System.Windows.Forms.Label label11; } } Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -244,6 +244,7 @@ proiectt_textBox4.Text = _struct.Version; proiectt_textBox5.Text = _struct.Description; proiectt_textBox6.Text = _struct.Group; + pictureBox1.Image = _struct.Logo; _loading = false; } @@ -319,6 +320,7 @@ { tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); textt_comboBox1.Items.Clear(); textt_comboBox1.Items.Add(MPinstalerStruct.TEXT_LOG_TYPE); textt_comboBox1.Items.Add(MPinstalerStruct.TEXT_README_TYPE); @@ -394,11 +396,13 @@ othert_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; } tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); } else { tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); } } @@ -467,5 +471,21 @@ { this.Close(); } + + private void button_browse_Click(object sender, EventArgs e) + { + openFileDialog1.Filter = "All files|*.*|png files|*.png|bmp files|*.bmp|jpeg files|*.jpg"; + openFileDialog1.Multiselect = false; + if (openFileDialog1.ShowDialog(this) == DialogResult.OK) + { + pictureBox1.Load(openFileDialog1.FileName); + _struct.Logo = pictureBox1.Image; + } + } + + private void pictureBox1_LoadCompleted(object sender, AsyncCompletedEventArgs e) + { + _struct.Logo = pictureBox1.Image; + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -44,11 +44,16 @@ this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); this.button5 = new System.Windows.Forms.Button(); + this.button6 = new System.Windows.Forms.Button(); + this.button7 = new System.Windows.Forms.Button(); + this.button8 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 // - this.button1.Location = new System.Drawing.Point(13, 279); + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Location = new System.Drawing.Point(19, 279); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(65, 21); this.button1.TabIndex = 0; @@ -58,9 +63,11 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(309, 279); + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button2.Location = new System.Drawing.Point(589, 279); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 21); + this.button2.Size = new System.Drawing.Size(65, 21); this.button2.TabIndex = 1; this.button2.Text = "Remove"; this.button2.UseVisualStyleBackColor = true; @@ -68,6 +75,7 @@ // // languageComboBox // + this.languageComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.languageComboBox.FormattingEnabled = true; this.languageComboBox.Location = new System.Drawing.Point(216, 252); this.languageComboBox.Name = "languageComboBox"; @@ -86,12 +94,14 @@ this.columnHeader3}); this.listView1.FullRowSelect = true; this.listView1.GridLines = true; + this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listView1.Location = new System.Drawing.Point(12, 12); this.listView1.Name = "listView1"; this.listView1.Size = new System.Drawing.Size(372, 235); this.listView1.TabIndex = 3; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); // // columnHeader1 @@ -111,6 +121,7 @@ // // textBox1 // + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(12, 253); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(62, 20); @@ -118,6 +129,7 @@ // // textBox2 // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Location = new System.Drawing.Point(80, 253); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(130, 20); @@ -125,9 +137,11 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(105, 279); + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button3.Location = new System.Drawing.Point(399, 279); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(75, 21); + this.button3.Size = new System.Drawing.Size(65, 21); this.button3.TabIndex = 6; this.button3.Text = "Save"; this.button3.UseVisualStyleBackColor = true; @@ -135,9 +149,11 @@ // // button4 // - this.button4.Location = new System.Drawing.Point(207, 279); + this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button4.Location = new System.Drawing.Point(494, 279); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(75, 21); + this.button4.Size = new System.Drawing.Size(65, 21); this.button4.TabIndex = 7; this.button4.Text = "Close"; this.button4.UseVisualStyleBackColor = true; @@ -145,6 +161,7 @@ // // comboBox1 // + this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(13, 306); @@ -154,13 +171,16 @@ // // listView2 // + this.listView2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader4, this.columnHeader5}); this.listView2.FullRowSelect = true; + this.listView2.HideSelection = false; this.listView2.Location = new System.Drawing.Point(434, 12); this.listView2.Name = "listView2"; - this.listView2.Size = new System.Drawing.Size(227, 311); + this.listView2.Size = new System.Drawing.Size(227, 261); this.listView2.TabIndex = 9; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; @@ -176,7 +196,8 @@ // // button5 // - this.button5.Location = new System.Drawing.Point(390, 156); + this.button5.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.button5.Location = new System.Drawing.Point(390, 121); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(38, 23); this.button5.TabIndex = 10; @@ -184,11 +205,50 @@ this.button5.UseVisualStyleBackColor = true; this.button5.Click += new System.EventHandler(this.button5_Click); // + // button6 + // + this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button6.Location = new System.Drawing.Point(103, 279); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(76, 21); + this.button6.TabIndex = 11; + this.button6.Text = "Add all lang."; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.button6_Click); + // + // button7 + // + this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button7.Location = new System.Drawing.Point(304, 279); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(65, 21); + this.button7.TabIndex = 12; + this.button7.Text = "Revert"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.button7_Click); + // + // button8 + // + this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button8.Location = new System.Drawing.Point(209, 279); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(65, 21); + this.button8.TabIndex = 13; + this.button8.Text = "Clear"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.button8_Click); + // // Form2 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(673, 335); + this.Controls.Add(this.button8); + this.Controls.Add(this.button7); + this.Controls.Add(this.button6); this.Controls.Add(this.button5); this.Controls.Add(this.listView2); this.Controls.Add(this.comboBox1); @@ -226,5 +286,8 @@ private System.Windows.Forms.Button button5; private System.Windows.Forms.ColumnHeader columnHeader4; private System.Windows.Forms.ColumnHeader columnHeader5; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button button7; + private System.Windows.Forms.Button button8; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -152,5 +152,60 @@ listView1.Items.AddRange(new ListViewItem[] { item1 }); } } + + private void button7_Click(object sender, EventArgs e) + { + LoadLanguages(); + listView1.Items.Clear(); + foreach (LanguageString lg in Language) + { + ListViewItem item1 = new ListViewItem(lg.dwCode, 0); + item1.SubItems.Add(lg.mapSting); + item1.SubItems.Add(lg.language); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + } + } + + private void button6_Click(object sender, EventArgs e) + { + foreach (string lg in languageComboBox.Items) + { + MPLanguageHelper mplh = new MPLanguageHelper(); + mplh.Load(lg); + if (mplh.isLoaded) + { + int idx = -1;// this.Language.BinarySearch(ls, new LanguageStringComparer()); + for (int i = 0; i < mplh.Language.Count; i++) + if (mplh.Language[i].dwCode.Trim() == textBox1.Text.Trim()) + { + idx = i; + break; + } + if (idx > -1) + { + ListViewItem item1 = new ListViewItem(mplh.Language[idx].dwCode, 0); + item1.SubItems.Add(mplh.Language[idx].mapSting); + item1.SubItems.Add(lg); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + } + } + } + } + + private void listView1_MouseDoubleClick(object sender, MouseEventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; + textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; + languageComboBox.Text = listView1.SelectedItems[0].SubItems[2].Text; + listView1.Items.Remove(listView1.SelectedItems[0]); + } + } + + private void button8_Click(object sender, EventArgs e) + { + listView1.Items.Clear(); + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -41,6 +41,7 @@ string _version = string.Empty; string _description = string.Empty; string _group = string.Empty; + Image _image = null; public ArrayList Uninstall = new ArrayList(); public ArrayList FileList = new ArrayList(); @@ -74,6 +75,12 @@ set {_author = value; } } + public Image Logo + { + get { return _image; } + set { _image = value; } + } + public string Group { get { return _group; } @@ -118,6 +125,7 @@ Version = string.Empty; UpdateURL = string.Empty; Group = string.Empty; + Logo = null; } public bool SaveToFile(string fil) @@ -174,7 +182,8 @@ writer.WriteElementString("UpdateURL", this.UpdateURL); writer.WriteElementString("Version", this.Version); writer.WriteElementString("Description", this.Description); - writer.WriteElementString("Group", this.Group); + writer.WriteElementString("Group", this.Group); + WriteLogoElement(writer); writer.WriteEndElement(); writer.WriteEndElement(); writer.Flush(); @@ -192,6 +201,23 @@ } return true; } + + public void WriteLogoElement(XmlWriter writer) + { + if (this.Logo != null) + { + string t = Path.GetTempFileName(); + this.Logo.Save(t, System.Drawing.Imaging.ImageFormat.Png); + FileStream fs = File.OpenRead(Path.GetFullPath(t)); + byte[] buffer = new byte[fs.Length]; + fs.Read(buffer, 0, buffer.Length); + fs.Close(); + File.Delete(t); + writer.WriteStartElement("Logo"); + writer.WriteBase64(buffer, 0, buffer.Length); + writer.WriteEndElement(); + } + } public void BuilFile(ListBox ls, ProgressBar pb) { @@ -277,6 +303,24 @@ XmlNode node_gr = nodeoption.SelectSingleNode("Group"); if (node_gr != null) this.Group = node_gr.InnerText; + XmlNode node_logo = nodeoption.SelectSingleNode("Logo"); + if (node_logo != null) + { + byte[] buffer = Convert.FromBase64String(node_logo.InnerText); + string t = Path.GetTempFileName(); + FileStream fs = new FileStream(t, FileMode.Create); + fs.Write(buffer, 0, buffer.Length); + fs.Close(); + this.Logo = Image.FromFile(t,true); + try + { + File.Delete(t); + } + catch (Exception) + { + + } + } } public MPIFileList FindList(string typ, string stpy) Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -304,6 +304,7 @@ writer.WriteElementString("Author", it._intalerStruct.Author); writer.WriteElementString("Description", it._intalerStruct.Description); writer.WriteElementString("Group", it._intalerStruct.Group); + it._intalerStruct.WriteLogoElement(writer); writer.WriteStartElement("Uninstall"); for (int j = 0; j < it._intalerStruct.Uninstall.Count; j++) { Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -42,7 +42,7 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(121, 32); this.button1.TabIndex = 0; - this.button1.Text = "Manage package"; + this.button1.Text = "Create package"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // @@ -72,6 +72,7 @@ // // button4 // + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button4.Location = new System.Drawing.Point(254, 231); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(26, 23); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -56,6 +56,7 @@ this.columnHeader10 = new System.Windows.Forms.ColumnHeader(); this.label1 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.button6 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -179,6 +180,7 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.button6); this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.comboBox2); this.tabPage1.Controls.Add(this.linkLabel1); @@ -199,7 +201,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(250, 280); + this.label2.Location = new System.Drawing.Point(361, 280); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(36, 13); this.label2.TabIndex = 7; @@ -212,7 +214,7 @@ this.comboBox2.Items.AddRange(new object[] { "List", "Icons"}); - this.comboBox2.Location = new System.Drawing.Point(250, 296); + this.comboBox2.Location = new System.Drawing.Point(361, 296); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(82, 21); this.comboBox2.TabIndex = 6; @@ -319,6 +321,15 @@ this.comboBox1.TabIndex = 0; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // + // button6 + // + this.button6.Location = new System.Drawing.Point(250, 294); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(105, 23); + this.button6.TabIndex = 8; + this.button6.Text = "Find updates"; + this.button6.UseVisualStyleBackColor = true; + // // controlp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -367,5 +378,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.ColumnHeader columnHeader10; + private System.Windows.Forms.Button button6; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-19 20:32:28 UTC (rev 198) @@ -126,129 +126,129 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAENASsBdAH/AQ4BMQGBAf8BDgE1AYgB/wEPATsBmQH/AQ8BPAGfAf8BDwFC - AbAB/wEPAUQBtgH/ARABRAG2Af8BEAFEAbYB/wEQAUQBtgH/ARABRAG2Af8BEAFEAbYB/wEQAUQBtgH/ - ARABRAG2Af8BDwFAAaoB/wEPATwBnwH/AQ8BOgGWAf8BDgE1AYgB/wEOAS8BfwH/AQ0BKgFxAf//AKEA - AQ8BOQGTAf8BEgFFAbYB/wEXAUsBuAH/ARsBTwG7Af8BIAFTAb8B/wEkAVgBwwH/ASkBXAHHAf8BLgFh - AcoB/wEyAWYBzgH/ATcBawHRAf8BPAFvAdQB/wFAAXQB1wH/AUQBeAHaAf8BRwF7AdwB/wFKAX4B3gH/ - AU4BgQHgAf8BTwGBAeEB/wFQAYEB4gH/AVABgQHiAf8BTwGBAeEB/wFNAYAB4AH/AUoBfQHeAf8BRQF5 - AdoB/wFAAXMB1gH/ATgBbAHRAf8BLwFjAcsB/wEZAU0BvAH/AQ8BOAGQAf//AI0AAQ8BOgGWAf8BFgFI - AbMB/wEhAVMBtwH/ASUBVwG8Af8BKAFbAcEB/wErAV4BxQH/AS4BYgHJAf8BMQFlAc0B/wE0AWgBzwH/ - ATgBawHRAf8BOwFuAdMB/wE+AXEB1QH/AUEBdAHXAf8BRAF4AdoB/wFHAXoB3AH/AUoBfgHeAf8BTQGB - AeAB/wFQAYEB4gH/AVQBgQHkAf8BVwGBAeYB/wFaAYIB6QH/AV0BhQHrAf8BYAGIAe0B/wFjAYsB7wH/ - AWYBjgHxAf8BaQGSAfMB/wFsAZQB9QH/AWwBlAH1Af8BMwFmAc4B/wEOATkBkwH//wCJAAERAUQBswH/ - AR0BTwGwAf8BIQFTAbUB/wEkAVYBugH/ASgBWgG/Af8BKwFdAcMB/wEuAWEByAH/ATEBZQHMAf8BNAFo - Ac8B/wE3AWsB0QH/AToBbgHTAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BRwF6AdwB/wFKAX0B3gH/ - AU0BgQHgAf8BUAGBAeIB/wFTAYEB5AH/AVYBgQHmAf8BWgGCAegB/wFdAYUB6gH/AWABiAHsAf8BYwGL - Ae8B/wFmAY4B8QH/AWkBkQHzAf8BbAGUAfUB/wFvAZcB9wH/AW4BlgH2Af8BGwFPAb4B//8AiQABFAFG - Aa8B/wEdAU4BrgH/ASEBUgGzAf8BJAFWAbgB/wEnAVkBvQH/ASoBXQHBAf8BLQFgAcYB/wExAWQBygH/ - ATQBZwHOAf8BNwFqAdAB/wE6AW4B0wH/AT0BcQHVAf8BQAF0AdcB/wFDAXcB2QH/AUYBegHbAf8BSQF9 - Ad0B/wFNAYAB3wH/AVABgQHhAf8BUwGBAeQB/wFWAYEB5gH/AVkBgQHoAf8BXAGEAeoB/wFfAYcB7AH/ - AWIBigHuAf8BZQGNAfAB/wFoAZAB8gH/AWoBkwH0Af8BbAGUAfUB/wFtAZUB9gH/ATQBaAHOAf//AIkA - ARUBRwGsAf8BHQFNAawB/wEgAVEBsQH/ASQBVQG2Af8BJwFYAbsB/wEqAVwBvwH/AS0BXwHEAf8BMAFj - AcgB/wEzAWcBzQH/ATYBagHQAf8BOQFtAdIB/wE9AXAB1AH/AUABcwHWAf8BQwF2AdkB/wFGAXkB2wH/ - AUkBfAHdAf8BTAF/Ad8B/wFPAYEB4QH/AVIBgQHjAf8BVQGBAeUB/wFYAYEB5wH/AVsBgwHpAf8BXgGG - AesB/wFhAYkB7QH/AWMBjAHvAf8BZgGOAfEB/wFoAZAB8gH/AWoBkgHzAf8BagGTAfQB/wE9AXEB1QH/ - /wCFAAEOAS4BfAH/ARYBRgGpAf8BHAFMAakB/wEfAVABrwH/ASIBVAG0Af8BJgFXAbkB/wEpAVsBvQH/ - ASwBXwHCAf8BLwFiAcYB/wEyAWUBywH/ATYBaQHPAf8BOQFsAdIB/wE8AW8B1AH/AT8BcgHWAf8BQgF1 - AdgB/wFFAXgB2gH/AUgBewHcAf8BRAF4Ad4B/wE2AW4B2wH/AUgBfwHfAf8BPAF2Ad8B/wFOAYEB5wH/ - AWkBjgHrAf8BTQGBAeoB/wFfAYcB7AH/AWIBigHuAf8BZAGMAe8B/wFmAY4B8QH/AWcBjwHxAf8BZwGQ - AfIB/wFEAXgB2gH/AQ4BLgF8Af//AIEAAQ4BMwGCAf8BGgFJAacB/wEbAUsBpwH/AR4BTwGsAf8BIgFT - AbIB/wElAVYBtwH/ASkBWgG7Af8BLAFeAcAB/wEvAWEBxAH/ATIBZQHJAf8BNQFoAc0B/wE4AWsB0QH/ - ATsBbgHTAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BRwF6AdsB/wE7AXEB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BXwGGAesB/wFXAYEB6wH/AV8BiAHsAf8BYQGKAe4B/wFjAYsB7wH/AWQBjAHvAf8BZAGN - AfAB/wFKAX4B3gH/AQ4BMwGCAf//AIEAAQ4BNwGNAf8BQwFqAbMB/wE0AV4BrgH/AR8BTgGqAf8BIQFR - Aa8B/wEkAVUBtAH/ASgBWQG5Af8BKwFcAb4B/wEuAWABwgH/ATEBYwHHAf8BNAFnAcsB/wE3AWoBzwH/ - AToBbQHSAf8BPQFwAdUB/wFAAXMB1wH/AUMBdgHZAf8BPwF0AdsB/wEdAV4B1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BOQF2AeYB/wFRAYEB6wH/AV8BhwHsAf8BYAGIAe0B/wFhAYkB7QH/AWIBigHuAf8BTwGB - AeEB/wEOATcBjgH//wCBAAEPATwBnwH/AVIBdQG1Af8BTwFzAbYB/wE+AWcBtAH/ARoBTAGtAf8BIwFU - AbIB/wEmAVcBtwH/ASoBWwG7Af8BLQFeAcAB/wEwAWIBxAH/ATMBZQHJAf8BNgFpAc0B/wE5AWwB0QH/ - ATsBbwHUAf8BPwFyAdYB/wE3AW8B1wH/AUIBcwHdAf8BbwGLAecF/wFcAYIB4wH/ASgBZQHbAf8BKQFn - Ad0B/wGJAakB7wn/AXMBlgHsAf8BWAGEAeoB/wFdAYYB6wH/AV4BhwHsAf8BXwGHAewB/wFSAYEB4wH/ - AQ8BPAGfAf//AIEAARABPgGkAf8BaAGBAbsB/wFWAXkBtwH/AVABdQG4Af8BQgFsAbUB/wEcAU0BrwH/ - ASUBVgG0Af8BKAFZAbkB/wEsAV0BvgH/AS8BYAHCAf8BMgFkAcYB/wE0AWcBygH/ATcBagHOAf8BOgFu - AdIB/wE9AXEB1QH/AS8BZgHSAf8B2wHlAfUF/wG/AdIB9QH/ASsBZgHYAf8BTQGBAeAB/wFQAYEB4QH/ - ASoBaAHfAf8C/gH9Af8B5AHqAfwB/wFdAYcB6gH/AVkBggHoAf8BWwGDAekB/wFbAYQB6gH/AVwBhAHq - Af8BVAGBAeQB/wEPAT4BpQH//wCBAAEUAUYBtQH/AXsBigHCAf8BXgF/AbkB/wFXAXoBuQH/AVgBeQG+ - Af8BOAFjAbUB/wEgAVABsQH/AScBWAG2Af8BKgFbAbsB/wEtAV8BwAH/ASoBWgHEAf8BGwFTAcIB/wEp - AV8BygH/AS0BYgHQAf8BOwFvAdMB/wEmAWEB1gH/AYMBowHmBf8BrwHHAe8B/wEsAWcB2QH/AUsBfwHe - Af8BTgGBAeAB/wEtAWgB2wH/AfQB+AH9Af8BVAGBAeoB/wFBAXoB5QH/AVcBgQHmAf8BWAGBAecB/wFY - AYEB6AH/AVkBgQHoAf8BVAGBAeUB/wEPAUQBtgH//wCBAAEXAUkBtQH/AYMBmQHIAf8BZAGBAboB/wFf - AX8BugH/AVkBfAG7Af8BWQF8Ab8B/wEaAU8BsAH/ASUBVgG0Af8BKAFaAbgB/wEsAV0BvQH/ARkBUAG7 - Af8ByAHUAfEF/wELAUUBwQH/ARYBUwHJAf8BbgGJAd8B/wFeAYEB3gH/ASwBZwHUBf8BJgFhAdYB/wEv - AWcB2QH/AS0BaAHaAf8BSgGAAeIF/wHUAeEB9AH/AUgBfgHjAf8BVAGBAeQB/wFVAYEB5QH/AVYBgQHm - Af8BVgGBAeYB/wFUAYEB5QH/ARABRAG1Af//AIEAARoBSwG1Af8BlAGmAc4B/wFrAYEBuwH/AWYBgQG7 - Af8BYAGBAbwB/wFhAYEBwAH/ATkBXwG0Af8BEAFFAasB/wEtAVwBuQH/AQsBPAGsAf8BCwEvAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF+AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE9AXUB4gH/AVEBgQHi - Af8BUgGBAeMB/wFTAYEB4wH/AVMBgQHkAf8BUwGBAeQB/wEQAUQBtgH//wCBAAEdAU4BtgH/AaMBswHU - Af8BcgGCAbwB/wFtAYEBvQH/AWcBgQG9Af8BZAGBAb0B/wFNAXQBugH/ARgBSQGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATQBagHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEaAVwB1wH/AToBcgHfAf8BRQF5Ad8B/wFO - AYEB4AH/AU8BgQHhAf8BUAGBAeEB/wFQAYEB4gH/AVABgQHiAf8BEAFEAbYB//8AgQABHwFPAbcB/wGy - Ab8B2gH/AXgBhwG8Af8BdAGEAb4B/wFuAYEBvgH/AWgBgQG/Af8BaQGBAcIB/wEeAU4BrA3/AZYBrgHg - Af8BJAFWAb4B/wELAUIBvAH/AUkBdgHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRAF4AdcB/wFG - AXgB2AH/Ae0B8wH9Af8BWgGBAeEB/wE9AXMB2wH/AUkBfQHdAf8BSgF+Ad4B/wFLAX8B3wH/AUwBgAHf - Af8BTQGAAeAB/wFNAYEB4AH/AU0BgQHgAf8BEQFFAbYB//8AgQABHwFPAbcB/wHAAcsB4QH/AX8BjAG+ - Af8BegGJAb8B/wF1AYYBvwH/AW8BgQHAAf8BcAGEAcAB/wELATQBmQH/AZIBqAHXBf8BdwGLAdEB/wEL - AUEBrQH/ASQBWAG/Af8BLAFdAcIB/wEjAVoBwQH/AQsBRwHDAf8B5wHvAfoJ/wHiAeoB9wH/ASMBXQHP - Af8BLwFpAdcB/wE2AW4B2QH/AUUBeAHaAf8BRgF6AdsB/wFHAXsB3AH/AUkBfAHdAf8BSQF9Ad0B/wFK - AX0B3gH/AUoBfgHeAf8BSgF+Ad4B/wEQAUQBtgH//wCBAAEeAU4BtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AXwBiwHBAf8BdgGHAcEB/wFvAYIBvgH/AUIBbQGxCf8BCwEwAaIB/wEgAVoBtwH/ASsBXAG7 - Af8BLgFfAb8B/wExAWIBwwH/ASMBWQHCAf8BVgGAAdMJ/wE3AWwB1AH/ATQBagHVAf8BPwFyAdYB/wFB - AXQB1wH/AUIBdgHYAf8BQwF3AdkB/wFFAXgB2gH/AUYBeQHbAf8BRgF6AdsB/wFHAXoB3AH/AUcBewHc - Af8BRwF7AdwB/wEQAUQBtgH//wCBAAEbAUwBtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BcwGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BCwE1AaIB/wEmAVcBtAH/ASkBWgG4Af8BLAFdAbwB/wEu - AWABwAH/ASoBXwHEAf8BGgFVAcQF/wG4AckB7wH/AQwBSwHJAf8BNwFpAdIB/wE8AXAB1AH/AT4BcQHV - Af8BPwFzAdYB/wFBAXQB1wH/AUIBdQHYAf8BQwF2AdkB/wFDAXcB2QH/AUQBeAHaAf8BRAF4AdoB/wFD - AXYB2QH/ARABRAG1Af//AIEAARYBSQG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF9 - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wELASwBmwH/ASQBVQGwAf8BJwFYAbUB/wEpAVsBuQH/ - ASwBXQG9Af8BIgFXAcEB/wE6AWoByAn/AW0BhwHeAf8BKAFeAdEB/wE6AW0B0wH/ATsBbwHTAf8BPQFw - AdUB/wE+AXEB1QH/AT8BcgHWAf8BQAFzAdcB/wFBAXQB1wH/AUEBdQHYAf8BQgF1AdgB/wE+AXIB1gH/ - AQ8BQwG2Af//AIEAARABPgGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AXwBigHAAf8BWgF8AbUB/wHIAdIB6AX/ATUBXgGuAf8BCwFAAaUB/wElAVUBsQH/AScBWAG1Af8BIAFX - AbkB/wELAT4BsQH/AbkBxQHsDf8BHgFXAcgB/wE3AWsB0QH/ATkBbAHSAf8BOgFuAdMB/wE7AW8B0wH/ - ATwBcAHUAf8BPQFxAdUB/wE+AXEB1QH/AT4BcgHWAf8BPwFyAdYB/wE5AW0B0gH/AQ8BPQGiAf//AIEA - AQ8BPAGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcQGE - Ab4B/wG3AcYB4wn/AT4BZQG0Af8BCwErAZsB/wELATUBogH/AQsBNwGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUIBcgHLAf8BZwGCAdUB/wEkAVkBxgH/ATQBaAHOAf8BNgFqAdAB/wE3AWsB0QH/ATgBbAHSAf8BOQFt - AdIB/wE6AW4B0wH/ATsBbgHTAf8BOwFvAdMB/wE8AW8B1AH/ATQBaAHPAf8BDwE8AZ8B//8AgQABDgE2 + ASADAAEBAQABIAYAAUAqAAEOASwBdQH/AQ8BMgGBAf8BDwE2AYgB/wEQATwBmQH/ARABPQGfAf8BEAFD + AbAB/wEQAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/ + AREBRQG2Af8BEAFBAaoB/wEQAT0BnwH/ARABOwGWAf8BDwE2AYgB/wEPATABgAH/AQ4BKwFyAf//AKEA + ARABOgGTAf8BEwFGAbYB/wEYAUwBuAH/ARwBUAG7Af8BIQFUAb8B/wElAVkBwwH/ASoBXQHHAf8BLwFi + AcoB/wEzAWcBzgH/ATgBbAHRAf8BPQFwAdQB/wFBAXUB1wH/AUUBeQHaAf8BSAF8AdwB/wFLAX8B3gH/ + AU8BgQHgAf8BUAGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BUAGBAeEB/wFOAYEB4AH/AUsBfgHeAf8BRgF6 + AdoB/wFBAXQB1gH/ATkBbQHRAf8BMAFkAcsB/wEaAU4BvAH/ARABOQGQAf//AI0AARABOwGWAf8BFwFJ + AbMB/wEiAVQBtwH/ASYBWAG8Af8BKQFcAcEB/wEsAV8BxQH/AS8BYwHJAf8BMgFmAc0B/wE1AWkBzwH/ + ATkBbAHRAf8BPAFvAdMB/wE/AXIB1QH/AUIBdQHXAf8BRQF5AdoB/wFIAXsB3AH/AUsBfwHeAf8BTgGB + AeAB/wFRAYEB4gH/AVUBgQHkAf8BWAGBAeYB/wFbAYIB6QH/AV4BhQHrAf8BYQGIAe0B/wFkAYsB7wH/ + AWcBjgHxAf8BagGSAfMB/wFtAZQB9QH/AW0BlAH1Af8BNAFnAc4B/wEPAToBkwH//wCJAAESAUUBswH/ + AR4BUAGwAf8BIgFUAbUB/wElAVcBugH/ASkBWwG/Af8BLAFeAcMB/wEvAWIByAH/ATIBZgHMAf8BNQFp + Ac8B/wE4AWwB0QH/ATsBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdwB/wFLAX4B3gH/ + AU4BgQHgAf8BUQGBAeIB/wFUAYEB5AH/AVcBgQHmAf8BWwGCAegB/wFeAYUB6gH/AWEBiAHsAf8BZAGL + Ae8B/wFnAY4B8QH/AWoBkQHzAf8BbQGUAfUB/wFwAZcB9wH/AW8BlgH2Af8BHAFQAb4B//8AiQABFQFH + Aa8B/wEeAU8BrgH/ASIBUwGzAf8BJQFXAbgB/wEoAVoBvQH/ASsBXgHBAf8BLgFhAcYB/wEyAWUBygH/ + ATUBaAHOAf8BOAFrAdAB/wE7AW8B0wH/AT4BcgHVAf8BQQF1AdcB/wFEAXgB2QH/AUcBewHbAf8BSgF+ + Ad0B/wFOAYEB3wH/AVEBgQHhAf8BVAGBAeQB/wFXAYEB5gH/AVoBgQHoAf8BXQGEAeoB/wFgAYcB7AH/ + AWMBigHuAf8BZgGNAfAB/wFpAZAB8gH/AWsBkwH0Af8BbQGUAfUB/wFuAZUB9gH/ATUBaQHOAf//AIkA + ARYBSAGsAf8BHgFOAawB/wEhAVIBsQH/ASUBVgG2Af8BKAFZAbsB/wErAV0BvwH/AS4BYAHEAf8BMQFk + AcgB/wE0AWgBzQH/ATcBawHQAf8BOgFuAdIB/wE+AXEB1AH/AUEBdAHWAf8BRAF3AdkB/wFHAXoB2wH/ + AUoBfQHdAf8BTQGAAd8B/wFQAYEB4QH/AVMBgQHjAf8BVgGBAeUB/wFZAYEB5wH/AVwBgwHpAf8BXwGG + AesB/wFiAYkB7QH/AWQBjAHvAf8BZwGOAfEB/wFpAZAB8gH/AWsBkgHzAf8BawGTAfQB/wE+AXIB1QH/ + /wCFAAEPAS8BfQH/ARcBRwGpAf8BHQFNAakB/wEgAVEBrwH/ASMBVQG0Af8BJwFYAbkB/wEqAVwBvQH/ + AS0BYAHCAf8BMAFjAcYB/wEzAWYBywH/ATcBagHPAf8BOgFtAdIB/wE9AXAB1AH/AUABcwHWAf8BQwF2 + AdgB/wFGAXkB2gH/AUkBfAHcAf8BRQF5Ad4B/wE3AW8B2wH/AUkBgAHfAf8BPQF3Ad8B/wFPAYEB5wH/ + AWoBjgHrAf8BTgGBAeoB/wFgAYcB7AH/AWMBigHuAf8BZQGMAe8B/wFnAY4B8QH/AWgBjwHxAf8BaAGQ + AfIB/wFFAXkB2gH/AQ8BLwF9Af//AIEAAQ8BNAGCAf8BGwFKAacB/wEcAUwBpwH/AR8BUAGsAf8BIwFU + AbIB/wEmAVcBtwH/ASoBWwG7Af8BLQFfAcAB/wEwAWIBxAH/ATMBZgHJAf8BNgFpAc0B/wE5AWwB0QH/ + ATwBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdsB/wE8AXIB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BYAGGAesB/wFYAYEB6wH/AWABiAHsAf8BYgGKAe4B/wFkAYsB7wH/AWUBjAHvAf8BZQGN + AfAB/wFLAX8B3gH/AQ8BNAGCAf//AIEAAQ8BOAGNAf8BRAFrAbMB/wE1AV8BrgH/ASABTwGqAf8BIgFS + Aa8B/wElAVYBtAH/ASkBWgG5Af8BLAFdAb4B/wEvAWEBwgH/ATIBZAHHAf8BNQFoAcsB/wE4AWsBzwH/ + ATsBbgHSAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BQAF1AdsB/wEeAV8B1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BOgF3AeYB/wFSAYEB6wH/AWABhwHsAf8BYQGIAe0B/wFiAYkB7QH/AWMBigHuAf8BUAGB + AeEB/wEPATgBjgH//wCBAAEQAT0BnwH/AVMBdgG1Af8BUAF0AbYB/wE/AWgBtAH/ARsBTQGtAf8BJAFV + AbIB/wEnAVgBtwH/ASsBXAG7Af8BLgFfAcAB/wExAWMBxAH/ATQBZgHJAf8BNwFqAc0B/wE6AW0B0QH/ + ATwBcAHUAf8BQAFzAdYB/wE4AXAB1wH/AUMBdAHdAf8BcAGLAecF/wFdAYIB4wH/ASkBZgHbAf8BKgFo + Ad0B/wGJAakB7wn/AXQBlgHsAf8BWQGEAeoB/wFeAYYB6wH/AV8BhwHsAf8BYAGHAewB/wFTAYEB4wH/ + ARABPQGfAf//AIEAAREBPwGkAf8BaQGBAbsB/wFXAXoBtwH/AVEBdgG4Af8BQwFtAbUB/wEdAU4BrwH/ + ASYBVwG0Af8BKQFaAbkB/wEtAV4BvgH/ATABYQHCAf8BMwFlAcYB/wE1AWgBygH/ATgBawHOAf8BOwFv + AdIB/wE+AXIB1QH/ATABZwHSAf8B2wHlAfUF/wG/AdIB9QH/ASwBZwHYAf8BTgGBAeAB/wFRAYEB4QH/ + ASsBaQHfAf8C/gH9Af8B5AHqAfwB/wFeAYcB6gH/AVoBggHoAf8BXAGDAekB/wFcAYQB6gH/AV0BhAHq + Af8BVQGBAeQB/wEQAT8BpQH//wCBAAEVAUcBtQH/AXwBigHCAf8BXwGAAbkB/wFYAXsBuQH/AVkBegG+ + Af8BOQFkAbUB/wEhAVEBsQH/ASgBWQG2Af8BKwFcAbsB/wEuAWABwAH/ASsBWwHEAf8BHAFUAcIB/wEq + AWABygH/AS4BYwHQAf8BPAFwAdMB/wEnAWIB1gH/AYMBowHmBf8BrwHHAe8B/wEtAWgB2QH/AUwBgAHe + Af8BTwGBAeAB/wEuAWkB2wH/AfQB+AH9Af8BVQGBAeoB/wFCAXsB5QH/AVgBgQHmAf8BWQGBAecB/wFZ + AYEB6AH/AVoBgQHoAf8BVQGBAeUB/wEQAUUBtgH//wCBAAEYAUoBtQH/AYMBmQHIAf8BZQGBAboB/wFg + AYABugH/AVoBfQG7Af8BWgF9Ab8B/wEbAVABsAH/ASYBVwG0Af8BKQFbAbgB/wEtAV4BvQH/ARoBUQG7 + Af8ByAHUAfEF/wEMAUYBwQH/ARcBVAHJAf8BbwGJAd8B/wFfAYEB3gH/AS0BaAHUBf8BJwFiAdYB/wEw + AWgB2QH/AS4BaQHaAf8BSwGBAeIF/wHUAeEB9AH/AUkBfwHjAf8BVQGBAeQB/wFWAYEB5QH/AVcBgQHm + Af8BVwGBAeYB/wFVAYEB5QH/AREBRQG1Af//AIEAARsBTAG1Af8BlAGmAc4B/wFsAYEBuwH/AWcBgQG7 + Af8BYQGBAbwB/wFiAYEBwAH/AToBYAG0Af8BEQFGAasB/wEuAV0BuQH/AQwBPQGsAf8BDAEwAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF/AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE+AXYB4gH/AVIBgQHi + Af8BUwGBAeMB/wFUAYEB4wH/AVQBgQHkAf8BVAGBAeQB/wERAUUBtgH//wCBAAEeAU8BtgH/AaMBswHU + Af8BcwGCAbwB/wFuAYEBvQH/AWgBgQG9Af8BZQGBAb0B/wFOAXUBugH/ARkBSgGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATUBawHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEbAV0B1wH/ATsBcwHfAf8BRgF6Ad8B/wFP + AYEB4AH/AVABgQHhAf8BUQGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BEQFFAbYB//8AgQABIAFQAbcB/wGy + Ab8B2gH/AXkBhwG8Af8BdQGEAb4B/wFvAYEBvgH/AWkBgQG/Af8BagGBAcIB/wEfAU8BrA3/AZYBrgHg + Af8BJQFXAb4B/wEMAUMBvAH/AUoBdwHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRQF5AdcB/wFH + AXkB2AH/Ae0B8wH9Af8BWwGBAeEB/wE+AXQB2wH/AUoBfgHdAf8BSwF/Ad4B/wFMAYAB3wH/AU0BgQHf + Af8BTgGBAeAB/wFOAYEB4AH/AU4BgQHgAf8BEgFGAbYB//8AgQABIAFQAbcB/wHAAcsB4QH/AYABjAG+ + Af8BewGJAb8B/wF2AYYBvwH/AXABgQHAAf8BcQGEAcAB/wEMATUBmQH/AZIBqAHXBf8BeAGLAdEB/wEM + AUIBrQH/ASUBWQG/Af8BLQFeAcIB/wEkAVsBwQH/AQwBSAHDAf8B5wHvAfoJ/wHiAeoB9wH/ASQBXgHP + Af8BMAFqAdcB/wE3AW8B2QH/AUYBeQHaAf8BRwF7AdsB/wFIAXwB3AH/AUoBfQHdAf8BSgF+Ad0B/wFL + AX4B3gH/AUsBfwHeAf8BSwF/Ad4B/wERAUUBtgH//wCBAAEfAU8BtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AX0BiwHBAf8BdwGHAcEB/wFwAYIBvgH/AUMBbgGxCf8BDAExAaIB/wEhAVsBtwH/ASwBXQG7 + Af8BLwFgAb8B/wEyAWMBwwH/ASQBWgHCAf8BVwGBAdMJ/wE4AW0B1AH/ATUBawHVAf8BQAFzAdYB/wFC + AXUB1wH/AUMBdwHYAf8BRAF4AdkB/wFGAXkB2gH/AUcBegHbAf8BRwF7AdsB/wFIAXsB3AH/AUgBfAHc + Af8BSAF8AdwB/wERAUUBtgH//wCBAAEcAU0BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BdAGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDAE2AaIB/wEnAVgBtAH/ASoBWwG4Af8BLQFeAbwB/wEv + AWEBwAH/ASsBYAHEAf8BGwFWAcQF/wG4AckB7wH/AQ0BTAHJAf8BOAFqAdIB/wE9AXEB1AH/AT8BcgHV + Af8BQAF0AdYB/wFCAXUB1wH/AUMBdgHYAf8BRAF3AdkB/wFEAXgB2QH/AUUBeQHaAf8BRQF5AdoB/wFE + AXcB2QH/AREBRQG1Af//AIEAARcBSgG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF+ + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEMAS0BmwH/ASUBVgGwAf8BKAFZAbUB/wEqAVwBuQH/ + AS0BXgG9Af8BIwFYAcEB/wE7AWsByAn/AW4BhwHeAf8BKQFfAdEB/wE7AW4B0wH/ATwBcAHTAf8BPgFx + AdUB/wE/AXIB1QH/AUABcwHWAf8BQQF0AdcB/wFCAXUB1wH/AUIBdgHYAf8BQwF2AdgB/wE/AXMB1gH/ + ARABRAG2Af//AIEAAREBPwGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AX0BigHAAf8BWwF9AbUB/wHIAdIB6AX/ATYBXwGuAf8BDAFBAaUB/wEmAVYBsQH/ASgBWQG1Af8BIQFY + AbkB/wEMAT8BsQH/AbkBxQHsDf8BHwFYAcgB/wE4AWwB0QH/AToBbQHSAf8BOwFvAdMB/wE8AXAB0wH/ + AT0BcQHUAf8BPgFyAdUB/wE/AXIB1QH/AT8BcwHWAf8BQAFzAdYB/wE6AW4B0gH/ARABPgGiAf//AIEA + ARABPQGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcgGE + Ab4B/wG3AcYB4wn/AT8BZgG0Af8BDAEsAZsB/wEMATYBogH/AQwBOAGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUMBcwHLAf8BaAGCAdUB/wElAVoBxgH/ATUBaQHOAf8BNwFrAdAB/wE4AWwB0QH/ATkBbQHSAf8BOgFu + AdIB/wE7AW8B0wH/ATwBbwHTAf8BPAFwAdMB/wE9AXAB1AH/ATUBaQHPAf8BEAE9AZ8B//8AgQABDwE3 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BCwEpAasB/wEbAVIBvQH/AScBWwHFAf8BMAFjAcgB/wEyAWUBywH/ATMBZwHOAf8BNAFo - Ac8B/wE1AWkB0AH/ATYBagHQAf8BNwFrAdEB/wE4AWwB0QH/ATgBbAHSAf8BOQFsAdIB/wEvAWMBywH/ - AQ4BNgGLAf//AIEAAQ4BMwGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWkBgQG8Af8BCwEXAYUB/wHrAfAB9Qn/AakBuwHhCf8BawGC - Ac4B/wEjAVYBvQH/ASwBXgHBAf8BLgFgAcUB/wEvAWIByAH/ATABZAHLAf8BMgFlAc0B/wEzAWYBzgH/ - ATQBZwHOAf8BNAFoAc8B/wE1AWkBzwH/ATUBaQHQAf8BNgFqAdAB/wEqAV0BxwH/AQ4BMwGBAf//AIEA - AQ0BLQF5Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BdwGHAcQB/wHQAdwB7QX/ATsBZQGwAf8BCwEcAZUB/wEPAUUBqQH/ - AakBuAHhAf8BDAFCAa0B/wEXAU4BswH/ASMBVQG9Af8BJAFXAcEB/wEmAV8BxAH/AS4BYQHHAf8BLwFi - AcoB/wEwAWQBzAH/ATEBZAHMAf8BMgFlAc0B/wEyAWYBzQH/ATMBZgHNAf8BMwFmAc4B/wElAVgBxAH/ - AQ4BLQF5Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AXwBjQHIAf8BbAGC - AcEB/wFiAYEBwwH/AVgBgQHEAf8BWgF/AcUB/wFcAYEBxQH/AVcBfQHGAf8BUgF7AcYB/wFIAXUByQH/ - AUABbgHJAf8BOwFrAcsB/wE2AWgBywH/ATEBZAHLAf8BLwFiAcsB/wEvAWMBywH/ATABYwHMAf8BMAFk - AcwB/wEgAVMBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BDAEqAasB/wEcAVMBvQH/ASgBXAHFAf8BMQFkAcgB/wEzAWYBywH/ATQBaAHOAf8BNQFp + Ac8B/wE2AWoB0AH/ATcBawHQAf8BOAFsAdEB/wE5AW0B0QH/ATkBbQHSAf8BOgFtAdIB/wEwAWQBywH/ + AQ8BNwGLAf//AIEAAQ8BNAGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWoBgQG8Af8BDAEYAYUB/wHrAfAB9Qn/AakBuwHhCf8BbAGC + Ac4B/wEkAVcBvQH/AS0BXwHBAf8BLwFhAcUB/wEwAWMByAH/ATEBZQHLAf8BMwFmAc0B/wE0AWcBzgH/ + ATUBaAHOAf8BNQFpAc8B/wE2AWoBzwH/ATYBagHQAf8BNwFrAdAB/wErAV4BxwH/AQ8BNAGBAf//AIEA + AQ4BLgF6Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BeAGHAcQB/wHQAdwB7QX/ATwBZgGwAf8BDAEdAZUB/wEQAUYBqQH/ + AakBuAHhAf8BDQFDAa0B/wEYAU8BswH/ASQBVgG9Af8BJQFYAcEB/wEnAWABxAH/AS8BYgHHAf8BMAFj + AcoB/wExAWUBzAH/ATIBZQHMAf8BMwFmAc0B/wEzAWcBzQH/ATQBZwHNAf8BNAFnAc4B/wEmAVkBxAH/ + AQ8BLgF6Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX0BjQHIAf8BbQGC + AcEB/wFjAYEBwwH/AVkBgQHEAf8BWwGAAcUB/wFdAYEBxQH/AVgBfgHGAf8BUwF8AcYB/wFJAXYByQH/ + AUEBbwHJAf8BPAFsAcsB/wE3AWkBywH/ATIBZQHLAf8BMAFjAcsB/wEwAWQBywH/ATEBZAHMAf8BMQFl + AcwB/wEhAVQBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AX0BiwHGAf8BdwGHAcYB/wFtAYIBxwH/AWcBgQHHAf8BYQGBAccB/wFbAYABxwH/AVUBfAHIAf8BTwF4 - AcgB/wFJAXQByQH/AUMBcAHKAf8BPQFsAcoB/wE2AWcBywH/ATABYwHKAf8BLQFgAckB/wEtAWEBygH/ - AS0BYQHKAf8BGwFPAb0B//8AiQABZwGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AX4BiwHGAf8BeAGHAcYB/wFuAYIBxwH/AWgBgQHHAf8BYgGBAccB/wFcAYEBxwH/AVYBfQHIAf8BUAF5 + AcgB/wFKAXUByQH/AUQBcQHKAf8BPgFtAcoB/wE3AWgBywH/ATEBZAHKAf8BLgFhAckB/wEuAWIBygH/ + AS4BYgHKAf8BHAFQAb0B//8AiQABaAGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGAAZAByAH/AXoBiwHHAf8BdAGHAccB/wFtAYIBxwH/AWcBgQHHAf8BYAGBAccB/wFaAYABxwH/ - AVQBewHIAf8BTgF3AcgB/wFIAXMByQH/AUEBbgHJAf8BOwFqAcoB/wE0AWUBygH/AS4BYQHJAf8BKgFe - AcgB/wEqAV4ByAH/ARYBSgG6Af//AIkAASYBVQG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AXsBiwHHAf8BdQGHAccB/wFuAYIBxwH/AWgBgQHHAf8BYQGBAccB/wFbAYEBxwH/ + AVUBfAHIAf8BTwF4AcgB/wFJAXQByQH/AUIBbwHJAf8BPAFrAcoB/wE1AWYBygH/AS8BYgHJAf8BKwFf + AcgB/wErAV8ByAH/ARcBSwG6Af//AIkAAScBVgG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wF/AY8BxwH/AXoBiwHHAf8BcwGGAccB/wFtAYIBxwH/AWYBgQHHAf8BYAGB - AccB/wFaAX8BxwH/AVMBegHHAf8BTQF2AcgB/wFGAXIByAH/AUABbQHIAf8BOQFoAckB/wEyAWQByAH/ - ASwBXgHHAf8BJQFZAcQB/wEQAUMBswH//wCJAAENATABgQH/AWUBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGAAY8BxwH/AXsBiwHHAf8BdAGGAccB/wFuAYIBxwH/AWcBgQHHAf8BYQGB + AccB/wFbAYABxwH/AVQBewHHAf8BTgF3AcgB/wFHAXMByAH/AUEBbgHIAf8BOgFpAckB/wEzAWUByAH/ + AS0BXwHHAf8BJgFaAcQB/wERAUQBswH//wCJAAEOATEBgQH/AWYBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF9AYwBxQH/AXgBiQHGAf8BcwGGAccB/wFsAYEBxwH/ - AWUBgQHGAf8BXwGBAcYB/wFZAX4BxgH/AVIBeQHHAf8BTAF0AccB/wFFAXABxwH/AT4BawHIAf8BNwFn - AcgB/wEtAV4BxQH/ARUBSQG5Af8BDQEsAXcB//8AjQABDgEwAYEB/wEjAVMBugH/AV8BgQHMAf8BfgGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF+AYwBxQH/AXkBiQHGAf8BdAGGAccB/wFtAYEBxwH/ + AWYBgQHGAf8BYAGBAcYB/wFaAX8BxgH/AVMBegHHAf8BTQF1AccB/wFGAXEBxwH/AT8BbAHIAf8BOAFo + AcgB/wEuAV8BxQH/ARYBSgG5Af8BDgEtAXgB//8AjQABDwExAYEB/wEkAVQBugH/AWABgQHMAf8BfwGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BewGN - AcwB/wFpAYEByQH/AVYBfAHFAf8BQwFtAcIB/wE4AWQBwAH/AS0BXAG+Af8BJAFVAb0B/wEcAU4BugH/ - AREBRQG2Af8BDQEtAXoB//8ApQABDgEvAX8B/wEOATUBiAH/AQ8BOgGWAf8BDwE8AZ8B/wEPAUEBrQH/ - ARABRAG2Af8BDwFEAbYB/wESAUUBtgH/ARMBRgG2Af8BEwFGAbYB/wERAUQBtgH/AQ8BRAG2Af8BEAFE - AbYB/wEPAT8BpwH/AQ8BPAGfAf8BDwE4AZAB/wEOATQBhQH/AQ4BLgF8Af//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfAGN + AcwB/wFqAYEByQH/AVcBfQHFAf8BRAFuAcIB/wE5AWUBwAH/AS4BXQG+Af8BJQFWAb0B/wEdAU8BugH/ + ARIBRgG2Af8BDgEuAXsB//8ApQABDwEwAYAB/wEPATYBiAH/ARABOwGWAf8BEAE9AZ8B/wEQAUIBrQH/ + AREBRQG2Af8BEAFFAbYB/wETAUYBtgH/ARQBRwG2Af8BFAFHAbYB/wESAUUBtgH/ARABRQG2Af8BEQFF + AbYB/wEQAUABpwH/ARABPQGfAf8BEAE5AZAB/wEPATUBhQH/AQ8BLwF9Af//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wizard_1)); this.panel1 = new System.Windows.Forms.Panel(); + this.listBox1 = new System.Windows.Forms.ListBox(); this.progressBar2 = new System.Windows.Forms.ProgressBar(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.label2 = new System.Windows.Forms.Label(); @@ -40,15 +41,17 @@ this.button_back = new System.Windows.Forms.Button(); this.button_next = new System.Windows.Forms.Button(); this.button_cancel = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox2); this.panel1.Controls.Add(this.listBox1); this.panel1.Controls.Add(this.progressBar2); this.panel1.Controls.Add(this.progressBar1); @@ -60,6 +63,15 @@ this.panel1.Size = new System.Drawing.Size(334, 298); this.panel1.TabIndex = 0; // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.HorizontalScrollbar = true; + this.listBox1.Location = new System.Drawing.Point(14, 174); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(308, 108); + this.listBox1.TabIndex = 5; + // // progressBar2 // this.progressBar2.Location = new System.Drawing.Point(14, 143); @@ -88,7 +100,7 @@ this.title_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.title_label.Location = new System.Drawing.Point(9, 9); this.title_label.Name = "title_label"; - this.title_label.Size = new System.Drawing.Size(313, 30); + this.title_label.Size = new System.Drawing.Size(252, 30); this.title_label.TabIndex = 1; this.title_label.Text = "label1"; // @@ -152,14 +164,16 @@ this.button_cancel.UseVisualStyleBackColor = true; this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); // - // listBox1 + // pictureBox2 // - this.listBox1.FormattingEnabled = true; - this.listBox1.HorizontalScrollbar = true; - this.listBox1.Location = new System.Drawing.Point(14, 174); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(308, 108); - this.listBox1.TabIndex = 5; + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.Location = new System.Drawing.Point(267, 4); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(64, 64); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 6; + this.pictureBox2.TabStop = false; + this.pictureBox2.Visible = false; // // wizard_1 // @@ -181,6 +195,7 @@ this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -199,5 +214,6 @@ private System.Windows.Forms.ProgressBar progressBar2; private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.PictureBox pictureBox2; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -47,6 +47,15 @@ title_label.Text = package._intalerStruct.Name; button_next.Text = "Next"; richTextBox1.Visible = true; + if (package._intalerStruct.Logo != null) + { + pictureBox2.Visible = true; + pictureBox2.Image = package._intalerStruct.Logo; + } + else + { + pictureBox2.Visible = false; + } richTextBox1.Text = String.Format(" Name : {0} \n\n Author : {1} \n\n Version : {2} \n\n Description :\n {3} \n", package._intalerStruct.Name, package._intalerStruct.Author, package._intalerStruct.Version, package._intalerStruct.Description); if (!this.Visible) this.ShowDialog(); break; Deleted: trunk/plugins/mpinstaler/MPInstaler.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |