[mapguide-commits] r6613 - in branches/2.4/MgDev/Desktop: MapViewer
MapViewerTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri May 4 14:24:44 EDT 2012
Author: jng
Date: 2012-05-04 11:24:43 -0700 (Fri, 04 May 2012)
New Revision: 6613
Modified:
branches/2.4/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
branches/2.4/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
branches/2.4/MgDev/Desktop/MapViewerTest/Program.cs
Log:
Update VS2010 projects with previous changes
Modified: branches/2.4/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2012-05-04 17:59:22 UTC (rev 6612)
+++ branches/2.4/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2012-05-04 18:24:43 UTC (rev 6613)
@@ -79,6 +79,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="BaseInteractionComponents.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="Debug.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -90,21 +93,39 @@
<Compile Include="IMapViewerComponent.cs" />
<Compile Include="IMapStatusBar.cs" />
<Compile Include="IPropertyPane.cs" />
- <Compile Include="MgBufferControl.cs" />
- <Compile Include="MgBufferControlImpl.cs" />
+ <Compile Include="MgBufferComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgBufferControlImpl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Include="MgBufferControlImpl.Designer.cs">
<DependentUpon>MgBufferControlImpl.cs</DependentUpon>
</Compile>
- <Compile Include="MgComponent.cs" />
- <Compile Include="MgControlImpl.cs" />
+ <Compile Include="MgComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgControlImpl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Include="MgDefaultToolbar.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="MgInvokeComponent.cs" />
- <Compile Include="MgLineMeasureControlImpl.cs" />
+ <Compile Include="MgGenericInvokeComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgInvokeComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgLineMeasureControlImpl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Include="MgLineMeasureControlImpl.Designer.cs">
<DependentUpon>MgLineMeasureControlImpl.cs</DependentUpon>
</Compile>
+ <Compile Include="MgLoadPackageComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MgMapViewer.cs">
<SubType>Component</SubType>
</Compile>
@@ -116,15 +137,21 @@
<DependentUpon>MgLegend.cs</DependentUpon>
</Compile>
<Compile Include="MgMapViewerProvider.cs" />
- <Compile Include="MgMeasureControl.cs" />
+ <Compile Include="MgMeasureComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MgPropertyPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="MgPropertyPane.Designer.cs">
<DependentUpon>MgPropertyPane.cs</DependentUpon>
</Compile>
- <Compile Include="MgQueryControl.cs" />
- <Compile Include="MgQueryControlImpl.cs" />
+ <Compile Include="MgQueryComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgQueryControlImpl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Include="MgQueryControlImpl.Designer.cs">
<DependentUpon>MgQueryControlImpl.cs</DependentUpon>
</Compile>
@@ -135,12 +162,33 @@
<DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
</Compile>
<Compile Include="MgReadOnlyStream.cs" />
+ <Compile Include="MgTaskPane.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MgTaskPane.Designer.cs">
+ <DependentUpon>MgTaskPane.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MgViewerOptionsComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgViewerOptionsControlImpl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MgViewerOptionsControlImpl.Designer.cs">
+ <DependentUpon>MgViewerOptionsControlImpl.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>
+ <Compile Include="Tasks\MgTaskPaneStub.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Tasks\MgTaskPaneStub.Designer.cs">
+ <DependentUpon>MgTaskPaneStub.cs</DependentUpon>
+ </Compile>
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup>
<ItemGroup>
@@ -166,10 +214,19 @@
<EmbeddedResource Include="MgQueryResultsDialog.resx">
<DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MgTaskPane.resx">
+ <DependentUpon>MgTaskPane.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MgViewerOptionsControlImpl.resx">
+ <DependentUpon>MgViewerOptionsControlImpl.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="Tasks\MgTaskPaneStub.resx">
+ <DependentUpon>MgTaskPaneStub.cs</DependentUpon>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\lc_broken.gif" />
@@ -377,6 +434,15 @@
<ItemGroup>
<None Include="Resources\AreaLayerDef.txt" />
</ItemGroup>
+ <ItemGroup>
+ <Content Include="MapViewer.csproj" />
+ <Content Include="MapViewer.csproj.user" />
+ <Content Include="Resources\icon_home.gif" />
+ <Content Include="Resources\icon_tasks.gif" />
+ <Content Include="Resources\load_package.gif" />
+ <Content Include="Resources\monitor_status.gif" />
+ <Content Include="Resources\view_log.gif" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
Modified: branches/2.4/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2012-05-04 17:59:22 UTC (rev 6612)
+++ branches/2.4/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2012-05-04 18:24:43 UTC (rev 6613)
@@ -103,19 +103,19 @@
<Compile Include="CompactViewer.Designer.cs">
<DependentUpon>CompactViewer.cs</DependentUpon>
</Compile>
- <Compile Include="Form1.cs">
+ <Compile Include="MgAppWindow.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Form1.Designer.cs">
- <DependentUpon>Form1.cs</DependentUpon>
+ <Compile Include="MgAppWindow.Designer.cs">
+ <DependentUpon>MgAppWindow.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="CompactViewer.resx">
<DependentUpon>CompactViewer.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Form1.resx">
- <DependentUpon>Form1.cs</DependentUpon>
+ <EmbeddedResource Include="MgAppWindow.resx">
+ <DependentUpon>MgAppWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -240,6 +240,10 @@
<Name>MapViewer.Net40</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Content Include="Resources\icon_home.gif" />
+ <Content Include="Resources\icon_tasks.gif" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
Modified: branches/2.4/MgDev/Desktop/MapViewerTest/Program.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewerTest/Program.cs 2012-05-04 17:59:22 UTC (rev 6612)
+++ branches/2.4/MgDev/Desktop/MapViewerTest/Program.cs 2012-05-04 18:24:43 UTC (rev 6613)
@@ -32,15 +32,29 @@
MessageBox.Show(ex.ToString(), "Error");
return;
}
+ var fact = new MgServiceFactory();
+ var resSvc = (MgResourceService)fact.CreateService(MgServiceType.ResourceService);
var frm = new MgAppWindow();
if (args.Length == 1)
{
try
{
var resId = new MgResourceIdentifier(args[0]);
- resId.Validate();
- var fact = new MgServiceFactory();
- var resSvc = (MgResourceService)fact.CreateService(MgServiceType.ResourceService);
+ resId.Validate();
+ if (!resSvc.ResourceExists(resId))
+ {
+ using (var open = new OpenFileDialog())
+ {
+ open.Filter = "*.mgp|*.mgp";
+ if (open.ShowDialog() == DialogResult.OK)
+ {
+ var source = new MgByteSource(open.FileName);
+ var br = source.GetReader();
+ resSvc.ApplyResourcePackage(br);
+ }
+ }
+ }
+
if (resSvc.ResourceExists(resId))
{
frm.Load += (s, e) =>
@@ -48,12 +62,37 @@
LoadMap(frm, resId);
};
}
+ else
+ {
+ MessageBox.Show("The specified Map Definition (" + resId.ToString() + ") does not exist");
+ return;
+ }
}
catch (MgException ex)
{
ex.Dispose();
}
}
+ else
+ {
+ var diag = new ResourceIdDialog();
+ if (diag.ShowDialog() == DialogResult.OK)
+ {
+ var resId = diag.ResourceID;
+ if (resSvc.ResourceExists(resId))
+ {
+ frm.Load += (s, e) =>
+ {
+ LoadMap(frm, resId);
+ };
+ }
+ else
+ {
+ MessageBox.Show("The specified Map Definition (" + resId.ToString() + ") does not exist");
+ return;
+ }
+ }
+ }
Application.ApplicationExit += new EventHandler(OnAppExit);
Application.Run(frm);
}
More information about the mapguide-commits
mailing list