Merge pull request #46 from tomaz82/misc

Misc

Author: JockeJarre

b2sbackglassdesigner/b2sbackglassdesigner/classes/B2S/GeneralData.vb

@@ -42,8 +42,15 @@
             IsDirty = True
             Save()
         End Sub
-        Public Sub RemoveImageSet(ByVal index As Integer)
-
+        Public Sub RemoveImageSet(ByVal index As Integer, ByVal type As eImageSetType)
+            Select Case type
+                Case eImageSetType.ReelImages
+                    ImportedReelImageSets.RemoveAt(index)
+                Case eImageSetType.CreditReelImages
+                    ImportedCreditReelImageSets.RemoveAt(index)
+                Case eImageSetType.LEDImages
+                    ImportedLEDImageSets.RemoveAt(index)
+            End Select
             IsDirty = True
             Save()
         End Sub

b2sbackglassdesigner/b2sbackglassdesigner/classes/Tab/B2STabPage.vb

@@ -43,7 +43,7 @@ Public Class B2STabPage
 
     Private PictureBox As B2SPictureBox = Nothing
     Private DMDPictureBox As B2SPictureBox = Nothing
-    Private ReadOnly Property CurrentPictureBox() As B2SPictureBox
+    Public ReadOnly Property CurrentPictureBox() As B2SPictureBox
         Get
             Return If(BackglassData IsNot Nothing, If(BackglassData.IsDMDImageShown, DMDPictureBox, PictureBox), Nothing)
         End Get

b2sbackglassdesigner/b2sbackglassdesigner/formDesigner.vb

@@ -40,7 +40,8 @@ Public Class formDesigner
 #Region "events"
 
     Private Sub formDesigner_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-
+        ' allow drag and drop
+        Me.AllowDrop = True
         ' start app title and status bar
         Me.Text = Headline
         'Me.KeyPreview = True
@@ -55,10 +56,9 @@ Public Class formDesigner
 
         ' listbox to undo
         Undo.ListBox = formToolUndo.lbHistory
-
     End Sub
-    Private Sub formDesigner_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
 
+    Private Sub formDesigner_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
         ' open up the tool windows
         For Each formName As String In MyBase.StartToolForms
             Select Case formName
