[mapguide-commits] r4466 - in trunk/Tools/Maestro/Maestro: .
ResourceEditors ResourceEditors/FeatureSourceEditors/Filebased
ResourceEditors/FeatureSourceEditors/Gdal
ResourceEditors/FeatureSourceEditors/King.KML
ResourceEditors/FeatureSourceEditors/ODBC
ResourceEditors/FeatureSourceEditors/OGR
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Dec 23 16:21:32 EST 2009
Author: ksgeograf
Date: 2009-12-23 16:21:31 -0500 (Wed, 23 Dec 2009)
New Revision: 4466
Modified:
trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs
trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx
trunk/Tools/Maestro/Maestro/EditorInterface.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Filebased/Unmanaged.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/Simple.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/King.KML/Unmanaged.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/Unmanaged.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/OGR/Unmanaged.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/ShellIcons.cs
Log:
Maestro:
Fixed issue #1212.
Also fixed a bug which would cause wrong icons to be displayed.
Modified: trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -61,11 +61,12 @@
// Required for Windows Form Designer support
//
InitializeComponent();
- FolderView.ImageList = OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.ImageList;
- ItemView.SmallImageList = OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.ImageList;
-
OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.AddIcon(FOLDER_IMAGE, imageList.Images[0]);
OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.AddIcon(FOLDER_ALIAS, imageList.Images[1]);
+
+ FolderView.ImageList = OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.ImageList;
+ ItemView.SmallImageList = OSGeo.MapGuide.Maestro.ResourceEditors.ShellIcons.ImageList;
+
this.Icon = FormMain.MaestroIcon;
}
@@ -272,7 +273,9 @@
//
// BrowseUnmanagedData
//
+ this.AcceptButton = this.OKButton;
resources.ApplyResources(this, "$this");
+ this.CancelButton = this.CancelButton;
this.Controls.Add(this.CancelButton);
this.Controls.Add(this.OKButton);
this.Controls.Add(this.panel1);
@@ -447,7 +450,7 @@
if (FolderView.Nodes.Count > 0)
FolderView.SelectedNode = FolderView.Nodes[0];
- if (m_startPath != null)
+ if (!string.IsNullOrEmpty(m_startPath) && m_startPath.StartsWith("%MG_DATA_PATH_ALIAS["))
{
string[] items = m_startPath.Replace("%MG_DATA_PATH_ALIAS[", "[").Replace("]%", "]/").Split('/');
TreeNodeCollection basis = FolderView.Nodes;
Modified: trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx 2009-12-23 21:21:31 UTC (rev 4466)
@@ -503,43 +503,43 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK
- CQAAAk1TRnQBSQFMAgEBAgEAAQwBAAEMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEP8AcwABqQGJAYQB/wHkAaEBSwH/AeQBoQFLAf8B2QGZAV4B/wHlAaQBUQH/
- AeQBoQFLAf8BygGJAWQB/4QAAYcBwgH4Af8BawHKAfsB/wEmAcQB/QH/ASYBxAH9Af8BJgHEAf0B/wEm
- AcQB/QH/ARwBvgH9Af8BHAG+Af0B/wEcAb4B/QH/ARwBvgH9Af8BFQG7Af0B/wEVAbsB/QH/ARoBswH7
- Af8MAAGEAcQB9gH/AVYBuQH0Af8BrAHrAfoB/wHCAfAB+wH/AcIB8AH7Af8BwgHwAfsB/wHCAfAB+wH/
- AcIB8AH7Af8BxAGhAYMB/wHgAZUBNwH/Ad0BmAFKAf8B3AG1AaoB/wHVAY8BTQH/AeABlQE3Af8B0AGQ
- AV8B/4QAAZUBygH5Af8BhwHKAfkB/wE9AdkC/wE9AdkC/wEwAdIC/wEwAdIC/wEwAdIC/wEwAdIC/wEw
- AdIC/wEtAdEC/wEtAdEC/wEoAc8C/wEoAc8C/wF4Ab8B8QH/CAABiwHHAfYB/wGTAdsB+AH/AW4BzgH2
- Af8BoQHrAfoB/wGeAekB+gH/AZwB5gH6Af8BnAHmAfoB/wGTAdsB+AH/AawBqAGeAf8B2QGLATsB/wG2
- AYMBXQH/AZ0BtwHXAf8BrAGNAXsB/wHXAYgBNgH/AdEBnwGCAf+EAAGYAcsB+QH/AWsBvgH4Af8BdgHo
- Af4B/wFMAeEC/wFMAeEC/wFMAeEC/wFMAeEC/wFIAd8C/wFIAd8C/wFIAd8C/wE9AdkC/wFIAd8C/wFF
- AdcB/AH/AV4ByAH4Af8MAAGsAesB+gH/AU4BuAH0Af8BXQHbAfYB/wFRAdUB9QH/AU0B0AH1Af8BTQHQ
- AfUB/wFFAcUB9AH/AUcBugHoAf8BdQGRAZ4B/wFxAaoB4QH/AZQBzAH+Af8BegG3Ae8B/wF5AZABnwH/
- AXUBnQHUAf+EAAGYAcsB+QH/ATsBugH6Af8BlQHjAf0B/wFdAekC/wFdAekC/wFdAekC/wFdAekC/wFU
- AeUC/wFUAeUC/wFUAeUC/wFUAeUC/wFUAeUC/wFZAeEB/QH/AYQB6QH9Af8MAAGhAeQB+AH/AWIBwAH1
- Af8BUQHVAfUB/wE2AcsB8wH/AS4BwAHyAf8BKwG6AfEB/wEqAbgB8QH/ASoBuAHxAf8BMwGlAesB/wGE
- AcMB/gH/AXwBwAH+Af8BfAHAAf4B/wFIAaoB7QH/AUQBrgHvAf+EAAGYAcsB+QH/ATgByQH9Af8BhwHK
- AfkB/wFwAe4C/wFwAe4C/wFwAe4C/wFsAe4C/wFsAe4C/wFsAe4C/wFlAe0C/wFlAe0C/wFlAe0C/wFs
- Ae4C/wGfAfwB/gH/AYEBwgHwAf8IAAGWAd0B9wH/AYoB3AH4Af8BTgG4AfQB/wEuAcAB8gH/AS4BwAHy
- Af8BKwG6AfEB/wEqAbgB8QH/ASgBtQHxAf8BMwGpAfEB/wF2AbwB/gH/AW4BuAH+Af8BbgG4Af4B/wFQ
- AZ4B6wH/AUkBmAHgAf8BdAGhAecB/4AAAZgBywH5Af8BTwHYAv8BSQG6AfgB/wHBAfQB/gH/AbUB9AH+
+ CQAAAk1TRnQBSQFMAgEBAgEAARQBAAEUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABEAMAAQEBAAEgBgABEP8AcwABqQGJAYQB/wHkAaEBSgH/AeQBoQFKAf8B2QGZAV0B/wHlAaQBUAH/
+ AeQBoQFKAf8BygGJAWMB/4QAAYcBwgH4Af8BagHKAfsB/wElAcQB/QH/ASUBxAH9Af8BJQHEAf0B/wEl
+ AcQB/QH/ARsBvgH9Af8BGwG+Af0B/wEbAb4B/QH/ARsBvgH9Af8BFAG7Af0B/wEUAbsB/QH/ARkBswH7
+ Af8MAAGEAcQB9gH/AVUBuQH0Af8BrAHrAfoB/wHCAfAB+wH/AcIB8AH7Af8BwgHwAfsB/wHCAfAB+wH/
+ AcIB8AH7Af8BxAGhAYMB/wHgAZUBNgH/Ad0BmAFJAf8B3AG1AaoB/wHVAY8BTAH/AeABlQE2Af8B0AGQ
+ AV4B/4QAAZUBygH5Af8BhwHKAfkB/wE8AdkC/wE8AdkC/wEvAdIC/wEvAdIC/wEvAdIC/wEvAdIC/wEv
+ AdIC/wEsAdEC/wEsAdEC/wEnAc8C/wEnAc8C/wF3Ab8B8QH/CAABiwHHAfYB/wGTAdsB+AH/AW0BzgH2
+ Af8BoQHrAfoB/wGeAekB+gH/AZwB5gH6Af8BnAHmAfoB/wGTAdsB+AH/AawBqAGeAf8B2QGLAToB/wG2
+ AYMBXAH/AZ0BtwHXAf8BrAGNAXoB/wHXAYgBNQH/AdEBnwGCAf+EAAGYAcsB+QH/AWoBvgH4Af8BdQHo
+ Af4B/wFLAeEC/wFLAeEC/wFLAeEC/wFLAeEC/wFHAd8C/wFHAd8C/wFHAd8C/wE8AdkC/wFHAd8C/wFE
+ AdcB/AH/AV0ByAH4Af8MAAGsAesB+gH/AU0BuAH0Af8BXAHbAfYB/wFQAdUB9QH/AUwB0AH1Af8BTAHQ
+ AfUB/wFEAcUB9AH/AUYBugHoAf8BdAGRAZ4B/wFwAaoB4QH/AZQBzAH+Af8BeQG3Ae8B/wF4AZABnwH/
+ AXQBnQHUAf+EAAGYAcsB+QH/AToBugH6Af8BlQHjAf0B/wFcAekC/wFcAekC/wFcAekC/wFcAekC/wFT
+ AeUC/wFTAeUC/wFTAeUC/wFTAeUC/wFTAeUC/wFYAeEB/QH/AYQB6QH9Af8MAAGhAeQB+AH/AWEBwAH1
+ Af8BUAHVAfUB/wE1AcsB8wH/AS0BwAHyAf8BKgG6AfEB/wEpAbgB8QH/ASkBuAHxAf8BMgGlAesB/wGE
+ AcMB/gH/AXsBwAH+Af8BewHAAf4B/wFHAaoB7QH/AUMBrgHvAf+EAAGYAcsB+QH/ATcByQH9Af8BhwHK
+ AfkB/wFvAe4C/wFvAe4C/wFvAe4C/wFrAe4C/wFrAe4C/wFrAe4C/wFkAe0C/wFkAe0C/wFkAe0C/wFr
+ Ae4C/wGfAfwB/gH/AYEBwgHwAf8IAAGWAd0B9wH/AYoB3AH4Af8BTQG4AfQB/wEtAcAB8gH/AS0BwAHy
+ Af8BKgG6AfEB/wEpAbgB8QH/AScBtQHxAf8BMgGpAfEB/wF1AbwB/gH/AW0BuAH+Af8BbQG4Af4B/wFP
+ AZ4B6wH/AUgBmAHgAf8BcwGhAecB/4AAAZgBywH5Af8BTgHYAv8BSAG6AfgB/wHBAfQB/gH/AbUB9AH+
Af8BtQH0Af4B/wG1AfQB/gH/AaUB9AH+Af8BiQHzAv8BiQHzAv8BiQHzAv8BhQHzAv8BhAHpAf0B/wG0
- A/8BgAHUAfgB/wgAAYoB0wH2Af8BngHpAfoB/wFIAa4B8QH/AUUBxQH0Af8BQwG5AfEB/wFBAbQB8AH/
- AUEBtAHwAf8BQQG0AfAB/wFBAbQB8AH/AVMBpAH5Af8BcAG4Af4B/wFkAbEB+gH/AVkBiQG8Af+IAAGY
- AcsB+QH/AWoB5QL/AUUB1wH8Af8BQAHBAfgB/wFAAcEB+AH/AUABwQH4Af8BQAHBAfgB/wF0AcQB+AH/
- Ac0B9wH+Af8BzQH3Af4B/wHBAfQB/gH/AcUB9wH+Af8BwQH0Af4B/wHaAf0B/gH/AcEB9AH+Af8IAAF8
- AckB9QH/AaEB8QH6Af8BjAHhAfcB/wF2AcoB6wH/AV0BqAHOAf8BXAGmAc0B/wFcAaYBzQH/AVgBnwHN
- Af8BWAGfAc0B/wFhAacBygH/AVcBpgHTAf8BfgHDAdwB/wFlAZoB0AH/iAABmAHLAfkB/wGFAfMC/wFp
- AfAC/wFpAfAC/wFpAfAC/wFpAfAC/wFpAfAC/wFgAeIB/AH/AVoBzQH6Af8BWgHNAfoB/wFaAc0B+gH/
- AVoBzQH6Af8BUgG5AfgB/xAAAW8BvwHzAf8BoQHxAfoB/wGhAfEB+gH/AZwB7gH2Af8BeQHAAc4B/wF1
- AbwBywH/AXUBvAHLAf8BdQG8AcsB/wFwAbUBygH/AXABtQHKAf8BcwG5AdEB/wGcAeYB+gH/AWwBrgHs
+ A/8BgAHUAfgB/wgAAYoB0wH2Af8BngHpAfoB/wFHAa4B8QH/AUQBxQH0Af8BQgG5AfEB/wFAAbQB8AH/
+ AUABtAHwAf8BQAG0AfAB/wFAAbQB8AH/AVIBpAH5Af8BbwG4Af4B/wFjAbEB+gH/AVgBiQG8Af+IAAGY
+ AcsB+QH/AWkB5QL/AUQB1wH8Af8BPwHBAfgB/wE/AcEB+AH/AT8BwQH4Af8BPwHBAfgB/wFzAcQB+AH/
+ Ac0B9wH+Af8BzQH3Af4B/wHBAfQB/gH/AcUB9wH+Af8BwQH0Af4B/wHaAf0B/gH/AcEB9AH+Af8IAAF7
+ AckB9QH/AaEB8QH6Af8BjAHhAfcB/wF1AcoB6wH/AVwBqAHOAf8BWwGmAc0B/wFbAaYBzQH/AVcBnwHN
+ Af8BVwGfAc0B/wFgAacBygH/AVYBpgHTAf8BfQHDAdwB/wFkAZoB0AH/iAABmAHLAfkB/wGFAfMC/wFo
+ AfAC/wFoAfAC/wFoAfAC/wFoAfAC/wFoAfAC/wFfAeIB/AH/AVkBzQH6Af8BWQHNAfoB/wFZAc0B+gH/
+ AVkBzQH6Af8BUQG5AfgB/xAAAW4BvwHzAf8BoQHxAfoB/wGhAfEB+gH/AZwB7gH2Af8BeAHAAc4B/wF0
+ AbwBywH/AXQBvAHLAf8BdAG8AcsB/wFvAbUBygH/AW8BtQHKAf8BcgG5AdEB/wGcAeYB+gH/AWsBrgHs
Af+IAAGYAcsB+QH/AaQB/gL/AZAB/gL/AZAB/gL/AZAB/gL/AbQD/wG0A/8BtAP/AbQD/wG0A/8BtAP/
- AbQD/wF7Ac4B+gH/EAABbQG6AfEB/wGxAfMB+QH/AbEB8wH5Af8BsQHzAfkB/wGsAesB+gH/AasB7AH3
- Af8BqwHsAfcB/wGsAesB+gH/Aa8B5wH0Af8BsQHkAfQB/wGxAeQB9AH/AbEB5AH0Af8BewG7Ae8B/4gA
+ AbQD/wF6Ac4B+gH/EAABbAG6AfEB/wGxAfMB+QH/AbEB8wH5Af8BsQHzAfkB/wGsAesB+gH/AasB7AH3
+ Af8BqwHsAfcB/wGsAesB+gH/Aa8B5wH0Af8BsQHkAfQB/wGxAeQB9AH/AbEB5AH0Af8BegG7Ae8B/4gA
AZgBywH5Af8B1AP/AcoD/wHKA/8B1AP/AYcBwgH4Af8wAAGNAbwB8gH/AY0BvAHyAf8BjQG8AfIB/wwA
- AWEBlAHPAf8B2AHzAfYB/wHpAfcB+AH/AekB9wH4Af8B6AH2AfcB/wGIAcEB7wH/jAABlQHKAfkB/wGY
- AcsB+QH/AZgBywH5Af8BkwHIAfkB/1AAAW0BnAHPAf8BbQGcAc8B/wFtAZwBzwH/AWsBlwHKAf8BcgGW
+ AWABlAHPAf8B2AHzAfYB/wHpAfcB+AH/AekB9wH4Af8B6AH2AfcB/wGIAcEB7wH/jAABlQHKAfkB/wGY
+ AcsB+QH/AZgBywH5Af8BkwHIAfkB/1AAAWwBnAHPAf8BbAGcAc8B/wFsAZwBzwH/AWoBlwHKAf8BcQGW
AcgB//8A/wD/AIsAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAT/BAAD/wEB
BQABBwEAAQEFAAEDAQABAQUAAQMBgAEBBQABAwGAAQEFAAEBAYAGAAEBAYABAwUAAQEBgAEDBQABBwGA
AQMFAAEHAYABAwQAAQMB/wHHAQMEAAGHAv8BgwQABP8EAAT/BAAE/wQACw==
Modified: trunk/Tools/Maestro/Maestro/EditorInterface.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/EditorInterface.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/EditorInterface.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -198,6 +198,8 @@
umd.SetFileTypes(filetypes);
if (m_lastPath != null)
umd.SelectedText = m_lastPath;
+ if (startPath != null && startPath.StartsWith("%MG_DATA_PATH_ALIAS["))
+ umd.SelectedText = startPath;
if (umd.ShowDialog(m_editor) == DialogResult.OK)
{
m_lastPath = umd.SelectedText;
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Filebased/Unmanaged.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Filebased/Unmanaged.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Filebased/Unmanaged.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -151,7 +151,7 @@
/*System.Collections.Specialized.NameValueCollection nv = new System.Collections.Specialized.NameValueCollection();
nv.Add(".sdf", "SDF Files (*.sdf)");
nv.Add("", "All files (*.*)");*/
- string f = m_editor.BrowseUnmanagedData(null, m_fileTypes);
+ string f = m_editor.BrowseUnmanagedData(FilepathText.Text, m_fileTypes);
if (f != null)
FilepathText.Text = f;
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/Simple.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/Simple.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/Simple.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -154,7 +154,7 @@
{
NameValueCollection nv = new NameValueCollection();
nv.Add("", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AllFiles);
- string s = m_editor.BrowseUnmanagedData("", nv);
+ string s = m_editor.BrowseUnmanagedData(Filepath.Text, nv);
if (s != null)
Filepath.Text = s;
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/King.KML/Unmanaged.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/King.KML/Unmanaged.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/King.KML/Unmanaged.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -135,7 +135,7 @@
System.Collections.Specialized.NameValueCollection nv = new System.Collections.Specialized.NameValueCollection();
nv.Add(".kml", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.KMLFiles);
nv.Add("", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AllFiles);
- string f = m_editor.BrowseUnmanagedData(null, nv);
+ string f = m_editor.BrowseUnmanagedData(FilePath.Text, nv);
if (f != null)
FilePath.Text = f;
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/Unmanaged.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/Unmanaged.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/Unmanaged.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -160,7 +160,7 @@
nv.Add(".xls", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.ExcelFiles);
nv.Add(".dbf", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.dBaseFiles);
nv.Add("", OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AllFiles);
- string f = m_editor.BrowseUnmanagedData(null, nv);
+ string f = m_editor.BrowseUnmanagedData(FilepathText.Text, nv);
if (f != null)
FilepathText.Text = f;
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/OGR/Unmanaged.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/OGR/Unmanaged.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/OGR/Unmanaged.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -154,7 +154,7 @@
nv.Add(".dgn", ResourceEditors.Strings.Common.DGNFiles);
nv.Add(".s57", ResourceEditors.Strings.Common.S57Files);
nv.Add("", ResourceEditors.Strings.Common.AllFiles);
- string f = m_editor.BrowseUnmanagedData(null, nv);
+ string f = m_editor.BrowseUnmanagedData(FilepathText.Text, nv);
if (f != null)
FilepathText.Text = f;
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ShellIcons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ShellIcons.cs 2009-12-23 20:51:49 UTC (rev 4465)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ShellIcons.cs 2009-12-23 21:21:31 UTC (rev 4466)
@@ -121,15 +121,15 @@
DestroyIcon(shinfo.hIcon);
m_imageList.Images.Add(tmp);
- m_loadedImages.Add(type, m_imageList.Images.Count - 1);
+ m_loadedImages.Add(ext, m_imageList.Images.Count - 1);
}
catch
{
}
}
- if (m_loadedImages.ContainsKey(type))
- return (int)m_loadedImages[type];
+ if (m_loadedImages.ContainsKey(ext))
+ return (int)m_loadedImages[ext];
else
return 0;
}
More information about the mapguide-commits
mailing list