[mapguide-commits] r6999 - in trunk/Tools/Maestro: Maestro.AddIn.ExtendedObjectModels/Editor Maestro.AddIn.ExtendedObjectModels/Templates Maestro.AddIn.Scripting/Services Maestro.AddIn.Scripting/UI Maestro.AddInManager Maestro.Base Maestro.Base/Commands Maestro.Base/Commands/Conditions Maestro.Base/Commands/SiteExplorer Maestro.Base/Commands/Test Maestro.Base/Editor Maestro.Base/Events Maestro.Base/Properties Maestro.Base/Services Maestro.Base/Services/DragDropHandlers Maestro.Base/Templates Maestro.Base/UI Maestro.Base/UI/Preferences RtMapInspector
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 11 05:28:35 PDT 2012
Author: jng
Date: 2012-09-11 05:28:35 -0700 (Tue, 11 Sep 2012)
New Revision: 6999
Added:
trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs
Modified:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingService.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IPEWrapper.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/Paths.cs
trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs
trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs
trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs
trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs
trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddInManager/Strings.resx
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs
trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs
trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs
trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs
trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs
trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs
trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs
trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs
trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs
trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs
trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs
trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs
trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs
trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs
trunk/Tools/Maestro/RtMapInspector/MainForm.Designer.cs
trunk/Tools/Maestro/RtMapInspector/MainForm.resx
Log:
#2110: Localization review of the following:
- Maestro.AddIn.ExtendedObjectModels
- Maestro.AddIn.Scripting
- Maestro.AddInManager
- RtMapInspector
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -31,7 +31,7 @@
public WebLayout110EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "1.1.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "1.1.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -46,7 +46,7 @@
public WebLayout240EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "2.4.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "2.4.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -61,7 +61,7 @@
public LayerDefinition110EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.1.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.1.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -77,7 +77,7 @@
public LayerDefinition120EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.2.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.2.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -93,7 +93,7 @@
public LayerDefinition130EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.3.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.3.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -109,7 +109,7 @@
public LayerDefinition230EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "2.3.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "2.3.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -125,7 +125,7 @@
public LayerDefinition240EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "2.4.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "2.4.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -141,7 +141,7 @@
public MapDefinition230EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "2.3.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "2.3.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -157,7 +157,7 @@
public MapDefinition240EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "2.4.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "2.4.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -173,7 +173,7 @@
public WatermarkDefinition230EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WatermarkDefinition, "2.3.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WatermarkDefinition, "2.3.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -189,7 +189,7 @@
public WatermarkDefinition240EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WatermarkDefinition, "2.4.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WatermarkDefinition, "2.4.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -205,7 +205,7 @@
public LoadProcedure110EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "1.1.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "1.1.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -221,7 +221,7 @@
public LoadProcedure220EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "2.2.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "2.2.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -237,7 +237,7 @@
public SymbolDefinition110EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "1.1.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "1.1.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -252,7 +252,7 @@
public SymbolDefinition240EditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "2.4.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "2.4.0"); //NOXLATE
}
public IEditorViewContent Create()
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -50,7 +50,7 @@
public override OSGeo.MapGuide.MaestroAPI.Resource.IResource CreateItem(string startPoint, OSGeo.MapGuide.MaestroAPI.IServerConnection conn)
{
- return ObjectFactory.CreateMapDefinition(conn, new Version(2, 3, 0), "");
+ return ObjectFactory.CreateMapDefinition(conn, new Version(2, 3, 0), string.Empty);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -50,7 +50,7 @@
public override OSGeo.MapGuide.MaestroAPI.Resource.IResource CreateItem(string startPoint, OSGeo.MapGuide.MaestroAPI.IServerConnection conn)
{
- return ObjectFactory.CreateMapDefinition(conn, new Version(2, 4, 0), "");
+ return ObjectFactory.CreateMapDefinition(conn, new Version(2, 4, 0), string.Empty);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingService.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingService.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -43,7 +43,7 @@
private void InitializeScope(ScriptScope scope)
{
- scope.SetVariable("app", new HostApplication());
+ scope.SetVariable("app", new HostApplication()); //NOXLATE
}
private static ScriptEngine CreateDefaultEngine()
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IPEWrapper.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IPEWrapper.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IPEWrapper.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -108,7 +108,8 @@
if (!string.IsNullOrEmpty(text.Trim()))
{
//sbOutput.Remove(0, sbOutput.Length); //Clear
- text = text.Replace("\\n", "\r\n"); //to support newline for textbox use
+ //to support newline for textbox use
+ text = text.Replace("\\n", "\r\n"); //NOXLATE
sbOutput.Append(text + Environment.NewLine);
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -55,7 +55,7 @@
get { return this; }
}
- public const string ShowIronPythonConsole = "Scripting.ShowIronPythonConsole";
+ public const string ShowIronPythonConsole = "Scripting.ShowIronPythonConsole";//to support newline for textbox use
public bool ApplyChanges()
{
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -37,7 +37,7 @@
{
InitializeComponent();
_console = new IronTextBoxControl();
- _console.Prompt = ">>>";
+ _console.Prompt = ">>>"; //NOXLATE
_console.Dock = DockStyle.Fill;
this.Controls.Add(_console);
@@ -46,7 +46,7 @@
protected override void OnLoad(EventArgs e)
{
- _console.WriteText("help" + Environment.NewLine);
+ _console.WriteText("help" + Environment.NewLine); //NOXLATE
_console.SimEnter();
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -52,7 +52,7 @@
/// <summary>
/// Default prompt text.
/// </summary>
- private string prompt = ">>>";
+ private string prompt = ">>>"; //NOXLATE
/// <summary>
/// Used for storing commands.
@@ -268,7 +268,7 @@
return (string)this.Lines.GetValue(this.Lines.GetLength(0) - 1);
}
else
- return "";
+ return string.Empty;
}
/// <summary>
@@ -439,7 +439,7 @@
//If it is not an empty command, then "fire" the command
if (currentCommand.Length != 0 && this.defStmtBuilder.Length == 0 && !IsRawInput)
{
- if (!currentCommand.Trim().Contains("raw_input"))
+ if (!currentCommand.Trim().Contains("raw_input")) //NOXLATE
printLine();
((IronTextBoxControl)this.Parent).FireCommandEntered(currentCommand);
commandHistory.Add(currentCommand);
@@ -448,7 +448,7 @@
//if we are doing a def statement (currentCommand.EndsWith(":"))
if (this.defStmtBuilder.Length != 0)
{
- if (currentCommand.EndsWith(":"))
+ if (currentCommand.EndsWith(":")) //NOXLATE
{
//we are in the first line of a def, it has already printed to console
@@ -456,17 +456,17 @@
//int asize = Parser.GetNextAutoIndentSize(this.defStmtBuilder.ToString()+"\r\n", 4);
//don't printPrompt();
- ReplaceTextAtPrompt("..." + CreateIndentstring(4));
+ ReplaceTextAtPrompt("..." + CreateIndentstring(4)); //NOXLATE
e.Handled = true;
return;
}
else//We are past the first line, and are indenting or ending a def
{
- this.defStmtBuilder.Append(currentCommand + "\r\n");
+ this.defStmtBuilder.Append(currentCommand + "\r\n"); //NOXLATE
//if it is an empty command let's see if we just finished a def statement
- if (currentCommand.Trim().Equals(""))
+ if (currentCommand.Trim().Equals(string.Empty)) //NOXLATE
{
((IronTextBoxControl)this.Parent).FireCommandEntered(this.defStmtBuilder.ToString().Trim());
commandHistory.Add(this.defStmtBuilder.ToString());
@@ -477,7 +477,7 @@
else
{
//don't printPrompt();
- AddText("\r\n..." + CreateIndentstring(4));
+ AddText("\r\n..." + CreateIndentstring(4)); //NOXLATE
e.Handled = true;
return;
}
@@ -485,14 +485,14 @@
}
//raw_input support...
- if (currentCommand.Trim().Contains("raw_input("))
+ if (currentCommand.Trim().Contains("raw_input(")) //NOXLATE
{
IsRawInput = true;
//Note: if raw_input is in quotes this will not work
//fyi: IronPython.Modules.Builtin.RawInput();
//remove the "\r\n" from IPEWrapper
- this.Text = this.Text.Remove(this.Text.Length - "\r\n".Length, "\r\n".Length);
+ this.Text = this.Text.Remove(this.Text.Length - "\r\n".Length, "\r\n".Length); //NOXLATE
rawprompt = (string)this.Lines.GetValue(this.Lines.Length - 1);
MoveCaretToEndOfText();
@@ -504,20 +504,20 @@
if(IsRawInput)
{
string rawcommand = (string)this.Lines.GetValue(this.Lines.Length - 2);
- rawcommand = rawcommand.Replace(Prompt, "");
+ rawcommand = rawcommand.Replace(Prompt, string.Empty);
string tempprompt = (string)this.Lines.GetValue(this.Lines.Length - 1);
var iptemp = Python.CreateEngine();
//examine to see what type of raw_input
- if (rawcommand.Trim().Equals("raw_input()"))
+ if (rawcommand.Trim().Equals("raw_input()")) //NOXLATE
{
IsRawInput = false;
}
else// s = raw_input('--> ')
{
IsRawInput = false;
- rawprompt = "";
+ rawprompt = string.Empty;
e.Handled = true;
printPrompt();
MoveCaretToEndOfText();
@@ -548,10 +548,10 @@
/// <returns></returns>
public string CreateIndentstring(int indentsize)
{
- string r = "";
+ string r = string.Empty;
for (int i = 0; i < indentsize; i++)
{
- r += " ";
+ r += " "; //NOXLATE
}
return r;
}
@@ -642,7 +642,7 @@
/// <param name="index">index of StringCollection to retrieve.</param>
public string GetStringCollectValue(System.Collections.Specialized.StringCollection inCol, int index)
{
- string value = "";
+ string value = string.Empty;
int count = 0;
System.Collections.Specialized.StringEnumerator myEnumerator = inCol.GetEnumerator();
while (myEnumerator.MoveNext())
@@ -776,7 +776,7 @@
//Create the scope for the ScriptEngine
scope = engine.CreateScope();
//Expose our host application
- scope.SetVariable("app", new Services.HostApplication());
+ scope.SetVariable("app", new Services.HostApplication()); //NOXLATE
//IronTextBox's CommandEntered event
CommandEntered += new EventCommandEntered(irontextboxControl_CommandEntered);
}
@@ -832,17 +832,17 @@
object tempobject;
//Begin IronTextBox evaluation if something there....
- if (command != "")
+ if (command != string.Empty)
{
- if (command == "cls")
+ if (command == "cls") //NOXLATE
this.Clear();
- else if (command.StartsWith("refl "))
+ else if (command.StartsWith("refl ")) //NOXLATE
this.ReflectIdentifier(command.Substring(5), false);
- else if (command.StartsWith("reflw "))
+ else if (command.StartsWith("reflw ")) //NOXLATE
this.ReflectIdentifier(command.Substring(6), true);
- else if (command.StartsWith("printw "))
+ else if (command.StartsWith("printw ")) //NOXLATE
this.PrintIdentifier(command.Substring(7), true);
- else if (command == "history")
+ else if (command == "history") //NOXLATE
{
string[] commands = this.GetCommandHistory();
StringBuilder stringBuilder = new StringBuilder(commands.Length);
@@ -853,29 +853,29 @@
}
this.WriteText(stringBuilder.ToString());
}
- else if (command == "help")
+ else if (command == "help") //NOXLATE
{
this.WriteText(GetHelpText());
}
- else if (command == "newconsole")
+ else if (command == "newconsole") //NOXLATE
{
//consoleTextBox.global_eng = new PythonEngine();
- this.WriteText("Not currently supported\r\n");
+ this.WriteText("Not currently supported\r\n"); //NOXLATE
}
else if (command.StartsWith("prompt") && command.Length == 6)
{
- string[] parts = command.Split(new char[] { '=' });
- if (parts.Length == 2 && parts[0].Trim() == "prompt")
+ string[] parts = command.Split(new char[] { '=' }); //NOXLATE
+ if (parts.Length == 2 && parts[0].Trim() == "prompt") //NOXLATE
this.Prompt = parts[1].Trim();
}
- else if (command == "btaf")
+ else if (command == "btaf") //NOXLATE
{
//btaf = Browse To Append File....
//Check to see if sys is loaded
- if (!DoIPEvaluate("dir()").ToString().Contains("sys"))
+ if (!DoIPEvaluate("dir()").ToString().Contains("sys")) //NOXLATE
{
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("import sys");
+ consoleTextBox.WriteText("import sys"); //NOXLATE
this.SimEnter();
}
@@ -883,34 +883,34 @@
ofd.SelectedPath = Paths.MiscDirs.vs_Projects;
ofd.ShowDialog();
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + ofd.SelectedPath + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + ofd.SelectedPath + "\")"); //NOXLATE
this.SimEnter();
}
- else if (command == "runfile")
+ else if (command == "runfile") //NOXLATE
{
//runfile - Run a .Py file. Calls OpenFileDialog to PythonEngine.RunFile....
// goodfor debuging .y file within IDE
this.Runfile();
}
- else if (command == "btwfi")
+ else if (command == "btwfi") //NOXLATE
{
//btwfi - Browse To Walk FIle. Calls OpenFileDialog.
this.WalkPythonFile();
}
- else if (command == "rew")
+ else if (command == "rew") //NOXLATE
{
//btwfi - Browse To Walk FIle. Calls OpenFileDialog.
StringBuilder SBCode = new StringBuilder();
this.RewritePyFiletoSB(out SBCode);
DoIPExecute(SBCode.ToString()); //transformed object code from a .py
}
- else if (command.StartsWith("paths"))
+ else if (command.StartsWith("paths")) //NOXLATE
{
//Appends all hardcoded common paths stored in Paths
//paths [-arg] - [args: -misc, -python24, -ironpython, -all] (-all=default)
- if (command.Contains(" -"))
+ if (command.Contains(" -")) //NOXLATE
{
- string[] splitcommand = command.Split('-');
+ string[] splitcommand = command.Split('-'); //NOXLATE
splitcommand[1] = splitcommand[1].Trim();
this.ImportPaths(splitcommand[1]);
}
@@ -918,7 +918,7 @@
this.ImportPaths(command.Trim());
}
- else if (command.TrimEnd().EndsWith(":") == true)
+ else if (command.TrimEnd().EndsWith(":") == true) //NOXLATE
{
//Need to do a ReadStatement...
try
@@ -940,14 +940,14 @@
}
defBuilder.Append(line);
- defBuilder.Append("\r\n");
+ defBuilder.Append("\r\n"); //NOXLATE
bool endOfInput = (line.Length == 0);
bool parsingMultiLineString;
bool parsingMultiLineCmpdStmt;
//old//s = ParsetheText(consoleTextBox.global_eng.Sys, new CompilerContext(), defBuilder.ToString(), endOfInput, out parsingMultiLineString, out isMultiLine);
- string[] seperators = new string[] { "\r" };
+ string[] seperators = new string[] { "\r" }; //NOXLATE
string[] allpieces = defBuilder.ToString().Split(seperators, StringSplitOptions.None);
if (/*Options.AutoIndentSize != 0 &&*/ line.Trim().Length == 0)
@@ -983,7 +983,7 @@
catch (Exception err)//catch any errors
{
- this.WriteText("\r\nERROR: " + err.Message);
+ this.WriteText("\r\nERROR: " + err.Message); //NOXLATE
}
}
}
@@ -1001,7 +1001,7 @@
}
catch (Exception ex)
{
- WriteText("ERROR: " + ex.Message);
+ WriteText("ERROR: " + ex.Message); //NOXLATE
}
}
@@ -1011,20 +1011,20 @@
{
dynamic obj = scope.GetVariable(identifier);
var sb = new StringBuilder();
- sb.Append("========= Reflecting " + identifier + " ==========" + Environment.NewLine);
+ sb.Append("========= Reflecting " + identifier + " ==========" + Environment.NewLine); //NOXLATE
Type t = obj.GetType();
- sb.Append("CLR Type: " + t.Name + Environment.NewLine);
- sb.Append("Methods:" + Environment.NewLine);
+ sb.Append("CLR Type: " + t.Name + Environment.NewLine); //NOXLATE
+ sb.Append("Methods:" + Environment.NewLine); //NOXLATE
foreach (var method in t.GetMethods())
{
- sb.Append(" - " + method.ToString() + Environment.NewLine);
+ sb.Append(" - " + method.ToString() + Environment.NewLine); //NOXLATE
}
- sb.Append("Properties:" + Environment.NewLine);
+ sb.Append("Properties:" + Environment.NewLine); //NOXLATE
foreach (var prop in t.GetProperties())
{
- sb.Append(" - " + prop.Name + " (" + prop.PropertyType.Name + ")" + Environment.NewLine);
+ sb.Append(" - " + prop.Name + " (" + prop.PropertyType.Name + ")" + Environment.NewLine); //NOXLATE
}
- sb.Append("========= Reflection complete ==========" + Environment.NewLine);
+ sb.Append("========= Reflection complete ==========" + Environment.NewLine); //NOXLATE
if (newWindow)
new TextWindow(sb.ToString()).ShowDialog();
else
@@ -1032,7 +1032,7 @@
}
catch (Exception ex)
{
- WriteText("ERROR: " + ex.Message);
+ WriteText("ERROR: " + ex.Message); //NOXLATE
}
}
@@ -1044,40 +1044,40 @@
{
string helpText;
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.Append("*******************************************");
+ stringBuilder.Append("*******************************************"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append("** Maestro IronPython Console Help **");
+ stringBuilder.Append("** Maestro IronPython Console Help **"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append("*******************************************");
+ stringBuilder.Append("*******************************************"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- //stringBuilder.Append("You are using " + engine.LanguageDisplayName + " (" + engine.LanguageVersion + ")");
- stringBuilder.Append("You are using " + engine.Setup.DisplayName + " (" + engine.LanguageVersion + ")");
+ //stringBuilder.Append("You are using " + engine.LanguageDisplayName + " (" + engine.LanguageVersion + ")"); //NOXLATE
+ stringBuilder.Append("You are using " + engine.Setup.DisplayName + " (" + engine.LanguageVersion + ")"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append("Commands Available:");
+ stringBuilder.Append("Commands Available:"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" prompt - Changes prompt. Usage: prompt=<desired_prompt>");
+ stringBuilder.Append(" prompt - Changes prompt. Usage: prompt=<desired_prompt>"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" history - prints history of entered commands.");
+ stringBuilder.Append(" history - prints history of entered commands."); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" cls - Clears the screen.");
+ stringBuilder.Append(" cls - Clears the screen."); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
//stringBuilder.Append(" newconsole - Clears the current PythonEngine.");
- stringBuilder.Append(" refl <variable> - Displays all members/properties of a given variable");
+ stringBuilder.Append(" refl <variable> - Displays all members/properties of a given variable"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" reflw <variable> - Displays all members/properties of a given variable to a new window");
+ stringBuilder.Append(" reflw <variable> - Displays all members/properties of a given variable to a new window"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" printw <variable> - Prints the value of the given variable to a new window");
+ stringBuilder.Append(" printw <variable> - Prints the value of the given variable to a new window"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" btaf - Browse To Append Folder. Calls FolderBrowserDialog.");
+ stringBuilder.Append(" btaf - Browse To Append Folder. Calls FolderBrowserDialog."); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" btwfi - Browse To Walk FIle. Calls OpenFileDialog.");
+ stringBuilder.Append(" btwfi - Browse To Walk FIle. Calls OpenFileDialog."); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" paths [-arg] - [args: -misc, -python24, -ironpython, -all] (-all=default)");
+ stringBuilder.Append(" paths [-arg] - [args: -misc, -python24, -ironpython, -all] (-all=default)"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" rew - Re-Write a Python file into a StringBuilder.(for testing)");
+ stringBuilder.Append(" rew - Re-Write a Python file into a StringBuilder.(for testing)"); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
- stringBuilder.Append(" runfile - Run a .Py file. Calls OpenFileDialog to PythonEngine.RunFile.");
+ stringBuilder.Append(" runfile - Run a .Py file. Calls OpenFileDialog to PythonEngine.RunFile."); //NOXLATE
stringBuilder.Append(System.Environment.NewLine);
helpText = stringBuilder.ToString();
return helpText;
@@ -1217,7 +1217,7 @@
{
string filetext = File.ReadAllText(fullpathfilename);
//tabs create a problem when trying to remove comments
- filetext = filetext.Replace("\t", " ");
+ filetext = filetext.Replace("\t", " "); //NOXLATE
// Create an instance of StreamReader to read from a file.
// The using statement also closes the StreamReader.
@@ -1231,16 +1231,16 @@
while ((line = sr.ReadLine()) != null)
{
//if the line is a # comment line, or a single line do not add...
- if (!line.StartsWith("#") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.Equals("\r\n") && line != "")
+ if (!line.StartsWith("#") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.Equals("\r\n") && line != "") //NOXLATE
{
//catch """ comments
- if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\""))
+ if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"")) //NOXLATE
{
//the line may also end with """, so if it is not read until end
if (!IsSingleCommentLine(line))
{
//get to the end of the comments
- while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\""))
+ while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\"")) //NOXLATE
{
//do nothing
}
@@ -1254,13 +1254,13 @@
if (!IsSingleCommentLine(line))
{
//if the line ends with """, then delete """ and read until end
- if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") == line.Length - 3)
+ if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") == line.Length - 3) //NOXLATE
{
//remove """ and reassign line
line = line.Remove(line.Length - 3);
//get to the end of the comments
- while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\""))
+ while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\"")) //NOXLATE
{
//do nothing
}
@@ -1276,7 +1276,7 @@
pos = sb.Length;
//if a blank line, enter previous text as a FuncDef
- if (line == "" && sb.Length != 0)
+ if (line == string.Empty && sb.Length != 0)
{
try //try to find last ""
{
@@ -1297,7 +1297,7 @@
catch (Exception e)
{
// Let the user know what went wrong.
- consoleTextBox.WriteText("The file could not be read:");
+ consoleTextBox.WriteText("The file could not be read:"); //NOXLATE
consoleTextBox.WriteText(e.Message);
}
@@ -1311,22 +1311,22 @@
try
{
//See if sys is imported...
- if (!DoIPEvaluate("dir()").ToString().Contains("sys"))
+ if (!DoIPEvaluate("dir()").ToString().Contains("sys")) //NOXLATE
{
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("import sys");
+ consoleTextBox.WriteText("import sys"); //NOXLATE
this.SimEnter();
}
//Browse to the file...
OpenFileDialog ofd = new OpenFileDialog();
ofd.InitialDirectory = Paths.MiscDirs.vs_Projects;
- ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*";
+ ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*"; //NOXLATE
ofd.ShowDialog();
//Ask the user if they would like to append the path
- string message = "Do you need to append the folder:\r\n" + Path.GetDirectoryName(Path.GetFullPath(ofd.FileName)) + "\r\n\r\nto the PythonEngine?";
- string caption = "Append Folder Path";
+ string message = "Do you need to append the folder:\r\n" + Path.GetDirectoryName(Path.GetFullPath(ofd.FileName)) + "\r\n\r\nto the PythonEngine?"; //NOXLATE
+ string caption = "Append Folder Path"; //NOXLATE
MessageBoxButtons buttons = MessageBoxButtons.YesNo;
DialogResult result;
@@ -1335,14 +1335,14 @@
if (result == DialogResult.Yes)
{
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + Path.GetDirectoryName(Path.GetFullPath(ofd.FileName)) + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + Path.GetDirectoryName(Path.GetFullPath(ofd.FileName)) + "\")"); //NOXLATE
this.SimEnter();
//Keep asking until No
while (result.Equals(DialogResult.Yes))
{
//Ask the user if more folders are needed to be appended
- message = "Do you need to append another folder?";
+ message = "Do you need to append another folder?"; //NOXLATE
result = MessageBox.Show(this, message, caption, buttons);
if (result == DialogResult.Yes)
{
@@ -1350,7 +1350,7 @@
fbd.SelectedPath = Path.GetDirectoryName(Path.GetFullPath(ofd.FileName));
fbd.ShowDialog();
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + fbd.SelectedPath + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + fbd.SelectedPath + "\")"); //NOXLATE
this.SimEnter();
}
}
@@ -1361,7 +1361,7 @@
catch (Exception e)
{
// Let the user know what went wrong.
- consoleTextBox.WriteText("The file could not be read:");
+ consoleTextBox.WriteText("The file could not be read:"); //NOXLATE
consoleTextBox.WriteText(e.Message);
}
}
@@ -1376,7 +1376,7 @@
//Browse to the file...
OpenFileDialog ofd = new OpenFileDialog();
ofd.InitialDirectory = Paths.MiscDirs.vs_Projects;
- ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*";
+ ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*"; //NOXLATE
ofd.ShowDialog();
DoIPExecuteFile(ofd.FileName);
@@ -1384,7 +1384,7 @@
}
catch (Exception ex)
{
- consoleTextBox.WriteText("The file could not be read:");
+ consoleTextBox.WriteText("The file could not be read:"); //NOXLATE
consoleTextBox.WriteText(ex.Message);
}
@@ -1399,17 +1399,17 @@
StringBuilder sb = new StringBuilder();
//See if sys is imported...
- if (!DoIPEvaluate("dir()").ToString().Contains("sys"))
+ if (!DoIPEvaluate("dir()").ToString().Contains("sys")) //NOXLATE
{
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("import sys");
+ consoleTextBox.WriteText("import sys"); //NOXLATE
this.SimEnter();
}
//Browse to the file...
OpenFileDialog ofd = new OpenFileDialog();
ofd.InitialDirectory = Paths.MiscDirs.vs_Projects;
- ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*";
+ ofd.Filter = "Python files (*.py)|*.py|All files (*.*)|*.*"; //NOXLATE
ofd.ShowDialog();
try
@@ -1439,16 +1439,16 @@
/////temp testing
//if the line is a # comment line, or a single line do not add...
- if (!line.StartsWith("#") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.Equals("\r\n") && line != "")
+ if (!line.StartsWith("#") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.StartsWith(" #") && !line.Equals("\r\n") && line != "") //NOXLATE
{
//catch """ comments
- if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\""))
+ if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"")) //NOXLATE
{
//the line may also end with """, so if it is not read until end
if (!IsSingleCommentLine(line))
{
//get to the end of the comments
- while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\""))
+ while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\"")) //NOXLATE
{
//do nothing
}
@@ -1462,13 +1462,13 @@
if (!IsSingleCommentLine(line))
{
//if the line ends with """, then delete """ and read until end
- if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") == line.Length - 3)
+ if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") == line.Length - 3) //NOXLATE
{
//remove """ and reassign line
line = line.Remove(line.Length - 3);
//get to the end of the comments
- while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\""))
+ while (!sr.ReadLine().TrimEnd().EndsWith("\"\"\"")) //NOXLATE
{
//do nothing
}
@@ -1484,7 +1484,7 @@
catch (Exception e)
{
// Let the user know what went wrong.
- consoleTextBox.WriteText("The file could not be read:");
+ consoleTextBox.WriteText("The file could not be read:"); //NOXLATE
consoleTextBox.WriteText(e.Message);
}
@@ -1501,13 +1501,13 @@
//Trim the end of the line because sometimes whitespace after """
line = line.TrimEnd();
- if (line.StartsWith("#") || line.StartsWith(" #") || line.StartsWith(" #") || line.StartsWith(" #") && line != "")
+ if (line.StartsWith("#") || line.StartsWith(" #") || line.StartsWith(" #") || line.StartsWith(" #") && line != "") //NOXLATE
{
return true;
}
- else if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\""))
+ else if (line.StartsWith("\"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"") || line.StartsWith(" \"\"\"")) //NOXLATE
{
- if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") != line.Length - 3)
+ if (line.TrimEnd().EndsWith("\"\"\"") && line.IndexOf("\"\"\"") != line.Length - 3) //NOXLATE
{
return true;
}
@@ -1581,10 +1581,10 @@
SCEIronPythonDirs.Reset();
//Check to see if sys is loaded
- if (!DoIPEvaluate("dir()").ToString().Contains("sys"))
+ if (!DoIPEvaluate("dir()").ToString().Contains("sys")) //NOXLATE
{
consoleTextBox.printPrompt();
- consoleTextBox.WriteText("import sys");
+ consoleTextBox.WriteText("import sys"); //NOXLATE
this.SimEnter();
}
else
@@ -1595,65 +1595,65 @@
{
switch (arg)
{
- case "misc":
+ case "misc": //NOXLATE
{
while (SCEMiscDirs.MoveNext())
{
//consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + SCEMiscDirs.Current + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + SCEMiscDirs.Current + "\")"); //NOXLATE
this.SimEnter();
}
break;
}
- case "python24":
+ case "python24": //NOXLATE
{
while (SCEPython24Dirs.MoveNext())
{
//consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + SCEPython24Dirs.Current + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + SCEPython24Dirs.Current + "\")"); //NOXLATE
this.SimEnter();
}
break;
}
- case "ironpython":
+ case "ironpython": //NOXLATE
{
while (SCEIronPythonDirs.MoveNext())
{
//consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + SCEIronPythonDirs.Current + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + SCEIronPythonDirs.Current + "\")"); //NOXLATE
this.SimEnter();
}
break;
}
- case "all":
+ case "all": //NOXLATE
{
while (SCEAll.MoveNext())
{
//consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + SCEAll.Current + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + SCEAll.Current + "\")"); //NOXLATE
this.SimEnter();
}
break;
}
- case "paths":
+ case "paths": //NOXLATE
{
while (SCEAll.MoveNext())
{
//consoleTextBox.printPrompt();
- consoleTextBox.WriteText("sys.path.append(\"" + SCEAll.Current + "\")");
+ consoleTextBox.WriteText("sys.path.append(\"" + SCEAll.Current + "\")"); //NOXLATE
this.SimEnter();
}
break;
}
default:
- consoleTextBox.WriteText("Invalid arg. Only: -misc, -python24, -ironpython, -all");
+ consoleTextBox.WriteText("Invalid arg. Only: -misc, -python24, -ironpython, -all"); //NOXLATE
break;
}
}
catch (Exception e)
{
// Let the user know what went wrong.
- consoleTextBox.WriteText("ImportPaths error: ");
+ consoleTextBox.WriteText("ImportPaths error: "); //NOXLATE
consoleTextBox.WriteText(e.Message);
}
}
@@ -1733,33 +1733,33 @@
switch (itstype.FullName)
{
- case "IronPython.Runtime.PythonDictionary":
+ case "IronPython.Runtime.PythonDictionary": //NOXLATE
PythonDictionary IPDict = new PythonDictionary();
IPDict = (PythonDictionary)inobject;
MessageBox.Show(IPDict.ToString());
break;
- case "IronPython.Runtime.List":
+ case "IronPython.Runtime.List": //NOXLATE
List IPList = new List();
IPList = (List)inobject;
MessageBox.Show(IPList.ToString());
break;
- case "System.String":
+ case "System.String": //NOXLATE
MessageBox.Show(inobject.ToString());
break;
- case "System.Int32":
+ case "System.Int32": //NOXLATE
MessageBox.Show(Convert.ToString(inobject));
break;
- case "System.Collections.Specialized.StringCollection":
+ case "System.Collections.Specialized.StringCollection": //NOXLATE
StringCollection IPSC = new StringCollection();
IPSC = (StringCollection)inobject;
StringEnumerator SCE = IPSC.GetEnumerator();
- string output = "";
+ string output = string.Empty;
while (SCE.MoveNext())
output += SCE.Current.ToString();
MessageBox.Show(output);
break;
default:
- MessageBox.Show(inobject.GetType().ToString() + " not yet implemented.");
+ MessageBox.Show(inobject.GetType().ToString() + " not yet implemented."); //NOXLATE
break;
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/Paths.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/Paths.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/Paths.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -43,19 +43,19 @@
/// MIT's ConceptNet 2.1 directory.
/// default: "...MyDocuments) + @"\Python Projects\conceptnet2.1"
/// </summary>
- public static string ConceptNet = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Python Projects\conceptnet2.1";
+ public static string ConceptNet = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Python Projects\conceptnet2.1"; //NOXLATE
/// <summary>
/// MIT's MontyLingua directory.
/// default: "...MyDocuments) + @"\Python Projects\conceptnet2.1\montylingua"
/// </summary>
- public static string montylingua = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Python Projects\conceptnet2.1\montylingua";
+ public static string montylingua = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Python Projects\conceptnet2.1\montylingua"; //NOXLATE
/// <summary>
/// Visual Studio\Projects Folder.
/// default: "..MyDocuments) + @"\Visual Studio 2008\Projects"
/// </summary>
- public static string vs_Projects = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Visual Studio 2008\Projects";
+ public static string vs_Projects = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Visual Studio 2008\Projects"; //NOXLATE
/*
/// <summary>
@@ -92,35 +92,35 @@
/// Folder to Python library modules.
/// default: "C:\Python24\Lib"
/// </summary>
- public static string Python24_Lib = @"C:\Python24\Lib";
+ public static string Python24_Lib = @"C:\Python24\Lib"; //NOXLATE
/// <summary>
/// Folder to Tkinter library modules.
/// default: "C:\Python24\Lib\lib-tk"
/// </summary>
- public static string Python24_Lib_lib_tk = @"C:\Python24\Lib\lib-tk";
+ public static string Python24_Lib_lib_tk = @"C:\Python24\Lib\lib-tk"; //NOXLATE
/// <summary>
/// default: "C:\Python24\libs"
/// </summary>
- public static string Python24_libs = @"C:\Python24\libs";
+ public static string Python24_libs = @"C:\Python24\libs"; //NOXLATE
/// <summary>
/// default: "C:\Python24\DLLs"
/// </summary>
- public static string Python24_DLLs = @"C:\Python24\DLLs";
+ public static string Python24_DLLs = @"C:\Python24\DLLs"; //NOXLATE
/// <summary>
/// Some useful programs written in Python.
/// default: "C:\Python24\Tools"
/// </summary>
- public static string Python24_Tools = @"C:\Python24\Tools";
+ public static string Python24_Tools = @"C:\Python24\Tools"; //NOXLATE
/// <summary>
/// Some useful programs written in Python.
/// default: "C:\Python24\Tools\Scripts"
/// </summary>
- public static string Python24_Tools_Scripts = @"C:\Python24\Tools\Scripts";
+ public static string Python24_Tools_Scripts = @"C:\Python24\Tools\Scripts"; //NOXLATE
/*
/// <summary>
@@ -160,35 +160,35 @@
/// Folder to Python library modules.
/// default: "C:\Python25\Lib"
/// </summary>
- public static string Python25_Lib = @"C:\Python25\Lib";
+ public static string Python25_Lib = @"C:\Python25\Lib"; //NOXLATE
/// <summary>
/// Folder to Tkinter library modules.
/// default: "C:\Python25\Lib\lib-tk"
/// </summary>
- public static string Python25_Lib_lib_tk = @"C:\Python25\Lib\lib-tk";
+ public static string Python25_Lib_lib_tk = @"C:\Python25\Lib\lib-tk"; //NOXLATE
/// <summary>
/// default: "C:\Python25\libs"
/// </summary>
- public static string Python25_libs = @"C:\Python25\libs";
+ public static string Python25_libs = @"C:\Python25\libs"; //NOXLATE
/// <summary>
/// default: "C:\Python25\DLLs"
/// </summary>
- public static string Python25_DLLs = @"C:\Python25\DLLs";
+ public static string Python25_DLLs = @"C:\Python25\DLLs"; //NOXLATE
/// <summary>
/// Some useful programs written in Python.
/// default: "C:\Python25\Tools"
/// </summary>
- public static string Python25_Tools = @"C:\Python25\Tools";
+ public static string Python25_Tools = @"C:\Python25\Tools"; //NOXLATE
/// <summary>
/// Some useful programs written in Python.
/// default: "C:\Python25\Tools\Scripts"
/// </summary>
- public static string Python25_Tools_Scripts = @"C:\Python25\Tools\Scripts";
+ public static string Python25_Tools_Scripts = @"C:\Python25\Tools\Scripts"; //NOXLATE
/*
/// <summary>
@@ -233,7 +233,7 @@
/// IronPython Tutorial scripts.
/// default: "...MyDocuments) + @"\Visual Studio 2008\Projects\IronPython-2.0B2\Tutorial"
/// </summary>
- public static string IronPython_Tutorial = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Visual Studio 2008\Projects\IronPython-2.0B2\Tutorial";
+ public static string IronPython_Tutorial = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Visual Studio 2008\Projects\IronPython-2.0B2\Tutorial"; //NOXLATE
/// <summary>
/// IronPython Paths
Modified: trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -10,207 +10,209 @@
namespace ICSharpCode.AddInManager
{
- public class AboutForm : System.Windows.Forms.Form
- {
- Font boldFont;
-
- public AboutForm(AddIn addIn)
- {
- //
- // The InitializeComponent() call is required for Windows Forms designer support.
- //
- InitializeComponent();
-
- boldFont = new Font(Font, FontStyle.Bold);
-
- List<string> titles = new List<string>();
- List<string> values = new List<string>();
-
- this.Text = addIn.Name;
- closeButton.Text = ResourceService.GetString("Global.CloseButtonText");
-
- titles.Add("AddIn name");
- values.Add(addIn.Name);
-
- if (addIn.Manifest.PrimaryVersion != null && addIn.Manifest.PrimaryVersion.ToString() != "0.0.0.0") {
- titles.Add("Version");
- values.Add(addIn.Manifest.PrimaryVersion.ToString());
- }
-
- if (addIn.Properties["author"].Length > 0) {
- titles.Add("Author");
- values.Add(addIn.Properties["author"]);
- }
-
- if (addIn.Properties["copyright"].Length > 0) {
- if (!addIn.Properties["copyright"].StartsWith("prj:")) {
- titles.Add("Copyright");
- values.Add(addIn.Properties["copyright"]);
- }
- }
-
- if (addIn.Properties["license"].Length > 0) {
- titles.Add("License");
- values.Add(addIn.Properties["license"]);
- }
-
- if (addIn.Properties["url"].Length > 0) {
- titles.Add("Website");
- values.Add(addIn.Properties["url"]);
- }
-
- if (addIn.Properties["description"].Length > 0) {
- titles.Add("Description");
- values.Add(addIn.Properties["description"]);
- }
-
- titles.Add("AddIn file");
- values.Add(FileUtility.NormalizePath(addIn.FileName));
-
- titles.Add("Internal name");
- values.Add(addIn.Manifest.PrimaryIdentity);
-
- table.RowCount = titles.Count + 1;
- table.RowStyles.Clear();
- for (int i = 0; i < titles.Count; i++) {
- table.RowStyles.Add(new RowStyle(SizeType.AutoSize));
- AddRow(titles[i], values[i], i);
- }
- }
-
- protected override void Dispose(bool disposing)
- {
- base.Dispose(disposing);
- if (disposing) {
- if (boldFont != null)
- boldFont.Dispose();
- }
- }
-
- void AddRow(string desc, string val, int rowIndex)
- {
- Label descLabel = new Label();
- descLabel.AutoSize = true;
- descLabel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- descLabel.Font = boldFont;
- descLabel.Text = StringParser.Parse(desc) + ":";
- table.Controls.Add(descLabel, 0, rowIndex);
-
- Label valLabel;
- string link = GetLink(val);
- if (link != null) {
- LinkLabel linkLabel = new LinkLabel();
- linkLabel.LinkClicked += delegate {
- try {
- System.Diagnostics.Process.Start(link);
- } catch (Exception ex) {
- MessageService.ShowMessage(ex.ToString());
- }
- };
- valLabel = linkLabel;
- } else {
- valLabel = new Label();
- }
- valLabel.AutoSize = true;
- valLabel.Text = val;
- table.Controls.Add(valLabel, 1, rowIndex);
- }
-
- string GetLink(string text)
- {
- if (text == null)
- return null;
- switch (text) {
- case "GNU General Public License":
- case "GPL":
- return "http://www.gnu.org/licenses/gpl.html";
- case "LGPL":
- case "GNU Lesser General Public License":
- return "http://www.gnu.org/licenses/lgpl.html";
- default:
- if (text.StartsWith("http://"))
- return text;
- if (text.StartsWith("www."))
- return "http://" + text;
- return null;
- }
- }
-
- #region Windows Forms Designer generated code
- /// <summary>
- /// This method is required for Windows Forms designer support.
- /// Do not change the method contents inside the source code editor. The Forms designer might
- /// not be able to load this method if it was changed manually.
- /// </summary>
- private void InitializeComponent()
- {
- System.Windows.Forms.Panel bottomPanel;
- this.closeButton = new System.Windows.Forms.Button();
- this.table = new System.Windows.Forms.TableLayoutPanel();
- bottomPanel = new System.Windows.Forms.Panel();
- bottomPanel.SuspendLayout();
- this.SuspendLayout();
- //
- // bottomPanel
- //
- bottomPanel.Controls.Add(this.closeButton);
- bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
- bottomPanel.Location = new System.Drawing.Point(0, 233);
- bottomPanel.Name = "bottomPanel";
- bottomPanel.Size = new System.Drawing.Size(351, 35);
- bottomPanel.TabIndex = 0;
- //
- // closeButton
- //
- this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.closeButton.Location = new System.Drawing.Point(264, 6);
- this.closeButton.Name = "closeButton";
- this.closeButton.Size = new System.Drawing.Size(75, 23);
- this.closeButton.TabIndex = 0;
- this.closeButton.Text = "Close";
- this.closeButton.UseCompatibleTextRendering = true;
- this.closeButton.UseVisualStyleBackColor = true;
- this.closeButton.Click += new System.EventHandler(this.CloseButtonClick);
- //
- // table
- //
- this.table.ColumnCount = 2;
- this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.table.Dock = System.Windows.Forms.DockStyle.Fill;
- this.table.Location = new System.Drawing.Point(0, 8);
- this.table.Name = "table";
- this.table.RowCount = 2;
- this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.table.Size = new System.Drawing.Size(351, 225);
- this.table.TabIndex = 1;
- //
- // AboutForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.SystemColors.Info;
- this.ClientSize = new System.Drawing.Size(351, 268);
- this.Controls.Add(this.table);
- this.Controls.Add(bottomPanel);
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "AboutForm";
- this.Padding = new System.Windows.Forms.Padding(0, 8, 0, 0);
- this.ShowInTaskbar = false;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "AboutForm";
- bottomPanel.ResumeLayout(false);
- this.ResumeLayout(false);
- }
- private System.Windows.Forms.Button closeButton;
- private System.Windows.Forms.TableLayoutPanel table;
- #endregion
-
- void CloseButtonClick(object sender, EventArgs e)
- {
- Close();
- }
- }
+ using Str = Maestro.AddInManager.Strings;
+
+ public class AboutForm : System.Windows.Forms.Form
+ {
+ Font boldFont;
+
+ public AboutForm(AddIn addIn)
+ {
+ //
+ // The InitializeComponent() call is required for Windows Forms designer support.
+ //
+ InitializeComponent();
+
+ boldFont = new Font(Font, FontStyle.Bold);
+
+ List<string> titles = new List<string>();
+ List<string> values = new List<string>();
+
+ this.Text = addIn.Name;
+ closeButton.Text = ResourceService.GetString("Global.CloseButtonText"); //NOXLATE
+
+ titles.Add(Str.TitleAddInFile);
+ values.Add(addIn.Name);
+
+ if (addIn.Manifest.PrimaryVersion != null && addIn.Manifest.PrimaryVersion.ToString() != "0.0.0.0") {
+ titles.Add(Str.TitleVersion);
+ values.Add(addIn.Manifest.PrimaryVersion.ToString());
+ }
+
+ if (addIn.Properties["author"].Length > 0) {
+ titles.Add(Str.TitleAuthor);
+ values.Add(addIn.Properties["author"]);
+ }
+
+ if (addIn.Properties["copyright"].Length > 0) {
+ if (!addIn.Properties["copyright"].StartsWith("prj:")) {
+ titles.Add(Str.TitleCopyright);
+ values.Add(addIn.Properties["copyright"]);
+ }
+ }
+
+ if (addIn.Properties["license"].Length > 0) {
+ titles.Add(Str.TitleLicense);
+ values.Add(addIn.Properties["license"]);
+ }
+
+ if (addIn.Properties["url"].Length > 0) {
+ titles.Add(Str.TitleWebsite);
+ values.Add(addIn.Properties["url"]);
+ }
+
+ if (addIn.Properties["description"].Length > 0) {
+ titles.Add(Str.TitleDescription);
+ values.Add(addIn.Properties["description"]);
+ }
+
+ titles.Add(Str.TitleAddInFile);
+ values.Add(FileUtility.NormalizePath(addIn.FileName));
+
+ titles.Add(Str.TitleInternalName);
+ values.Add(addIn.Manifest.PrimaryIdentity);
+
+ table.RowCount = titles.Count + 1;
+ table.RowStyles.Clear();
+ for (int i = 0; i < titles.Count; i++) {
+ table.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+ AddRow(titles[i], values[i], i);
+ }
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ base.Dispose(disposing);
+ if (disposing) {
+ if (boldFont != null)
+ boldFont.Dispose();
+ }
+ }
+
+ void AddRow(string desc, string val, int rowIndex)
+ {
+ Label descLabel = new Label();
+ descLabel.AutoSize = true;
+ descLabel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ descLabel.Font = boldFont;
+ descLabel.Text = StringParser.Parse(desc) + ":"; //NOXLATE
+ table.Controls.Add(descLabel, 0, rowIndex);
+
+ Label valLabel;
+ string link = GetLink(val);
+ if (link != null) {
+ LinkLabel linkLabel = new LinkLabel();
+ linkLabel.LinkClicked += delegate {
+ try {
+ System.Diagnostics.Process.Start(link);
+ } catch (Exception ex) {
+ MessageService.ShowMessage(ex.ToString());
+ }
+ };
+ valLabel = linkLabel;
+ } else {
+ valLabel = new Label();
+ }
+ valLabel.AutoSize = true;
+ valLabel.Text = val;
+ table.Controls.Add(valLabel, 1, rowIndex);
+ }
+
+ string GetLink(string text)
+ {
+ if (text == null)
+ return null;
+ switch (text) {
+ case "GNU General Public License": //NOXLATE
+ case "GPL": //NOXLATE
+ return "http://www.gnu.org/licenses/gpl.html"; //NOXLATE
+ case "LGPL": //NOXLATE
+ case "GNU Lesser General Public License": //NOXLATE
+ return "http://www.gnu.org/licenses/lgpl.html"; //NOXLATE
+ default:
+ if (text.StartsWith("http://")) //NOXLATE
+ return text;
+ if (text.StartsWith("www.")) //NOXLATE
+ return "http://" + text; //NOXLATE
+ return null;
+ }
+ }
+
+ #region Windows Forms Designer generated code
+ /// <summary>
+ /// This method is required for Windows Forms designer support.
+ /// Do not change the method contents inside the source code editor. The Forms designer might
+ /// not be able to load this method if it was changed manually.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.Panel bottomPanel;
+ this.closeButton = new System.Windows.Forms.Button();
+ this.table = new System.Windows.Forms.TableLayoutPanel();
+ bottomPanel = new System.Windows.Forms.Panel();
+ bottomPanel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // bottomPanel
+ //
+ bottomPanel.Controls.Add(this.closeButton);
+ bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+ bottomPanel.Location = new System.Drawing.Point(0, 233);
+ bottomPanel.Name = "bottomPanel";
+ bottomPanel.Size = new System.Drawing.Size(351, 35);
+ bottomPanel.TabIndex = 0;
+ //
+ // closeButton
+ //
+ this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.closeButton.Location = new System.Drawing.Point(264, 6);
+ this.closeButton.Name = "closeButton";
+ this.closeButton.Size = new System.Drawing.Size(75, 23);
+ this.closeButton.TabIndex = 0;
+ this.closeButton.Text = "Close";
+ this.closeButton.UseCompatibleTextRendering = true;
+ this.closeButton.UseVisualStyleBackColor = true;
+ this.closeButton.Click += new System.EventHandler(this.CloseButtonClick);
+ //
+ // table
+ //
+ this.table.ColumnCount = 2;
+ this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.table.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.table.Location = new System.Drawing.Point(0, 8);
+ this.table.Name = "table";
+ this.table.RowCount = 2;
+ this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.table.Size = new System.Drawing.Size(351, 225);
+ this.table.TabIndex = 1;
+ //
+ // AboutForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.SystemColors.Info;
+ this.ClientSize = new System.Drawing.Size(351, 268);
+ this.Controls.Add(this.table);
+ this.Controls.Add(bottomPanel);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "AboutForm";
+ this.Padding = new System.Windows.Forms.Padding(0, 8, 0, 0);
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "AboutForm";
+ bottomPanel.ResumeLayout(false);
+ this.ResumeLayout(false);
+ }
+ private System.Windows.Forms.Button closeButton;
+ private System.Windows.Forms.TableLayoutPanel table;
+ #endregion
+
+ void CloseButtonClick(object sender, EventArgs e)
+ {
+ Close();
+ }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -47,7 +47,7 @@
{
this.addIn = addIn;
this.BackColor = SystemColors.Window;
- this.ContextMenuStrip = MenuService.CreateContextMenu(this, "/AddIns/AddInManager/ContextMenu");
+ this.ContextMenuStrip = MenuService.CreateContextMenu(this, "/AddIns/AddInManager/ContextMenu"); //NOXLATE
isExternal = !FileUtility.IsBaseDirectory(FileUtility.ApplicationRootPath, addIn.FileName)
&& !FileUtility.IsBaseDirectory(PropertyService.ConfigDirectory, addIn.FileName);
@@ -140,12 +140,12 @@
Brush textBrush;
string description = GetText(out textBrush);
int titleWidth;
- using (Font boldFont = new Font("Arial", 8, FontStyle.Bold))
+ using (Font boldFont = new Font("Arial", 8, FontStyle.Bold)) //NOXLATE
{
g.DrawString(addIn.Name, boldFont, textBrush, innerMargin, innerMargin);
titleWidth = (int)g.MeasureString(addIn.Name, boldFont).Width + 1;
}
- if (addIn.Version != null && addIn.Version.ToString() != "0.0.0.0")
+ if (addIn.Version != null && addIn.Version.ToString() != "0.0.0.0") //NOXLATE
{
g.DrawString(addIn.Version.ToString(), Font, textBrush, innerMargin + titleWidth + 4, innerMargin);
}
@@ -187,34 +187,34 @@
if (addIn.Enabled)
{
textBrush = SystemBrushes.ControlText;
- return addIn.Properties["description"];
+ return addIn.Properties["description"]; //NOXLATE
}
else
{
textBrush = SystemBrushes.ActiveCaption;
- return ResourceService.GetString("AddInManager.AddInEnabled");
+ return ResourceService.GetString("AddInManager.AddInEnabled"); //NOXLATE
}
case AddInAction.Disable:
textBrush = SystemBrushes.GrayText;
if (addIn.Enabled)
- return ResourceService.GetString("AddInManager.AddInWillBeDisabled");
+ return ResourceService.GetString("AddInManager.AddInWillBeDisabled"); //NOXLATE
else
- return ResourceService.GetString("AddInManager.AddInDisabled");
+ return ResourceService.GetString("AddInManager.AddInDisabled"); //NOXLATE
case AddInAction.Install:
textBrush = SystemBrushes.ActiveCaption;
- return ResourceService.GetString("AddInManager.AddInInstalled");
+ return ResourceService.GetString("AddInManager.AddInInstalled"); //NOXLATE
case AddInAction.Uninstall:
textBrush = SystemBrushes.GrayText;
- return ResourceService.GetString("AddInManager.AddInRemoved");
+ return ResourceService.GetString("AddInManager.AddInRemoved"); //NOXLATE
case AddInAction.Update:
textBrush = SystemBrushes.ActiveCaption;
- return ResourceService.GetString("AddInManager.AddInUpdated");
+ return ResourceService.GetString("AddInManager.AddInUpdated"); //NOXLATE
case AddInAction.InstalledTwice:
textBrush = Brushes.Red;
- return ResourceService.GetString("AddInManager.AddInInstalledTwice");
+ return ResourceService.GetString("AddInManager.AddInInstalledTwice"); //NOXLATE
case AddInAction.DependencyError:
textBrush = Brushes.Red;
- return ResourceService.GetString("AddInManager.AddInDependencyFailed");
+ return ResourceService.GetString("AddInManager.AddInDependencyFailed"); //NOXLATE
case AddInAction.CustomError:
textBrush = Brushes.Red;
return StringParser.Parse(addIn.CustomErrorMessage);
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -44,9 +44,9 @@
{
public bool IsValid(object caller, Condition condition)
{
- string states = condition.Properties["states"];
+ string states = condition.Properties["states"]; //NOXLATE
string action = ((AddInControl)caller).AddIn.Action.ToString();
- foreach (string state in states.Split(','))
+ foreach (string state in states.Split(',')) //NOXLATE
{
if (state == action)
return true;
@@ -101,15 +101,15 @@
{
get
{
- return ((AddInControl)Owner).AddIn.Properties["url"].Length > 0;
+ return ((AddInControl)Owner).AddIn.Properties["url"].Length > 0; //NOXLATE
}
}
public override void Run()
{
- try {
- System.Diagnostics.Process.Start(((AddInControl)Owner).AddIn.Properties["url"]);
- } catch {}
+ try {
+ System.Diagnostics.Process.Start(((AddInControl)Owner).AddIn.Properties["url"]); //NOXLATE
+ } catch {}
ManagerForm.Instance.Close();
}
}
Modified: trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -61,11 +61,11 @@
//
InitializeComponent();
- installButton.Text = ResourceService.GetString("AddInManager.InstallButton");
- uninstallButton.Text = ResourceService.GetString("AddInManager.ActionUninstall");
- closeButton.Text = ResourceService.GetString("TextClose");
- showPreinstalledAddInsCheckBox.Text = ResourceService.GetString("AddInManager.ShowPreinstalledAddIns");
- this.Text = ResourceService.GetString("AddInManager.Title");
+ installButton.Text = ResourceService.GetString("AddInManager.InstallButton"); //NOXLATE
+ uninstallButton.Text = ResourceService.GetString("AddInManager.ActionUninstall"); //NOXLATE
+ closeButton.Text = ResourceService.GetString("TextClose"); //NOXLATE
+ showPreinstalledAddInsCheckBox.Text = ResourceService.GetString("AddInManager.ShowPreinstalledAddIns"); //NOXLATE
+ this.Text = ResourceService.GetString("AddInManager.Title"); //NOXLATE
RightToLeftConverter.ConvertRecursive(this);
CreateAddInList();
@@ -78,7 +78,7 @@
Rectangle rect = splitContainer.Panel1.ClientRectangle;
rect.Offset(16, 16);
rect.Inflate(-32, -32);
- e.Graphics.DrawString(ResourceService.GetString("AddInManager.NoAddInsInstalled"),
+ e.Graphics.DrawString(ResourceService.GetString("AddInManager.NoAddInsInstalled"), //NOXLATE
Font, SystemBrushes.WindowText, rect);
}
}
@@ -97,7 +97,7 @@
foreach (AddIn addIn in addInList)
{
string identity = addIn.Manifest.PrimaryIdentity;
- if (addIn.Properties["addInManagerHidden"] == "true")
+ if (addIn.Properties["addInManagerHidden"] == "true") //NOXLATE
continue;
addInControl = new AddInControl(addIn);
addInControl.Dock = DockStyle.Top;
@@ -112,7 +112,7 @@
}
ShowPreinstalledAddInsCheckBoxCheckedChanged(null, null);
- showPreinstalledAddInsCheckBox.Checked = true;
+ showPreinstalledAddInsCheckBox.Checked = true;
splitContainer.Panel2Collapsed = true;
}
@@ -283,8 +283,8 @@
if (allEnabled == true || allHaveIdentity == false)
{
selectedAction = AddInAction.Disable;
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionDisable");
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionDisable");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionDisable"); //NOXLATE
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionDisable"); //NOXLATE
if (allHaveIdentity)
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
else
@@ -294,8 +294,8 @@
else if (allDisabled)
{
selectedAction = AddInAction.Enable;
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionEnable");
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionEnable");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionEnable"); //NOXLATE
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionEnable"); //NOXLATE
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Enable);
if (hasErrors)
runActionButton.Enabled = false;
@@ -304,31 +304,31 @@
else if (allInstalling)
{
selectedAction = AddInAction.Uninstall;
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelInstallation");
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelInstall");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelInstallation"); //NOXLATE
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelInstall"); //NOXLATE
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
uninstallButton.Visible = false;
}
else if (allUninstalling)
{
selectedAction = AddInAction.Enable;
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelDeinstallation");
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelDeinstallation");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelDeinstallation"); //NOXLATE
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelDeinstallation"); //NOXLATE
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Enable);
uninstallButton.Visible = false;
}
else if (allUpdating)
{
selectedAction = AddInAction.InstalledTwice;
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelUpdate");
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelUpdate");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelUpdate"); //NOXLATE
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelUpdate"); //NOXLATE
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.CancelUpdate);
uninstallButton.Visible = false;
}
else
{
- actionGroupBox.Text = "";
- actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionInconsistentSelection");
+ actionGroupBox.Text = string.Empty;
+ actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionInconsistentSelection"); //NOXLATE
runActionButton.Visible = false;
uninstallButton.Visible = false;
}
@@ -436,7 +436,7 @@
int rowIndex = 0;
if (dependencies.Count > 0)
{
- AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredDependencies"));
+ AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredDependencies")); //NOXLATE
foreach (AddInReference dep in dependencies)
{
if (!AddDependencyRow(addInDict, dep, rowIndex++, null))
@@ -445,7 +445,7 @@
}
if (dependenciesToSel.Count > 0)
{
- AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredBy"));
+ AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredBy")); //NOXLATE
foreach (KeyValuePair<AddIn, AddInReference> pair in dependenciesToSel)
{
if (!AddDependencyRow(addInDict, pair.Value, rowIndex++, pair.Key.Name))
@@ -500,7 +500,7 @@
{
using (OpenFileDialog dlg = new OpenFileDialog())
{
- dlg.Filter = ResourceService.GetString("AddInManager.FileFilter");
+ dlg.Filter = ResourceService.GetString("AddInManager.FileFilter"); //NOXLATE
dlg.Multiselect = true;
if (dlg.ShowDialog() == DialogResult.OK)
{
@@ -528,26 +528,26 @@
// Same file-extension check is in Panel1DragEnter
switch (Path.GetExtension(file).ToLowerInvariant())
{
- case ".addin":
+ case ".addin": //NOXLATE
if (FileUtility.IsBaseDirectory(FileUtility.ApplicationRootPath, file))
{
- MessageService.ShowMessage("${res:AddInManager.CannotInstallIntoApplicationDirectory}");
+ MessageService.ShowMessage("${res:AddInManager.CannotInstallIntoApplicationDirectory}"); //NOXLATE
return false;
}
list.Add(new InstallableAddIn(file, false));
break;
- case ".sdaddin":
- case ".zip":
+ case ".sdaddin": //NOXLATE
+ case ".zip": //NOXLATE
list.Add(new InstallableAddIn(file, true));
break;
default:
- MessageService.ShowMessage("${res:AddInManager.UnknownFileFormat} " + Path.GetExtension(file));
+ MessageService.ShowMessage("${res:AddInManager.UnknownFileFormat} " + Path.GetExtension(file)); //NOXLATE
return false;
}
}
catch (AddInLoadException ex)
{
- MessageService.ShowMessage("Error loading " + file + ":\n" + ex.Message);
+ MessageService.ShowMessage(string.Format(Strings.ErrorLoadingFile, file, Environment.NewLine, ex.Message));
return false;
}
}
@@ -594,38 +594,38 @@
if (updateAddIns.Count == 0)
{
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionInstall");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionInstall"); //NOXLATE
}
else if (installAddIns.Count == 0)
{
- actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionUpdate");
+ actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionUpdate"); //NOXLATE
}
else
{
actionGroupBox.Text = runActionButton.Text =
- ResourceService.GetString("AddInManager.ActionInstall")
- + " + " +
- ResourceService.GetString("AddInManager.ActionUpdate");
+ ResourceService.GetString("AddInManager.ActionInstall") //NOXLATE
+ + " + " + //NOXLATE
+ ResourceService.GetString("AddInManager.ActionUpdate"); //NOXLATE
}
List<AddIn> addInList = new List<AddIn>();
StringBuilder b = new StringBuilder();
if (installAddIns.Count == 1)
{
- b.Append("Installs the AddIn " + installAddIns[0]);
+ b.Append("Installs the AddIn " + installAddIns[0]); //NOXLATE
}
else if (installAddIns.Count > 1)
{
- b.Append("Installs the AddIns " + string.Join(",", installAddIns.ToArray()));
+ b.Append("Installs the AddIns " + string.Join(",", installAddIns.ToArray())); //NOXLATE
}
if (updateAddIns.Count > 0 && installAddIns.Count > 0)
- b.Append("; ");
+ b.Append("; "); //NOXLATE
if (updateAddIns.Count == 1)
{
- b.Append("Updates the AddIn " + updateAddIns[0]);
+ b.Append("Updates the AddIn " + updateAddIns[0]); //NOXLATE
}
else if (updateAddIns.Count > 1)
{
- b.Append("Updates the AddIns " + string.Join(",", updateAddIns.ToArray()));
+ b.Append("Updates the AddIns " + string.Join(",", updateAddIns.ToArray())); //NOXLATE
}
actionDescription.Text = b.ToString();
runActionButton.Enabled = ShowDependencies(addInList, ShowDependencyMode.Enable);
@@ -691,11 +691,11 @@
{
switch (Path.GetExtension(file).ToLowerInvariant())
{
- case ".addin":
+ case ".addin": //NOXLATE
addInCount += 1;
break;
- case ".sdaddin":
- case ".zip":
+ case ".sdaddin": //NOXLATE
+ case ".zip": //NOXLATE
packageCount += 1;
break;
default:
@@ -765,9 +765,9 @@
case AddInAction.Disable:
for (int i = 0; i < selected.Count; i++)
{
- if (selected[i].Manifest.PrimaryIdentity == "ICSharpCode.AddInManager")
+ if (selected[i].Manifest.PrimaryIdentity == "ICSharpCode.AddInManager") //NOXLATE
{
- MessageService.ShowMessage("${res:AddInManager.CannotDisableAddInManager}");
+ MessageService.ShowMessage("${res:AddInManager.CannotDisableAddInManager}"); //NOXLATE
selected.RemoveAt(i--);
}
}
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.225
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -368,6 +368,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Error loading {0}:{1}{2}.
+ /// </summary>
+ internal static string ErrorLoadingFile {
+ get {
+ return ResourceManager.GetString("ErrorLoadingFile", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Close.
/// </summary>
internal static string TextClose {
@@ -375,5 +384,86 @@
return ResourceManager.GetString("TextClose", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to AddIn File.
+ /// </summary>
+ internal static string TitleAddInFile {
+ get {
+ return ResourceManager.GetString("TitleAddInFile", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to AddIn Name.
+ /// </summary>
+ internal static string TitleAddInName {
+ get {
+ return ResourceManager.GetString("TitleAddInName", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Author.
+ /// </summary>
+ internal static string TitleAuthor {
+ get {
+ return ResourceManager.GetString("TitleAuthor", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Copyright.
+ /// </summary>
+ internal static string TitleCopyright {
+ get {
+ return ResourceManager.GetString("TitleCopyright", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Description.
+ /// </summary>
+ internal static string TitleDescription {
+ get {
+ return ResourceManager.GetString("TitleDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Internal Name.
+ /// </summary>
+ internal static string TitleInternalName {
+ get {
+ return ResourceManager.GetString("TitleInternalName", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to License.
+ /// </summary>
+ internal static string TitleLicense {
+ get {
+ return ResourceManager.GetString("TitleLicense", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Version.
+ /// </summary>
+ internal static string TitleVersion {
+ get {
+ return ResourceManager.GetString("TitleVersion", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Website.
+ /// </summary>
+ internal static string TitleWebsite {
+ get {
+ return ResourceManager.GetString("TitleWebsite", resourceCulture);
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Strings.resx 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Strings.resx 2012-09-11 12:28:35 UTC (rev 6999)
@@ -220,7 +220,37 @@
<data name="CMD_AddInManager" xml:space="preserve">
<value>Add-In Manager</value>
</data>
+ <data name="ErrorLoadingFile" xml:space="preserve">
+ <value>Error loading {0}:{1}{2}</value>
+ </data>
<data name="TextClose" xml:space="preserve">
<value>Close</value>
</data>
+ <data name="TitleAddInFile" xml:space="preserve">
+ <value>AddIn File</value>
+ </data>
+ <data name="TitleAddInName" xml:space="preserve">
+ <value>AddIn Name</value>
+ </data>
+ <data name="TitleAuthor" xml:space="preserve">
+ <value>Author</value>
+ </data>
+ <data name="TitleCopyright" xml:space="preserve">
+ <value>Copyright</value>
+ </data>
+ <data name="TitleDescription" xml:space="preserve">
+ <value>Description</value>
+ </data>
+ <data name="TitleInternalName" xml:space="preserve">
+ <value>Internal Name</value>
+ </data>
+ <data name="TitleLicense" xml:space="preserve">
+ <value>License</value>
+ </data>
+ <data name="TitleVersion" xml:space="preserve">
+ <value>Version</value>
+ </data>
+ <data name="TitleWebsite" xml:space="preserve">
+ <value>Website</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -34,21 +34,21 @@
{
var cnt = wb.ActiveDocumentView;
var ed = cnt as IEditorViewContent;
- string prop = condition.Properties["property"];
+ string prop = condition.Properties["property"]; //NOXLATE
if (!string.IsNullOrEmpty(prop))
{
prop = prop.ToUpper();
switch (prop)
{
- case "CANPREVIEW":
+ case "CANPREVIEW": //NOXLATE
return ed != null && ed.CanBePreviewed;
- case "CANVALIDATE":
+ case "CANVALIDATE": //NOXLATE
return ed != null && ed.CanBeValidated;
- case "CANSAVE":
+ case "CANSAVE": //NOXLATE
return ed != null && !ed.IsNew && ed.IsDirty;
- case "CANPROFILE":
+ case "CANPROFILE": //NOXLATE
return ed != null && ed.CanProfile;
- case "CANEDITASXML":
+ case "CANEDITASXML": //NOXLATE
return ed != null && ed.CanEditAsXml;
default:
return false;
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -29,7 +29,7 @@
{
public bool IsValid(object caller, Condition condition)
{
- var types = condition.Properties["types"];
+ var types = condition.Properties["types"]; //NOXLATE
if (types != null)
{
var wb = Workbench.Instance;
@@ -38,7 +38,7 @@
if (wb.ActiveEditor != null)
{
var rtype = wb.ActiveEditor.EditorService.GetEditedResource().ResourceType.ToString();
- var resTypes = new List<string>(types.Split(','));
+ var resTypes = new List<string>(types.Split(',')); //NOXLATE
return resTypes.Contains(rtype);
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -33,7 +33,7 @@
foreach (var connName in connMgr.GetConnectionNames())
{
var conn = connMgr.GetConnection(connName);
- if (conn.ProviderName.Equals(condition.Properties["provider"]))
+ if (conn.ProviderName.Equals(condition.Properties["provider"])) //NOXLATE
return true;
}
return false;
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -28,7 +28,7 @@
{
public bool IsValid(object caller, Condition condition)
{
- var types = condition.Properties["types"];
+ var types = condition.Properties["types"]; //NOXLATE
if (types != null)
{
var wb = Workbench.Instance;
@@ -36,7 +36,7 @@
{
if (wb.ActiveSiteExplorer != null)
{
- var resTypes = new List<string>(types.Split(','));
+ var resTypes = new List<string>(types.Split(',')); //NOXLATE
if (resTypes.Count > 0)
{
var items = wb.ActiveSiteExplorer.SelectedItems;
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -34,7 +34,7 @@
if (wb.ActiveSiteExplorer != null && wb.ActiveSiteExplorer.SelectedItems.Length == 1)
{
var ri = wb.ActiveSiteExplorer.SelectedItems[0];
- string prop = condition.Properties["type"];
+ string prop = condition.Properties["type"]; //NOXLATE
if (!string.IsNullOrEmpty(prop))
{
return prop.ToUpper() == ri.ResourceType.ToUpper();
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
var exp = wb.ActiveSiteExplorer;
if (exp != null)
{
- var cmds = condition.Properties["commands"].Split(',');
+ var cmds = condition.Properties["commands"].Split(','); //NOXLATE
var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
var conn = connMgr.GetConnection(exp.ConnectionName);
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -33,13 +33,13 @@
{
public override void Run()
{
- string exe = PropertyService.Get(ConfigProperties.LiveMapEditorPath, "");
+ string exe = PropertyService.Get(ConfigProperties.LiveMapEditorPath, string.Empty);
if (!File.Exists(exe))
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -32,13 +32,13 @@
{
public override void Run()
{
- string exe = PropertyService.Get(ConfigProperties.LocalFsPreviewPath, "");
+ string exe = PropertyService.Get(ConfigProperties.LocalFsPreviewPath, string.Empty);
if (!File.Exists(exe))
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -50,7 +50,7 @@
// Connection display names should be unique. A duplicate means we are connecting to the same MG server
- LoggingService.Info("Connection created: " + conn.DisplayName);
+ LoggingService.Info("Connection created: " + conn.DisplayName); //NOXLATE
if (mgr.GetConnection(conn.DisplayName) == null)
{
mgr.AddConnection(conn.DisplayName, conn);
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -37,13 +37,13 @@
internal static void RunCooker(params string [] args)
{
- string exe = PropertyService.Get(ConfigProperties.MgCookerPath, "");
+ string exe = PropertyService.Get(ConfigProperties.MgCookerPath, string.Empty); //NOXLATE
if (!File.Exists(exe))
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MgCooker.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MgCooker.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
@@ -55,7 +55,7 @@
var procInfo = new ProcessStartInfo(exe);
procInfo.WorkingDirectory = Path.GetDirectoryName(exe);
- procInfo.Arguments = string.Join(" ", args);
+ procInfo.Arguments = string.Join(" ", args); //NOXLATE
var proc = Process.Start(procInfo);
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -56,7 +56,7 @@
var res = tpl.CreateItem(startPoint, conn);
if (res != null)
{
- res.ResourceID = "Session:" + conn.SessionID + "//" + Guid.NewGuid().ToString() + "." + res.ResourceType.ToString();
+ res.ResourceID = "Session:" + conn.SessionID + "//" + Guid.NewGuid().ToString() + "." + res.ResourceType.ToString(); //NOXLATE
conn.ResourceService.SaveResource(res);
var ed = orm.Open(res.ResourceID, conn, false, exp);
if (!string.IsNullOrEmpty(startPoint))
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -73,7 +73,7 @@
//doesn't already exists. Note this would automatically guard against any resources in this folder
//that may already be open in an editor
var rid = new ResourceIdentifier(item.ResourceId);
- var name = rid.IsFolder ? (rid.Name + "/") : (rid.Name + "." + rid.ResourceType.ToString());
+ var name = rid.IsFolder ? (rid.Name + "/") : (rid.Name + "." + rid.ResourceType.ToString()); //NOXLATE
var resId = folder.ResourceId + name;
int counter = 0;
while (conn.ResourceService.ResourceExists(resId))
@@ -82,13 +82,13 @@
if (rid.IsFolder)
{
- resId = folder.ResourceId + rid.Name + " (" + counter + ")/";
+ resId = folder.ResourceId + rid.Name + " (" + counter + ")/"; //NOXLATE
}
else
{
- var rname = name.Substring(0, name.IndexOf("."));
- var type = name.Substring(name.IndexOf("."));
- rname += " (" + counter + ")";
+ var rname = name.Substring(0, name.IndexOf(".")); //NOXLATE
+ var type = name.Substring(name.IndexOf(".")); //NOXLATE
+ rname += " (" + counter + ")"; //NOXLATE
resId = folder.ResourceId + rname + type;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -32,13 +32,13 @@
{
public override void Run()
{
- string exe = PropertyService.Get(ConfigProperties.RtMapInspectorPath, "");
+ string exe = PropertyService.Get(ConfigProperties.RtMapInspectorPath, string.Empty);
if (!File.Exists(exe))
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "RtMapInspector.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "RtMapInspector.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -34,13 +34,13 @@
var mgr = ServiceRegistry.GetService<ServerConnectionManager>();
var conn = mgr.GetConnection(wb.ActiveSiteExplorer.ConnectionName);
- if (conn.ProviderName.ToUpper() == "MAESTRO.HTTP")
+ if (conn.ProviderName.ToUpper() == "MAESTRO.HTTP") //NOXLATE
{
- string baseUrl = conn.GetCustomProperty("BaseUrl").ToString();
- if (!baseUrl.EndsWith("/"))
- baseUrl += "/";
+ string baseUrl = conn.GetCustomProperty("BaseUrl").ToString(); //NOXLATE
+ if (!baseUrl.EndsWith("/")) //NOXLATE
+ baseUrl += "/"; //NOXLATE
- Process.Start(baseUrl + "mapadmin/login.php");
+ Process.Start(baseUrl + "mapadmin/login.php"); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -64,7 +64,7 @@
if (parent != null)
exp.RefreshModel(source.DisplayName, parent.ResourceId);
else
- exp.RefreshModel(source.DisplayName, "Library://");
+ exp.RefreshModel(source.DisplayName, StringConstants.RootIdentifier);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -89,8 +89,8 @@
private static bool ConfirmDeleteOpenResources(RepositoryItem[] items, Maestro.Base.Editor.IEditorViewContent[] editors)
{
- Check.NotNull(items, "items");
- Check.NotNull(editors, "editors");
+ Check.NotNull(items, "items"); //NOXLATE
+ Check.NotNull(editors, "editors"); //NOXLATE
Dictionary<string, string> resIds = new Dictionary<string, string>();
foreach (var item in items)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -54,7 +54,7 @@
//doesn't already exists. Note this would automatically guard against any resources in this folder
//that may already be open in an editor
var rid = new ResourceIdentifier(item.ResourceId);
- var name = rid.IsFolder ? (rid.Name + "/") : (rid.Name + "." + rid.ResourceType.ToString());
+ var name = rid.IsFolder ? (rid.Name + "/") : (rid.Name + "." + rid.ResourceType.ToString()); //NOXLATE
var resId = folder.ResourceId + name;
int counter = 0;
while (conn.ResourceService.ResourceExists(resId))
@@ -63,13 +63,13 @@
if (rid.IsFolder)
{
- resId = folder.ResourceId + rid.Name + " (" + counter + ")/";
+ resId = folder.ResourceId + rid.Name + " (" + counter + ")/"; //NOXLATE
}
else
{
- var rname = name.Substring(0, name.IndexOf("."));
- var type = name.Substring(name.IndexOf("."));
- rname += " (" + counter + ")";
+ var rname = name.Substring(0, name.IndexOf(".")); //NOXLATE
+ var type = name.Substring(name.IndexOf(".")); //NOXLATE
+ rname += " (" + counter + ")"; //NOXLATE
resId = folder.ResourceId + rname + type;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -39,7 +39,7 @@
var item = exp.SelectedItems[0];
if (item.IsFolder)
{
- string defaultName = "New Folder";
+ string defaultName = "New Folder"; //NOXLATE
string name = defaultName;
int counter = -1;
while (item.Contains(name))
@@ -60,13 +60,13 @@
{
name = diag.FolderName;
//conn.ResourceService.CreateFolder(item.ResourceId + name);
- conn.ResourceService.SetResourceXmlData(item.ResourceId + name + "/", null);
+ conn.ResourceService.SetResourceXmlData(item.ResourceId + name + "/", null); //NOXLATE
var path = item.Model.GetPath(item);
item.Model.RaiseStructureChanged(new Aga.Controls.Tree.TreeModelEventArgs(path, new object[0]));
//Expand so user can see this new folder
exp.ExpandNode(conn.DisplayName, item.ResourceId);
- exp.SelectNode(conn.DisplayName, item.ResourceId + name + "/");
+ exp.SelectNode(conn.DisplayName, item.ResourceId + name + "/"); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -23,6 +23,7 @@
using ICSharpCode.Core;
using Maestro.Base.Services;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Base.Commands.SiteExplorer
{
@@ -39,20 +40,20 @@
if (items.Length == 1)
{
var it = items[0];
- if (it.ResourceType == "FeatureSource" || it.ResourceType == "LayerDefinition")
+ if (it.ResourceType == ResourceTypes.FeatureSource.ToString() || it.ResourceType == ResourceTypes.LayerDefinition.ToString())
{
var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
var conn = connMgr.GetConnection(wb.ActiveSiteExplorer.ConnectionName);
var resId = it.ResourceId;
- if (it.ResourceType == "LayerDefinition")
+ if (it.ResourceType == ResourceTypes.LayerDefinition.ToString())
{
var res = (ILayerDefinition)conn.ResourceService.GetResource(resId);
resId = res.SubLayer.ResourceId;
}
//If selected item is a Layer, it must be pointing to a Feature Source and not a Drawing Source
- if (resId.EndsWith("FeatureSource"))
+ if (resId.EndsWith(ResourceTypes.FeatureSource.ToString()))
{
using (var st = conn.ResourceService.GetResourceXmlData(resId))
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -63,13 +63,13 @@
string newid = string.Empty;
if (current.IsFolder)
{
- oldid = parent.ResourceId + current.Name + "/";
- newid = parent.ResourceId + dlg.NewName + "/";
+ oldid = parent.ResourceId + current.Name + "/"; //NOXLATE
+ newid = parent.ResourceId + dlg.NewName + "/"; //NOXLATE
}
else
{
- oldid = parent.ResourceId + current.Name + "." + current.ResourceType;
- newid = parent.ResourceId + dlg.NewName + "." + current.ResourceType;
+ oldid = parent.ResourceId + current.Name + "." + current.ResourceType; //NOXLATE
+ newid = parent.ResourceId + dlg.NewName + "." + current.ResourceType; //NOXLATE
}
if (omgr.IsOpen(newid, conn))
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -112,7 +112,7 @@
{
foreach (var map in mg.Map)
{
- if (map.Type.Equals("MapGuide"))
+ if (map.Type.Equals("MapGuide")) //NOXLATE
{
string mdfId = map.GetMapDefinition();
if (mdfId.Equals(srcMap))
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -52,11 +52,11 @@
}
foreach (var n in names)
{
- string fid = current + n + "/";
+ string fid = current + n + "/"; //NOXLATE
if (!conn.ResourceService.ResourceExists(fid))
{
conn.ResourceService.SetResourceXmlData(fid, null);
- LoggingService.Info("Created Folder: " + fid); //LOCALIZEME
+ LoggingService.Info("Created Folder: " + fid);
}
}
exp.RefreshModel(conn.DisplayName, current);
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -23,6 +23,7 @@
using ICSharpCode.Core;
using Maestro.Base.Services;
using Maestro.Editors.FeatureSource;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Base.Commands.SiteExplorer
{
@@ -39,7 +40,7 @@
if (items.Length == 1)
{
var it = items[0];
- if (it.ResourceType == "FeatureSource")
+ if (it.ResourceType == ResourceTypes.FeatureSource.ToString())
{
var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
var conn = connMgr.GetConnection(wb.ActiveSiteExplorer.ConnectionName);
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -41,14 +41,14 @@
ResourceService.RegisterNeutralImages(Properties.Resources.ResourceManager);
ResourceService.RegisterNeutralStrings(Properties.Resources.ResourceManager);
- ResourcePreviewerFactory.RegisterPreviewer("Maestro.Http", new DefaultResourcePreviewer());
+ ResourcePreviewerFactory.RegisterPreviewer("Maestro.Http", new DefaultResourcePreviewer()); //NOXLATE
Workbench.WorkbenchInitialized += (sender, e) =>
{
ServiceRegistry.GetService<NewItemTemplateService>().InitUserTemplates();
var wb = Workbench.Instance;
wb.FormClosing += new System.Windows.Forms.FormClosingEventHandler(OnWorkbenchClosing);
- wb.Text = "MapGuide Maestro";
+ wb.Text = "MapGuide Maestro"; //NOXLATE
var mgr = ServiceRegistry.GetService<ViewContentManager>();
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -42,7 +42,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -42,7 +42,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
@@ -57,14 +57,14 @@
var conn = mgr.GetConnection(exp.ConnectionName);
var picker = new ResourcePicker(conn.ResourceService, ResourcePickerMode.OpenResource);
- picker.SetStartingPoint("Library://Samples/Sheboygan/");
+ picker.SetStartingPoint("Library://Samples/Sheboygan/"); //NOXLATE
if (picker.ShowDialog(wb) == System.Windows.Forms.DialogResult.OK)
{
MessageService.ShowMessage(picker.ResourceID);
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
@@ -85,7 +85,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
@@ -107,7 +107,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -47,7 +47,7 @@
return;
}
}
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -42,7 +42,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
@@ -64,7 +64,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,14 +36,14 @@
var conn = mgr.GetConnection(exp.ConnectionName);
var providers = conn.FeatureService.FeatureProviders;
- var provider = GenericItemSelectionDialog.SelectItem("Select FDO provider", "Select an FDO provider", providers, "DisplayName", "Name");
+ var provider = GenericItemSelectionDialog.SelectItem(Properties.Resources.TitleSelectFdoProvider, Properties.Resources.PromptSelectFdoProvider, providers, "DisplayName", "Name");
if (provider != null)
{
MessageService.ShowMessage(provider.DisplayName);
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -43,7 +43,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
@@ -64,7 +64,7 @@
}
else
{
- MessageService.ShowMessage("Cancelled");
+ MessageService.ShowMessage(Properties.Resources.Cancelled);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -47,9 +47,9 @@
List<string> tags = new List<string>();
if (rt == OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout)
- tags.AddRange(new string[] { "Title", "Tooltip", "Description", "Label", "Prompt" });
+ tags.AddRange(new string[] { "Title", "Tooltip", "Description", "Label", "Prompt" }); //NOXLATE
else if (rt == OSGeo.MapGuide.MaestroAPI.ResourceTypes.ApplicationDefinition)
- tags.AddRange(new string[] { "Title", "Label", "Tooltip", "StatusText", "EmptyText" });
+ tags.AddRange(new string[] { "Title", "Label", "Tooltip", "StatusText", "EmptyText" }); //NOXLATE
var diag = new LabelLocalizationDialog(doc, tags.ToArray());
if (diag.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -30,7 +30,7 @@
{
public override void Run()
{
- var path = Path.Combine(FileUtility.ApplicationRootPath, "UserDoc/index.html");
+ var path = Path.Combine(FileUtility.ApplicationRootPath, "UserDoc/index.html"); //NOXLATE
if (!File.Exists(path))
{
MessageService.ShowError(Properties.Resources.HelpFileNotFound);
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -78,7 +78,7 @@
var rep = de.DiffReport();
TextDiffView dlg = new TextDiffView(sLF, dLF, rep, time);
- dlg.Text += " - " + edSvc.ResourceID;
+ dlg.Text += " - " + edSvc.ResourceID; //NOXLATE
dlg.ShowDialog();
dlg.Dispose();
}
@@ -88,7 +88,7 @@
ex.Message,
Environment.NewLine,
ex.StackTrace);
- MessageBox.Show(tmp, "Compare Error");
+ MessageBox.Show(tmp, Properties.Resources.CompareError);
return;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -167,7 +167,7 @@
}
else
{
- LoggingService.Info("Skipping validation on save");
+ LoggingService.Info("Skipping validation on save"); //NOXLATE
e.Cancel = false;
}
}
@@ -218,7 +218,7 @@
this.Description = GetTooltip(this.IsNew ? Properties.Resources.NewResource : _svc.ResourceID);
}
- const string DIRTY_PREFIX = "* ";
+ const string DIRTY_PREFIX = "* "; //NOXLATE
void OnDirtyStateChanged(object sender, EventArgs e)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -86,13 +86,13 @@
dlg.ShowDialog();
/*
- string exe = PropertyService.Get(ConfigProperties.LocalFsPreviewPath, "");
+ string exe = PropertyService.Get(ConfigProperties.LocalFsPreviewPath, string.Empty);
if (!File.Exists(exe))
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
@@ -110,9 +110,9 @@
List<string> args = new List<string>();
foreach (string key in clonep.Keys)
{
- args.Add("-" + key + ":" + clonep[key]);
+ args.Add("-" + key + ":" + clonep[key]); //NOXLATE
}
- procInfo.Arguments = string.Join(" ", args.ToArray());
+ procInfo.Arguments = string.Join(" ", args.ToArray()); //NOXLATE
var proc = Process.Start(procInfo);
*/
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -44,7 +44,7 @@
public FusionEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.ApplicationDefinition, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.ApplicationDefinition, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -59,7 +59,7 @@
public DrawingSourceEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -74,7 +74,7 @@
public FeatureSourceEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.FeatureSource, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.FeatureSource, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -89,7 +89,7 @@
public LayerDefinitionEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -104,7 +104,7 @@
public LoadProcedureEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -119,7 +119,7 @@
public MapDefinitionEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -134,7 +134,7 @@
public PrintLayoutEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.PrintLayout, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.PrintLayout, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -149,7 +149,7 @@
public SymbolDefinitionEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
@@ -164,7 +164,7 @@
public WebLayoutEditorFactory()
{
- this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "1.0.0");
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout, "1.0.0"); //NOXLATE
}
public IEditorViewContent Create()
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -83,7 +83,7 @@
public override void RunProcess(string processName, params string[] args)
{
//HACK: Yeah yeah
- if (processName.ToLower() == "mgcooker")
+ if (processName.ToLower() == "mgcooker") //NOXLATE
{
Maestro.Base.Commands.MgCookerCommand.RunCooker(args);
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -48,12 +48,12 @@
private string GenerateFeatureSourcePreviewUrl(IResource res)
{
string url = _rootUrl;
- if (!url.EndsWith("/"))
- url += "/";
+ if (!url.EndsWith("/")) //NOXLATE
+ url += "/"; //NOXLATE
var resId = res.ResourceID;
var sessionId = _edSvc.SessionID;
- url += "schemareport/describeschema.php?viewer=basic&schemaName=&className=&resId=" + resId + "&sessionId=" + sessionId;
+ url += "schemareport/describeschema.php?viewer=basic&schemaName=&className=&resId=" + resId + "&sessionId=" + sessionId; //NOXLATE
return url;
}
@@ -61,15 +61,15 @@
private string GenerateLayerPreviewUrl(IResource res)
{
string url = _rootUrl;
- if (!url.EndsWith("/"))
- url += "/";
+ if (!url.EndsWith("/")) //NOXLATE
+ url += "/"; //NOXLATE
var ldf = (ILayerDefinition)res;
var sessionId = _edSvc.SessionID;
var conn = res.CurrentConnection;
//Create temp map definition to house our current layer
- var mdfId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".MapDefinition";
+ var mdfId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".MapDefinition"; //NOXLATE
string csWkt;
var extent = ldf.GetSpatialExtent(true, out csWkt);
@@ -86,7 +86,7 @@
conn.ResourceService.SaveResourceAs(mdf, mdfId);
- if (PropertyService.Get(ConfigProperties.PreviewViewerType, "AJAX").Equals("AJAX"))
+ if (PropertyService.Get(ConfigProperties.PreviewViewerType, "AJAX").Equals("AJAX")) //NOXLATE
{
//Create temp web layout to house this map
var wl = ObjectFactory.CreateWebLayout(_edSvc.GetEditedResource().CurrentConnection, new Version(1, 0, 0), mdfId);
@@ -94,21 +94,21 @@
//Add a custom zoom command (to assist previews of layers that aren't [0, infinity] scale)
AttachPreviewCommands(wl);
- var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout";
+ var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId;
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
}
else
{
throw new NotImplementedException();
////Create temp flex layout
//var appDef = ObjectFactory.CreatePreviewFlexLayout(conn);
- //var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition";
- //appDef.AddMapGroup("previewmap", true, mdfId);
+ //var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition"; //NOXLATE
+ //appDef.AddMapGroup("previewmap", true, mdfId); //NOXLATE
//conn.ResourceService.SaveResourceAs(appDef, resId);
- //url += "fusion/templates/mapguide/preview/index.html?Session=" + sessionId + "&ApplicationDefinition=" + resId;
+ //url += "fusion/templates/mapguide/preview/index.html?Session=" + sessionId + "&ApplicationDefinition=" + resId; //NOXLATE
}
return url;
@@ -117,59 +117,59 @@
private static void AttachPreviewCommands(IWebLayout wl)
{
var cmd = wl.CreateInvokeScriptCommand();
- cmd.Name = "ZoomScale";
- cmd.Label = "Zoom to Scale"; //LOCALIZEME
- cmd.Tooltip = "Zoom to a specified scale";
+ cmd.Name = "ZoomScale"; //NOXLATE
+ cmd.Label = Properties.Resources.Label_ZoomToScale;
+ cmd.Tooltip = Properties.Resources.Desc_ZoomToScale;
cmd.Script = @"
var map = parent.parent.GetMapFrame();
var center = map.GetCenter();
var scale = parseFloat(prompt('Enter the scale:'));
map.ZoomToView(center.X, center.Y, scale, true);
- ";
+ "; //NOXLATE
cmd.TargetViewer = TargetViewerType.Ajax;
- cmd.ImageURL = "../stdicons/icon_zoom.gif";
+ cmd.ImageURL = "../stdicons/icon_zoom.gif"; //NOXLATE
wl.CommandSet.AddCommand(cmd);
var cmd2 = wl.CreateInvokeScriptCommand();
- cmd2.Name = "GetMapKml";
- cmd2.Label = "Get KML";
- cmd2.Description = "Gets the current map as a KML document";
- cmd2.Tooltip = "Gets the current map as a KML document";
+ cmd2.Name = "GetMapKml"; //NOXLATE
+ cmd2.Label = Properties.Resources.Label_GetMapKml;
+ cmd2.Description = Properties.Resources.Desc_GetMapKml;
+ cmd2.Tooltip = Properties.Resources.Desc_GetMapKml;
cmd2.Script = @"
var map = parent.parent.GetMapFrame();
var url = ""../mapagent/mapagent.fcgi?OPERATION=GETMAPKML&VERSION=1.0.0&FORMAT=KML&DISPLAYDPI=96&MAPDEFINITION=" + wl.Map.ResourceId + @""";
url += ""&SESSION="" + map.GetSessionId();
- window.open(url);";
+ window.open(url);"; //NOXLATE
cmd2.TargetViewer = TargetViewerType.Ajax;
- cmd2.ImageURL = "../stdicons/icon_invokescript.gif";
+ cmd2.ImageURL = "../stdicons/icon_invokescript.gif"; //NOXLATE
wl.CommandSet.AddCommand(cmd2);
var cmd3 = wl.CreateInvokeScriptCommand();
- cmd3.Name = "GetExtents";
- cmd3.Label = "Get Extents";
- cmd3.Description = "Displays the current map extents";
- cmd3.Tooltip = "Displays the current map extents";
+ cmd3.Name = "GetExtents"; //NOXLATE
+ cmd3.Label = Properties.Resources.Label_GetExtents;
+ cmd3.Description = Properties.Resources.Desc_GetExtents;
+ cmd3.Tooltip = Properties.Resources.Desc_GetExtents;
cmd3.Script = @"
var map = parent.parent.GetMapFrame();
alert('Map Extents\n\nLower Left: ' + map.extX1 + ', ' + map.extY2 + '\nUpper Right: ' + map.extX2 + ', ' + map.extY1);
- ";
+ "; //NOXLATE
cmd3.TargetViewer = TargetViewerType.Ajax;
- cmd3.ImageURL = "../stdicons/icon_invokescript.gif";
+ cmd3.ImageURL = "../stdicons/icon_invokescript.gif"; //NOXLATE
wl.CommandSet.AddCommand(cmd3);
var zoomScale = wl.CreateCommandItem(cmd.Name);
- var menu = wl.CreateFlyout("Tools", "Tools", "Extra tools", "", "",
- wl.CreateCommandItem("ZoomScale"),
- wl.CreateCommandItem("GetMapKml"),
- wl.CreateCommandItem("GetExtents")
+ var menu = wl.CreateFlyout(Properties.Resources.Label_Tools, Properties.Resources.Label_Tools, Properties.Resources.Label_ExtraTools, string.Empty, string.Empty,
+ wl.CreateCommandItem("ZoomScale"), //NOXLATE
+ wl.CreateCommandItem("GetMapKml"), //NOXLATE
+ wl.CreateCommandItem("GetExtents") //NOXLATE
);
wl.ToolBar.AddItem(menu);
}
@@ -178,10 +178,10 @@
{
//We demand a 2.3.0 Map Definition or higher
if (wmd.CurrentConnection.SiteVersion < new Version(2, 3))
- throw new InvalidOperationException("The site version of this current connection is not known to support watermarks");
+ throw new InvalidOperationException(Properties.Resources.SiteVersionDoesntSupportWatermarks);
- IMapDefinition2 map = (IMapDefinition2)ObjectFactory.CreateMapDefinition(wmd.CurrentConnection, wmd.SupportedMapDefinitionVersion, "Watermark Definition Preview");
- map.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]";
+ IMapDefinition2 map = (IMapDefinition2)ObjectFactory.CreateMapDefinition(wmd.CurrentConnection, wmd.SupportedMapDefinitionVersion, "Watermark Definition Preview"); //NOXLATE
+ map.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]"; //NOXLATE
map.Extents = ObjectFactory.CreateEnvelope(-1000000, -1000000, 1000000, 1000000);
map.AddWatermark(wmd);
return GenerateMapPreviewUrl(map);
@@ -190,17 +190,17 @@
private string GenerateMapPreviewUrl(IResource res)
{
string url = _rootUrl;
- if (!url.EndsWith("/"))
- url += "/";
+ if (!url.EndsWith("/")) //NOXLATE
+ url += "/"; //NOXLATE
var sessionId = _edSvc.SessionID;
- var mdfId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".MapDefinition";
+ var mdfId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".MapDefinition"; //NOXLATE
var mdf = (IMapDefinition)res;
var conn = mdf.CurrentConnection;
conn.ResourceService.SaveResourceAs(mdf, mdfId);
- if (PropertyService.Get(ConfigProperties.PreviewViewerType, "AJAX").Equals("AJAX"))
+ if (PropertyService.Get(ConfigProperties.PreviewViewerType, "AJAX").Equals("AJAX")) //NOXLATE
{
//Create temp web layout to house this map
var wl = ObjectFactory.CreateWebLayout(_edSvc.GetEditedResource().CurrentConnection, new Version(1, 0, 0), mdfId);
@@ -208,21 +208,21 @@
//Add a custom zoom command (to assist previews of layers that aren't [0, infinity] scale)
AttachPreviewCommands(wl);
- var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout";
+ var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId;
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
}
else
{
throw new NotImplementedException();
////Create temp flex layout
//var appDef = ObjectFactory.CreateFlexibleLayout(conn);
- //var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition";
- //appDef.AddMapGroup("previewmap", true, mdfId);
+ //var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition"; //NOXLATE
+ //appDef.AddMapGroup("previewmap", true, mdfId); //NOXLATE
//conn.ResourceService.SaveResourceAs(appDef, resId);
- //url += "fusion/templates/mapguide/preview/index.html?Session=" + sessionId + "&ApplicationDefinition=" + resId;
+ //url += "fusion/templates/mapguide/preview/index.html?Session=" + sessionId + "&ApplicationDefinition=" + resId; //NOXLATE
}
return url;
@@ -231,16 +231,16 @@
private string GenerateWebLayoutPreviewUrl(IResource res)
{
string url = _rootUrl;
- if (!url.EndsWith("/"))
- url += "/";
+ if (!url.EndsWith("/")) //NOXLATE
+ url += "/"; //NOXLATE
var sessionId = _edSvc.SessionID;
- var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout";
+ var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
var wl = (IWebLayout)res;
var conn = wl.CurrentConnection;
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId;
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
return url;
}
@@ -248,17 +248,17 @@
private string GenerateFlexLayoutPreviewUrl(IResource res)
{
string url = _rootUrl;
- if (!url.EndsWith("/"))
- url += "/";
+ if (!url.EndsWith("/")) //NOXLATE
+ url += "/"; //NOXLATE
//Create temp flex layout
var sessionId = _edSvc.SessionID;
var appDef = (IApplicationDefinition)res;
var conn = appDef.CurrentConnection;
- var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition";
+ var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition"; //NOXLATE
conn.ResourceService.SaveResourceAs(appDef, resId);
- url += appDef.TemplateUrl + "?Session=" + sessionId + "&ApplicationDefinition=" + resId;
+ url += appDef.TemplateUrl + "?Session=" + sessionId + "&ApplicationDefinition=" + resId; //NOXLATE
return url;
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -70,7 +70,7 @@
_edSvc.RegisterCustomNotifier(editor);
editor.Bind(_edSvc);
editor.ReadyForEditing(); //This turns on event broadcasting
- this.Title = Properties.Resources.XmlEditor + " " + ResourceIdentifier.GetName(this.EditorService.ResourceID);
+ this.Title = Properties.Resources.XmlEditor + " " + ResourceIdentifier.GetName(this.EditorService.ResourceID); //NOXLATE
}
protected override ICollection<ValidationIssue> ValidateEditedResource()
@@ -140,7 +140,7 @@
public override void Preview()
{
//Save the current resource to another session copy
- string resId = "Session:" + this.EditorService.SessionID + "//" + Guid.NewGuid() + "." + this.Resource.ResourceType.ToString();
+ string resId = "Session:" + this.EditorService.SessionID + "//" + Guid.NewGuid() + "." + this.Resource.ResourceType.ToString(); //NOXLATE
this.EditorService.ResourceService.SetResourceXmlData(resId, new MemoryStream(Encoding.UTF8.GetBytes(this.XmlContent)));
//Copy any resource data
Modified: trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -46,7 +46,7 @@
svc.ConnectionAdded += new ServerConnectionEventHandler(OnConnectionAdded);
svc.ConnectionRemoved += new ServerConnectionEventHandler(OnConnectionRemoved);
- LoggingService.Info("Starting session keep-alive timer");
+ LoggingService.Info("Starting session keep-alive timer"); //NOXLATE
_keepAliveTimer.Start();
}
@@ -58,7 +58,7 @@
foreach (var name in svc.GetConnectionNames())
{
var conn = svc.GetConnection(name);
- if (conn.ProviderName.ToUpper().Equals("MAESTRO.LOCAL"))
+ if (conn.ProviderName.ToUpper().Equals("MAESTRO.LOCAL")) //NOXLATE
continue;
string sessionId = conn.SessionID;
@@ -66,8 +66,8 @@
{
try
{
- conn.FeatureService.GetProviderCapabilities("OSGeo.SDF");
- LoggingService.Info("Session kept alive: " + sessionId);
+ conn.FeatureService.GetProviderCapabilities("OSGeo.SDF"); //NOXLATE
+ LoggingService.Info("Session kept alive: " + sessionId); //NOXLATE
}
catch (Exception)
{
@@ -93,7 +93,7 @@
Workbench wb = Workbench.Instance;
Debug.Assert(wb.ActiveSiteExplorer != null);
var svc = ServiceRegistry.GetService<ServerConnectionManager>();
- LoggingService.Info("There are now " + svc.GetConnectionNames().Count + " active connections"); //LOCALIZEME
+ LoggingService.Info("There are now " + svc.GetConnectionNames().Count + " active connections"); //NOXLATE
//Debug.Assert(wb.ActiveSiteExplorer.ConnectionName == name);
}
@@ -118,7 +118,7 @@
var svc = ServiceRegistry.GetService<ServerConnectionManager>();
var conn = svc.GetConnection(name);
- LoggingService.Info("There are now " + svc.GetConnectionNames().Count + " active connections"); //LOCALIZEME
+ LoggingService.Info("There are now " + svc.GetConnectionNames().Count + " active connections"); //NOXLATE
}
static void OnActiveConnectionChanged(object sender, EventArgs e)
@@ -131,7 +131,7 @@
}
else
{
- wb.SetStatusLabel("");
+ wb.SetStatusLabel(string.Empty);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-09-11 12:28:35 UTC (rev 6999)
@@ -279,6 +279,9 @@
<Compile Include="UI\AboutDialog.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Include="UI\AboutDialog.Designer.cs">
+ <DependentUpon>AboutDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="UI\BoundsPicker.cs">
<SubType>Form</SubType>
</Compile>
Modified: trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -33,7 +33,7 @@
get
{
var asmVersion = Assembly.GetExecutingAssembly().GetName().Version;
- return string.Format("Maestro-{0}.{1}", asmVersion.Major, asmVersion.Minor);
+ return string.Format("Maestro-{0}.{1}", asmVersion.Major, asmVersion.Minor); //NOXLATE
}
}
@@ -58,8 +58,8 @@
{
var asmVersion = Assembly.GetExecutingAssembly().GetName().Version;
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
- string.Format("Maestro-{0}.{1}", asmVersion.Major, asmVersion.Minor),
- "AddIns");
+ string.Format("Maestro-{0}.{1}", asmVersion.Major, asmVersion.Minor), //NOXLATE
+ "AddIns"); //NOXLATE
}
}*/
}
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -87,6 +87,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap application_browser {
get {
object obj = ResourceManager.GetObject("application_browser", resourceCulture);
@@ -94,6 +97,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap application_sidebar_list {
get {
object obj = ResourceManager.GetObject("application_sidebar_list", resourceCulture);
@@ -101,6 +107,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap application_task {
get {
object obj = ResourceManager.GetObject("application_task", resourceCulture);
@@ -108,6 +117,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap applications_stack {
get {
object obj = ResourceManager.GetObject("applications_stack", resourceCulture);
@@ -115,6 +127,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow {
get {
object obj = ResourceManager.GetObject("arrow", resourceCulture);
@@ -122,6 +137,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_180 {
get {
object obj = ResourceManager.GetObject("arrow-180", resourceCulture);
@@ -129,6 +147,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_circle_045_left {
get {
object obj = ResourceManager.GetObject("arrow-circle-045-left", resourceCulture);
@@ -136,6 +157,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_circle_double {
get {
object obj = ResourceManager.GetObject("arrow_circle_double", resourceCulture);
@@ -143,6 +167,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap blueprints {
get {
object obj = ResourceManager.GetObject("blueprints", resourceCulture);
@@ -234,6 +261,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap box__arrow {
get {
object obj = ResourceManager.GetObject("box__arrow", resourceCulture);
@@ -241,6 +271,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap box__pencil {
get {
object obj = ResourceManager.GetObject("box__pencil", resourceCulture);
@@ -248,6 +281,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap box__plus {
get {
object obj = ResourceManager.GetObject("box__plus", resourceCulture);
@@ -283,6 +319,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Cancelled.
+ /// </summary>
+ internal static string Cancelled {
+ get {
+ return ResourceManager.GetString("Cancelled", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Cannot rename resource as it is already opened by another editor.
/// </summary>
internal static string CannotRenameAlreadyOpenedResource {
@@ -309,6 +354,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap clipboard_paste {
get {
object obj = ResourceManager.GetObject("clipboard_paste", resourceCulture);
@@ -325,6 +373,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap clock {
get {
object obj = ResourceManager.GetObject("clock", resourceCulture);
@@ -360,6 +411,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Compare Error.
+ /// </summary>
+ internal static string CompareError {
+ get {
+ return ResourceManager.GetString("CompareError", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Confirm.
/// </summary>
internal static string Confirm {
@@ -540,6 +600,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap cross {
get {
object obj = ResourceManager.GetObject("cross", resourceCulture);
@@ -547,6 +610,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap cross_circle {
get {
object obj = ResourceManager.GetObject("cross-circle", resourceCulture);
@@ -554,6 +620,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap cross_script {
get {
object obj = ResourceManager.GetObject("cross_script", resourceCulture);
@@ -561,6 +630,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap cross_small {
get {
object obj = ResourceManager.GetObject("cross_small", resourceCulture);
@@ -568,6 +640,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap database__arrow {
get {
object obj = ResourceManager.GetObject("database__arrow", resourceCulture);
@@ -575,6 +650,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap database_share {
get {
object obj = ResourceManager.GetObject("database_share", resourceCulture);
@@ -600,6 +678,36 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Displays the current map extents.
+ /// </summary>
+ internal static string Desc_GetExtents {
+ get {
+ return ResourceManager.GetString("Desc_GetExtents", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Gets the current map as a KML document.
+ /// </summary>
+ internal static string Desc_GetMapKml {
+ get {
+ return ResourceManager.GetString("Desc_GetMapKml", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Zoom to a specified scale.
+ /// </summary>
+ internal static string Desc_ZoomToScale {
+ get {
+ return ResourceManager.GetString("Desc_ZoomToScale", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap disk {
get {
object obj = ResourceManager.GetObject("disk", resourceCulture);
@@ -607,6 +715,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap disk__arrow {
get {
object obj = ResourceManager.GetObject("disk__arrow", resourceCulture);
@@ -614,6 +725,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap disks {
get {
object obj = ResourceManager.GetObject("disks", resourceCulture);
@@ -621,6 +735,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document {
get {
object obj = ResourceManager.GetObject("document", resourceCulture);
@@ -628,6 +745,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document__arrow {
get {
object obj = ResourceManager.GetObject("document__arrow", resourceCulture);
@@ -635,6 +755,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document__plus {
get {
object obj = ResourceManager.GetObject("document__plus", resourceCulture);
@@ -642,6 +765,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document_code {
get {
object obj = ResourceManager.GetObject("document_code", resourceCulture);
@@ -649,6 +775,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document_copy {
get {
object obj = ResourceManager.GetObject("document_copy", resourceCulture);
@@ -656,6 +785,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap document_search_result {
get {
object obj = ResourceManager.GetObject("document_search_result", resourceCulture);
@@ -672,6 +804,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_diff {
get {
object obj = ResourceManager.GetObject("edit_diff", resourceCulture);
@@ -679,6 +814,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_language {
get {
object obj = ResourceManager.GetObject("edit_language", resourceCulture);
@@ -794,6 +932,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap folder__plus {
get {
object obj = ResourceManager.GetObject("folder__plus", resourceCulture);
@@ -810,6 +951,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap folder_horizontal {
get {
object obj = ResourceManager.GetObject("folder_horizontal", resourceCulture);
@@ -844,6 +988,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap folder_open_document {
get {
object obj = ResourceManager.GetObject("folder_open_document", resourceCulture);
@@ -905,6 +1052,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_document {
get {
object obj = ResourceManager.GetObject("icon_document", resourceCulture);
@@ -912,6 +1062,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_drawingsource {
get {
object obj = ResourceManager.GetObject("icon_drawingsource", resourceCulture);
@@ -919,6 +1072,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_featuresource {
get {
object obj = ResourceManager.GetObject("icon_featuresource", resourceCulture);
@@ -926,6 +1082,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_fusion {
get {
object obj = ResourceManager.GetObject("icon_fusion", resourceCulture);
@@ -933,6 +1092,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_layerdefinition {
get {
object obj = ResourceManager.GetObject("icon_layerdefinition", resourceCulture);
@@ -940,6 +1102,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_mapdefinition {
get {
object obj = ResourceManager.GetObject("icon_mapdefinition", resourceCulture);
@@ -947,6 +1112,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_printlayout {
get {
object obj = ResourceManager.GetObject("icon_printlayout", resourceCulture);
@@ -954,6 +1122,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_symboldefinition {
get {
object obj = ResourceManager.GetObject("icon_symboldefinition", resourceCulture);
@@ -961,6 +1132,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_symbolibrary {
get {
object obj = ResourceManager.GetObject("icon_symbolibrary", resourceCulture);
@@ -968,6 +1142,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_watermark {
get {
object obj = ResourceManager.GetObject("icon_watermark", resourceCulture);
@@ -975,6 +1152,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_weblayout {
get {
object obj = ResourceManager.GetObject("icon_weblayout", resourceCulture);
@@ -982,6 +1162,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon icon_xmleditor {
get {
object obj = ResourceManager.GetObject("icon_xmleditor", resourceCulture);
@@ -989,6 +1172,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap images_stack {
get {
object obj = ResourceManager.GetObject("images_stack", resourceCulture);
@@ -1059,6 +1245,54 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Extra Tools.
+ /// </summary>
+ internal static string Label_ExtraTools {
+ get {
+ return ResourceManager.GetString("Label_ExtraTools", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Get Extents.
+ /// </summary>
+ internal static string Label_GetExtents {
+ get {
+ return ResourceManager.GetString("Label_GetExtents", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Get KML.
+ /// </summary>
+ internal static string Label_GetMapKml {
+ get {
+ return ResourceManager.GetString("Label_GetMapKml", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Tools.
+ /// </summary>
+ internal static string Label_Tools {
+ get {
+ return ResourceManager.GetString("Label_Tools", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Zoom to Scale.
+ /// </summary>
+ internal static string Label_ZoomToScale {
+ get {
+ return ResourceManager.GetString("Label_ZoomToScale", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer {
get {
object obj = ResourceManager.GetObject("layer", resourceCulture);
@@ -1084,6 +1318,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap loading {
get {
object obj = ResourceManager.GetObject("loading", resourceCulture);
@@ -1118,6 +1355,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap map {
get {
object obj = ResourceManager.GetObject("map", resourceCulture);
@@ -1125,6 +1365,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ /// </summary>
internal static System.Drawing.Icon MapGuide_Maestro {
get {
object obj = ResourceManager.GetObject("MapGuide_Maestro", resourceCulture);
@@ -1132,6 +1375,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap marker {
get {
object obj = ResourceManager.GetObject("marker", resourceCulture);
@@ -1490,6 +1736,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap navigation {
get {
object obj = ResourceManager.GetObject("navigation", resourceCulture);
@@ -1497,6 +1746,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap navigation_000_white {
get {
object obj = ResourceManager.GetObject("navigation-000-white", resourceCulture);
@@ -1504,6 +1756,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap navigation_180 {
get {
object obj = ResourceManager.GetObject("navigation-180", resourceCulture);
@@ -1511,6 +1766,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap navigation_180_white {
get {
object obj = ResourceManager.GetObject("navigation-180-white", resourceCulture);
@@ -1572,6 +1830,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap plug__arrow {
get {
object obj = ResourceManager.GetObject("plug__arrow", resourceCulture);
@@ -1579,6 +1840,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap plug__minus {
get {
object obj = ResourceManager.GetObject("plug--minus", resourceCulture);
@@ -1586,6 +1850,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap plug__plus {
get {
object obj = ResourceManager.GetObject("plug__plus", resourceCulture);
@@ -1649,6 +1916,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap printer {
get {
object obj = ResourceManager.GetObject("printer", resourceCulture);
@@ -1819,6 +2089,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Select an FDO Provider.
+ /// </summary>
+ internal static string PromptSelectFdoProvider {
+ get {
+ return ResourceManager.GetString("PromptSelectFdoProvider", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Rename to.
/// </summary>
internal static string RenameTo {
@@ -1836,6 +2115,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap reports_stack {
get {
object obj = ResourceManager.GetObject("reports_stack", resourceCulture);
@@ -2090,6 +2372,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap scissors_blue {
get {
object obj = ResourceManager.GetObject("scissors_blue", resourceCulture);
@@ -2124,6 +2409,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap server {
get {
object obj = ResourceManager.GetObject("server", resourceCulture);
@@ -2131,6 +2419,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap server__arrow {
get {
object obj = ResourceManager.GetObject("server__arrow", resourceCulture);
@@ -2436,6 +2727,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to The site version of this current connection is not known to support watermarks.
+ /// </summary>
+ internal static string SiteVersionDoesntSupportWatermarks {
+ get {
+ return ResourceManager.GetString("SiteVersionDoesntSupportWatermarks", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Skipping resource: {0}.
/// </summary>
internal static string SkippingResource {
@@ -2462,6 +2762,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap system_monitor {
get {
object obj = ResourceManager.GetObject("system_monitor", resourceCulture);
@@ -2496,6 +2799,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap tick {
get {
object obj = ResourceManager.GetObject("tick", resourceCulture);
@@ -2513,6 +2819,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Select FDO Provider.
+ /// </summary>
+ internal static string TitleSelectFdoProvider {
+ get {
+ return ResourceManager.GetString("TitleSelectFdoProvider", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Edit as XML.
/// </summary>
internal static string Toolbar_EditAsXml {
@@ -2917,6 +3232,27 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Unknown version.
+ /// </summary>
+ internal static string VersionUnknown {
+ get {
+ return ResourceManager.GetString("VersionUnknown", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unknown version or not connected.
+ /// </summary>
+ internal static string VersionUnknownOrNotConnected {
+ get {
+ return ResourceManager.GetString("VersionUnknownOrNotConnected", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap water {
get {
object obj = ResourceManager.GetObject("water", resourceCulture);
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2012-09-11 12:28:35 UTC (rev 6999)
@@ -2694,4 +2694,49 @@
<data name="ConnectionDoesNotSupportRequiredInterfaces" xml:space="preserve">
<value>The current connection does not support the required interfaces to perform this action</value>
</data>
+ <data name="Cancelled" xml:space="preserve">
+ <value>Cancelled</value>
+ </data>
+ <data name="CompareError" xml:space="preserve">
+ <value>Compare Error</value>
+ </data>
+ <data name="PromptSelectFdoProvider" xml:space="preserve">
+ <value>Select an FDO Provider</value>
+ </data>
+ <data name="TitleSelectFdoProvider" xml:space="preserve">
+ <value>Select FDO Provider</value>
+ </data>
+ <data name="Desc_GetExtents" xml:space="preserve">
+ <value>Displays the current map extents</value>
+ </data>
+ <data name="Desc_GetMapKml" xml:space="preserve">
+ <value>Gets the current map as a KML document</value>
+ </data>
+ <data name="Desc_ZoomToScale" xml:space="preserve">
+ <value>Zoom to a specified scale</value>
+ </data>
+ <data name="Label_ExtraTools" xml:space="preserve">
+ <value>Extra Tools</value>
+ </data>
+ <data name="Label_GetExtents" xml:space="preserve">
+ <value>Get Extents</value>
+ </data>
+ <data name="Label_GetMapKml" xml:space="preserve">
+ <value>Get KML</value>
+ </data>
+ <data name="Label_Tools" xml:space="preserve">
+ <value>Tools</value>
+ </data>
+ <data name="Label_ZoomToScale" xml:space="preserve">
+ <value>Zoom to Scale</value>
+ </data>
+ <data name="SiteVersionDoesntSupportWatermarks" xml:space="preserve">
+ <value>The site version of this current connection is not known to support watermarks</value>
+ </data>
+ <data name="VersionUnknown" xml:space="preserve">
+ <value>Unknown version</value>
+ </data>
+ <data name="VersionUnknownOrNotConnected" xml:space="preserve">
+ <value>Unknown version or not connected</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -34,7 +34,7 @@
_handlers = new Dictionary<string, List<IDragDropHandler>>();
//Find and register drag and drop handlers
- List<IDragDropHandler> handlers = AddInTree.BuildItems<IDragDropHandler>("/Maestro/DragDropHandlers", this);
+ List<IDragDropHandler> handlers = AddInTree.BuildItems<IDragDropHandler>("/Maestro/DragDropHandlers", this); //NOXLATE
if (handlers != null)
{
foreach (IDragDropHandler h in handlers)
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
get { return Properties.Resources.DwfHandlerAction; }
}
- string[] extensions = { ".dwf" };
+ string[] extensions = { ".dwf" }; //NOXLATE
public string[] FileExtensions
{
@@ -54,14 +54,14 @@
string fileName = Path.GetFileName(file);
string resName = Path.GetFileNameWithoutExtension(file);
int counter = 0;
- string resId = folderId + resName + ".DrawingSource";
+ string resId = folderId + resName + ".DrawingSource"; //NOXLATE
while (conn.ResourceService.ResourceExists(resId))
{
counter++;
- resId = folderId + resName + " (" + counter + ").DrawingSource";
+ resId = folderId + resName + " (" + counter + ").DrawingSource"; //NOXLATE
}
ds.ResourceID = resId;
- //fs.SetConnectionProperty("File", "%MG_DATA_FILE_PATH%" + fileName);
+ //fs.SetConnectionProperty("File", StringConstants.MgDataFilePath + fileName); //NOXLATE
ds.SourceName = fileName;
conn.ResourceService.SaveResource(ds);
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
get { return Properties.Resources.MgpHandlerAction; }
}
- string[] extensions = { ".mgp" };
+ string[] extensions = { ".mgp" }; //NOXLATE
public string[] FileExtensions
{
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
get { return Properties.Resources.SdfHandlerAction; }
}
- string[] extensions = { ".sdf" };
+ string[] extensions = { ".sdf" }; //NOXLATE
public string[] FileExtensions
{
@@ -49,19 +49,19 @@
{
var wb = Workbench.Instance;
var exp = wb.ActiveSiteExplorer;
- var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SDF");
+ var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SDF"); //NOXLATE
string fileName = Path.GetFileName(file);
string resName = Path.GetFileNameWithoutExtension(file);
int counter = 0;
- string resId = folderId + resName + ".FeatureSource";
+ string resId = folderId + resName + ".FeatureSource"; //NOXLATE
while (conn.ResourceService.ResourceExists(resId))
{
counter++;
- resId = folderId + resName + " (" + counter + ").FeatureSource";
+ resId = folderId + resName + " (" + counter + ").FeatureSource"; //NOXLATE
}
fs.ResourceID = resId;
- fs.SetConnectionProperty("File", "%MG_DATA_FILE_PATH%" + fileName);
+ fs.SetConnectionProperty("File", StringConstants.MgDataFilePath + fileName); //NOXLATE
conn.ResourceService.SaveResource(fs);
using (var stream = File.Open(file, FileMode.Open))
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
get { return Properties.Resources.ShpHandlerAction; }
}
- private string[] extensions = { ".shp" };
+ private string[] extensions = { ".shp" }; //NOXLATE
public string[] FileExtensions
{
@@ -49,30 +49,30 @@
{
var wb = Workbench.Instance;
var exp = wb.ActiveSiteExplorer;
- var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SHP");
+ var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SHP"); //NOXLATE
string fileName = Path.GetFileName(file);
string resName = Path.GetFileNameWithoutExtension(file);
int counter = 0;
- string resId = folderId + resName + ".FeatureSource";
+ string resId = folderId + resName + ".FeatureSource"; //NOXLATE
while (conn.ResourceService.ResourceExists(resId))
{
counter++;
- resId = folderId + resName + " (" + counter + ").FeatureSource";
+ resId = folderId + resName + " (" + counter + ").FeatureSource"; //NOXLATE
}
fs.ResourceID = resId;
- fs.SetConnectionProperty("DefaultFileLocation", "%MG_DATA_FILE_PATH%" + fileName);
+ fs.SetConnectionProperty("DefaultFileLocation", StringConstants.MgDataFilePath + fileName); //NOXLATE
conn.ResourceService.SaveResource(fs);
//As we all know, the term shape file is deceptive...
string[] files = new string[]
{
file,
- file.Substring(0, file.LastIndexOf(".")) + ".shx",
- file.Substring(0, file.LastIndexOf(".")) + ".dbf",
- file.Substring(0, file.LastIndexOf(".")) + ".idx",
- file.Substring(0, file.LastIndexOf(".")) + ".prj",
- file.Substring(0, file.LastIndexOf(".")) + ".cpg"
+ file.Substring(0, file.LastIndexOf(".")) + ".shx", //NOXLATE
+ file.Substring(0, file.LastIndexOf(".")) + ".dbf", //NOXLATE
+ file.Substring(0, file.LastIndexOf(".")) + ".idx", //NOXLATE
+ file.Substring(0, file.LastIndexOf(".")) + ".prj", //NOXLATE
+ file.Substring(0, file.LastIndexOf(".")) + ".cpg" //NOXLATE
};
foreach (string fn in files)
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,7 +36,7 @@
get { return Properties.Resources.SdfHandlerAction; }
}
- string[] extensions = { ".sqlite", ".db", ".slt" };
+ string[] extensions = { ".sqlite", ".db", ".slt" }; //NOXLATE
public string[] FileExtensions
{
@@ -49,19 +49,19 @@
{
var wb = Workbench.Instance;
var exp = wb.ActiveSiteExplorer;
- var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SQLite");
+ var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SQLite"); //NOXLATE
string fileName = Path.GetFileName(file);
string resName = Path.GetFileNameWithoutExtension(file);
int counter = 0;
- string resId = folderId + resName + ".FeatureSource";
+ string resId = folderId + resName + ".FeatureSource"; //NOXLATE
while (conn.ResourceService.ResourceExists(resId))
{
counter++;
- resId = folderId + resName + " (" + counter + ").FeatureSource";
+ resId = folderId + resName + " (" + counter + ").FeatureSource"; //NOXLATE
}
fs.ResourceID = resId;
- fs.SetConnectionProperty("File", "%MG_DATA_FILE_PATH%" + fileName);
+ fs.SetConnectionProperty("File", StringConstants.MgDataFilePath + fileName); //NOXLATE
conn.ResourceService.SaveResource(fs);
using (var stream = File.Open(file, FileMode.Open))
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -36,14 +36,14 @@
get { return Properties.Resources.XmlResHandlerAction; }
}
- private string[] extensions = { ".xml",
- ".FeatureSource",
- ".LayerDefinition",
- ".MapDefinition",
- ".WebLayout",
- ".SymbolDefinition",
- ".ApplicationDefinition",
- ".PrintLayout",
+ private string[] extensions = { ".xml", //NOXLATE
+ ".FeatureSource", //NOXLATE
+ ".LayerDefinition", //NOXLATE
+ ".MapDefinition", //NOXLATE
+ ".WebLayout", //NOXLATE
+ ".SymbolDefinition", //NOXLATE
+ ".ApplicationDefinition", //NOXLATE
+ ".PrintLayout", //NOXLATE
};
public string[] FileExtensions
@@ -63,12 +63,12 @@
int counter = 0;
string name = Path.GetFileNameWithoutExtension(file);
- string resId = folderId + name + "." + res.ResourceType.ToString();
+ string resId = folderId + name + "." + res.ResourceType.ToString(); //NOXLATE
while (conn.ResourceService.ResourceExists(resId))
{
counter++;
- resId = folderId + name + " (" + counter + ")." + res.ResourceType.ToString();
+ resId = folderId + name + " (" + counter + ")." + res.ResourceType.ToString(); //NOXLATE
}
res.ResourceID = resId;
Modified: trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -41,17 +41,17 @@
base.Initialize();
_templates = new Dictionary<string, List<ItemTemplate>>();
- var tpls = AddInTree.BuildItems<ItemTemplate>("/Maestro/NewItemTemplates", this);
+ var tpls = AddInTree.BuildItems<ItemTemplate>("/Maestro/NewItemTemplates", this); //NOXLATE
foreach (var tp in tpls)
{
if (!_templates.ContainsKey(tp.Category))
_templates[tp.Category] = new List<ItemTemplate>();
_templates[tp.Category].Add(tp);
- LoggingService.Info("Registered default template: " + tp.GetType()); //LOCALIZE
+ LoggingService.Info("Registered default template: " + tp.GetType()); //NOXLATE
}
- LoggingService.Info("Initialized: New Item Template Service"); //LOCALIZE
+ LoggingService.Info("Initialized: New Item Template Service"); //NOXLATE
}
internal void InitUserTemplates()
@@ -72,7 +72,7 @@
List<UserItemTemplate> tpls = new List<UserItemTemplate>();
//TODO: Store path in preferences
- string userTplPath = Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates");
+ string userTplPath = Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"); //NOXLATE
if (Directory.Exists(userTplPath))
{
foreach (string file in Directory.GetFiles(userTplPath))
@@ -84,7 +84,7 @@
}
catch (Exception)
{
- LoggingService.Info("Could not load user template: " + file); //LOCALIZE
+ LoggingService.Info("Could not load user template: " + file); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -69,7 +69,7 @@
_openItems = new Dictionary<string, IEditorViewContent>();
_factories = new Dictionary<ResourceTypeDescriptor, IEditorFactory>();
- var facts = AddInTree.BuildItems<IEditorFactory>("/Maestro/Editors", this);
+ var facts = AddInTree.BuildItems<IEditorFactory>("/Maestro/Editors", this); //NOXLATE
foreach (var fact in facts)
{
if (_factories.ContainsKey(fact.ResourceTypeAndVersion))
@@ -102,10 +102,10 @@
internal void RenameResourceId(string oldId, string newId, IServerConnection conn, ISiteExplorer siteExp)
{
- Check.NotEmpty(oldId, "oldId");
- Check.NotEmpty(newId, "newId");
- Check.NotNull(siteExp, "siteExp");
- Check.NotNull(conn, "conn");
+ Check.NotEmpty(oldId, "oldId"); //NOXLATE
+ Check.NotEmpty(newId, "newId"); //NOXLATE
+ Check.NotNull(siteExp, "siteExp"); //NOXLATE
+ Check.NotNull(conn, "conn"); //NOXLATE
string oldKey = ComputeResourceKey(oldId, conn);
string newKey = ComputeResourceKey(newId, conn);
@@ -127,12 +127,12 @@
public static string ComputeResourceKey(string resId, IServerConnection conn)
{
- return conn.DisplayName + "|" + resId;
+ return conn.DisplayName + "|" + resId; //NOXLATE
}
public static string ComputeResourceKey(IResource res, IServerConnection conn)
{
- return conn.DisplayName + "|" + res.ResourceID;
+ return conn.DisplayName + "|" + res.ResourceID; //NOXLATE
}
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -64,9 +64,9 @@
IServerConnection conn = res.CurrentConnection;
BusyWaitDialog.Run(Properties.Resources.PrgPreparingResourcePreview, () => {
- string mapguideRootUrl = (string)conn.GetCustomProperty("BaseUrl");
+ string mapguideRootUrl = (string)conn.GetCustomProperty("BaseUrl"); //NOXLATE
//Save the current resource to another session copy
- string resId = "Session:" + edSvc.SessionID + "//" + res.ResourceType.ToString() + "Preview" + Guid.NewGuid() + "." + res.ResourceType.ToString();
+ string resId = "Session:" + edSvc.SessionID + "//" + res.ResourceType.ToString() + "Preview" + Guid.NewGuid() + "." + res.ResourceType.ToString(); //NOXLATE
edSvc.ResourceService.SaveResourceAs(res, resId);
edSvc.ResourceService.CopyResource(res.ResourceID, resId, true);
@@ -81,10 +81,10 @@
{
//HACK-ish: We are flubbing a completely invalid Layer Definition under normal circumstances,
//but one that has the minimum required content model to generate an appropriate GETLEGENDIMAGE preview for
- vl.FeatureName = "";
- vl.ResourceId = "";
- vl.Geometry = "";
- vl.ToolTip = "";
+ vl.FeatureName = string.Empty;
+ vl.ResourceId = string.Empty;
+ vl.Geometry = string.Empty;
+ vl.ToolTip = string.Empty;
var vsr = vl.GetScaleRangeAt(0) as IVectorScaleRange2;
if (vsr != null)
{
@@ -98,11 +98,11 @@
csym.AddSymbolInstance(si);
vsr.CompositeStyle = new List<ICompositeTypeStyle>() { cs };
- var ldfId = "Session:" + edSvc.SessionID + "//" + res.ResourceType.ToString() + "Preview" + Guid.NewGuid() + ".LayerDefinition";
+ var ldfId = "Session:" + edSvc.SessionID + "//" + res.ResourceType.ToString() + "Preview" + Guid.NewGuid() + ".LayerDefinition"; //NOXLATE
edSvc.ResourceService.SaveResourceAs(layerDef, ldfId);
var mappingSvc = (IMappingService)conn.GetService((int)ServiceType.Mapping);
- var img = mappingSvc.GetLegendImage(42, ldfId, 0, 4, 100, 100, "PNG");
+ var img = mappingSvc.GetLegendImage(42, ldfId, 0, 4, 100, 100, "PNG"); //NOXLATE
return new ImagePreviewResult() { ImagePreview = img };
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -37,7 +37,7 @@
if (_init)
return;
- _services = AddInTree.BuildItems<ServiceBase>("/Maestro/ApplicationServices", null);
+ _services = AddInTree.BuildItems<ServiceBase>("/Maestro/ApplicationServices", null); //NOXLATE
foreach (var svc in _services)
{
svc.Initialize();
Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -51,7 +51,7 @@
var ldf = ObjectFactory.CreateDefaultLayer(conn, OSGeo.MapGuide.ObjectModels.LayerDefinition.LayerType.Drawing, new Version(1, 0, 0));
ldf.SubLayer.ResourceId = picker.ResourceID;
var dl = ((IDrawingLayerDefinition)ldf.SubLayer);
- dl.LayerFilter = "";
+ dl.LayerFilter = string.Empty;
dl.MinScale = 0;
IDrawingService dwSvc = (IDrawingService)conn.GetService((int)ServiceType.Drawing);
Modified: trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -46,8 +46,8 @@
Properties.Resources.SelectFdoProvider,
Properties.Resources.SelectFdoProvider,
conn.FeatureService.FeatureProviders,
- "DisplayName",
- "Name");
+ "DisplayName", //NOXLATE
+ "Name"); //NOXLATE
if (provider != null)
{
Added: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -0,0 +1,265 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Maestro.Base.UI
+{
+ partial class AboutDialog
+ {
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ if (components != null)
+ {
+ components.Dispose();
+ }
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDialog));
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.linkLabel = new System.Windows.Forms.LinkLabel();
+ this.label1 = new System.Windows.Forms.Label();
+ this.Version = new System.Windows.Forms.Label();
+ this.PayPalImage = new System.Windows.Forms.PictureBox();
+ this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.Localization = new System.Windows.Forms.Label();
+ this.ServerVersion = new System.Windows.Forms.Label();
+ this.thirdPartyTab = new System.Windows.Forms.TabPage();
+ this.lnkDockPanel = new System.Windows.Forms.LinkLabel();
+ this.lnkAdvTreeView = new System.Windows.Forms.LinkLabel();
+ this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+ this.lnkSharpDevelop = new System.Windows.Forms.LinkLabel();
+ this.colorBrewerlinkLabel = new System.Windows.Forms.LinkLabel();
+ this.ziplibLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.tfnetLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.label2 = new System.Windows.Forms.Label();
+ this.creditsTab = new System.Windows.Forms.TabPage();
+ this.Credits = new System.Windows.Forms.TextBox();
+ this.licenseTab = new System.Windows.Forms.TabPage();
+ this.License = new System.Windows.Forms.TextBox();
+ this.tabControl = new System.Windows.Forms.TabControl();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PayPalImage)).BeginInit();
+ this.thirdPartyTab.SuspendLayout();
+ this.creditsTab.SuspendLayout();
+ this.licenseTab.SuspendLayout();
+ this.tabControl.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ resources.ApplyResources(this.pictureBox1, "pictureBox1");
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.TabStop = false;
+ //
+ // linkLabel
+ //
+ resources.ApplyResources(this.linkLabel, "linkLabel");
+ this.linkLabel.Name = "linkLabel";
+ this.linkLabel.TabStop = true;
+ this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // Version
+ //
+ resources.ApplyResources(this.Version, "Version");
+ this.Version.Name = "Version";
+ //
+ // PayPalImage
+ //
+ this.PayPalImage.Cursor = System.Windows.Forms.Cursors.Hand;
+ resources.ApplyResources(this.PayPalImage, "PayPalImage");
+ this.PayPalImage.Name = "PayPalImage";
+ this.PayPalImage.TabStop = false;
+ this.ToolTip.SetToolTip(this.PayPalImage, resources.GetString("PayPalImage.ToolTip"));
+ this.PayPalImage.Click += new System.EventHandler(this.PayPalImage_Click);
+ //
+ // Localization
+ //
+ resources.ApplyResources(this.Localization, "Localization");
+ this.Localization.Name = "Localization";
+ //
+ // ServerVersion
+ //
+ resources.ApplyResources(this.ServerVersion, "ServerVersion");
+ this.ServerVersion.Name = "ServerVersion";
+ //
+ // thirdPartyTab
+ //
+ resources.ApplyResources(this.thirdPartyTab, "thirdPartyTab");
+ this.thirdPartyTab.Controls.Add(this.lnkDockPanel);
+ this.thirdPartyTab.Controls.Add(this.lnkAdvTreeView);
+ this.thirdPartyTab.Controls.Add(this.linkLabel1);
+ this.thirdPartyTab.Controls.Add(this.lnkSharpDevelop);
+ this.thirdPartyTab.Controls.Add(this.colorBrewerlinkLabel);
+ this.thirdPartyTab.Controls.Add(this.ziplibLinkLabel);
+ this.thirdPartyTab.Controls.Add(this.tfnetLinkLabel);
+ this.thirdPartyTab.Controls.Add(this.label2);
+ this.thirdPartyTab.Name = "thirdPartyTab";
+ this.thirdPartyTab.UseVisualStyleBackColor = true;
+ //
+ // lnkDockPanel
+ //
+ resources.ApplyResources(this.lnkDockPanel, "lnkDockPanel");
+ this.lnkDockPanel.Name = "lnkDockPanel";
+ this.lnkDockPanel.TabStop = true;
+ this.lnkDockPanel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkDockPanel_LinkClicked);
+ //
+ // lnkAdvTreeView
+ //
+ resources.ApplyResources(this.lnkAdvTreeView, "lnkAdvTreeView");
+ this.lnkAdvTreeView.Name = "lnkAdvTreeView";
+ this.lnkAdvTreeView.TabStop = true;
+ this.lnkAdvTreeView.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkAdvTreeView_LinkClicked);
+ //
+ // linkLabel1
+ //
+ resources.ApplyResources(this.linkLabel1, "linkLabel1");
+ this.linkLabel1.Name = "linkLabel1";
+ this.linkLabel1.TabStop = true;
+ this.linkLabel1.UseCompatibleTextRendering = true;
+ this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkIcons_Clicked);
+ //
+ // lnkSharpDevelop
+ //
+ resources.ApplyResources(this.lnkSharpDevelop, "lnkSharpDevelop");
+ this.lnkSharpDevelop.Name = "lnkSharpDevelop";
+ this.lnkSharpDevelop.TabStop = true;
+ this.lnkSharpDevelop.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkSharpDevelop_LinkClicked);
+ //
+ // colorBrewerlinkLabel
+ //
+ resources.ApplyResources(this.colorBrewerlinkLabel, "colorBrewerlinkLabel");
+ this.colorBrewerlinkLabel.Name = "colorBrewerlinkLabel";
+ this.colorBrewerlinkLabel.TabStop = true;
+ this.colorBrewerlinkLabel.UseCompatibleTextRendering = true;
+ this.colorBrewerlinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkColorBrewer_Clicked);
+ //
+ // ziplibLinkLabel
+ //
+ resources.ApplyResources(this.ziplibLinkLabel, "ziplibLinkLabel");
+ this.ziplibLinkLabel.Name = "ziplibLinkLabel";
+ this.ziplibLinkLabel.TabStop = true;
+ this.ziplibLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ziplibLinkLabel_LinkClicked);
+ //
+ // tfnetLinkLabel
+ //
+ resources.ApplyResources(this.tfnetLinkLabel, "tfnetLinkLabel");
+ this.tfnetLinkLabel.Name = "tfnetLinkLabel";
+ this.tfnetLinkLabel.TabStop = true;
+ this.tfnetLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.tfnetLinkLabel_LinkClicked);
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // creditsTab
+ //
+ this.creditsTab.Controls.Add(this.Credits);
+ resources.ApplyResources(this.creditsTab, "creditsTab");
+ this.creditsTab.Name = "creditsTab";
+ this.creditsTab.UseVisualStyleBackColor = true;
+ //
+ // Credits
+ //
+ resources.ApplyResources(this.Credits, "Credits");
+ this.Credits.Name = "Credits";
+ this.Credits.ReadOnly = true;
+ //
+ // licenseTab
+ //
+ this.licenseTab.Controls.Add(this.License);
+ resources.ApplyResources(this.licenseTab, "licenseTab");
+ this.licenseTab.Name = "licenseTab";
+ this.licenseTab.UseVisualStyleBackColor = true;
+ //
+ // License
+ //
+ resources.ApplyResources(this.License, "License");
+ this.License.Name = "License";
+ this.License.ReadOnly = true;
+ //
+ // tabControl
+ //
+ this.tabControl.Controls.Add(this.licenseTab);
+ this.tabControl.Controls.Add(this.creditsTab);
+ this.tabControl.Controls.Add(this.thirdPartyTab);
+ resources.ApplyResources(this.tabControl, "tabControl");
+ this.tabControl.Name = "tabControl";
+ this.tabControl.SelectedIndex = 0;
+ //
+ // AboutDialog
+ //
+ resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.ServerVersion);
+ this.Controls.Add(this.tabControl);
+ this.Controls.Add(this.Localization);
+ this.Controls.Add(this.PayPalImage);
+ this.Controls.Add(this.Version);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.linkLabel);
+ this.Controls.Add(this.pictureBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "AboutDialog";
+ this.Load += new System.EventHandler(this.FormAbout_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PayPalImage)).EndInit();
+ this.thirdPartyTab.ResumeLayout(false);
+ this.thirdPartyTab.PerformLayout();
+ this.creditsTab.ResumeLayout(false);
+ this.creditsTab.PerformLayout();
+ this.licenseTab.ResumeLayout(false);
+ this.licenseTab.PerformLayout();
+ this.tabControl.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.LinkLabel linkLabel;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label Version;
+ private System.Windows.Forms.ToolTip ToolTip;
+ private System.Windows.Forms.PictureBox PayPalImage;
+ private System.ComponentModel.IContainer components;
+ private System.Windows.Forms.Label Localization;
+ private System.Windows.Forms.Label ServerVersion;
+ private System.Windows.Forms.TabPage thirdPartyTab;
+ private System.Windows.Forms.LinkLabel lnkAdvTreeView;
+ private System.Windows.Forms.LinkLabel linkLabel1;
+ private System.Windows.Forms.LinkLabel lnkSharpDevelop;
+ private System.Windows.Forms.LinkLabel colorBrewerlinkLabel;
+ private System.Windows.Forms.LinkLabel ziplibLinkLabel;
+ private System.Windows.Forms.LinkLabel tfnetLinkLabel;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TabPage creditsTab;
+ private System.Windows.Forms.TextBox Credits;
+ private System.Windows.Forms.TabPage licenseTab;
+ private System.Windows.Forms.TextBox License;
+ private System.Windows.Forms.TabControl tabControl;
+ private System.Windows.Forms.LinkLabel lnkDockPanel;
+ }
+}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -28,42 +28,19 @@
namespace Maestro.Base.UI
{
- /// <summary>
- /// Summary description for FormAbout.
- /// </summary>
- public class AboutDialog : System.Windows.Forms.Form
- {
- private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.LinkLabel linkLabel;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label Version;
- private System.Windows.Forms.ToolTip ToolTip;
- private System.Windows.Forms.PictureBox PayPalImage;
- private System.ComponentModel.IContainer components;
- private System.Windows.Forms.Label Localization;
- private Label ServerVersion;
- private TabPage thirdPartyTab;
- private LinkLabel lnkAdvTreeView;
- private LinkLabel linkLabel1;
- private LinkLabel lnkSharpDevelop;
- private LinkLabel colorBrewerlinkLabel;
- private LinkLabel ziplibLinkLabel;
- private LinkLabel tfnetLinkLabel;
- private Label label2;
- private TabPage creditsTab;
- private TextBox Credits;
- private TabPage licenseTab;
- private TextBox License;
- private TabControl tabControl;
- private LinkLabel lnkDockPanel;
+ /// <summary>
+ /// Summary description for FormAbout.
+ /// </summary>
+ public partial class AboutDialog : System.Windows.Forms.Form
+ {
private IServerConnection m_connection;
- private AboutDialog()
- {
- //
- // Required for Windows Form Designer support
- //
- InitializeComponent();
+ private AboutDialog()
+ {
+ //
+ // Required for Windows Form Designer support
+ //
+ InitializeComponent();
this.Icon = Properties.Resources.MapGuide_Maestro;
}
@@ -73,237 +50,6 @@
m_connection = connection;
}
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- protected override void Dispose( bool disposing )
- {
- if( disposing )
- {
- if(components != null)
- {
- components.Dispose();
- }
- }
- base.Dispose( disposing );
- }
-
- #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDialog));
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.linkLabel = new System.Windows.Forms.LinkLabel();
- this.label1 = new System.Windows.Forms.Label();
- this.Version = new System.Windows.Forms.Label();
- this.PayPalImage = new System.Windows.Forms.PictureBox();
- this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
- this.Localization = new System.Windows.Forms.Label();
- this.ServerVersion = new System.Windows.Forms.Label();
- this.thirdPartyTab = new System.Windows.Forms.TabPage();
- this.lnkDockPanel = new System.Windows.Forms.LinkLabel();
- this.lnkAdvTreeView = new System.Windows.Forms.LinkLabel();
- this.linkLabel1 = new System.Windows.Forms.LinkLabel();
- this.lnkSharpDevelop = new System.Windows.Forms.LinkLabel();
- this.colorBrewerlinkLabel = new System.Windows.Forms.LinkLabel();
- this.ziplibLinkLabel = new System.Windows.Forms.LinkLabel();
- this.tfnetLinkLabel = new System.Windows.Forms.LinkLabel();
- this.label2 = new System.Windows.Forms.Label();
- this.creditsTab = new System.Windows.Forms.TabPage();
- this.Credits = new System.Windows.Forms.TextBox();
- this.licenseTab = new System.Windows.Forms.TabPage();
- this.License = new System.Windows.Forms.TextBox();
- this.tabControl = new System.Windows.Forms.TabControl();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.PayPalImage)).BeginInit();
- this.thirdPartyTab.SuspendLayout();
- this.creditsTab.SuspendLayout();
- this.licenseTab.SuspendLayout();
- this.tabControl.SuspendLayout();
- this.SuspendLayout();
- //
- // pictureBox1
- //
- resources.ApplyResources(this.pictureBox1, "pictureBox1");
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.TabStop = false;
- //
- // linkLabel
- //
- resources.ApplyResources(this.linkLabel, "linkLabel");
- this.linkLabel.Name = "linkLabel";
- this.linkLabel.TabStop = true;
- this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // Version
- //
- resources.ApplyResources(this.Version, "Version");
- this.Version.Name = "Version";
- //
- // PayPalImage
- //
- this.PayPalImage.Cursor = System.Windows.Forms.Cursors.Hand;
- resources.ApplyResources(this.PayPalImage, "PayPalImage");
- this.PayPalImage.Name = "PayPalImage";
- this.PayPalImage.TabStop = false;
- this.ToolTip.SetToolTip(this.PayPalImage, resources.GetString("PayPalImage.ToolTip"));
- this.PayPalImage.Click += new System.EventHandler(this.PayPalImage_Click);
- //
- // Localization
- //
- resources.ApplyResources(this.Localization, "Localization");
- this.Localization.Name = "Localization";
- //
- // ServerVersion
- //
- resources.ApplyResources(this.ServerVersion, "ServerVersion");
- this.ServerVersion.Name = "ServerVersion";
- //
- // thirdPartyTab
- //
- resources.ApplyResources(this.thirdPartyTab, "thirdPartyTab");
- this.thirdPartyTab.Controls.Add(this.lnkDockPanel);
- this.thirdPartyTab.Controls.Add(this.lnkAdvTreeView);
- this.thirdPartyTab.Controls.Add(this.linkLabel1);
- this.thirdPartyTab.Controls.Add(this.lnkSharpDevelop);
- this.thirdPartyTab.Controls.Add(this.colorBrewerlinkLabel);
- this.thirdPartyTab.Controls.Add(this.ziplibLinkLabel);
- this.thirdPartyTab.Controls.Add(this.tfnetLinkLabel);
- this.thirdPartyTab.Controls.Add(this.label2);
- this.thirdPartyTab.Name = "thirdPartyTab";
- this.thirdPartyTab.UseVisualStyleBackColor = true;
- //
- // lnkDockPanel
- //
- resources.ApplyResources(this.lnkDockPanel, "lnkDockPanel");
- this.lnkDockPanel.Name = "lnkDockPanel";
- this.lnkDockPanel.TabStop = true;
- this.lnkDockPanel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkDockPanel_LinkClicked);
- //
- // lnkAdvTreeView
- //
- resources.ApplyResources(this.lnkAdvTreeView, "lnkAdvTreeView");
- this.lnkAdvTreeView.Name = "lnkAdvTreeView";
- this.lnkAdvTreeView.TabStop = true;
- this.lnkAdvTreeView.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkAdvTreeView_LinkClicked);
- //
- // linkLabel1
- //
- resources.ApplyResources(this.linkLabel1, "linkLabel1");
- this.linkLabel1.Name = "linkLabel1";
- this.linkLabel1.TabStop = true;
- this.linkLabel1.UseCompatibleTextRendering = true;
- this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkIcons_Clicked);
- //
- // lnkSharpDevelop
- //
- resources.ApplyResources(this.lnkSharpDevelop, "lnkSharpDevelop");
- this.lnkSharpDevelop.Name = "lnkSharpDevelop";
- this.lnkSharpDevelop.TabStop = true;
- this.lnkSharpDevelop.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkSharpDevelop_LinkClicked);
- //
- // colorBrewerlinkLabel
- //
- resources.ApplyResources(this.colorBrewerlinkLabel, "colorBrewerlinkLabel");
- this.colorBrewerlinkLabel.Name = "colorBrewerlinkLabel";
- this.colorBrewerlinkLabel.TabStop = true;
- this.colorBrewerlinkLabel.UseCompatibleTextRendering = true;
- this.colorBrewerlinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkColorBrewer_Clicked);
- //
- // ziplibLinkLabel
- //
- resources.ApplyResources(this.ziplibLinkLabel, "ziplibLinkLabel");
- this.ziplibLinkLabel.Name = "ziplibLinkLabel";
- this.ziplibLinkLabel.TabStop = true;
- this.ziplibLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ziplibLinkLabel_LinkClicked);
- //
- // tfnetLinkLabel
- //
- resources.ApplyResources(this.tfnetLinkLabel, "tfnetLinkLabel");
- this.tfnetLinkLabel.Name = "tfnetLinkLabel";
- this.tfnetLinkLabel.TabStop = true;
- this.tfnetLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.tfnetLinkLabel_LinkClicked);
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // creditsTab
- //
- this.creditsTab.Controls.Add(this.Credits);
- resources.ApplyResources(this.creditsTab, "creditsTab");
- this.creditsTab.Name = "creditsTab";
- this.creditsTab.UseVisualStyleBackColor = true;
- //
- // Credits
- //
- resources.ApplyResources(this.Credits, "Credits");
- this.Credits.Name = "Credits";
- this.Credits.ReadOnly = true;
- //
- // licenseTab
- //
- this.licenseTab.Controls.Add(this.License);
- resources.ApplyResources(this.licenseTab, "licenseTab");
- this.licenseTab.Name = "licenseTab";
- this.licenseTab.UseVisualStyleBackColor = true;
- //
- // License
- //
- resources.ApplyResources(this.License, "License");
- this.License.Name = "License";
- this.License.ReadOnly = true;
- //
- // tabControl
- //
- this.tabControl.Controls.Add(this.licenseTab);
- this.tabControl.Controls.Add(this.creditsTab);
- this.tabControl.Controls.Add(this.thirdPartyTab);
- resources.ApplyResources(this.tabControl, "tabControl");
- this.tabControl.Name = "tabControl";
- this.tabControl.SelectedIndex = 0;
- //
- // AboutDialog
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.ServerVersion);
- this.Controls.Add(this.tabControl);
- this.Controls.Add(this.Localization);
- this.Controls.Add(this.PayPalImage);
- this.Controls.Add(this.Version);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.linkLabel);
- this.Controls.Add(this.pictureBox1);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "AboutDialog";
- this.Load += new System.EventHandler(this.FormAbout_Load);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.PayPalImage)).EndInit();
- this.thirdPartyTab.ResumeLayout(false);
- this.thirdPartyTab.PerformLayout();
- this.creditsTab.ResumeLayout(false);
- this.creditsTab.PerformLayout();
- this.licenseTab.ResumeLayout(false);
- this.licenseTab.PerformLayout();
- this.tabControl.ResumeLayout(false);
- this.ResumeLayout(false);
-
- }
- #endregion
-
/// <summary>
/// Dummy function used to create a thread to read the default locale from
/// </summary>
@@ -311,19 +57,19 @@
private UrlLauncherService _launcher;
- private void FormAbout_Load(object sender, System.EventArgs e)
- {
+ private void FormAbout_Load(object sender, System.EventArgs e)
+ {
System.Threading.Thread tmp = new System.Threading.Thread(new System.Threading.ThreadStart(dummy_function));
_launcher = ServiceRegistry.GetService<UrlLauncherService>();
Debug.Assert(_launcher != null);
Credits.Text = Properties.Resources.Contributors;
- Version.Text = string.Format(Properties.Resources.About_VersionLabel, Application.ProductVersion);
+ Version.Text = string.Format(Properties.Resources.About_VersionLabel, Application.ProductVersion);
Localization.Text = string.Format(Properties.Resources.About_LanguageLabel, System.Threading.Thread.CurrentThread.CurrentUICulture, tmp.CurrentUICulture);
- string version = "Unknown or Not Connected";
- string match = "unknown version";
+ string version = Properties.Resources.VersionUnknownOrNotConnected;
+ string match = Properties.Resources.VersionUnknown;
if (m_connection != null)
{
version = m_connection.SiteVersion.ToString();
@@ -333,51 +79,51 @@
}
ServerVersion.Text = string.Format(Properties.Resources.About_ServerVersionLabel, version, match);
- }
+ }
- private void PayPalImage_Click(object sender, System.EventArgs e)
- {
- _launcher.OpenUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=jumpinjackie%40gmail%2ecom&lc=AU&item_name=MapGuide%20Maestro%20Project¤cy_code=AUD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted");
- }
+ private void PayPalImage_Click(object sender, System.EventArgs e)
+ {
+ _launcher.OpenUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=jumpinjackie%40gmail%2ecom&lc=AU&item_name=MapGuide%20Maestro%20Project¤cy_code=AUD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"); //NOXLATE
+ }
- private void linkLabel_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
- {
+ private void linkLabel_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+ {
_launcher.OpenUrl(linkLabel.Text);
- }
+ }
private void tfnetLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://code.google.com/p/nettopologysuite/");
+ _launcher.OpenUrl("http://code.google.com/p/nettopologysuite/"); //NOXLATE
}
private void ziplibLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://sharpdevelop.net/OpenSource/SharpZipLib/Default.aspx");
+ _launcher.OpenUrl("http://sharpdevelop.net/OpenSource/SharpZipLib/Default.aspx"); //NOXLATE
}
private void lnkColorBrewer_Clicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://colorbrewer.org/");
+ _launcher.OpenUrl("http://colorbrewer.org/"); //NOXLATE
}
private void lnkSharpDevelop_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://sharpdevelop.net/OpenSource/SD/Default.aspx");
+ _launcher.OpenUrl("http://sharpdevelop.net/OpenSource/SD/Default.aspx"); //NOXLATE
}
private void lnkIcons_Clicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://p.yusukekamiyamane.com/");
+ _launcher.OpenUrl("http://p.yusukekamiyamane.com/"); //NOXLATE
}
private void lnkAdvTreeView_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://sourceforge.net/projects/treeviewadv/");
+ _launcher.OpenUrl("http://sourceforge.net/projects/treeviewadv/"); //NOXLATE
}
private void lnkDockPanel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("https://github.com/lextm/sharpsnmplib/tree/master/WinFormsUI");
+ _launcher.OpenUrl("https://github.com/lextm/sharpsnmplib/tree/master/WinFormsUI"); //NOXLATE
}
- }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -57,25 +57,25 @@
try
{
System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
- if (bounds.Trim().StartsWith("<"))
+ if (bounds.Trim().StartsWith("<")) //NOXLATE
bounds = System.Web.HttpUtility.HtmlDecode(bounds);
- bounds = "<root>" + bounds + "</root>";
+ bounds = "<root>" + bounds + "</root>"; //NOXLATE
doc.LoadXml(bounds);
- System.Xml.XmlNode root = doc["root"];
- if (root["Bounds"] != null)
+ System.Xml.XmlNode root = doc["root"]; //NOXLATE
+ if (root["Bounds"] != null) //NOXLATE
{
- if (root["Bounds"].Attributes["SRS"] != null)
- SRSCombo.Text = root["Bounds"].Attributes["SRS"].Value;
+ if (root["Bounds"].Attributes["SRS"] != null) //NOXLATE
+ SRSCombo.Text = root["Bounds"].Attributes["SRS"].Value; //NOXLATE
- if (root["Bounds"].Attributes["west"] != null)
- MinX.Text = root["Bounds"].Attributes["west"].Value;
- if (root["Bounds"].Attributes["east"] != null)
- MaxX.Text = root["Bounds"].Attributes["east"].Value;
+ if (root["Bounds"].Attributes["west"] != null) //NOXLATE
+ MinX.Text = root["Bounds"].Attributes["west"].Value; //NOXLATE
+ if (root["Bounds"].Attributes["east"] != null) //NOXLATE
+ MaxX.Text = root["Bounds"].Attributes["east"].Value; //NOXLATE
- if (root["Bounds"].Attributes["south"] != null)
- MinY.Text = root["Bounds"].Attributes["south"].Value;
- if (root["Bounds"].Attributes["north"] != null)
- MaxY.Text = root["Bounds"].Attributes["north"].Value;
+ if (root["Bounds"].Attributes["south"] != null) //NOXLATE
+ MinY.Text = root["Bounds"].Attributes["south"].Value; //NOXLATE
+ if (root["Bounds"].Attributes["north"] != null) //NOXLATE
+ MaxY.Text = root["Bounds"].Attributes["north"].Value; //NOXLATE
}
else
throw new Exception(Properties.Resources.BoundsPicker_MissingBoundsError);
@@ -166,12 +166,12 @@
return;
}
- m_bounds = "<Bounds west=\"" + MinX.Text + "\" east=\"" + MaxX.Text + "\" south=\"" + MinY.Text + "\" north=\"" + MaxY.Text + "\" ";
+ m_bounds = "<Bounds west=\"" + MinX.Text + "\" east=\"" + MaxX.Text + "\" south=\"" + MinY.Text + "\" north=\"" + MaxY.Text + "\" "; //NOXLATE
if (srs != null)
{
- m_bounds += " SRS=\"" + srs + "\"";
+ m_bounds += " SRS=\"" + srs + "\""; //NOXLATE
}
- m_bounds += " />";
+ m_bounds += " />"; //NOXLATE
this.DialogResult = DialogResult.OK;
this.Close();
Modified: trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -99,7 +99,7 @@
var rep = de.DiffReport();
TextDiffView dlg = new TextDiffView(sLF, dLF, rep, time);
- dlg.Text += " - " + _edSvc.ResourceID;
+ dlg.Text += " - " + _edSvc.ResourceID; //NOXLATE
dlg.ShowDialog();
dlg.Dispose();
}
@@ -109,7 +109,7 @@
ex.Message,
Environment.NewLine,
ex.StackTrace);
- MessageBox.Show(tmp, "Compare Error");
+ MessageBox.Show(tmp, Properties.Resources.CompareError);
return;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -113,7 +113,7 @@
return;
_translate = value;
- OnPropertyChanged("Translate");
+ OnPropertyChanged("Translate"); //NOXLATE
}
}
@@ -130,7 +130,7 @@
return;
_translation = value;
- OnPropertyChanged("Translation");
+ OnPropertyChanged("Translation"); //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -54,7 +54,7 @@
{
if (!txtMessages.IsDisposed)
{
- txtMessages.AppendText(string.Format("[{0}]: {1}", msg.LogDate.ToString("dd MMM yyyy hh:mm:ss"), msg.Message));
+ txtMessages.AppendText(string.Format("[{0}]: {1}", msg.LogDate.ToString("dd MMM yyyy hh:mm:ss"), msg.Message)); //NOXLATE
txtMessages.ScrollToCaret();
}
}
@@ -68,7 +68,7 @@
{
using (var save = DialogFactory.SaveFile())
{
- save.Filter = "*.log|*.log";
+ save.Filter = "*.log|*.log"; //NOXLATE
if (save.ShowDialog() == DialogResult.OK)
{
File.WriteAllText(save.FileName, txtMessages.Text);
Modified: trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -189,7 +189,7 @@
private void lstTemplates_SelectedIndexChanged(object sender, EventArgs e)
{
- txtDescription.Text = "";
+ txtDescription.Text = string.Empty;
if (lstTemplates.SelectedItems.Count == 1)
{
var li = lstTemplates.SelectedItems[0];
Modified: trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -48,7 +48,7 @@
{
items.Add(new KeyValuePair<string, IServerConnection>(name, connMgr.GetConnection(name)));
}
- cmbConnection.DisplayMember = "Key";
+ cmbConnection.DisplayMember = "Key"; //NOXLATE
cmbConnection.DataSource = items;
cmbConnection.SelectedIndex = 0;
}
@@ -73,11 +73,11 @@
private void btnOpen_Click(object sender, EventArgs e)
{
- lblMessage.Text = "";
+ lblMessage.Text = string.Empty;
if (ResourceIdentifier.Validate(txtResourceId.Text) && !ResourceIdentifier.IsFolderResource(txtResourceId.Text))
this.DialogResult = System.Windows.Forms.DialogResult.OK;
else
- lblMessage.Text = "Resource ID is not valid";
+ lblMessage.Text = Properties.Resources.InvalidResourceId;
}
private void btnCancel_Click(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -64,7 +64,7 @@
void OnRequestDispatched(object sender, OSGeo.MapGuide.MaestroAPI.RequestEventArgs e)
{
- string msg = string.Format("[{0}]: {1}", DateTime.Now.ToString("dd MMM yyyy hh:mm:ss"), e.Data);
+ string msg = string.Format("[{0}]: {1}", DateTime.Now.ToString("dd MMM yyyy hh:mm:ss"), e.Data); //NOXLATE
if (!txtMessages.IsDisposed)
{
@@ -93,7 +93,7 @@
{
using (var save = DialogFactory.SaveFile())
{
- save.Filter = "*.log|*.log";
+ save.Filter = "*.log|*.log"; //NOXLATE
if (save.ShowDialog() == DialogResult.OK)
{
File.WriteAllText(save.FileName, txtMessages.Text);
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -29,19 +29,19 @@
{
public static class ConfigProperties
{
- public const string PreviewViewerType = "General.PreviewViewerType";
- public const string UserTemplatesDirectory = "General.UserTemplatesDirectory";
- public const string ShowMessages = "General.ShowMessages";
- public const string ShowOutboundRequests = "General.ShowOutboundRequests";
- public const string OpenColor = "General.OpenColor";
- public const string DirtyColor = "General.DirtyColor";
- public const string MgCookerPath = "General.MgCookerPath";
- public const string RtMapInspectorPath = "General.RtMapInspectorPath";
- public const string LocalFsPreviewPath = "General.LocalFsPreviewPath";
- public const string ValidateOnSave = "General.ValidateResourceOnSave";
- public const string XsdSchemaPath = "Editor.XsdSchemaPath";
- public const string ShowTipOfTheDay = "General.ShowTipOfTheDay";
- public const string LiveMapEditorPath = "General.LiveMapEditorPath";
+ public const string PreviewViewerType = "General.PreviewViewerType"; //NOXLATE
+ public const string UserTemplatesDirectory = "General.UserTemplatesDirectory"; //NOXLATE
+ public const string ShowMessages = "General.ShowMessages"; //NOXLATE
+ public const string ShowOutboundRequests = "General.ShowOutboundRequests"; //NOXLATE
+ public const string OpenColor = "General.OpenColor"; //NOXLATE
+ public const string DirtyColor = "General.DirtyColor"; //NOXLATE
+ public const string MgCookerPath = "General.MgCookerPath"; //NOXLATE
+ public const string RtMapInspectorPath = "General.RtMapInspectorPath"; //NOXLATE
+ public const string LocalFsPreviewPath = "General.LocalFsPreviewPath"; //NOXLATE
+ public const string ValidateOnSave = "General.ValidateResourceOnSave"; //NOXLATE
+ public const string XsdSchemaPath = "Editor.XsdSchemaPath"; //NOXLATE
+ public const string ShowTipOfTheDay = "General.ShowTipOfTheDay"; //NOXLATE
+ public const string LiveMapEditorPath = "General.LiveMapEditorPath"; //NOXLATE
internal static void ApplyDefaults()
{
@@ -72,13 +72,13 @@
public static bool DefaultShowTipOfTheDay { get { return true; } }
- public static string DefaultMgCookerPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "MgCooker.exe"); } }
+ public static string DefaultMgCookerPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "MgCooker.exe"); } } //NOXLATE
- public static string DefaultLocalFsPreviewPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "MaestroFsPreview.exe"); } }
+ public static string DefaultLocalFsPreviewPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "MaestroFsPreview.exe"); } } //NOXLATE
- public static string DefaultRtMapInspectorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "RtMapInspector.exe"); } }
+ public static string DefaultRtMapInspectorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "RtMapInspector.exe"); } } //NOXLATE
- public static string DefaultLiveMapEditorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "Maestro.LiveMapEditor.exe"); } }
+ public static string DefaultLiveMapEditorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "Maestro.LiveMapEditor.exe"); } } //NOXLATE
public static Color DefaultOpenColor { get { return Color.LightGreen; } }
@@ -90,10 +90,10 @@
public static bool DefaultValidateOnSave { get { return true; } }
- public static string DefaultXsdSchemaPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "Schemas"); } }
+ public static string DefaultXsdSchemaPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "Schemas"); } } //NOXLATE
- public static string DefaultPreviewViewerType { get { return "AJAX"; } }
+ public static string DefaultPreviewViewerType { get { return "AJAX"; } } //NOXLATE
- public static string DefaultUserTemplatesDirectory { get { return Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"); } }
+ public static string DefaultUserTemplatesDirectory { get { return Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"); } } //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -44,13 +44,13 @@
{
base.OnLoad(e);
- var viewer = Props.Get(ConfigProperties.PreviewViewerType, "AJAX");
- if (viewer.Equals("AJAX"))
+ var viewer = Props.Get(ConfigProperties.PreviewViewerType, "AJAX"); //NOXLATE
+ if (viewer.Equals("AJAX")) //NOXLATE
rdAjax.Checked = true;
else
rdFusion.Checked = true;
- var path = Props.Get(ConfigProperties.UserTemplatesDirectory, Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"));
+ var path = Props.Get(ConfigProperties.UserTemplatesDirectory, Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates")); //NOXLATE
txtTemplatePath.Text = path;
var msg = Props.Get(ConfigProperties.ShowMessages, true);
chkMessages.Checked = msg;
@@ -93,9 +93,9 @@
//These changes can be applied without restart
if (rdFusion.Checked)
- Apply(ConfigProperties.PreviewViewerType, "FUSION");
+ Apply(ConfigProperties.PreviewViewerType, "FUSION"); //NOXLATE
else
- Apply(ConfigProperties.PreviewViewerType, "AJAX");
+ Apply(ConfigProperties.PreviewViewerType, "AJAX"); //NOXLATE
Apply(ConfigProperties.UserTemplatesDirectory, txtTemplatePath.Text);
Apply(ConfigProperties.MgCookerPath, txtMgCooker.Text);
@@ -107,10 +107,10 @@
Apply(ConfigProperties.ShowTipOfTheDay, chkShowTipOfTheDay.Checked);
//These changes require restart
- if (Apply(ConfigProperties.ShowMessages, chkMessages.Checked ? "True" : "False"))
+ if (Apply(ConfigProperties.ShowMessages, chkMessages.Checked ? "True" : "False")) //NOXLATE
restart = true;
- if (Apply(ConfigProperties.ShowOutboundRequests, chkOutbound.Checked ? "True" : "False"))
+ if (Apply(ConfigProperties.ShowOutboundRequests, chkOutbound.Checked ? "True" : "False")) //NOXLATE
restart = true;
return restart;
@@ -137,7 +137,7 @@
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MgCooker.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MgCooker.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == DialogResult.OK)
{
@@ -150,7 +150,7 @@
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "MaestroFsPreview.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == DialogResult.OK)
{
@@ -163,7 +163,7 @@
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "RtMapInspector.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "RtMapInspector.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == DialogResult.OK)
{
@@ -176,7 +176,7 @@
{
using (var dlg = DialogFactory.OpenFile())
{
- dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe");
+ dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe"); //NOXLATE
dlg.Filter = Properties.Resources.FilterExecutables;
if (dlg.ShowDialog() == DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -39,7 +39,7 @@
protected override void OnLoad(EventArgs e)
{
- _sheets = AddInTree.BuildItems<IPreferenceSheet>("/Maestro/Preferences", this);
+ _sheets = AddInTree.BuildItems<IPreferenceSheet>("/Maestro/Preferences", this); //NOXLATE
tabPreferences.TabPages.Clear();
foreach (var sh in _sheets)
{
@@ -76,7 +76,7 @@
restart = true;
}
PropertyService.Save();
- LoggingService.Info("Preferences saved");
+ LoggingService.Info("Preferences saved"); //NOXLATE
return restart;
}
@@ -98,7 +98,7 @@
restart = true;
}
PropertyService.Save();
- LoggingService.Info("Preferences reset with default values");
+ LoggingService.Info("Preferences reset with default values"); //NOXLATE
return restart;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -83,23 +83,23 @@
mdf.RemoveLayer(layers[i]);
}
- var layer = mdf.AddLayer(null, "x", resourceId);
+ var layer = mdf.AddLayer(null, "x", resourceId); //NOXLATE
layer.Visible = true;
layer.Selectable = true;
- layer.Name = "x";
- layer.LegendLabel = "";
+ layer.Name = "x"; //NOXLATE
+ layer.LegendLabel = string.Empty;
}
private void MakeTempMap()
{
if (m_tempmap == null)
{
- IMapDefinition m = ObjectFactory.CreateMapDefinition(m_connection, "");
- m.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]";
+ IMapDefinition m = ObjectFactory.CreateMapDefinition(m_connection, string.Empty);
+ m.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]"; //NOXLATE
m.SetExtents(-1, -1, 1, 1);
//AIMS 2012 demands this checks out. Can't flub it anymore
- m.ResourceID = "Session:" + m_connection.SessionID + "//non-existing.MapDefinition";
+ m.ResourceID = "Session:" + m_connection.SessionID + "//non-existing.MapDefinition"; //NOXLATE
var mpsvc = (IMappingService)m_connection.GetService((int)ServiceType.Mapping);
var rid = new ResourceIdentifier(Guid.NewGuid().ToString(), ResourceTypes.RuntimeMap, m_connection.SessionID);
@@ -125,11 +125,11 @@
{
try
{
- IMapDefinition mdef = ObjectFactory.CreateMapDefinition(m_connection, "");
+ IMapDefinition mdef = ObjectFactory.CreateMapDefinition(m_connection, string.Empty);
//We cannot flub this anymore. AIMS 2012 demands the Map Definition id specified checks out
- mdef.ResourceID = "Session:" + m_connection.SessionID + "//ProfileTest.MapDefinition";
+ mdef.ResourceID = "Session:" + m_connection.SessionID + "//ProfileTest.MapDefinition"; //NOXLATE
m_connection.ResourceService.SaveResource(mdef);
- IMapLayer layer = mdef.AddLayer(null, "Test Layer", ldef.ResourceID);
+ IMapLayer layer = mdef.AddLayer(null, "Test Layer", ldef.ResourceID); //NOXLATE
layer.Visible = false;
layer.Selectable = false;
@@ -141,7 +141,7 @@
var map = mpsvc.CreateMap(mdef);
using (new Timer(Properties.Resources.Prof_LogMessageIdentifyFetching, backgroundWorker))
{
- var rtl = map.Layers["Test Layer"];
+ var rtl = map.Layers["Test Layer"]; //NOXLATE
rtl.Visible = true;
rtl.Selectable = true;
}
@@ -199,7 +199,7 @@
{
mdf.CoordinateSystem = lst.SpatialContext[0].CoordinateSystemWkt;
if (string.IsNullOrEmpty(m_tempmap.CoordinateSystem))
- mdf.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]";
+ mdf.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]"; //NOXLATE
double llx = double.Parse(lst.SpatialContext[0].Extent.LowerLeftCoordinate.X, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture);
double lly = double.Parse(lst.SpatialContext[0].Extent.LowerLeftCoordinate.Y, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture); ;
@@ -213,7 +213,7 @@
var mpsvc = (IMappingService)m_connection.GetService((int)ServiceType.Mapping);
//We cannot flub this anymore. AIMS 2012 demands the Map Definition id specified checks out
- mdf.ResourceID = "Session:" + m_connection.SessionID + "//ProfileTest.MapDefinition";
+ mdf.ResourceID = "Session:" + m_connection.SessionID + "//ProfileTest.MapDefinition"; //NOXLATE
m_connection.ResourceService.SaveResource(mdf);
var rtmap = mpsvc.CreateMap(mdf);
@@ -249,7 +249,7 @@
if (backgroundWorker.CancellationPending)
return;
- backgroundWorker.ReportProgress(0, ("\r\n"));
+ backgroundWorker.ReportProgress(0, ("\r\n")); //NOXLATE
}
private void ProfileMapDefinition(IMapDefinition mapDef)
@@ -337,7 +337,7 @@
return;
//We cannot flub this anymore. AIMS 2012 demands the Map Definition id specified checks out
- mdef.ResourceID = "Session:" + m_connection.SessionID + "//ProfilingTest.MapDefinition";
+ mdef.ResourceID = "Session:" + m_connection.SessionID + "//ProfilingTest.MapDefinition"; //NOXLATE
m_connection.ResourceService.SaveResource(mdef);
var rtmap = mpsvc.CreateMap(mdef);
@@ -388,7 +388,7 @@
{
TimeSpan ts = DateTime.Now - m_begin;
m_isDisposed = true;
- m_worker.ReportProgress(0, (m_text + ts.TotalMilliseconds)); //ts.Minutes.ToString("00") + ":" + ts.Seconds.ToString("00") + "." + ts.Milliseconds.ToString("000")));
+ m_worker.ReportProgress(0, (m_text + ts.TotalMilliseconds));
m_worker = null;
m_text = null;
}
@@ -447,7 +447,7 @@
bool scroll = Math.Abs((Results.SelectionStart + Results.SelectionLength) - Results.Text.Length) < 20;
- Results.Text += message + "\r\n";
+ Results.Text += message + "\r\n"; //NOXLATE
if (scroll)
{
Results.SelectionLength = 0;
Modified: trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -138,7 +138,7 @@
if (this.ResourceType == ResourceTypes.Folder.ToString())
return this.Name;
else
- return this.Name + "." + this.ResourceType;
+ return this.Name + "." + this.ResourceType; //NOXLATE
}
}
@@ -198,7 +198,7 @@
public bool IsRoot
{
- get { return this.ResourceId == "Library://"; }
+ get { return this.ResourceId == StringConstants.RootIdentifier; }
}
public string ResourceId
@@ -228,7 +228,7 @@
return;
string parentid = ResourceIdentifier.GetParentFolder(this.ResourceId);
- this.ResourceId = parentid + this.NameQualified + ((IsFolder) ? "/" : "");
+ this.ResourceId = parentid + this.NameQualified + ((IsFolder) ? "/" : string.Empty); //NOXLATE
NotifyNodesChanged();
}
}
@@ -299,7 +299,7 @@
public bool IsFolder
{
- get { return this.ResourceId.EndsWith("/"); }
+ get { return this.ResourceId.EndsWith("/"); } //NOXLATE
}
public Image Icon
@@ -456,7 +456,7 @@
var conn = _connManager.GetConnection(connName);
- var list = conn.ResourceService.GetRepositoryResources("Library://", 0);
+ var list = conn.ResourceService.GetRepositoryResources(StringConstants.RootIdentifier, 0); //NOXLATE
if (list.Items.Count != 1)
{
throw new InvalidOperationException(); //Huh?
@@ -487,7 +487,7 @@
string connName = GetParentConnectionName(node);
var conn = _connManager.GetConnection(connName);
node.ClearChildrenWithoutNotification();
- var list = conn.ResourceService.GetRepositoryResources(node.ResourceId, "", 1, false);
+ var list = conn.ResourceService.GetRepositoryResources(node.ResourceId, string.Empty, 1, false); //NOXLATE
foreach (RepositoryItem item in GetSorted(connName, list))
{
node.AddChildWithoutNotification(item);
@@ -581,10 +581,10 @@
internal TreePath GetPathFromResourceId(string connectionName, string resId)
{
var rootNode = _rootNodes[connectionName];
- if ("Library://".Equals(resId))
+ if (StringConstants.RootIdentifier.Equals(resId))
return GetPath(rootNode);
-
- string[] components = ResourceIdentifier.GetPath(resId).Split('/');
+
+ string[] components = ResourceIdentifier.GetPath(resId).Split('/'); //NOXLATE
if (!ResourceIdentifier.IsFolderResource(resId))
{
//Fix extension to last component
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -81,7 +81,7 @@
else
_resSvc.SetResourceHeader(_resourceId, (ResourceDocumentHeaderType)obj);
- LoggingService.Info("Resource Header Updated: " + _resourceId);
+ LoggingService.Info("Resource Header Updated: " + _resourceId); //NOXLATE
}
catch (Exception ex)
{
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -49,7 +49,7 @@
_large = new ImageList();
}
- const string UNKNOWN = "UNKNOWN";
+ const string UNKNOWN = "UNKNOWN"; //NOXLATE
public static ResourceIconCache CreateDefault()
{
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -156,12 +156,12 @@
UpdateListItem(g, gl[g.Name]);
UseInherited.Checked = m_resourceHeader.Security.Inherited;
- if (m_resourceId.Extension != "LayerDefinition")
+ if (m_resourceId.Extension != ResourceTypes.LayerDefinition.ToString())
tabControl1.TabPages.Remove(WMSTab);
else
UpdateWMSDisplay();
- if (m_resourceId.Extension != "FeatureSource")
+ if (m_resourceId.Extension != ResourceTypes.FeatureSource.ToString())
tabControl1.TabPages.Remove(WFSTab);
else
UpdateWFSDisplay();
@@ -195,26 +195,26 @@
{
var props = m_resourceHeader.Metadata.GetProperties();
- WFSTitle.Text = props["_Title"];
- WFSKeywords.Text = props["_Keywords"];
- WFSAbstract.Text = props["_Abstract"];
- WFSMetadata.Text = props["_ExtendedMetadata"];
+ WFSTitle.Text = props["_Title"]; //NOXLATE
+ WFSKeywords.Text = props["_Keywords"]; //NOXLATE
+ WFSAbstract.Text = props["_Abstract"]; //NOXLATE
+ WFSMetadata.Text = props["_ExtendedMetadata"]; //NOXLATE
- txtPrimarySRS.Text = props["_PrimarySRS"];
- txtOtherSRS.Text = props["_OtherSRS"];
- WFSAvailable.Checked = props["_IsPublished"] == "1";
- WFSBounds.Text = props["_Bounds"];
+ txtPrimarySRS.Text = props["_PrimarySRS"]; //NOXLATE
+ txtOtherSRS.Text = props["_OtherSRS"]; //NOXLATE
+ WFSAvailable.Checked = props["_IsPublished"] == "1"; //NOXLATE
+ WFSBounds.Text = props["_Bounds"]; //NOXLATE
}
else
{
WFSTitle.Text =
WFSKeywords.Text =
WFSAbstract.Text =
- WFSMetadata.Text = "";
+ WFSMetadata.Text = string.Empty;
txtPrimarySRS.Text =
txtOtherSRS.Text =
- WFSBounds.Text = "";
+ WFSBounds.Text = string.Empty;
WFSAvailable.Checked = false;
}
}
@@ -234,28 +234,28 @@
if (m_resourceHeader.Metadata != null && m_resourceHeader.Metadata.Simple != null && m_resourceHeader.Metadata.Simple.Property != null)
{
var props = m_resourceHeader.Metadata.GetProperties();
- WMSTitle.Text = props["_Title"];
- WMSKeyWords.Text = props["_Keywords"];
- WMSAbstract.Text = props["_Abstract"];
- WMSMetadata.Text = props["_ExtendedMetadata"];
+ WMSTitle.Text = props["_Title"]; //NOXLATE
+ WMSKeyWords.Text = props["_Keywords"]; //NOXLATE
+ WMSAbstract.Text = props["_Abstract"]; //NOXLATE
+ WMSMetadata.Text = props["_ExtendedMetadata"]; //NOXLATE
- WMSQueryable.Checked = props["_Queryable"] == "1";
- WMSOpaque.Checked = props["_Opaque"] == "1";
- WMSAvalible.Checked = props["_IsPublished"] == "1";
- WMSBounds.Text = props["_Bounds"];
+ WMSQueryable.Checked = props["_Queryable"] == "1"; //NOXLATE
+ WMSOpaque.Checked = props["_Opaque"] == "1"; //NOXLATE
+ WMSAvalible.Checked = props["_IsPublished"] == "1"; //NOXLATE
+ WMSBounds.Text = props["_Bounds"]; //NOXLATE
}
else
{
WMSTitle.Text =
WMSKeyWords.Text =
WMSAbstract.Text =
- WMSMetadata.Text = "";
+ WMSMetadata.Text = string.Empty;
WMSQueryable.Checked =
WMSOpaque.Checked =
WMSAvalible.Checked = false;
- WMSBounds.Text = "";
+ WMSBounds.Text = string.Empty;
}
}
finally
@@ -332,7 +332,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Title", WMSTitle.Text);
+ m_resourceHeader.Metadata.SetProperty("_Title", WMSTitle.Text); //NOXLATE
}
private void EnsureMetaData()
@@ -349,56 +349,56 @@
m_resourceHeader.Metadata.Simple.Property = new ResourceDocumentHeaderTypeMetadataSimplePropertyCollection();
*/
- if (m_resourceId.Extension == "LayerDefinition")
+ if (m_resourceId.Extension == ResourceTypes.LayerDefinition.ToString())
{
var props = m_resourceHeader.Metadata.GetProperties();
bool apply = false;
- if (props["_Title"] == null)
+ if (props["_Title"] == null) //NOXLATE
{
- props["_Title"] = "";
+ props["_Title"] = string.Empty; //NOXLATE
apply = true;
}
- if (props["_Keywords"] == null)
+ if (props["_Keywords"] == null) //NOXLATE
{
- props["_Keywords"] = "";
+ props["_Keywords"] = string.Empty; //NOXLATE
apply = true;
}
- if (props["_Abstract"] == null)
+ if (props["_Abstract"] == null) //NOXLATE
{
- props["_Abstract"] = "";
+ props["_Abstract"] = string.Empty; //NOXLATE
apply = true;
}
- if (props["_ExtendedMetadata"] == null)
+ if (props["_ExtendedMetadata"] == null) //NOXLATE
{
- props["_ExtendedMetadata"] = "";
+ props["_ExtendedMetadata"] = string.Empty; //NOXLATE
apply = true;
}
- if (props["_Queryable"] == null)
+ if (props["_Queryable"] == null) //NOXLATE
{
- props["_Queryable"] = "0";
+ props["_Queryable"] = "0"; //NOXLATE
apply = true;
}
- if (props["_Opaque"] == null)
+ if (props["_Opaque"] == null) //NOXLATE
{
- props["_Opaque"] = "0";
+ props["_Opaque"] = "0"; //NOXLATE
apply = true;
}
- if (props["_IsPublished"] == null)
+ if (props["_IsPublished"] == null) //NOXLATE
{
- props["_IsPublished"] = "0";
+ props["_IsPublished"] = "0"; //NOXLATE
apply = true;
}
- if (props["_Bounds"] == null)
+ if (props["_Bounds"] == null) //NOXLATE
{
- props["_Bounds"] = "";
+ props["_Bounds"] = string.Empty; //NOXLATE
apply = true;
}
@@ -413,7 +413,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Keywords", WMSKeyWords.Text);
+ m_resourceHeader.Metadata.SetProperty("_Keywords", WMSKeyWords.Text); //NOXLATE
}
private void WMSAbstract_TextChanged(object sender, EventArgs e)
@@ -421,7 +421,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Abstract", WMSAbstract.Text);
+ m_resourceHeader.Metadata.SetProperty("_Abstract", WMSAbstract.Text); //NOXLATE
}
private void WMSMetadata_TextChanged(object sender, EventArgs e)
@@ -429,7 +429,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_ExtendedMetadata", WMSMetadata.Text);
+ m_resourceHeader.Metadata.SetProperty("_ExtendedMetadata", WMSMetadata.Text); //NOXLATE
}
private void WMSAvalible_CheckedChanged(object sender, EventArgs e)
@@ -437,7 +437,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_IsPublished", Convert.ToInt32(WMSAvalible.Checked).ToString());
+ m_resourceHeader.Metadata.SetProperty("_IsPublished", Convert.ToInt32(WMSAvalible.Checked).ToString()); //NOXLATE
}
private void WMSBounds_TextChanged(object sender, EventArgs e)
@@ -445,7 +445,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Bounds", WMSBounds.Text);
+ m_resourceHeader.Metadata.SetProperty("_Bounds", WMSBounds.Text); //NOXLATE
}
private void WMSQueryable_CheckedChanged(object sender, EventArgs e)
@@ -453,7 +453,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Queryable", Convert.ToInt32(WMSQueryable.Checked).ToString());
+ m_resourceHeader.Metadata.SetProperty("_Queryable", Convert.ToInt32(WMSQueryable.Checked).ToString()); //NOXLATE
}
private void WMSOpaque_CheckedChanged(object sender, EventArgs e)
@@ -461,7 +461,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Opaque", Convert.ToInt32(WMSOpaque.Checked).ToString());
+ m_resourceHeader.Metadata.SetProperty("_Opaque", Convert.ToInt32(WMSOpaque.Checked).ToString()); //NOXLATE
}
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
@@ -489,7 +489,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Title", WFSTitle.Text);
+ m_resourceHeader.Metadata.SetProperty("_Title", WFSTitle.Text); //NOXLATE
}
private void WFSKeywords_TextChanged(object sender, EventArgs e)
@@ -497,7 +497,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Keywords", WFSKeywords.Text);
+ m_resourceHeader.Metadata.SetProperty("_Keywords", WFSKeywords.Text); //NOXLATE
}
private void WFSAbstract_TextChanged(object sender, EventArgs e)
@@ -505,7 +505,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Abstract", WFSAbstract.Text);
+ m_resourceHeader.Metadata.SetProperty("_Abstract", WFSAbstract.Text); //NOXLATE
}
private void WFSMetadata_TextChanged(object sender, EventArgs e)
@@ -513,7 +513,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_ExtendedMetadata", WFSMetadata.Text);
+ m_resourceHeader.Metadata.SetProperty("_ExtendedMetadata", WFSMetadata.Text); //NOXLATE
}
private void WFSAvailable_CheckedChanged(object sender, EventArgs e)
@@ -521,7 +521,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_IsPublished", Convert.ToInt32(WFSAvailable.Checked).ToString());
+ m_resourceHeader.Metadata.SetProperty("_IsPublished", Convert.ToInt32(WFSAvailable.Checked).ToString()); //NOXLATE
}
private void WFSPrimarySRS_TextChanged(object sender, EventArgs e)
@@ -529,7 +529,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_PrimarySRS", txtPrimarySRS.Text);
+ m_resourceHeader.Metadata.SetProperty("_PrimarySRS", txtPrimarySRS.Text); //NOXLATE
}
private void WFSOtherSRS_TextChanged(object sender, EventArgs e)
@@ -537,7 +537,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_OtherSRS", txtOtherSRS.Text);
+ m_resourceHeader.Metadata.SetProperty("_OtherSRS", txtOtherSRS.Text); //NOXLATE
}
private void WFSBounds_TextChanged(object sender, EventArgs e)
@@ -545,7 +545,7 @@
if (m_isUpdating)
return;
EnsureMetaData();
- m_resourceHeader.Metadata.SetProperty("_Bounds", WFSBounds.Text);
+ m_resourceHeader.Metadata.SetProperty("_Bounds", WFSBounds.Text); //NOXLATE
}
private void WFSClearHeaderButton_Click(object sender, EventArgs e)
@@ -563,8 +563,8 @@
foreach (DataGridViewRow dr in dataGridView1.Rows)
{
- string k = dr.Cells[0].Value == null || dr.Cells[0].Value == DBNull.Value ? "" : dr.Cells[0].Value.ToString();
- string v = dr.Cells[1].Value == null || dr.Cells[1].Value == DBNull.Value ? "" : dr.Cells[1].Value.ToString();
+ string k = dr.Cells[0].Value == null || dr.Cells[0].Value == DBNull.Value ? string.Empty : dr.Cells[0].Value.ToString();
+ string v = dr.Cells[1].Value == null || dr.Cells[1].Value == DBNull.Value ? string.Empty : dr.Cells[1].Value.ToString();
if (!string.IsNullOrEmpty(k))
m_resourceHeader.Metadata.SetProperty(k, v);
@@ -735,7 +735,7 @@
List<string> items = new List<string>();
foreach (OSGeo.MapGuide.MaestroAPI.CoordinateSystem.CoordinateSystemDefinitionBase c in m_connection.CoordinateSystemCatalog.Coordsys)
{
- if (c.Code.StartsWith("EPSG:"))
+ if (c.Code.StartsWith("EPSG:")) //NOXLATE
items.Add(c.Code);
}
@@ -763,7 +763,7 @@
try
{
m_isUpdating = true;
- string srs = "EPSG:????";
+ string srs = "EPSG:????"; //NOXLATE
string bounds = WMSBounds.Text;
bool warnedEPSG = false;
@@ -772,15 +772,15 @@
if (!string.IsNullOrEmpty(bounds))
{
System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
- if (bounds.Trim().StartsWith("<"))
+ if (bounds.Trim().StartsWith("<")) //NOXLATE
bounds = System.Web.HttpUtility.HtmlDecode(bounds);
- bounds = "<root>" + bounds + "</root>";
+ bounds = "<root>" + bounds + "</root>"; //NOXLATE
doc.LoadXml(bounds);
- System.Xml.XmlNode root = doc["root"];
- if (root["Bounds"] != null)
+ System.Xml.XmlNode root = doc["root"]; //NOXLATE
+ if (root["Bounds"] != null) //NOXLATE
{
- if (root["Bounds"].Attributes["SRS"] != null)
- srs = root["Bounds"].Attributes["SRS"].Value;
+ if (root["Bounds"].Attributes["SRS"] != null) //NOXLATE
+ srs = root["Bounds"].Attributes["SRS"].Value; //NOXLATE
}
else
throw new Exception(Properties.Resources.ResProp_MissingBoundsError);
@@ -800,17 +800,17 @@
//TODO: Convert wkt to EPSG code and use that?
//TODO: Convert to lon/lat
- bounds = "<Bounds west=\"" + env.MinX.ToString(ic) + "\" east=\"" + env.MaxX.ToString(ic) + "\" south=\"" + env.MinY.ToString(ic) + "\" north=\"" + env.MaxY.ToString(ic) + "\" ";
- bounds += " SRS=\"" + srs + "\"";
- bounds += " />";
+ bounds = "<Bounds west=\"" + env.MinX.ToString(ic) + "\" east=\"" + env.MaxX.ToString(ic) + "\" south=\"" + env.MinY.ToString(ic) + "\" north=\"" + env.MaxY.ToString(ic) + "\" "; //NOXLATE
+ bounds += " SRS=\"" + srs + "\""; //NOXLATE
+ bounds += " />"; //NOXLATE
m_isUpdating = false;
WMSBounds.Text = bounds;
- if ((srs == "" || srs == "EPSG:????") && !warnedEPSG)
+ if ((srs == string.Empty || srs == "EPSG:????") && !warnedEPSG) //NOXLATE
{
MessageBox.Show(this, Properties.Resources.ResProp_EpsgMissingWarning, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
- WMSBounds.SelectionStart = WMSBounds.Text.IndexOf("SRS=\"") + "SRS=\"".Length;
+ WMSBounds.SelectionStart = WMSBounds.Text.IndexOf("SRS=\"") + "SRS=\"".Length; //NOXLATE
WMSBounds.SelectionLength = WMSBounds.Text.IndexOf("\"", WMSBounds.SelectionStart) - WMSBounds.SelectionStart;
WMSBounds.ScrollToCaret();
WMSBounds.Focus();
@@ -864,7 +864,7 @@
throw new Exception(failures ? Properties.Resources.ResProp_NoSpatialDataWithFailuresError : Properties.Resources.ResProp_NoSpatialDataError);
m_isUpdating = false;
- WFSBounds.Text = "<Bounds west=\"" + env.MinX.ToString(ic) + "\" east=\"" + env.MaxX.ToString(ic) + "\" south=\"" + env.MinY.ToString(ic) + "\" north=\"" + env.MaxY.ToString(ic) + "\" />";
+ WFSBounds.Text = "<Bounds west=\"" + env.MinX.ToString(ic) + "\" east=\"" + env.MaxX.ToString(ic) + "\" south=\"" + env.MinY.ToString(ic) + "\" north=\"" + env.MaxY.ToString(ic) + "\" />"; //NOXLATE
}
catch (Exception ex)
{
Modified: trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -52,7 +52,7 @@
ndResource.ToolTipProvider = new RepositoryItemToolTipProvider();
ndResource.DrawText += new EventHandler<Aga.Controls.Tree.NodeControls.DrawEventArgs>(OnNodeDrawText);
- var ts = ToolbarService.CreateToolStripItems("/Maestro/Shell/SiteExplorer/Toolbar", this, true);
+ var ts = ToolbarService.CreateToolStripItems("/Maestro/Shell/SiteExplorer/Toolbar", this, true); //NOXLATE
tsSiteExplorer.Items.AddRange(ts);
_connManager = ServiceRegistry.GetService<ServerConnectionManager>();
@@ -220,9 +220,9 @@
{
RepositoryItem item = items[0];
if (item.IsFolder)
- MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedFolder", trvResources, e.X, e.Y);
+ MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedFolder", trvResources, e.X, e.Y); //NOXLATE
else
- MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedDocument", trvResources, e.X, e.Y);
+ MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedDocument", trvResources, e.X, e.Y); //NOXLATE
}
else //Multi select
{
@@ -237,15 +237,15 @@
if (folderCount == 0) //All selected documents
{
- MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedDocuments", trvResources, e.X, e.Y);
+ MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedDocuments", trvResources, e.X, e.Y); //NOXLATE
}
else if (folderCount == items.Length) //All selected folders
{
- MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedFolders", trvResources, e.X, e.Y);
+ MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedFolders", trvResources, e.X, e.Y); //NOXLATE
}
else //Mixed selection
{
- MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedMixedResources", trvResources, e.X, e.Y);
+ MenuService.ShowContextMenu(this, "/Maestro/Shell/SiteExplorer/SelectedMixedResources", trvResources, e.X, e.Y); //NOXLATE
}
}
}
@@ -302,7 +302,7 @@
public void ExpandNode(string connectionName, string folderId)
{
- if ("Library://".Equals(folderId))
+ if (StringConstants.RootIdentifier.Equals(folderId))
return;
var path = _model.GetPathFromResourceId(connectionName, folderId);
@@ -437,7 +437,7 @@
foreach (var fid in folders)
{
- LoggingService.Info("Refreshing: " + fid + " on " + connectionName); //LOCALIZEME
+ LoggingService.Info("Refreshing: " + fid + " on " + connectionName); //NOXLATE
RefreshModel(connectionName, fid);
}
}
@@ -472,22 +472,22 @@
/*
//If we're dropping to the root, the common parent becomes our
//target root
- if (folderId == "Library://")
+ if (folderId == StringConstants.RootIdentifier)
folderId = rootSourceParent;
*/
//If common parent is not root, we want the name of the folder to append
//to our target
- if (rootSourceParent != "Library://")
+ if (rootSourceParent != StringConstants.RootIdentifier)
{
ResourceIdentifier resId = new ResourceIdentifier(rootSourceParent);
- folderId = folderId + resId.Name + "/";
+ folderId = folderId + resId.Name + "/"; //NOXLATE
}
var targets = new List<string>();
foreach (var resId in sourceIds)
{
var dstId = resId.Replace(rootSourceParent, folderId);
- System.Diagnostics.Trace.TraceInformation("{0} => {1}", resId, dstId);
+ System.Diagnostics.Trace.TraceInformation("{0} => {1}", resId, dstId); //NOXLATE
targets.Add(dstId);
}
@@ -536,9 +536,9 @@
{
int matches = 0;
string[] parts = data.First().ResourceId.ToString()
- .Substring("Library://".Length)
- .Split('/');
- string test = "Library://";
+ .Substring(StringConstants.RootIdentifier.Length)
+ .Split('/'); //NOXLATE
+ string test = StringConstants.RootIdentifier;
string parent = test;
int partIndex = 0;
//Use first one as a sample to see how far we can go. Keep going until we have
@@ -559,7 +559,7 @@
}
else
{
- return "Library://";
+ return StringConstants.RootIdentifier;
}
}
@@ -578,9 +578,9 @@
{
int matches = 0;
string[] parts = data.First().ResourceId.ToString()
- .Substring("Library://".Length)
- .Split('/');
- string test = "Library://";
+ .Substring(StringConstants.RootIdentifier.Length)
+ .Split('/'); //NOXLATE
+ string test = StringConstants.RootIdentifier;
string parent = test;
int partIndex = 0;
//Use first one as a sample to see how far we can go. Keep going until we have
@@ -601,7 +601,7 @@
}
else
{
- return "Library://";
+ return StringConstants.RootIdentifier;
}
}
@@ -680,13 +680,13 @@
//otherwise the content *inside* the source folder is
//moved instead of the folder itself!
var rid = new ResourceIdentifier(r);
- var target = folderId + rid.Name + "/";
+ var target = folderId + rid.Name + "/"; //NOXLATE
conn.ResourceService.MoveResourceWithReferences(r, target, null, cb);
}
else
{
var rid = new ResourceIdentifier(r);
- var target = folderId + rid.Name + "." + rid.Extension;
+ var target = folderId + rid.Name + "." + rid.Extension; //NOXLATE
if (omgr.IsOpen(r, conn))
{
notMovedFromSource.Add(r);
Modified: trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -49,7 +49,7 @@
internal static void OnDragDrop(ISiteExplorer sender, DragEventArgs e, TreeNodeAdv droppedNode)
{
//If drop node specified, extract relevant folder, otherwise default to root (Library://)
- string folderId = "Library://";
+ string folderId = StringConstants.RootIdentifier;
IServerConnection conn = null;
var mgr = ServiceRegistry.GetService<ServerConnectionManager>();
@@ -61,7 +61,7 @@
if (ri.IsFolder)
folderId = ri.ResourceId;
else
- folderId = ri.Parent != null ? ri.Parent.ResourceId : "Library://";
+ folderId = ri.Parent != null ? ri.Parent.ResourceId : StringConstants.RootIdentifier;
}
conn = mgr.GetConnection(ri.ConnectionName);
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -57,14 +57,14 @@
//Init the tips
List<string> tips = new List<string>();
XmlDocument doc = new XmlDocument();
- string totdRoot = Path.Combine(FileUtility.ApplicationRootPath, "Data/TipOfTheDay");
+ string totdRoot = Path.Combine(FileUtility.ApplicationRootPath, "Data/TipOfTheDay"); //NOXLATE
var ci = Thread.CurrentThread.CurrentUICulture;
//Try to find a localized source based on current UI culture, fallback to english if none found
- string path = Path.Combine(totdRoot, ci.Name + ".xml");
+ string path = Path.Combine(totdRoot, ci.Name + ".xml"); //NOXLATE
if (!File.Exists(path))
- path = Path.Combine(totdRoot, "en.xml");
+ path = Path.Combine(totdRoot, "en.xml"); //NOXLATE
doc.Load(path);
- foreach (XmlNode node in doc.SelectNodes("//Tips/TipOfTheDay"))
+ foreach (XmlNode node in doc.SelectNodes("//Tips/TipOfTheDay")) //NOXLATE
{
tips.Add(node.InnerText);
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -133,7 +133,7 @@
{
if (p.Value.Length > 0)
{
- sw.WriteLine(new string('*', 80));
+ sw.WriteLine(new string('*', 80)); //NOXLATE
sw.WriteLine(string.Format(Properties.Resources.ValidationProgressMessage, p.Key));
foreach (ValidationIssue i in p.Value)
sw.WriteLine(string.Format(Properties.Resources.ValidationResultFormat, i.Status, i.StatusCode, i.Message));
Modified: trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -55,13 +55,13 @@
public MenuStrip GetMainMenu(WorkbenchBase workbench)
{
var menu = new System.Windows.Forms.MenuStrip();
- MenuService.AddItemsToMenu(menu.Items, workbench, "/Maestro/Shell/MainMenu");
+ MenuService.AddItemsToMenu(menu.Items, workbench, "/Maestro/Shell/MainMenu"); //NOXLATE
return menu;
}
public ToolStrip GetMainToolStrip(WorkbenchBase workbench)
{
- return ToolbarService.CreateToolStrip(workbench, "/Maestro/Shell/Toolbars/Main");
+ return ToolbarService.CreateToolStrip(workbench, "/Maestro/Shell/Toolbars/Main"); //NOXLATE
}
public IViewContentManager GetViewContentManager()
Modified: trunk/Tools/Maestro/RtMapInspector/MainForm.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/MainForm.Designer.cs 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/RtMapInspector/MainForm.Designer.cs 2012-09-11 12:28:35 UTC (rev 6999)
@@ -39,26 +39,25 @@
this.rdResourceId = new System.Windows.Forms.RadioButton();
this.rdMapName = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.imgList = new System.Windows.Forms.ImageList(this.components);
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.properties = new System.Windows.Forms.PropertyGrid();
this.tabControl1 = new System.Windows.Forms.TabControl();
- this.trvLayersAndGroups = new System.Windows.Forms.TreeView();
this.TAB_LAYERS = new System.Windows.Forms.TabPage();
+ this.trvLayersAndGroups = new System.Windows.Forms.TreeView();
+ this.imgList = new System.Windows.Forms.ImageList(this.components);
this.TAB_SELECTION = new System.Windows.Forms.TabPage();
this.trvSelection = new System.Windows.Forms.TreeView();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.properties = new System.Windows.Forms.PropertyGrid();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
this.tabControl1.SuspendLayout();
this.TAB_LAYERS.SuspendLayout();
this.TAB_SELECTION.SuspendLayout();
+ this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.btnLoad);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.txtMapName);
@@ -66,199 +65,130 @@
this.groupBox1.Controls.Add(this.txtResourceId);
this.groupBox1.Controls.Add(this.rdResourceId);
this.groupBox1.Controls.Add(this.rdMapName);
- this.groupBox1.Location = new System.Drawing.Point(13, 13);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(597, 135);
- this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Source";
//
// btnLoad
//
- this.btnLoad.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnLoad.Location = new System.Drawing.Point(497, 97);
+ resources.ApplyResources(this.btnLoad, "btnLoad");
this.btnLoad.Name = "btnLoad";
- this.btnLoad.Size = new System.Drawing.Size(75, 23);
- this.btnLoad.TabIndex = 6;
- this.btnLoad.Text = "Load Map";
this.btnLoad.UseVisualStyleBackColor = true;
this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click);
//
// label1
//
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(17, 22);
+ resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(58, 13);
- this.label1.TabIndex = 5;
- this.label1.Text = "Session ID";
//
// txtMapName
//
- this.txtMapName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.txtMapName.Location = new System.Drawing.Point(133, 45);
+ resources.ApplyResources(this.txtMapName, "txtMapName");
this.txtMapName.Name = "txtMapName";
- this.txtMapName.Size = new System.Drawing.Size(439, 20);
- this.txtMapName.TabIndex = 4;
//
// txtSessionId
//
- this.txtSessionId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.txtSessionId.Location = new System.Drawing.Point(133, 19);
+ resources.ApplyResources(this.txtSessionId, "txtSessionId");
this.txtSessionId.Name = "txtSessionId";
- this.txtSessionId.Size = new System.Drawing.Size(439, 20);
- this.txtSessionId.TabIndex = 3;
//
// txtResourceId
//
- this.txtResourceId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.txtResourceId.Location = new System.Drawing.Point(133, 71);
+ resources.ApplyResources(this.txtResourceId, "txtResourceId");
this.txtResourceId.Name = "txtResourceId";
- this.txtResourceId.Size = new System.Drawing.Size(439, 20);
- this.txtResourceId.TabIndex = 2;
//
// rdResourceId
//
- this.rdResourceId.AutoSize = true;
- this.rdResourceId.Location = new System.Drawing.Point(20, 72);
+ resources.ApplyResources(this.rdResourceId, "rdResourceId");
this.rdResourceId.Name = "rdResourceId";
- this.rdResourceId.Size = new System.Drawing.Size(85, 17);
- this.rdResourceId.TabIndex = 1;
this.rdResourceId.TabStop = true;
- this.rdResourceId.Text = "Resource ID";
this.rdResourceId.UseVisualStyleBackColor = true;
//
// rdMapName
//
- this.rdMapName.AutoSize = true;
+ resources.ApplyResources(this.rdMapName, "rdMapName");
this.rdMapName.Checked = true;
- this.rdMapName.Location = new System.Drawing.Point(20, 45);
this.rdMapName.Name = "rdMapName";
- this.rdMapName.Size = new System.Drawing.Size(77, 17);
- this.rdMapName.TabIndex = 0;
this.rdMapName.TabStop = true;
- this.rdMapName.Text = "Map Name";
this.rdMapName.UseVisualStyleBackColor = true;
//
// groupBox2
//
- this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Controls.Add(this.tabControl1);
- this.groupBox2.Location = new System.Drawing.Point(13, 155);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(321, 328);
- this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Runtime Map";
//
- // imgList
- //
- this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
- this.imgList.TransparentColor = System.Drawing.Color.Transparent;
- this.imgList.Images.SetKeyName(0, "folder.png");
- this.imgList.Images.SetKeyName(1, "folder--minus.png");
- this.imgList.Images.SetKeyName(2, "layer.png");
- this.imgList.Images.SetKeyName(3, "layer--minus.png");
- this.imgList.Images.SetKeyName(4, "map.png");
- //
- // groupBox3
- //
- this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBox3.Controls.Add(this.properties);
- this.groupBox3.Location = new System.Drawing.Point(340, 155);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(270, 328);
- this.groupBox3.TabIndex = 2;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Properties";
- //
- // properties
- //
- this.properties.Dock = System.Windows.Forms.DockStyle.Fill;
- this.properties.Location = new System.Drawing.Point(3, 16);
- this.properties.Name = "properties";
- this.properties.Size = new System.Drawing.Size(264, 309);
- this.properties.TabIndex = 0;
- //
// tabControl1
//
this.tabControl1.Controls.Add(this.TAB_LAYERS);
this.tabControl1.Controls.Add(this.TAB_SELECTION);
- this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(3, 16);
+ resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(315, 309);
- this.tabControl1.TabIndex = 1;
//
+ // TAB_LAYERS
+ //
+ this.TAB_LAYERS.Controls.Add(this.trvLayersAndGroups);
+ resources.ApplyResources(this.TAB_LAYERS, "TAB_LAYERS");
+ this.TAB_LAYERS.Name = "TAB_LAYERS";
+ this.TAB_LAYERS.UseVisualStyleBackColor = true;
+ //
// trvLayersAndGroups
//
- this.trvLayersAndGroups.Dock = System.Windows.Forms.DockStyle.Fill;
- this.trvLayersAndGroups.ImageIndex = 0;
+ resources.ApplyResources(this.trvLayersAndGroups, "trvLayersAndGroups");
this.trvLayersAndGroups.ImageList = this.imgList;
- this.trvLayersAndGroups.Location = new System.Drawing.Point(3, 3);
this.trvLayersAndGroups.Name = "trvLayersAndGroups";
- this.trvLayersAndGroups.SelectedImageIndex = 0;
- this.trvLayersAndGroups.Size = new System.Drawing.Size(301, 277);
- this.trvLayersAndGroups.TabIndex = 0;
this.trvLayersAndGroups.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.trvLayersAndGroups_AfterSelect);
//
- // TAB_LAYERS
+ // imgList
//
- this.TAB_LAYERS.Controls.Add(this.trvLayersAndGroups);
- this.TAB_LAYERS.Location = new System.Drawing.Point(4, 22);
- this.TAB_LAYERS.Name = "TAB_LAYERS";
- this.TAB_LAYERS.Padding = new System.Windows.Forms.Padding(3);
- this.TAB_LAYERS.Size = new System.Drawing.Size(307, 283);
- this.TAB_LAYERS.TabIndex = 0;
- this.TAB_LAYERS.Text = "Layers and Groups";
- this.TAB_LAYERS.UseVisualStyleBackColor = true;
+ this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
+ this.imgList.TransparentColor = System.Drawing.Color.Transparent;
+ this.imgList.Images.SetKeyName(0, "folder.png");
+ this.imgList.Images.SetKeyName(1, "folder--minus.png");
+ this.imgList.Images.SetKeyName(2, "layer.png");
+ this.imgList.Images.SetKeyName(3, "layer--minus.png");
+ this.imgList.Images.SetKeyName(4, "map.png");
//
// TAB_SELECTION
//
this.TAB_SELECTION.Controls.Add(this.trvSelection);
- this.TAB_SELECTION.Location = new System.Drawing.Point(4, 22);
+ resources.ApplyResources(this.TAB_SELECTION, "TAB_SELECTION");
this.TAB_SELECTION.Name = "TAB_SELECTION";
- this.TAB_SELECTION.Size = new System.Drawing.Size(307, 283);
- this.TAB_SELECTION.TabIndex = 1;
- this.TAB_SELECTION.Text = "Current Selection";
this.TAB_SELECTION.UseVisualStyleBackColor = true;
//
// trvSelection
//
- this.trvSelection.Dock = System.Windows.Forms.DockStyle.Fill;
- this.trvSelection.ImageIndex = 0;
+ resources.ApplyResources(this.trvSelection, "trvSelection");
this.trvSelection.ImageList = this.imgList;
- this.trvSelection.Location = new System.Drawing.Point(0, 0);
this.trvSelection.Name = "trvSelection";
- this.trvSelection.SelectedImageIndex = 0;
- this.trvSelection.Size = new System.Drawing.Size(307, 283);
- this.trvSelection.TabIndex = 0;
//
+ // groupBox3
+ //
+ resources.ApplyResources(this.groupBox3, "groupBox3");
+ this.groupBox3.Controls.Add(this.properties);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.TabStop = false;
+ //
+ // properties
+ //
+ resources.ApplyResources(this.properties, "properties");
+ this.properties.Name = "properties";
+ //
// MainForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(622, 495);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Name = "MainForm";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Runtime Map Inspector";
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
- this.groupBox3.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.TAB_LAYERS.ResumeLayout(false);
this.TAB_SELECTION.ResumeLayout(false);
+ this.groupBox3.ResumeLayout(false);
this.ResumeLayout(false);
}
Modified: trunk/Tools/Maestro/RtMapInspector/MainForm.resx
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/MainForm.resx 2012-09-10 17:12:51 UTC (rev 6998)
+++ trunk/Tools/Maestro/RtMapInspector/MainForm.resx 2012-09-11 12:28:35 UTC (rev 6999)
@@ -117,6 +117,225 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="btnLoad.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnLoad.Location" type="System.Drawing.Point, System.Drawing">
+ <value>497, 97</value>
+ </data>
+ <data name="btnLoad.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnLoad.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="btnLoad.Text" xml:space="preserve">
+ <value>Load Map</value>
+ </data>
+ <data name=">>btnLoad.Name" xml:space="preserve">
+ <value>btnLoad</value>
+ </data>
+ <data name=">>btnLoad.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnLoad.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>btnLoad.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 22</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>58, 13</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Session ID</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="txtMapName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtMapName.Location" type="System.Drawing.Point, System.Drawing">
+ <value>133, 45</value>
+ </data>
+ <data name="txtMapName.Size" type="System.Drawing.Size, System.Drawing">
+ <value>439, 20</value>
+ </data>
+ <data name="txtMapName.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name=">>txtMapName.Name" xml:space="preserve">
+ <value>txtMapName</value>
+ </data>
+ <data name=">>txtMapName.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtMapName.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtMapName.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="txtSessionId.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtSessionId.Location" type="System.Drawing.Point, System.Drawing">
+ <value>133, 19</value>
+ </data>
+ <data name="txtSessionId.Size" type="System.Drawing.Size, System.Drawing">
+ <value>439, 20</value>
+ </data>
+ <data name="txtSessionId.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>txtSessionId.Name" xml:space="preserve">
+ <value>txtSessionId</value>
+ </data>
+ <data name=">>txtSessionId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtSessionId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtSessionId.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="txtResourceId.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtResourceId.Location" type="System.Drawing.Point, System.Drawing">
+ <value>133, 71</value>
+ </data>
+ <data name="txtResourceId.Size" type="System.Drawing.Size, System.Drawing">
+ <value>439, 20</value>
+ </data>
+ <data name="txtResourceId.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>txtResourceId.Name" xml:space="preserve">
+ <value>txtResourceId</value>
+ </data>
+ <data name=">>txtResourceId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtResourceId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtResourceId.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="rdResourceId.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="rdResourceId.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 72</value>
+ </data>
+ <data name="rdResourceId.Size" type="System.Drawing.Size, System.Drawing">
+ <value>85, 17</value>
+ </data>
+ <data name="rdResourceId.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="rdResourceId.Text" xml:space="preserve">
+ <value>Resource ID</value>
+ </data>
+ <data name=">>rdResourceId.Name" xml:space="preserve">
+ <value>rdResourceId</value>
+ </data>
+ <data name=">>rdResourceId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>rdResourceId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>rdResourceId.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="rdMapName.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="rdMapName.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 45</value>
+ </data>
+ <data name="rdMapName.Size" type="System.Drawing.Size, System.Drawing">
+ <value>77, 17</value>
+ </data>
+ <data name="rdMapName.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="rdMapName.Text" xml:space="preserve">
+ <value>Map Name</value>
+ </data>
+ <data name=">>rdMapName.Name" xml:space="preserve">
+ <value>rdMapName</value>
+ </data>
+ <data name=">>rdMapName.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>rdMapName.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>rdMapName.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 13</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>597, 135</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Source</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Left, Right</value>
+ </data>
+ <data name="trvLayersAndGroups.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="trvLayersAndGroups.ImageIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
<metadata name="imgList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -125,7 +344,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE
- DAAAAk1TRnQBSQFMAgEBBQEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DAAAAk1TRnQBSQFMAgEBBQEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -179,4 +398,235 @@
AQMBgAEBAYABAQHAAQMBwAEDBP8L
</value>
</data>
+ <data name="trvLayersAndGroups.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 3</value>
+ </data>
+ <data name="trvLayersAndGroups.SelectedImageIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="trvLayersAndGroups.Size" type="System.Drawing.Size, System.Drawing">
+ <value>301, 277</value>
+ </data>
+ <data name="trvLayersAndGroups.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>trvLayersAndGroups.Name" xml:space="preserve">
+ <value>trvLayersAndGroups</value>
+ </data>
+ <data name=">>trvLayersAndGroups.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>trvLayersAndGroups.Parent" xml:space="preserve">
+ <value>TAB_LAYERS</value>
+ </data>
+ <data name=">>trvLayersAndGroups.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="TAB_LAYERS.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_LAYERS.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TAB_LAYERS.Size" type="System.Drawing.Size, System.Drawing">
+ <value>307, 283</value>
+ </data>
+ <data name="TAB_LAYERS.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="TAB_LAYERS.Text" xml:space="preserve">
+ <value>Layers and Groups</value>
+ </data>
+ <data name=">>TAB_LAYERS.Name" xml:space="preserve">
+ <value>TAB_LAYERS</value>
+ </data>
+ <data name=">>TAB_LAYERS.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_LAYERS.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_LAYERS.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="trvSelection.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="trvSelection.ImageIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="trvSelection.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="trvSelection.SelectedImageIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="trvSelection.Size" type="System.Drawing.Size, System.Drawing">
+ <value>307, 283</value>
+ </data>
+ <data name="trvSelection.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>trvSelection.Name" xml:space="preserve">
+ <value>trvSelection</value>
+ </data>
+ <data name=">>trvSelection.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>trvSelection.Parent" xml:space="preserve">
+ <value>TAB_SELECTION</value>
+ </data>
+ <data name=">>trvSelection.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="TAB_SELECTION.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_SELECTION.Size" type="System.Drawing.Size, System.Drawing">
+ <value>307, 283</value>
+ </data>
+ <data name="TAB_SELECTION.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="TAB_SELECTION.Text" xml:space="preserve">
+ <value>Current Selection</value>
+ </data>
+ <data name=">>TAB_SELECTION.Name" xml:space="preserve">
+ <value>TAB_SELECTION</value>
+ </data>
+ <data name=">>TAB_SELECTION.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_SELECTION.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_SELECTION.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 16</value>
+ </data>
+ <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>315, 309</value>
+ </data>
+ <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name=">>tabControl1.Name" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>tabControl1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>tabControl1.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>tabControl1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 155</value>
+ </data>
+ <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>321, 328</value>
+ </data>
+ <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="groupBox2.Text" xml:space="preserve">
+ <value>Runtime Map</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox2.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="groupBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Right</value>
+ </data>
+ <data name="properties.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="properties.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 16</value>
+ </data>
+ <data name="properties.Size" type="System.Drawing.Size, System.Drawing">
+ <value>264, 309</value>
+ </data>
+ <data name="properties.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>properties.Name" xml:space="preserve">
+ <value>properties</value>
+ </data>
+ <data name=">>properties.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>properties.Parent" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>properties.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>340, 155</value>
+ </data>
+ <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>270, 328</value>
+ </data>
+ <data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="groupBox3.Text" xml:space="preserve">
+ <value>Properties</value>
+ </data>
+ <data name=">>groupBox3.Name" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>groupBox3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox3.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox3.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 13</value>
+ </data>
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>622, 495</value>
+ </data>
+ <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+ <value>CenterParent</value>
+ </data>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Runtime Map Inspector</value>
+ </data>
+ <data name=">>imgList.Name" xml:space="preserve">
+ <value>imgList</value>
+ </data>
+ <data name=">>imgList.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>MainForm</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list