@@ -89,8 +89,8 @@ Public Class formDesigner
         Catch ex As Exception
             MessageBox.Show(String.Format(My.Resources.MSG_StartupSaveError, ex.Message), AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
         End Try
-
     End Sub
+
     Private Sub formDesigner_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         Do While B2STab.TabPages.Count > 0
             B2STab.SelectedIndex = B2STab.TabPages.Count - 1
@@ -102,6 +102,48 @@ Public Class formDesigner
         Loop
     End Sub
 
+    Private Sub formDesigner_DragEnter(sender As System.Object, e As System.Windows.Forms.DragEventArgs) Handles Me.DragEnter
+        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            e.Effect = DragDropEffects.Copy
+        Else
+            e.Effect = DragDropEffects.None
+        End If
+    End Sub
+
+    Private Sub formDesigner_DragDrop(sender As System.Object, e As System.Windows.Forms.DragEventArgs) Handles Me.DragDrop
+        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            Dim file_paths As String() = CType(e.Data.GetData(DataFormats.FileDrop), String())
+            For Each file_path As String In file_paths
+                If (My.Computer.FileSystem.GetFileInfo(file_path).Extension = ".directb2s") Then
+                    LoadDirectB2S(file_path)
+                ElseIf (My.Computer.FileSystem.GetFileInfo(file_path).Extension = ".b2s") Then
+                    LoadB2S(file_path)
+                ElseIf (My.Computer.FileSystem.GetFileInfo(file_path).Extension = ".b2b") Then
+                    LoadB2B(file_path)
+                ElseIf (My.Computer.FileSystem.GetFileInfo(file_path).Extension = ".png") Then
+                    If Backglass.currentTabPage IsNot Nothing Then
+                        Dim image As Image = Bitmap.FromFile(file_path).Copy(True)
+
+                        If image IsNot Nothing Then
+                            If Not Backglass.currentTabPage.ShowIlluFrames Then
+                                tsmiShowIlluFrames.PerformClick()
+                            End If
+                            Dim name As String = IO.Path.GetFileNameWithoutExtension(file_path)
+                            Dim box As B2SPictureBox = Backglass.currentTabPage.CurrentPictureBox
+                            Dim location As Point = box.PointToClient(New Point(e.X, e.Y))
+                            If location.X < 0 Or location.X > box.Width Or location.Y < 0 Or location.Y > box.Height Then
+                                location = New Point(0, 0)
+                            End If
+                            Backglass.currentTabPage.Illumination_AddSnippit(name, image, New Point(location.X / box.Mouse.factor, location.Y / box.Mouse.factor))
+                            Backglass.currentData.Images.Insert(Images.eImageInfoType.Title4IlluminationSnippits, New Images.ImageInfo(Images.eImageInfoType.IlluminationSnippits, name, image))
+                            LoadToolResourcesForm()
+                        End If
+                    End If
+                End If
+            Next file_path
+        End If
+    End Sub
+
     Private Sub B2STab_LightsReportProgress(sender As Object, e As Illumination.Lights.LightsProgressEventArgs) Handles B2STab.LightsReportProgress
         ShowProgress(e.Progress)
     End Sub
@@ -391,23 +433,10 @@ Public Class formDesigner
                 .FileName = String.Empty
                 .InitialDirectory = BackglassProjectsPath
                 If .ShowDialog(Me) = DialogResult.OK Then
-                    Dim backglassdata As Backglass.Data = Nothing
-                    Cursor.Current = Cursors.WaitCursor
-                    save.LoadData(backglassdata, .FileName)
-                    Cursor.Current = Cursors.Default
-                    If backglassdata IsNot Nothing Then
-                        If backglassdata.IsBackup Then
-                            If MessageBox.Show(My.Resources.MSG_BackupFile, AppTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.No Then
-                                Exit Sub
-                            End If
-                        End If
-                        LoadData(backglassdata)
-                    End If
+                    LoadB2S(.FileName)
                 End If
             End With
-            ShowStatus()
         End Using
-        LockUnlockMenus()
     End Sub
     Private Sub OpenBackup_Click(sender As System.Object, e As System.EventArgs) Handles tsmiOpenBackup.Click
         Using filedialog As OpenFileDialog = New OpenFileDialog
@@ -416,22 +445,10 @@ Public Class formDesigner
                 .FileName = String.Empty
                 .InitialDirectory = BackglassProjectsPath
                 If .ShowDialog(Me) = DialogResult.OK Then
-                    Dim backglassdata As Backglass.Data = Nothing
-                    Cursor.Current = Cursors.WaitCursor
-                    save.LoadData(backglassdata, .FileName)
-                    Cursor.Current = Cursors.Default
-                    If backglassdata IsNot Nothing Then
-                        If backglassdata.IsBackup Then
-                            LoadData(backglassdata)
-                        Else
-                            MessageBox.Show(My.Resources.MSG_NoBackupFile, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
-                        End If
-                    End If
+                    LoadB2B(.FileName)
                 End If
             End With
-            ShowStatus()
         End Using
-        LockUnlockMenus()
     End Sub
 
     Private Sub Close_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tsmiClose.Click
@@ -524,19 +541,7 @@ Public Class formDesigner
                 .FileName = String.Empty
                 .InitialDirectory = If(LatestImportDirectory.Length, LatestImportDirectory, BackglassProjectsPath)
                 If .ShowDialog(Me) = DialogResult.OK Then
-                    Dim backglassdata As Backglass.Data = Nothing
-                    Cursor.Current = Cursors.WaitCursor
-                    LatestImportDirectory = IO.Path.GetDirectoryName(.FileName)
-                    SaveSettings()
-                    Try
-                        coding.ImportDirectB2SFile(backglassdata, .FileName)
-                        If backglassdata IsNot Nothing Then
-                            LoadData(backglassdata)
-                        End If
-                    Catch ex As Exception
-                        MessageBox.Show(My.Resources.MSG_ImportError2, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Error)
-                    End Try
-                    Cursor.Current = Cursors.Default
+                    LoadDirectB2S(.FileName)
                 End If
             End With
             ShowStatus()
@@ -582,18 +587,8 @@ Public Class formDesigner
     End Sub
     Private Sub OpenRecent_ChildClick(ByVal sender As Object, ByVal e As EventArgs)
         If TypeOf sender.Tag Is KeyValuePair(Of Integer, Recent.recentEntry) Then
-            Dim path As String = BackglassProjectsPath
-            Dim backglassdata As Backglass.Data = Nothing
-            Cursor.Current = Cursors.WaitCursor
-            If save.LoadData(backglassdata, IO.Path.Combine(path, sender.Tag.Value.Name) & ".b2s") Then
-                LoadData(backglassdata)
-            Else
-                MessageBox.Show(My.Resources.MSG_NoProjectFileFound, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
-                recent.RemoveFromRecentList(sender.Tag.Key)
-            End If
-            Cursor.Current = Cursors.Default
+            LoadB2S(IO.Path.Combine(BackglassProjectsPath, sender.Tag.Value.Name) & ".b2s")
         End If
-        ShowStatus()
     End Sub
 
     Private Sub ClearThisList_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tsmiClearThisList.Click
@@ -1160,7 +1155,6 @@ Public Class formDesigner
             If Not Backglass.currentTabPage.ShowIlluFrames Then
                 tsmiShowIlluFrames.PerformClick()
             End If
-            Backglass.currentTabPage.ShowIlluFrames = True
             ' add bulb
             Backglass.currentTabPage.Illumination_AddBulb()
         End If
@@ -1171,7 +1165,6 @@ Public Class formDesigner
             If Not Backglass.currentTabPage.ShowIlluFrames Then
                 tsmiShowIlluFrames.PerformClick()
             End If
-            Backglass.currentTabPage.ShowIlluFrames = True
             ' add bulb
             If formAddSnippit Is Nothing Then formAddSnippit = New formAddSnippit()
             formAddSnippit.ShowDialog(Me)
@@ -1435,6 +1428,66 @@ Public Class formDesigner
 
 #Region "private methods"
 
+    Private Sub LoadDirectB2S(ByVal filename As String)
+        Dim backglassdata As Backglass.Data = Nothing
+        Cursor.Current = Cursors.WaitCursor
+        LatestImportDirectory = IO.Path.GetDirectoryName(filename)
+        SaveSettings()
+        Try
+            coding.ImportDirectB2SFile(backglassdata, filename)
+            If backglassdata IsNot Nothing Then
+                LoadData(backglassdata)
+            End If
+        Catch ex As Exception
+            MessageBox.Show(My.Resources.MSG_ImportError2, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Error)
+        End Try
+        Cursor.Current = Cursors.Default
+        ShowStatus()
+        LockUnlockMenus()
+    End Sub
+
+    Private Sub LoadB2S(ByVal filename As String)
+        Dim backglassdata As Backglass.Data = Nothing
+        Cursor.Current = Cursors.WaitCursor
+        Try
+            save.LoadData(backglassdata, filename)
+            If backglassdata IsNot Nothing Then
+                If backglassdata.IsBackup Then
+                    If MessageBox.Show(My.Resources.MSG_BackupFile, AppTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Yes Then
+                        LoadData(backglassdata)
+                    End If
+                Else
+                    LoadData(backglassdata)
+                End If
+            End If
+        Catch ex As Exception
+            MessageBox.Show(My.Resources.MSG_ImportError2, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Error)
+        End Try
+        Cursor.Current = Cursors.Default
+        ShowStatus()
+        LockUnlockMenus()
+    End Sub
+
+    Private Sub LoadB2B(ByVal filename As String)
+        Dim backglassdata As Backglass.Data = Nothing
+        Cursor.Current = Cursors.WaitCursor
+        Try
+            save.LoadData(backglassdata, filename)
+            If backglassdata IsNot Nothing Then
+                If backglassdata.IsBackup Then
+                    LoadData(backglassdata)
+                Else
+                    MessageBox.Show(My.Resources.MSG_NoBackupFile, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
+                End If
+            End If
+        Catch ex As Exception
+            MessageBox.Show(My.Resources.MSG_ImportError2, AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Error)
+        End Try
+        Cursor.Current = Cursors.Default
+        ShowStatus()
+        LockUnlockMenus()
+    End Sub
+
     Private Function OpenSettings(ByVal newtable As Boolean, Optional ByVal savetableas As Boolean = False) As Boolean
         Dim ret As Boolean = False
         Dim isANewTable As Boolean = (newtable AndAlso Not savetableas)
@@ -1734,6 +1787,14 @@ Public Class formDesigner
                         formToolIllumination.rbAlignCenter.Checked = True
                     End If
                     formToolIllumination.MyFont = If(String.IsNullOrEmpty(.FontName), Nothing, New Font(.FontName, .FontSize, .FontStyle))
+
+                    formToolIllumination.ignoreChange = True
+                    formToolIllumination.txtLocationX.Text = .Location.X.ToString()
+                    formToolIllumination.txtLocationY.Text = .Location.Y.ToString()
+                    formToolIllumination.txtSizeWidth.Text = .Size.Width.ToString()
+                    formToolIllumination.txtSizeHeight.Text = .Size.Height.ToString()
+                    formToolIllumination.ignoreChange = False
+
                     formToolIllumination.ZOrder = .ZOrder
                     formToolIllumination.IsSnippit = .IsImageSnippit
                     formToolIllumination.SnippitType = .SnippitInfo.SnippitType
@@ -1763,6 +1824,13 @@ Public Class formDesigner
                 formToolIllumination.MyFont = Nothing
                 formToolIllumination.ZOrder = 0
                 formToolIllumination.IsSnippit = False
+
+                formToolIllumination.ignoreChange = True
+                formToolIllumination.txtLocationX.Text = ""
+                formToolIllumination.txtLocationY.Text = ""
+                formToolIllumination.txtSizeWidth.Text = ""
+                formToolIllumination.txtSizeHeight.Text = ""
+                formToolIllumination.ignoreChange = False
             End If
             ' set headlines and lock/unlock some fields
             If Backglass.currentData IsNot Nothing Then