From 396a02382f6d3fa7bf8ab6a177a1127556618b01 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Mon, 26 Jan 2026 13:49:53 +0100 Subject: [PATCH] Revert "Improve Monitoring tab UI: add email limit panel" This reverts commit 6b291e82a73e35a81b0317739261475a039f97ce. --- App/EmailProfiler.Form/frmMain.Designer.vb | 66 +-- App/EmailProfiler.Form/frmMain.resx | 627 +-------------------- 2 files changed, 22 insertions(+), 671 deletions(-) diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb index 1c7dc0e..f99f10c 100644 --- a/App/EmailProfiler.Form/frmMain.Designer.vb +++ b/App/EmailProfiler.Form/frmMain.Designer.vb @@ -325,10 +325,8 @@ Partial Class frmMain Me.Label3 = New System.Windows.Forms.Label() Me.txtPasswort = New System.Windows.Forms.TextBox() Me.tabMonitoring = New System.Windows.Forms.TabPage() - Me.pnlGridMonitoring = New DevExpress.XtraEditors.PanelControl() Me.gridMonitoring = New DevExpress.XtraGrid.GridControl() Me.GridView5 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.pnlAbrufmenge = New DevExpress.XtraEditors.PanelControl() Me.TBEMLP_HISTORYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.TBEMLP_POLL_PROFILESTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_PROFILESTableAdapter() @@ -341,8 +339,6 @@ Partial Class frmMain Me.TBEMLP_CONFIGTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.lblMonitoringLimit = New DevExpress.XtraEditors.LabelControl() - Me.txtMonitoringLimit = New DevExpress.XtraEditors.TextEdit() GUIDLabel = New System.Windows.Forms.Label() PROFILE_NAMELabel = New System.Windows.Forms.Label() POLL_TYPELabel = New System.Windows.Forms.Label() @@ -448,14 +444,9 @@ Partial Class frmMain CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() Me.tabMonitoring.SuspendLayout() - CType(Me.pnlGridMonitoring, System.ComponentModel.ISupportInitialize).BeginInit() - Me.pnlGridMonitoring.SuspendLayout() CType(Me.gridMonitoring, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.pnlAbrufmenge, System.ComponentModel.ISupportInitialize).BeginInit() - Me.pnlAbrufmenge.SuspendLayout() CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtMonitoringLimit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GUIDLabel @@ -1098,7 +1089,7 @@ Partial Class frmMain Me.GridControl4.Location = New System.Drawing.Point(3, 31) Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.Name = "GridControl4" - Me.GridControl4.Size = New System.Drawing.Size(245, 99) + Me.GridControl4.Size = New System.Drawing.Size(245, 125) Me.GridControl4.TabIndex = 33 Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -3424,8 +3415,7 @@ Partial Class frmMain 'tabMonitoring ' Me.tabMonitoring.AutoScroll = True - Me.tabMonitoring.Controls.Add(Me.pnlGridMonitoring) - Me.tabMonitoring.Controls.Add(Me.pnlAbrufmenge) + Me.tabMonitoring.Controls.Add(Me.gridMonitoring) Me.tabMonitoring.Location = New System.Drawing.Point(4, 32) Me.tabMonitoring.Name = "tabMonitoring" Me.tabMonitoring.Size = New System.Drawing.Size(1227, 558) @@ -3433,22 +3423,15 @@ Partial Class frmMain Me.tabMonitoring.Text = "Monitoring" Me.tabMonitoring.UseVisualStyleBackColor = True ' - 'pnlGridMonitoring - ' - Me.pnlGridMonitoring.Controls.Add(Me.gridMonitoring) - Me.pnlGridMonitoring.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnlGridMonitoring.Location = New System.Drawing.Point(0, 68) - Me.pnlGridMonitoring.Name = "pnlGridMonitoring" - Me.pnlGridMonitoring.Size = New System.Drawing.Size(1227, 490) - Me.pnlGridMonitoring.TabIndex = 2 - ' 'gridMonitoring ' - Me.gridMonitoring.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridMonitoring.Location = New System.Drawing.Point(3, 3) + Me.gridMonitoring.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.gridMonitoring.Location = New System.Drawing.Point(32, 33) Me.gridMonitoring.MainView = Me.GridView5 Me.gridMonitoring.Name = "gridMonitoring" - Me.gridMonitoring.Size = New System.Drawing.Size(1221, 484) + Me.gridMonitoring.Size = New System.Drawing.Size(1163, 491) Me.gridMonitoring.TabIndex = 0 Me.gridMonitoring.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView5}) ' @@ -3465,16 +3448,6 @@ Partial Class frmMain Me.GridView5.OptionsView.ShowAutoFilterRow = True Me.GridView5.OptionsView.ShowGroupPanel = False ' - 'pnlAbrufmenge - ' - Me.pnlAbrufmenge.Controls.Add(Me.txtMonitoringLimit) - Me.pnlAbrufmenge.Controls.Add(Me.lblMonitoringLimit) - Me.pnlAbrufmenge.Dock = System.Windows.Forms.DockStyle.Top - Me.pnlAbrufmenge.Location = New System.Drawing.Point(0, 0) - Me.pnlAbrufmenge.Name = "pnlAbrufmenge" - Me.pnlAbrufmenge.Size = New System.Drawing.Size(1227, 68) - Me.pnlAbrufmenge.TabIndex = 1 - ' 'TBEMLP_HISTORYBindingSource ' Me.TBEMLP_HISTORYBindingSource.DataMember = "TBEMLP_HISTORY" @@ -3531,21 +3504,6 @@ Partial Class frmMain Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' - 'lblMonitoringLimit - ' - Me.lblMonitoringLimit.Location = New System.Drawing.Point(35, 25) - Me.lblMonitoringLimit.Name = "lblMonitoringLimit" - Me.lblMonitoringLimit.Size = New System.Drawing.Size(197, 23) - Me.lblMonitoringLimit.TabIndex = 0 - Me.lblMonitoringLimit.Text = "Abrufmenge an Emails:" - ' - 'txtMonitoringLimit - ' - Me.txtMonitoringLimit.Location = New System.Drawing.Point(239, 19) - Me.txtMonitoringLimit.Name = "txtMonitoringLimit" - Me.txtMonitoringLimit.Size = New System.Drawing.Size(100, 38) - Me.txtMonitoringLimit.TabIndex = 1 - ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -3626,15 +3584,9 @@ Partial Class frmMain Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.tabMonitoring.ResumeLayout(False) - CType(Me.pnlGridMonitoring, System.ComponentModel.ISupportInitialize).EndInit() - Me.pnlGridMonitoring.ResumeLayout(False) CType(Me.gridMonitoring, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.pnlAbrufmenge, System.ComponentModel.ISupportInitialize).EndInit() - Me.pnlAbrufmenge.ResumeLayout(False) - Me.pnlAbrufmenge.PerformLayout() CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtMonitoringLimit.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3900,8 +3852,4 @@ Partial Class frmMain Friend WithEvents tabMonitoring As TabPage Friend WithEvents gridMonitoring As DevExpress.XtraGrid.GridControl Friend WithEvents GridView5 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents pnlGridMonitoring As DevExpress.XtraEditors.PanelControl - Friend WithEvents pnlAbrufmenge As DevExpress.XtraEditors.PanelControl - Friend WithEvents txtMonitoringLimit As DevExpress.XtraEditors.TextEdit - Friend WithEvents lblMonitoringLimit As DevExpress.XtraEditors.LabelControl End Class diff --git a/App/EmailProfiler.Form/frmMain.resx b/App/EmailProfiler.Form/frmMain.resx index 700861a..180591e 100644 --- a/App/EmailProfiler.Form/frmMain.resx +++ b/App/EmailProfiler.Form/frmMain.resx @@ -120,384 +120,183 @@ False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - False - - True - - - True - - - True - - - True - - - True - 1271, 17 - - True - - - True - - - True - - - True - 290, 56 180, 56 - - True - - - True - - - True - 623, 134 985, 56 - - True - @@ -563,117 +362,12 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC - - True - - - True - - - True - - - True - 17, 95 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - 1139, 56 - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -686,6 +380,9 @@ nlwVm9EAAAAASUVORK5CYII= + + 17, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -738,9 +435,6 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC - - True - @@ -766,33 +460,12 @@ LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - True - - - True - 537, 95 - - True - - - True - - - True - - - True - 1021, 95 - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -805,6 +478,9 @@ nlwVm9EAAAAASUVORK5CYII= + + 537, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -857,24 +533,6 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC - - True - - - True - - - True - - - True - - - True - - - True - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -895,48 +553,12 @@ IC8+DQogIDwvZz4NCjwvc3ZnPgs= - - True - - - True - 17, 134 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - 1175, 95 - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -949,6 +571,9 @@ nlwVm9EAAAAASUVORK5CYII= + + 17, 134 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1001,9 +626,6 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC - - True - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1030,123 +652,15 @@ TDI0LDIzLjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - 1162, 173 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True + + 623, 134 851, 173 - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1211,122 +725,14 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True + + 180, 56 239, 173 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True + + 239, 173 1297, 134 @@ -1364,9 +770,6 @@ 1005, 173 - - True - 324