diff --git a/EDMDesigner/FrmMain.vb b/EDMDesigner/FrmMain.vb index a5ad674a..56968ffe 100644 --- a/EDMDesigner/FrmMain.vb +++ b/EDMDesigner/FrmMain.vb @@ -3,10 +3,12 @@ Imports DigitalData.Modules.Logging Imports System.IO Public Class FrmMain - Private SelectedTable As Integer + Private _selectedTable As Integer + Private _selectedTableName As String + Private _logger As NLog.Logger Private _logConfig As LogConfig - Private DBFirebird As Firebird + Private _firebird As Firebird Private Sub CreateTableNodesFromDatatable(DataTable As DataTable, DatabaseName As String) treeViewMain.Nodes.Clear() @@ -29,6 +31,7 @@ Public Class FrmMain For Each row As DataRow In DataTable.Rows Dim oNode As New TreeNode With { .Text = row.Item("TABLE"), + .Name = row.Item("TABLE"), .Tag = row.Item("TABLE_ID") } @@ -45,7 +48,7 @@ Public Class FrmMain End Sub Private Function LoadTables() - Return DBFirebird.GetDatatable("SELECT DISTINCT T.TABLE_ID,T.""TABLE"" from VWEDM_TABLE_COLUMN T") + Return _firebird.GetDatatable("SELECT DISTINCT T.TABLE_ID,T.""TABLE"" from VWEDM_TABLE_COLUMN T") End Function Private Function DatabaseSettingsExist() @@ -53,9 +56,9 @@ Public Class FrmMain End Function Private Sub Init() - DBFirebird = New Firebird(_logConfig.LogFactory, My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword) + _firebird = New Firebird(_logConfig.LogFactory, My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword) - If DBFirebird.ConnectionFailed Then + If _firebird.ConnectionFailed Then MsgBox("Database connection failed. Please check the log.", vbCritical) Exit Sub End If @@ -64,7 +67,7 @@ Public Class FrmMain 'CurrentUser = New ClassCurrentUser(DBFirebird) Dim dt As DataTable = LoadTables() - CreateTableNodesFromDatatable(dt, DBFirebird.DatabaseName) + CreateTableNodesFromDatatable(dt, _firebird.DatabaseName) End Sub @@ -89,7 +92,8 @@ Public Class FrmMain Private Sub TreeViewMain_NodeMouseClick(sender As Object, e As TreeNodeMouseClickEventArgs) Handles treeViewMain.NodeMouseClick If e.Button = MouseButtons.Right Then - SelectedTable = -1 + _selectedTable = -1 + _selectedTableName = Nothing ' Wenn kein Node geklickt wurde, aussteigen If e.Node Is Nothing OrElse e.Node.Parent Is Nothing Then @@ -101,7 +105,8 @@ Public Class FrmMain ' Das Kontextmenü für den angeklickten Node öffnen Select Case parentName Case "TABLES" - SelectedTable = e.Node.Tag + _selectedTable = e.Node.Tag + _selectedTableName = e.Node.Name contextMenuTable.Show(MousePosition) Case "DATABASE" contextMenuDatabase.Show(MousePosition) @@ -111,31 +116,38 @@ Public Class FrmMain End If End Sub - Private Sub SpaltenBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SpaltenBearbeitenToolStripMenuItem.Click - Dim dt As DataTable = DBFirebird.GetDatatable($"SELECT * FROM VWEDM_TABLE_COLUMN WHERE TABLE_ID = {SelectedTable}") - gridControlTableProperties.DataSource = dt - End Sub Private Sub TabelleBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TabelleBearbeitenToolStripMenuItem.Click + Dim oDataTable = New DataTable() + Dim oConnection = _firebird.GetConnection() + Dim oDataAdapter = New FirebirdSql.Data.FirebirdClient.FbDataAdapter($"SELECT * FROM VWEDM_TABLE_COLUMN WHERE TABLE_ID = {_selectedTable}", oConnection) - End Sub + Try + oDataAdapter.Fill(oDataTable) + gridControlTableProperties.DataSource = oDataTable + Catch ex As Exception + _logger.Error(ex) + MsgBox($"Error while loading columns for table {_selectedTable}") + Finally + oConnection.Close() + End Try - Private Sub DebugAnToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DebugAnToolStripMenuItem.Click - _logConfig.Debug = True - End Sub + oDataTable = New DataTable() + oConnection = _firebird.GetConnection() + oDataAdapter = New FirebirdSql.Data.FirebirdClient.FbDataAdapter($"SELECT * FROM VW_{_selectedTableName}", oConnection) - Private Sub DebugAusToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DebugAusToolStripMenuItem.Click - _logConfig.Debug = False - End Sub + Try + oDataAdapter.Fill(oDataTable) + gridControlTableData.DataSource = oDataTable + Catch ex As Exception + _logger.Error(ex) + MsgBox($"Error while loading data for table {_selectedTable}") + Finally + oConnection.Close() + End Try - Private Sub WriteDebugLogToolStripMenuItem_Click(sender As Object, e As EventArgs) - _logger.Debug("Welcome to monkey island!") - End Sub - - Private Sub SpamTheLogToolStripMenuItem_Click(sender As Object, e As EventArgs) - For index = 1 To 100000 - _logger.Debug("Spam No. {0}", index) - Next + 'Dim dt As DataTable = _firebird.GetDatatable($"SELECT * FROM VWEDM_TABLE_COLUMN WHERE TABLE_ID = {_selectedTable}") + 'gridControlTableProperties.DataSource = dt End Sub Private Sub NeueTabelleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeueTabelleToolStripMenuItem.Click @@ -143,6 +155,6 @@ Public Class FrmMain oForm.ShowDialog() Dim oTables As DataTable = LoadTables() - CreateTableNodesFromDatatable(oTables, DBFirebird.DatabaseName) + CreateTableNodesFromDatatable(oTables, _firebird.DatabaseName) End Sub End Class diff --git a/EDMDesigner/frmMain.Designer.vb b/EDMDesigner/frmMain.Designer.vb index 4baa2482..a8fef387 100644 --- a/EDMDesigner/frmMain.Designer.vb +++ b/EDMDesigner/frmMain.Designer.vb @@ -22,33 +22,31 @@ Partial Class FrmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DockingContainer2 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() - Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() - Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() + Me.components = New System.ComponentModel.Container() + Dim DockingContainer3 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() + Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components) + Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.ToolStripStatusLabelConState = New System.Windows.Forms.ToolStripStatusLabel() Me.treeViewMain = New System.Windows.Forms.TreeView() Me.gridControlTableProperties = New DevExpress.XtraGrid.GridControl() Me.gridViewTableProperties = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.MySettingsBindingSource = New System.Windows.Forms.BindingSource() - Me.contextMenuTable = New System.Windows.Forms.ContextMenuStrip() + Me.MySettingsBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.contextMenuTable = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.TabelleBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TabelleLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.SpaltenBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.NeueSpalteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() - Me.DebugToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DebugAnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DebugAusToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager() - Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.panelTableDetail = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager() - Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView() - Me.contextMenuDatabase = New System.Windows.Forms.ContextMenuStrip() + Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.gridControlTableData = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.panelDatabase = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components) + Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components) + Me.contextMenuDatabase = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.NeueTabelleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,12 +55,17 @@ Partial Class FrmMain CType(Me.gridViewTableProperties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MySettingsBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.contextMenuTable.SuspendLayout() - Me.MenuStrip1.SuspendLayout() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.DockPanel1.SuspendLayout() - Me.DockPanel1_Container.SuspendLayout() - Me.DockPanel2.SuspendLayout() + Me.panelTableDetail.SuspendLayout() Me.DockPanel2_Container.SuspendLayout() + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer1.Panel1.SuspendLayout() + Me.SplitContainer1.Panel2.SuspendLayout() + Me.SplitContainer1.SuspendLayout() + CType(Me.gridControlTableData, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.panelDatabase.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.contextMenuDatabase.SuspendLayout() @@ -75,7 +78,7 @@ Partial Class FrmMain 'Document1 ' Me.Document1.Caption = "DockPanel2" - Me.Document1.ControlName = "DockPanel2" + Me.Document1.ControlName = "panelTableDetail" Me.Document1.FloatLocation = New System.Drawing.Point(-1910, 9) Me.Document1.FloatSize = New System.Drawing.Size(200, 200) Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[False] @@ -112,7 +115,7 @@ Partial Class FrmMain Me.gridControlTableProperties.Location = New System.Drawing.Point(0, 0) Me.gridControlTableProperties.MainView = Me.gridViewTableProperties Me.gridControlTableProperties.Name = "gridControlTableProperties" - Me.gridControlTableProperties.Size = New System.Drawing.Size(749, 457) + Me.gridControlTableProperties.Size = New System.Drawing.Size(749, 228) Me.gridControlTableProperties.TabIndex = 0 Me.gridControlTableProperties.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gridViewTableProperties}) ' @@ -127,9 +130,9 @@ Partial Class FrmMain ' 'contextMenuTable ' - Me.contextMenuTable.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TabelleBearbeitenToolStripMenuItem, Me.TabelleLöschenToolStripMenuItem, Me.ToolStripSeparator1, Me.SpaltenBearbeitenToolStripMenuItem, Me.NeueSpalteToolStripMenuItem}) + Me.contextMenuTable.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TabelleBearbeitenToolStripMenuItem, Me.TabelleLöschenToolStripMenuItem}) Me.contextMenuTable.Name = "contextMenuTable" - Me.contextMenuTable.Size = New System.Drawing.Size(179, 98) + Me.contextMenuTable.Size = New System.Drawing.Size(177, 48) ' 'TabelleBearbeitenToolStripMenuItem ' @@ -143,69 +146,88 @@ Partial Class FrmMain Me.TabelleLöschenToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.TabelleLöschenToolStripMenuItem.Text = "Tabelle löschen.." ' - 'ToolStripSeparator1 - ' - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(175, 6) - ' - 'SpaltenBearbeitenToolStripMenuItem - ' - Me.SpaltenBearbeitenToolStripMenuItem.Name = "SpaltenBearbeitenToolStripMenuItem" - Me.SpaltenBearbeitenToolStripMenuItem.Size = New System.Drawing.Size(178, 22) - Me.SpaltenBearbeitenToolStripMenuItem.Text = "Spalten bearbeiten.." - ' - 'NeueSpalteToolStripMenuItem - ' - Me.NeueSpalteToolStripMenuItem.Name = "NeueSpalteToolStripMenuItem" - Me.NeueSpalteToolStripMenuItem.Size = New System.Drawing.Size(178, 22) - Me.NeueSpalteToolStripMenuItem.Text = "Neue Spalte.." - ' 'MenuStrip1 ' - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DebugToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Size = New System.Drawing.Size(955, 24) Me.MenuStrip1.TabIndex = 1 Me.MenuStrip1.Text = "MenuStrip1" ' - 'DebugToolStripMenuItem - ' - Me.DebugToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DebugAnToolStripMenuItem, Me.DebugAusToolStripMenuItem}) - Me.DebugToolStripMenuItem.Name = "DebugToolStripMenuItem" - Me.DebugToolStripMenuItem.Size = New System.Drawing.Size(54, 20) - Me.DebugToolStripMenuItem.Text = "Debug" - ' - 'DebugAnToolStripMenuItem - ' - Me.DebugAnToolStripMenuItem.Name = "DebugAnToolStripMenuItem" - Me.DebugAnToolStripMenuItem.Size = New System.Drawing.Size(132, 22) - Me.DebugAnToolStripMenuItem.Text = "Debug An" - ' - 'DebugAusToolStripMenuItem - ' - Me.DebugAusToolStripMenuItem.Name = "DebugAusToolStripMenuItem" - Me.DebugAusToolStripMenuItem.Size = New System.Drawing.Size(132, 22) - Me.DebugAusToolStripMenuItem.Text = "Debug Aus" - ' 'DockManager1 ' Me.DockManager1.Form = Me - Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1, Me.DockPanel2}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelTableDetail, Me.panelDatabase}) Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl"}) ' - 'DockPanel1 + 'panelTableDetail ' - Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) - Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left - Me.DockPanel1.ID = New System.Guid("f88fafa6-e45c-4fbf-9675-b590ab7ad0b3") - Me.DockPanel1.Location = New System.Drawing.Point(0, 24) - Me.DockPanel1.Name = "DockPanel1" - Me.DockPanel1.Options.ShowCloseButton = False - Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.SavedSizeFactor = 0R - Me.DockPanel1.Size = New System.Drawing.Size(200, 485) - Me.DockPanel1.Text = "Datenbank" + Me.panelTableDetail.Controls.Add(Me.DockPanel2_Container) + Me.panelTableDetail.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float + Me.panelTableDetail.DockedAsTabbedDocument = True + Me.panelTableDetail.FloatLocation = New System.Drawing.Point(-1910, 9) + Me.panelTableDetail.ID = New System.Guid("01f09f00-3eb4-4caa-b31c-cbe38c6e45b3") + Me.panelTableDetail.Location = New System.Drawing.Point(0, 0) + Me.panelTableDetail.Name = "panelTableDetail" + Me.panelTableDetail.Options.ShowCloseButton = False + Me.panelTableDetail.OriginalSize = New System.Drawing.Size(200, 200) + Me.panelTableDetail.SavedSizeFactor = 1.0R + Me.panelTableDetail.Size = New System.Drawing.Size(749, 457) + Me.panelTableDetail.Text = "DockPanel2" + ' + 'DockPanel2_Container + ' + Me.DockPanel2_Container.Controls.Add(Me.SplitContainer1) + Me.DockPanel2_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel2_Container.Name = "DockPanel2_Container" + Me.DockPanel2_Container.Size = New System.Drawing.Size(749, 457) + Me.DockPanel2_Container.TabIndex = 0 + ' + 'SplitContainer1 + ' + Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer1.Name = "SplitContainer1" + Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainer1.Panel1 + ' + Me.SplitContainer1.Panel1.Controls.Add(Me.gridControlTableProperties) + ' + 'SplitContainer1.Panel2 + ' + Me.SplitContainer1.Panel2.Controls.Add(Me.gridControlTableData) + Me.SplitContainer1.Size = New System.Drawing.Size(749, 457) + Me.SplitContainer1.SplitterDistance = 228 + Me.SplitContainer1.TabIndex = 1 + ' + 'gridControlTableData + ' + Me.gridControlTableData.Dock = System.Windows.Forms.DockStyle.Fill + Me.gridControlTableData.Location = New System.Drawing.Point(0, 0) + Me.gridControlTableData.MainView = Me.GridView1 + Me.gridControlTableData.Name = "gridControlTableData" + Me.gridControlTableData.Size = New System.Drawing.Size(749, 225) + Me.gridControlTableData.TabIndex = 0 + Me.gridControlTableData.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.gridControlTableData + Me.GridView1.Name = "GridView1" + ' + 'panelDatabase + ' + Me.panelDatabase.Controls.Add(Me.DockPanel1_Container) + Me.panelDatabase.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.panelDatabase.ID = New System.Guid("f88fafa6-e45c-4fbf-9675-b590ab7ad0b3") + Me.panelDatabase.Location = New System.Drawing.Point(0, 24) + Me.panelDatabase.Name = "panelDatabase" + Me.panelDatabase.Options.ShowCloseButton = False + Me.panelDatabase.OriginalSize = New System.Drawing.Size(200, 200) + Me.panelDatabase.SavedSizeFactor = 0R + Me.panelDatabase.Size = New System.Drawing.Size(200, 485) + Me.panelDatabase.Text = "Datenbank" ' 'DockPanel1_Container ' @@ -215,29 +237,6 @@ Partial Class FrmMain Me.DockPanel1_Container.Size = New System.Drawing.Size(191, 458) Me.DockPanel1_Container.TabIndex = 0 ' - 'DockPanel2 - ' - Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) - Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float - Me.DockPanel2.DockedAsTabbedDocument = True - Me.DockPanel2.FloatLocation = New System.Drawing.Point(-1910, 9) - Me.DockPanel2.ID = New System.Guid("01f09f00-3eb4-4caa-b31c-cbe38c6e45b3") - Me.DockPanel2.Location = New System.Drawing.Point(0, 0) - Me.DockPanel2.Name = "DockPanel2" - Me.DockPanel2.Options.ShowCloseButton = False - Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel2.SavedSizeFactor = 1.0R - Me.DockPanel2.Size = New System.Drawing.Size(749, 457) - Me.DockPanel2.Text = "DockPanel2" - ' - 'DockPanel2_Container - ' - Me.DockPanel2_Container.Controls.Add(Me.gridControlTableProperties) - Me.DockPanel2_Container.Location = New System.Drawing.Point(0, 0) - Me.DockPanel2_Container.Name = "DockPanel2_Container" - Me.DockPanel2_Container.Size = New System.Drawing.Size(749, 457) - Me.DockPanel2_Container.TabIndex = 0 - ' 'DocumentManager1 ' Me.DocumentManager1.ContainerControl = Me @@ -248,19 +247,22 @@ Partial Class FrmMain ' Me.TabbedView1.DocumentGroups.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() {Me.DocumentGroup1}) Me.TabbedView1.Documents.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseDocument() {Me.Document1}) - DockingContainer2.Element = Me.DocumentGroup1 - Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer2}) + DockingContainer3.Element = Me.DocumentGroup1 + Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer3}) + Me.TabbedView1.WindowsDialogProperties.NameColumnWidth = 5 + Me.TabbedView1.WindowsDialogProperties.PathColumnWidth = 5 + Me.TabbedView1.WindowsDialogProperties.Size = New System.Drawing.Size(400, 300) ' 'contextMenuDatabase ' Me.contextMenuDatabase.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueTabelleToolStripMenuItem}) Me.contextMenuDatabase.Name = "contextMenuDatabase" - Me.contextMenuDatabase.Size = New System.Drawing.Size(181, 48) + Me.contextMenuDatabase.Size = New System.Drawing.Size(149, 26) ' 'NeueTabelleToolStripMenuItem ' Me.NeueTabelleToolStripMenuItem.Name = "NeueTabelleToolStripMenuItem" - Me.NeueTabelleToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.NeueTabelleToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.NeueTabelleToolStripMenuItem.Text = "Neue Tabelle.." ' 'FrmMain @@ -268,7 +270,7 @@ Partial Class FrmMain Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(955, 531) - Me.Controls.Add(Me.DockPanel1) + Me.Controls.Add(Me.panelDatabase) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.MenuStrip1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -283,13 +285,17 @@ Partial Class FrmMain CType(Me.gridViewTableProperties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MySettingsBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.contextMenuTable.ResumeLayout(False) - Me.MenuStrip1.ResumeLayout(False) - Me.MenuStrip1.PerformLayout() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() - Me.DockPanel1.ResumeLayout(False) - Me.DockPanel1_Container.ResumeLayout(False) - Me.DockPanel2.ResumeLayout(False) + Me.panelTableDetail.ResumeLayout(False) Me.DockPanel2_Container.ResumeLayout(False) + Me.SplitContainer1.Panel1.ResumeLayout(False) + Me.SplitContainer1.Panel2.ResumeLayout(False) + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer1.ResumeLayout(False) + CType(Me.gridControlTableData, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.panelDatabase.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit() Me.contextMenuDatabase.ResumeLayout(False) @@ -306,23 +312,20 @@ Partial Class FrmMain Friend WithEvents contextMenuTable As ContextMenuStrip Friend WithEvents TabelleBearbeitenToolStripMenuItem As ToolStripMenuItem Friend WithEvents TabelleLöschenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ToolStripSeparator1 As ToolStripSeparator - Friend WithEvents SpaltenBearbeitenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents NeueSpalteToolStripMenuItem As ToolStripMenuItem Friend WithEvents MySettingsBindingSource As BindingSource Friend WithEvents MenuStrip1 As MenuStrip Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager - Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents panelDatabase As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents panelTableDetail As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents DocumentManager1 As DevExpress.XtraBars.Docking2010.DocumentManager Friend WithEvents TabbedView1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView Friend WithEvents DocumentGroup1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup Friend WithEvents Document1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.Document - Friend WithEvents DebugToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DebugAnToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DebugAusToolStripMenuItem As ToolStripMenuItem Friend WithEvents contextMenuDatabase As ContextMenuStrip Friend WithEvents NeueTabelleToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SplitContainer1 As SplitContainer + Friend WithEvents gridControlTableData As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView End Class