Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.Designer.cs
===================================================================
diff -u -r0428f14663024267ad596c102f96e518d0576196 -r516f5c56f48bee70f78ca969a5658d89b9dd8dce
--- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.Designer.cs (.../SelectItemDialog.Designer.cs) (revision 0428f14663024267ad596c102f96e518d0576196)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.Designer.cs (.../SelectItemDialog.Designer.cs) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce)
@@ -77,10 +77,6 @@
// listViewItemTypes
//
resources.ApplyResources(this.listViewItemTypes, "listViewItemTypes");
- this.listViewItemTypes.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
- ((System.Windows.Forms.ListViewGroup)(resources.GetObject("listViewItemTypes.Groups"))),
- ((System.Windows.Forms.ListViewGroup)(resources.GetObject("listViewItemTypes.Groups1"))),
- ((System.Windows.Forms.ListViewGroup)(resources.GetObject("listViewItemTypes.Groups2")))});
this.listViewItemTypes.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.listViewItemTypes.HideSelection = false;
this.listViewItemTypes.LargeImageList = this.imageList;
@@ -95,11 +91,9 @@
//
// imageList
//
- this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream")));
+ this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+ resources.ApplyResources(this.imageList, "imageList");
this.imageList.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList.Images.SetKeyName(0, "table.png");
- this.imageList.Images.SetKeyName(1, "chart_curve.png");
- this.imageList.Images.SetKeyName(2, "map.png");
//
// SelectItemDialog
//
Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs
===================================================================
diff -u -rcf5500705e6163f283ab151a0a489bbfe60d2f7e -r516f5c56f48bee70f78ca969a5658d89b9dd8dce
--- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs (.../SelectItemDialog.cs) (revision cf5500705e6163f283ab151a0a489bbfe60d2f7e)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs (.../SelectItemDialog.cs) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce)
@@ -47,9 +47,6 @@
this.text = text;
- imageList.Images.Clear();
- listViewItemTypes.Clear();
- listViewItemTypes.Groups.Clear();
listViewItemTypes.HandleCreated += ListViewItemTypesOnHandleCreated;
// http://blogs.msdn.com/b/oldnewthing/archive/2005/05/03/414317.aspx
@@ -145,7 +142,10 @@
{
if (SelectedItem == null)
{
- MessageBox.Show(Resources.SelectItemDialog_buttonOk_Click_Please_select_an_item, Resources.SelectItemDialog_buttonOk_Click_Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show(Resources.SelectItemDialog_buttonOk_Click_Please_select_an_item,
+ Resources.SelectItemDialog_buttonOk_Click_Error,
+ MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
DialogResult = DialogResult.None;
}
}
Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.resx
===================================================================
diff -u -rcf5500705e6163f283ab151a0a489bbfe60d2f7e -r516f5c56f48bee70f78ca969a5658d89b9dd8dce
--- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.resx (.../SelectItemDialog.resx) (revision cf5500705e6163f283ab151a0a489bbfe60d2f7e)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.resx (.../SelectItemDialog.resx) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce)
@@ -177,214 +177,11 @@
Top, Bottom, Left, Right
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwCwAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
- ZwROYW1lCkl0ZW1zQ291bnQFSXRlbTAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUBBAIBAAQE
- BAQEBChTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAghU3lzdGVtLldp
- bmRvd3MuRm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0
- ZW0CAAAAIVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAAhU3lzdGVtLldpbmRvd3Mu
- Rm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0CAAAA
- IVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAACAAAABgMAAAAHSGFiaXRhdAX8////
- KFN5c3RlbS5XaW5kb3dzLkZvcm1zLkhvcml6b250YWxBbGlnbm1lbnQBAAAAB3ZhbHVlX18ACAIAAAAA
- AAAACgYFAAAADmxpc3RWaWV3R3JvdXAxBgAAAAkGAAAACQcAAAAJCAAAAAkJAAAACQoAAAAJCwAAAAwM
- AAAAUVN5c3RlbS5EcmF3aW5nLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGlj
- S2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQUGAAAAIVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3
- SXRlbQgAAAAEVGV4dApJbWFnZUluZGV4CUJhY2tDb2xvcgdDaGVja2VkBEZvbnQJRm9yZUNvbG9yF1Vz
- ZUl0ZW1TdHlsZUZvclN1Ykl0ZW1zBUdyb3VwAQAEAAQEAAQIFFN5c3RlbS5EcmF3aW5nLkNvbG9yDAAA
- AAETU3lzdGVtLkRyYXdpbmcuRm9udAwAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IMAAAAASJTeXN0ZW0u
- V2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwAgAAAAIAAAAGDQAAAB9HcmlkIFNwYXRpYWwgRGF0YSAo
- MkQsIHJlZ3VsYXIp/////wXy////FFN5c3RlbS5EcmF3aW5nLkNvbG9yBAAAAARuYW1lBXZhbHVlCmtu
- b3duQ29sb3IFc3RhdGUBAAAACQcHDAAAAAoAAAAAAAAAABgAAQAACQ8AAAAB8P////L///8KAAAAAAAA
- AAAaAAEAAQkBAAAAAQcAAAAGAAAABhIAAAAfR3JpZCBTcGF0aWFsIERhdGEgKDJELCByZWd1bGFyKf//
- //8B7f////L///8KAAAAAAAAAAAYAAEAAAkUAAAAAev////y////CgAAAAAAAAAAGgABAAEJAQAAAAEI
- AAAABgAAAAYXAAAAH0dyaWQgU3BhdGlhbCBEYXRhICgyRCwgcmVndWxhcin/////Aej////y////CgAA
- AAAAAAAAGAABAAAJGQAAAAHm////8v///woAAAAAAAAAABoAAQABCQEAAAABCQAAAAYAAAAGHAAAAB9H
- cmlkIFNwYXRpYWwgRGF0YSAoMkQsIHJlZ3VsYXIp/////wHj////8v///woAAAAAAAAAABgAAQAACR4A
- AAAB4f////L///8KAAAAAAAAAAAaAAEAAQkBAAAAAQoAAAAGAAAABiEAAAAfR3JpZCBTcGF0aWFsIERh
- dGEgKDJELCByZWd1bGFyKf////8B3v////L///8KAAAAAAAAAAAYAAEAAAkjAAAAAdz////y////CgAA
- AAAAAAAAGgABAAEJAQAAAAELAAAABgAAAAYmAAAAH0dyaWQgU3BhdGlhbCBEYXRhICgyRCwgcmVndWxh
- cin/////Adn////y////CgAAAAAAAAAAGAABAAAJKAAAAAHX////8v///woAAAAAAAAAABoAAQABCQEA
- AAAFDwAAABNTeXN0ZW0uRHJhd2luZy5Gb250BAAAAAROYW1lBFNpemUFU3R5bGUEVW5pdAEABAQLGFN5
- c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQwAAAAbU3lzdGVtLkRyYXdpbmcuR3JhcGhpY3NVbml0DAAAAAwA
- AAAGKwAAABRNaWNyb3NvZnQgU2FucyBTZXJpZgAABEEF1P///xhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
- bGUBAAAAB3ZhbHVlX18ACAwAAAAAAAAABdP///8bU3lzdGVtLkRyYXdpbmcuR3JhcGhpY3NVbml0AQAA
- AAd2YWx1ZV9fAAgMAAAAAwAAAAEUAAAADwAAAAYuAAAAFE1pY3Jvc29mdCBTYW5zIFNlcmlmAAAEQQHR
- ////1P///wAAAAAB0P///9P///8DAAAAARkAAAAPAAAABjEAAAAUTWljcm9zb2Z0IFNhbnMgU2VyaWYA
- AARBAc7////U////AAAAAAHN////0////wMAAAABHgAAAA8AAAAGNAAAABRNaWNyb3NvZnQgU2FucyBT
- ZXJpZgAABEEBy////9T///8AAAAAAcr////T////AwAAAAEjAAAADwAAAAY3AAAAFE1pY3Jvc29mdCBT
- YW5zIFNlcmlmAAAEQQHI////1P///wAAAAABx////9P///8DAAAAASgAAAAPAAAABjoAAAAUTWljcm9z
- b2Z0IFNhbnMgU2VyaWYAAARBAcX////U////AAAAAAHE////0////wMAAAAL
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwCwAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
- ZwROYW1lCkl0ZW1zQ291bnQFSXRlbTAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUBBAIBAAQE
- BAQEBChTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAghU3lzdGVtLldp
- bmRvd3MuRm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0
- ZW0CAAAAIVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAAhU3lzdGVtLldpbmRvd3Mu
- Rm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0CAAAA
- IVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAACAAAABgMAAAAFU29iZWsF/P///yhT
- eXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AQAAAAd2YWx1ZV9fAAgCAAAAAAAA
- AAoGBQAAAA5saXN0Vmlld0dyb3VwMwYAAAAJBgAAAAkHAAAACQgAAAAJCQAAAAkKAAAACQsAAAAMDAAA
- AFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tl
- eVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFBgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0
- ZW0IAAAABFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJ
- dGVtU3R5bGVGb3JTdWJJdGVtcwVHcm91cAEABAAEBAAECBRTeXN0ZW0uRHJhd2luZy5Db2xvcgwAAAAB
- E1N5c3RlbS5EcmF3aW5nLkZvbnQMAAAAFFN5c3RlbS5EcmF3aW5nLkNvbG9yDAAAAAEiU3lzdGVtLldp
- bmRvd3MuRm9ybXMuTGlzdFZpZXdHcm91cAIAAAACAAAABg0AAAARR3JpZCAxRCAoTmV0d29yayn/////
- BfL///8UU3lzdGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEA
- AAAJBwcMAAAACgAAAAAAAAAAGAABAAAJDwAAAAHw////8v///woAAAAAAAAAABoAAQABCQEAAAABBwAA
- AAYAAAAGEgAAABFHcmlkIDFEIChOZXR3b3JrKf////8B7f////L///8KAAAAAAAAAAAYAAEAAAkUAAAA
- Aev////y////CgAAAAAAAAAAGgABAAEJAQAAAAEIAAAABgAAAAYXAAAAEUdyaWQgMUQgKE5ldHdvcmsp
- /////wHo////8v///woAAAAAAAAAABgAAQAACRkAAAAB5v////L///8KAAAAAAAAAAAaAAEAAQkBAAAA
- AQkAAAAGAAAABhwAAAARR3JpZCAxRCAoTmV0d29yayn/////AeP////y////CgAAAAAAAAAAGAABAAAJ
- HgAAAAHh////8v///woAAAAAAAAAABoAAQABCQEAAAABCgAAAAYAAAAGIQAAABFHcmlkIDFEIChOZXR3
- b3JrKf////8B3v////L///8KAAAAAAAAAAAYAAEAAAkjAAAAAdz////y////CgAAAAAAAAAAGgABAAEJ
- AQAAAAELAAAABgAAAAYmAAAAEUdyaWQgMUQgKE5ldHdvcmsp/////wHZ////8v///woAAAAAAAAAABgA
- AQAACSgAAAAB1/////L///8KAAAAAAAAAAAaAAEAAQkBAAAABQ8AAAATU3lzdGVtLkRyYXdpbmcuRm9u
- dAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5bGUMAAAA
- G1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAwAAAAMAAAABisAAAAUTWljcm9zb2Z0IFNhbnMgU2Vy
- aWYAAARBBdT///8YU3lzdGVtLkRyYXdpbmcuRm9udFN0eWxlAQAAAAd2YWx1ZV9fAAgMAAAAAAAAAAXT
- ////G1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAEAAAAHdmFsdWVfXwAIDAAAAAMAAAABFAAAAA8A
- AAAGLgAAABRNaWNyb3NvZnQgU2FucyBTZXJpZgAABEEB0f///9T///8AAAAAAdD////T////AwAAAAEZ
- AAAADwAAAAYxAAAAFE1pY3Jvc29mdCBTYW5zIFNlcmlmAAAEQQHO////1P///wAAAAABzf///9P///8D
- AAAAAR4AAAAPAAAABjQAAAAUTWljcm9zb2Z0IFNhbnMgU2VyaWYAAARBAcv////U////AAAAAAHK////
- 0////wMAAAABIwAAAA8AAAAGNwAAABRNaWNyb3NvZnQgU2FucyBTZXJpZgAABEEByP///9T///8AAAAA
- Acf////T////AwAAAAEoAAAADwAAAAY6AAAAFE1pY3Jvc29mdCBTYW5zIFNlcmlmAAAEQQHF////1P//
- /wAAAAABxP///9P///8DAAAACw==
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwCwAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
- ZwROYW1lCkl0ZW1zQ291bnQFSXRlbTAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUBBAIBAAQE
- BAQEBChTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAghU3lzdGVtLldp
- bmRvd3MuRm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0
- ZW0CAAAAIVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAAhU3lzdGVtLldpbmRvd3Mu
- Rm9ybXMuTGlzdFZpZXdJdGVtAgAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0CAAAA
- IVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3SXRlbQIAAAACAAAABgMAAAAHRGVsZnQzRAX8////
- KFN5c3RlbS5XaW5kb3dzLkZvcm1zLkhvcml6b250YWxBbGlnbm1lbnQBAAAAB3ZhbHVlX18ACAIAAAAA
- AAAACgYFAAAADmxpc3RWaWV3R3JvdXAyBgAAAAkGAAAACQcAAAAJCAAAAAkJAAAACQoAAAAJCwAAAAwM
- AAAAUVN5c3RlbS5EcmF3aW5nLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGlj
- S2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQUGAAAAIVN5c3RlbS5XaW5kb3dzLkZvcm1zLkxpc3RWaWV3
- SXRlbQgAAAAEVGV4dApJbWFnZUluZGV4CUJhY2tDb2xvcgdDaGVja2VkBEZvbnQJRm9yZUNvbG9yF1Vz
- ZUl0ZW1TdHlsZUZvclN1Ykl0ZW1zBUdyb3VwAQAEAAQEAAQIFFN5c3RlbS5EcmF3aW5nLkNvbG9yDAAA
- AAETU3lzdGVtLkRyYXdpbmcuRm9udAwAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IMAAAAASJTeXN0ZW0u
- V2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwAgAAAAIAAAAGDQAAABZHcmlkIDNEIChVbnN0cnVjdHVy
- ZWQp/////wXy////FFN5c3RlbS5EcmF3aW5nLkNvbG9yBAAAAARuYW1lBXZhbHVlCmtub3duQ29sb3IF
- c3RhdGUBAAAACQcHDAAAAAoAAAAAAAAAABgAAQAACQ8AAAAB8P////L///8KAAAAAAAAAAAaAAEAAQkB
- AAAAAQcAAAAGAAAABhIAAAAWR3JpZCAzRCAoVW5zdHJ1Y3R1cmVkKf////8B7f////L///8KAAAAAAAA
- AAAYAAEAAAkUAAAAAev////y////CgAAAAAAAAAAGgABAAEJAQAAAAEIAAAABgAAAAYXAAAAFkdyaWQg
- M0QgKFVuc3RydWN0dXJlZCn/////Aej////y////CgAAAAAAAAAAGAABAAAJGQAAAAHm////8v///woA
- AAAAAAAAABoAAQABCQEAAAABCQAAAAYAAAAGHAAAABZHcmlkIDNEIChVbnN0cnVjdHVyZWQp/////wHj
- ////8v///woAAAAAAAAAABgAAQAACR4AAAAB4f////L///8KAAAAAAAAAAAaAAEAAQkBAAAAAQoAAAAG
- AAAABiEAAAAWR3JpZCAzRCAoVW5zdHJ1Y3R1cmVkKf////8B3v////L///8KAAAAAAAAAAAYAAEAAAkj
- AAAAAdz////y////CgAAAAAAAAAAGgABAAEJAQAAAAELAAAABgAAAAYmAAAAFkdyaWQgM0QgKFVuc3Ry
- dWN0dXJlZCn/////Adn////y////CgAAAAAAAAAAGAABAAAJKAAAAAHX////8v///woAAAAAAAAAABoA
- AQABCQEAAAAFDwAAABNTeXN0ZW0uRHJhd2luZy5Gb250BAAAAAROYW1lBFNpemUFU3R5bGUEVW5pdAEA
- BAQLGFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQwAAAAbU3lzdGVtLkRyYXdpbmcuR3JhcGhpY3NVbml0
- DAAAAAwAAAAGKwAAABRNaWNyb3NvZnQgU2FucyBTZXJpZgAABEEF1P///xhTeXN0ZW0uRHJhd2luZy5G
- b250U3R5bGUBAAAAB3ZhbHVlX18ACAwAAAAAAAAABdP///8bU3lzdGVtLkRyYXdpbmcuR3JhcGhpY3NV
- bml0AQAAAAd2YWx1ZV9fAAgMAAAAAwAAAAEUAAAADwAAAAYuAAAAFE1pY3Jvc29mdCBTYW5zIFNlcmlm
- AAAEQQHR////1P///wAAAAAB0P///9P///8DAAAAARkAAAAPAAAABjEAAAAUTWljcm9zb2Z0IFNhbnMg
- U2VyaWYAAARBAc7////U////AAAAAAHN////0////wMAAAABHgAAAA8AAAAGNAAAABRNaWNyb3NvZnQg
- U2FucyBTZXJpZgAABEEBy////9T///8AAAAAAcr////T////AwAAAAEjAAAADwAAAAY3AAAAFE1pY3Jv
- c29mdCBTYW5zIFNlcmlmAAAEQQHI////1P///wAAAAABx////9P///8DAAAAASgAAAAPAAAABjoAAAAU
- TWljcm9zb2Z0IFNhbnMgU2VyaWYAAARBAcX////U////AAAAAAHE////0////wMAAAAL
-
-
17, 17
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
- EQAAAk1TRnQBSQFMAgEBAwEAAXwBAAF8AQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEJIAAVcCVQG3AVMBXgFVAf8BVwFjAVgB/wFYAWMBWAH/AVgBYwFZAf8BWAFj
- AVkB/wFYAWMBWgH/AVgBYwFaAf8BWAFjAVoB/wFYAWMBWgH/AVgBYwFaAf8BWAFjAVsB/wFYAWMBWwH/
- AVgBZAFbAf8BVQFgAVcB/wFXAlUBt0QAAVsCWQHEAXYBZQFSAfQB0QGWAV0B/wHOAZIBWAH/AcsBjgFT
- Af8ByQGKAVAB/wHHAYcBSwH/AcMBhAFHAf8BwwGEAUcB/wHDAYQBRwH/AcMBhAFHAf8BwwGEAUcB/wHD
- AYQBRwH/AVUCUwGwCAABtAFeASAB/wGzAV0BIAH/AbIBXQEfAf8BsQFdAR8B/wGwAVsBHwH/Aa8BWwEf
- Af8BrwFbAR4B/wGuAVoBHgH/Aa4BWgEdAf8BrQFZAR0B/wGtAVkBHQH/AawBWQEdAf8BqwFYAR0B/wGr
- AVgBHQH/BAABUwFeAVQB/wHrAfUB7AH/AdQB7QHXAf8B1AHuAdcB/wHUAe4B2AH/AdUB7gHYAf8B1QHu
- AdkB/wHVAe4B2QH/AdYB7wHaAf8B1gHvAdoB/wHUAeIB7AH/Ac8B5QHWAf8B1QHtAdkB/wHYAe8B3AH/
- AdUB7QHZAf8BVQFgAVcB/0QAAdcBoQFqAf8B+AHyAe0B/wH3AfAB6gH/AfYB7QHmAf8B9AHqAeIB/wHz
- AecB3gH/AfEB5AHbAf8B8AHiAdgB/wHwAeIB2AH/AfAB4gHYAf8B8AHiAdgB/wHwAeIB2AH/AfAB4gHY
- Af8BsAGEAUcB/QgAAbYBXwEiAf8DMQFPAy0BRgMtAUUDBwEJBAADFQEdCAADFQEdBAADEwEaAT0CPAFo
- AwkBDAQAAVYBYgFYAf8B7gH4Ae8B/wGkAdsBvAH/AYwBygGmAf8BmAHVAbEB/wGGAckBoQH/AWgBrQHA
- Af8BSgGHAcYB/wGDAcIBtgH/AWsBrAGvAf8BXQFkAesB/wGBAcUBowH/AYwB0AGmAf8BhQHKAaAB/wHS
- AekB1wH/AVgBYwFbAf9EAAHZAaQBbwH/AfkB8wHuAf8B6wHSAb4F/wHrAdMBvw3/AeoBxwGtDf8B8AHi
- AdgB/wHGAYwBVAH/CAABtwFgASIB/wMSARkDTgGZA10B4gFbAV0BVwHtAT0CPAFoEAADBgEIA1oB3gNM
- AZMIAAFVAWIBWAH/AewB9wHuAf8BlgHbAa8B/wGBAckBmgH/AY8B2AGqAf8BbgHIAZcB/wGKAdYBqQH/
- AVMBogGsAf8BSQGIAdcB/wE8AVEB4AH/AW0BqAHJAf8BgQHJAZkB/wGHAdABoAH/AYEBygGaAf8B1gHu
- AdoB/wFYAWMBWgH/RAAB3QGoAYEB/wH5AfMB7wH/AesB0AG6Af8B6wHQAbsB/wHrAdABuwH/AesB0AG7
- Af8B6wHQAbsB/wHrAdEBvQH/AeoBzQG1Af8B6gHNAbUB/wHqAc0BtQH/AeoBzQG1Af8B8AHiAdgB/wHG
- AYoBUQH/CAABuQFiASMB/wMqAUAIAAFOAk0BlgFTAWIBUwHxA1EBogMJAQwIAAFJAkgBiAFYAWIBVAHv
- DAABVQFiAVcB/wH3AfsB+AH/AZsB3gHEAf8BZwHDAZMB/wGBAc8BnwH/AWMBwQGPAf8BgQHOAZ0B/wFi
- Ab8BjAH/AWQBpAG7Af8BPAFMAdoB/wFAAXAB0QH/AUUBjQG2Af8BZwG+AZ0B/wFoAcMBjwH/AdcB7wHa
- Af8BWAFjAVoB/0QAAd8BqgGCAf8B+QHzAe8B/wHqAc4BtwX/AesB0AG7Df8B6gHPAboB/wH7AfYB8gn/
- AfAB4gHYAf8ByAGNAVQB/wgAAbsBYwEkAf8DNAFUAxEBFwgAAy8BSgFXAV8BVwHoA18B4AFVAlMBrQFZ
- AlYBvgFSAWUBUAH0AzkBXwQAAxMBGgQAAVUBYgFXAf8B+AH8AfkB/wG8AvsB/wGdAecB3wH/AZMB4QG7
- Af8BawHJAZcB/wGJAdoBqQH/AWkBxgGYAf8BZQFwAfMB/wFfAa4BrQH/AYIB4QHdAf8BTAGnAeEB/wFK
- AYwB5gH/AVUBnwG9Af8B0AHpAdsB/wFYAWMBWgH/RAAB4QGuAYcB/wH6AfQB8AH/AeoBywGyAf8B6gHM
- AbMB/wHqAcwBswH/AeoBzAGzAf8B6gHMAbMB/wHqAc4BtwH/AegBxwGsAf8B6AHHAawB/wHoAcgBsAH/
- AegByAGuAf8B8AHiAdgB/wHEAYYBSQH/CAABvQFkASUB/wMxAU8CXAFhAdwMAANDAXcBTwJOAZcDWQHM
- A1oBzQM1AVcIAAFUAlMBsAQAAVQBYQFXAf8B+AH8AfgB/wGkAesB7QH/AY0C3wH/AZcC6wH/AWYBzwG3
- Af8BaAHKAZkB/wFKAYMBsAH/AVQBbAHXAf8BRQHDAbYB/wGQAdUBzQH/AUQCxgH/AYEB0AHdAf8BWAGZ
- AdsB/wHKAeQB3AH/AVgBYwFaAf9EAAHjAbEBjAH/AfoB9gHxAf8B6gHJAa4F/wHqAckBsA3/AegBxwGs
- Df8B8QHlAdsB/wHGAYYBSgH/CAABvgFmASUB/wMgAS8BGQESAdUB/gNIAYYDSAGEAeABTAEAAf8BtwFD
- ARcB/QG7AVgBCAH+AzUBVxAAAS0BKQGgAfoEAAFUAWEBVgH/AfgB/AH4Af8BrwL6Af8BlALrAf8BogH5
- AfoB/wGKAeoB6wH/AZUB7QHzAf8BTQFTAesB/wGHAdkB5gH/AVAB0gHRAf8B3AHbAckB/wGsAdQBzQH/
- AZcB2gHUAf8BawHRAc4B/wHUAe8B2wH/AVgBYwFZAf9EAAHlAbQBjwH/AfoB9gHyAf8B6QHGAaoB/wHp
- AcYBrAH/AeoBxwGsAf8B6QHHAa0B/wHpAckBrgH/AekByQGwAf8B6AHHAawB/wHpAckBsAH/AegByAGw
- Af8B6AHMAbUB/wHyAecB3gH/AcgBigFOAf8IAAHAAWcBJwH/BAABUQJPAaUBJAEhAaMB+wGEAVEBSAH3
- A0wBkgMCAQMBVwJWAbgBkQFcATsB+AFGAkUBfggAA1gBwAJOAWgB8AQAAVQBYQFVAf8B+AH8AfgB/wGf
- AvEB/wGBAd0B3wH/AYoB6gHrAf8BaQLeAf8BWQGRAe4B/wFJAYEB4gH/AVwB3AHdAf8BawG/AbcB/wHl
- AcgBsgH/AdoBugGjAf8B3gG8AaYB/wHZAbcBnwH/AdYB7QHYAf8BWAFjAVgB/0QAAecBtwGUAf8B+wH3
- AfQB/wHpAcMBpgX/AegBxAGpDf8B6AHHAawN/wH3AfEB6wH/AcsBjwFUAf8IAAHCAWgBJwH/CAABQQEv
- AcMB/gFHAUEBjQH5DAABUwJSAagBnAFfASIB+wFRAlABnwMaASUBKwEoAfYB/wFPAk4BlwQAAVMBYQFV
- Af8B+AH8AfgB/wGmAvkB/wGLAekB6gH/AZkB+AH6Af8BbAHTAesB/wFZAV8C/wFrAdwB6gH/AWQB3wHe
- Af8BwQHFAbUB/wHxAdEBugH/AeUBwQGpAf8B6gHHAa4B/wHkAb0BoQH/AdYB7QHXAf8BVwFjAVgB/0QA
- AekBugGYAf8B+wH3AfQB/wHpAcMBpgH/AekBwwGmAf8B6QHDAaYB/wHpAcMBpgH/AekBwwGmAf8B6QHD
- AaYB/wHpAcMBpgH/AekBwwGmAf8B6QHDAaYB/wHpAcMBpgH/AfsB9wH0Af8BzgGTAVkB/wgAAcMBaAEo
- Af8DFQEdA0oBigGBAk0B+gFRAUQBigH3AU4CTQGVDAADSgGNAbcBXwFAAf0BnQFfATIB+wGQAWoBQQH5
- AboBfwFCAf4EAAFTAWEBVQH/AfgB/AH4Af8BkALqAf8BbAHdAd4B/wGBAekB6gH/AUIBXwHiAf8BVwGd
- Ae4B/wFSAtcB/wFPAcsByQH/AdQBsAGXAf8B4gG6AZ8B/wHWAawBjwH/AdsBsAGRAf8B1AGnAYYB/wHW
- Ae0B1wH/AVcBYgFYAf9EAAHrAb0BmwH/AfsB9wH0Kf8B+wH3AfQB/wHRAZcBXwH/CAABxAFpASkB/wMC
- AQMBkAFqAUEB+QNWAbYBSQJIAYcBRwFCAcwB/gMoATwIAAMYASIBVwFTAW8B8QFJAUgBeQH2AUcCRgGA
- CAABUwFhAVUB/wH3AfwB+AH/AZ8C+QH/AYUB6QHqAf8BhAHTAfoB/wFGAU4B8AH/AYcB8gH3Af8BVAHa
- AdcB/wGYAdUBygH/AeABtwGcAf8B7QHHAakB/wHgAbMBlAH/AeYBuAGYAf8B3gGuAYwB/wHXAewB1gH/
- AVcBYgFYAf9EAAHsAb8BngH/AfsB9wH0Af8BnAHVAaUB/wGYAdMBoQH/AZQB0AGdAf8BkAHOAZgB/wGL
- AcsBkwH/AYcByQGOAf8BggHGAYkB/wGBAcMBhAH/AW8BwQGBAf8BawG+AYAB/wH7AfcB9AH/AdQBmwFk
- Af8IAAHFAWoBKQH/AyMBMwG3AYMBQAH9AwcBCQQAAVsCWQHDAk0BngH6AV0CWgHKAV4BWAFeAd0BVwFN
- AZ4B+wJdAWEB4gMYASIMAAFTAWEBVAH/AfcB/AH4Af8BigLqAf8BZgHdAd4B/wFKAVkB8AH/AUoBnwHf
- Af8BZwLoAf8BOgLBAf8CuwGlAf8B0AGkAYMB/wHeAbABjgH/AdEBngFuAf8B1gGiAW4B/wHPAZgBZQH/
- AdcB6wHVAf8BVgFiAVgB/0QAAWkCYAHrAfsB9wH0Af8B+wH3AfQB/wH7AfcB9AH/AfsB9wH0Af8B+wH3
- AfQB/wH7AfcB9AH/AfsB9wH0Af8B+wH3AfQB/wH7AfcB9AH/AfsB9wH0Af8B+wH3AfQB/wH7AfcB9AH/
- AY4BcgFcAfgIAAHGAWsBKQH/AzwBZgFSAlEBpwwAA0oBigNfAeADWgHTAzgBXhQAAVMBYQFUAf8B9wH8
- AfgB/wGdAvkB/wFgAbQB7QH/AVYBZQH+Af8BgQHnAekB/wGMAvQB/wFGAs0B/wHsAcIBpAH/Ad0BrQGK
- Af8B6wG6AZcB/wHdAacBgQH/AeIBqwGDAf8B2gGgAWkB/wHZAeoB1AH/AVUBYgFYAf9EAAFGAkUBfgJf
- AVgB4wHtAcABnwH/AesBvgGdAf8B6wG8AZoB/wHpAboBlgH/AecBtwGTAf8B5gG1AZAB/wHkAbIBjAH/
- AeIBrwGIAf8B4AGsAYQB/wHdAakBgQH/AdwBpQGBAf8BXQJaAcoIAAHGAWsBKQH/AzQBVDQAAVABXgFR
- Af8B+wH8AfsB/wH8Af4B/AH/AfcB/AH4Af8B9wH8AfgB/wH3AfwB+AH/AfgB/AH4Af8B9wH8AfkB/wH4
- AfwB+AH/AfgB/AH4Af8B7AH3Ae4B/wHtAfcB7gH/Ae8B9gHtAf8B7gH0AewB/wHrAfQB6wH/AVIBXgFT
- Af/AAANXAb0BUAFeAVEB/wFTAWEBVAH/AVMBYQFUAf8BUwFhAVQB/wFTAWEBVAH/AVMBYQFVAf8BUwFh
- AVUB/wFTAWEBVQH/AVMBYQFVAf8BVAFhAVUB/wFUAWEBVgH/AVQBYQFWAf8BVAFhAVcB/wFSAV4BUwH/
- AVkCVwG9QAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAGAAQEBgAEB
- BAABgAEBAYIB0QQAAYABAQGBAeMEAAGAAQEBmAFnBAABgAEBAYwBBQQAAYABAQGOAQ0EAAGAAQEBgAE9
- BAABgAEBAaABGQQAAYABAQGzAYEEAAGAAQEBgQHBBAABgAEBAYABwwQAAYABAQGEAQcEAAGAAQEBjgEf
- BAABgAEBAZ8B/wQABP8EAAs=
-
+
+ 16, 16
12, 12
@@ -429,6 +226,6 @@
SelectItemDialog
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ Core.Common.Controls.Dialogs.DialogBase, Core.Common.Controls, Version=16.2.1.5472, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs
===================================================================
diff -u -rcf5500705e6163f283ab151a0a489bbfe60d2f7e -r516f5c56f48bee70f78ca969a5658d89b9dd8dce
--- Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision cf5500705e6163f283ab151a0a489bbfe60d2f7e)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce)
@@ -23,13 +23,15 @@
using System.Windows.Forms;
using Core.Common.Controls.Dialogs;
using Core.Common.Gui.Forms;
+using Core.Common.Gui.Test.Properties;
+using NUnit.Extensions.Forms;
using NUnit.Framework;
using Rhino.Mocks;
namespace Core.Common.Gui.Test.Forms
{
[TestFixture]
- public class SelectItemDialogTest
+ public class SelectItemDialogTest : NUnitFormTest
{
[Test]
public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
@@ -61,5 +63,105 @@
mocks.VerifyAll();
}
+
+ [Test]
+ public void Constructor_Always_SetMinimumSize()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var parent = mocks.StrictMock();
+ mocks.ReplayAll();
+
+ using (var dialog = new SelectItemDialog(parent, "Dialog text"))
+ {
+ // Call
+ dialog.Show();
+
+ // Assert
+ Assert.AreEqual(320, dialog.MinimumSize.Width);
+ Assert.AreEqual(220, dialog.MinimumSize.Height);
+ }
+ }
+
+ [Test]
+ public void OnLoad_Text_SetsText()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var parent = mocks.StrictMock();
+ mocks.ReplayAll();
+ var text = "Dialog text";
+
+ using (var dialog = new SelectItemDialog(parent, text))
+ {
+ // Call
+ dialog.Show();
+
+ // Assert
+ Assert.AreEqual(text, dialog.Text);
+ }
+
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void ButtonOkClick_NoItemSelected_ShowDialogWithText()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var parent = mocks.StrictMock();
+ mocks.ReplayAll();
+
+ string messageText = null;
+ DialogBoxHandler = (name, wnd) =>
+ {
+ var messageBox = new MessageBoxTester(wnd);
+ messageText = messageBox.Text;
+ messageBox.ClickOk();
+ };
+
+ using (var dialog = new SelectItemDialog(parent, "Dialog text"))
+ {
+ dialog.Show();
+
+ // Call
+ var okButton = new ButtonTester("buttonOk", dialog);
+ okButton.Click();
+
+ // Assert
+ Assert.IsNull(dialog.SelectedItemTag);
+ Assert.IsNull(dialog.SelectedItemTypeName);
+ Assert.AreEqual("Selecteer een type.", messageText);
+ Assert.AreEqual(DialogResult.None, dialog.DialogResult);
+ }
+
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void SelectedItemTag_ItemSelected_ReturnsSelectedItem()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var parent = mocks.StrictMock();
+ mocks.ReplayAll();
+
+ using (var dialog = new SelectItemDialog(parent, "Dialog text"))
+ {
+ var tag = new object();
+ dialog.AddItemType("aName", "aCategory", Resources.abacus, tag);
+ var listView = (ListView)new ControlTester("listViewItemTypes", dialog).TheObject;
+ dialog.Show();
+
+ // Call
+ listView.Items[0].Selected = true;
+
+ // Assert
+ Assert.AreEqual(tag, dialog.SelectedItemTag);
+ Assert.AreEqual("aName", dialog.SelectedItemTypeName);
+ }
+
+ mocks.VerifyAll();
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r516f5c56f48bee70f78ca969a5658d89b9dd8dce
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce)
@@ -22,6 +22,7 @@
using System;
using System.IO;
using System.Linq;
+using System.Security.AccessControl;
using Core.Common.Base.Data;
using Core.Common.IO.Exceptions;
using Core.Common.TestUtil;
@@ -72,6 +73,49 @@
}
[Test]
+ public void WriteWaveConditions_FilePathTooLong_ThrowCriticalFileWriteException()
+ {
+ // Setup
+ var filePath = new string('a', 249);
+
+ // Call
+ TestDelegate call = () => WaveConditionsWriter.WriteWaveConditions(Enumerable.Empty(), filePath);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual(string.Format("Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{0}'.", filePath), exception.Message);
+ Assert.IsInstanceOf(exception.InnerException);
+ }
+
+ [Test]
+ public void WriteWaveConditions_InvalidDirectoryRights_ThrowCriticalFileWriteException()
+ {
+ // Setup
+ string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
+ "WriteWaveConditions_InvalidDirectoryRights_ThrowCriticalFileWriteException");
+ Directory.CreateDirectory(directoryPath);
+ string filePath = Path.Combine(directoryPath, "test.csv");
+
+ // Call
+ TestDelegate call = () => WaveConditionsWriter.WriteWaveConditions(Enumerable.Empty(), filePath);
+
+ try
+ {
+ using (new DirectoryPermissionsRevoker(directoryPath, FileSystemRights.Write))
+ {
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual(string.Format("Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{0}'.", filePath), exception.Message);
+ Assert.IsInstanceOf(exception.InnerException);
+ }
+ }
+ finally
+ {
+ Directory.Delete(directoryPath, true);
+ }
+ }
+
+ [Test]
public void WriteWaveConditions_ValidData_ValidFile()
{
// Setup