Commit 8dfd7ca7 authored by Pilzinsel64's avatar Pilzinsel64
Browse files

merge branche 'master' into dotnet5

parents efbc88f6 d8d79687
......@@ -30,11 +30,12 @@ Partial Class FormMain
Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem()
Me.ButtonItem_EditProfile = New DevComponents.DotNetBar.ButtonItem()
Me.ButtonItem_ForceUpperCase = New DevComponents.DotNetBar.ButtonItem()
Me.ButtonItem_AutoDetectStartEndQuotationMarks = New DevComponents.DotNetBar.ButtonItem()
Me.ButtonItem_AutoFocusEditorTextBox = New DevComponents.DotNetBar.ButtonItem()
Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
Me.Bar2 = New DevComponents.DotNetBar.Bar()
Me.LabelItem_OtherStatus = New DevComponents.DotNetBar.LabelItem()
Me.RibbonControl1 = New DevComponents.DotNetBar.RibbonControl()
Me.ButtonItem_AutoDetectStartEndQuotationMarks = New DevComponents.DotNetBar.ButtonItem()
CType(Me.Bar1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Bar2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
......@@ -54,34 +55,47 @@ Partial Class FormMain
'
'ButtonItem_Load
'
Me.ButtonItem_Load.Name = "ButtonItem_Load"
resources.ApplyResources(Me.ButtonItem_Load, "ButtonItem_Load")
Me.ButtonItem_Load.Name = "ButtonItem_Load"
'
'ButtonItem_Save
'
resources.ApplyResources(Me.ButtonItem_Save, "ButtonItem_Save")
Me.ButtonItem_Save.Enabled = False
Me.ButtonItem_Save.Name = "ButtonItem_Save"
resources.ApplyResources(Me.ButtonItem_Save, "ButtonItem_Save")
'
'ButtonItem1
'
resources.ApplyResources(Me.ButtonItem1, "ButtonItem1")
Me.ButtonItem1.BeginGroup = True
Me.ButtonItem1.Name = "ButtonItem1"
Me.ButtonItem1.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem_EditProfile, Me.ButtonItem_ForceUpperCase, Me.ButtonItem_AutoDetectStartEndQuotationMarks})
resources.ApplyResources(Me.ButtonItem1, "ButtonItem1")
Me.ButtonItem1.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem_EditProfile, Me.ButtonItem_ForceUpperCase, Me.ButtonItem_AutoDetectStartEndQuotationMarks, Me.ButtonItem_AutoFocusEditorTextBox})
'
'ButtonItem_EditProfile
'
resources.ApplyResources(Me.ButtonItem_EditProfile, "ButtonItem_EditProfile")
Me.ButtonItem_EditProfile.BeginGroup = True
Me.ButtonItem_EditProfile.Name = "ButtonItem_EditProfile"
resources.ApplyResources(Me.ButtonItem_EditProfile, "ButtonItem_EditProfile")
'
'ButtonItem_ForceUpperCase
'
resources.ApplyResources(Me.ButtonItem_ForceUpperCase, "ButtonItem_ForceUpperCase")
Me.ButtonItem_ForceUpperCase.AutoCheckOnClick = True
Me.ButtonItem_ForceUpperCase.Checked = True
Me.ButtonItem_ForceUpperCase.Name = "ButtonItem_ForceUpperCase"
resources.ApplyResources(Me.ButtonItem_ForceUpperCase, "ButtonItem_ForceUpperCase")
'
'ButtonItem_AutoDetectStartEndQuotationMarks
'
resources.ApplyResources(Me.ButtonItem_AutoDetectStartEndQuotationMarks, "ButtonItem_AutoDetectStartEndQuotationMarks")
Me.ButtonItem_AutoDetectStartEndQuotationMarks.AutoCheckOnClick = True
Me.ButtonItem_AutoDetectStartEndQuotationMarks.Checked = True
Me.ButtonItem_AutoDetectStartEndQuotationMarks.Name = "ButtonItem_AutoDetectStartEndQuotationMarks"
'
'ButtonItem_AutoFocusEditorTextBox
'
resources.ApplyResources(Me.ButtonItem_AutoFocusEditorTextBox, "ButtonItem_AutoFocusEditorTextBox")
Me.ButtonItem_AutoFocusEditorTextBox.AutoCheckOnClick = True
Me.ButtonItem_AutoFocusEditorTextBox.Name = "ButtonItem_AutoFocusEditorTextBox"
'
'StyleManager1
'
......@@ -90,9 +104,9 @@ Partial Class FormMain
'
'Bar2
'
resources.ApplyResources(Me.Bar2, "Bar2")
Me.Bar2.AntiAlias = True
Me.Bar2.BarType = DevComponents.DotNetBar.eBarType.StatusBar
resources.ApplyResources(Me.Bar2, "Bar2")
Me.Bar2.IsMaximized = False
Me.Bar2.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem_OtherStatus})
Me.Bar2.Name = "Bar2"
......@@ -102,12 +116,13 @@ Partial Class FormMain
'
'LabelItem_OtherStatus
'
resources.ApplyResources(Me.LabelItem_OtherStatus, "LabelItem_OtherStatus")
Me.LabelItem_OtherStatus.ItemAlignment = DevComponents.DotNetBar.eItemAlignment.Far
Me.LabelItem_OtherStatus.Name = "LabelItem_OtherStatus"
resources.ApplyResources(Me.LabelItem_OtherStatus, "LabelItem_OtherStatus")
'
'RibbonControl1
'
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
'
'
......@@ -115,7 +130,6 @@ Partial Class FormMain
Me.RibbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
Me.RibbonControl1.CanCustomize = False
Me.RibbonControl1.CaptionVisible = True
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.ForeColor = System.Drawing.Color.Black
Me.RibbonControl1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
Me.RibbonControl1.Name = "RibbonControl1"
......@@ -137,13 +151,6 @@ Partial Class FormMain
Me.RibbonControl1.SystemText.QatRemoveItemText = resources.GetString("RibbonControl1.SystemText.QatRemoveItemText")
Me.RibbonControl1.TabGroupHeight = 14
'
'ButtonItem_AutoDetectStartEndQuotationMarks
'
Me.ButtonItem_AutoDetectStartEndQuotationMarks.AutoCheckOnClick = True
Me.ButtonItem_AutoDetectStartEndQuotationMarks.Checked = True
Me.ButtonItem_AutoDetectStartEndQuotationMarks.Name = "ButtonItem_AutoDetectStartEndQuotationMarks"
resources.ApplyResources(Me.ButtonItem_AutoDetectStartEndQuotationMarks, "ButtonItem_AutoDetectStartEndQuotationMarks")
'
'FormMain
'
resources.ApplyResources(Me, "$this")
......@@ -170,4 +177,5 @@ Partial Class FormMain
Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
Friend WithEvents ButtonItem_ForceUpperCase As DevComponents.DotNetBar.ButtonItem
Friend WithEvents ButtonItem_AutoDetectStartEndQuotationMarks As DevComponents.DotNetBar.ButtonItem
Friend WithEvents ButtonItem_AutoFocusEditorTextBox As DevComponents.DotNetBar.ButtonItem
End Class
......@@ -123,14 +123,17 @@
<data name="ButtonItem_Save.Text" xml:space="preserve">
<value>Speichern</value>
</data>
<data name="ButtonItem1.Text" xml:space="preserve">
<value>Optionen</value>
</data>
<data name="ButtonItem_EditProfile.Text" xml:space="preserve">
<value>Text-Profile organisieren</value>
</data>
<data name="ButtonItem_ForceUpperCase.Text" xml:space="preserve">
<value>Großbuchstaben für Level- und Sternennamen erzwingen</value>
</data>
<data name="ButtonItem1.Text" xml:space="preserve">
<value>Optionen</value>
<data name="ButtonItem_AutoFocusEditorTextBox.Text" xml:space="preserve">
<value>Editor-Textbox automatisch fokusieren</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
This diff is collapsed.
......@@ -43,6 +43,7 @@ Public Class FormMain
Settings.Load(settingsFilePath)
ButtonItem_AutoDetectStartEndQuotationMarks.Checked = Settings.Instance.AutoDetectStartEndQuotationMarks
ButtonItem_ForceUpperCase.Checked = Settings.Instance.ForceUppercaseForActAndLevelNames
ButtonItem_AutoFocusEditorTextBox.Checked = Settings.Instance.AutoFocusEditorTextBox
tabTextManager.Enabled = False
finishedLoading = True
......@@ -53,6 +54,7 @@ Public Class FormMain
Private Sub LoadSettingsToController(reloadCurrenTable As Boolean)
controller.ForceUppercaseForActAndLevelNames = Settings.Instance.ForceUppercaseForActAndLevelNames
controller.AutoDetectStartEndQuotationMarks = Settings.Instance.AutoDetectStartEndQuotationMarks
controller.AutoFocusEditTextBox = Settings.Instance.AutoFocusEditorTextBox
If finishedLoading AndAlso reloadCurrenTable Then
tabTextManager.SetGuiForTextTable()
......@@ -139,4 +141,9 @@ Public Class FormMain
Private Sub RomManager_GettingDefaultTextProfileInfo(rommgr As RomManager, e As GetTextProfileInfoEventArgs) Handles RomManager.GettingDefaultTextProfileInfo
e.ProfileInfo = controller.GetDefaultTextProfileInfo
End Sub
Private Sub ButtonItem_AutoFocusEditorTextBox_CheckedChanged(sender As Object, e As EventArgs) Handles ButtonItem_AutoFocusEditorTextBox.CheckedChanged
Settings.Instance.AutoFocusEditorTextBox = ButtonItem_AutoFocusEditorTextBox.Checked
LoadSettingsToController(False)
End Sub
End Class
......@@ -5,6 +5,7 @@ Public Class Settings
Public Property ForceUppercaseForActAndLevelNames As Boolean = True
Public Property AutoDetectStartEndQuotationMarks As Boolean = True
Public Property AutoFocusEditorTextBox As Boolean = False
#Region "Save/Load"
......
{
"ForceUppercaseForActAndLevelNames": true,
"AutoDetectStartEndQuotationMarks": true
}
\ No newline at end of file
......@@ -6717,6 +6717,13 @@
Gets a value indicating whether the tree node is in the selected state. true if the tree node is in the selected state; otherwise, false.
</summary>
</member>
<member name="M:DevComponents.AdvTree.Node.SetSelected(System.Boolean)">
<summary>
Select or deselect this Node in tree view.
</summary>
<param name="value">The value that represents if the new state should be selected or not.</param>
<returns>Returns true if selection/deselection was successfull, else returns false.</returns>
</member>
<member name="P:DevComponents.AdvTree.Node.Selectable">
<summary>
Gets or sets whether node can be selected by user by clicking it with the mouse or using keyboard. Default value is true.
......@@ -7538,6 +7545,18 @@
<param name="searchAllChildren">true to search child nodes of tree nodes; otherwise, false. </param>
<returns>An array of Node objects whose Name property matches the specified key.</returns>
</member>
<member name="P:DevComponents.AdvTree.NodeCollection.AllNodes">
<summary>
Gets the Node collection to enumerate easier.
</summary>
<returns></returns>
</member>
<member name="M:DevComponents.AdvTree.NodeCollection.ToArray">
<summary>
Copies all Nodes to an array.
</summary>
<returns></returns>
</member>
<member name="M:DevComponents.AdvTree.NodeComparer.#ctor">
<summary>
Creates new instance of NodeComparer class. You can use NodeComparer to sort the nodes by specific column/cell by calling
No preview for this file type
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment