コミット: 42 - pdfSecondMonitor (svn)

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

コミットメタ情報

• リビジョン: 42 (tree)
• 日時: 2018-10-31 21:41:12
• 作者: bellyoshi

ログメッセージ

変更サマリ

• modified: pdfsecondmonitor/frmOperation.vb

差分

--- pdfsecondmonitor/frmOperation.vb	(revision 41)
+++ pdfsecondmonitor/frmOperation.vb	(revision 42)
@@ -167,8 +167,8 @@
             Exit Sub
         End If
         txtPDFFileName.Text = fileviewinfo.FileName
-        Dim ext = IO.Path.GetExtension(fileviewinfo.FileName).ToLower()
-        If ext = ".pdf" Then
+        Dim ext = IO.Path.GetExtension(fileviewinfo.FileName)
+        If IsContain(ext, {".pdf"}) Then
             tbcFileOpes.SelectTab(tpAdobePDF.TabIndex)
             CtlPdf1.SetFileInfo(fileviewinfo)
 
@@ -183,14 +183,21 @@
         ControlEnable()
     End Sub
 
+    Private Function IsContain(ext As String, exts As String()) As Boolean
+        For Each target In exts
+            If String.Compare(target, ext, True) Then
+                Return True
+            End If
+        Next
+        Return False
+    End Function
+
     Private Function IsImageExt(ext) As Boolean
-        Dim imageExt = {".jpeg", ".jpg", ".bmp", ".png"}
-        Return imageExt.Contains(ext)
+        Return IsContain(ext, {".jpeg", ".jpg", ".bmp", ".png", "gif", "tiff"})
     End Function
 
     Private Function IsMovieExt(ext) As Boolean
-        Dim movieExt = {".avi", ".mpeg", ".mp4", ".wmv"}
-        Return movieExt.Contains(ext)
+        Return IsContain(ext, {".avi", ".mpeg", ".mp4", ".wmv"})
     End Function