Merge pull request #8 from Felix-MoBu/0.5.9

0.5.9
Felix-MoBu · Jul 27, 2023 · dcf3c1f · dcf3c1f
2 parents b741a48 + b2cbc07
commit dcf3c1f
Show file tree

Hide file tree

Showing 22 changed files with 867 additions and 532 deletions.
diff --git a/OMSI-Content-Tool/Forms/Frm_Einst.Designer.vb b/OMSI-Content-Tool/Forms/Frm_Einst.Designer.vb
diff --git a/OMSI-Content-Tool/Forms/Frm_Einst.vb b/OMSI-Content-Tool/Forms/Frm_Einst.vb
@@ -13,10 +13,11 @@ Public Class Frm_Einst
         Settings.BackupAnlegen = CBBackup.Checked
         Settings.LogDebug = CBLogDebug.Checked
         Settings.o3dAutoConvert = CBautoO3d.Checked
+        Settings.AutoLoadTrailer = CBAutoLoadTrailer.Checked
         Settings.CreatorID = Convert.ToInt32(TBCreatorID.Text)
         Settings.NickName = TBNickname.Text
 
-        Settings.GitShowInMenue = CBGitInMenue.Checked
+        Settings.UseGit = CBUseGit.Checked
         Settings.GitAutoCommit = CBGitAutoCommit.Checked
         Settings.LogGit = CBLogGit.Checked
 
@@ -85,9 +86,10 @@ Public Class Frm_Einst
         CBBackup.Checked = Settings.BackupAnlegen
         CBLogDebug.Checked = Settings.LogDebug
         CBautoO3d.Checked = Settings.o3dAutoConvert
+        CBAutoLoadTrailer.Checked = Settings.AutoLoadTrailer
         TBCreatorID.Text = Convert.ToString(Settings.CreatorID)
         TBNickname.Text = Settings.NickName
-        CBGitInMenue.Checked = Settings.GitShowInMenue
+        CBUseGit.Checked = Settings.UseGit
         CBGitAutoCommit.Checked = Settings.GitAutoCommit
         DDInternalClipboard.SelectedIndex = Settings.Point3DInternalClipboard
 
@@ -232,7 +234,7 @@ Public Class Frm_Einst
 
     Private Sub BTAnmelden_Click(sender As Object, e As EventArgs) Handles BTAnmelden.Click
         If checkLogin(TBMail.Text, TBPassword.Text) Then
-            Settings.eMail = TBMail.Text
+            Settings.EMail = TBMail.Text
             Log.Add("Im Online-Bereich angemeldet.")
             MsgBox("Anmeldung erfolgreich! Anwendung bitte neu starten.")
             BTAnmelden.Enabled = False
@@ -245,7 +247,7 @@ Public Class Frm_Einst
     End Sub
 
     Private Sub BTAbmelden_Click(sender As Object, e As EventArgs) Handles BTAbmelden.Click
-        Settings.eMail = ""
+        Settings.EMail = ""
         Log.Add("Im Online-Bereich abgemeldet.")
         BTAnmelden.Enabled = True
         BTAbmelden.Enabled = False
@@ -328,7 +330,7 @@ Public Class Frm_Einst
         End If
     End Sub
 
-    Private Sub CBGitInMenue_CheckedChanged(sender As Object, e As EventArgs) Handles CBGitInMenue.CheckedChanged
-        Frm_Main.GitToolStripMenuItem.Visible = CBGitInMenue.Checked
+    Private Sub CBGitInMenue_CheckedChanged(sender As Object, e As EventArgs) Handles CBUseGit.CheckedChanged
+        Frm_Main.GitToolStripMenuItem.Visible = CBUseGit.Checked
     End Sub
 End Class
diff --git a/OMSI-Content-Tool/Forms/Frm_FindMesh.vb b/OMSI-Content-Tool/Forms/Frm_FindMesh.vb
@@ -14,6 +14,12 @@ Public Class Frm_FindMesh
 
     Private Sub TBSuchen_KeyDown(sender As Object, e As KeyEventArgs) Handles TBSuchen.KeyDown
         Select Case e.KeyCode
+            Case Keys.Up
+                Frm_Main.UpArrow()
+                e.Handled = True
+            Case Keys.Down
+                Frm_Main.DownArrow()
+                e.Handled = True
             Case Keys.Enter
                 suchen()
                 e.Handled = True