From 3d9f6be915f746bdfa45f26067c4fff5439ab4cb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Jun 2018 10:30:12 +0200 Subject: [PATCH 1/2] jj: use ShowErrorMessage --- DDUserManager/DDUserManager/frmMain.Designer.vb | 16 ++++++++-------- DDUserManager/DDUserManager/frmMain.vb | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index bbb87cc..2f1c789 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -780,7 +780,7 @@ Partial Class frmMain 'GUIDLabel3 ' GUIDLabel3.AutoSize = True - GUIDLabel3.Location = New System.Drawing.Point(46, 62) + GUIDLabel3.Location = New System.Drawing.Point(11, 39) GUIDLabel3.Name = "GUIDLabel3" GUIDLabel3.Size = New System.Drawing.Size(49, 13) GUIDLabel3.TabIndex = 0 @@ -789,7 +789,7 @@ Partial Class frmMain 'NAMELabel2 ' NAMELabel2.AutoSize = True - NAMELabel2.Location = New System.Drawing.Point(46, 89) + NAMELabel2.Location = New System.Drawing.Point(11, 66) NAMELabel2.Name = "NAMELabel2" NAMELabel2.Size = New System.Drawing.Size(39, 13) NAMELabel2.TabIndex = 2 @@ -798,7 +798,7 @@ Partial Class frmMain 'SHORT_NAMELabel ' SHORT_NAMELabel.AutoSize = True - SHORT_NAMELabel.Location = New System.Drawing.Point(46, 116) + SHORT_NAMELabel.Location = New System.Drawing.Point(11, 93) SHORT_NAMELabel.Name = "SHORT_NAMELabel" SHORT_NAMELabel.Size = New System.Drawing.Size(58, 13) SHORT_NAMELabel.TabIndex = 4 @@ -807,7 +807,7 @@ Partial Class frmMain 'PRODUCT_VERSIONLabel ' PRODUCT_VERSIONLabel.AutoSize = True - PRODUCT_VERSIONLabel.Location = New System.Drawing.Point(46, 143) + PRODUCT_VERSIONLabel.Location = New System.Drawing.Point(11, 120) PRODUCT_VERSIONLabel.Name = "PRODUCT_VERSIONLabel" PRODUCT_VERSIONLabel.Size = New System.Drawing.Size(46, 13) PRODUCT_VERSIONLabel.TabIndex = 8 @@ -3410,7 +3410,7 @@ Partial Class frmMain 'GUIDTextBox3 ' Me.GUIDTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_MODULESBindingSource, "GUID", True)) - Me.GUIDTextBox3.Location = New System.Drawing.Point(171, 59) + Me.GUIDTextBox3.Location = New System.Drawing.Point(77, 36) Me.GUIDTextBox3.Name = "GUIDTextBox3" Me.GUIDTextBox3.ReadOnly = True Me.GUIDTextBox3.Size = New System.Drawing.Size(200, 21) @@ -3419,7 +3419,7 @@ Partial Class frmMain 'NAMETextBox2 ' Me.NAMETextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_MODULESBindingSource, "NAME", True)) - Me.NAMETextBox2.Location = New System.Drawing.Point(171, 86) + Me.NAMETextBox2.Location = New System.Drawing.Point(77, 63) Me.NAMETextBox2.Name = "NAMETextBox2" Me.NAMETextBox2.ReadOnly = True Me.NAMETextBox2.Size = New System.Drawing.Size(200, 21) @@ -3428,7 +3428,7 @@ Partial Class frmMain 'SHORT_NAMETextBox ' Me.SHORT_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_MODULESBindingSource, "SHORT_NAME", True)) - Me.SHORT_NAMETextBox.Location = New System.Drawing.Point(171, 113) + Me.SHORT_NAMETextBox.Location = New System.Drawing.Point(77, 90) Me.SHORT_NAMETextBox.Name = "SHORT_NAMETextBox" Me.SHORT_NAMETextBox.ReadOnly = True Me.SHORT_NAMETextBox.Size = New System.Drawing.Size(200, 21) @@ -3437,7 +3437,7 @@ Partial Class frmMain 'PRODUCT_VERSIONTextBox ' Me.PRODUCT_VERSIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_MODULESBindingSource, "PRODUCT_VERSION", True)) - Me.PRODUCT_VERSIONTextBox.Location = New System.Drawing.Point(171, 140) + Me.PRODUCT_VERSIONTextBox.Location = New System.Drawing.Point(77, 117) Me.PRODUCT_VERSIONTextBox.Name = "PRODUCT_VERSIONTextBox" Me.PRODUCT_VERSIONTextBox.ReadOnly = True Me.PRODUCT_VERSIONTextBox.Size = New System.Drawing.Size(200, 21) diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 85ebfdf..6c9ffdb 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -160,7 +160,7 @@ Public Class frmMain Return dt Catch ex As Exception - MessageBox.Show($"Error in GetClientsForUser: {ex.Message}") + ShowErrorMessage($"Error in GetClientsForUser", ex) Return Nothing End Try @@ -173,7 +173,7 @@ Public Class frmMain Return dt Catch ex As Exception - MessageBox.Show($"Error in GetGroupsForUser: {ex.Message}") + ShowErrorMessage($"Error in GetGroupsForUser", ex) Return Nothing End Try @@ -186,7 +186,7 @@ Public Class frmMain Return dt Catch ex As Exception - MessageBox.Show($"Error in GetModulesForUser: {ex.Message}") + ShowErrorMessage($"Error in GetModulesForUser", ex) Return Nothing End Try @@ -205,7 +205,7 @@ Public Class frmMain UpdateSavedLabel() End If Catch ex As Exception - MsgBox("Error while saving user: " & vbCrLf & ex.Message) + ShowErrorMessage($"Error while saving user", ex) End Try End Sub @@ -223,7 +223,7 @@ Public Class frmMain UpdateSavedLabel() End If Catch ex As Exception - MsgBox("Error while saving group: " & vbCrLf & ex.Message) + ShowErrorMessage($"Error while saving group", ex) End Try End Sub @@ -242,7 +242,7 @@ Public Class frmMain End If Catch ex As Exception - MsgBox("Error while saving client: " & vbCrLf & ex.Message) + ShowErrorMessage($"Error while saving client", ex) End Try End Sub @@ -266,7 +266,7 @@ Public Class frmMain TBDD_GROUPS_USERTableAdapter.Fill(UserDataSet.TBDD_GROUPS_USER) TBDD_USER_MODULESTableAdapter.Fill(UserDataSet.TBDD_USER_MODULES) Catch ex As Exception - MsgBox($"Error while loading UserData: {ex.Message}") + ShowErrorMessage($"Error while loading user data", ex) End Try End Sub From e01eeeba32aba2d48806d16350443e897ee162a8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Jun 2018 10:43:14 +0200 Subject: [PATCH 2/2] jj: fix attribute in db dialog --- DDUserManager/SetupWix/DatabaseDlg.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DDUserManager/SetupWix/DatabaseDlg.wxs b/DDUserManager/SetupWix/DatabaseDlg.wxs index 7e5a768..c65d0e1 100644 --- a/DDUserManager/SetupWix/DatabaseDlg.wxs +++ b/DDUserManager/SetupWix/DatabaseDlg.wxs @@ -5,7 +5,7 @@ - +