diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj
index 190472c..ada9466 100644
--- a/Global_Indexer/Global_Indexer.vbproj
+++ b/Global_Indexer/Global_Indexer.vbproj
@@ -63,7 +63,7 @@
On
- Resources\DD_Icons_ICO_GLOBIX_128.ico
+ file.ico
My Project\app.manifest
@@ -775,10 +775,12 @@
PreserveNewest
+
PreserveNewest
+
diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb
index a4f9cde..2ca2f9a 100644
--- a/Global_Indexer/My Project/AssemblyInfo.vb
+++ b/Global_Indexer/My Project/AssemblyInfo.vb
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
+
\ No newline at end of file
diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb
index 177efc1..dffe020 100644
--- a/Global_Indexer/My Project/Resources.Designer.vb
+++ b/Global_Indexer/My Project/Resources.Designer.vb
@@ -420,6 +420,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property file() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("file", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/Global_Indexer/My Project/Resources.resx b/Global_Indexer/My Project/Resources.resx
index 8f7de54..fb2c3db 100644
--- a/Global_Indexer/My Project/Resources.resx
+++ b/Global_Indexer/My Project/Resources.resx
@@ -157,6 +157,9 @@
..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
..\Resources\database_save2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -196,6 +199,9 @@
..\Resources\globe_handdrawn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -235,9 +241,6 @@
..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- ..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -265,14 +268,11 @@
..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -280,12 +280,15 @@
..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\arrow_Up_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -310,8 +313,8 @@
..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -322,7 +325,7 @@
..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx
index 86fadc5..3ff7d7d 100644
--- a/Global_Indexer/My Project/licenses.licx
+++ b/Global_Indexer/My Project/licenses.licx
@@ -1,7 +1,8 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/Global_Indexer/Resources/file.png b/Global_Indexer/Resources/file.png
new file mode 100644
index 0000000..a018d09
Binary files /dev/null and b/Global_Indexer/Resources/file.png differ
diff --git a/Global_Indexer/file.ico b/Global_Indexer/file.ico
new file mode 100644
index 0000000..7296965
Binary files /dev/null and b/Global_Indexer/file.ico differ
diff --git a/Global_Indexer/frmSQL_DESIGNER.Designer.vb b/Global_Indexer/frmSQL_DESIGNER.Designer.vb
index 50102d8..3b3dcca 100644
--- a/Global_Indexer/frmSQL_DESIGNER.Designer.vb
+++ b/Global_Indexer/frmSQL_DESIGNER.Designer.vb
@@ -23,7 +23,6 @@ Partial Class frmSQL_DESIGNER
_
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER))
Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -34,7 +33,6 @@ Partial Class frmSQL_DESIGNER
Me.Label4 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
- Me.dgvResult = New System.Windows.Forms.DataGridView()
Me.dgvPlaceholders = New System.Windows.Forms.DataGridView()
Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -53,9 +51,12 @@ Partial Class frmSQL_DESIGNER
Me.cmbUser = New System.Windows.Forms.ComboBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.btnAddUser = New System.Windows.Forms.Button()
+ Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+ Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'btnShowConnections
@@ -96,15 +97,14 @@ Partial Class frmSQL_DESIGNER
'
Me.SQL_COMMANDTextBox.AcceptsReturn = True
Me.SQL_COMMANDTextBox.AcceptsTab = True
- Me.SQL_COMMANDTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
+ Me.SQL_COMMANDTextBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125)
Me.SQL_COMMANDTextBox.Multiline = True
Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox"
Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(905, 186)
+ Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(936, 186)
Me.SQL_COMMANDTextBox.TabIndex = 86
'
'Label4
@@ -118,11 +118,10 @@ Partial Class frmSQL_DESIGNER
'
'Label1
'
- Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.Label1.Location = New System.Drawing.Point(13, 331)
+ Me.Label1.Location = New System.Drawing.Point(13, 328)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(65, 15)
Me.Label1.TabIndex = 91
@@ -130,42 +129,25 @@ Partial Class frmSQL_DESIGNER
'
'Label5
'
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label5.AutoSize = True
Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.Label5.Location = New System.Drawing.Point(365, 331)
+ Me.Label5.Location = New System.Drawing.Point(367, 328)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(55, 15)
Me.Label5.TabIndex = 90
Me.Label5.Text = "Ergebnis:"
'
- 'dgvResult
- '
- Me.dgvResult.AllowUserToAddRows = False
- Me.dgvResult.AllowUserToDeleteRows = False
- DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
- Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
- Me.dgvResult.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.dgvResult.Location = New System.Drawing.Point(368, 349)
- Me.dgvResult.Name = "dgvResult"
- Me.dgvResult.ReadOnly = True
- Me.dgvResult.Size = New System.Drawing.Size(552, 134)
- Me.dgvResult.TabIndex = 89
- '
'dgvPlaceholders
'
Me.dgvPlaceholders.AllowUserToAddRows = False
Me.dgvPlaceholders.AllowUserToDeleteRows = False
DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
- Me.dgvPlaceholders.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
Me.dgvPlaceholders.Enabled = False
- Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 349)
+ Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 348)
Me.dgvPlaceholders.Name = "dgvPlaceholders"
Me.dgvPlaceholders.Size = New System.Drawing.Size(338, 133)
Me.dgvPlaceholders.TabIndex = 88
@@ -183,12 +165,12 @@ Partial Class frmSQL_DESIGNER
'
'btnTestSQL
'
- Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle))
Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image)
Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.btnTestSQL.Location = New System.Drawing.Point(752, 314)
+ Me.btnTestSQL.Location = New System.Drawing.Point(783, 314)
Me.btnTestSQL.Name = "btnTestSQL"
Me.btnTestSQL.Size = New System.Drawing.Size(168, 29)
Me.btnTestSQL.TabIndex = 87
@@ -232,7 +214,7 @@ Partial Class frmSQL_DESIGNER
Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK
Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image)
Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnSaveSQLCommand.Location = New System.Drawing.Point(825, 489)
+ Me.btnSaveSQLCommand.Location = New System.Drawing.Point(847, 655)
Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand"
Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30)
Me.btnSaveSQLCommand.TabIndex = 95
@@ -245,7 +227,7 @@ Partial Class frmSQL_DESIGNER
Me.lblSaveFinalIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.lblSaveFinalIndex.AutoSize = True
Me.lblSaveFinalIndex.BackColor = System.Drawing.Color.Yellow
- Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 489)
+ Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 655)
Me.lblSaveFinalIndex.Name = "lblSaveFinalIndex"
Me.lblSaveFinalIndex.Size = New System.Drawing.Size(38, 13)
Me.lblSaveFinalIndex.TabIndex = 96
@@ -335,11 +317,31 @@ Partial Class frmSQL_DESIGNER
Me.btnAddUser.TabIndex = 99
Me.btnAddUser.UseVisualStyleBackColor = True
'
+ 'GridControl1
+ '
+ Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.GridControl1.Location = New System.Drawing.Point(370, 349)
+ Me.GridControl1.MainView = Me.GridView1
+ Me.GridControl1.Name = "GridControl1"
+ Me.GridControl1.Size = New System.Drawing.Size(581, 300)
+ Me.GridControl1.TabIndex = 100
+ Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+ '
+ 'GridView1
+ '
+ Me.GridView1.GridControl = Me.GridControl1
+ Me.GridView1.Name = "GridView1"
+ Me.GridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways
+ Me.GridView1.OptionsView.ShowGroupPanel = False
+ '
'frmSQL_DESIGNER
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(930, 523)
+ Me.ClientSize = New System.Drawing.Size(952, 689)
+ Me.Controls.Add(Me.GridControl1)
Me.Controls.Add(Me.btnAddUser)
Me.Controls.Add(Me.btnAddStatic)
Me.Controls.Add(Me.btnAddControl)
@@ -356,7 +358,6 @@ Partial Class frmSQL_DESIGNER
Me.Controls.Add(Me.cmbIndexe)
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.Label5)
- Me.Controls.Add(Me.dgvResult)
Me.Controls.Add(Me.dgvPlaceholders)
Me.Controls.Add(Me.btnTestSQL)
Me.Controls.Add(Me.SQL_COMMANDTextBox)
@@ -366,15 +367,15 @@ Partial Class frmSQL_DESIGNER
Me.Controls.Add(Me.cmbConnection)
Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
Me.MinimizeBox = False
Me.MinimumSize = New System.Drawing.Size(937, 392)
Me.Name = "frmSQL_DESIGNER"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "SQL - Designer"
CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -390,7 +391,6 @@ Partial Class frmSQL_DESIGNER
Friend WithEvents Label4 As System.Windows.Forms.Label
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents Label5 As System.Windows.Forms.Label
- Friend WithEvents dgvResult As System.Windows.Forms.DataGridView
Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView
Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn
Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn
@@ -409,4 +409,6 @@ Partial Class frmSQL_DESIGNER
Friend WithEvents cmbUser As ComboBox
Friend WithEvents Label3 As Label
Friend WithEvents btnAddUser As Button
+ Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+ Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
End Class
diff --git a/Global_Indexer/frmSQL_DESIGNER.vb b/Global_Indexer/frmSQL_DESIGNER.vb
index 354c697..dbb8013 100644
--- a/Global_Indexer/frmSQL_DESIGNER.vb
+++ b/Global_Indexer/frmSQL_DESIGNER.vb
@@ -175,7 +175,7 @@ Public Class frmSQL_DESIGNER
If ds IsNot Nothing Then
- dgvResult.DataSource = ds.Tables(0)
+ GridControl1.DataSource = ds.Tables(0)
End If
End Sub
Private Function ExecuteWithConnection(connectionId As Integer, sql As String) As DataSet
diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb
index 9b22c7a..8b59f8c 100644
--- a/Global_Indexer/frmStart.Designer.vb
+++ b/Global_Indexer/frmStart.Designer.vb
@@ -256,7 +256,7 @@ Partial Class frmStart
Me.Controls.Add(Me.barDockControlBottom)
Me.Controls.Add(Me.barDockControlTop)
Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon)
- Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.FileFlow_Icon
+ Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.file
Me.KeyPreview = True
Me.MaximizeBox = False
Me.Name = "frmStart"