Commit: 46 - pdfSecondMonitor (svn)

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

Commit MetaInfo

• Revision: 46 (tree)
• Time: 2018-11-26 16:42:55
• Author: bellyoshi

Log Message

Change Summary

• modified: pdfsecondmonitor/CtlImage.vb
• modified: pdfsecondmonitor/FormDispacher.vb
• modified: pdfsecondmonitor/My Project/Application.Designer.vb
• modified: pdfsecondmonitor/My Project/Application.myapp
• modified: pdfsecondmonitor/ctlMovie.vb
• modified: pdfsecondmonitor/ctlPdf.vb
• modified: pdfsecondmonitor/frmMovieViewer.vb
• modified: pdfsecondmonitor/frmOperation.Designer.vb
• modified: pdfsecondmonitor/frmOperation.vb
• modified: pdfsecondmonitor/startup.vb

Incremental Difference

--- pdfsecondmonitor/CtlImage.vb	(revision 45)
+++ pdfsecondmonitor/CtlImage.vb	(revision 46)
@@ -2,11 +2,7 @@
 
     Private _dispacher As FormDispacher = FormDispacher.GetInstance
 
-    Public ReadOnly Property PictureBox As PictureBox
-        Get
-            Return _dispacher.GetPictureBox
-        End Get
-    End Property
+    Private _pictureBox As PictureBox
 
     Private Sub btnRotate_Click(sender As Object, e As EventArgs) Handles btnRotate.Click
         Dim bmp As Bitmap = New Bitmap(_fileViewParam.FileName)
@@ -15,24 +11,20 @@
         '"FlipX"は水平方向に反転することを意味する
         bmp.RotateFlip(RotateFlipType.Rotate180FlipX)
         '表示
-        PictureBox.Image = bmp
+        _pictureBox.Image = bmp
     End Sub
 
-    Private Sub CtlImage_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
-    End Sub
-
     Private _fileViewParam As FileViewParam
 
     Public Sub SetFileInfo(f As FileViewParam)
         Me._fileViewParam = f
-        If _fileViewParam Is Nothing Then
-            _dispacher.HidePdfViewer()
-        Else
-            _dispacher.ShowPdfViewer()
+        If f Is Nothing Then
+            Return
         End If
-        PictureBox.ImageLocation = _fileViewParam.FileName
-        PictureBox.SizeMode = PictureBoxSizeMode.Zoom 'サイズ調整
+        _pictureBox = _dispacher.ShowImage()
+        _pictureBox.ImageLocation = _fileViewParam.FileName
+        _pictureBox.SizeMode = PictureBoxSizeMode.Zoom 'サイズ調整
 
 
     End Sub

--- pdfsecondmonitor/FormDispacher.vb	(revision 45)
+++ pdfsecondmonitor/FormDispacher.vb	(revision 46)
@@ -35,34 +35,17 @@
         Return instance
     End Function
 
-    Private _frmOperation As frmOperation
-    Public Sub ShowOperation()
-        Create(_frmOperation, GetType(frmOperation))
-        _frmOperation.Show()
-    End Sub
-
-
-    Public Sub ShowImage()
+    Public Function ShowImage() As PictureBox
         Show(_frmImageViewer, GetType(frmImageViewer))
-    End Sub
-    Private _frmImageViewer As frmImageViewer
-    Public Function GetPictureBox() As PictureBox
-        If _frmImageViewer Is Nothing Then
-            ShowImage()
-        End If
         Return _frmImageViewer.PictureBox1
     End Function
+    Private _frmImageViewer As frmImageViewer
 
-    Dim _frmPdfViewer As frmPdfViewer
 
+
     Private _frmMovieViewer As frmMovieViewer
-    Public Sub ShowMovie()
+    Public Function ShowMovie() As AxWMPLib.AxWindowsMediaPlayer
         Show(_frmMovieViewer, GetType(frmMovieViewer))
-    End Sub
-    Public Function GetPlayer() As AxWMPLib.AxWindowsMediaPlayer
-        If _frmMovieViewer Is Nothing Then
-            ShowMovie()
-        End If
         Return _frmMovieViewer.AxWindowsMediaPlayer1
     End Function
 
@@ -89,25 +72,18 @@
         targetForm.Show()
     End Sub
 
