[mapguide-commits] r6994 - in trunk/Tools/Maestro: Maestro Maestro/Properties Maestro.Editors Maestro.Editors/Common Maestro.Editors/Diagnostics Maestro.Editors/Diff Maestro.Editors/DrawingSource Maestro.Editors/FeatureSource Maestro.Editors/FeatureSource/Extensions Maestro.Editors/FeatureSource/Preview Maestro.Editors/FeatureSource/Providers Maestro.Editors/FeatureSource/Providers/Gdal Maestro.Editors/FeatureSource/Providers/Odbc Maestro.Editors/FeatureSource/Providers/Odbc/Drivers Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors Maestro.Editors/FeatureSource/Providers/Rdbms Maestro.Editors/FeatureSource/Providers/SQLite Maestro.Editors/FeatureSource/Providers/Sdf Maestro.Editors/FeatureSource/Providers/Shp Maestro.Editors/FeatureSource/Providers/Wms Maestro.Editors/Fusion Maestro.Editors/Fusion/WidgetEditors Maestro.Editors/Generic Maestro.Editors/Generic/XmlEditor Maestro.Editors/LayerDefinition Maestro.Editors/Layer Definition/Drawing Maestro.Editors/LayerDefinition/Raster Maestro.Editors/LayerDefinition/Vector Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/LayerDefinition/Vector/StyleEditors Maestro.Editors/Properties OSGeo.MapGuide.MaestroAPI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 10 05:58:30 PDT 2012
Author: jng
Date: 2012-09-10 05:58:29 -0700 (Mon, 10 Sep 2012)
New Revision: 6994
Modified:
trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
trunk/Tools/Maestro/Maestro/Program.cs
trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro/Properties/Resources.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
Log:
#2110: Localization review of Maestro and Maestro.Editors
Modified: trunk/Tools/Maestro/Maestro/Program.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Program.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro/Program.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -60,16 +60,16 @@
//ServiceManager.MessageService = wfmsg;
ServiceManager.Instance = new MaestroServiceManager();
- LoggingService.Info("Application start");
+ LoggingService.Info("Application start"); //NOXLATE
// Setup Platform.ini if required
if (!Platform.IsRunningOnMono)
{
- if (!File.Exists("Platform.ini") && File.Exists("LocalConfigure.exe"))
+ if (!File.Exists("Platform.ini") && File.Exists("LocalConfigure.exe")) //NOXLATE
{
var proc = new ProcessStartInfo("LocalConfigure.exe");
if (Environment.OSVersion.Version.Major >= 6)
- proc.Verb = "runas";
+ proc.Verb = "runas"; //NOXLATE
var p = Process.Start(proc);
p.WaitForExit();
@@ -95,12 +95,12 @@
// "data/resources" for language resources, "data/options" for default options
FileUtility.ApplicationRootPath = Path.GetDirectoryName(exe.Location);
- LoggingService.Info("Starting core services...");
+ LoggingService.Info("Starting core services..."); //NOXLATE
// CoreStartup is a helper class making starting the Core easier.
// The parameter is used as the application name, e.g. for the default title of
// MessageService.ShowMessage() calls.
- CoreStartup coreStartup = new CoreStartup("MapGuide Maestro");
+ CoreStartup coreStartup = new CoreStartup("MapGuide Maestro"); //NOXLATE
// It is also used as default storage location for the application settings:
// "%Application Data%\%Application Name%", but you can override that by setting c.ConfigDirectory
@@ -109,40 +109,40 @@
coreStartup.ConfigDirectory = MaestroPaths.BasePath;
// Specify the name of the application settings file (.xml is automatically appended)
- coreStartup.PropertiesName = "AppProperties";
+ coreStartup.PropertiesName = "AppProperties"; //NOXLATE
// Initializes the Core services (ResourceService, PropertyService, etc.)
coreStartup.StartCoreServices();
- LoggingService.Info("Looking for AddIns...");
+ LoggingService.Info("Looking for AddIns..."); //NOXLATE
// Searches for ".addin" files in the application directory.
- coreStartup.AddAddInsFromDirectory(Path.Combine(FileUtility.ApplicationRootPath, "AddIns"));
+ coreStartup.AddAddInsFromDirectory(Path.Combine(FileUtility.ApplicationRootPath, "AddIns")); //NOXLATE
// Searches for a "AddIns.xml" in the user profile that specifies the names of the
// add-ins that were deactivated by the user, and adds "external" AddIns.
- coreStartup.ConfigureExternalAddIns(Path.Combine(PropertyService.ConfigDirectory, "AddIns.xml"));
+ coreStartup.ConfigureExternalAddIns(Path.Combine(PropertyService.ConfigDirectory, "AddIns.xml")); //NOXLATE
// Searches for add-ins installed by the user into his profile directory. This also
// performs the job of installing, uninstalling or upgrading add-ins if the user
// requested it the last time this application was running.
- coreStartup.ConfigureUserAddIns(Path.Combine(PropertyService.ConfigDirectory, "AddInInstallTemp"),
- Path.Combine(PropertyService.ConfigDirectory, "AddIns"));
+ coreStartup.ConfigureUserAddIns(Path.Combine(PropertyService.ConfigDirectory, "AddInInstallTemp"), //NOXLATE
+ Path.Combine(PropertyService.ConfigDirectory, "AddIns")); //NOXLATE
ResourceService.Language = lang;
- LoggingService.Info("Loading AddInTree...");
+ LoggingService.Info("Loading AddInTree..."); //NOXLATE
// Now finally initialize the application. This parses the ".addin" files and
// creates the AddIn tree. It also automatically runs the commands in
// "/Workspace/Autostart"
coreStartup.RunInitialization();
- LoggingService.Info("Initializing Workbench...");
+ LoggingService.Info("Initializing Workbench..."); //NOXLATE
// Workbench is our class from the base project, this method creates an instance
// of the main form.
ServiceRegistry.Initialize(() => {
Workbench.InitializeWorkbench(new WorkbenchInitializer());
try
{
- LoggingService.Info("Running application...");
+ LoggingService.Info("Running application..."); //NOXLATE
// Workbench.Instance is the instance of the main form, run the message loop.
Application.Run(Workbench.Instance);
}
@@ -155,10 +155,10 @@
}
catch (Exception ex)
{
- ErrorDialog.Show("Error storing properties", ex.ToString());
+ ErrorDialog.Show(Properties.Resources.Error_StoreProperties, ex.ToString());
}
}
- LoggingService.Info("Application shutdown");
+ LoggingService.Info("Application shutdown"); //NOXLATE
});
}
@@ -173,7 +173,7 @@
static void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
{
- LoggingService.InfoFormatted("Loaded assembly: {0}", args.LoadedAssembly.GetName().Name);
+ LoggingService.InfoFormatted("Loaded assembly: {0}", args.LoadedAssembly.GetName().Name); //NOXLATE
}
static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
Modified: trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.269
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -61,6 +61,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Error storing properties.
+ /// </summary>
+ internal static string Error_StoreProperties {
+ get {
+ return ResourceManager.GetString("Error_StoreProperties", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to It seems you're not running Windows. I assume you must be running Mono then. Please take note that some things may not work as intended in Mono. .
/// </summary>
internal static string Warn_Mono {
Modified: trunk/Tools/Maestro/Maestro/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/Resources.resx 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro/Properties/Resources.resx 2012-09-10 12:58:29 UTC (rev 6994)
@@ -112,11 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="Error_StoreProperties" xml:space="preserve">
+ <value>Error storing properties</value>
+ </data>
<data name="Warn_Mono" xml:space="preserve">
<value>It seems you're not running Windows. I assume you must be running Mono then. Please take note that some things may not work as intended in Mono. </value>
</data>
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -78,7 +78,7 @@
CoordinateWait.Visible = true;
CoordinateWait.BringToFront();
this.Refresh();
- _cat.FindCoordSys("");
+ _cat.FindCoordSys(""); //NOXLATE
CoordinateSystemDefinitionBase[] items = null;
try
@@ -96,7 +96,7 @@
EPSGCodeText.Items.Clear();
foreach (CoordinateSystemDefinitionBase c in items)
{
- if (c.Code.StartsWith("EPSG:"))
+ if (c.Code.StartsWith("EPSG:")) //NOXLATE
EPSGCodeText.Items.Add(c.EPSG);
}
}
@@ -119,7 +119,7 @@
CoordSysCodeText.EndUpdate();
}
- if (WKTText.Text != "")
+ if (WKTText.Text != "") //NOXLATE
{
SelectByWKT.Checked = true;
ValidateWKT_Click(null, null);
@@ -198,7 +198,7 @@
try
{
m_epsgCoordSys = null;
- m_epsgCoordSys = _cat.FindCoordSys("EPSG:" + EPSGCodeText.Text);
+ m_epsgCoordSys = _cat.FindCoordSys("EPSG:" + EPSGCodeText.Text); //NOXLATE
if (m_epsgCoordSys == null)
{
string s = _cat.ConvertEpsgCodeToWkt(EPSGCodeText.Text);
@@ -339,10 +339,10 @@
try { CoordinateSystem.SelectedItem = selectedCoordsys; }
catch { }
if (!SelectByCoordSysCode.Checked)
- try { CoordSysCodeText.Text = selectedCoordsys == null ? "" : selectedCoordsys.Code; }
+ try { CoordSysCodeText.Text = selectedCoordsys == null ? "" : selectedCoordsys.Code; } //NOXLATE
catch { }
if (!SelectByWKT.Checked)
- try { WKTText.Text = selectedCoordsys == null ? "" : selectedCoordsys.WKT; }
+ try { WKTText.Text = selectedCoordsys == null ? "" : selectedCoordsys.WKT; } //NOXLATE
catch { }
if (!SelectByEPSGCode.Checked)
try { EPSGCodeText.Text = selectedCoordsys.EPSG; }
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -98,7 +98,7 @@
//
// EditorBindableCollapsiblePanel
//
- this.Name = "EditorBindableCollapsiblePanel";
+ this.Name = "EditorBindableCollapsiblePanel"; //NOXLATE
this.ResumeLayout(false);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -170,7 +170,7 @@
btn.Name = name;
btn.Text = name;
btn.ToolTipText = func.Description;
- string fmt = "{0}({1})";
+ string fmt = "{0}({1})"; //NOXLATE
List<string> args = new List<string>();
foreach (FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition argDef in func.ArgumentDefinitionList)
{
@@ -254,32 +254,32 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "aValue",
+ Name = "aValue", //NOXLATE
Description = Properties.Resources.Func_ARGB_AValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "rValue",
+ Name = "rValue", //NOXLATE
Description = Properties.Resources.Func_ARGB_RValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "gValue",
+ Name = "gValue", //NOXLATE
Description = Properties.Resources.Func_ARGB_GValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "bValue",
+ Name = "bValue", //NOXLATE
Description = Properties.Resources.Func_ARGB_BValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
},
},
Description = Properties.Resources.Func_ARGB_Description,
- Name = "ARGB",
- ReturnType = "Int32"
+ Name = "ARGB", //NOXLATE
+ ReturnType = "Int32" //NOXLATE
};
//DECAP
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
@@ -288,30 +288,30 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "strValue",
+ Name = "strValue", //NOXLATE
Description = Properties.Resources.Func_DECAP_StringValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
}
},
Description = Properties.Resources.Func_DECAP_Description,
- Name = "DECAP",
- ReturnType = "String"
+ Name = "DECAP", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//FEATURECLASS
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
{
ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
Description = Properties.Resources.Func_FEATURECLASS_Description,
- Name = "FEATURECLASS",
- ReturnType = "String"
+ Name = "FEATURECLASS", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//FEATUREID
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
{
ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
Description = Properties.Resources.Func_FEATUREID_Description,
- Name = "FEATUREID",
- ReturnType = "String"
+ Name = "FEATUREID", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//IF
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
@@ -320,34 +320,34 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "condition",
+ Name = "condition", //NOXLATE
Description = Properties.Resources.Func_IF_ConditionDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "trueValue",
+ Name = "trueValue", //NOXLATE
Description = Properties.Resources.Func_IF_TrueValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "falseValue",
+ Name = "falseValue", //NOXLATE
Description = Properties.Resources.Func_IF_FalseValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
}
},
Description = Properties.Resources.Func_IF_Description,
- Name = "IF",
- ReturnType = "String"
+ Name = "IF", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//LAYERID
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
{
ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
Description = Properties.Resources.Func_LAYERID_Description,
- Name = "LAYERID",
- ReturnType = "String"
+ Name = "LAYERID", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//LOOKUP
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
@@ -356,40 +356,40 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "expression",
+ Name = "expression", //NOXLATE
Description = Properties.Resources.Func_LOOKUP_ExpressionDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "defaultValue",
+ Name = "defaultValue", //NOXLATE
Description = Properties.Resources.Func_LOOKUP_DefaultValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "index",
+ Name = "index", //NOXLATE
Description = Properties.Resources.Func_LOOKUP_IndexDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "value",
+ Name = "value", //NOXLATE
Description = Properties.Resources.Func_LOOKUP_ValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
}
},
Description = Properties.Resources.Func_LOOKUP_Description,
- Name = "LOOKUP",
- ReturnType = "String"
+ Name = "LOOKUP", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//MAPNAME
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
{
ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
Description = Properties.Resources.Func_MAPNAME_Description,
- Name = "MAPNAME",
- ReturnType = "String"
+ Name = "MAPNAME", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//RANGE
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
@@ -398,46 +398,46 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "expression",
+ Name = "expression", //NOXLATE
Description = Properties.Resources.Func_RANGE_ExpressionDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "rangeMin",
+ Name = "rangeMin", //NOXLATE
Description = Properties.Resources.Func_RANGE_MinDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "rangeMax",
+ Name = "rangeMax", //NOXLATE
Description = Properties.Resources.Func_RANGE_MaxDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "defaultValue",
+ Name = "defaultValue", //NOXLATE
Description = Properties.Resources.Func_RANGE_DefaultValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
},
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "value",
+ Name = "value", //NOXLATE
Description = Properties.Resources.Func_RANGE_ValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
}
},
Description = Properties.Resources.Func_RANGE_Description,
- Name = "RANGE",
- ReturnType = "String"
+ Name = "RANGE", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//SESSION
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
{
ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>(),
Description = Properties.Resources.Func_SESSION_Description,
- Name = "SESSION",
- ReturnType = "String"
+ Name = "SESSION", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
//URLENCODE
yield return new FdoProviderCapabilitiesExpressionFunctionDefinition()
@@ -446,14 +446,14 @@
{
new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
{
- Name = "strValue",
+ Name = "strValue", //NOXLATE
Description = Properties.Resources.Func_URLENCODE_StringValueDescription,
DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
}
},
Description = Properties.Resources.Func_URLENCODE_Description,
- Name = "URLENCODE",
- ReturnType = "String"
+ Name = "URLENCODE", //NOXLATE
+ ReturnType = "String" //NOXLATE
};
}
@@ -485,7 +485,7 @@
{
if (!string.IsNullOrEmpty(op))
{
- string filterTemplate = "<geometry property> {0} GeomFromText('<FGF geometry text>')";
+ string filterTemplate = Properties.Resources.GeomFilterTemplate;
string exprText = string.Format(filterTemplate, op);
InsertText(exprText);
}
@@ -606,9 +606,9 @@
List<string> tokens = new List<string>();
foreach (FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition argDef in _func.ArgumentDefinitionList)
{
- tokens.Add("[" + argDef.Name.Trim() + "]");
+ tokens.Add("[" + argDef.Name.Trim() + "]"); //NOXLATE
}
- _argStr = string.Join(", ", tokens.ToArray());
+ _argStr = string.Join(", ", tokens.ToArray()); //NOXLATE
}
return _argStr;
}
@@ -622,7 +622,7 @@
{
get
{
- return this.Name + "(" + GetArgumentString() + ")";
+ return this.Name + "(" + GetArgumentString() + ")"; //NOXLATE
}
}
}
@@ -638,7 +638,7 @@
_autoBox.SelectedIndexChanged += new EventHandler(OnAutoCompleteSelectedIndexChanged);
_autoBox.KeyDown += new KeyEventHandler(OnAutoCompleteKeyDown);
_autoBox.KeyUp += new KeyEventHandler(OnAutoCompleteKeyUp);
- _autoBox.ValueMember = "Name";
+ _autoBox.ValueMember = "Name"; //NOXLATE
_autoBox.Font = new Font(FontFamily.GenericMonospace, 10.0f);
ExpressionText.Controls.Add(_autoBox);
}
@@ -749,11 +749,11 @@
newPos = start + aci.Name.Length + 1; //Position the caret just after the opening bracket
//Has at least two arguments
- int idx = fullText.IndexOf(",");
+ int idx = fullText.IndexOf(","); //NOXLATE
if (idx > 0)
selLength = idx - aci.Name.Length - 1;
else
- selLength = fullText.IndexOf(")") - fullText.IndexOf("(") - 1;
+ selLength = fullText.IndexOf(")") - fullText.IndexOf("(") - 1; //NOXLATE
}
string prefix = ExpressionText.Text.Substring(0, start);
@@ -841,14 +841,14 @@
else if (code == Keys.OemQuotes)
{
if (e.Modifiers == Keys.Shift) // "
- InsertText("\"");
+ InsertText("\""); //NOXLATE
else // '
- InsertText("'");
+ InsertText("'"); //NOXLATE
}
else if (code == Keys.D9 && e.Modifiers == Keys.Shift) // (
{
- InsertText(")");
+ InsertText(")"); //NOXLATE
}
else if (code == Keys.Up || code == Keys.Down)
{
@@ -977,22 +977,22 @@
using (new WaitCursor(this))
{
string filter = null;
- var expr = "UNIQUE(" + ColumnName.Text + ")";
+ var expr = "UNIQUE(" + ColumnName.Text + ")"; //NOXLATE
bool bFallback = false;
ColumnValue.Items.Clear();
ColumnValue.Tag = null;
try
{
using (var rdr = _featSvc.AggregateQueryFeatureSource(m_featureSource, _cls.QualifiedName, filter, new System.Collections.Specialized.NameValueCollection() {
- { "UNIQ_VALS", expr }
+ { "UNIQ_VALS", expr } //NOXLATE
}))
{
- ColumnValue.Tag = rdr.GetPropertyType("UNIQ_VALS");
+ ColumnValue.Tag = rdr.GetPropertyType("UNIQ_VALS"); //NOXLATE
while (rdr.ReadNext())
{
- if (!rdr.IsNull("UNIQ_VALS"))
+ if (!rdr.IsNull("UNIQ_VALS")) //NOXLATE
{
- object value = rdr["UNIQ_VALS"];
+ object value = rdr["UNIQ_VALS"]; //NOXLATE
ColumnValue.Items.Add(value);
}
}
@@ -1042,12 +1042,12 @@
}
catch (Exception ex)
{
- if (filter == null && ex.Message.IndexOf("MgNullPropertyValueException") >= 0)
+ if (filter == null && ex.Message.IndexOf("MgNullPropertyValueException") >= 0) //NOXLATE
{
hasNull = true;
rawEx = ex;
retry = true;
- filter = ColumnName.Text + " != NULL";
+ filter = ColumnName.Text + " != NULL"; //NOXLATE
}
else if (rawEx != null)
throw rawEx;
@@ -1058,7 +1058,7 @@
ColumnValue.Items.Clear();
if (hasNull)
- ColumnValue.Items.Add("NULL");
+ ColumnValue.Items.Add("NULL"); //NOXLATE
foreach (string s in values.Keys)
ColumnValue.Items.Add(s);
@@ -1089,14 +1089,14 @@
var tag = ColumnValue.Tag;
if (tag != null)
{
- if (ColumnValue.Tag == typeof(string) && (ColumnValue.SelectedIndex != 0 || ColumnValue.Text != "NULL"))
+ if (ColumnValue.Tag == typeof(string) && (ColumnValue.SelectedIndex != 0 || ColumnValue.Text != "NULL")) //NOXLATE
{
- InsertText("'" + ColumnValue.Text + "'");
+ InsertText("'" + ColumnValue.Text + "'"); //NOXLATE
}
else
{
if (tag is PropertyValueType && (PropertyValueType)tag == PropertyValueType.String)
- InsertText("'" + ColumnValue.Text + "'");
+ InsertText("'" + ColumnValue.Text + "'"); //NOXLATE
else
InsertText(ColumnValue.Text);
}
@@ -1132,7 +1132,7 @@
_myImageIndex = index;
}
public ImageListBoxItem(string text) : this(text, -1) { }
- public ImageListBoxItem() : this("") { }
+ public ImageListBoxItem() : this("") { } //NOXLATE
private object _tag;
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -41,8 +41,8 @@
if (!this.DesignMode)
{
base.SetCustomRender(new RenderCustomItem(ImageComboRender));
- base.ValueMember = "Name";
- base.DisplayMember = "Name";
+ base.ValueMember = "Name"; //NOXLATE
+ base.DisplayMember = "Name"; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -69,7 +69,7 @@
public bool IsRoot
{
- get { return this.ResourceId == "Library://"; }
+ get { return this.ResourceId == StringConstants.RootIdentifier; }
}
public IRepositoryItem Instance { get { return _item; } }
@@ -219,14 +219,14 @@
{
if (item == null)
{
- var list = _resSvc.GetRepositoryResources("Library://", 0);
+ var list = _resSvc.GetRepositoryResources(StringConstants.RootIdentifier, 0);
return GetSorted(list);
}
else
{
if (item.HasChildren)
{
- var list = _resSvc.GetRepositoryResources(item.ResourceId, _bFoldersOnly ? ResourceTypes.Folder.ToString() : "", 1, true);
+ var list = _resSvc.GetRepositoryResources(item.ResourceId, _bFoldersOnly ? ResourceTypes.Folder.ToString() : "", 1, true); //NOXLATE
return GetSorted(list);
}
else
@@ -308,7 +308,7 @@
internal void Refresh(string folderId)
{
- if (string.IsNullOrEmpty(folderId) || folderId == "Library://")
+ if (string.IsNullOrEmpty(folderId) || folderId == StringConstants.RootIdentifier)
{
InitRoot();
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -105,7 +105,7 @@
// Library:// will *always* exist, so fallback to this if given folder doesn't check out
if (!_resSvc.ResourceExists(folderId))
- folderId = "Library://";
+ folderId = StringConstants.RootIdentifier;
this.ActiveControl = repoView;
repoView.NavigateTo(folderId);
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -66,7 +66,7 @@
: this(conn)
{
if (ResourceIdentifier.GetResourceType(symbolLibrary) != OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolLibrary)
- throw new ArgumentException("Not a valid symbol library resource identifier: " + symbolLibrary); //LOCALIZE
+ throw new ArgumentException(string.Format(Properties.Resources.ErrorInvalidSymbolLibraryResourceId, symbolLibrary));
txtSymbolLibrary.Text = symbolLibrary;
}
@@ -120,7 +120,7 @@
foreach (var res in sectResources.SectionResource)
{
- if (res.Role.ToUpper() == "THUMBNAIL")
+ if (res.Role.ToUpper() == StringConstants.Thumbnail.ToUpper())
{
using (var rs = drawSvc.GetSectionResource(ds.ResourceID, res.Href))
{
@@ -155,7 +155,7 @@
foreach (var res in sectResources.SectionResource)
{
- if (res.Role.ToUpper() == "THUMBNAIL")
+ if (res.Role.ToUpper() == StringConstants.Thumbnail.ToUpper())
{
using (var rs = drawSvc.GetSectionResource(ds.ResourceID, res.Href))
{
@@ -183,7 +183,7 @@
private static IDrawingSource PrepareSymbolDrawingSource(IServerConnection conn, string symResId)
{
//Extract the symbols.dwf resource data and copy to a session based drawing source
- var dwf = conn.ResourceService.GetResourceData(symResId, "symbols.dwf");
+ var dwf = conn.ResourceService.GetResourceData(symResId, "symbols.dwf"); //NOXLATE
if (!dwf.CanSeek)
{
//House in MemoryStream
@@ -196,13 +196,13 @@
dwf = ms;
}
var ds = OSGeo.MapGuide.ObjectModels.ObjectFactory.CreateDrawingSource(conn);
- ds.SourceName = "symbols.dwf";
- ds.ResourceID = "Session:" + conn.SessionID + "//" + Guid.NewGuid() + ".DrawingSource";
+ ds.SourceName = "symbols.dwf"; //NOXLATE
+ ds.ResourceID = "Session:" + conn.SessionID + "//" + Guid.NewGuid() + ".DrawingSource"; //NOXLATE
conn.ResourceService.SaveResource(ds);
using (dwf)
{
- conn.ResourceService.SetResourceData(ds.ResourceID, "symbols.dwf", OSGeo.MapGuide.ObjectModels.Common.ResourceDataType.File, dwf);
+ conn.ResourceService.SetResourceData(ds.ResourceID, "symbols.dwf", OSGeo.MapGuide.ObjectModels.Common.ResourceDataType.File, dwf); //NOXLATE
}
return ds;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -213,12 +213,12 @@
get
{
List<string> items = new List<string>();
- string[] tokens = txtItem.Text.Split('\t');
+ string[] tokens = txtItem.Text.Split('\t'); //NOXLATE
foreach (var path in tokens)
{
- var leftpart = path.Substring(0, path.IndexOf("]"));
- var rightpart = path.Substring(path.IndexOf("]") + 1);
- items.Add("%MG_DATA_PATH_ALIAS" + leftpart + "]%" + rightpart);
+ var leftpart = path.Substring(0, path.IndexOf("]")); //NOXLATE
+ var rightpart = path.Substring(path.IndexOf("]") + 1); //NOXLATE
+ items.Add("%MG_DATA_PATH_ALIAS" + leftpart + "]%" + rightpart); //NOXLATE
}
return items.ToArray();
}
@@ -277,58 +277,58 @@
private int GetImageIndex(string fileName)
{
- string ext = fileName.Substring(fileName.LastIndexOf(".") + 1);
+ string ext = fileName.Substring(fileName.LastIndexOf(".") + 1); //NOXLATE
switch (ext.ToUpper())
{
- case "EXE":
+ case "EXE": //NOXLATE
return IDX_FILE_EXE;
- case "DOC":
- case "DOCX":
+ case "DOC": //NOXLATE
+ case "DOCX": //NOXLATE
return IDX_FILE_DOC;
- case "MDB":
- case "ACCDB":
+ case "MDB": //NOXLATE
+ case "ACCDB": //NOXLATE
return IDX_FILE_MDB;
- case "XLS":
- case "XLSX":
+ case "XLS": //NOXLATE
+ case "XLSX": //NOXLATE
return IDX_FILE_XLS;
- case "CSV":
+ case "CSV": //NOXLATE
return IDX_FILE_CSV;
- case "MOV":
- case "MPG":
- case "AVI":
- case "MP4":
- case "WMV":
- case "ASF":
- case "FLV":
+ case "MOV": //NOXLATE
+ case "MPG": //NOXLATE
+ case "AVI": //NOXLATE
+ case "MP4": //NOXLATE
+ case "WMV": //NOXLATE
+ case "ASF": //NOXLATE
+ case "FLV": //NOXLATE
return IDX_FILE_MOVIE;
- case "HTM":
- case "HTML":
+ case "HTM": //NOXLATE
+ case "HTML": //NOXLATE
return IDX_FILE_HTML;
- case "PNG":
- case "JPG":
- case "GIF":
- case "ICO":
- case "BMP":
- case "TGA":
+ case "PNG": //NOXLATE
+ case "JPG": //NOXLATE
+ case "GIF": //NOXLATE
+ case "ICO": //NOXLATE
+ case "BMP": //NOXLATE
+ case "TGA": //NOXLATE
return IDX_FILE_IMAGE;
- case "PDF":
+ case "PDF": //NOXLATE
return IDX_FILE_PDF;
- case "PHP":
+ case "PHP": //NOXLATE
return IDX_FILE_PHP;
- case "PPT":
- case "PPTX":
+ case "PPT": //NOXLATE
+ case "PPTX": //NOXLATE
return IDX_FILE_PPT;
- case "TXT":
+ case "TXT": //NOXLATE
return IDX_FILE_TXT;
- case "ZIP":
- case "RAR":
- case "ACE":
- case "7Z":
- case "GZ":
- case "TAR":
- case "BZ2":
+ case "ZIP": //NOXLATE
+ case "RAR": //NOXLATE
+ case "ACE": //NOXLATE
+ case "7Z": //NOXLATE
+ case "GZ": //NOXLATE
+ case "TAR": //NOXLATE
+ case "BZ2": //NOXLATE
return IDX_FILE_ARCHIVE;
- case "XML":
+ case "XML": //NOXLATE
return IDX_FILE_XML;
default:
return IDX_FILE_UNKNOWN;
@@ -364,7 +364,7 @@
{
names.Add(item.Name);
}
- txtItem.Text = string.Join("\t", names.ToArray());
+ txtItem.Text = string.Join("\t", names.ToArray()); //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -115,12 +115,12 @@
private static string ParseMs(string value)
{
- return value + " " + Properties.Resources.UnitsMs;
+ return value + " " + Properties.Resources.UnitsMs; //NOXLATE
}
private static string ParseSeconds(string value)
{
- return value + " " + Properties.Resources.UnitsSeconds;
+ return value + " " + Properties.Resources.UnitsSeconds; //NOXLATE
}
private static string ParseKb(string valueBytes)
@@ -131,7 +131,7 @@
System.Threading.Thread.CurrentThread.CurrentUICulture,
out d))
{
- return (d / 1000.0).ToString(System.Threading.Thread.CurrentThread.CurrentUICulture) + " " + Properties.Resources.UnitsKb;
+ return (d / 1000.0).ToString(System.Threading.Thread.CurrentThread.CurrentUICulture) + " " + Properties.Resources.UnitsKb; //NOXLATE
}
return valueBytes;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -41,6 +41,8 @@
InitializeComponent();
}
+ const string NumFormat = "00000";
+
public TextDiffView(TextFileDiffList source, TextFileDiffList destination, List<DiffResultSpan> DiffLines, double seconds)
: this()
{
@@ -56,12 +58,12 @@
case DiffResultSpanStatus.DeleteSource:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString("00000"));
- lviD = new ListViewItem(cnt.ToString("00000"));
+ lviS = new ListViewItem(cnt.ToString(NumFormat));
+ lviD = new ListViewItem(cnt.ToString(NumFormat));
lviS.BackColor = Color.Red;
lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
lviD.BackColor = Color.LightGray;
- lviD.SubItems.Add("");
+ lviD.SubItems.Add(string.Empty);
lvSource.Items.Add(lviS);
lvDestination.Items.Add(lviD);
@@ -72,8 +74,8 @@
case DiffResultSpanStatus.NoChange:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString("00000"));
- lviD = new ListViewItem(cnt.ToString("00000"));
+ lviS = new ListViewItem(cnt.ToString(NumFormat));
+ lviD = new ListViewItem(cnt.ToString(NumFormat));
lviS.BackColor = Color.White;
lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
lviD.BackColor = Color.White;
@@ -88,10 +90,10 @@
case DiffResultSpanStatus.AddDestination:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString("00000"));
- lviD = new ListViewItem(cnt.ToString("00000"));
+ lviS = new ListViewItem(cnt.ToString(NumFormat));
+ lviD = new ListViewItem(cnt.ToString(NumFormat));
lviS.BackColor = Color.LightGray;
- lviS.SubItems.Add("");
+ lviS.SubItems.Add(string.Empty);
lviD.BackColor = Color.LightGreen;
lviD.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
@@ -104,8 +106,8 @@
case DiffResultSpanStatus.Replace:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString("00000"));
- lviD = new ListViewItem(cnt.ToString("00000"));
+ lviS = new ListViewItem(cnt.ToString(NumFormat));
+ lviD = new ListViewItem(cnt.ToString(NumFormat));
lviS.BackColor = Color.Red;
lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
lviD.BackColor = Color.LightGreen;
Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -53,7 +53,7 @@
resDataCtrl.Init(service);
resDataCtrl.DataListChanged += new EventHandler(OnResourceDataListChanged);
resDataCtrl.ResourceDataMarked += new ResourceDataSelectionEventHandler(OnResourceDataMarked);
- TextBoxBinder.BindText(txtSourceCs, _dws, "CoordinateSpace");
+ TextBoxBinder.BindText(txtSourceCs, _dws, "CoordinateSpace"); //NOXLATE
MarkSelected();
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -49,8 +49,8 @@
_edSvc = edSvc;
_cls = cls;
_parent = parent;
- TextBoxBinder.BindText(txtExpression, calc, "Expression");
- TextBoxBinder.BindText(txtName, calc, "Name");
+ TextBoxBinder.BindText(txtExpression, calc, "Expression"); //NOXLATE
+ TextBoxBinder.BindText(txtName, calc, "Name"); //NOXLATE
}
private void lnkEdit_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -49,9 +49,9 @@
//HACK
if (string.IsNullOrEmpty(ext.FeatureClass))
ext.FeatureClass = names[0];
-
- TextBoxBinder.BindText(txtExtendedName, ext, "Name");
- ComboBoxBinder.BindSelectedIndexChanged(cmbBaseClass, "SelectedItem", ext, "FeatureClass");
+
+ TextBoxBinder.BindText(txtExtendedName, ext, "Name"); //NOXLATE
+ ComboBoxBinder.BindSelectedIndexChanged(cmbBaseClass, "SelectedItem", ext, "FeatureClass"); //NOXLATE
}
//private void txtExtendedName_TextChanged(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -57,9 +57,9 @@
public JoinSettings(string primaryFeatureSource, string primaryClass, IAttributeRelation rel)
: this()
{
- Check.NotNull(rel, "rel");
- Check.NotNull(primaryClass, "primaryClass");
- Check.NotNull(primaryFeatureSource, "primaryFeatureSource");
+ Check.NotNull(rel, "rel"); //NOXLATE
+ Check.NotNull(primaryClass, "primaryClass"); //NOXLATE
+ Check.NotNull(primaryFeatureSource, "primaryFeatureSource"); //NOXLATE
_primaryFeatureSource = primaryFeatureSource;
_primaryClass = primaryClass;
@@ -110,7 +110,7 @@
return;
}
- var selClass = GenericItemSelectionDialog.SelectItem(Properties.Resources.SelectFeatureClass, Properties.Resources.SelectFeatureClass, _secondaryClasses, "QualifiedName", "QualifiedName");
+ var selClass = GenericItemSelectionDialog.SelectItem(Properties.Resources.SelectFeatureClass, Properties.Resources.SelectFeatureClass, _secondaryClasses, "QualifiedName", "QualifiedName"); //NOXLATE
if (selClass != null)
{
_secondaryClass = selClass;
@@ -131,9 +131,9 @@
_edSvc = service;
_edSvc.RegisterCustomNotifier(this);
- TextBoxBinder.BindText(txtJoinName, _rel, "Name");
- TextBoxBinder.BindText(txtFeatureSource, _rel, "ResourceId");
- TextBoxBinder.BindText(txtSecondaryClass, _rel, "AttributeClass");
+ TextBoxBinder.BindText(txtJoinName, _rel, "Name"); //NOXLATE
+ TextBoxBinder.BindText(txtFeatureSource, _rel, "ResourceId"); //NOXLATE
+ TextBoxBinder.BindText(txtSecondaryClass, _rel, "AttributeClass"); //NOXLATE
//Init selected classes
if (!string.IsNullOrEmpty(_rel.ResourceId))
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -42,8 +42,8 @@
lblPrimary.Text = primary.QualifiedName;
lblSecondary.Text = secondary.QualifiedName;
- cmbPrimary.DisplayMember = "Name";
- cmbSecondary.DisplayMember = "Name";
+ cmbPrimary.DisplayMember = "Name"; //NOXLATE
+ cmbSecondary.DisplayMember = "Name"; //NOXLATE
cmbPrimary.DataSource = primary.Properties;
cmbSecondary.DataSource = secondary.Properties;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -71,11 +71,11 @@
ext.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
node.Text = ext.Name;
}
- else if (evt.PropertyName == "FeatureClass")
+ else if (evt.PropertyName == "FeatureClass") //NOXLATE
{
node.ToolTipText = string.Format(Properties.Resources.ExtendedClassTooltip, ext.FeatureClass);
}
@@ -96,11 +96,11 @@
calc.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
cNode.Text = calc.Name;
}
- else if (evt.PropertyName == "Expression")
+ else if (evt.PropertyName == "Expression") //NOXLATE
{
cNode.ToolTipText = calc.Expression;
}
@@ -121,7 +121,7 @@
join.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
jNode.Text = join.Name;
}
@@ -160,11 +160,11 @@
node.ImageIndex = node.SelectedImageIndex = IDX_EXTENSION;
ext.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
node.Text = ext.Name;
}
- else if (evt.PropertyName == "FeatureClass")
+ else if (evt.PropertyName == "FeatureClass") //NOXLATE
{
node.ToolTipText = string.Format(Properties.Resources.ExtendedClassTooltip, ext.FeatureClass);
}
@@ -197,11 +197,11 @@
cNode.Tag = calc;
calc.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
cNode.Text = calc.Name;
}
- else if (evt.PropertyName == "Expression")
+ else if (evt.PropertyName == "Expression") //NOXLATE
{
cNode.ToolTipText = calc.Expression;
}
@@ -238,7 +238,7 @@
jNode.ImageIndex = jNode.SelectedImageIndex = IDX_JOIN;
join.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Name")
+ if (evt.PropertyName == "Name") //NOXLATE
{
jNode.Text = join.Name;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -14,17 +14,17 @@
static FsEditorMap()
{
_editors = new Dictionary<string, Type>();
- if (System.IO.File.Exists("FsEditorMap.xml"))
+ if (System.IO.File.Exists("FsEditorMap.xml")) //NOXLATE
{
var doc = new XmlDocument();
- doc.Load("FsEditorMap.xml");
- var list = doc.SelectNodes("//FeatureSourceEditorMap/Editor");
+ doc.Load("FsEditorMap.xml"); //NOXLATE
+ var list = doc.SelectNodes("//FeatureSourceEditorMap/Editor"); //NOXLATE
foreach (XmlNode node in list)
{
try
{
- string provider = node.Attributes["provider"].Value.ToUpper();
- string typeName = node.Attributes["type"].Value;
+ string provider = node.Attributes["provider"].Value.ToUpper(); //NOXLATE
+ string typeName = node.Attributes["type"].Value; //NOXLATE
_editors[provider] = Type.GetType(typeName);
}
@@ -35,11 +35,11 @@
static string Normalize(string provider)
{
- string[] tokens = provider.Split('.');
+ string[] tokens = provider.Split('.'); //NOXLATE
if (tokens.Length == 2)
return provider;
else
- return tokens[0] + "." + tokens[1];
+ return tokens[0] + "." + tokens[1]; //NOXLATE
}
public static CollapsiblePanel GetPanel(string provider)
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -271,7 +271,7 @@
{
var pane = new PreviewPane(currentFsId, mode, cls, _fsvc, _caps);
var page = new TabPage();
- page.Text = Properties.Resources.StandardQuery + " - " + cls.QualifiedName;
+ page.Text = Properties.Resources.StandardQuery + " - " + cls.QualifiedName; //NOXLATE
page.Tag = mode;
pane.Dock = DockStyle.Fill;
page.Controls.Add(pane);
@@ -371,7 +371,7 @@
var classNames = _fsvc.GetClassNames(currentFsId, schTag.SchemaName);
foreach (var qClsName in classNames)
{
- var clsName = qClsName.Split(':')[1];
+ var clsName = qClsName.Split(':')[1]; //NOXLATE
var node = new TreeNode(clsName);
node.Text = clsName;
node.Tag = new ClassNodeTag(schTag.SchemaName, clsName);
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -146,11 +146,11 @@
private string GenerateAlias()
{
int counter = 1;
- string name = "Expr" + counter;
+ string name = "Expr" + counter; //NOXLATE
while (AliasExists(name))
{
counter++;
- name = "Expr" + counter;
+ name = "Expr" + counter; //NOXLATE
}
return name;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -95,7 +95,7 @@
}
}
- protected virtual string FileFdoProperty { get { return "File"; } }
+ protected virtual string FileFdoProperty { get { return "File"; } } //NOXLATE
protected virtual bool CanSelectFolders()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -109,10 +109,10 @@
}
// This should really come from GetSchemaMapping, but it's broken: minX, minY, maxX, maxY
- private const string TEMPLATE_CFG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><fdo:DataStore xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:fds=\"http://fdo.osgeo.org/schemas/fds\"><gml:DerivedCRS gml:id=\"Default\"><gml:metaDataProperty><gml:GenericMetaData><fdo:SCExtentType>dynamic</fdo:SCExtentType><fdo:XYTolerance>0.001000</fdo:XYTolerance><fdo:ZTolerance>0.001000</fdo:ZTolerance></gml:GenericMetaData></gml:metaDataProperty><gml:remarks>System generated default FDO Spatial Context</gml:remarks><gml:srsName>Default</gml:srsName><gml:validArea><gml:boundingBox><gml:pos>{0} {1}</gml:pos><gml:pos>{2} {3}</gml:pos></gml:boundingBox></gml:validArea><gml:baseCRS>" +
- "<fdo:WKTCRS gml:id=\"Default\"><gml:srsName>Default</gml:srsName><fdo:WKT>LOCAL_CS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]</fdo:WKT></fdo:WKTCRS></gml:baseCRS><gml:definedByConversion xlink:href=\"http://fdo.osgeo.org/coord_conversions#identity\"/><gml:derivedCRSType codeSpace=\"http://fdo.osgeo.org/crs_types\">geographic</gml:derivedCRSType><gml:usesCS xlink:href=\"http://fdo.osgeo.org/cs#default_cartesian\"/></gml:DerivedCRS><xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:default=\"http://fdo.osgeo.org/schemas/feature/default\" targetNamespace=\"http://fdo.osgeo.org/schemas/feature/default\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:element name=\"default\" type=\"default:defaultType\" abstract
=\"false\" substitutionGroup=\"gml:_Feature\"><xs:key name=\"defaultKey\"><xs:selector xpath=\".//default\"/>" +
- "<xs:field xpath=\"FeatId\"/></xs:key></xs:element><xs:complexType name=\"defaultType\" abstract=\"false\" fdo:hasGeometry=\"false\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:complexContent><xs:extension base=\"gml:AbstractFeatureType\"><xs:sequence><xs:element name=\"FeatId\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:simpleType><xs:restriction base=\"xs:string\"><xs:maxLength value=\"256\"/></xs:restriction></xs:simpleType></xs:element><xs:element name=\"Raster\" type=\"fdo:RasterPropertyType\" fdo:defaultImageXSize=\"1024\" fdo:defaultImageYSize=\"1024\" fdo:srsName=\"Default\"><xs:annotation>" +
- "<xs:appinfo source=\"http://fdo.osgeo.org/schemas\"><fdo:DefaultDataModel dataModelType=\"Bitonal\" dataType=\"Unknown\" organization=\"Pixel\" bitsPerPixel=\"1\" tileSizeX=\"256\" tileSizeY=\"256\"/></xs:appinfo></xs:annotation></xs:element></xs:sequence></xs:extension></xs:complexContent></xs:complexType></xs:schema><SchemaMapping xmlns=\"http://fdogrfp.osgeo.org/schemas\" provider=\"OSGeo.Gdal.3.2\" name=\"default\"></SchemaMapping></fdo:DataStore>";
+ private const string TEMPLATE_CFG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><fdo:DataStore xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:fds=\"http://fdo.osgeo.org/schemas/fds\"><gml:DerivedCRS gml:id=\"Default\"><gml:metaDataProperty><gml:GenericMetaData><fdo:SCExtentType>dynamic</fdo:SCExtentType><fdo:XYTolerance>0.001000</fdo:XYTolerance><fdo:ZTolerance>0.001000</fdo:ZTolerance></gml:GenericMetaData></gml:metaDataProperty><gml:remarks>System generated default FDO Spatial Context</gml:remarks><gml:srsName>Default</gml:srsName><gml:validArea><gml:boundingBox><gml:pos>{0} {1}</gml:pos><gml:pos>{2} {3}</gml:pos></gml:boundingBox></gml:validArea><gml:baseCRS>" + //NOXLATE
+ "<fdo:WKTCRS gml:id=\"Default\"><gml:srsName>Default</gml:srsName><fdo:WKT>LOCAL_CS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]</fdo:WKT></fdo:WKTCRS></gml:baseCRS><gml:definedByConversion xlink:href=\"http://fdo.osgeo.org/coord_conversions#identity\"/><gml:derivedCRSType codeSpace=\"http://fdo.osgeo.org/crs_types\">geographic</gml:derivedCRSType><gml:usesCS xlink:href=\"http://fdo.osgeo.org/cs#default_cartesian\"/></gml:DerivedCRS><xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:default=\"http://fdo.osgeo.org/schemas/feature/default\" targetNamespace=\"http://fdo.osgeo.org/schemas/feature/default\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:element name=\"default\" type=\"default:defaultType\" abstract
=\"false\" substitutionGroup=\"gml:_Feature\"><xs:key name=\"defaultKey\"><xs:selector xpath=\".//default\"/>" + //NOXLATE
+ "<xs:field xpath=\"FeatId\"/></xs:key></xs:element><xs:complexType name=\"defaultType\" abstract=\"false\" fdo:hasGeometry=\"false\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:complexContent><xs:extension base=\"gml:AbstractFeatureType\"><xs:sequence><xs:element name=\"FeatId\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:simpleType><xs:restriction base=\"xs:string\"><xs:maxLength value=\"256\"/></xs:restriction></xs:simpleType></xs:element><xs:element name=\"Raster\" type=\"fdo:RasterPropertyType\" fdo:defaultImageXSize=\"1024\" fdo:defaultImageYSize=\"1024\" fdo:srsName=\"Default\"><xs:annotation>" + //NOXLATE
+ "<xs:appinfo source=\"http://fdo.osgeo.org/schemas\"><fdo:DefaultDataModel dataModelType=\"Bitonal\" dataType=\"Unknown\" organization=\"Pixel\" bitsPerPixel=\"1\" tileSizeX=\"256\" tileSizeY=\"256\"/></xs:appinfo></xs:annotation></xs:element></xs:sequence></xs:extension></xs:complexContent></xs:complexType></xs:schema><SchemaMapping xmlns=\"http://fdogrfp.osgeo.org/schemas\" provider=\"OSGeo.Gdal.3.2\" name=\"default\"></SchemaMapping></fdo:DataStore>"; //NOXLATE
private void BuildDefaultDocument()
@@ -191,8 +191,8 @@
string fileName = null;
if (isAlias)
{
- dir = added.Substring(0, added.LastIndexOf("\\"));
- fileName = added.Substring(added.LastIndexOf("\\") + 1);
+ dir = added.Substring(0, added.LastIndexOf("\\")); //NOXLATE
+ fileName = added.Substring(added.LastIndexOf("\\") + 1); //NOXLATE
}
else
{
@@ -248,7 +248,7 @@
string dir = null;
if (isAlias)
{
- dir = remove.Substring(0, remove.LastIndexOf("\\"));
+ dir = remove.Substring(0, remove.LastIndexOf("\\")); //NOXLATE
}
else
{
@@ -258,7 +258,7 @@
var loc = FindLocation(conf, dir);
if (null != loc)
{
- string f = isAlias ? remove.Substring(remove.LastIndexOf("\\") + 1) : Path.GetFileName(remove);
+ string f = isAlias ? remove.Substring(remove.LastIndexOf("\\") + 1) : Path.GetFileName(remove); //NOXLATE
loc.RemoveItem(f);
result.Removed.Add(remove);
if (loc.Items.Length == 0)
@@ -274,11 +274,11 @@
string dir = null;
if (isAlias)
{
- int idx = add.LastIndexOf("/");
+ int idx = add.LastIndexOf("/"); //NOXLATE
if (idx >= 0)
dir = add.Substring(0, idx);
else
- dir = add.Substring(0, add.LastIndexOf("%") + 1);
+ dir = add.Substring(0, add.LastIndexOf("%") + 1); //NOXLATE
}
else
{
@@ -288,10 +288,10 @@
//Create a temp feature source to attempt interrogation of extents
var values = new NameValueCollection();
- values["DefaultRasterFileLocation"] = add;
- var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.Gdal", values);
+ values["DefaultRasterFileLocation"] = add; //NOXLATE
+ var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.Gdal", values); //NOXLATE
- var resId = new ResourceIdentifier("Session:" + conn.SessionID + "//" + Guid.NewGuid() + ".FeatureSource");
+ var resId = new ResourceIdentifier("Session:" + conn.SessionID + "//" + Guid.NewGuid() + ".FeatureSource"); //NOXLATE
fs.ResourceID = resId.ToString();
conn.ResourceService.SaveResource(fs);
@@ -301,11 +301,11 @@
if (isAlias)
{
- int idx = add.LastIndexOf("/");
+ int idx = add.LastIndexOf("/"); //NOXLATE
if (idx >= 0)
- raster.FileName = add.Substring(add.LastIndexOf("/") + 1);
+ raster.FileName = add.Substring(add.LastIndexOf("/") + 1); //NOXLATE
else
- raster.FileName = add.Substring(add.LastIndexOf("%") + 1);
+ raster.FileName = add.Substring(add.LastIndexOf("%") + 1); //NOXLATE
}
else
{
@@ -358,16 +358,16 @@
if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
{
List<string> files = new List<string>();
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.png"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpg"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpeg"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tif"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tiff"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.ecw"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.sid"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.dem"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.gif"));
- files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.bmp"));
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.png")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpg")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpeg")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tif")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tiff")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.ecw")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.sid")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.dem")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.gif")); //NOXLATE
+ files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.bmp")); //NOXLATE
DoUpdateConfiguration(files.ToArray(), new string[0]);
}
@@ -397,21 +397,21 @@
var folder = picker.SelectedItem;
if (!string.IsNullOrEmpty(folder))
{
- folder = folder.Replace("%MG_DATA_PATH_ALIAS[", "[")
- .Replace("]%", "]");
+ folder = folder.Replace("%MG_DATA_PATH_ALIAS[", "[") //NOXLATE
+ .Replace("]%", "]"); //NOXLATE
}
var list = _service.ResourceService.EnumerateUnmanagedData(folder, string.Empty, false, UnmanagedDataTypes.Files);
var extensions = new List<string>(new string[] {
- ".png",
- ".jpg",
- ".jpeg",
- ".tif",
- ".tiff",
- ".ecw",
- ".sid",
- ".dem",
- ".gif",
- ".bmp"
+ ".png", //NOXLATE
+ ".jpg", //NOXLATE
+ ".jpeg", //NOXLATE
+ ".tif", //NOXLATE
+ ".tiff", //NOXLATE
+ ".ecw", //NOXLATE
+ ".sid", //NOXLATE
+ ".dem", //NOXLATE
+ ".gif", //NOXLATE
+ ".bmp" //NOXLATE
});
foreach (var f in list.Items)
{
@@ -422,9 +422,9 @@
{
if (file.FileName.ToLower().EndsWith(ext))
{
- var leftpart = file.UnmanagedDataId.Substring(0, file.UnmanagedDataId.IndexOf("]"));
- var rightpart = file.UnmanagedDataId.Substring(file.UnmanagedDataId.IndexOf("]") + 1);
- var item = "%MG_DATA_PATH_ALIAS" + leftpart + "]%" + rightpart;
+ var leftpart = file.UnmanagedDataId.Substring(0, file.UnmanagedDataId.IndexOf("]")); //NOXLATE
+ var rightpart = file.UnmanagedDataId.Substring(file.UnmanagedDataId.IndexOf("]") + 1); //NOXLATE
+ var item = "%MG_DATA_PATH_ALIAS" + leftpart + "]%" + rightpart; //NOXLATE
files.Add(item);
break;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -60,7 +60,7 @@
internal void InitDefaults()
{
- txtPath.Text = _fs.GetConnectionProperty("DefaultRasterFileLocation");
+ txtPath.Text = _fs.GetConnectionProperty("DefaultRasterFileLocation"); //NOXLATE
}
private void txtPath_TextChanged(object sender, EventArgs e)
@@ -68,7 +68,7 @@
if (_init)
return;
- _fs.SetConnectionProperty("DefaultRasterFileLocation", txtPath.Text);
+ _fs.SetConnectionProperty("DefaultRasterFileLocation", txtPath.Text); //NOXLATE
}
private void btnBrowseFile_Click(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -83,12 +83,12 @@
var prov = _service.FeatureService.GetFeatureProvider(_fs.Provider);
var colName = new DataGridViewColumn();
- colName.Name = "COL_NAME";
+ colName.Name = "COL_NAME"; //NOXLATE
colName.HeaderText = Properties.Resources.ColHeaderName;
colName.ReadOnly = true;
colName.CellTemplate = new DataGridViewTextBoxCell();
var colValue = new DataGridViewColumn();
- colValue.Name = "COL_VALUE";
+ colValue.Name = "COL_VALUE"; //NOXLATE
colValue.HeaderText = Properties.Resources.ColHeaderValue;
colValue.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
colValue.CellTemplate = new DataGridViewTextBoxCell();
@@ -150,7 +150,7 @@
{
e.Paint(e.CellBounds, DataGridViewPaintParts.All & ~DataGridViewPaintParts.ContentForeground);
Graphics g = e.Graphics;
- g.DrawString(new string('*', cell.Value.ToString().Length), this.Font, new SolidBrush(Color.Black), e.CellBounds);
+ g.DrawString(new string('*', cell.Value.ToString().Length), this.Font, new SolidBrush(Color.Black), e.CellBounds); //NOXLATE
e.Handled = true;
}
}
@@ -191,7 +191,7 @@
var param = GetConnectionParameters();
var cloneFs = (IFeatureSource)_fs.Clone();
- _service.ResourceService.SaveResourceAs(cloneFs, "Session:" + _service.SessionID + "//" + Guid.NewGuid().ToString() + ".FeatureSource");
+ _service.ResourceService.SaveResourceAs(cloneFs, "Session:" + _service.SessionID + "//" + Guid.NewGuid().ToString() + ".FeatureSource"); //NOXLATE
cloneFs.ClearConnectionProperties();
foreach (var key in param.AllKeys)
@@ -357,7 +357,7 @@
var file = resDataCtrl.MarkedFile;
if (!string.IsNullOrEmpty(file))
{
- var value = "%MG_DATA_FILE_PATH%" + file;
+ var value = "%MG_DATA_FILE_PATH%" + file; //NOXLATE
cell.Value = value;
}
else
@@ -390,8 +390,8 @@
{
if (diag.ShowDialog() == DialogResult.OK)
{
- _fs.SetConnectionProperty(diag.UserProperty, "%MG_USERNAME%");
- _fs.SetConnectionProperty(diag.PasswordProperty, "%MG_PASSWORD%");
+ _fs.SetConnectionProperty(diag.UserProperty, StringConstants.MgUsernamePlaceholder);
+ _fs.SetConnectionProperty(diag.PasswordProperty, StringConstants.MgPasswordPlaceholder);
_fs.SetEncryptedCredentials(diag.Username, diag.Password);
_service.SyncSessionCopy();
InitGrid();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -32,25 +32,25 @@
/// <summary>
/// The SQL Server Name
/// </summary>
- [Description("The SQL Server Name")]
+ [Description("The SQL Server Name")] //NOXLATE
public string ServerName { get; set; }
/// <summary>
/// The SQL Server database
/// </summary>
- [Description("The SQL Server database")]
+ [Description("The SQL Server database")] //NOXLATE
public string Database { get; set; }
/// <summary>
/// The user name
/// </summary>
- [Description("Username")]
+ [Description("Username")] //NOXLATE
public string UserName { get; set; }
/// <summary>
/// The password
/// </summary>
- [Description("Password")]
+ [Description("Password")] //NOXLATE
public string Password { get; set; }
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -31,17 +31,17 @@
static OdbcDriverMap()
{
_drivers = new Dictionary<string, Type>();
- if (System.IO.File.Exists("OdbcEditorMap.xml"))
+ if (System.IO.File.Exists("OdbcEditorMap.xml")) //NOXLATE
{
var doc = new XmlDocument();
- doc.Load("OdbcEditorMap.xml");
- var list = doc.SelectNodes("//OdbcDriverMap/Driver");
+ doc.Load("OdbcEditorMap.xml"); //NOXLATE
+ var list = doc.SelectNodes("//OdbcDriverMap/Driver"); //NOXLATE
foreach (XmlNode node in list)
{
try
{
- string provider = node.Attributes["name"].Value.ToUpper();
- string typeName = node.Attributes["type"].Value;
+ string provider = node.Attributes["name"].Value.ToUpper(); //NOXLATE
+ string typeName = node.Attributes["type"].Value; //NOXLATE
_drivers[provider] = Type.GetType(typeName);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -89,17 +89,17 @@
cmbMethod.DataSource = (OdbcConnectionMethod[])Enum.GetValues(typeof(OdbcConnectionMethod));
var values = _fs.GetConnectionProperties();
- string odbcStr = values["ConnectionString"];
+ string odbcStr = values["ConnectionString"]; //NOXLATE
if (!string.IsNullOrEmpty(odbcStr))
{
//See if it is file-basd
- if (odbcStr.Contains("Dbq="))
+ if (odbcStr.Contains("Dbq=")) //NOXLATE
{
- if (odbcStr.Contains("%MG_DATA_FILE_PATH%"))
+ if (odbcStr.Contains("%MG_DATA_FILE_PATH%")) //NOXLATE
{
cmbMethod.SelectedItem = OdbcConnectionMethod.ManagedFile;
}
- else if (odbcStr.Contains("%MG_DATA_PATH_ALIAS"))
+ else if (odbcStr.Contains("%MG_DATA_PATH_ALIAS")) //NOXLATE
{
cmbMethod.SelectedItem = OdbcConnectionMethod.Unmanaged;
}
@@ -113,7 +113,7 @@
cmbMethod.SelectedItem = OdbcConnectionMethod.KnownDriver;
}
}
- else if (values["DataSourceName"] != null)
+ else if (values["DataSourceName"] != null) //NOXLATE
{
cmbMethod.SelectedItem = OdbcConnectionMethod.DSN;
}
@@ -236,7 +236,7 @@
_service.SyncSessionCopy();
string result = _fs.TestConnection();
- if (!result.ToLower().Equals("true"))
+ if (!result.ToLower().Equals("true")) //NOXLATE
{
MessageBox.Show(string.Format(Properties.Resources.InvalidConnection, result), Properties.Resources.TitleError);
return false;
@@ -301,12 +301,12 @@
var xmlDoc = new XmlDocument();
XmlNamespaceManager mgr = new XmlNamespaceManager(xmlDoc.NameTable);
- mgr.AddNamespace("xs", XmlNamespaces.XS);
- mgr.AddNamespace("xsi", XmlNamespaces.XSI);
- mgr.AddNamespace("fdo", XmlNamespaces.FDO);
- mgr.AddNamespace("gml", XmlNamespaces.GML);
- mgr.AddNamespace("xlink", XmlNamespaces.XLINK);
- mgr.AddNamespace("fds", XmlNamespaces.FDS);
+ mgr.AddNamespace("xs", XmlNamespaces.XS); //NOXLATE
+ mgr.AddNamespace("xsi", XmlNamespaces.XSI); //NOXLATE
+ mgr.AddNamespace("fdo", XmlNamespaces.FDO); //NOXLATE
+ mgr.AddNamespace("gml", XmlNamespaces.GML); //NOXLATE
+ mgr.AddNamespace("xlink", XmlNamespaces.XLINK); //NOXLATE
+ mgr.AddNamespace("fds", XmlNamespaces.FDS); //NOXLATE
//This may have changed, so reapply
var props = Use64BitDriver ? this.ChildEditor.Get64BitConnectionProperties() : this.ChildEditor.ConnectionProperties;
@@ -325,7 +325,7 @@
BusyWaitDelegate worker = () =>
{
- classNames = names.Select(x => x.Contains(":") ? x.Split(':')[1] : x).ToArray();
+ classNames = names.Select(x => x.Contains(":") ? x.Split(':')[1] : x).ToArray(); //NOXLATE
var schema = _fs.CurrentConnection.FeatureService.DescribeFeatureSourcePartial(_fs.ResourceID, schemaName, classNames);
_doc.AddSchema(schema); //Only one schema is supported by ODBC so this is ok
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -101,7 +101,7 @@
if (_item != null)
{
//Set logical geometry property
- var prop = new GeometricPropertyDefinition("Geometry", "");
+ var prop = new GeometricPropertyDefinition("Geometry", ""); //NOXLATE
prop.GeometricTypes = FeatureGeometricType.Point;
prop.HasElevation = true;
prop.HasMeasure = true;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -28,11 +28,11 @@
set
{
_override = value;
- OnPropertyChanged("Override");
+ OnPropertyChanged("Override"); //NOXLATE
}
}
- [DisplayName("Spatial Context")]
+ [DisplayName("Spatial Context")] //NOXLATE
public string SpatialContext
{
get { return _spatialContext; }
@@ -45,64 +45,64 @@
if (prop != null)
prop.SpatialContextAssociation = value;
}
- OnPropertyChanged("SpatialContext");
+ OnPropertyChanged("SpatialContext"); //NOXLATE
}
}
- [DisplayName("Key Column")]
+ [DisplayName("Key Column")] //NOXLATE
public string Key
{
get { return _key; }
set
{
_key = value;
- OnPropertyChanged("Key");
+ OnPropertyChanged("Key"); //NOXLATE
}
}
private bool _geom;
- [DisplayName("Has Geometry")]
+ [DisplayName("Has Geometry")] //NOXLATE
public bool Geometry
{
get { return _geom; }
set
{
_geom = value;
- OnPropertyChanged("Geometry");
+ OnPropertyChanged("Geometry"); //NOXLATE
}
}
- [DisplayName("X Column")]
+ [DisplayName("X Column")] //NOXLATE
public string X
{
get { return _x; }
set
{
_x = value;
- OnPropertyChanged("X");
+ OnPropertyChanged("X"); //NOXLATE
}
}
- [DisplayName("Y Column")]
+ [DisplayName("Y Column")] //NOXLATE
public string Y
{
get { return _y; }
set
{
_y = value;
- OnPropertyChanged("Y");
+ OnPropertyChanged("Y"); //NOXLATE
}
}
- [DisplayName("Z Column")]
+ [DisplayName("Z Column")] //NOXLATE
public string Z
{
get { return _z; }
set
{
_z = value;
- OnPropertyChanged("Z");
+ OnPropertyChanged("Z"); //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -53,12 +53,12 @@
get
{
var values = new NameValueCollection();
- values["ConnectionString"] = txtConnStr.Text;
+ values["ConnectionString"] = txtConnStr.Text; //NOXLATE
return values;
}
set
{
- txtConnStr.Text = value["ConnectionString"];
+ txtConnStr.Text = value["ConnectionString"]; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -47,7 +47,7 @@
{
service.RegisterCustomNotifier(this);
_fs = (IFeatureSource)service.GetEditedResource();
- _dsnNames = service.FeatureService.GetConnectionPropertyValues("OSGeo.ODBC", "DataSourceName", string.Empty);
+ _dsnNames = service.FeatureService.GetConnectionPropertyValues("OSGeo.ODBC", "DataSourceName", string.Empty); //NOXLATE
}
void OnConnectionChanged()
@@ -63,12 +63,12 @@
{
var values = new NameValueCollection();
if (!string.IsNullOrEmpty(txtDSN.Text))
- values["DataSourceName"] = txtDSN.Text;
+ values["DataSourceName"] = txtDSN.Text; //NOXLATE
return values;
}
set
{
- txtDSN.Text = value["DataSourceName"];
+ txtDSN.Text = value["DataSourceName"]; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -55,13 +55,13 @@
{
var values = new NameValueCollection();
if (this.SelectedDriver != null)
- values["ConnectionString"] = this.SelectedDriver.OdbcConnectionString;
+ values["ConnectionString"] = this.SelectedDriver.OdbcConnectionString; //NOXLATE
return values;
}
set
{
- if (this.SelectedDriver != null && value["ConnectionString"] != null)
- this.SelectedDriver.OdbcConnectionString = value["ConnectionString"];
+ if (this.SelectedDriver != null && value["ConnectionString"] != null) //NOXLATE
+ this.SelectedDriver.OdbcConnectionString = value["ConnectionString"]; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -71,16 +71,16 @@
set
{
var inner = new System.Data.Odbc.OdbcConnectionStringBuilder();
- if (value["ConnectionString"] == null)
- throw new InvalidOperationException(string.Format(Properties.Resources.FdoConnectionStringComponentNotFound, "ConnectionString"));
+ if (value["ConnectionString"] == null) //NOXLATE
+ throw new InvalidOperationException(string.Format(Properties.Resources.FdoConnectionStringComponentNotFound, "ConnectionString")); //NOXLATE
- inner.ConnectionString = value["ConnectionString"];
- if (inner["Dbq"] == null)
- throw new InvalidOperationException(string.Format(Properties.Resources.OdbcConnectionStringComponentNotFound, "Dbq"));
+ inner.ConnectionString = value["ConnectionString"]; //NOXLATE
+ if (inner["Dbq"] == null) //NOXLATE
+ throw new InvalidOperationException(string.Format(Properties.Resources.OdbcConnectionStringComponentNotFound, "Dbq")); //NOXLATE
- string path = inner["Dbq"].ToString();
- if (path.Contains("%MG_DATA_FILE_PATH%"))
- resDataCtrl.MarkedFile = path.Substring("%MG_DATA_FILE_PATH%".Length);
+ string path = inner["Dbq"].ToString(); //NOXLATE
+ if (path.Contains(StringConstants.MgDataFilePath))
+ resDataCtrl.MarkedFile = path.Substring(StringConstants.MgDataFilePath.Length);
}
}
@@ -103,9 +103,9 @@
//throw new InvalidOperationException(string.Format(Properties.Resources.OdbcCannotInferDriver, resDataCtrl.MarkedFile));
var inner = new System.Data.Odbc.OdbcConnectionStringBuilder();
- inner["Driver"] = drv;
- inner["Dbq"] = "%MG_DATA_FILE_PATH%" + resDataCtrl.MarkedFile;
- values["ConnectionString"] = inner.ToString();
+ inner["Driver"] = drv; //NOXLATE
+ inner["Dbq"] = StringConstants.MgDataFilePath + resDataCtrl.MarkedFile;
+ values["ConnectionString"] = inner.ToString(); //NOXLATE
return values;
}
@@ -116,16 +116,16 @@
{
string ext = System.IO.Path.GetExtension(fileName).ToUpper();
switch (ext)
- {
- case ".ACCDB":
+ {
+ case ".ACCDB": //NOXLATE
return Properties.Resources.OdbcDriverAccess64;
- case ".MDB":
+ case ".MDB": //NOXLATE
return use64Bit ? Properties.Resources.OdbcDriverAccess64 : Properties.Resources.OdbcDriverAccess;
- case ".XLS":
+ case ".XLS": //NOXLATE
return use64Bit ? Properties.Resources.OdbcDriverExcel64 : Properties.Resources.OdbcDriverExcel;
- case ".XLSX":
- case ".XLSM":
- case ".XLSB":
+ case ".XLSX": //NOXLATE
+ case ".XLSM": //NOXLATE
+ case ".XLSB": //NOXLATE
return Properties.Resources.OdbcDriverExcel64;
}
return null;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -63,15 +63,15 @@
string ext = System.IO.Path.GetExtension(fileName).ToUpper();
switch (ext)
{
- case ".ACCDB":
+ case ".ACCDB": //NOXLATE
return Properties.Resources.OdbcDriverAccess64;
- case ".MDB":
+ case ".MDB": //NOXLATE
return use64Bit ? Properties.Resources.OdbcDriverAccess64 : Properties.Resources.OdbcDriverAccess;
- case ".XLS":
+ case ".XLS": //NOXLATE
return use64Bit ? Properties.Resources.OdbcDriverExcel64 : Properties.Resources.OdbcDriverExcel;
- case ".XLSX":
- case ".XLSM":
- case ".XLSB":
+ case ".XLSX": //NOXLATE
+ case ".XLSM": //NOXLATE
+ case ".XLSB": //NOXLATE
return Properties.Resources.OdbcDriverExcel64;
}
return null;
@@ -85,11 +85,11 @@
}
set
{
- var cstr = value["ConnectionString"];
+ var cstr = value["ConnectionString"]; //NOXLATE
var builder = new System.Data.Common.DbConnectionStringBuilder();
builder.ConnectionString = cstr;
- if (builder["Dbq"] != null)
- txtFilePath.Text = builder["Dbq"].ToString();
+ if (builder["Dbq"] != null) //NOXLATE
+ txtFilePath.Text = builder["Dbq"].ToString(); //NOXLATE
}
}
@@ -107,9 +107,9 @@
//throw new InvalidOperationException(string.Format(Properties.Resources.OdbcCannotInferDriver, path));
var inner = new System.Data.Odbc.OdbcConnectionStringBuilder();
- inner["Driver"] = drv;
- inner["Dbq"] = path;
- values["ConnectionString"] = inner.ToString();
+ inner["Driver"] = drv; //NOXLATE
+ inner["Dbq"] = path; //NOXLATE
+ values["ConnectionString"] = inner.ToString(); //NOXLATE
return values;
}
@@ -125,10 +125,10 @@
{
using (var open = new OpenFileDialog())
{
- open.Filter = Properties.Resources.OdbcDriverAccess + "|*.mdb|" +
- Properties.Resources.OdbcDriverAccess64 + "|*.accdb,*.mdb|" +
- Properties.Resources.OdbcDriverExcel + "|*.xls|" +
- Properties.Resources.OdbcDriverExcel64 + "|*.xlsx,*.xlsm,*.xlsb";
+ open.Filter = Properties.Resources.OdbcDriverAccess + "|*.mdb|" + //NOXLATE
+ Properties.Resources.OdbcDriverAccess64 + "|*.accdb,*.mdb|" + //NOXLATE
+ Properties.Resources.OdbcDriverExcel + "|*.xls|" + //NOXLATE
+ Properties.Resources.OdbcDriverExcel64 + "|*.xlsx,*.xlsm,*.xlsb"; //NOXLATE
if (open.ShowDialog() == DialogResult.OK)
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -39,7 +39,7 @@
{
get
{
- return "OSGeo.MySQL";
+ return "OSGeo.MySQL"; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -39,7 +39,7 @@
{
get
{
- return "OSGeo.PostgreSQL";
+ return "OSGeo.PostgreSQL"; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -64,47 +64,47 @@
_fs = _service.GetEditedResource() as IFeatureSource;
//Set the field values
- txtService.Text = _fs.GetConnectionProperty("Service");
+ txtService.Text = _fs.GetConnectionProperty("Service"); //NOXLATE
//We're gonna follow MG Studio behaviour here which is: Never load the password
//and auto trigger dirty state.
if (!_service.IsNew)
{
- txtUsername.Text = _fs.GetEncryptedUsername() ?? _fs.GetConnectionProperty("Username");
+ txtUsername.Text = _fs.GetEncryptedUsername() ?? _fs.GetConnectionProperty("Username"); //NOXLATE
//txtPassword.Text = _fs.GetConnectionProperty("Password");
OnResourceChanged();
}
//Set initial value of data store if possible
- var dstore = _fs.GetConnectionProperty("DataStore");
+ var dstore = _fs.GetConnectionProperty("DataStore"); //NOXLATE
txtDataStore.Text = dstore;
//As our connection properties are not CLR properties,
//"manually" bind these fields
txtService.TextChanged += (s, e) =>
{
- _fs.SetConnectionProperty("Service", txtService.Text);
+ _fs.SetConnectionProperty("Service", txtService.Text); //NOXLATE
};
txtUsername.TextChanged += (s, e) =>
{
if (string.IsNullOrEmpty(txtUsername.Text))
- _fs.SetConnectionProperty("Username", null);
+ _fs.SetConnectionProperty("Username", null); //NOXLATE
else
- _fs.SetConnectionProperty("Username", txtUsername.Text);
+ _fs.SetConnectionProperty("Username", txtUsername.Text); //NOXLATE
};
txtPassword.TextChanged += (s, e) =>
{
if (string.IsNullOrEmpty(txtPassword.Text))
- _fs.SetConnectionProperty("Password", null);
+ _fs.SetConnectionProperty("Password", null); //NOXLATE
else
- _fs.SetConnectionProperty("Password", txtPassword.Text);
+ _fs.SetConnectionProperty("Password", txtPassword.Text); //NOXLATE
};
txtDataStore.TextChanged += (s, e) =>
{
- _fs.SetConnectionProperty("DataStore", txtDataStore.Text);
+ _fs.SetConnectionProperty("DataStore", txtDataStore.Text); //NOXLATE
};
}
@@ -126,21 +126,21 @@
if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
{
- if (username != "%MG_USERNAME%" && password != "%MG_PASSWORD%")
+ if (username != StringConstants.MgUsernamePlaceholder && password != StringConstants.MgPasswordPlaceholder)
{
- _fs.SetConnectionProperty("Username", "%MG_USERNAME%");
- _fs.SetConnectionProperty("Password", "%MG_PASSWORD%");
+ _fs.SetConnectionProperty("Username", StringConstants.MgUsernamePlaceholder); //NOXLATE
+ _fs.SetConnectionProperty("Password", StringConstants.MgPasswordPlaceholder); //NOXLATE
_fs.SetEncryptedCredentials(username, password);
_service.SyncSessionCopy();
}
}
else if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password))
{
- _fs.SetConnectionProperty("Username", null);
- _fs.SetConnectionProperty("Password", null);
+ _fs.SetConnectionProperty("Username", null); //NOXLATE
+ _fs.SetConnectionProperty("Password", null); //NOXLATE
try
{
- _fs.DeleteResourceData("MG_USER_CREDENTIALS");
+ _fs.DeleteResourceData(StringConstants.MgUserCredentialsResourceData);
}
catch { }
_service.SyncSessionCopy();
@@ -161,9 +161,9 @@
private string GetPartialConnectionStringForDataStoreEnumeration()
{
var builder = new System.Data.Common.DbConnectionStringBuilder();
- builder["Service"] = _fs.GetConnectionProperty("Service");
- builder["Username"] = txtUsername.Text; //_fs.GetConnectionProperty("Username");
- builder["Password"] = txtPassword.Text; //_fs.GetConnectionProperty("Password");
+ builder["Service"] = _fs.GetConnectionProperty("Service"); //NOXLATE
+ builder["Username"] = txtUsername.Text; //_fs.GetConnectionProperty("Username"); //NOXLATE
+ builder["Password"] = txtPassword.Text; //_fs.GetConnectionProperty("Password"); //NOXLATE
return builder.ToString();
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -39,7 +39,7 @@
{
get
{
- return "OSGeo.SQLServerSpatial";
+ return "OSGeo.SQLServerSpatial"; //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -27,6 +27,7 @@
using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System.Diagnostics;
using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Editors.FeatureSource.Providers.SQLite
{
@@ -51,10 +52,10 @@
MarkSelected();
//HACK: Set UseFdoMetadata property if not specified otherwise this will be an invalid feature source
- if (string.IsNullOrEmpty(_fs.GetConnectionProperty("UseFdoMetadata")))
- _fs.SetConnectionProperty("UseFdoMetadata", "FALSE");
+ if (string.IsNullOrEmpty(_fs.GetConnectionProperty("UseFdoMetadata"))) //NOXLATE
+ _fs.SetConnectionProperty("UseFdoMetadata", "FALSE"); //NOXLATE
- chkUseFdoMetadata.Checked = _fs.GetConnectionProperty("UseFdoMetadata").ToUpper().Equals(true.ToString().ToUpper());
+ chkUseFdoMetadata.Checked = _fs.GetConnectionProperty("UseFdoMetadata").ToUpper().Equals(true.ToString().ToUpper()); //NOXLATE
}
private void MarkSelected()
@@ -84,7 +85,7 @@
protected override void OnResourceMarked(string dataName)
{
- string fileProp = "%MG_DATA_FILE_PATH%" + dataName;
+ string fileProp = StringConstants.MgDataFilePath + dataName;
string currFileProp = _fs.GetConnectionProperty(this.FileFdoProperty);
if (!currFileProp.Equals(fileProp))
_fs.SetConnectionProperty(this.FileFdoProperty, fileProp);
@@ -93,9 +94,9 @@
private void chkUseFdoMetadata_CheckedChanged(object sender, EventArgs e)
{
var newValue = chkUseFdoMetadata.Checked.ToString().ToUpper();
- var currValue = _fs.GetConnectionProperty("UseFdoMetadata");
+ var currValue = _fs.GetConnectionProperty("UseFdoMetadata"); //NOXLATE
if (!newValue.Equals(currValue))
- _fs.SetConnectionProperty("UseFdoMetadata", newValue);
+ _fs.SetConnectionProperty("UseFdoMetadata", newValue); //NOXLATE
}
private void btnTest_Click(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -27,6 +27,7 @@
using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System.Diagnostics;
using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Editors.FeatureSource.Providers.Sdf
{
@@ -51,10 +52,10 @@
MarkSelected();
//HACK: Set ReadOnly property if not specified otherwise this will be an invalid feature source
- if (string.IsNullOrEmpty(_fs.GetConnectionProperty("ReadOnly")))
- _fs.SetConnectionProperty("ReadOnly", "FALSE");
+ if (string.IsNullOrEmpty(_fs.GetConnectionProperty("ReadOnly"))) //NOXLATE
+ _fs.SetConnectionProperty("ReadOnly", "FALSE"); //NOXLATE
- chkReadOnly.Checked = _fs.GetConnectionProperty("ReadOnly").ToUpper().Equals(true.ToString().ToUpper());
+ chkReadOnly.Checked = _fs.GetConnectionProperty("ReadOnly").ToUpper().Equals(true.ToString().ToUpper()); //NOXLATE
}
private void MarkSelected()
@@ -78,7 +79,7 @@
protected override string[] GetUnmanagedFileExtensions()
{
- return new string[] { "sdf" };
+ return new string[] { "sdf" }; //NOXLATE
}
protected override void OnResourceChanged()
@@ -90,14 +91,14 @@
private void chkReadOnly_CheckedChanged(object sender, EventArgs e)
{
var newValue = chkReadOnly.Checked.ToString().ToUpper();
- var currValue = _fs.GetConnectionProperty("ReadOnly");
+ var currValue = _fs.GetConnectionProperty("ReadOnly"); //NOXLATE
if (!newValue.Equals(currValue))
- _fs.SetConnectionProperty("ReadOnly", newValue);
+ _fs.SetConnectionProperty("ReadOnly", newValue); //NOXLATE
}
protected override void OnResourceMarked(string dataName)
{
- string fileProp = "%MG_DATA_FILE_PATH%" + dataName;
+ string fileProp = StringConstants.MgDataFilePath + dataName;
string currFileProp = _fs.GetConnectionProperty(this.FileFdoProperty);
if (!currFileProp.Equals(fileProp))
_fs.SetConnectionProperty(this.FileFdoProperty, fileProp);
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -28,6 +28,7 @@
using System.Diagnostics;
using System.IO;
using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Editors.FeatureSource.Providers.Shp
{
@@ -50,18 +51,18 @@
Debug.Assert(_fs != null);
if (_fs.ConnectionPropertyNames.Length == 0)
{
- _fs.SetConnectionProperty("DefaultFileLocation", "%MG_DATA_FILE_PATH%");
+ _fs.SetConnectionProperty("DefaultFileLocation", StringConstants.MgDataFilePath); //NOXLATE
}
MarkSelected();
resDataCtrl.ResourceDataUploaded += new Maestro.Editors.Common.ResourceDataCtrl.ResourceUploadEventHandler(OnResourceDataUploaded);
}
- static readonly string[] SHP_RELATED_EXTENSIONS = { ".shx", ".dbf", ".idx", ".prj", ".cpg" };
+ static readonly string[] SHP_RELATED_EXTENSIONS = { ".shx", ".dbf", ".idx", ".prj", ".cpg" }; //NOXLATE
void OnResourceDataUploaded(string dataName, string origPath)
{
//If a SHP file was loaded, we want all of its buddies too
- if (origPath.ToLower().EndsWith(".shp"))
+ if (origPath.ToLower().EndsWith(".shp")) //NOXLATE
{
var pathPrefix = origPath.Substring(0, origPath.Length - 4);
foreach (string ext in SHP_RELATED_EXTENSIONS)
@@ -82,14 +83,14 @@
protected override string[] GetUnmanagedFileExtensions()
{
- return new string[] { "shp" };
+ return new string[] { "shp" }; //NOXLATE
}
protected override string FileFdoProperty
{
get
{
- return "DefaultFileLocation";
+ return "DefaultFileLocation"; //NOXLATE
}
}
@@ -120,7 +121,7 @@
protected override void OnResourceMarked(string dataName)
{
- var newValue = "%MG_DATA_FILE_PATH%" + dataName;
+ var newValue = StringConstants.MgDataFilePath + dataName;
var currValue = _fs.GetConnectionProperty(this.FileFdoProperty);
if (!newValue.Equals(currValue))
_fs.SetConnectionProperty(this.FileFdoProperty, newValue);
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -48,7 +48,7 @@
_items = new BindingList<RasterWmsItem>();
_service = service;
_fs = (IFeatureSource)_service.GetEditedResource();
- txtFeatureServer.Text = _fs.GetConnectionProperty("FeatureServer");
+ txtFeatureServer.Text = _fs.GetConnectionProperty("FeatureServer"); //NOXLATE
string xml = _fs.GetConfigurationContent();
if (!string.IsNullOrEmpty(xml))
{
@@ -78,7 +78,7 @@
var contexts = _fs.GetSpatialInfo(false);
var schemaName = _fs.GetSchemaNames()[0];
var clsNames = _fs.GetClassNames(schemaName);
- var schema = new FeatureSchema(schemaName, "");
+ var schema = new FeatureSchema(schemaName, string.Empty);
doc.AddSchema(schema);
foreach (var sc in contexts.SpatialContext)
@@ -90,15 +90,15 @@
foreach (var clsName in clsNames)
{
- var className = clsName.Split(':')[1];
- var cls = new ClassDefinition(className, "");
- cls.AddProperty(new DataPropertyDefinition("Id", "")
+ var className = clsName.Split(':')[1]; //NOXLATE
+ var cls = new ClassDefinition(className, string.Empty);
+ cls.AddProperty(new DataPropertyDefinition("Id", string.Empty) //NOXLATE
{
DataType = DataPropertyType.String,
Length = 256,
IsNullable = false
}, true);
- cls.AddProperty(new RasterPropertyDefinition("Image", "")
+ cls.AddProperty(new RasterPropertyDefinition("Image", string.Empty) //NOXLATE
{
DefaultImageXSize = 1024,
DefaultImageYSize = 1024,
@@ -107,7 +107,7 @@
schema.AddClass(cls);
- var item = CreateDefaultItem(schema.Name, cls.Name, "Image", defaultSc);
+ var item = CreateDefaultItem(schema.Name, cls.Name, "Image", defaultSc); //NOXLATE
doc.AddRasterItem(item);
}
@@ -117,12 +117,12 @@
private static RasterWmsItem CreateDefaultItem(string schemaName, string clsName, string rasName, IFdoSpatialContext defaultSc)
{
var item = new RasterWmsItem(clsName, rasName);
- item.ImageFormat = "PNG";
+ item.ImageFormat = "PNG"; //NOXLATE
item.IsTransparent = true;
item.BackgroundColor = Color.White;
item.SpatialContextName = defaultSc.Name;
item.UseTileCache = false;
- item.AddLayer(new WmsLayerDefinition(schemaName + ":" + clsName) { Style = "default" });
+ item.AddLayer(new WmsLayerDefinition(schemaName + ":" + clsName) { Style = "default" }); //NOXLATE
return item;
}
@@ -180,15 +180,15 @@
var name = GenericInputDialog.GetValue(Properties.Resources.TitleNewFeatureClass, Properties.Resources.PromptName, null);
var schema = _config.Schemas[0];
- var cls = new ClassDefinition(name, "");
- cls.AddProperty(new DataPropertyDefinition("Id", "")
+ var cls = new ClassDefinition(name, string.Empty);
+ cls.AddProperty(new DataPropertyDefinition("Id", string.Empty) //NOXLATE
{
DataType = DataPropertyType.String,
Length = 256,
IsNullable = false
}, true);
- var rp = new RasterPropertyDefinition("Image", "")
+ var rp = new RasterPropertyDefinition("Image", string.Empty) //NOXLATE
{
DefaultImageXSize = 800,
DefaultImageYSize = 800
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -53,9 +53,9 @@
_service.RegisterCustomNotifier(this);
_fs = (IFeatureSource)_service.GetEditedResource();
- txtFeatureServer.Text = _fs.GetConnectionProperty("FeatureServer");
- txtUsername.Text = _fs.GetConnectionProperty("Username");
- txtPassword.Text = _fs.GetConnectionProperty("Password");
+ txtFeatureServer.Text = _fs.GetConnectionProperty("FeatureServer"); //NOXLATE
+ txtUsername.Text = _fs.GetConnectionProperty("Username"); //NOXLATE
+ txtPassword.Text = _fs.GetConnectionProperty("Password"); //NOXLATE
}
finally
{
@@ -67,7 +67,7 @@
{
if (_init)
return;
- _fs.SetConnectionProperty("FeatureServer", txtFeatureServer.Text);
+ _fs.SetConnectionProperty("FeatureServer", txtFeatureServer.Text); //NOXLATE
}
private void txtUsername_TextChanged(object sender, EventArgs e)
@@ -75,9 +75,9 @@
if (_init)
return;
if (string.IsNullOrEmpty(txtUsername.Text))
- _fs.SetConnectionProperty("Username", null);
+ _fs.SetConnectionProperty("Username", null); //NOXLATE
else
- _fs.SetConnectionProperty("Username", txtUsername.Text);
+ _fs.SetConnectionProperty("Username", txtUsername.Text); //NOXLATE
}
private void txtPassword_TextChanged(object sender, EventArgs e)
@@ -85,9 +85,9 @@
if (_init)
return;
if (string.IsNullOrEmpty(txtPassword.Text))
- _fs.SetConnectionProperty("Password", null);
+ _fs.SetConnectionProperty("Password", null); //NOXLATE
else
- _fs.SetConnectionProperty("Password", txtPassword.Text);
+ _fs.SetConnectionProperty("Password", txtPassword.Text); //NOXLATE
}
private void btnTest_Click(object sender, EventArgs e)
@@ -107,21 +107,21 @@
if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
{
- if (username != "%MG_USERNAME%" && password != "%MG_PASSWORD%")
+ if (username != StringConstants.MgUsernamePlaceholder && password != StringConstants.MgPasswordPlaceholder)
{
- _fs.SetConnectionProperty("Username", "%MG_USERNAME%");
- _fs.SetConnectionProperty("Password", "%MG_PASSWORD%");
+ _fs.SetConnectionProperty("Username", StringConstants.MgUsernamePlaceholder); //NOXLATE
+ _fs.SetConnectionProperty("Password", StringConstants.MgPasswordPlaceholder); //NOXLATE
_fs.SetEncryptedCredentials(username, password);
_service.SyncSessionCopy();
}
}
else
{
- _fs.SetConnectionProperty("Username", null);
- _fs.SetConnectionProperty("Password", null);
+ _fs.SetConnectionProperty("Username", null); //NOXLATE
+ _fs.SetConnectionProperty("Password", null); //NOXLATE
try
{
- _fs.DeleteResourceData("MG_USER_CREDENTIALS");
+ _fs.DeleteResourceData(StringConstants.MgUserCredentialsResourceData);
}
catch { }
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -56,10 +56,10 @@
try
{
_fsvc = (IFusionService)_edsvc.GetService((int)ServiceType.Fusion);
- _baseUrl = service.GetCustomProperty("BaseUrl").ToString();
+ _baseUrl = service.GetCustomProperty("BaseUrl").ToString(); //NOXLATE
- if (!_baseUrl.EndsWith("/"))
- _baseUrl += "/";
+ if (!_baseUrl.EndsWith("/")) //NOXLATE
+ _baseUrl += "/"; //NOXLATE
}
catch
{
@@ -69,8 +69,8 @@
_edsvc.Saved += OnSaved;
_flexLayout = (IApplicationDefinition)service.GetEditedResource();
- TextBoxBinder.BindText(txtTemplateUrl, _flexLayout, "TemplateUrl");
- TextBoxBinder.BindText(txtTitle, _flexLayout, "Title");
+ TextBoxBinder.BindText(txtTemplateUrl, _flexLayout, "TemplateUrl"); //NOXLATE
+ TextBoxBinder.BindText(txtTitle, _flexLayout, "Title"); //NOXLATE
var templates = _fsvc.GetApplicationTemplates();
InitializeTemplateList(templates);
@@ -96,13 +96,13 @@
try
{
var conn = _flexLayout.CurrentConnection;
- string baseUrl = conn.GetCustomProperty("BaseUrl").ToString();
- if (!baseUrl.EndsWith("/"))
- baseUrl += "/";
+ string baseUrl = conn.GetCustomProperty("BaseUrl").ToString(); //NOXLATE
+ if (!baseUrl.EndsWith("/")) //NOXLATE
+ baseUrl += "/"; //NOXLATE
if (!_edsvc.IsNew)
{
- txtPublicUrl.Text = baseUrl + txtTemplateUrl.Text + "?ApplicationDefinition=" + _edsvc.ResourceID;
+ txtPublicUrl.Text = baseUrl + txtTemplateUrl.Text + "?ApplicationDefinition=" + _edsvc.ResourceID; //NOXLATE
btnShowInBrowser.Enabled = true;
}
else
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -57,7 +57,7 @@
/// <returns></returns>
public IWidgetInfo GetWidgetInfo(string name)
{
- Check.NotEmpty(name, "name");
+ Check.NotEmpty(name, "name"); //NOXLATE
foreach (var wgt in _widgetSet.WidgetInfo)
{
if (name.Equals(wgt.Type))
@@ -82,7 +82,7 @@
/// <returns></returns>
public IApplicationDefinitionContainerInfo GetContainerInfo(string name)
{
- Check.NotEmpty(name, "name");
+ Check.NotEmpty(name, "name"); //NOXLATE
foreach (var cnt in _containerSet.ContainerInfo)
{
if (name.Equals(cnt.Type))
@@ -98,7 +98,7 @@
/// <returns></returns>
public IApplicationDefinitionTemplateInfo GetTemplateInfo(string name)
{
- Check.NotEmpty(name, "name");
+ Check.NotEmpty(name, "name"); //NOXLATE
foreach (var tpl in _templateSet.TemplateInfo)
{
if (name.Equals(tpl.Name))
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -96,9 +96,9 @@
/// <returns></returns>
public static IWidgetEditor GetEditorForWidget(IWidget widget, FlexibleLayoutEditorContext context, IEditorService edsvc)
{
- Check.NotNull(widget, "widget");
- Check.NotNull(context, "context");
- Check.NotNull(edsvc, "edsvc");
+ Check.NotNull(widget, "widget"); //NOXLATE
+ Check.NotNull(context, "context"); //NOXLATE
+ Check.NotNull(edsvc, "edsvc"); //NOXLATE
IWidgetEditor ed = null;
if (_edTypes.ContainsKey(widget.Name))
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -38,27 +38,27 @@
[ToolboxItem(false)]
internal partial class MapCtrl : UserControl, INotifyResourceChanged
{
- const string G_NORMAL_MAP = "G_NORMAL_MAP";
- const string G_SATELLITE_MAP = "G_SATELLITE_MAP";
- const string G_HYBRID_MAP = "G_HYBRID_MAP";
- const string G_PHYSICAL_MAP = "G_PHYSICAL_MAP";
+ const string G_NORMAL_MAP = "G_NORMAL_MAP"; //NOXLATE
+ const string G_SATELLITE_MAP = "G_SATELLITE_MAP"; //NOXLATE
+ const string G_HYBRID_MAP = "G_HYBRID_MAP"; //NOXLATE
+ const string G_PHYSICAL_MAP = "G_PHYSICAL_MAP"; //NOXLATE
- const string YAHOO_MAP_REG = "YAHOO_MAP_REG";
- const string YAHOO_MAP_SAT = "YAHOO_MAP_SAT";
- const string YAHOO_MAP_HYB = "YAHOO_MAP_HYB";
+ const string YAHOO_MAP_REG = "YAHOO_MAP_REG"; //NOXLATE
+ const string YAHOO_MAP_SAT = "YAHOO_MAP_SAT"; //NOXLATE
+ const string YAHOO_MAP_HYB = "YAHOO_MAP_HYB"; //NOXLATE
- const string BING_ROAD = "Road";
- const string BING_AERIAL = "Aerial";
- const string BING_HYBRID = "Hybrid";
+ const string BING_ROAD = "Road"; //NOXLATE
+ const string BING_AERIAL = "Aerial"; //NOXLATE
+ const string BING_HYBRID = "Hybrid"; //NOXLATE
- const string Type_Google = "Google";
- const string Type_Yahoo = "Yahoo";
- const string Type_Bing = "VirtualEarth";
- const string Type_OSM = "OpenStreetMap";
+ const string Type_Google = "Google"; //NOXLATE
+ const string Type_Yahoo = "Yahoo"; //NOXLATE
+ const string Type_Bing = "VirtualEarth"; //NOXLATE
+ const string Type_OSM = "OpenStreetMap"; //NOXLATE
- const string OSM_MAP_MAPNIK = "Mapnik";
- const string OSM_MAP_TRANSPORTMAP = "TransportMap";
- const string OSM_MAP_CYCLEMAP = "CycleMap";
+ const string OSM_MAP_MAPNIK = "Mapnik"; //NOXLATE
+ const string OSM_MAP_TRANSPORTMAP = "TransportMap"; //NOXLATE
+ const string OSM_MAP_CYCLEMAP = "CycleMap"; //NOXLATE
private MapCtrl()
{
@@ -166,7 +166,7 @@
foreach (var map in group.Map)
{
- if (map.Type.Equals("MapGuide"))
+ if (map.Type.Equals("MapGuide")) //NOXLATE
{
_map = map;
}
@@ -212,8 +212,8 @@
}
}
- string googUrl = _appDef.GetValue("GoogleScript");
- string yahooUrl = _appDef.GetValue("YahooScript");
+ string googUrl = _appDef.GetValue("GoogleScript"); //NOXLATE
+ string yahooUrl = _appDef.GetValue("YahooScript"); //NOXLATE
if (!string.IsNullOrEmpty(yahooUrl))
{
@@ -263,7 +263,7 @@
}
};
- TextBoxBinder.BindText(txtMapId, group, "id");
+ TextBoxBinder.BindText(txtMapId, group, "id"); //NOXLATE
txtMapDefinition.Text = _map.GetMapDefinition();
txtMapDefinition.TextChanged += (s, e) =>
@@ -272,10 +272,10 @@
OnResourceChanged();
};
- CheckBoxBinder.BindChecked(chkSingleTiled, _map, "SingleTile");
+ CheckBoxBinder.BindChecked(chkSingleTiled, _map, "SingleTile"); //NOXLATE
- var selOverlay = _map.GetValue("SelectionAsOverlay");
- var selColor = _map.GetValue("SelectionColor");
+ var selOverlay = _map.GetValue("SelectionAsOverlay"); //NOXLATE
+ var selColor = _map.GetValue("SelectionColor"); //NOXLATE
if (!string.IsNullOrEmpty(selColor))
cmbSelectionColor.CurrentColor = Utility.ParseHTMLColorRGBA(selColor.Substring(2)); //Strip the "0x" part
@@ -289,12 +289,12 @@
cmbSelectionColor.SelectedIndexChanged += (s, e) =>
{
- _map.SetValue("SelectionColor", "0x" + Utility.SerializeHTMLColorRGBA(cmbSelectionColor.CurrentColor, true));
+ _map.SetValue("SelectionColor", "0x" + Utility.SerializeHTMLColorRGBA(cmbSelectionColor.CurrentColor, true)); //NOXLATE
OnResourceChanged();
};
chkSelectionAsOverlay.CheckedChanged += (s, e) =>
- {
- _map.SetValue("SelectionAsOverlay", chkSelectionAsOverlay.Checked.ToString().ToLower());
+ {
+ _map.SetValue("SelectionAsOverlay", chkSelectionAsOverlay.Checked.ToString().ToLower()); //NOXLATE
OnResourceChanged();
};
@@ -327,31 +327,31 @@
//Check for maps unaccounted for, these will be disabled
if (!_cmsMaps.ContainsKey(G_HYBRID_MAP))
- _cmsMaps[G_HYBRID_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, "Google Hybrid", G_HYBRID_MAP)) { IsEnabled = false };
+ _cmsMaps[G_HYBRID_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, Properties.Resources.CmsGoogleHybrid, G_HYBRID_MAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(G_NORMAL_MAP))
- _cmsMaps[G_NORMAL_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, "Google Streets", G_NORMAL_MAP)) { IsEnabled = false };
+ _cmsMaps[G_NORMAL_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, Properties.Resources.CmsGoogleStreets, G_NORMAL_MAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(G_SATELLITE_MAP))
- _cmsMaps[G_SATELLITE_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, "Google Satellite", G_SATELLITE_MAP)) { IsEnabled = false };
+ _cmsMaps[G_SATELLITE_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, Properties.Resources.CmsGoogleSatellite, G_SATELLITE_MAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(G_PHYSICAL_MAP))
- _cmsMaps[G_PHYSICAL_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, "Google Physical", G_PHYSICAL_MAP)) { IsEnabled = false };
+ _cmsMaps[G_PHYSICAL_MAP] = new CmsMap(group.CreateCmsMapEntry(Type_Google, true, Properties.Resources.CmsGooglePhysical, G_PHYSICAL_MAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(YAHOO_MAP_HYB))
- _cmsMaps[YAHOO_MAP_HYB] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, "Yahoo! Maps Hybrid", YAHOO_MAP_HYB)) { IsEnabled = false };
+ _cmsMaps[YAHOO_MAP_HYB] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, Properties.Resources.CmsYahooHybrid, YAHOO_MAP_HYB)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(YAHOO_MAP_REG))
- _cmsMaps[YAHOO_MAP_REG] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, "Yahoo! Maps Street", YAHOO_MAP_REG)) { IsEnabled = false };
+ _cmsMaps[YAHOO_MAP_REG] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, Properties.Resources.CmsYahooStreet, YAHOO_MAP_REG)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(YAHOO_MAP_SAT))
- _cmsMaps[YAHOO_MAP_SAT] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, "Yahoo! Maps Satellite", YAHOO_MAP_SAT)) { IsEnabled = false };
+ _cmsMaps[YAHOO_MAP_SAT] = new CmsMap(group.CreateCmsMapEntry(Type_Yahoo, true, Properties.Resources.CmsYahooSatellite, YAHOO_MAP_SAT)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(BING_ROAD))
- _cmsMaps[BING_ROAD] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Street", BING_ROAD)) { IsEnabled = false };
+ _cmsMaps[BING_ROAD] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, Properties.Resources.CmsBingStreet, BING_ROAD)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(BING_AERIAL))
- _cmsMaps[BING_AERIAL] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Satellite", BING_AERIAL)) { IsEnabled = false };
+ _cmsMaps[BING_AERIAL] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, Properties.Resources.CmsBingSatellite, BING_AERIAL)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(BING_HYBRID))
- _cmsMaps[BING_HYBRID] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Hybrid", BING_HYBRID)) { IsEnabled = false };
+ _cmsMaps[BING_HYBRID] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, Properties.Resources.CmsBingHybrid, BING_HYBRID)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(OSM_MAP_MAPNIK))
- _cmsMaps[OSM_MAP_MAPNIK] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map", OSM_MAP_MAPNIK)) { IsEnabled = false };
+ _cmsMaps[OSM_MAP_MAPNIK] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, Properties.Resources.CmsOsm, OSM_MAP_MAPNIK)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(OSM_MAP_TRANSPORTMAP))
- _cmsMaps[OSM_MAP_TRANSPORTMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (TransportMap)", OSM_MAP_TRANSPORTMAP)) { IsEnabled = false };
+ _cmsMaps[OSM_MAP_TRANSPORTMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, Properties.Resources.CmsOsmTransport, OSM_MAP_TRANSPORTMAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(OSM_MAP_CYCLEMAP))
- _cmsMaps[OSM_MAP_CYCLEMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (CycleMap)", OSM_MAP_CYCLEMAP)) { IsEnabled = false };
+ _cmsMaps[OSM_MAP_CYCLEMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, Properties.Resources.CmsOsmCycle, OSM_MAP_CYCLEMAP)) { IsEnabled = false };
}
private void chkOverride_CheckedChanged(object sender, EventArgs e)
@@ -382,7 +382,7 @@
private void SetCmsAvailability(string olType, bool enabled)
{
- Trace.TraceInformation("Setting availability of CMS provider ({0}) to {1}", olType, enabled);
+ Trace.TraceInformation("Setting availability of CMS provider ({0}) to {1}", olType, enabled); //NOXLATE
if (_cmsMaps.ContainsKey(olType))
{
var map = _cmsMaps[olType];
@@ -413,7 +413,7 @@
}
if (IsUsingCmsLayers())
- _map.OverlayOptions = _map.CreateOverlayOptions(false, true, "EPSG:900913");
+ _map.OverlayOptions = _map.CreateOverlayOptions(false, true, "EPSG:900913"); //NOXLATE
else
_map.OverlayOptions = null;
@@ -437,7 +437,7 @@
return;
if (chkBingStreets.Checked)
- _appDef.SetValue("VirtualEarthScript", BING_URL);
+ _appDef.SetValue("VirtualEarthScript", BING_URL); //NOXLATE
SetCmsAvailability(BING_ROAD, chkBingStreets.Checked);
}
@@ -447,7 +447,7 @@
return;
if (chkBingSatellite.Checked)
- _appDef.SetValue("VirtualEarthScript", BING_URL);
+ _appDef.SetValue("VirtualEarthScript", BING_URL); //NOXLATE
SetCmsAvailability(BING_AERIAL, chkBingSatellite.Checked);
}
@@ -457,7 +457,7 @@
return;
if (chkBingHybrid.Checked)
- _appDef.SetValue("VirtualEarthScript", BING_URL);
+ _appDef.SetValue("VirtualEarthScript", BING_URL); //NOXLATE
SetCmsAvailability(BING_HYBRID, chkBingHybrid.Checked);
}
@@ -467,7 +467,7 @@
return;
if (chkGoogStreets.Checked)
- _appDef.SetValue("GoogleScript", GOOGLE_URL);
+ _appDef.SetValue("GoogleScript", GOOGLE_URL); //NOXLATE
SetCmsAvailability(G_NORMAL_MAP, chkGoogStreets.Checked);
}
@@ -477,7 +477,7 @@
return;
if (chkGoogSatellite.Checked)
- _appDef.SetValue("GoogleScript", GOOGLE_URL);
+ _appDef.SetValue("GoogleScript", GOOGLE_URL); //NOXLATE
SetCmsAvailability(G_SATELLITE_MAP, chkGoogSatellite.Checked);
}
@@ -487,7 +487,7 @@
return;
if (chkGoogHybrid.Checked)
- _appDef.SetValue("GoogleScript", GOOGLE_URL);
+ _appDef.SetValue("GoogleScript", GOOGLE_URL); //NOXLATE
SetCmsAvailability(G_HYBRID_MAP, chkGoogHybrid.Checked);
}
@@ -497,7 +497,7 @@
return;
if (chkGoogTerrain.Checked)
- _appDef.SetValue("GoogleScript", GOOGLE_URL);
+ _appDef.SetValue("GoogleScript", GOOGLE_URL); //NOXLATE
SetCmsAvailability(G_PHYSICAL_MAP, chkGoogTerrain.Checked);
}
@@ -534,7 +534,7 @@
return;
if (chkOsmMapnik.Checked)
- _appDef.SetValue("OpenStreetMapScript", OSM_URL);
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL); //NOXLATE
SetCmsAvailability(OSM_MAP_MAPNIK, chkOsmMapnik.Checked);
}
@@ -544,7 +544,7 @@
return;
if (chkOsmTransportMap.Checked)
- _appDef.SetValue("OpenStreetMapScript", OSM_URL);
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL); //NOXLATE
SetCmsAvailability(OSM_MAP_TRANSPORTMAP, chkOsmTransportMap.Checked);
}
@@ -554,7 +554,7 @@
return;
if (chkOsmCycleMap.Checked)
- _appDef.SetValue("OpenStreetMapScript", OSM_URL);
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL); //NOXLATE
SetCmsAvailability(OSM_MAP_CYCLEMAP, chkOsmCycleMap.Checked);
}
@@ -583,13 +583,13 @@
if (_noEvents)
return;
- _appDef.SetValue("YahooScript", YAHOO_URL + txtYahooApiKey.Text);
+ _appDef.SetValue("YahooScript", YAHOO_URL + txtYahooApiKey.Text); //NOXLATE
}
- const string OSM_URL = "http://www.openstreetmap.org/openlayers/OpenStreetMap.js";
- const string GOOGLE_URL = "http://maps.google.com/maps/api/js?sensor=false";
- const string YAHOO_URL = "http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=";
- const string BING_URL = "http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2";
+ const string OSM_URL = "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"; //NOXLATE
+ const string GOOGLE_URL = "http://maps.google.com/maps/api/js?sensor=false"; //NOXLATE
+ const string YAHOO_URL = "http://api.maps.yahoo.com/ajaxymap?v=3.0&appid="; //NOXLATE
+ const string BING_URL = "http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2"; //NOXLATE
private void OnResourceChanged()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -53,10 +53,10 @@
try
{
_fsvc = (IFusionService)service.GetService((int)ServiceType.Fusion);
- _baseUrl = service.GetCustomProperty("BaseUrl").ToString();
+ _baseUrl = service.GetCustomProperty("BaseUrl").ToString(); //NOXLATE
- if (!_baseUrl.EndsWith("/"))
- _baseUrl += "/";
+ if (!_baseUrl.EndsWith("/")) //NOXLATE
+ _baseUrl += "/"; //NOXLATE
}
catch
{
@@ -80,7 +80,7 @@
item.Tag = group;
group.PropertyChanged += (s, e) =>
{
- if (e.PropertyName == "id")
+ if (e.PropertyName == "id") //NOXLATE
item.Text = group.id;
};
lstMaps.Items.Add(item);
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -39,7 +39,7 @@
_appDef = appDef;
_context = context;
- cmbWidgets.DisplayMember = "Type";
+ cmbWidgets.DisplayMember = "Type"; //NOXLATE
cmbWidgets.DataSource = _context.GetAllWidgets();
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -42,7 +42,7 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtUrl.Text = _widget.GetValue("AboutURL");
+ txtUrl.Text = _widget.GetValue("AboutURL"); //NOXLATE
}
public Control Content
@@ -52,7 +52,7 @@
private void txtUrl_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("AboutURL", txtUrl.Text);
+ _widget.SetValue("AboutURL", txtUrl.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -42,7 +42,7 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtElementId.Text = _widget.GetValue("ElementId");
+ txtElementId.Text = _widget.GetValue("ElementId"); //NOXLATE
}
public Control Content
@@ -52,7 +52,7 @@
private void txtElementId_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("ElementId", txtElementId.Text);
+ _widget.SetValue("ElementId", txtElementId.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -44,16 +44,16 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- TextBoxBinder.BindText(txtTarget, this, "Target");
+ TextBoxBinder.BindText(txtTarget, this, "Target"); //NOXLATE
}
public string Target
{
- get { return _widget.GetValue("Target"); }
+ get { return _widget.GetValue("Target"); } //NOXLATE
set
- {
- _widget.SetValue("Target", value);
- OnPropertyChanged("Target");
+ {
+ _widget.SetValue("Target", value); //NOXLATE
+ OnPropertyChanged("Target"); //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -40,7 +40,7 @@
InitializeComponent();
}
- private string[] _units = { "meters", "feet", "miles", "kilometers" };
+ private string[] _units = { "meters", "feet", "miles", "kilometers" }; //NOXLATE
private IWidget _widget;
@@ -49,14 +49,14 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- TextBoxBinder.BindText(txtBorderColorInput, this, "BorderColorInput");
- TextBoxBinder.BindText(txtBufferDistance, this, "BufferDistance");
- TextBoxBinder.BindText(txtBufferDistanceInput, this, "BufferDistanceInput");
- TextBoxBinder.BindText(txtBufferUnitsInput, this, "BufferUnitsInput");
- TextBoxBinder.BindText(txtFillColorInput, this, "FillColorInput");
- TextBoxBinder.BindText(txtLayerName, this, "LayerName");
- TextBoxBinder.BindText(txtLayerNameInput, this, "LayerNameInput");
- TextBoxBinder.BindText(txtBufferUnits, this, "BufferUnits");
+ TextBoxBinder.BindText(txtBorderColorInput, this, "BorderColorInput"); //NOXLATE
+ TextBoxBinder.BindText(txtBufferDistance, this, "BufferDistance"); //NOXLATE
+ TextBoxBinder.BindText(txtBufferDistanceInput, this, "BufferDistanceInput"); //NOXLATE
+ TextBoxBinder.BindText(txtBufferUnitsInput, this, "BufferUnitsInput"); //NOXLATE
+ TextBoxBinder.BindText(txtFillColorInput, this, "FillColorInput"); //NOXLATE
+ TextBoxBinder.BindText(txtLayerName, this, "LayerName"); //NOXLATE
+ TextBoxBinder.BindText(txtLayerNameInput, this, "LayerNameInput"); //NOXLATE
+ TextBoxBinder.BindText(txtBufferUnits, this, "BufferUnits"); //NOXLATE
cmbBorderColor.CurrentColor = this.BorderColor;
cmbFillColor.CurrentColor = this.FillColor;
@@ -69,21 +69,21 @@
public string LayerName
{
- get { return _widget.GetValue("LayerName"); }
+ get { return _widget.GetValue("LayerName"); } //NOXLATE
set
{
- _widget.SetValue("LayerName", value);
- OnPropertyChanged("LayerName");
+ _widget.SetValue("LayerName", value); //NOXLATE
+ OnPropertyChanged("LayerName"); //NOXLATE
}
}
public string LayerNameInput
{
- get { return _widget.GetValue("LayerNameInput"); }
+ get { return _widget.GetValue("LayerNameInput"); } //NOXLATE
set
{
- _widget.SetValue("LayerNameInput", value);
- OnPropertyChanged("LayerNameInput");
+ _widget.SetValue("LayerNameInput", value); //NOXLATE
+ OnPropertyChanged("LayerNameInput"); //NOXLATE
}
}
@@ -92,84 +92,84 @@
get
{
double value;
- if (double.TryParse(_widget.GetValue("BufferDistance"), out value))
+ if (double.TryParse(_widget.GetValue("BufferDistance"), out value)) //NOXLATE
return value;
return 100.0;
}
set
{
- _widget.SetValue("BufferDistance", value.ToString(CultureInfo.InvariantCulture));
- OnPropertyChanged("BufferDistance");
+ _widget.SetValue("BufferDistance", value.ToString(CultureInfo.InvariantCulture)); //NOXLATE
+ OnPropertyChanged("BufferDistance"); //NOXLATE
}
}
public string BufferDistanceInput
{
- get { return _widget.GetValue("BufferDistanceInput"); }
+ get { return _widget.GetValue("BufferDistanceInput"); } //NOXLATE
set
{
- _widget.SetValue("BufferDistanceInput", value);
- OnPropertyChanged("BufferDistanceInput");
+ _widget.SetValue("BufferDistanceInput", value); //NOXLATE
+ OnPropertyChanged("BufferDistanceInput"); //NOXLATE
}
}
public string BufferUnits
{
- get { return _widget.GetValue("BufferUnits"); }
+ get { return _widget.GetValue("BufferUnits"); } //NOXLATE
set
{
- _widget.SetValue("BufferUnits", value);
- OnPropertyChanged("BufferUnits");
+ _widget.SetValue("BufferUnits", value); //NOXLATE
+ OnPropertyChanged("BufferUnits"); //NOXLATE
}
}
public string BufferUnitsInput
{
- get { return _widget.GetValue("BufferUnitsInput"); }
+ get { return _widget.GetValue("BufferUnitsInput"); } //NOXLATE
set
{
- _widget.SetValue("BufferUnitsInput", value);
- OnPropertyChanged("BufferUnitsInput");
+ _widget.SetValue("BufferUnitsInput", value); //NOXLATE
+ OnPropertyChanged("BufferUnitsInput"); //NOXLATE
}
}
public Color BorderColor
{
- get { return Utility.ParseHTMLColor(_widget.GetValue("BorderColor")); }
+ get { return Utility.ParseHTMLColor(_widget.GetValue("BorderColor")); } //NOXLATE
set
{
- _widget.SetValue("BorderColor", Utility.SerializeHTMLColor(value, true));
- OnPropertyChanged("BorderColor");
+ _widget.SetValue("BorderColor", Utility.SerializeHTMLColor(value, true)); //NOXLATE
+ OnPropertyChanged("BorderColor"); //NOXLATE
}
}
public string BorderColorInput
{
- get { return _widget.GetValue("BorderColorInput"); }
+ get { return _widget.GetValue("BorderColorInput"); } //NOXLATE
set
{
- _widget.SetValue("BorderColorInput", value);
- OnPropertyChanged("BorderColorInput");
+ _widget.SetValue("BorderColorInput", value); //NOXLATE
+ OnPropertyChanged("BorderColorInput"); //NOXLATE
}
}
public Color FillColor
{
- get { return Utility.ParseHTMLColor(_widget.GetValue("FillColor")); }
+ get { return Utility.ParseHTMLColor(_widget.GetValue("FillColor")); } //NOXLATE
set
{
- _widget.SetValue("FillColor", Utility.SerializeHTMLColor(value, true));
- OnPropertyChanged("FillColor");
+ _widget.SetValue("FillColor", Utility.SerializeHTMLColor(value, true)); //NOXLATE
+ OnPropertyChanged("FillColor"); //NOXLATE
}
}
public string FillColorInput
{
- get { return _widget.GetValue("FillColorInput"); }
+ get { return _widget.GetValue("FillColorInput"); } //NOXLATE
set
{
- _widget.SetValue("FillColorInput", value);
- OnPropertyChanged("FillColorInput");
+ _widget.SetValue("FillColorInput", value); //NOXLATE
+ OnPropertyChanged("FillColorInput"); //NOXLATE
}
}
@@ -184,7 +184,7 @@
private void btnBrowseBufferUnits_Click(object sender, EventArgs e)
{
- var item = GenericItemSelectionDialog.SelectItem("Buffer Units", "Select Buffer Units", _units);
+ var item = GenericItemSelectionDialog.SelectItem(Properties.Resources.TitleBufferUnits, Properties.Resources.PromptSelectBufferUnits, _units);
if (item != null)
{
txtBufferUnits.Text = item;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -43,7 +43,7 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtColorInputId.Text = _widget.GetValue("ColorInputId");
+ txtColorInputId.Text = _widget.GetValue("ColorInputId"); //NOXLATE
}
public Control Content
@@ -53,7 +53,7 @@
private void txtColorInputId_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("ColorInputId", txtColorInputId.Text);
+ _widget.SetValue("ColorInputId", txtColorInputId.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -44,9 +44,9 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtTemplate.Text = _widget.GetValue("Template");
- numPrecision.Value = Convert.ToDecimal(_widget.GetValue("Precision"));
- txtUnits.Text = _widget.GetValue("Units");
+ txtTemplate.Text = _widget.GetValue("Template"); //NOXLATE
+ numPrecision.Value = Convert.ToDecimal(_widget.GetValue("Precision")); //NOXLATE
+ txtUnits.Text = _widget.GetValue("Units"); //NOXLATE
}
public Control Content
@@ -56,17 +56,17 @@
private void txtTemplate_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Template", txtTemplate.Text);
+ _widget.SetValue("Template", txtTemplate.Text); //NOXLATE
}
private void numPrecision_ValueChanged(object sender, EventArgs e)
{
- _widget.SetValue("Precision", numPrecision.Value.ToString(CultureInfo.InvariantCulture));
+ _widget.SetValue("Precision", numPrecision.Value.ToString(CultureInfo.InvariantCulture)); //NOXLATE
}
private void txtUnits_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Units", txtUnits.Text);
+ _widget.SetValue("Units", txtUnits.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -44,7 +44,7 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- numPrecision.Value = Convert.ToDecimal(_widget.GetValue("Precision"));
+ numPrecision.Value = Convert.ToDecimal(_widget.GetValue("Precision")); //NOXLATE
}
public Control Content
@@ -54,7 +54,7 @@
private void numPrecision_ValueChanged(object sender, EventArgs e)
{
- _widget.SetValue("Precision", numPrecision.Value.ToString(CultureInfo.InvariantCulture));
+ _widget.SetValue("Precision", numPrecision.Value.ToString(CultureInfo.InvariantCulture)); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -43,7 +43,7 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtDirection.Text = _widget.GetValue("Direction");
+ txtDirection.Text = _widget.GetValue("Direction"); //NOXLATE
}
public Control Content
@@ -51,11 +51,11 @@
get { return this; }
}
- private string[] _values = { "Next", "Previous" };
+ private string[] _values = { "Next", "Previous" }; //NOXLATE
private void btnBrowse_Click(object sender, EventArgs e)
{
- var item = GenericItemSelectionDialog.SelectItem("Direction", "Specify Direction to traverse extent history", _values);
+ var item = GenericItemSelectionDialog.SelectItem(Properties.Resources.TitleDirection, Properties.Resources.PromptDirection, _values);
if (item != null)
{
txtDirection.Text = item;
@@ -64,7 +64,7 @@
private void txtDirection_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Direction", txtDirection.Text);
+ _widget.SetValue("Direction", txtDirection.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -42,7 +42,7 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtTarget.Text = _widget.GetValue("Target");
+ txtTarget.Text = _widget.GetValue("Target"); //NOXLATE
}
public Control Content
@@ -52,7 +52,7 @@
private void txtTarget_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Target", txtTarget.Text);
+ _widget.SetValue("Target", txtTarget.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -71,20 +71,20 @@
doc.LoadXml(txtXmlContent.Text);
//Base widget properties
- XmlNode node = doc.SelectSingleNode("//WidgetType/Name");
+ XmlNode node = doc.SelectSingleNode("//WidgetType/Name"); //NOXLATE
if (node != null)
_widget.Name = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/Type");
+ node = doc.SelectSingleNode("//WidgetType/Type"); //NOXLATE
if (node != null)
_widget.Type = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/Location");
+ node = doc.SelectSingleNode("//WidgetType/Location"); //NOXLATE
if (node != null)
_widget.Location = node.InnerText;
//Extension elements
- node = doc.SelectSingleNode("//WidgetType/Extension");
+ node = doc.SelectSingleNode("//WidgetType/Extension"); //NOXLATE
if (node != null)
{
List<XmlElement> elements = new List<XmlElement>();
@@ -102,27 +102,27 @@
var uiw = _widget as IUIWidget;
if (uiw != null)
{
- node = doc.SelectSingleNode("//WidgetType/StatusItem");
+ node = doc.SelectSingleNode("//WidgetType/StatusItem"); //NOXLATE
if (node != null)
uiw.StatusText = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/ImageUrl");
+ node = doc.SelectSingleNode("//WidgetType/ImageUrl"); //NOXLATE
if (node != null)
uiw.ImageUrl = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/ImageClass");
+ node = doc.SelectSingleNode("//WidgetType/ImageClass"); //NOXLATE
if (node != null)
uiw.ImageClass = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/Tooltip");
+ node = doc.SelectSingleNode("//WidgetType/Tooltip"); //NOXLATE
if (node != null)
uiw.Tooltip = node.InnerText;
- node = doc.SelectSingleNode("//WidgetType/Label");
+ node = doc.SelectSingleNode("//WidgetType/Label"); //NOXLATE
if (node != null)
uiw.Label = node.InnerText;
- node = doc.SelectSingleNode("//Widget/Disabled");
+ node = doc.SelectSingleNode("//Widget/Disabled"); //NOXLATE
if (node != null)
uiw.Disabled = node.InnerText;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -42,8 +42,8 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtTarget.Text = _widget.GetValue("Target");
- txtUrl.Text = _widget.GetValue("Url");
+ txtTarget.Text = _widget.GetValue("Target"); //NOXLATE
+ txtUrl.Text = _widget.GetValue("Url"); //NOXLATE
}
public Control Content
@@ -53,12 +53,12 @@
private void txtTarget_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Target", txtTarget.Text);
+ _widget.SetValue("Target", txtTarget.Text); //NOXLATE
}
private void txtUrl_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Url", txtUrl.Text);
+ _widget.SetValue("Url", txtUrl.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -43,7 +43,7 @@
{
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- txtViewType.Text = _widget.GetValue("ViewType");
+ txtViewType.Text = _widget.GetValue("ViewType"); //NOXLATE
}
public Control Content
@@ -51,11 +51,11 @@
get { return this; }
}
- private string[] _values = { "full", "initial" };
+ private string[] _values = { "full", "initial" }; //NOXLATE
private void btnBrowse_Click(object sender, EventArgs e)
{
- var item = GenericItemSelectionDialog.SelectItem("View Type", "Select zoom extents option", _values);
+ var item = GenericItemSelectionDialog.SelectItem(Properties.Resources.TitleViewType, Properties.Resources.PromptViewType, _values);
if (item != null)
{
txtViewType.Text = item;
@@ -64,7 +64,7 @@
private void txtViewType_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("ViewType", txtViewType.Text);
+ _widget.SetValue("ViewType", txtViewType.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -43,17 +43,17 @@
_widget = widget;
baseEditor.Setup(_widget, context, edsvc);
- chkHideInvisibleLayers.Checked = Convert.ToBoolean(_widget.GetValue("HideInvisibleLayers"));
- chkShowMapFolder.Checked = Convert.ToBoolean(_widget.GetValue("ShowMapFolder"));
- chkShowRootFolder.Checked = Convert.ToBoolean(_widget.GetValue("ShowRootFolder"));
+ chkHideInvisibleLayers.Checked = Convert.ToBoolean(_widget.GetValue("HideInvisibleLayers")); //NOXLATE
+ chkShowMapFolder.Checked = Convert.ToBoolean(_widget.GetValue("ShowMapFolder")); //NOXLATE
+ chkShowRootFolder.Checked = Convert.ToBoolean(_widget.GetValue("ShowRootFolder")); //NOXLATE
- txtDisabledLayerIcon.Text = _widget.GetValue("DisabledLayerIcon");
- txtGroupInfoIcon.Text = _widget.GetValue("GroupInfoIcon");
- txtLayerDwfIcon.Text = _widget.GetValue("LayerDWFIcon");
- txtLayerInfoIcon.Text = _widget.GetValue("LayerInfoIcon");
- txtLayerRasterIcon.Text = _widget.GetValue("LayerRasterIcon");
- txtLayerThemeIcon.Text = _widget.GetValue("LayerThemeIcon");
- txtRootFolderIcon.Text = _widget.GetValue("RootFolderIcon");
+ txtDisabledLayerIcon.Text = _widget.GetValue("DisabledLayerIcon"); //NOXLATE
+ txtGroupInfoIcon.Text = _widget.GetValue("GroupInfoIcon"); //NOXLATE
+ txtLayerDwfIcon.Text = _widget.GetValue("LayerDWFIcon"); //NOXLATE
+ txtLayerInfoIcon.Text = _widget.GetValue("LayerInfoIcon"); //NOXLATE
+ txtLayerRasterIcon.Text = _widget.GetValue("LayerRasterIcon"); //NOXLATE
+ txtLayerThemeIcon.Text = _widget.GetValue("LayerThemeIcon"); //NOXLATE
+ txtRootFolderIcon.Text = _widget.GetValue("RootFolderIcon"); //NOXLATE
}
public Control Content
@@ -63,52 +63,52 @@
private void chkHideInvisibleLayers_CheckedChanged(object sender, EventArgs e)
{
- _widget.SetValue("HideInvisibleLayers", chkHideInvisibleLayers.Checked.ToString());
+ _widget.SetValue("HideInvisibleLayers", chkHideInvisibleLayers.Checked.ToString()); //NOXLATE
}
private void chkShowRootFolder_CheckedChanged(object sender, EventArgs e)
{
- _widget.SetValue("ShowRootFolder", chkShowRootFolder.Checked.ToString());
+ _widget.SetValue("ShowRootFolder", chkShowRootFolder.Checked.ToString()); //NOXLATE
}
private void chkShowMapFolder_CheckedChanged(object sender, EventArgs e)
{
- _widget.SetValue("ShowMapFolder", chkShowMapFolder.Checked.ToString());
+ _widget.SetValue("ShowMapFolder", chkShowMapFolder.Checked.ToString()); //NOXLATE
}
private void txtLayerRasterIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("LayerRasterIcon", txtLayerRasterIcon.Text);
+ _widget.SetValue("LayerRasterIcon", txtLayerRasterIcon.Text); //NOXLATE
}
private void txtLayerDwfIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("LayerDWFIcon", txtLayerDwfIcon.Text);
+ _widget.SetValue("LayerDWFIcon", txtLayerDwfIcon.Text); //NOXLATE
}
private void txtLayerThemeIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("LayerThemeIcon", txtLayerThemeIcon.Text);
+ _widget.SetValue("LayerThemeIcon", txtLayerThemeIcon.Text); //NOXLATE
}
private void txtDisabledLayerIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("DisabledLayerIcon", txtDisabledLayerIcon.Text);
+ _widget.SetValue("DisabledLayerIcon", txtDisabledLayerIcon.Text); //NOXLATE
}
private void txtLayerInfoIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("LayerInfoIcon", txtLayerInfoIcon.Text);
+ _widget.SetValue("LayerInfoIcon", txtLayerInfoIcon.Text); //NOXLATE
}
private void txtGroupInfoIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("GroupInfoIcon", txtGroupInfoIcon.Text);
+ _widget.SetValue("GroupInfoIcon", txtGroupInfoIcon.Text); //NOXLATE
}
private void txtRootFolderIcon_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("RootFolderIcon", txtRootFolderIcon.Text);
+ _widget.SetValue("RootFolderIcon", txtRootFolderIcon.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -45,7 +45,7 @@
_widget = widget;
_edsvc = edsvc;
baseEditor.Setup(_widget, context, edsvc);
- txtFolder.Text = _widget.GetValue("Folder");
+ txtFolder.Text = _widget.GetValue("Folder"); //NOXLATE
}
public Control Content
@@ -67,7 +67,7 @@
private void txtFolder_TextChanged(object sender, EventArgs e)
{
- _widget.SetValue("Folder", txtFolder.Text);
+ _widget.SetValue("Folder", txtFolder.Text); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -50,9 +50,9 @@
/// <param name="edsvc"></param>
public void Setup(IWidget widget, FlexibleLayoutEditorContext context, IEditorService edsvc)
{
- TextBoxBinder.BindText(txtName, widget, "Name");
- TextBoxBinder.BindText(txtType, widget, "Type");
- TextBoxBinder.BindText(txtLocation, widget, "Location");
+ TextBoxBinder.BindText(txtName, widget, "Name"); //NOXLATE
+ TextBoxBinder.BindText(txtType, widget, "Type"); //NOXLATE
+ TextBoxBinder.BindText(txtLocation, widget, "Location"); //NOXLATE
}
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -34,7 +34,7 @@
public WidgetInfoDialog(IWidgetInfo info)
{
InitializeComponent();
- this.Text += " - " + info.Type;
+ this.Text += " - " + info.Type; //NOXLATE
grdExtensionProperties.DataSource = info.Parameters;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -91,7 +91,7 @@
widget.PropertyChanged += (s, e) =>
{
- if (e.PropertyName == "Name")
+ if (e.PropertyName == "Name") //NOXLATE
item.Name = widget.Name;
};
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -58,10 +58,10 @@
_edsvc = service;
_fsvc = (IFusionService)_edsvc.GetService((int)ServiceType.Fusion);
_context = new FlexibleLayoutEditorContext(_fsvc);
- _baseUrl = service.GetCustomProperty("BaseUrl").ToString();
+ _baseUrl = service.GetCustomProperty("BaseUrl").ToString(); //NOXLATE
- if (!_baseUrl.EndsWith("/"))
- _baseUrl += "/";
+ if (!_baseUrl.EndsWith("/")) //NOXLATE
+ _baseUrl += "/"; //NOXLATE
}
catch
{
@@ -210,7 +210,7 @@
private TreeNode CreateNode(IUIItem item)
{
- Check.NotNull(item, "item");
+ Check.NotNull(item, "item"); //NOXLATE
var node = new TreeNode();
switch (item.Function)
{
@@ -222,7 +222,7 @@
item.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Label")
+ if (evt.PropertyName == "Label") //NOXLATE
{
node.Text = ((IFlyoutItem)item).Label;
OnResourceChanged();
@@ -245,7 +245,7 @@
item.PropertyChanged += (s, evt) =>
{
- if (evt.PropertyName == "Widget")
+ if (evt.PropertyName == "Widget") //NOXLATE
{
node.Text = ((IWidgetItem)item).Widget;
OnResourceChanged();
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -35,207 +35,207 @@
//
// Adapted for use in the Maestro Generic XML editor component
- internal partial class FindAndReplaceForm : Form
- {
- public FindAndReplaceForm()
- {
- InitializeComponent();
- _search = new TextEditorSearcher();
- }
+ internal partial class FindAndReplaceForm : Form
+ {
+ public FindAndReplaceForm()
+ {
+ InitializeComponent();
+ _search = new TextEditorSearcher();
+ }
- TextEditorSearcher _search;
- TextEditorControl _editor;
- TextEditorControl Editor {
- get { return _editor; }
- set {
- _editor = value;
- _search.Document = _editor.Document;
- UpdateTitleBar();
- }
- }
+ TextEditorSearcher _search;
+ TextEditorControl _editor;
+ TextEditorControl Editor {
+ get { return _editor; }
+ set {
+ _editor = value;
+ _search.Document = _editor.Document;
+ UpdateTitleBar();
+ }
+ }
- private void UpdateTitleBar()
- {
- string text = ReplaceMode ? Properties.Resources.TextFindAndReplace : Properties.Resources.TextFind;
- if (_editor != null && _editor.FileName != null)
- text += " - " + Path.GetFileName(_editor.FileName);
- if (_search.HasScanRegion)
- text += " " + Properties.Resources.TextSelectionOnly;
- this.Text = text;
- }
+ private void UpdateTitleBar()
+ {
+ string text = ReplaceMode ? Properties.Resources.TextFindAndReplace : Properties.Resources.TextFind;
+ if (_editor != null && _editor.FileName != null)
+ text += " - " + Path.GetFileName(_editor.FileName); //NOXLATE
+ if (_search.HasScanRegion)
+ text += " " + Properties.Resources.TextSelectionOnly; //NOXLATE
+ this.Text = text;
+ }
internal void ShowFor(TextEditorControl editor, bool replaceMode, bool show)
{
Editor = editor;
- _search.ClearScanRegion();
- var sm = editor.ActiveTextAreaControl.SelectionManager;
- if (sm.HasSomethingSelected && sm.SelectionCollection.Count == 1) {
- var sel = sm.SelectionCollection[0];
- if (sel.StartPosition.Line == sel.EndPosition.Line)
- txtLookFor.Text = sm.SelectedText;
- else
- _search.SetScanRegion(sel);
- } else {
- // Get the current word that the caret is on
- Caret caret = editor.ActiveTextAreaControl.Caret;
- int start = TextUtilities.FindWordStart(editor.Document, caret.Offset);
- int endAt = TextUtilities.FindWordEnd(editor.Document, caret.Offset);
- txtLookFor.Text = editor.Document.GetText(start, endAt - start);
- }
-
- ReplaceMode = replaceMode;
+ _search.ClearScanRegion();
+ var sm = editor.ActiveTextAreaControl.SelectionManager;
+ if (sm.HasSomethingSelected && sm.SelectionCollection.Count == 1) {
+ var sel = sm.SelectionCollection[0];
+ if (sel.StartPosition.Line == sel.EndPosition.Line)
+ txtLookFor.Text = sm.SelectedText;
+ else
+ _search.SetScanRegion(sel);
+ } else {
+ // Get the current word that the caret is on
+ Caret caret = editor.ActiveTextAreaControl.Caret;
+ int start = TextUtilities.FindWordStart(editor.Document, caret.Offset);
+ int endAt = TextUtilities.FindWordEnd(editor.Document, caret.Offset);
+ txtLookFor.Text = editor.Document.GetText(start, endAt - start);
+ }
+
+ ReplaceMode = replaceMode;
if (show)
{
- this.Owner = (Form)editor.TopLevelControl;
- this.Show();
-
- txtLookFor.SelectAll();
- txtLookFor.Focus();
+ this.Owner = (Form)editor.TopLevelControl;
+ this.Show();
+
+ txtLookFor.SelectAll();
+ txtLookFor.Focus();
}
}
- public void ShowFor(TextEditorControl editor, bool replaceMode)
- {
- ShowFor(editor, replaceMode, true);
- }
+ public void ShowFor(TextEditorControl editor, bool replaceMode)
+ {
+ ShowFor(editor, replaceMode, true);
+ }
- public bool ReplaceMode
- {
- get { return txtReplaceWith.Visible; }
- set {
- btnReplace.Visible = btnReplaceAll.Visible = value;
- lblReplaceWith.Visible = txtReplaceWith.Visible = value;
- btnHighlightAll.Visible = !value;
- this.AcceptButton = value ? btnReplace : btnFindNext;
- UpdateTitleBar();
- }
- }
+ public bool ReplaceMode
+ {
+ get { return txtReplaceWith.Visible; }
+ set {
+ btnReplace.Visible = btnReplaceAll.Visible = value;
+ lblReplaceWith.Visible = txtReplaceWith.Visible = value;
+ btnHighlightAll.Visible = !value;
+ this.AcceptButton = value ? btnReplace : btnFindNext;
+ UpdateTitleBar();
+ }
+ }
- private void btnFindPrevious_Click(object sender, EventArgs e)
- {
+ private void btnFindPrevious_Click(object sender, EventArgs e)
+ {
FindNext(txtLookFor.Text, false, true, Properties.Resources.TextNotFound);
- }
- private void btnFindNext_Click(object sender, EventArgs e)
- {
+ }
+ private void btnFindNext_Click(object sender, EventArgs e)
+ {
FindNext(txtLookFor.Text, false, false, Properties.Resources.TextNotFound);
- }
+ }
- public bool _lastSearchWasBackward = false;
- public bool _lastSearchLoopedAround;
+ public bool _lastSearchWasBackward = false;
+ public bool _lastSearchLoopedAround;
public TextRange FindNext(string find, bool viaF3, bool searchBackward, string messageIfNotFound)
{
return FindNext(find, viaF3, searchBackward, messageIfNotFound, false);
}
- public TextRange FindNext(string find, bool viaF3, bool searchBackward, string messageIfNotFound, bool silent)
- {
+ public TextRange FindNext(string find, bool viaF3, bool searchBackward, string messageIfNotFound, bool silent)
+ {
if (string.IsNullOrEmpty(find))
- {
+ {
if (!silent)
- MessageBox.Show(Properties.Resources.TextNoStringSpecifiedToLookFor);
- return null;
- }
- _lastSearchWasBackward = searchBackward;
+ MessageBox.Show(Properties.Resources.TextNoStringSpecifiedToLookFor);
+ return null;
+ }
+ _lastSearchWasBackward = searchBackward;
_search.LookFor = find; // txtLookFor.Text;
- _search.MatchCase = chkMatchCase.Checked;
- _search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
+ _search.MatchCase = chkMatchCase.Checked;
+ _search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
- var caret = _editor.ActiveTextAreaControl.Caret;
- if (viaF3 && _search.HasScanRegion && !caret.Offset.
- IsInRange(_search.BeginOffset, _search.EndOffset)) {
- // user moved outside of the originally selected region
- _search.ClearScanRegion();
- UpdateTitleBar();
- }
+ var caret = _editor.ActiveTextAreaControl.Caret;
+ if (viaF3 && _search.HasScanRegion && !caret.Offset.
+ IsInRange(_search.BeginOffset, _search.EndOffset)) {
+ // user moved outside of the originally selected region
+ _search.ClearScanRegion();
+ UpdateTitleBar();
+ }
- int startFrom = caret.Offset - (searchBackward ? 1 : 0);
- TextRange range = _search.FindNext(startFrom, searchBackward, out _lastSearchLoopedAround);
- if (range != null)
- SelectResult(range);
- else if (messageIfNotFound != null && !silent)
- MessageBox.Show(messageIfNotFound);
- return range;
- }
+ int startFrom = caret.Offset - (searchBackward ? 1 : 0);
+ TextRange range = _search.FindNext(startFrom, searchBackward, out _lastSearchLoopedAround);
+ if (range != null)
+ SelectResult(range);
+ else if (messageIfNotFound != null && !silent)
+ MessageBox.Show(messageIfNotFound);
+ return range;
+ }
- private void SelectResult(TextRange range)
- {
- TextLocation p1 = _editor.Document.OffsetToPosition(range.Offset);
- TextLocation p2 = _editor.Document.OffsetToPosition(range.Offset + range.Length);
- _editor.ActiveTextAreaControl.SelectionManager.SetSelection(p1, p2);
- _editor.ActiveTextAreaControl.ScrollTo(p1.Line, p1.Column);
- // Also move the caret to the end of the selection, because when the user
- // presses F3, the caret is where we start searching next time.
- _editor.ActiveTextAreaControl.Caret.Position =
- _editor.Document.OffsetToPosition(range.Offset + range.Length);
- }
+ private void SelectResult(TextRange range)
+ {
+ TextLocation p1 = _editor.Document.OffsetToPosition(range.Offset);
+ TextLocation p2 = _editor.Document.OffsetToPosition(range.Offset + range.Length);
+ _editor.ActiveTextAreaControl.SelectionManager.SetSelection(p1, p2);
+ _editor.ActiveTextAreaControl.ScrollTo(p1.Line, p1.Column);
+ // Also move the caret to the end of the selection, because when the user
+ // presses F3, the caret is where we start searching next time.
+ _editor.ActiveTextAreaControl.Caret.Position =
+ _editor.Document.OffsetToPosition(range.Offset + range.Length);
+ }
- Dictionary<TextEditorControl, HighlightGroup> _highlightGroups = new Dictionary<TextEditorControl, HighlightGroup>();
+ Dictionary<TextEditorControl, HighlightGroup> _highlightGroups = new Dictionary<TextEditorControl, HighlightGroup>();
- private void btnHighlightAll_Click(object sender, EventArgs e)
- {
- if (!_highlightGroups.ContainsKey(_editor))
- _highlightGroups[_editor] = new HighlightGroup(_editor);
- HighlightGroup group = _highlightGroups[_editor];
+ private void btnHighlightAll_Click(object sender, EventArgs e)
+ {
+ if (!_highlightGroups.ContainsKey(_editor))
+ _highlightGroups[_editor] = new HighlightGroup(_editor);
+ HighlightGroup group = _highlightGroups[_editor];
- if (string.IsNullOrEmpty(LookFor))
- // Clear highlights
- group.ClearMarkers();
- else {
- _search.LookFor = txtLookFor.Text;
- _search.MatchCase = chkMatchCase.Checked;
- _search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
+ if (string.IsNullOrEmpty(LookFor))
+ // Clear highlights
+ group.ClearMarkers();
+ else {
+ _search.LookFor = txtLookFor.Text;
+ _search.MatchCase = chkMatchCase.Checked;
+ _search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
- bool looped = false;
- int offset = 0, count = 0;
- for(;;) {
- TextRange range = _search.FindNext(offset, false, out looped);
- if (range == null || looped)
- break;
- offset = range.Offset + range.Length;
- count++;
+ bool looped = false;
+ int offset = 0, count = 0;
+ for(;;) {
+ TextRange range = _search.FindNext(offset, false, out looped);
+ if (range == null || looped)
+ break;
+ offset = range.Offset + range.Length;
+ count++;
- var m = new TextMarker(range.Offset, range.Length,
- TextMarkerType.SolidBlock, Color.Yellow, Color.Black);
- group.AddMarker(m);
- }
- if (count == 0)
- MessageBox.Show(Properties.Resources.TextSearchTextNotFound);
- else
- Close();
- }
- }
-
- private void FindAndReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
- { // Prevent dispose, as this form can be re-used
- if (e.CloseReason != CloseReason.FormOwnerClosing)
- {
- if (this.Owner != null)
- this.Owner.Select(); // prevent another app from being activated instead
-
- e.Cancel = true;
- Hide();
-
- // Discard search region
- _search.ClearScanRegion();
- _editor.Refresh(); // must repaint manually
- }
- }
+ var m = new TextMarker(range.Offset, range.Length,
+ TextMarkerType.SolidBlock, Color.Yellow, Color.Black);
+ group.AddMarker(m);
+ }
+ if (count == 0)
+ MessageBox.Show(Properties.Resources.TextSearchTextNotFound);
+ else
+ Close();
+ }
+ }
+
+ private void FindAndReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
+ { // Prevent dispose, as this form can be re-used
+ if (e.CloseReason != CloseReason.FormOwnerClosing)
+ {
+ if (this.Owner != null)
+ this.Owner.Select(); // prevent another app from being activated instead
+
+ e.Cancel = true;
+ Hide();
+
+ // Discard search region
+ _search.ClearScanRegion();
+ _editor.Refresh(); // must repaint manually
+ }
+ }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- Close();
- }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ Close();
+ }
- private void btnReplace_Click(object sender, EventArgs e)
- {
- var sm = _editor.ActiveTextAreaControl.SelectionManager;
- if (string.Equals(sm.SelectedText, txtLookFor.Text, StringComparison.OrdinalIgnoreCase))
- InsertText(txtReplaceWith.Text);
+ private void btnReplace_Click(object sender, EventArgs e)
+ {
+ var sm = _editor.ActiveTextAreaControl.SelectionManager;
+ if (string.Equals(sm.SelectedText, txtLookFor.Text, StringComparison.OrdinalIgnoreCase))
+ InsertText(txtReplaceWith.Text);
FindNext(txtLookFor.Text, false, _lastSearchWasBackward, Properties.Resources.TextNotFound);
- }
+ }
internal int FindAndReplace(string find, string replace)
{
@@ -267,34 +267,34 @@
return count;
}
- private void btnReplaceAll_Click(object sender, EventArgs e)
- {
+ private void btnReplaceAll_Click(object sender, EventArgs e)
+ {
int count = FindAndReplace(txtLookFor.Text, txtReplaceWith.Text);
- if (count == 0)
- MessageBox.Show(Properties.Resources.TextNoOccurrencesFound);
- else {
- MessageBox.Show(string.Format(Properties.Resources.TextOccurrencesReplaced, count));
- Close();
- }
- }
+ if (count == 0)
+ MessageBox.Show(Properties.Resources.TextNoOccurrencesFound);
+ else {
+ MessageBox.Show(string.Format(Properties.Resources.TextOccurrencesReplaced, count));
+ Close();
+ }
+ }
- private void InsertText(string text)
- {
- var textArea = _editor.ActiveTextAreaControl.TextArea;
- textArea.Document.UndoStack.StartUndoGroup();
- try {
- if (textArea.SelectionManager.HasSomethingSelected) {
- textArea.Caret.Position = textArea.SelectionManager.SelectionCollection[0].StartPosition;
- textArea.SelectionManager.RemoveSelectedText();
- }
- textArea.InsertString(text);
- } finally {
- textArea.Document.UndoStack.EndUndoGroup();
- }
- }
+ private void InsertText(string text)
+ {
+ var textArea = _editor.ActiveTextAreaControl.TextArea;
+ textArea.Document.UndoStack.StartUndoGroup();
+ try {
+ if (textArea.SelectionManager.HasSomethingSelected) {
+ textArea.Caret.Position = textArea.SelectionManager.SelectionCollection[0].StartPosition;
+ textArea.SelectionManager.RemoveSelectedText();
+ }
+ textArea.InsertString(text);
+ } finally {
+ textArea.Document.UndoStack.EndUndoGroup();
+ }
+ }
- public string LookFor { get { return txtLookFor.Text; } }
- }
+ public string LookFor { get { return txtLookFor.Text; } }
+ }
internal static class ExtensionMethods
{
@@ -317,226 +317,226 @@
}
}
- public class TextRange : AbstractSegment
- {
- IDocument _document;
- public TextRange(IDocument document, int offset, int length)
- {
- _document = document;
- this.offset = offset;
- this.length = length;
- }
- }
+ public class TextRange : AbstractSegment
+ {
+ IDocument _document;
+ public TextRange(IDocument document, int offset, int length)
+ {
+ _document = document;
+ this.offset = offset;
+ this.length = length;
+ }
+ }
- /// <summary>This class finds occurrances of a search string in a text
- /// editor's IDocument... it's like Find box without a GUI.</summary>
- public class TextEditorSearcher : IDisposable
- {
- IDocument _document;
- public IDocument Document
- {
- get { return _document; }
- set {
- if (_document != value) {
- ClearScanRegion();
- _document = value;
- }
- }
- }
+ /// <summary>This class finds occurrances of a search string in a text
+ /// editor's IDocument... it's like Find box without a GUI.</summary>
+ public class TextEditorSearcher : IDisposable
+ {
+ IDocument _document;
+ public IDocument Document
+ {
+ get { return _document; }
+ set {
+ if (_document != value) {
+ ClearScanRegion();
+ _document = value;
+ }
+ }
+ }
- // I would have used the TextAnchor class to represent the beginning and
- // end of the region to scan while automatically adjusting to changes in
- // the document--but for some reason it is sealed and its constructor is
- // internal. Instead I use a TextMarker, which is perhaps even better as
- // it gives me the opportunity to highlight the region. Note that all the
- // markers and coloring information is associated with the text document,
- // not the editor control, so TextEditorSearcher doesn't need a reference
- // to the TextEditorControl. After adding the marker to the document, we
- // must remember to remove it when it is no longer needed.
- TextMarker _region = null;
- /// <summary>Sets the region to search. The region is updated
- /// automatically as the document changes.</summary>
- public void SetScanRegion(ISelection sel)
- {
- SetScanRegion(sel.Offset, sel.Length);
- }
- /// <summary>Sets the region to search. The region is updated
- /// automatically as the document changes.</summary>
- public void SetScanRegion(int offset, int length)
- {
- var bkgColor = _document.HighlightingStrategy.GetColorFor("Default").BackgroundColor;
- _region = new TextMarker(offset, length, TextMarkerType.SolidBlock,
- bkgColor.HalfMix(Color.FromArgb(160,160,160)));
- _document.MarkerStrategy.AddMarker(_region);
- }
- public bool HasScanRegion
- {
- get { return _region != null; }
- }
- public void ClearScanRegion()
- {
- if (_region != null)
- {
- _document.MarkerStrategy.RemoveMarker(_region);
- _region = null;
- }
- }
- public void Dispose() { ClearScanRegion(); GC.SuppressFinalize(this); }
- ~TextEditorSearcher() { Dispose(); }
-
- /// <summary>Begins the start offset for searching</summary>
- public int BeginOffset
- {
- get {
- if (_region != null)
- return _region.Offset;
- else
- return 0;
- }
- }
- /// <summary>Begins the end offset for searching</summary>
- public int EndOffset
- {
- get {
- if (_region != null)
- return _region.EndOffset;
- else
- return _document.TextLength;
- }
- }
+ // I would have used the TextAnchor class to represent the beginning and
+ // end of the region to scan while automatically adjusting to changes in
+ // the document--but for some reason it is sealed and its constructor is
+ // internal. Instead I use a TextMarker, which is perhaps even better as
+ // it gives me the opportunity to highlight the region. Note that all the
+ // markers and coloring information is associated with the text document,
+ // not the editor control, so TextEditorSearcher doesn't need a reference
+ // to the TextEditorControl. After adding the marker to the document, we
+ // must remember to remove it when it is no longer needed.
+ TextMarker _region = null;
+ /// <summary>Sets the region to search. The region is updated
+ /// automatically as the document changes.</summary>
+ public void SetScanRegion(ISelection sel)
+ {
+ SetScanRegion(sel.Offset, sel.Length);
+ }
+ /// <summary>Sets the region to search. The region is updated
+ /// automatically as the document changes.</summary>
+ public void SetScanRegion(int offset, int length)
+ {
+ var bkgColor = _document.HighlightingStrategy.GetColorFor("Default").BackgroundColor; //NOXLATE
+ _region = new TextMarker(offset, length, TextMarkerType.SolidBlock,
+ bkgColor.HalfMix(Color.FromArgb(160,160,160)));
+ _document.MarkerStrategy.AddMarker(_region);
+ }
+ public bool HasScanRegion
+ {
+ get { return _region != null; }
+ }
+ public void ClearScanRegion()
+ {
+ if (_region != null)
+ {
+ _document.MarkerStrategy.RemoveMarker(_region);
+ _region = null;
+ }
+ }
+ public void Dispose() { ClearScanRegion(); GC.SuppressFinalize(this); }
+ ~TextEditorSearcher() { Dispose(); }
+
+ /// <summary>Begins the start offset for searching</summary>
+ public int BeginOffset
+ {
+ get {
+ if (_region != null)
+ return _region.Offset;
+ else
+ return 0;
+ }
+ }
+ /// <summary>Begins the end offset for searching</summary>
+ public int EndOffset
+ {
+ get {
+ if (_region != null)
+ return _region.EndOffset;
+ else
+ return _document.TextLength;
+ }
+ }
- public bool MatchCase;
+ public bool MatchCase;
- public bool MatchWholeWordOnly;
+ public bool MatchWholeWordOnly;
- string _lookFor;
- string _lookFor2; // uppercase in case-insensitive mode
- public string LookFor
- {
- get { return _lookFor; }
- set { _lookFor = value; }
- }
+ string _lookFor;
+ string _lookFor2; // uppercase in case-insensitive mode
+ public string LookFor
+ {
+ get { return _lookFor; }
+ set { _lookFor = value; }
+ }
- /// <summary>Finds next instance of LookFor, according to the search rules
- /// (MatchCase, MatchWholeWordOnly).</summary>
- /// <param name="beginAtOffset">Offset in Document at which to begin the search</param>
- /// <remarks>If there is a match at beginAtOffset precisely, it will be returned.</remarks>
- /// <returns>Region of document that matches the search string</returns>
- public TextRange FindNext(int beginAtOffset, bool searchBackward, out bool loopedAround)
- {
- Debug.Assert(!string.IsNullOrEmpty(_lookFor));
- loopedAround = false;
+ /// <summary>Finds next instance of LookFor, according to the search rules
+ /// (MatchCase, MatchWholeWordOnly).</summary>
+ /// <param name="beginAtOffset">Offset in Document at which to begin the search</param>
+ /// <remarks>If there is a match at beginAtOffset precisely, it will be returned.</remarks>
+ /// <returns>Region of document that matches the search string</returns>
+ public TextRange FindNext(int beginAtOffset, bool searchBackward, out bool loopedAround)
+ {
+ Debug.Assert(!string.IsNullOrEmpty(_lookFor));
+ loopedAround = false;
- int startAt = BeginOffset, endAt = EndOffset;
- int curOffs = beginAtOffset.InRange(startAt, endAt);
+ int startAt = BeginOffset, endAt = EndOffset;
+ int curOffs = beginAtOffset.InRange(startAt, endAt);
- _lookFor2 = MatchCase ? _lookFor : _lookFor.ToUpperInvariant();
-
- TextRange result;
- if (searchBackward) {
- result = FindNextIn(startAt, curOffs, true);
- if (result == null) {
- loopedAround = true;
- result = FindNextIn(curOffs, endAt, true);
- }
- } else {
- result = FindNextIn(curOffs, endAt, false);
- if (result == null) {
- loopedAround = true;
- result = FindNextIn(startAt, curOffs, false);
- }
- }
- return result;
- }
+ _lookFor2 = MatchCase ? _lookFor : _lookFor.ToUpperInvariant();
+
+ TextRange result;
+ if (searchBackward) {
+ result = FindNextIn(startAt, curOffs, true);
+ if (result == null) {
+ loopedAround = true;
+ result = FindNextIn(curOffs, endAt, true);
+ }
+ } else {
+ result = FindNextIn(curOffs, endAt, false);
+ if (result == null) {
+ loopedAround = true;
+ result = FindNextIn(startAt, curOffs, false);
+ }
+ }
+ return result;
+ }
- private TextRange FindNextIn(int offset1, int offset2, bool searchBackward)
- {
- Debug.Assert(offset2 >= offset1);
- offset2 -= _lookFor.Length;
+ private TextRange FindNextIn(int offset1, int offset2, bool searchBackward)
+ {
+ Debug.Assert(offset2 >= offset1);
+ offset2 -= _lookFor.Length;
- // Make behavior decisions before starting search loop
- Func<char, char, bool> matchFirstCh;
- Func<int, bool> matchWord;
- if (MatchCase)
- matchFirstCh = (lookFor, c) => (lookFor == c);
- else
- matchFirstCh = (lookFor, c) => (lookFor == Char.ToUpperInvariant(c));
- if (MatchWholeWordOnly)
- matchWord = IsWholeWordMatch;
- else
- matchWord = IsPartWordMatch;
+ // Make behavior decisions before starting search loop
+ Func<char, char, bool> matchFirstCh;
+ Func<int, bool> matchWord;
+ if (MatchCase)
+ matchFirstCh = (lookFor, c) => (lookFor == c);
+ else
+ matchFirstCh = (lookFor, c) => (lookFor == Char.ToUpperInvariant(c));
+ if (MatchWholeWordOnly)
+ matchWord = IsWholeWordMatch;
+ else
+ matchWord = IsPartWordMatch;
- // Search
- char lookForCh = _lookFor2[0];
- if (searchBackward)
- {
- for (int offset = offset2; offset >= offset1; offset--) {
- if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
- && matchWord(offset))
- return new TextRange(_document, offset, _lookFor.Length);
- }
- } else {
- for (int offset = offset1; offset <= offset2; offset++) {
- if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
- && matchWord(offset))
- return new TextRange(_document, offset, _lookFor.Length);
- }
- }
- return null;
- }
- private bool IsWholeWordMatch(int offset)
- {
- if (IsWordBoundary(offset) && IsWordBoundary(offset + _lookFor.Length))
- return IsPartWordMatch(offset);
- else
- return false;
- }
- private bool IsWordBoundary(int offset)
- {
- return offset <= 0 || offset >= _document.TextLength ||
- !IsAlphaNumeric(offset - 1) || !IsAlphaNumeric(offset);
- }
- private bool IsAlphaNumeric(int offset)
- {
- char c = _document.GetCharAt(offset);
- return Char.IsLetterOrDigit(c) || c == '_';
- }
- private bool IsPartWordMatch(int offset)
- {
- string substr = _document.GetText(offset, _lookFor.Length);
- if (!MatchCase)
- substr = substr.ToUpperInvariant();
- return substr == _lookFor2;
- }
- }
+ // Search
+ char lookForCh = _lookFor2[0];
+ if (searchBackward)
+ {
+ for (int offset = offset2; offset >= offset1; offset--) {
+ if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
+ && matchWord(offset))
+ return new TextRange(_document, offset, _lookFor.Length);
+ }
+ } else {
+ for (int offset = offset1; offset <= offset2; offset++) {
+ if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
+ && matchWord(offset))
+ return new TextRange(_document, offset, _lookFor.Length);
+ }
+ }
+ return null;
+ }
+ private bool IsWholeWordMatch(int offset)
+ {
+ if (IsWordBoundary(offset) && IsWordBoundary(offset + _lookFor.Length))
+ return IsPartWordMatch(offset);
+ else
+ return false;
+ }
+ private bool IsWordBoundary(int offset)
+ {
+ return offset <= 0 || offset >= _document.TextLength ||
+ !IsAlphaNumeric(offset - 1) || !IsAlphaNumeric(offset);
+ }
+ private bool IsAlphaNumeric(int offset)
+ {
+ char c = _document.GetCharAt(offset);
+ return Char.IsLetterOrDigit(c) || c == '_'; //NOXLATE
+ }
+ private bool IsPartWordMatch(int offset)
+ {
+ string substr = _document.GetText(offset, _lookFor.Length);
+ if (!MatchCase)
+ substr = substr.ToUpperInvariant();
+ return substr == _lookFor2;
+ }
+ }
- /// <summary>Bundles a group of markers together so that they can be cleared
- /// together.</summary>
- public class HighlightGroup : IDisposable
- {
- List<TextMarker> _markers = new List<TextMarker>();
- TextEditorControl _editor;
- IDocument _document;
- public HighlightGroup(TextEditorControl editor)
- {
- _editor = editor;
- _document = editor.Document;
- }
- public void AddMarker(TextMarker marker)
- {
- _markers.Add(marker);
- _document.MarkerStrategy.AddMarker(marker);
- }
- public void ClearMarkers()
- {
- foreach (TextMarker m in _markers)
- _document.MarkerStrategy.RemoveMarker(m);
- _markers.Clear();
- _editor.Refresh();
- }
- public void Dispose() { ClearMarkers(); GC.SuppressFinalize(this); }
- ~HighlightGroup() { Dispose(); }
+ /// <summary>Bundles a group of markers together so that they can be cleared
+ /// together.</summary>
+ public class HighlightGroup : IDisposable
+ {
+ List<TextMarker> _markers = new List<TextMarker>();
+ TextEditorControl _editor;
+ IDocument _document;
+ public HighlightGroup(TextEditorControl editor)
+ {
+ _editor = editor;
+ _document = editor.Document;
+ }
+ public void AddMarker(TextMarker marker)
+ {
+ _markers.Add(marker);
+ _document.MarkerStrategy.AddMarker(marker);
+ }
+ public void ClearMarkers()
+ {
+ foreach (TextMarker m in _markers)
+ _document.MarkerStrategy.RemoveMarker(m);
+ _markers.Clear();
+ _editor.Refresh();
+ }
+ public void Dispose() { ClearMarkers(); GC.SuppressFinalize(this); }
+ ~HighlightGroup() { Dispose(); }
- public IList<TextMarker> Markers { get { return _markers.AsReadOnly(); } }
- }
+ public IList<TextMarker> Markers { get { return _markers.AsReadOnly(); } }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -87,7 +87,7 @@
InitializeComponent();
txtXmlContent.RegisterAction(Keys.Control | Keys.F, new FindAction(this));
txtXmlContent.RegisterAction(Keys.Control | Keys.H, new FindAndReplaceAction(this));
- txtXmlContent.SetHighlighting("XML");
+ txtXmlContent.SetHighlighting("XML"); //NOXLATE
txtXmlContent.EnableFolding = true;
txtXmlContent.ShowInvalidLines = true;
txtXmlContent.ShowSpaces = true;
@@ -433,7 +433,7 @@
public string Name {
get {
if (prefix.Length > 0) {
- return String.Concat(prefix, ":", name);
+ return String.Concat(prefix, ":", name); //NOXLATE
} else {
return name;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -20,6 +20,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Editors
{
@@ -38,7 +39,7 @@
get
{
if (string.IsNullOrEmpty(smFolderId))
- return "Library://";
+ return StringConstants.RootIdentifier;
else
return smFolderId;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -55,18 +55,18 @@
_dlayer = lyr.SubLayer as IDrawingLayerDefinition;
Debug.Assert(_dlayer != null);
- TextBoxBinder.BindText(txtDrawingSource, _dlayer, "ResourceId");
- cmbSheet.DisplayMember = "Title";
- cmbSheet.ValueMember = "Name";
+ TextBoxBinder.BindText(txtDrawingSource, _dlayer, "ResourceId"); //NOXLATE
+ cmbSheet.DisplayMember = "Title"; //NOXLATE
+ cmbSheet.ValueMember = "Name"; //NOXLATE
cmbSheet.DataSource = _sheets;
PopulateSheets();
cmbSheet_SelectedIndexChanged(this, EventArgs.Empty);
- ComboBoxBinder.BindSelectedIndexChanged(cmbSheet, "SelectedValue", _dlayer, "Sheet");
-
+ ComboBoxBinder.BindSelectedIndexChanged(cmbSheet, "SelectedValue", _dlayer, "Sheet"); //NOXLATE
- var minBinding = new Binding("Text", _dlayer, "MinScale");
- var maxBinding = new Binding("Text", _dlayer, "MaxScale");
+ var minBinding = new Binding("Text", _dlayer, "MinScale"); //NOXLATE
+ var maxBinding = new Binding("Text", _dlayer, "MaxScale"); //NOXLATE
+
minBinding.Format += (sender, ce) =>
{
if (ce.DesiredType != typeof(string)) return;
@@ -138,7 +138,7 @@
}
else
{
- string[] visible = _dlayer.LayerFilter.Split(',');
+ string[] visible = _dlayer.LayerFilter.Split(','); //NOXLATE
foreach (var lyr in layers)
{
if (Array.IndexOf<string>(visible, lyr) >= 0)
@@ -171,7 +171,7 @@
{
list.Add(obj.ToString());
}
- return string.Join(",", list.ToArray());
+ return string.Join(",", list.ToArray()); //NOXLATE
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -65,7 +65,8 @@
void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
{
- if (e.PropertyName == "ResourceId") //Feature Source changed
+ //Feature Source changed
+ if (e.PropertyName == "ResourceId") //NOXLATE
{
_vl.RemoveAllScaleRanges();
PopulatePropertyList();
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -83,8 +83,8 @@
else
_hillShade = _colorStyle.HillShade;
- txtBrightnessFactor.Text = _colorStyle.BrightnessFactor.HasValue ? _colorStyle.BrightnessFactor.Value.ToString() : "0";
- txtContrastFactor.Text = _colorStyle.ContrastFactor.HasValue ? _colorStyle.ContrastFactor.Value.ToString() : "0";
+ txtBrightnessFactor.Text = _colorStyle.BrightnessFactor.HasValue ? _colorStyle.BrightnessFactor.Value.ToString() : "0"; //NOXLATE
+ txtContrastFactor.Text = _colorStyle.ContrastFactor.HasValue ? _colorStyle.ContrastFactor.Value.ToString() : "0"; //NOXLATE
if (!string.IsNullOrEmpty(_colorStyle.TransparencyColor))
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -61,9 +61,9 @@
_rl = res.SubLayer as IRasterLayerDefinition;
Debug.Assert(_rl != null);
- TextBoxBinder.BindText(txtFeatureSource, _rl, "ResourceId");
- TextBoxBinder.BindText(txtFeatureClass, _rl, "FeatureName");
- TextBoxBinder.BindText(txtGeometry, _rl, "Geometry");
+ TextBoxBinder.BindText(txtFeatureSource, _rl, "ResourceId"); //NOXLATE
+ TextBoxBinder.BindText(txtFeatureClass, _rl, "FeatureName"); //NOXLATE
+ TextBoxBinder.BindText(txtGeometry, _rl, "Geometry"); //NOXLATE
_rl.PropertyChanged += OnRasterLayerPropertyChanged;
}
@@ -142,7 +142,7 @@
return;
}
- var item = GenericItemSelectionDialog.SelectItem(null, null, list.ToArray(), "QualifiedName", "QualifiedName");
+ var item = GenericItemSelectionDialog.SelectItem(null, null, list.ToArray(), "QualifiedName", "QualifiedName"); //NOXLATE
if (item != null)
{
SetFeatureClass(item);
@@ -194,7 +194,7 @@
geoms.Add(col);
}
- var item = GenericItemSelectionDialog.SelectItem(null, null, geoms.ToArray(), "Name", "Name");
+ var item = GenericItemSelectionDialog.SelectItem(null, null, geoms.ToArray(), "Name", "Name"); //NOXLATE
if (item != null)
{
txtGeometry.Text = item.Name;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -178,13 +178,13 @@
Font font;
Color? foreground = null;
Color? background = null;
- string text = "";
+ string text = string.Empty;
BackgroundStyleType bgStyle;
if (item == null || item.FontName == null)
{
- font = new Font("Arial", 12);
+ font = new Font("Arial", 12); //NOXLATE
foreground = Color.Black;
background = Color.White;
text = Properties.Resources.EmptyText;
@@ -193,7 +193,7 @@
else
{
try { font = new Font(item.FontName, 12); }
- catch { font = new Font("Arial", 12); }
+ catch { font = new Font("Arial", 12); } //NOXLATE
try
{
foreground = Utility.ParseHTMLColor(item.ForegroundColor);
@@ -203,11 +203,11 @@
bgStyle = item.BackgroundStyle;
FontStyle fs = FontStyle.Regular;
- if (item.Bold == "true")
+ if (item.Bold == "true") //NOXLATE
fs |= FontStyle.Bold;
- if (item.Italic == "true")
+ if (item.Italic == "true") //NOXLATE
fs |= FontStyle.Italic;
- if (item.Underlined == "true")
+ if (item.Underlined == "true") //NOXLATE
fs |= FontStyle.Underline;
font = new Font(font, fs);
@@ -260,7 +260,7 @@
{
Font font;
Color? foreground = null;
- string text = "";
+ string text = string.Empty;
if (item == null || item.FontName == null)
{
@@ -270,7 +270,7 @@
else
{
try { font = new Font(item.FontName, 12); }
- catch { font = new Font("Arial", 12); }
+ catch { font = new Font("Arial", 12); } //NOXLATE
try
{
@@ -502,7 +502,7 @@
get
{
if (m_fillImages == null)
- m_fillImages = StyleImageCache.FillImages; //ReadImagesFromDisk("WebStudio" + System.IO.Path.DirectorySeparatorChar.ToString() + "areas"); //typeof(GeometryStyleEditors.ImageStylePicker).Namespace + ".Fillstyles");
+ m_fillImages = StyleImageCache.FillImages;
return m_fillImages;
}
}
@@ -512,7 +512,7 @@
get
{
if (m_lineStyles == null)
- m_lineStyles = StyleImageCache.LineStyles; //ReadImagesFromDisk("WebStudio" + System.IO.Path.DirectorySeparatorChar.ToString() + "lines"); //typeof(GeometryStyleEditors.ImageStylePicker).Namespace + ".Linestyles");
+ m_lineStyles = StyleImageCache.LineStyles;
return m_lineStyles;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -175,7 +175,7 @@
this.PreviewScale,
80,
40,
- "PNG",
+ "PNG", //NOXLATE
this.ThemeCategory);
//TODO: This is obviously a mess and could do with some future cleanup, but the idea here should be
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -139,7 +139,7 @@
private Control CreateEditor(ISymbolInstance symRef, IResourceService resSvc)
{
- Check.NotNull(symRef, "symRef");
+ Check.NotNull(symRef, "symRef"); //NOXLATE
if (symRef.Reference.Type == SymbolInstanceType.Reference)
{
return new ReferenceCtrl((ISymbolInstanceReferenceLibrary)symRef.Reference, resSvc);
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -104,7 +104,7 @@
}
else
{
- e.Graphics.DrawString("Preview\nnot available", Control.DefaultFont, Brushes.Black, new PointF(0, 0));
+ e.Graphics.DrawString(Properties.Resources.TextRenderPreviewNotAvailable, Control.DefaultFont, Brushes.Black, new PointF(0, 0));
}
}
@@ -148,11 +148,11 @@
var res = (ILayerDefinition)_edSvc.GetEditedResource();
var vl = (IVectorLayerDefinition)res.SubLayer;
if (vl.SymbolDefinitionVersion == null)
- throw new InvalidOperationException("This Layer Definition version does not support composite symbolization");
+ throw new InvalidOperationException(Properties.Resources.ErrorLayerDefnitionDoesNotSupportCompositeSymbolization);
var ssym = ObjectFactory.CreateSimpleSymbol(_edSvc.GetEditedResource().CurrentConnection,
vl.SymbolDefinitionVersion,
- "InlineSimpleSymbol",
- "Inline Simple Symbol");
+ "InlineSimpleSymbol", //NOXLATE
+ Properties.Resources.TextInlineSimpleSymbol);
var instance = _comp.CreateInlineSimpleSymbol(ssym);
AddInstance(instance, true);
@@ -163,11 +163,11 @@
var res = (ILayerDefinition)_edSvc.GetEditedResource();
var vl = (IVectorLayerDefinition)res.SubLayer;
if (vl.SymbolDefinitionVersion == null)
- throw new InvalidOperationException("This Layer Definition version does not support composite symbolization");
+ throw new InvalidOperationException(Properties.Resources.ErrorLayerDefnitionDoesNotSupportCompositeSymbolization);
var csym = ObjectFactory.CreateCompoundSymbol(_edSvc.GetEditedResource().CurrentConnection,
vl.SymbolDefinitionVersion,
"InlineCompoundSymbol",
- "Inline Compound Symbol");
+ Properties.Resources.TextInlineCompoundSymbol); //NOXLATE
var instance = _comp.CreateInlineCompoundSymbol(csym);
AddInstance(instance, true);
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -36,31 +36,11 @@
/// Summary description for AreaFeatureStyleEditor.
/// </summary>
[ToolboxItem(false)]
- internal class AreaFeatureStyleEditor : System.Windows.Forms.UserControl
+ internal partial class AreaFeatureStyleEditor : System.Windows.Forms.UserControl
{
- private System.Windows.Forms.ComboBox sizeContextCombo;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.GroupBox previewGroup;
- private System.Windows.Forms.PictureBox previewPicture;
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.Container components = null;
- private System.Data.DataSet ComboBoxDataSet;
- private System.Data.DataTable SizeContextTable;
- private System.Data.DataColumn dataColumn3;
- private System.Data.DataColumn dataColumn4;
- private System.Data.DataTable UnitsTable;
- private System.Data.DataColumn dataColumn5;
- private System.Data.DataColumn dataColumn6;
-
private IAreaSymbolizationFill m_item;
private FillStyleEditor fillStyleEditor;
private LineStyleEditor lineStyleEditor;
- private System.Windows.Forms.ComboBox sizeUnitsCombo;
private bool m_inUpdate = false;
private IFill previousFill = null;
@@ -124,206 +104,6 @@
lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_Line_SelectedIndexChanged);
}
- /// <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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AreaFeatureStyleEditor));
- this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
- this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
- this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
- this.UnitsTable = new System.Data.DataTable();
- this.dataColumn5 = new System.Data.DataColumn();
- this.dataColumn6 = new System.Data.DataColumn();
- this.sizeContextCombo = new System.Windows.Forms.ComboBox();
- this.SizeContextTable = new System.Data.DataTable();
- this.dataColumn3 = new System.Data.DataColumn();
- this.dataColumn4 = new System.Data.DataColumn();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.previewGroup = new System.Windows.Forms.GroupBox();
- this.lnkRefresh = new System.Windows.Forms.LinkLabel();
- this.previewPicture = new System.Windows.Forms.PictureBox();
- this.ComboBoxDataSet = new System.Data.DataSet();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.previewGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.SuspendLayout();
- //
- // fillStyleEditor
- //
- resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
- this.fillStyleEditor.Name = "fillStyleEditor";
- this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_ForegroundRequiresExpression);
- this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_BackgroundRequiresExpression);
- //
- // lineStyleEditor
- //
- resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
- this.lineStyleEditor.ColorExpression = "";
- this.lineStyleEditor.Name = "lineStyleEditor";
- this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.LineStyleEditor_RequiresExpressionEditor);
- //
- // sizeUnitsCombo
- //
- resources.ApplyResources(this.sizeUnitsCombo, "sizeUnitsCombo");
- this.sizeUnitsCombo.DataSource = this.UnitsTable;
- this.sizeUnitsCombo.DisplayMember = "Display";
- this.sizeUnitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeUnitsCombo.Name = "sizeUnitsCombo";
- this.sizeUnitsCombo.ValueMember = "Value";
- this.sizeUnitsCombo.SelectedIndexChanged += new System.EventHandler(this.sizeUnitsCombo_SelectedIndexChanged);
- //
- // UnitsTable
- //
- this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn5,
- this.dataColumn6});
- this.UnitsTable.TableName = "Units";
- //
- // dataColumn5
- //
- this.dataColumn5.Caption = "Display";
- this.dataColumn5.ColumnName = "Display";
- //
- // dataColumn6
- //
- this.dataColumn6.Caption = "Value";
- this.dataColumn6.ColumnName = "Value";
- //
- // sizeContextCombo
- //
- resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
- this.sizeContextCombo.DataSource = this.SizeContextTable;
- this.sizeContextCombo.DisplayMember = "Display";
- this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeContextCombo.Name = "sizeContextCombo";
- this.sizeContextCombo.ValueMember = "Value";
- this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
- //
- // SizeContextTable
- //
- this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn3,
- this.dataColumn4});
- this.SizeContextTable.TableName = "SizeContext";
- //
- // dataColumn3
- //
- this.dataColumn3.Caption = "Display";
- this.dataColumn3.ColumnName = "Display";
- //
- // dataColumn4
- //
- this.dataColumn4.Caption = "Value";
- this.dataColumn4.ColumnName = "Value";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // groupBox1
- //
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.Controls.Add(this.sizeUnitsCombo);
- this.groupBox1.Controls.Add(this.sizeContextCombo);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.lineStyleEditor);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // groupBox2
- //
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.Controls.Add(this.fillStyleEditor);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
- //
- // previewGroup
- //
- resources.ApplyResources(this.previewGroup, "previewGroup");
- this.previewGroup.Controls.Add(this.lnkRefresh);
- this.previewGroup.Controls.Add(this.previewPicture);
- this.previewGroup.Name = "previewGroup";
- this.previewGroup.TabStop = false;
- //
- // lnkRefresh
- //
- resources.ApplyResources(this.lnkRefresh, "lnkRefresh");
- this.lnkRefresh.BackColor = System.Drawing.Color.Transparent;
- this.lnkRefresh.Name = "lnkRefresh";
- this.lnkRefresh.TabStop = true;
- this.lnkRefresh.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkRefresh_LinkClicked);
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
- // ComboBoxDataSet
- //
- this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
- this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.SizeContextTable,
- this.UnitsTable});
- //
- // AreaFeatureStyleEditor
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.previewGroup);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Name = "AreaFeatureStyleEditor";
- this.Load += new System.EventHandler(this.AreaFeatureStyleEditor_Load);
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- this.groupBox1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.previewGroup.ResumeLayout(false);
- this.previewGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.ResumeLayout(false);
-
- }
- #endregion
-
private void AreaFeatureStyleEditor_Load(object sender, System.EventArgs e)
{
//UpdateDisplay();
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -49,7 +49,7 @@
/// <value>
/// The color expression.
/// </value>
- [DefaultValue("00000000")]
+ [DefaultValue("00000000")] //NOXLATE
public string ColorExpression
{
get { return txtColor.Text; }
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -60,7 +60,7 @@
chkEnabled.Checked = (_elSettings != null);
if (_elSettings == null)
- _elSettings = vsr2.Create("0", "0", ElevationTypeType.RelativeToGround, LengthUnitType.Meters);
+ _elSettings = vsr2.Create("0", "0", ElevationTypeType.RelativeToGround, LengthUnitType.Meters); //NOXLATE
try
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -27,149 +27,39 @@
namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
{
- /// <summary>
- /// Summary description for FillStyleEditor.
- /// </summary>
+ /// <summary>
+ /// Summary description for FillStyleEditor.
+ /// </summary>
[ToolboxItem(false)]
- internal class FillStyleEditor : System.Windows.Forms.UserControl
+ internal partial class FillStyleEditor : System.Windows.Forms.UserControl
{
- public ImageStylePicker fillCombo;
-
- public System.Windows.Forms.CheckBox displayFill;
- private System.Windows.Forms.Label lblBackground;
- public Label lblForeground;
- private System.Windows.Forms.Label lblFill;
- public ColorExpressionField foregroundColor;
- public ColorExpressionField backgroundColor;
-
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.Container components = null;
-
- public FillStyleEditor()
- {
- // This call is required by the Windows.Forms Form Designer.
- InitializeComponent();
+ public FillStyleEditor()
+ {
+ // This call is required by the Windows.Forms Form Designer.
+ InitializeComponent();
fillCombo.Items.Clear();
fillCombo.Items.AddRange(FeaturePreviewRender.FillImages);
}
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- protected override void Dispose( bool disposing )
- {
- if( disposing )
- {
- if(components != null)
- {
- components.Dispose();
- }
- }
- base.Dispose( disposing );
- }
+ private void FillStyleEditor_Load(object sender, System.EventArgs e)
+ {
+ }
- #region Component 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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FillStyleEditor));
- this.lblBackground = new System.Windows.Forms.Label();
- this.lblForeground = new System.Windows.Forms.Label();
- this.lblFill = new System.Windows.Forms.Label();
- this.fillCombo = new Maestro.Editors.Common.ImageStylePicker();
- this.displayFill = new System.Windows.Forms.CheckBox();
- this.foregroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.backgroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.SuspendLayout();
- //
- // lblBackground
- //
- resources.ApplyResources(this.lblBackground, "lblBackground");
- this.lblBackground.Name = "lblBackground";
- //
- // lblForeground
- //
- resources.ApplyResources(this.lblForeground, "lblForeground");
- this.lblForeground.Name = "lblForeground";
- //
- // lblFill
- //
- resources.ApplyResources(this.lblFill, "lblFill");
- this.lblFill.Name = "lblFill";
- //
- // fillCombo
- //
- resources.ApplyResources(this.fillCombo, "fillCombo");
- this.fillCombo.DisplayMember = "Name";
- this.fillCombo.Name = "fillCombo";
- this.fillCombo.TextWidth = 50;
- this.fillCombo.ValueMember = "Name";
- //
- // displayFill
- //
- this.displayFill.Checked = true;
- this.displayFill.CheckState = System.Windows.Forms.CheckState.Checked;
- resources.ApplyResources(this.displayFill, "displayFill");
- this.displayFill.Name = "displayFill";
- this.displayFill.CheckedChanged += new System.EventHandler(this.displayFill_CheckedChanged);
- //
- // foregroundColor
- //
- resources.ApplyResources(this.foregroundColor, "foregroundColor");
- this.foregroundColor.ColorExpression = "";
- this.foregroundColor.Name = "foregroundColor";
- this.foregroundColor.RequestExpressionEditor += new System.EventHandler(this.foregroundColor_RequestExpressionEditor);
- //
- // backgroundColor
- //
- resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.ColorExpression = "";
- this.backgroundColor.Name = "backgroundColor";
- this.backgroundColor.RequestExpressionEditor += new System.EventHandler(this.backgroundColor_RequestExpressionEditor);
- //
- // FillStyleEditor
- //
- this.Controls.Add(this.backgroundColor);
- this.Controls.Add(this.foregroundColor);
- this.Controls.Add(this.displayFill);
- this.Controls.Add(this.fillCombo);
- this.Controls.Add(this.lblBackground);
- this.Controls.Add(this.lblForeground);
- this.Controls.Add(this.lblFill);
- this.Name = "FillStyleEditor";
- resources.ApplyResources(this, "$this");
- this.Load += new System.EventHandler(this.FillStyleEditor_Load);
- this.ResumeLayout(false);
- this.PerformLayout();
+ private void displayFill_CheckedChanged(object sender, System.EventArgs e)
+ {
+ lblFill.Enabled =
+ lblForeground.Enabled =
+ lblBackground.Enabled =
+ fillCombo.Enabled =
+ foregroundColor.Enabled =
+ backgroundColor.Enabled =
+ displayFill.Checked;
+ }
- }
- #endregion
-
- private void FillStyleEditor_Load(object sender, System.EventArgs e)
- {
- }
-
- private void displayFill_CheckedChanged(object sender, System.EventArgs e)
- {
- lblFill.Enabled =
- lblForeground.Enabled =
- lblBackground.Enabled =
- fillCombo.Enabled =
- foregroundColor.Enabled =
- backgroundColor.Enabled =
- displayFill.Checked;
- }
-
public event EventHandler ForegroundRequiresExpression;
public event EventHandler BackgroundRequiresExpression;
-
private void foregroundColor_RequestExpressionEditor(object sender, EventArgs e)
{
var handler = this.ForegroundRequiresExpression;
@@ -183,5 +73,5 @@
if (handler != null)
handler(this, EventArgs.Empty);
}
- }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -31,77 +31,18 @@
namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
{
- /// <summary>
- /// Summary description for FontStyleEditor.
- /// </summary>
+ /// <summary>
+ /// Summary description for FontStyleEditor.
+ /// </summary>
[ToolboxItem(false)]
- internal class FontStyleEditor : System.Windows.Forms.UserControl
- {
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label label9;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.GroupBox fontGroup;
- private System.Windows.Forms.GroupBox colorGroup;
- private System.Windows.Forms.GroupBox alignmentGroup;
- private System.Windows.Forms.PictureBox previewPicture;
- private System.Windows.Forms.ComboBox sizeCombo;
- private System.Windows.Forms.ComboBox unitsCombo;
- private System.Windows.Forms.ComboBox sizeContextCombo;
- private System.Windows.Forms.ComboBox fontCombo;
- private System.Windows.Forms.ComboBox propertyCombo;
- private System.Windows.Forms.CheckBox underlineCheck;
- private System.Windows.Forms.CheckBox italicCheck;
- private System.Windows.Forms.CheckBox boldCheck;
- private System.Windows.Forms.ComboBox backgroundTypeCombo;
- private System.Windows.Forms.ComboBox rotationCombo;
- internal System.Windows.Forms.ComboBox verticalCombo;
- internal System.Windows.Forms.ComboBox horizontalCombo;
- private System.Windows.Forms.GroupBox previewGroup;
- private System.Data.DataSet ComboBoxDataSet;
- private System.Data.DataColumn dataColumn1;
- private System.Data.DataColumn dataColumn2;
- private System.Data.DataTable SizeContextTable;
- private System.Data.DataColumn dataColumn3;
- private System.Data.DataColumn dataColumn4;
- private System.Data.DataTable UnitsTable;
- private System.Data.DataColumn dataColumn5;
- private System.Data.DataColumn dataColumn6;
- private System.Data.DataTable RotationTable;
- private System.Data.DataColumn dataColumn7;
- private System.Data.DataColumn dataColumn8;
- private System.Data.DataTable BackgroundTypeTable;
- private System.Data.DataColumn dataColumn9;
- private System.Data.DataColumn dataColumn10;
- private System.Data.DataTable HorizontalTable;
- private System.Data.DataColumn dataColumn11;
- private System.Data.DataColumn dataColumn12;
- private System.Data.DataTable VerticalTable;
- private System.Data.DataColumn dataColumn13;
- private System.Data.DataColumn dataColumn14;
- private System.Data.DataTable FontTable;
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.Container components = null;
+ internal partial class FontStyleEditor : System.Windows.Forms.UserControl
+ {
+ private ITextSymbol m_item;
+
+ private bool m_inUpdate = false;
- private ITextSymbol m_item;
- internal System.Windows.Forms.Label verticalLabel;
- internal System.Windows.Forms.Label horizontalLabel;
- private CheckBox DisplayLabel;
- private ColorExpressionField textColor;
- private ColorExpressionField backgroundColor;
- private bool m_inUpdate = false;
+ public event EventHandler Changed;
- public event EventHandler Changed;
-
private IEditorService m_editor;
private ClassDefinition m_schema;
private string m_featureSource;
@@ -137,24 +78,24 @@
}
private FontStyleEditor()
- {
- //
- // Required for Windows Form Designer support
- //
- InitializeComponent();
+ {
+ //
+ // Required for Windows Form Designer support
+ //
+ InitializeComponent();
using(System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))
- ComboBoxDataSet.ReadXml(sr);
+ ComboBoxDataSet.ReadXml(sr);
}
- private void UpdateDisplay()
- {
- if (m_inUpdate)
- return;
- try
- {
- m_inUpdate = true;
+ private void UpdateDisplay()
+ {
+ if (m_inUpdate)
+ return;
+ try
+ {
+ m_inUpdate = true;
if (m_item == null)
{
@@ -164,23 +105,23 @@
else
DisplayLabel.Checked = true;
- propertyCombo.Text = m_item.Text;
- propertyCombo.SelectedItem = m_item.Text;
- if (m_item.FontName != null)
- fontCombo.Text = m_item.FontName;
- sizeContextCombo.SelectedValue = m_item.SizeContext.ToString();
- unitsCombo.SelectedValue = m_item.Unit.ToString();
- if (m_item.SizeX == null)
- sizeCombo.Text = "";
- else
- sizeCombo.Text = m_item.SizeX.ToString();
+ propertyCombo.Text = m_item.Text;
+ propertyCombo.SelectedItem = m_item.Text;
+ if (m_item.FontName != null)
+ fontCombo.Text = m_item.FontName;
+ sizeContextCombo.SelectedValue = m_item.SizeContext.ToString();
+ unitsCombo.SelectedValue = m_item.Unit.ToString();
+ if (m_item.SizeX == null)
+ sizeCombo.Text = "";
+ else
+ sizeCombo.Text = m_item.SizeX.ToString();
- boldCheck.Checked = m_item.Bold == "true";
- italicCheck.Checked = m_item.Italic == "true";
- underlineCheck.Checked = m_item.Underlined == "true";
+ boldCheck.Checked = m_item.Bold == "true";
+ italicCheck.Checked = m_item.Italic == "true";
+ underlineCheck.Checked = m_item.Underlined == "true";
textColor.ColorExpression = m_item.ForegroundColor;
backgroundColor.ColorExpression = m_item.BackgroundColor;
- backgroundTypeCombo.SelectedValue = m_item.BackgroundStyle.ToString();
+ backgroundTypeCombo.SelectedValue = m_item.BackgroundStyle.ToString();
rotationCombo.SelectedIndex = -1;
rotationCombo.Text = m_item.Rotation;
if (m_item.HorizontalAlignment != null)
@@ -202,521 +143,18 @@
verticalCombo.Text = m_item.VerticalAlignment;
}
}
- }
- finally
- {
- m_inUpdate = false;
- }
- }
+ }
+ finally
+ {
+ m_inUpdate = false;
+ }
+ }
- /// <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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FontStyleEditor));
- this.fontGroup = new System.Windows.Forms.GroupBox();
- this.sizeCombo = new System.Windows.Forms.ComboBox();
- this.unitsCombo = new System.Windows.Forms.ComboBox();
- this.UnitsTable = new System.Data.DataTable();
- this.dataColumn5 = new System.Data.DataColumn();
- this.dataColumn6 = new System.Data.DataColumn();
- this.sizeContextCombo = new System.Windows.Forms.ComboBox();
- this.SizeContextTable = new System.Data.DataTable();
- this.dataColumn3 = new System.Data.DataColumn();
- this.dataColumn4 = new System.Data.DataColumn();
- this.fontCombo = new System.Windows.Forms.ComboBox();
- this.propertyCombo = new System.Windows.Forms.ComboBox();
- this.label6 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.panel1 = new System.Windows.Forms.Panel();
- this.underlineCheck = new System.Windows.Forms.CheckBox();
- this.italicCheck = new System.Windows.Forms.CheckBox();
- this.boldCheck = new System.Windows.Forms.CheckBox();
- this.FontTable = new System.Data.DataTable();
- this.dataColumn1 = new System.Data.DataColumn();
- this.dataColumn2 = new System.Data.DataColumn();
- this.colorGroup = new System.Windows.Forms.GroupBox();
- this.backgroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.textColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.backgroundTypeCombo = new System.Windows.Forms.ComboBox();
- this.BackgroundTypeTable = new System.Data.DataTable();
- this.dataColumn9 = new System.Data.DataColumn();
- this.dataColumn10 = new System.Data.DataColumn();
- this.label7 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.alignmentGroup = new System.Windows.Forms.GroupBox();
- this.rotationCombo = new System.Windows.Forms.ComboBox();
- this.RotationTable = new System.Data.DataTable();
- this.dataColumn7 = new System.Data.DataColumn();
- this.dataColumn8 = new System.Data.DataColumn();
- this.verticalCombo = new System.Windows.Forms.ComboBox();
- this.VerticalTable = new System.Data.DataTable();
- this.dataColumn13 = new System.Data.DataColumn();
- this.dataColumn14 = new System.Data.DataColumn();
- this.horizontalCombo = new System.Windows.Forms.ComboBox();
- this.HorizontalTable = new System.Data.DataTable();
- this.dataColumn11 = new System.Data.DataColumn();
- this.dataColumn12 = new System.Data.DataColumn();
- this.label10 = new System.Windows.Forms.Label();
- this.verticalLabel = new System.Windows.Forms.Label();
- this.horizontalLabel = new System.Windows.Forms.Label();
- this.previewGroup = new System.Windows.Forms.GroupBox();
- this.previewPicture = new System.Windows.Forms.PictureBox();
- this.ComboBoxDataSet = new System.Data.DataSet();
- this.DisplayLabel = new System.Windows.Forms.CheckBox();
- this.fontGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.FontTable)).BeginInit();
- this.colorGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).BeginInit();
- this.alignmentGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).BeginInit();
- this.previewGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.SuspendLayout();
- //
- // fontGroup
- //
- resources.ApplyResources(this.fontGroup, "fontGroup");
- this.fontGroup.Controls.Add(this.sizeCombo);
- this.fontGroup.Controls.Add(this.unitsCombo);
- this.fontGroup.Controls.Add(this.sizeContextCombo);
- this.fontGroup.Controls.Add(this.fontCombo);
- this.fontGroup.Controls.Add(this.propertyCombo);
- this.fontGroup.Controls.Add(this.label6);
- this.fontGroup.Controls.Add(this.label5);
- this.fontGroup.Controls.Add(this.label4);
- this.fontGroup.Controls.Add(this.label3);
- this.fontGroup.Controls.Add(this.label2);
- this.fontGroup.Controls.Add(this.label1);
- this.fontGroup.Controls.Add(this.panel1);
- this.fontGroup.Name = "fontGroup";
- this.fontGroup.TabStop = false;
- this.fontGroup.Enter += new System.EventHandler(this.fontGroup_Enter);
- //
- // sizeCombo
- //
- resources.ApplyResources(this.sizeCombo, "sizeCombo");
- this.sizeCombo.Items.AddRange(new object[] {
- resources.GetString("sizeCombo.Items")});
- this.sizeCombo.Name = "sizeCombo";
- this.sizeCombo.SelectedIndexChanged += new System.EventHandler(this.sizeCombo_SelectedIndexChanged);
- this.sizeCombo.TextChanged += new System.EventHandler(this.sizeCombo_TextChanged);
- //
- // unitsCombo
- //
- resources.ApplyResources(this.unitsCombo, "unitsCombo");
- this.unitsCombo.DataSource = this.UnitsTable;
- this.unitsCombo.DisplayMember = "Display";
- this.unitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.unitsCombo.Name = "unitsCombo";
- this.unitsCombo.ValueMember = "Value";
- this.unitsCombo.SelectedIndexChanged += new System.EventHandler(this.unitsCombo_SelectedIndexChanged);
- //
- // UnitsTable
- //
- this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn5,
- this.dataColumn6});
- this.UnitsTable.TableName = "Units";
- //
- // dataColumn5
- //
- this.dataColumn5.Caption = "Display";
- this.dataColumn5.ColumnName = "Display";
- //
- // dataColumn6
- //
- this.dataColumn6.Caption = "Value";
- this.dataColumn6.ColumnName = "Value";
- //
- // sizeContextCombo
- //
- resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
- this.sizeContextCombo.DataSource = this.SizeContextTable;
- this.sizeContextCombo.DisplayMember = "Display";
- this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeContextCombo.Name = "sizeContextCombo";
- this.sizeContextCombo.ValueMember = "Value";
- this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
- //
- // SizeContextTable
- //
- this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn3,
- this.dataColumn4});
- this.SizeContextTable.TableName = "SizeContext";
- //
- // dataColumn3
- //
- this.dataColumn3.Caption = "Display";
- this.dataColumn3.ColumnName = "Display";
- //
- // dataColumn4
- //
- this.dataColumn4.Caption = "Value";
- this.dataColumn4.ColumnName = "Value";
- //
- // fontCombo
- //
- resources.ApplyResources(this.fontCombo, "fontCombo");
- this.fontCombo.Name = "fontCombo";
- this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
- this.fontCombo.TextChanged += new System.EventHandler(this.fontCombo_TextChanged);
- //
- // propertyCombo
- //
- resources.ApplyResources(this.propertyCombo, "propertyCombo");
- this.propertyCombo.Name = "propertyCombo";
- this.propertyCombo.SelectedIndexChanged += new System.EventHandler(this.propertyCombo_SelectedIndexChanged);
- this.propertyCombo.TextChanged += new System.EventHandler(this.propertyCombo_TextChanged);
- //
- // label6
- //
- resources.ApplyResources(this.label6, "label6");
- this.label6.Name = "label6";
- //
- // label5
- //
- resources.ApplyResources(this.label5, "label5");
- this.label5.Name = "label5";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // panel1
- //
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Controls.Add(this.underlineCheck);
- this.panel1.Controls.Add(this.italicCheck);
- this.panel1.Controls.Add(this.boldCheck);
- this.panel1.Name = "panel1";
- //
- // underlineCheck
- //
- resources.ApplyResources(this.underlineCheck, "underlineCheck");
- this.underlineCheck.Name = "underlineCheck";
- this.underlineCheck.CheckedChanged += new System.EventHandler(this.underlineCheck_CheckedChanged);
- //
- // italicCheck
- //
- resources.ApplyResources(this.italicCheck, "italicCheck");
- this.italicCheck.Name = "italicCheck";
- this.italicCheck.CheckedChanged += new System.EventHandler(this.italicCheck_CheckedChanged);
- //
- // boldCheck
- //
- resources.ApplyResources(this.boldCheck, "boldCheck");
- this.boldCheck.Name = "boldCheck";
- this.boldCheck.CheckedChanged += new System.EventHandler(this.boldCheck_CheckedChanged);
- //
- // FontTable
- //
- this.FontTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn1,
- this.dataColumn2});
- this.FontTable.TableName = "Font";
- //
- // dataColumn1
- //
- this.dataColumn1.Caption = "Display";
- this.dataColumn1.ColumnName = "Display";
- //
- // dataColumn2
- //
- this.dataColumn2.Caption = "Value";
- this.dataColumn2.ColumnName = "Value";
- //
- // colorGroup
- //
- resources.ApplyResources(this.colorGroup, "colorGroup");
- this.colorGroup.Controls.Add(this.backgroundColor);
- this.colorGroup.Controls.Add(this.textColor);
- this.colorGroup.Controls.Add(this.backgroundTypeCombo);
- this.colorGroup.Controls.Add(this.label7);
- this.colorGroup.Controls.Add(this.label8);
- this.colorGroup.Controls.Add(this.label9);
- this.colorGroup.Name = "colorGroup";
- this.colorGroup.TabStop = false;
- //
- // backgroundColor
- //
- resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.ColorExpression = "";
- this.backgroundColor.Name = "backgroundColor";
- this.backgroundColor.CurrentColorChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
- this.backgroundColor.RequestExpressionEditor += new System.EventHandler(this.BackgroundColor_RequestExpressionEditor);
- //
- // textColor
- //
- resources.ApplyResources(this.textColor, "textColor");
- this.textColor.ColorExpression = "";
- this.textColor.Name = "textColor";
- this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
- this.textColor.RequestExpressionEditor += new System.EventHandler(this.TextColor_RequestExpressionEditor);
- //
- // backgroundTypeCombo
- //
- resources.ApplyResources(this.backgroundTypeCombo, "backgroundTypeCombo");
- this.backgroundTypeCombo.DataSource = this.BackgroundTypeTable;
- this.backgroundTypeCombo.DisplayMember = "Display";
- this.backgroundTypeCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.backgroundTypeCombo.Name = "backgroundTypeCombo";
- this.backgroundTypeCombo.ValueMember = "Value";
- this.backgroundTypeCombo.SelectedIndexChanged += new System.EventHandler(this.backgroundTypeCombo_SelectedIndexChanged);
- //
- // BackgroundTypeTable
- //
- this.BackgroundTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn9,
- this.dataColumn10});
- this.BackgroundTypeTable.TableName = "BackgroundType";
- //
- // dataColumn9
- //
- this.dataColumn9.ColumnName = "Display";
- //
- // dataColumn10
- //
- this.dataColumn10.ColumnName = "Value";
- //
- // label7
- //
- resources.ApplyResources(this.label7, "label7");
- this.label7.Name = "label7";
- //
- // label8
- //
- resources.ApplyResources(this.label8, "label8");
- this.label8.Name = "label8";
- //
- // label9
- //
- resources.ApplyResources(this.label9, "label9");
- this.label9.Name = "label9";
- //
- // alignmentGroup
- //
- resources.ApplyResources(this.alignmentGroup, "alignmentGroup");
- this.alignmentGroup.Controls.Add(this.rotationCombo);
- this.alignmentGroup.Controls.Add(this.verticalCombo);
- this.alignmentGroup.Controls.Add(this.horizontalCombo);
- this.alignmentGroup.Controls.Add(this.label10);
- this.alignmentGroup.Controls.Add(this.verticalLabel);
- this.alignmentGroup.Controls.Add(this.horizontalLabel);
- this.alignmentGroup.Name = "alignmentGroup";
- this.alignmentGroup.TabStop = false;
- //
- // rotationCombo
- //
- resources.ApplyResources(this.rotationCombo, "rotationCombo");
- this.rotationCombo.DataSource = this.RotationTable;
- this.rotationCombo.DisplayMember = "Display";
- this.rotationCombo.Name = "rotationCombo";
- this.rotationCombo.ValueMember = "Value";
- this.rotationCombo.SelectedIndexChanged += new System.EventHandler(this.rotationCombo_SelectedIndexChanged);
- this.rotationCombo.TextChanged += new System.EventHandler(this.rotationCombo_TextChanged);
- //
- // RotationTable
- //
- this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn7,
- this.dataColumn8});
- this.RotationTable.TableName = "Rotation";
- //
- // dataColumn7
- //
- this.dataColumn7.Caption = "Display";
- this.dataColumn7.ColumnName = "Display";
- //
- // dataColumn8
- //
- this.dataColumn8.Caption = "Value";
- this.dataColumn8.ColumnName = "Value";
- //
- // verticalCombo
- //
- resources.ApplyResources(this.verticalCombo, "verticalCombo");
- this.verticalCombo.DataSource = this.VerticalTable;
- this.verticalCombo.DisplayMember = "Display";
- this.verticalCombo.Name = "verticalCombo";
- this.verticalCombo.ValueMember = "Value";
- this.verticalCombo.SelectedIndexChanged += new System.EventHandler(this.verticalCombo_SelectedIndexChanged);
- this.verticalCombo.TextChanged += new System.EventHandler(this.verticalCombo_TextChanged);
- //
- // VerticalTable
- //
- this.VerticalTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn13,
- this.dataColumn14});
- this.VerticalTable.TableName = "Vertical";
- //
- // dataColumn13
- //
- this.dataColumn13.ColumnName = "Display";
- //
- // dataColumn14
- //
- this.dataColumn14.ColumnName = "Value";
- //
- // horizontalCombo
- //
- resources.ApplyResources(this.horizontalCombo, "horizontalCombo");
- this.horizontalCombo.DataSource = this.HorizontalTable;
- this.horizontalCombo.DisplayMember = "Display";
- this.horizontalCombo.Name = "horizontalCombo";
- this.horizontalCombo.ValueMember = "Value";
- this.horizontalCombo.SelectedIndexChanged += new System.EventHandler(this.horizontalCombo_SelectedIndexChanged);
- this.horizontalCombo.TextChanged += new System.EventHandler(this.horizontalCombo_TextChanged);
- //
- // HorizontalTable
- //
- this.HorizontalTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn11,
- this.dataColumn12});
- this.HorizontalTable.TableName = "Horizontal";
- //
- // dataColumn11
- //
- this.dataColumn11.ColumnName = "Display";
- //
- // dataColumn12
- //
- this.dataColumn12.ColumnName = "Value";
- //
- // label10
- //
- resources.ApplyResources(this.label10, "label10");
- this.label10.Name = "label10";
- //
- // verticalLabel
- //
- resources.ApplyResources(this.verticalLabel, "verticalLabel");
- this.verticalLabel.Name = "verticalLabel";
- //
- // horizontalLabel
- //
- resources.ApplyResources(this.horizontalLabel, "horizontalLabel");
- this.horizontalLabel.Name = "horizontalLabel";
- //
- // previewGroup
- //
- resources.ApplyResources(this.previewGroup, "previewGroup");
- this.previewGroup.Controls.Add(this.previewPicture);
- this.previewGroup.Name = "previewGroup";
- this.previewGroup.TabStop = false;
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
- // ComboBoxDataSet
- //
- this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
- this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.FontTable,
- this.SizeContextTable,
- this.UnitsTable,
- this.RotationTable,
- this.BackgroundTypeTable,
- this.HorizontalTable,
- this.VerticalTable});
- //
- // DisplayLabel
- //
- resources.ApplyResources(this.DisplayLabel, "DisplayLabel");
- this.DisplayLabel.Checked = true;
- this.DisplayLabel.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayLabel.Name = "DisplayLabel";
- this.DisplayLabel.UseVisualStyleBackColor = true;
- this.DisplayLabel.CheckedChanged += new System.EventHandler(this.DisplayLabel_CheckedChanged);
- //
- // FontStyleEditor
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.DisplayLabel);
- this.Controls.Add(this.previewGroup);
- this.Controls.Add(this.colorGroup);
- this.Controls.Add(this.fontGroup);
- this.Controls.Add(this.alignmentGroup);
- this.Name = "FontStyleEditor";
- this.fontGroup.ResumeLayout(false);
- this.fontGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- this.panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.FontTable)).EndInit();
- this.colorGroup.ResumeLayout(false);
- this.colorGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).EndInit();
- this.alignmentGroup.ResumeLayout(false);
- this.alignmentGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).EndInit();
- this.previewGroup.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
- }
- #endregion
-
-
- private void propertyCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void propertyCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
if (propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
@@ -729,43 +167,43 @@
//This is required as we cannot update the text from within the SelectedIndexChanged event :(
BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), propertyCombo, current, expr != null);
}
- }
+ }
- private void fontCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void fontCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.FontName = (string)fontCombo.Text;
- previewPicture.Refresh();
+ m_item.FontName = (string)fontCombo.Text;
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void sizeContextCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void sizeContextCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.SizeContext = (SizeContextType)Enum.Parse(typeof(SizeContextType), (string)sizeContextCombo.SelectedValue);
- previewPicture.Refresh();
+ m_item.SizeContext = (SizeContextType)Enum.Parse(typeof(SizeContextType), (string)sizeContextCombo.SelectedValue);
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void unitsCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void unitsCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.Unit = (LengthUnitType)Enum.Parse(typeof(LengthUnitType), (string)unitsCombo.SelectedValue);
- previewPicture.Refresh();
+ m_item.Unit = (LengthUnitType)Enum.Parse(typeof(LengthUnitType), (string)unitsCombo.SelectedValue);
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void sizeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void sizeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
if (sizeCombo.SelectedIndex == sizeCombo.Items.Count - 1)
@@ -780,74 +218,74 @@
}
}
- private void boldCheck_CheckedChanged(object sender, System.EventArgs e)
- {
+ private void boldCheck_CheckedChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.Bold = boldCheck.Checked ? "true" : null;
- previewPicture.Refresh();
+ m_item.Bold = boldCheck.Checked ? "true" : null;
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void italicCheck_CheckedChanged(object sender, System.EventArgs e)
- {
+ private void italicCheck_CheckedChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.Italic = italicCheck.Checked ? "true" : null;
- previewPicture.Refresh();
+ m_item.Italic = italicCheck.Checked ? "true" : null;
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void underlineCheck_CheckedChanged(object sender, System.EventArgs e)
- {
+ private void underlineCheck_CheckedChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
- m_item.Underlined = underlineCheck.Checked ? "true" : null;
- previewPicture.Refresh();
+ m_item.Underlined = underlineCheck.Checked ? "true" : null;
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void textColor_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void textColor_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
- return;
+ return;
m_item.ForegroundColor = textColor.ColorExpression;
- previewPicture.Refresh();
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void backgroundColor_SelectedIndexChanged(object sender, System.EventArgs e)
- {
- if (m_inUpdate || m_item == null)
- return;
+ private void backgroundColor_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
+ if (m_inUpdate || m_item == null)
+ return;
m_item.BackgroundColor = backgroundColor.ColorExpression;
- previewPicture.Refresh();
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void backgroundTypeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void backgroundTypeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
- return;
- m_item.BackgroundStyle = (BackgroundStyleType)Enum.Parse(typeof(BackgroundStyleType), (string)backgroundTypeCombo.SelectedValue);
- previewPicture.Refresh();
+ return;
+ m_item.BackgroundStyle = (BackgroundStyleType)Enum.Parse(typeof(BackgroundStyleType), (string)backgroundTypeCombo.SelectedValue);
+ previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
- private void horizontalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void horizontalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
@@ -867,8 +305,8 @@
}
}
- private void verticalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void verticalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
@@ -888,8 +326,8 @@
}
}
- private void rotationCombo_SelectedIndexChanged(object sender, System.EventArgs e)
- {
+ private void rotationCombo_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null)
return;
@@ -917,18 +355,18 @@
return null;
}
- private void previewPicture_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
- {
- FeaturePreviewRender.RenderPreviewFont(e.Graphics, new Rectangle(1, 1, previewPicture.Width - 2, previewPicture.Height - 2), m_item);
- }
+ private void previewPicture_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
+ {
+ FeaturePreviewRender.RenderPreviewFont(e.Graphics, new Rectangle(1, 1, previewPicture.Width - 2, previewPicture.Height - 2), m_item);
+ }
- private void fontGroup_Enter(object sender, System.EventArgs e)
- {
-
- }
+ private void fontGroup_Enter(object sender, System.EventArgs e)
+ {
+
+ }
- private void propertyCombo_TextChanged(object sender, System.EventArgs e)
- {
+ private void propertyCombo_TextChanged(object sender, System.EventArgs e)
+ {
if (m_inUpdate || m_item == null || propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
return;
@@ -940,14 +378,14 @@
}
public ITextSymbol Item
- {
- get { return m_item; }
- set
- {
- m_item = value;
- UpdateDisplay();
- }
- }
+ {
+ get { return m_item; }
+ set
+ {
+ m_item = value;
+ UpdateDisplay();
+ }
+ }
private void DisplayLabel_CheckedChanged(object sender, EventArgs e)
{
@@ -1051,19 +489,19 @@
Changed(this, new EventArgs());
}
-
- void TextColor_RequestExpressionEditor(object sender, EventArgs e)
- {
+
+ void TextColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
string expr = m_editor.EditExpression(textColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
if (expr != null)
textColor.ColorExpression = expr;
- }
-
- void BackgroundColor_RequestExpressionEditor(object sender, EventArgs e)
- {
+ }
+
+ void BackgroundColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
string expr = m_editor.EditExpression(backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
if (expr != null)
backgroundColor.ColorExpression = expr;
- }
- }
+ }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2012-09-10 12:58:29 UTC (rev 6994)
@@ -798,6 +798,9 @@
<Compile Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.Designer.cs">
+ <DependentUpon>AreaFeatureStyleEditor.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\StyleEditors\ColorExpressionField.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -813,9 +816,15 @@
<Compile Include="LayerDefinition\Vector\StyleEditors\FillStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="LayerDefinition\Vector\StyleEditors\FillStyleEditor.Designer.cs">
+ <DependentUpon>FillStyleEditor.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\StyleEditors\FontStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="LayerDefinition\Vector\StyleEditors\FontStyleEditor.Designer.cs">
+ <DependentUpon>FontStyleEditor.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\StyleEditors\LineFeatureStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -259,6 +259,123 @@
}
/// <summary>
+ /// Looks up a localized string similar to Bing Maps Hybrid.
+ /// </summary>
+ internal static string CmsBingHybrid {
+ get {
+ return ResourceManager.GetString("CmsBingHybrid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Bing Maps Satellite.
+ /// </summary>
+ internal static string CmsBingSatellite {
+ get {
+ return ResourceManager.GetString("CmsBingSatellite", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Bing Maps Street.
+ /// </summary>
+ internal static string CmsBingStreet {
+ get {
+ return ResourceManager.GetString("CmsBingStreet", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Google Hybrid.
+ /// </summary>
+ internal static string CmsGoogleHybrid {
+ get {
+ return ResourceManager.GetString("CmsGoogleHybrid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Google Physical.
+ /// </summary>
+ internal static string CmsGooglePhysical {
+ get {
+ return ResourceManager.GetString("CmsGooglePhysical", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Google Satellite.
+ /// </summary>
+ internal static string CmsGoogleSatellite {
+ get {
+ return ResourceManager.GetString("CmsGoogleSatellite", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Google Streets.
+ /// </summary>
+ internal static string CmsGoogleStreets {
+ get {
+ return ResourceManager.GetString("CmsGoogleStreets", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Open Street Map.
+ /// </summary>
+ internal static string CmsOsm {
+ get {
+ return ResourceManager.GetString("CmsOsm", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Open Street Map (CycleMap).
+ /// </summary>
+ internal static string CmsOsmCycle {
+ get {
+ return ResourceManager.GetString("CmsOsmCycle", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Open Street Map (TransportMap).
+ /// </summary>
+ internal static string CmsOsmTransport {
+ get {
+ return ResourceManager.GetString("CmsOsmTransport", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Yahoo! Maps Hybrid.
+ /// </summary>
+ internal static string CmsYahooHybrid {
+ get {
+ return ResourceManager.GetString("CmsYahooHybrid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Yahoo! Maps Satellite.
+ /// </summary>
+ internal static string CmsYahooSatellite {
+ get {
+ return ResourceManager.GetString("CmsYahooSatellite", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Yahoo! Maps Street.
+ /// </summary>
+ internal static string CmsYahooStreet {
+ get {
+ return ResourceManager.GetString("CmsYahooStreet", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Name.
/// </summary>
internal static string ColHeaderName {
@@ -640,6 +757,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Not a valid symbol library resource identifier: {0}.
+ /// </summary>
+ internal static string ErrorInvalidSymbolLibraryResourceId {
+ get {
+ return ResourceManager.GetString("ErrorInvalidSymbolLibraryResourceId", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to This Layer Definition version does not support composite symbolization.
+ /// </summary>
+ internal static string ErrorLayerDefnitionDoesNotSupportCompositeSymbolization {
+ get {
+ return ResourceManager.GetString("ErrorLayerDefnitionDoesNotSupportCompositeSymbolization", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Error loading WMS configuration document: {0}. A default document will be created.
/// </summary>
internal static string ErrorLoadingWmsConfig {
@@ -1385,6 +1520,15 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to <geometry property> {0} GeomFromText('<FGF geometry text>').
+ /// </summary>
+ internal static string GeomFilterTemplate {
+ get {
+ return ResourceManager.GetString("GeomFilterTemplate", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap globe__arrow {
get {
object obj = ResourceManager.GetObject("globe--arrow", resourceCulture);
@@ -2730,6 +2874,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Specify Direction to traverse extent history.
+ /// </summary>
+ internal static string PromptDirection {
+ get {
+ return ResourceManager.GetString("PromptDirection", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Enter the name.
/// </summary>
internal static string PromptName {
@@ -2757,6 +2910,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Select Buffer Units.
+ /// </summary>
+ internal static string PromptSelectBufferUnits {
+ get {
+ return ResourceManager.GetString("PromptSelectBufferUnits", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Select Map.
/// </summary>
internal static string PromptSelectMap {
@@ -2784,6 +2946,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Select zoom extents option.
+ /// </summary>
+ internal static string PromptViewType {
+ get {
+ return ResourceManager.GetString("PromptViewType", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Could not find possible values for enumerable property.
/// </summary>
internal static string PropEnumNoValues {
@@ -3251,6 +3422,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Inline Compound Symbol.
+ /// </summary>
+ internal static string TextInlineCompoundSymbol {
+ get {
+ return ResourceManager.GetString("TextInlineCompoundSymbol", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Inline Simple Symbol.
+ /// </summary>
+ internal static string TextInlineSimpleSymbol {
+ get {
+ return ResourceManager.GetString("TextInlineSimpleSymbol", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Loading.
/// </summary>
internal static string TextLoading {
@@ -3314,6 +3503,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Preview\nnot available.
+ /// </summary>
+ internal static string TextRenderPreviewNotAvailable {
+ get {
+ return ResourceManager.GetString("TextRenderPreviewNotAvailable", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Search Text Not Found.
/// </summary>
internal static string TextSearchTextNotFound {
@@ -3364,6 +3562,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Buffer Units.
+ /// </summary>
+ internal static string TitleBufferUnits {
+ get {
+ return ResourceManager.GetString("TitleBufferUnits", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Direction.
+ /// </summary>
+ internal static string TitleDirection {
+ get {
+ return ResourceManager.GetString("TitleDirection", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Error.
/// </summary>
internal static string TitleError {
@@ -3391,6 +3607,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to View Type.
+ /// </summary>
+ internal static string TitleViewType {
+ get {
+ return ResourceManager.GetString("TitleViewType", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Warning.
/// </summary>
internal static string TitleWarning {
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2012-09-10 12:58:29 UTC (rev 6994)
@@ -5713,4 +5713,79 @@
<data name="ErrNotAFolder" xml:space="preserve">
<value>Not a folder</value>
</data>
+ <data name="ErrorInvalidSymbolLibraryResourceId" xml:space="preserve">
+ <value>Not a valid symbol library resource identifier: {0}</value>
+ </data>
+ <data name="GeomFilterTemplate" xml:space="preserve">
+ <value><geometry property> {0} GeomFromText('<FGF geometry text>')</value>
+ </data>
+ <data name="CmsBingHybrid" xml:space="preserve">
+ <value>Bing Maps Hybrid</value>
+ </data>
+ <data name="CmsBingSatellite" xml:space="preserve">
+ <value>Bing Maps Satellite</value>
+ </data>
+ <data name="CmsBingStreet" xml:space="preserve">
+ <value>Bing Maps Street</value>
+ </data>
+ <data name="CmsGoogleHybrid" xml:space="preserve">
+ <value>Google Hybrid</value>
+ </data>
+ <data name="CmsGooglePhysical" xml:space="preserve">
+ <value>Google Physical</value>
+ </data>
+ <data name="CmsGoogleSatellite" xml:space="preserve">
+ <value>Google Satellite</value>
+ </data>
+ <data name="CmsGoogleStreets" xml:space="preserve">
+ <value>Google Streets</value>
+ </data>
+ <data name="CmsOsm" xml:space="preserve">
+ <value>Open Street Map</value>
+ </data>
+ <data name="CmsOsmCycle" xml:space="preserve">
+ <value>Open Street Map (CycleMap)</value>
+ </data>
+ <data name="CmsOsmTransport" xml:space="preserve">
+ <value>Open Street Map (TransportMap)</value>
+ </data>
+ <data name="CmsYahooHybrid" xml:space="preserve">
+ <value>Yahoo! Maps Hybrid</value>
+ </data>
+ <data name="CmsYahooSatellite" xml:space="preserve">
+ <value>Yahoo! Maps Satellite</value>
+ </data>
+ <data name="CmsYahooStreet" xml:space="preserve">
+ <value>Yahoo! Maps Street</value>
+ </data>
+ <data name="PromptDirection" xml:space="preserve">
+ <value>Specify Direction to traverse extent history</value>
+ </data>
+ <data name="PromptSelectBufferUnits" xml:space="preserve">
+ <value>Select Buffer Units</value>
+ </data>
+ <data name="PromptViewType" xml:space="preserve">
+ <value>Select zoom extents option</value>
+ </data>
+ <data name="TitleBufferUnits" xml:space="preserve">
+ <value>Buffer Units</value>
+ </data>
+ <data name="TitleDirection" xml:space="preserve">
+ <value>Direction</value>
+ </data>
+ <data name="TitleViewType" xml:space="preserve">
+ <value>View Type</value>
+ </data>
+ <data name="ErrorLayerDefnitionDoesNotSupportCompositeSymbolization" xml:space="preserve">
+ <value>This Layer Definition version does not support composite symbolization</value>
+ </data>
+ <data name="TextInlineCompoundSymbol" xml:space="preserve">
+ <value>Inline Compound Symbol</value>
+ </data>
+ <data name="TextInlineSimpleSymbol" xml:space="preserve">
+ <value>Inline Simple Symbol</value>
+ </data>
+ <data name="TextRenderPreviewNotAvailable" xml:space="preserve">
+ <value>Preview\nnot available</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs 2012-09-10 11:45:26 UTC (rev 6993)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs 2012-09-10 12:58:29 UTC (rev 6994)
@@ -21,6 +21,27 @@
namespace OSGeo.MapGuide.MaestroAPI
{
+ public class StringConstants
+ {
+ /// <summary>
+ /// The root resource identifier
+ /// </summary>
+ public const string RootIdentifier = "Library://"; //NOXLATE
+
+ /// <summary>
+ /// A thumbnail dwf resource role
+ /// </summary>
+ public const string Thumbnail = "Thumbnail"; //NOXLATE
+
+ public const string MgUsernamePlaceholder = "%MG_USERNAME%"; //NOXLATE
+
+ public const string MgPasswordPlaceholder = "%MG_PASSWORD%"; //NOXLATE
+
+ public const string MgDataFilePath = "%MG_DATA_FILE_PATH%"; //NOXLATE
+
+ public const string MgUserCredentialsResourceData = "MG_USER_CREDENTIALS"; //NOXLATE
+ }
+
/// <summary>
/// Represents the common resource types in MapGuide
/// </summary>
More information about the mapguide-commits
mailing list