Ms merge
This commit is contained in:
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAVABCwFQAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAWABCwFgAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -1487,6 +1487,9 @@
|
||||
OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
|
||||
</value>
|
||||
</data>
|
||||
<data name="bsitmCount.Caption" xml:space="preserve">
|
||||
<value>0 Filtered Rows</value>
|
||||
</data>
|
||||
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
@@ -1518,7 +1521,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar1.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>RibbonControl1.Name" xml:space="preserve">
|
||||
<value>RibbonControl1</value>
|
||||
@@ -1530,10 +1533,10 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>RibbonControl1.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="GridControlWorkflows.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>715, 354</value>
|
||||
<value>945, 484</value>
|
||||
</data>
|
||||
<data name="GridControlWorkflows.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
@@ -1569,7 +1572,7 @@
|
||||
<value>233, 0</value>
|
||||
</data>
|
||||
<data name="Panel2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>715, 24</value>
|
||||
<value>945, 24</value>
|
||||
</data>
|
||||
<data name="Panel2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
@@ -1776,7 +1779,7 @@
|
||||
<value>233</value>
|
||||
</data>
|
||||
<data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>233, 378</value>
|
||||
<value>233, 508</value>
|
||||
</data>
|
||||
<data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
@@ -1796,14 +1799,17 @@
|
||||
<data name=">>NavBarControl1.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="Panel1.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 9pt</value>
|
||||
</data>
|
||||
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>230, 288</value>
|
||||
<value>0, 158</value>
|
||||
</data>
|
||||
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>948, 378</value>
|
||||
<value>1178, 508</value>
|
||||
</data>
|
||||
<data name="Panel1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
@@ -1818,7 +1824,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>Panel1.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Allgemein</value>
|
||||
@@ -2048,7 +2054,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>barDockControlBottom.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="barDockControlLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Left</value>
|
||||
@@ -2069,7 +2075,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>barDockControlLeft.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="barDockControlRight.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Right</value>
|
||||
@@ -2090,7 +2096,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>barDockControlRight.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
@@ -2104,63 +2110,6 @@
|
||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1178, 688</value>
|
||||
</data>
|
||||
<data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>31, 181</value>
|
||||
</data>
|
||||
<data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>179, 207</value>
|
||||
</data>
|
||||
<data name="XtraTabPage1.Text" xml:space="preserve">
|
||||
<value>XtraTabPage1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage1.Name" xml:space="preserve">
|
||||
<value>XtraTabPage1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage1.Parent" xml:space="preserve">
|
||||
<value>XtraTabControl1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>181, 230</value>
|
||||
</data>
|
||||
<data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>179, 207</value>
|
||||
</data>
|
||||
<data name="XtraTabPage2.Text" xml:space="preserve">
|
||||
<value>XtraTabPage2</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage2.Name" xml:space="preserve">
|
||||
<value>XtraTabPage2</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage2.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage2.Parent" xml:space="preserve">
|
||||
<value>XtraTabControl1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabPage2.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabControl1.Name" xml:space="preserve">
|
||||
<value>XtraTabControl1</value>
|
||||
</data>
|
||||
<data name=">>XtraTabControl1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>XtraTabControl1.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>XtraTabControl1.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 12pt</value>
|
||||
</data>
|
||||
@@ -2675,6 +2624,12 @@
|
||||
<data name=">>barbtnitmsaveLogfiles.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>bsitmCount.Name" xml:space="preserve">
|
||||
<value>bsitmCount</value>
|
||||
</data>
|
||||
<data name=">>bsitmCount.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageStart.Name" xml:space="preserve">
|
||||
<value>RibbonPageStart</value>
|
||||
</data>
|
||||
@@ -3628,7 +3583,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>barDockControlTop.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="RibbonPage2.Text" xml:space="preserve">
|
||||
<value>RibbonPage2</value>
|
||||
|
||||
Reference in New Issue
Block a user