-    Public Sub HidePdfViewer()
-        _frmPdfViewer.Hide()
-    End Sub
-
-    Public Sub ShowPdfViewer()
+    Dim _frmPdfViewer As frmPdfViewer
+    Public Function ShowPdfViewer() As frmPdfViewer
         Show(_frmPdfViewer, GetType(frmPdfViewer))
-    End Sub
-
-    'Private _frmStartup As frmStartup
-    'Public Sub SetStartup(ByVal frm As frmStartup)
-    '    _frmStartup = frmStartup
-    'End Sub
-    Public Sub Close()
-        '特に処理なし
-    End Sub
-
-    Public Function GetFrmPdfViewer() As frmPdfViewer
         Return _frmPdfViewer
     End Function
 
 
+
+    Public Sub CloseViewers()
+        For Each frm In _secondMonitorWindows
+            frm.Close()
+        Next
+    End Sub
+
 End Class

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

--- pdfsecondmonitor/ctlMovie.vb	(revision 45)
+++ pdfsecondmonitor/ctlMovie.vb	(revision 46)
@@ -2,11 +2,7 @@
     Private _dispacher As FormDispacher = FormDispacher.GetInstance
 
 
-    Public ReadOnly Property player As AxWMPLib.AxWindowsMediaPlayer
-        Get
-            Return _dispacher.GetPlayer
-        End Get
-    End Property
+    Private player As AxWMPLib.AxWindowsMediaPlayer
 
     Private _fileViewParam As FileViewParam
 
@@ -13,10 +9,10 @@
     Public Sub SetFileInfo(f As FileViewParam)
         Me._fileViewParam = f
         If _fileViewParam Is Nothing Then
+            Return
+        End If
+        player = _dispacher.ShowMovie()
 
-        Else
-            _dispacher.ShowMovie()
-        End If
         player.URL = _fileViewParam.FileName
         player.uiMode = "none"
         player.stretchToFit = True

--- pdfsecondmonitor/ctlPdf.vb	(revision 45)
+++ pdfsecondmonitor/ctlPdf.vb	(revision 46)
@@ -2,28 +2,23 @@
 
     Private _dispacher As FormDispacher = FormDispacher.GetInstance
 
-    ReadOnly Property frmPdfViewer As frmPdfViewer
-        Get
-            Return _dispacher.GetFrmPdfViewer
-        End Get
-    End Property
+    Private _viewer As frmPdfViewer
 
 
 
 
-
 #Region "ページ移動"
 
     Private Sub btnFirst_Click(sender As Object, e As EventArgs) Handles btnPDFFirst.Click
-        frmPdfViewer.FirstPage()
+        _viewer.FirstPage()
     End Sub
 
     Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnPDFNext.Click
-        frmPdfViewer.NextPage()
+        _viewer.NextPage()
     End Sub
 
     Private Sub btnBack_Click(sender As Object, e As EventArgs) Handles btnPDFBack.Click
-        frmPdfViewer.PrePage()
+        _viewer.PrePage()
     End Sub
 
     Private Sub btnLast_Click(sender As Object, e As EventArgs) Handles btnPDFLast.Click
@@ -37,7 +32,8 @@
     Private _fileViewParam As FileViewParam
     Public Sub SetFileInfo(f As FileViewParam)
         Me._fileViewParam = f
-        frmPdfViewer.OpenFile(f.FileName)
+        _viewer = _dispacher.ShowPdfViewer()
+        _viewer.OpenFile(f.FileName)
     End Sub
 
 

--- pdfsecondmonitor/frmMovieViewer.vb	(revision 45)
+++ pdfsecondmonitor/frmMovieViewer.vb	(revision 46)
@@ -1,5 +1,3 @@
 Public Class frmMovieViewer
-    Private Sub CtlMoviePlayer1_Load(sender As Object, e As EventArgs)
 
-    End Sub
 End Class
\ No newline at end of file

--- pdfsecondmonitor/frmOperation.Designer.vb	(revision 45)
+++ pdfsecondmonitor/frmOperation.Designer.vb	(revision 46)
@@ -38,10 +38,9 @@
         Me.Label6 = New System.Windows.Forms.Label()
         Me.txtPDFFileName = New System.Windows.Forms.TextBox()
         Me.btnDelete = New System.Windows.Forms.Button()
-        Me.btnInsert = New System.Windows.Forms.Button()
         Me.lstPDFFiles = New System.Windows.Forms.ListBox()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnUnSelect = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         Me.tpMediaPlayer.SuspendLayout()
