Commit: 52 - pdfSecondMonitor (svn)

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

Commit MetaInfo

• Revision: 52 (tree)
• Time: 2018-12-20 17:59:09
• Author: bellyoshi

Log Message

Change Summary

• modified: pdfsecondmonitor/frmOperation.Designer.vb
• modified: pdfsecondmonitor/frmOperation.vb

Incremental Difference

--- pdfsecondmonitor/frmOperation.Designer.vb	(revision 51)
+++ pdfsecondmonitor/frmOperation.Designer.vb	(revision 52)
@@ -29,12 +29,9 @@
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.tpMediaPlayer = New System.Windows.Forms.TabPage()
-        Me.CtlMovie1 = New pdfsecondmonitor.ctlMovie()
         Me.tbcFileOpes = New System.Windows.Forms.TabControl()
         Me.tpAdobePDF = New System.Windows.Forms.TabPage()
-        Me.CtlPdf1 = New pdfsecondmonitor.ctlPdf()
         Me.tpImage = New System.Windows.Forms.TabPage()
-        Me.CtlImage1 = New pdfsecondmonitor.CtlImage()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.txtPDFFileName = New System.Windows.Forms.TextBox()
         Me.btnDelete = New System.Windows.Forms.Button()
@@ -41,7 +38,10 @@
         Me.lstPDFFiles = New System.Windows.Forms.ListBox()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.btnUnSelect = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnFileAdd = New System.Windows.Forms.Button()
+        Me.CtlPdf1 = New pdfsecondmonitor.ctlPdf()
+        Me.CtlMovie1 = New pdfsecondmonitor.ctlMovie()
+        Me.CtlImage1 = New pdfsecondmonitor.CtlImage()
         Me.GroupBox1.SuspendLayout()
         Me.tpMediaPlayer.SuspendLayout()
         Me.tbcFileOpes.SuspendLayout()
@@ -96,13 +96,6 @@
         Me.tpMediaPlayer.Text = "動画"
         Me.tpMediaPlayer.UseVisualStyleBackColor = True
         '
-        'CtlMovie1
-        '
-        Me.CtlMovie1.Location = New System.Drawing.Point(37, 31)
-        Me.CtlMovie1.Name = "CtlMovie1"
-        Me.CtlMovie1.Size = New System.Drawing.Size(467, 166)
-        Me.CtlMovie1.TabIndex = 0
-        '
         'tbcFileOpes
         '
         Me.tbcFileOpes.Controls.Add(Me.tpAdobePDF)
@@ -125,13 +118,6 @@
         Me.tpAdobePDF.Text = "PDFの表示"
         Me.tpAdobePDF.UseVisualStyleBackColor = True
         '
-        'CtlPdf1
-        '
-        Me.CtlPdf1.Location = New System.Drawing.Point(6, 31)
-        Me.CtlPdf1.Name = "CtlPdf1"
-        Me.CtlPdf1.Size = New System.Drawing.Size(705, 128)
-        Me.CtlPdf1.TabIndex = 0
-        '
         'tpImage
         '
         Me.tpImage.Controls.Add(Me.CtlImage1)
@@ -143,13 +129,6 @@
         Me.tpImage.Text = "画像"
         Me.tpImage.UseVisualStyleBackColor = True
         '
-        'CtlImage1
-        '
-        Me.CtlImage1.Location = New System.Drawing.Point(28, 31)
-        Me.CtlImage1.Name = "CtlImage1"
-        Me.CtlImage1.Size = New System.Drawing.Size(600, 179)
-        Me.CtlImage1.TabIndex = 0
-        '
         'Label6
         '
         Me.Label6.AutoSize = True
@@ -195,15 +174,36 @@
         Me.btnUnSelect.Text = "選択解除"
         Me.btnUnSelect.UseVisualStyleBackColor = True
         '
-        'Button2
+        'btnFileAdd
         '
-        Me.Button2.Location = New System.Drawing.Point(212, 536)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(130, 23)
-        Me.Button2.TabIndex = 21
-        Me.Button2.Text = "ファイルを追加する"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnFileAdd.Location = New System.Drawing.Point(212, 536)
+        Me.btnFileAdd.Name = "btnFileAdd"
+        Me.btnFileAdd.Size = New System.Drawing.Size(130, 23)
+        Me.btnFileAdd.TabIndex = 21
+        Me.btnFileAdd.Text = "ファイルを追加する"
+        Me.btnFileAdd.UseVisualStyleBackColor = True
         '
