Commit: 40 - pdfSecondMonitor (svn)

デュアルディスプレイのセカンドモニターにＰＤＦ、動画、画像を表示。

Commit MetaInfo

• Revision: 40 (tree)
• Time: 2018-10-04 16:29:31
• Author: bellyoshi

Log Message

Change Summary

• modified: pdfsecondmonitor/FormDispacher.vb
• modified: pdfsecondmonitor/My Project/Application.Designer.vb
• modified: pdfsecondmonitor/My Project/Application.myapp
• modified: pdfsecondmonitor/frmOperation.vb
• modified: pdfsecondmonitor/pdfsecondmonitor.vbproj

Incremental Difference

--- pdfsecondmonitor/FormDispacher.vb	(revision 39)
+++ pdfsecondmonitor/FormDispacher.vb	(revision 40)
@@ -21,7 +21,9 @@
     Private _secondMonitorWindows As New List(Of Form)
 
     Private Sub registViewer(frm As Form)
-        _secondMonitorWindows.Add(frm)
+        If Not _secondMonitorWindows.Contains(frm) Then
+            _secondMonitorWindows.Add(frm)
+        End If
         SetViewerBounds(frm)
     End Sub
 
@@ -35,23 +37,15 @@
 
     Private _frmOperation As frmOperation
     Public Sub ShowOperation()
-        If _frmOperation Is Nothing Then
-            _frmOperation = New frmOperation
-        End If
+        Create(_frmOperation, GetType(frmOperation))
         _frmOperation.Show()
     End Sub
     Public Function GetAxPDF() As AxAcroPDFLib.AxAcroPDF
-
         Return _frmPdfViewer.AxAcroPDF1
-
     End Function
 
     Public Sub ShowImage()
-        If _frmImageViewer Is Nothing Then
-            _frmImageViewer = New frmImageViewer
-            registViewer(_frmImageViewer)
-        End If
-        _frmImageViewer.Show()
+        Show(_frmImageViewer, GetType(frmImageViewer))
     End Sub
     Private _frmImageViewer As frmImageViewer
     Public Function GetPictureBox() As PictureBox
@@ -65,11 +59,7 @@
 
     Private _frmMovieViewer As frmMovieViewer
     Public Sub ShowMovie()
-        If _frmMovieViewer Is Nothing Then
-            _frmMovieViewer = New frmMovieViewer
-            registViewer(_frmMovieViewer)
-        End If
-        _frmMovieViewer.Show()
+        Show(_frmMovieViewer, GetType(frmMovieViewer))
     End Sub
     Public Function GetPlayer() As AxWMPLib.AxWindowsMediaPlayer
         If _frmMovieViewer Is Nothing Then
@@ -78,27 +68,43 @@
         Return _frmMovieViewer.AxWindowsMediaPlayer1
     End Function
 
+    Public Sub Create(ByRef form As Form, ByVal formType As Type)
+        If form Is Nothing Then
+            form = Activator.CreateInstance(formType)
+        End If
 
+    End Sub
+
+    Private Sub HideOther(ByVal targetForm As Form)
+        For Each frm In _secondMonitorWindows
+            If frm Is targetForm Then
+                Continue For
+            End If
+            frm.Hide()
+        Next
+    End Sub
+
+    Public Sub Show(ByRef targetForm As Form, ByVal formType As Type)
+        Create(targetForm, formType)
+        registViewer(targetForm)
+        HideOther(targetForm)
+        targetForm.Show()
+    End Sub
+
     Public Sub HidePdfViewer()
         _frmPdfViewer.Hide()
     End Sub
 
     Public Sub ShowPdfViewer()
-        If _frmPdfViewer Is Nothing Then
-            _frmPdfViewer = New frmPdfViewer
-            registViewer(_frmPdfViewer)
-        End If
-        _frmPdfViewer.Show()
-
+        Show(_frmPdfViewer, GetType(frmPdfViewer))
     End Sub
 
-    Private _frmStartup As frmStartup
-    Public Sub SetStartup(ByVal frm As frmStartup)
-        _frmStartup = frmStartup
-    End Sub
+    'Private _frmStartup As frmStartup
+    'Public Sub SetStartup(ByVal frm As frmStartup)
+    '    _frmStartup = frmStartup
+    'End Sub
     Public Sub Close()
-        _frmPdfViewer.Close()
-        _frmStartup.Close()
+        '特に処理なし
     End Sub
 
     Public Sub frmPdfViewHideNavi()

--- pdfsecondmonitor/My Project/Application.Designer.vb	(revision 39)
+++ pdfsecondmonitor/My Project/Application.Designer.vb	(revision 40)
@@ -32,7 +32,7 @@
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.pdfsecondmonitor.frmStartup
+            Me.MainForm = Global.pdfsecondmonitor.frmOperation
         End Sub
     End Class
 End Namespace

--- pdfsecondmonitor/frmOperation.vb	(revision 39)
+++ pdfsecondmonitor/frmOperation.vb	(revision 40)
@@ -172,6 +172,7 @@
         ElseIf IsImageExt(ext) Then
             tbcFileOpes.SelectTab(tpImage.TabIndex)
             CtlImage1.SetFileInfo(fileviewinfo)
+            _dispacher.ShowImage()
         ElseIf IsMovieExt(ext) Then
             tbcFileOpes.SelectTab(tpMediaPlayer.TabIndex)
             CtlMovie1.SetFileInfo(fileviewinfo)