@@ -177,15 +176,6 @@
         Me.btnDelete.Text = "削除"
         Me.btnDelete.UseVisualStyleBackColor = True
         '
-        'btnInsert
-        '
-        Me.btnInsert.Location = New System.Drawing.Point(107, 598)
-        Me.btnInsert.Name = "btnInsert"
-        Me.btnInsert.Size = New System.Drawing.Size(92, 23)
-        Me.btnInsert.TabIndex = 20
-        Me.btnInsert.Text = "リストに追加"
-        Me.btnInsert.UseVisualStyleBackColor = True
-        '
         'lstPDFFiles
         '
         Me.lstPDFFiles.FormattingEnabled = True
@@ -195,14 +185,14 @@
         Me.lstPDFFiles.Size = New System.Drawing.Size(308, 349)
         Me.lstPDFFiles.TabIndex = 19
         '
-        'Button1
+        'btnUnSelect
         '
-        Me.Button1.Location = New System.Drawing.Point(43, 114)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(299, 23)
-        Me.Button1.TabIndex = 20
-        Me.Button1.Text = "背景テキスト"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.btnUnSelect.Location = New System.Drawing.Point(53, 126)
+        Me.btnUnSelect.Name = "btnUnSelect"
+        Me.btnUnSelect.Size = New System.Drawing.Size(267, 23)
+        Me.btnUnSelect.TabIndex = 20
+        Me.btnUnSelect.Text = "選択解除"
+        Me.btnUnSelect.UseVisualStyleBackColor = True
         '
         'Button2
         '
@@ -220,10 +210,9 @@
         Me.ClientSize = New System.Drawing.Size(1168, 649)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.btnUnSelect)
         Me.Controls.Add(Me.tbcFileOpes)
         Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.btnInsert)
         Me.Controls.Add(Me.btnDelete)
         Me.Controls.Add(Me.lstPDFFiles)
         Me.Controls.Add(Me.txtPDFFileName)
@@ -248,11 +237,10 @@
     Friend WithEvents tbcFileOpes As TabControl
     Friend WithEvents tpAdobePDF As TabPage
     Friend WithEvents txtPDFFileName As TextBox
-    Friend WithEvents btnInsert As Button
     Friend WithEvents lstPDFFiles As ListBox
     Friend WithEvents btnDelete As Button
     Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
-    Friend WithEvents Button1 As Button
+    Friend WithEvents btnUnSelect As Button
     Friend WithEvents Label6 As Label
     Friend WithEvents Button2 As Button
     Friend WithEvents tpImage As TabPage

--- pdfsecondmonitor/frmOperation.vb	(revision 45)
+++ pdfsecondmonitor/frmOperation.vb	(revision 46)
@@ -85,8 +85,8 @@
 
     Private Sub frmOperation_FormClosed(sender As Object, e As FormClosedEventArgs) Handles MyBase.FormClosed
         AppSettingSave()
-        _dispacher.Close()
 
+
     End Sub
 #End Region
 
@@ -170,13 +170,11 @@
         Dim ext = IO.Path.GetExtension(fileviewinfo.FileName)
         If IsContain(ext, {".pdf"}) Then
             tbcFileOpes.SelectTab(tpAdobePDF.TabIndex)
-            _dispacher.ShowPdfViewer()
             CtlPdf1.SetFileInfo(fileviewinfo)
 
         ElseIf IsImageExt(ext) Then
             tbcFileOpes.SelectTab(tpImage.TabIndex)
             CtlImage1.SetFileInfo(fileviewinfo)
-            _dispacher.ShowImage()
         ElseIf IsMovieExt(ext) Then
             tbcFileOpes.SelectTab(tpMediaPlayer.TabIndex)
             CtlMovie1.SetFileInfo(fileviewinfo)
@@ -225,6 +223,9 @@
 
     End Sub
 
+    Private Sub btnUnSelect_Click(sender As Object, e As EventArgs) Handles btnUnSelect.Click
+        _dispacher.CloseViewers()
+    End Sub
 
 
 
@@ -231,6 +232,7 @@
 
 
 
+
 #End Region
 
 End Class
\ No newline at end of file

--- pdfsecondmonitor/startup.vb	(revision 45)
+++ pdfsecondmonitor/startup.vb	(revision 46)
@@ -1,7 +1,7 @@
 Public Class startup
     Private Sub startup_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Dim dis = FormDispacher.GetInstance
-        dis.ShowOperation()
 
+
     End Sub
 End Class
\ No newline at end of file