+        'CtlPdf1
+        '
+        Me.CtlPdf1.Location = New System.Drawing.Point(6, 31)
+        Me.CtlPdf1.Name = "CtlPdf1"
+        Me.CtlPdf1.Size = New System.Drawing.Size(705, 128)
+        Me.CtlPdf1.TabIndex = 0
+        '
+        'CtlMovie1
+        '
+        Me.CtlMovie1.Location = New System.Drawing.Point(37, 31)
+        Me.CtlMovie1.Name = "CtlMovie1"
+        Me.CtlMovie1.Size = New System.Drawing.Size(467, 166)
+        Me.CtlMovie1.TabIndex = 0
+        '
+        'CtlImage1
+        '
+        Me.CtlImage1.Location = New System.Drawing.Point(28, 31)
+        Me.CtlImage1.Name = "CtlImage1"
+        Me.CtlImage1.Size = New System.Drawing.Size(600, 179)
+        Me.CtlImage1.TabIndex = 0
+        '
         'frmOperation
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
@@ -210,7 +210,7 @@
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1168, 649)
         Me.Controls.Add(Me.Label6)
-        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.btnFileAdd)
         Me.Controls.Add(Me.btnUnSelect)
         Me.Controls.Add(Me.tbcFileOpes)
         Me.Controls.Add(Me.GroupBox1)
@@ -243,7 +243,7 @@
     Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
     Friend WithEvents btnUnSelect As Button
     Friend WithEvents Label6 As Label
-    Friend WithEvents Button2 As Button
+    Friend WithEvents btnFileAdd As Button
     Friend WithEvents tpImage As TabPage
     Friend WithEvents CtlPdf1 As ctlPdf
     Friend WithEvents CtlImage1 As CtlImage

--- pdfsecondmonitor/frmOperation.vb	(revision 51)
+++ pdfsecondmonitor/frmOperation.vb	(revision 52)
@@ -198,7 +198,7 @@
 
     Private Function IsContain(ext As String, exts As String()) As Boolean
         For Each target In exts
-            If String.Compare(target, ext, True) = 0 Then
+            If String.Compare($".{target}", ext, True) = 0 Then
                 Return True
             End If
         Next
@@ -205,23 +205,44 @@
         Return False
     End Function
 
+    Private movieExts = {"avi", "mpeg", "mp4", "wmv"}
+
+    Private ImageExts = {"jpeg", "jpg", "bmp", "png", "gif", "tiff", "tif"}
     Private Function IsImageExt(ext) As Boolean
-        Return IsContain(ext, {".jpeg", ".jpg", ".bmp", ".png", "gif", "tiff"})
+        Return IsContain(ext, ImageExts)
     End Function
 
     Private Function IsMovieExt(ext) As Boolean
-        Return IsContain(ext, {".avi", ".mpeg", ".mp4", ".wmv"})
+        Return IsContain(ext, movieExts)
     End Function
 
+    Private Function CreateFilter() As String
+        Dim buf As New System.Text.StringBuilder
+        buf.Append("画像、動画、PDFファイル")
+        buf.Append("|")
+        buf.Append("*.pdf")
+        buf.Append(CreateExtsOfFilter(ImageExts))
+        buf.Append(CreateExtsOfFilter(movieExts))
+        buf.Append("|")
+        buf.Append("All Files(*.*)")
+        buf.Append("|")
+        buf.Append("*.*")
+        Return buf.ToString()
+    End Function
 
+    Private Function CreateExtsOfFilter(ByVal exts As String()) As String
+        Dim buf = New System.Text.StringBuilder
+        For Each ext In exts
+            buf.Append("*.")
+            buf.Append(ext)
+            buf.Append(";")
+        Next
+        Return buf.ToString()
+    End Function
 
-
-
-
-
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnFileAdd.Click
         OpenFileDialog1.Multiselect = True
-        OpenFileDialog1.Filter = "画像、動画、PDFファイル|*.pdf;*.bmp;*.gif;*.png;*.jpeg;*jpg;|All Files(*.*)|*.*;"
+        OpenFileDialog1.Filter = CreateFilter()
         OpenFileDialog1.FileName = txtPDFFileName.Text
         Dim ret = OpenFileDialog1.ShowDialog()
         If ret = Windows.Forms.DialogResult.Cancel Then
@@ -238,6 +259,7 @@
     End Sub
 
     Private Sub btnUnSelect_Click(sender As Object, e As EventArgs) Handles btnUnSelect.Click
+        lstPDFFiles.SelectedItem = Nothing
         _dispacher.CloseViewers()
     End Sub