Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo
This commit is contained in:
Jonathan Jenne
commit
98a1821f2b
@ -10,14 +10,9 @@
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT"
|
||||
connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.ECMConnectionStringDEFAULT"
|
||||
connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd" />
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString"
|
||||
connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.ECMConnectionStringDEFAULT" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd" />
|
||||
<add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<applicationSettings>
|
||||
<DigitalData.GUIs.ZooFlow.Settings>
|
||||
@ -27,10 +22,10 @@
|
||||
</DigitalData.GUIs.ZooFlow.Settings>
|
||||
<DevExpress.LookAndFeel.Design.AppSettings>
|
||||
<setting name="DefaultAppSkin" serializeAs="String">
|
||||
<value>Skin/Office 2019 Colorful</value>
|
||||
<value>Skin/Office 2019 White</value>
|
||||
</setting>
|
||||
<setting name="DefaultPalette" serializeAs="String">
|
||||
<value>Custom/Digital Data Palette</value>
|
||||
<value></value>
|
||||
</setting>
|
||||
<setting name="TouchUI" serializeAs="String">
|
||||
<value></value>
|
||||
|
||||
30
GUIs.ZooFlow/frmFlowForm.Designer.vb
generated
30
GUIs.ZooFlow/frmFlowForm.Designer.vb
generated
@ -55,6 +55,7 @@ Partial Class frmFlowForm
|
||||
Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox()
|
||||
Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox()
|
||||
Me.AccordionControl1 = New DevExpress.XtraBars.Navigation.AccordionControl()
|
||||
Me.TestFlowSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ContextMenuSystray.SuspendLayout()
|
||||
CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -79,16 +80,16 @@ Partial Class frmFlowForm
|
||||
'
|
||||
'ContextMenuSystray
|
||||
'
|
||||
Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheTestToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
|
||||
Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheTestToolStripMenuItem, Me.TestFlowSearchToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
|
||||
Me.ContextMenuSystray.Name = "ContextMenuSystray"
|
||||
Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 154)
|
||||
Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 198)
|
||||
'
|
||||
'GlobixToolStripMenuItem
|
||||
'
|
||||
Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig})
|
||||
Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short
|
||||
Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem"
|
||||
Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.GlobixToolStripMenuItem.Text = "Globix"
|
||||
Me.GlobixToolStripMenuItem.Visible = False
|
||||
'
|
||||
@ -102,7 +103,7 @@ Partial Class frmFlowForm
|
||||
'
|
||||
Me.UserKonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankverbindungToolStripMenuItem, Me.BasisKonfigurationToolStripMenuItem})
|
||||
Me.UserKonfigurationToolStripMenuItem.Name = "UserKonfigurationToolStripMenuItem"
|
||||
Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.UserKonfigurationToolStripMenuItem.Text = "User Konfiguration"
|
||||
'
|
||||
'DatenbankverbindungToolStripMenuItem
|
||||
@ -120,41 +121,41 @@ Partial Class frmFlowForm
|
||||
'ToolStripSeparator1
|
||||
'
|
||||
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
|
||||
Me.ToolStripSeparator1.Size = New System.Drawing.Size(170, 6)
|
||||
Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
|
||||
'
|
||||
'VerwaltungToolStripMenuItem
|
||||
'
|
||||
Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG
|
||||
Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
|
||||
Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
|
||||
'
|
||||
'ToolStripSeparator3
|
||||
'
|
||||
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
|
||||
Me.ToolStripSeparator3.Size = New System.Drawing.Size(170, 6)
|
||||
Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
|
||||
'
|
||||
'SucheTestToolStripMenuItem
|
||||
'
|
||||
Me.SucheTestToolStripMenuItem.Name = "SucheTestToolStripMenuItem"
|
||||
Me.SucheTestToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.SucheTestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.SucheTestToolStripMenuItem.Text = "Suche (Test)"
|
||||
'
|
||||
'TestToolStripMenuItem
|
||||
'
|
||||
Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
|
||||
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.TestToolStripMenuItem.Text = "Test"
|
||||
'
|
||||
'ToolStripSeparator2
|
||||
'
|
||||
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
|
||||
Me.ToolStripSeparator2.Size = New System.Drawing.Size(170, 6)
|
||||
Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
|
||||
'
|
||||
'ZooFlowBeendenToolStripMenuItem
|
||||
'
|
||||
Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
|
||||
Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
|
||||
Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
|
||||
'
|
||||
'PictureBoxPM1
|
||||
@ -252,6 +253,12 @@ Partial Class frmFlowForm
|
||||
Me.AccordionControl1.TabIndex = 16
|
||||
Me.AccordionControl1.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu
|
||||
'
|
||||
'TestFlowSearchToolStripMenuItem
|
||||
'
|
||||
Me.TestFlowSearchToolStripMenuItem.Name = "TestFlowSearchToolStripMenuItem"
|
||||
Me.TestFlowSearchToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.TestFlowSearchToolStripMenuItem.Text = "Test_FlowSearch"
|
||||
'
|
||||
'frmFlowForm
|
||||
'
|
||||
Me.AllowDrop = True
|
||||
@ -315,4 +322,5 @@ Partial Class frmFlowForm
|
||||
Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager
|
||||
Friend WithEvents BasisKonfigurationToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents AccordionControl1 As DevExpress.XtraBars.Navigation.AccordionControl
|
||||
Friend WithEvents TestFlowSearchToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@ -1972,9 +1972,9 @@
|
||||
<value>1079, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ToastNotificationsManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1228, 17</value>
|
||||
</metadata>
|
||||
<metadata name="BehaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 56</value>
|
||||
</metadata>
|
||||
<metadata name="BehaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>222, 56</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@ -893,5 +893,9 @@ Public Class frmFlowForm
|
||||
Private Sub BasisKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BasisKonfigurationToolStripMenuItem.Click
|
||||
frmConfigBasic.ShowDialog()
|
||||
End Sub
|
||||
|
||||
Private Sub TestFlowSearchToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestFlowSearchToolStripMenuItem.Click
|
||||
Open_FlowSearch()
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user