Index: Core/Common/src/Core.Common.Controls.Swf/CollapsibleSplitter.cs
===================================================================
diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Common/src/Core.Common.Controls.Swf/CollapsibleSplitter.cs (.../CollapsibleSplitter.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093)
+++ Core/Common/src/Core.Common.Controls.Swf/CollapsibleSplitter.cs (.../CollapsibleSplitter.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -43,6 +43,7 @@
using System.Windows.Forms;
using System.Windows.Forms.Design;
using Core.Common.Controls.Swf.Properties;
+using Core.Common.Utils;
namespace Core.Common.Controls.Swf
{
@@ -140,7 +141,7 @@
/// The initial state of the Splitter. Set to True if the control to hide is not visible by default
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("False")]
[Description("The initial state of the Splitter. Set to True if the control to hide is not visible by default")]
public bool IsCollapsed
@@ -162,7 +163,7 @@
/// The System.Windows.Forms.Control that the splitter will collapse
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("")]
[Description("The System.Windows.Forms.Control that the splitter will collapse")]
public Control ControlToHide { get; set; }
@@ -171,7 +172,7 @@
/// Determines if the collapse and expanding actions will be animated
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("True")]
[Description("Determines if the collapse and expanding actions will be animated")]
public bool UseAnimations { get; set; }
@@ -180,7 +181,7 @@
/// The delay in millisenconds between animation steps
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("20")]
[Description("The delay in millisenconds between animation steps")]
public int AnimationDelay
@@ -199,7 +200,7 @@
/// The amount of pixels moved in each animation step
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("20")]
[Description("The amount of pixels moved in each animation step")]
public int AnimationStep
@@ -218,7 +219,7 @@
/// When true the entire parent form will be expanded and collapsed, otherwise just the contol to expand will be changed
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("False")]
[Description("When true the entire parent form will be expanded and collapsed, otherwise just the contol to expand will be changed")]
public bool ExpandParentForm { get; set; }
@@ -227,7 +228,7 @@
/// The visual style that will be painted on the control
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("VisualStyles.XP")]
[Description("The visual style that will be painted on the control")]
public VisualStyles VisualStyle
@@ -247,7 +248,7 @@
/// An optional border style to paint on the control. Set to Flat for no border
///
[Bindable(true)]
- [Category("Collapsing Options")]
+ [ResourcesCategory(typeof(Resources), "Categories_Collapsing_options")]
[DefaultValue("System.Windows.Forms.Border3DStyle.Flat")]
[Description("An optional border style to paint on the control. Set to Flat for no border")]
public Border3DStyle BorderStyle3D
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs
===================================================================
diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -98,6 +98,15 @@
}
///
+ /// Looks up a localized string similar to Samenklap opties.
+ ///
+ internal static string Categories_Collapsing_options {
+ get {
+ return ResourceManager.GetString("Categories_Collapsing_options", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Argument bevat geen bestandsnaam.
///
internal static string Chart_ExportAsImage_Argument_did_not_contain_a_filename {
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx
===================================================================
diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -459,4 +459,7 @@
AddPointTool: naar boven
+
+ Samenklap opties
+
\ No newline at end of file
Index: Core/Common/test/Core.Common.Tests/Gui/Forms/ProgressBarDialogTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Common/test/Core.Common.Tests/Gui/Forms/ProgressBarDialogTest.cs (.../ProgressBarDialogTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Tests/Gui/Forms/ProgressBarDialogTest.cs (.../ProgressBarDialogTest.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -8,28 +8,34 @@
[TestFixture]
public class ProgressBarDialogTest
{
- [Test]
- public void EmptyTaskDoesNotHang()
- {
- ProgressBarDialog.PerformTask("Doing stuff", () => { });
- }
+ ///
+ /// Defined as a field to ensure that the use of WeakReference in ModalHelper doesn't
+ /// make GC clean the instance up.
+ ///
+ private Form mainWindow = new Form();
- [Test]
- public void ShowProgress()
- {
- ProgressBarDialog.PerformTask("Doing stuff", () => Thread.Sleep(200));
- }
-
[TestFixtureSetUp]
public void FixtureSetUp()
{
- ModalHelper.MainWindow = new Form();
+ ModalHelper.MainWindow = mainWindow;
}
[TestFixtureTearDown]
public void FixtureTearDown()
{
ModalHelper.MainWindow = null;
}
+
+ [Test]
+ public void EmptyTaskDoesNotHang()
+ {
+ ProgressBarDialog.PerformTask("Doing stuff", () => { });
+ }
+
+ [Test]
+ public void ShowProgress()
+ {
+ ProgressBarDialog.PerformTask("Doing stuff", () => Thread.Sleep(200));
+ }
}
}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Tests/IO/FileUtilsTest.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Common/test/Core.Common.Utils.Tests/IO/FileUtilsTest.cs (.../FileUtilsTest.cs) (revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/test/Core.Common.Utils.Tests/IO/FileUtilsTest.cs (.../FileUtilsTest.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -106,17 +106,39 @@
}
[Test]
- public void MakeRelativeToOtherRelativePath()
+ public void GetRelativePath_UsingRelativeFolderPath_ReturnsFullFilePath()
{
- string filePath = "\\myfolder\\myfile.txt";
- string folderPath = "\\myfolder";
+ string filePath = "myfolder\\myfile.txt";
+ string folderPath = "otherfolder";
string result = FileUtils.GetRelativePath(folderPath, filePath);
+ Assert.AreEqual(filePath, result);
+ }
+
+ [Test]
+ public void GetRelativePath_UsingAbsoluteFolderPath_ReturnsRelativeFilePath()
+ {
+ string filePath = "C:\\myfolder\\myfile.txt";
+ string folderPath = "C:\\myfolder";
+
+ string result = FileUtils.GetRelativePath(folderPath, filePath);
+
Assert.AreEqual(".\\myfile.txt", result);
}
[Test]
+ public void GetRelativePath_UsingNetworkPathPath_ReturnsRelativeFilePath()
+ {
+ string filePath = "\\\\myfolder\\myfile.txt";
+ string folderPath = "\\\\myfolder";
+
+ string result = FileUtils.GetRelativePath(folderPath, filePath);
+
+ Assert.AreEqual(".\\myfile.txt", result);
+ }
+
+ [Test]
public void CompareDirectories()
{
Assert.IsTrue(FileUtils.CompareDirectories(@"./data/myfile.myext", @"data\myfile.myext"));
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerLineProperties.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerLineProperties.cs (.../VectorLayerLineProperties.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerLineProperties.cs (.../VectorLayerLineProperties.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -42,7 +42,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Map coordinate system")]
[Description("Coordinate system (geographic or projected) on which the map is represented.")]
public string MapCoordinateSystem
@@ -53,7 +53,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Layer contents coordinate system")]
[Description("Coordinate system (geographic or projected) in which the objects contained in the selected layer are declared.")]
public string LayerCoordinateSystem
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPointProperties.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPointProperties.cs (.../VectorLayerPointProperties.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPointProperties.cs (.../VectorLayerPointProperties.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -42,7 +42,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Map coordinate system")]
[Description("Coordinate system (geographic or projected) on which the map is represented.")]
public string MapCoordinateSystem
@@ -53,7 +53,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Layer contents coordinate system")]
[Description("Coordinate system (geographic or projected) in which the objects contained in the selected layer are declared.")]
public string LayerCoordinateSystem
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs
===================================================================
diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs (.../VectorLayerPolygonProperties.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs (.../VectorLayerPolygonProperties.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -47,8 +47,8 @@
data.Opacity = (float) Math.Min(1.0, Math.Max(0.0, value));
}
}
-
- [Category("Coordinates")]
+
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Coordinate system")]
[Description("Coordinate system (geographic or projected) used for drawing.")]
[TypeConverter(typeof(CoordinateSystemStringTypeConverter))]
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerProperties.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerProperties.cs (.../VectorLayerProperties.cs) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerProperties.cs (.../VectorLayerProperties.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -164,7 +164,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Map coordinate system")]
[Description("Coordinate system (geographic or projected) on which the map is represented.")]
public ICoordinateTransformation MapCoordinateSystem
@@ -179,7 +179,7 @@
}
}
- [Category("Coordinates")]
+ [ResourcesCategory(typeof(Resources), "Categories_Coordinates")]
[DisplayName("Layer contents coordinate system")]
[Description("Coordinate system (geographic or projected) in which the objects contained in the selected layer are declared.")]
public ICoordinateSystem LayerCoordinateSystem
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -2382,6 +2382,15 @@
}
///
+ /// Looks up a localized string similar to .
+ ///
+ public static string String1 {
+ get {
+ return ResourceManager.GetString("String1", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap table {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx
===================================================================
diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -rc752f20ed694c8f5917c8c281bfe64519f03405a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx (.../Resources.resx) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx (.../Resources.resx) (revision c752f20ed694c8f5917c8c281bfe64519f03405a)
@@ -1036,4 +1036,7 @@
Weergave openen...
+
+
+
\ No newline at end of file