diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index d5580f00..4fd53f56 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -58,7 +58,7 @@ Public Class ClassDetailForm }}, {PAGE_GI_RELATIONS, New DetailSettings With { - .GridTitle = "Profile-Relations", + .GridTitle = "Globix profile-relations", .NewRecordTitle = "", .[Module] = MODULE_GI, .Entity = PAGE_GI_RELATIONS diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index 7b88fad9..6ba291a4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -661,7 +661,7 @@ Partial Class frmAdmin_Globix Me.TextEditNamenkonvention.Location = New System.Drawing.Point(157, 105) Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1 Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention" - Me.TextEditNamenkonvention.Size = New System.Drawing.Size(396, 20) + Me.TextEditNamenkonvention.Size = New System.Drawing.Size(684, 20) Me.TextEditNamenkonvention.StyleController = Me.LayoutControlProfile Me.TextEditNamenkonvention.TabIndex = 46 ' @@ -721,9 +721,9 @@ Partial Class frmAdmin_Globix ' Me.SimpleButtonNameconvention.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButtonNameconvention.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.SimpleButtonNameconvention.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.SimpleButtonNameconvention.Location = New System.Drawing.Point(560, 102) + Me.SimpleButtonNameconvention.Location = New System.Drawing.Point(848, 102) Me.SimpleButtonNameconvention.Name = "SimpleButtonNameconvention" - Me.SimpleButtonNameconvention.Size = New System.Drawing.Size(547, 22) + Me.SimpleButtonNameconvention.Size = New System.Drawing.Size(259, 22) Me.SimpleButtonNameconvention.StyleController = Me.LayoutControlProfile Me.SimpleButtonNameconvention.TabIndex = 58 Me.SimpleButtonNameconvention.Text = "Editor" @@ -776,7 +776,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 90) Me.LayoutControlItem30.Name = "LayoutControlItem30" Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem30.Size = New System.Drawing.Size(548, 30) + Me.LayoutControlItem30.Size = New System.Drawing.Size(836, 30) Me.LayoutControlItem30.Text = "Namenkonvention" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13) ' @@ -853,9 +853,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem1 ' Me.LayoutControlItem1.Control = Me.SimpleButtonNameconvention - Me.LayoutControlItem1.Location = New System.Drawing.Point(548, 90) + Me.LayoutControlItem1.Location = New System.Drawing.Point(836, 90) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(551, 30) + Me.LayoutControlItem1.Size = New System.Drawing.Size(263, 30) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem1.TextVisible = False ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx index 694b6190..05ee9257 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx @@ -120,8 +120,8 @@ False - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -140,7 +140,7 @@ DQogIDwvZz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -159,9 +159,6 @@ 350, 17 - - 350, 17 - 17, 17 @@ -180,7 +177,7 @@ 1161, 17 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -209,7 +206,10 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - + + 752, 56 + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -232,7 +232,7 @@ IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -278,10 +278,7 @@ 17, 95 - - 17, 95 - - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -298,7 +295,7 @@ IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -321,7 +318,27 @@ LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L - + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w + LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw + IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -339,7 +356,23 @@ NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== - + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -365,7 +398,7 @@ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -392,77 +425,7 @@ Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - 246, 56 - - - 1161, 17 - - - 752, 56 - - - 752, 56 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== - - - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -485,7 +448,7 @@ IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -511,6 +474,28 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx index 3c168b43..3609e73c 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx @@ -151,7 +151,7 @@ 17, 17 - 17, 56 + 848, 17 177, 17 @@ -160,6 +160,9 @@ 602, 17 - 278, 56 + 17, 56 + + + 219 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 1dda7aef..e7b8d1ee 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -18,6 +18,7 @@ Public Class frmAdmin_IDBEntity Private Sub frmAdmin_IDBEntity_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + TBIDB_BUSINESS_ENTITYTableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString If IsInsert Then DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName TBIDB_BUSINESS_ENTITYBindingSource.AddNew() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb index eab024b0..76d9ffd4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb @@ -30,15 +30,18 @@ Partial Class frmAdmin_IDBObjectStore Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.CAT_TITLETextBox = New System.Windows.Forms.TextBox() + Me.TBIDB_CATALOGBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.TBIDB_OBJECT_STOREBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() @@ -57,18 +60,16 @@ Partial Class frmAdmin_IDBObjectStore Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBIDB_OBJECT_STORETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_OBJECT_STORETableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() - Me.TBIDB_CATALOGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBIDB_CATALOGTableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_CATALOGTableAdapter() - Me.CAT_TITLETextBox = New System.Windows.Forms.TextBox() - Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() - Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.TBIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBIDB_CATALOGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() @@ -79,7 +80,6 @@ Partial Class frmAdmin_IDBObjectStore CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBIDB_CATALOGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -120,6 +120,13 @@ Partial Class frmAdmin_IDBObjectStore Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'labelStatus + ' + Me.labelStatus.Id = 4 + Me.labelStatus.ImageOptions.SvgImage = CType(resources.GetObject("labelStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.labelStatus.Name = "labelStatus" + Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -172,6 +179,24 @@ Partial Class frmAdmin_IDBObjectStore Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' + 'CAT_TITLETextBox + ' + Me.CAT_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_CATALOGBindingSource, "CAT_TITLE", True)) + Me.CAT_TITLETextBox.Location = New System.Drawing.Point(299, 36) + Me.CAT_TITLETextBox.Name = "CAT_TITLETextBox" + Me.CAT_TITLETextBox.Size = New System.Drawing.Size(933, 20) + Me.CAT_TITLETextBox.TabIndex = 16 + ' + 'TBIDB_CATALOGBindingSource + ' + Me.TBIDB_CATALOGBindingSource.DataMember = "TBIDB_CATALOG" + Me.TBIDB_CATALOGBindingSource.DataSource = Me.DSIDB_Stammdaten + ' + 'DSIDB_Stammdaten + ' + Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" + Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'CHANGED_WHENTextBox ' Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_OBJECT_STOREBindingSource, "CHANGED_WHEN", True)) @@ -186,11 +211,6 @@ Partial Class frmAdmin_IDBObjectStore Me.TBIDB_OBJECT_STOREBindingSource.DataMember = "TBIDB_OBJECT_STORE" Me.TBIDB_OBJECT_STOREBindingSource.DataSource = Me.DSIDB_Stammdaten ' - 'DSIDB_Stammdaten - ' - Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" - Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'CHANGED_WHOTextBox ' Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_OBJECT_STOREBindingSource, "CHANGED_WHO", True)) @@ -352,6 +372,15 @@ Partial Class frmAdmin_IDBObjectStore Me.LayoutControlItem5.Text = "Pfad-ID:" Me.LayoutControlItem5.TextSize = New System.Drawing.Size(83, 13) ' + 'LayoutControlItem12 + ' + Me.LayoutControlItem12.Control = Me.CAT_TITLETextBox + Me.LayoutControlItem12.Location = New System.Drawing.Point(201, 24) + Me.LayoutControlItem12.Name = "LayoutControlItem12" + Me.LayoutControlItem12.Size = New System.Drawing.Size(1023, 24) + Me.LayoutControlItem12.Text = "Pfad:" + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(83, 13) + ' 'TBIDB_OBJECT_STORETableAdapter ' Me.TBIDB_OBJECT_STORETableAdapter.ClearBeforeFill = True @@ -366,40 +395,12 @@ Partial Class frmAdmin_IDBObjectStore Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Me.TBIDB_OBJECT_STORETableAdapter Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete - ' - 'TBIDB_CATALOGBindingSource - ' - Me.TBIDB_CATALOGBindingSource.DataMember = "TBIDB_CATALOG" - Me.TBIDB_CATALOGBindingSource.DataSource = Me.DSIDB_Stammdaten + Me.TableAdapterManager.VWIDB_BE_ATTRIBUTETableAdapter = Nothing ' 'TBIDB_CATALOGTableAdapter ' Me.TBIDB_CATALOGTableAdapter.ClearBeforeFill = True ' - 'CAT_TITLETextBox - ' - Me.CAT_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_CATALOGBindingSource, "CAT_TITLE", True)) - Me.CAT_TITLETextBox.Location = New System.Drawing.Point(299, 36) - Me.CAT_TITLETextBox.Name = "CAT_TITLETextBox" - Me.CAT_TITLETextBox.Size = New System.Drawing.Size(933, 20) - Me.CAT_TITLETextBox.TabIndex = 16 - ' - 'LayoutControlItem12 - ' - Me.LayoutControlItem12.Control = Me.CAT_TITLETextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(201, 24) - Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Size = New System.Drawing.Size(1023, 24) - Me.LayoutControlItem12.Text = "Pfad:" - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(83, 13) - ' - 'labelStatus - ' - Me.labelStatus.Id = 4 - Me.labelStatus.ImageOptions.SvgImage = CType(resources.GetObject("labelStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.labelStatus.Name = "labelStatus" - Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph - ' 'frmAdmin_IDBObjectStore ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -415,8 +416,9 @@ Partial Class frmAdmin_IDBObjectStore CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.TBIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBIDB_CATALOGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() @@ -427,7 +429,6 @@ Partial Class frmAdmin_IDBObjectStore CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBIDB_CATALOGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx index d75dbd1b..622e204e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.resx @@ -196,28 +196,22 @@ 845, 17 - - 177, 17 - - - 177, 17 - 17, 17 + + 177, 17 + 427, 17 672, 17 - - 845, 17 - - - 17, 17 - - 1067, 17 + 17, 56 + + + 266 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.vb index b87c6442..6ff1d9f8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.vb @@ -31,7 +31,6 @@ Private Sub frmAdmin_IDBObjectStore_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DSIDB_Stammdaten.TBIDB_OBJECT_STORE". Sie können sie bei Bedarf verschieben oder entfernen. Me.TBIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString Me.TBIDB_CATALOGTableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString Me.TBIDB_OBJECT_STORETableAdapter.Fill(Me.DSIDB_Stammdaten.TBIDB_OBJECT_STORE) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 58b64f8a..faed45b0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -276,7 +276,7 @@ Public Class frmAdmin_Start Dim oPrimaryKey = Get_PrimaryKey(ViewMain.FocusedRowHandle) - If oPrimaryKey IsNot Nothing Then + If oPrimaryKey IsNot Nothing Or CurrentPage = PAGE_GI_RELATIONS Then DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) End If Catch ex As Exception diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.vb b/GUIs.ZooFlow/Administration/frmSQLDesigner.vb index 0b84d0eb..e0d19b33 100644 --- a/GUIs.ZooFlow/Administration/frmSQLDesigner.vb +++ b/GUIs.ZooFlow/Administration/frmSQLDesigner.vb @@ -127,9 +127,11 @@ Exit Sub End If Next - + MsgBox(cmbConnection.SelectedValue) Dim oconString = My.DatabaseECM.Get_ConnectionStringforID(cmbConnection.SelectedValue) + MsgBox(oconString) Dim decryptedConString = My.DatabaseECM.DecryptConnectionString(oconString) + MsgBox(decryptedConString) Dim oDT = My.DatabaseECM.GetDatatableWithConnection(query, decryptedConString) diff --git a/GUIs.ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb index 0cc188f0..efeea361 100644 --- a/GUIs.ZooFlow/My Project/Settings.Designer.vb +++ b/GUIs.ZooFlow/My Project/Settings.Designer.vb @@ -14,7 +14,7 @@ Option Explicit On _ Partial Friend NotInheritable Class Settings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index d6117e7c..16880422 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -233,6 +233,12 @@ DSIDB_Stammdaten.xsd + + frmConfigBasic.vb + + + Form + frmServiceConfig.vb diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb new file mode 100644 index 00000000..5c907045 --- /dev/null +++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb @@ -0,0 +1,30 @@ + _ +Partial Class frmConfigBasic + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + components = New System.ComponentModel.Container + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Text = "frmConfigBasic" + End Sub +End Class diff --git a/GUIs.ZooFlow/frmConfigBasic.vb b/GUIs.ZooFlow/frmConfigBasic.vb new file mode 100644 index 00000000..8c48cc14 --- /dev/null +++ b/GUIs.ZooFlow/frmConfigBasic.vb @@ -0,0 +1,3 @@ +Public Class frmConfigBasic + +End Class \ No newline at end of file