From b141334661f65b83982c7373a3011081457c6e37 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Mon, 21 Mar 2016 11:02:15 +0100 Subject: [PATCH 1/2] jj 21.03.2016 update translations --- app/DD-Record-Organiser/ClassControlProperties.vb | 7 ++++--- .../Strings/ControlProperties.Designer.vb | 9 +++++++++ .../Strings/ControlProperties.en.resx | 5 ++++- app/DD-Record-Organiser/Strings/ControlProperties.resx | 3 +++ app/DD-Record-Organiser/frmTool_ControlProperties.vb | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/DD-Record-Organiser/ClassControlProperties.vb b/app/DD-Record-Organiser/ClassControlProperties.vb index 74fae67..fa16060 100644 --- a/app/DD-Record-Organiser/ClassControlProperties.vb +++ b/app/DD-Record-Organiser/ClassControlProperties.vb @@ -310,7 +310,8 @@ Module ClassControlProperties End Set End Property - + + Public Property MasterDataId() As Integer Get Return _master_data_id @@ -568,7 +569,7 @@ Module ClassControlProperties End Property - + Public Property FormID() As Integer Get Return _form_id @@ -579,7 +580,7 @@ Module ClassControlProperties End Property - + Public Property ScreenID() As Integer Get Return _screen_id diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb b/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb index 23585a1..f861327 100644 --- a/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb +++ b/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb @@ -262,6 +262,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Die Id des Formulars, das über das Kontextmenü geöffnet wird. ähnelt. + ''' + Friend Shared ReadOnly Property desc_masterdataid() As String + Get + Return ResourceManager.GetString("desc_masterdataid", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Gibt an, ob das Feld mehrzeilig sein soll. ähnelt. ''' diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.en.resx b/app/DD-Record-Organiser/Strings/ControlProperties.en.resx index 675fb42..e939d6a 100644 --- a/app/DD-Record-Organiser/Strings/ControlProperties.en.resx +++ b/app/DD-Record-Organiser/Strings/ControlProperties.en.resx @@ -183,6 +183,9 @@ The element's location + + The Form's Id that will be opened via the contextmenu. + Should the element be a multiline field? @@ -208,7 +211,7 @@ The element's size - Gibt die Datenbank-Abfrage für dieses Element an. Es können @RECORD_ID und @FORM_ID als Platzhalter verwendet werden. The database query for this element. @RECORD_ID and @FORM_ID can be used as placeholders. Dynamic values from other controls can be inserted with the Syntax @controlid@. + The database query for this element. @RECORD_ID and @FORM_ID can be used as placeholders. Dynamic values from other controls can be inserted with the Syntax @controlid@. A list of static values seperated by a semicolon (;) diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.resx b/app/DD-Record-Organiser/Strings/ControlProperties.resx index bbbbcdd..877559d 100644 --- a/app/DD-Record-Organiser/Strings/ControlProperties.resx +++ b/app/DD-Record-Organiser/Strings/ControlProperties.resx @@ -183,6 +183,9 @@ Gibt die Position des Elements an. + + Die Id des Formulars, das über das Kontextmenü geöffnet wird. + Gibt an, ob das Feld mehrzeilig sein soll. diff --git a/app/DD-Record-Organiser/frmTool_ControlProperties.vb b/app/DD-Record-Organiser/frmTool_ControlProperties.vb index 4d8af5f..d8c8b33 100644 --- a/app/DD-Record-Organiser/frmTool_ControlProperties.vb +++ b/app/DD-Record-Organiser/frmTool_ControlProperties.vb @@ -260,7 +260,7 @@ ' Aktuelle Control Eigenschaften anzeigen Me.pgControlProperties.SelectedObject = props ' Fenster Titel aktualisieren - Me.Text = String.Format("Eigenschaften von {0}({1})", type, props.ID.ToString()) + Me.Text = String.Format("Properties of {0} ({1})", type, props.ID.ToString()) Catch ex As Exception MsgBox("Error in LoadControlProperties" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -599,7 +599,7 @@ End If If ClassControlCommands.DeleteControl() = True Then - MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information) + 'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information) CtrlBuilder.ClearControls() frmLevel_Designer.Instance.LoadControls() End If From 8a528a424f23722e06e896c65c633d1dda716315 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Mon, 21 Mar 2016 15:44:31 +0100 Subject: [PATCH 2/2] jj 21.03.2016 level designer 1 window, updated translations --- .../ClassControlProperties.vb | 37 +- .../DD-Record-Organiser.vbproj | 11 +- .../ModuleHelperMethods.vb | 24 +- .../My Project/licenses.licx | 11 +- .../Strings/ControlProperties.Designer.vb | 15 +- .../Strings/ControlProperties.en.resx | 7 +- .../Strings/ControlProperties.resx | 7 +- app/DD-Record-Organiser/cx4mqlti.wsf | 976 +++++++++ .../frmConfig_Basic.Designer.vb | 40 +- .../frmConfig_Basic.en-US.resx | 96 +- app/DD-Record-Organiser/frmConfig_Basic.resx | 1757 +++++++++-------- .../frmLevel_Designer.Designer.vb | 333 +++- .../frmLevel_Designer.en-US.resx | 68 +- .../frmLevel_Designer.resx | 850 +++++++- app/DD-Record-Organiser/frmLevel_Designer.vb | 583 ++++-- app/DD-Record-Organiser/frmMain.Designer.vb | 20 +- app/DD-Record-Organiser/frmMain.en-US.resx | 104 +- app/DD-Record-Organiser/frmMain.resx | 1696 ++++++++-------- 18 files changed, 4518 insertions(+), 2117 deletions(-) create mode 100644 app/DD-Record-Organiser/cx4mqlti.wsf diff --git a/app/DD-Record-Organiser/ClassControlProperties.vb b/app/DD-Record-Organiser/ClassControlProperties.vb index fa16060..3370ffd 100644 --- a/app/DD-Record-Organiser/ClassControlProperties.vb +++ b/app/DD-Record-Organiser/ClassControlProperties.vb @@ -34,23 +34,13 @@ Module ClassControlProperties ' +++++ ABSTRACT CLASSES +++++ Public MustInherit Class BaseProperties Private _id As Integer + Private _type As String Private _size As Size Private _location As Point Private _name As String Private _hint As String - - - Public Property Hint() As String - Get - Return _hint - End Get - Set(value As String) - _hint = value - End Set - End Property - - + Public Property ID() As Integer @@ -62,6 +52,29 @@ Module ClassControlProperties End Set End Property + + + + Public Property ControlType() As String + Get + Return _type + End Get + Set(value As String) + _type = value + End Set + End Property + + + + Public Property Hint() As String + Get + Return _hint + End Get + Set(value As String) + _hint = value + End Set + End Property + Public Property Size() As Size diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index b81ad42..be50436 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -211,11 +211,6 @@ True - - False - ..\..\lib\SnapPanelControl\SnapPanelControl.dll - True - @@ -1232,6 +1227,12 @@ + + + {9B1BBAC7-F595-43BA-8B54-CF2B595847CD} + SnapPanelControl + +