Commit: 50 - pdfSecondMonitor (svn)

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

Commit MetaInfo

• Revision: 50 (tree)
• Time: 2018-12-07 17:49:50
• Author: bellyoshi

Log Message

Change Summary

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

Incremental Difference

--- pdfsecondmonitor/CtlImage.Designer.vb	(revision 49)
+++ pdfsecondmonitor/CtlImage.Designer.vb	(revision 50)
@@ -22,23 +22,56 @@
     'コード エディターを使って変更しないでください。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.btnRotate = New System.Windows.Forms.Button()
+        Me.btnRotate180 = New System.Windows.Forms.Button()
+        Me.btnRotateM90 = New System.Windows.Forms.Button()
+        Me.btnRotate90 = New System.Windows.Forms.Button()
+        Me.btnRotate0 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
-        'btnRotate
+        'btnRotate180
         '
-        Me.btnRotate.Location = New System.Drawing.Point(232, 58)
-        Me.btnRotate.Name = "btnRotate"
-        Me.btnRotate.Size = New System.Drawing.Size(90, 51)
-        Me.btnRotate.TabIndex = 0
-        Me.btnRotate.Text = "180度回転"
-        Me.btnRotate.UseVisualStyleBackColor = True
+        Me.btnRotate180.Location = New System.Drawing.Point(232, 80)
+        Me.btnRotate180.Name = "btnRotate180"
+        Me.btnRotate180.Size = New System.Drawing.Size(90, 51)
+        Me.btnRotate180.TabIndex = 0
+        Me.btnRotate180.Text = "180度回転"
+        Me.btnRotate180.UseVisualStyleBackColor = True
         '
+        'btnRotateM90
+        '
+        Me.btnRotateM90.Location = New System.Drawing.Point(136, 58)
+        Me.btnRotateM90.Name = "btnRotateM90"
+        Me.btnRotateM90.Size = New System.Drawing.Size(90, 51)
+        Me.btnRotateM90.TabIndex = 0
+        Me.btnRotateM90.Text = "左90度"
+        Me.btnRotateM90.UseVisualStyleBackColor = True
+        '
+        'btnRotate90
+        '
+        Me.btnRotate90.Location = New System.Drawing.Point(328, 58)
+        Me.btnRotate90.Name = "btnRotate90"
+        Me.btnRotate90.Size = New System.Drawing.Size(90, 51)
+        Me.btnRotate90.TabIndex = 0
+        Me.btnRotate90.Text = "右90度"
+        Me.btnRotate90.UseVisualStyleBackColor = True
+        '
+        'btnRotate0
+        '
+        Me.btnRotate0.Location = New System.Drawing.Point(232, 23)
+        Me.btnRotate0.Name = "btnRotate0"
+        Me.btnRotate0.Size = New System.Drawing.Size(90, 51)
+        Me.btnRotate0.TabIndex = 0
+        Me.btnRotate0.Text = "０度"
+        Me.btnRotate0.UseVisualStyleBackColor = True
+        '
         'CtlImage
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.btnRotate)
+        Me.Controls.Add(Me.btnRotate90)
+        Me.Controls.Add(Me.btnRotate0)
+        Me.Controls.Add(Me.btnRotateM90)
+        Me.Controls.Add(Me.btnRotate180)
         Me.Name = "CtlImage"
         Me.Size = New System.Drawing.Size(600, 179)
         Me.ResumeLayout(False)
@@ -45,5 +78,8 @@
 
     End Sub
 
-    Friend WithEvents btnRotate As Button
+    Friend WithEvents btnRotate180 As Button
+    Friend WithEvents btnRotateM90 As Button
+    Friend WithEvents btnRotate90 As Button
+    Friend WithEvents btnRotate0 As Button
 End Class

--- pdfsecondmonitor/CtlImage.vb	(revision 49)
+++ pdfsecondmonitor/CtlImage.vb	(revision 50)
@@ -4,17 +4,30 @@
 
     Private _pictureBox As PictureBox
 
-    Private Sub btnRotate_Click(sender As Object, e As EventArgs) Handles btnRotate.Click
+    Private Sub Rotate(flip As RotateFlipType)
         Dim bmp As Bitmap = New Bitmap(_fileViewParam.FileName)
-        '180度回転して、水平方向に反転
-        '"Rotate180FlipX"の"Rotate180"は180度回転することを意味し、
-        '"FlipX"は水平方向に反転することを意味する
-        bmp.RotateFlip(RotateFlipType.Rotate180FlipX)
-        '表示
+        bmp.RotateFlip(flip)
         _pictureBox.Image = bmp
     End Sub
+    Private Sub None()
+        _pictureBox.ImageLocation = _fileViewParam.FileName
+    End Sub
+    Private Sub btnRotate_Click(sender As Object, e As EventArgs) Handles btnRotate180.Click
+        Rotate(RotateFlipType.Rotate180FlipNone)
+    End Sub
 
+    Private Sub btnRotate90_Click(sender As Object, e As EventArgs) Handles btnRotate90.Click
+        Rotate(RotateFlipType.Rotate90FlipNone)
+    End Sub
 
+    Private Sub btnRotate0_Click(sender As Object, e As EventArgs) Handles btnRotate0.Click
+        None()
+    End Sub
+
+    Private Sub btnRotate270_Click(sender As Object, e As EventArgs) Handles btnRotateM90.Click
+        Rotate(RotateFlipType.Rotate270FlipNone)
+    End Sub
+
     Private _fileViewParam As FileViewParam
 
     Public Sub SetFileInfo(f As FileViewParam)
@@ -23,9 +36,11 @@
             Return
         End If
         _pictureBox = _dispacher.ShowImage()
-        _pictureBox.ImageLocation = _fileViewParam.FileName
+        None()
         _pictureBox.SizeMode = PictureBoxSizeMode.Zoom 'サイズ調整
 
 
     End Sub
+
+
 End Class

--- pdfsecondmonitor/ctlPdf.Designer.vb	(revision 49)
+++ pdfsecondmonitor/ctlPdf.Designer.vb	(revision 50)
@@ -24,7 +24,6 @@
     Private Sub InitializeComponent()
         Me.btnPDFNext = New System.Windows.Forms.Button()
         Me.btnPDFBack = New System.Windows.Forms.Button()
-        Me.btnPDFLast = New System.Windows.Forms.Button()
         Me.btnPDFFirst = New System.Windows.Forms.Button()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.btnNextHalf = New System.Windows.Forms.Button()
@@ -48,15 +47,6 @@
         Me.btnPDFBack.Text = "前へ"
         Me.btnPDFBack.UseVisualStyleBackColor = True
         '
-        'btnPDFLast
-        '
-        Me.btnPDFLast.Location = New System.Drawing.Point(193, 26)
-        Me.btnPDFLast.Name = "btnPDFLast"
-        Me.btnPDFLast.Size = New System.Drawing.Size(49, 23)
-        Me.btnPDFLast.TabIndex = 26
-        Me.btnPDFLast.Text = "最後へ"
-        Me.btnPDFLast.UseVisualStyleBackColor = True
-        '
         'btnPDFFirst
         '
         Me.btnPDFFirst.Location = New System.Drawing.Point(25, 26)
@@ -68,7 +58,7 @@
         '
         'btnNextHalf
         '
-        Me.btnNextHalf.Location = New System.Drawing.Point(137, 75)
+        Me.btnNextHalf.Location = New System.Drawing.Point(112, 76)
         Me.btnNextHalf.Name = "btnNextHalf"
         Me.btnNextHalf.Size = New System.Drawing.Size(75, 23)
         Me.btnNextHalf.TabIndex = 28
@@ -82,7 +72,6 @@
         Me.Controls.Add(Me.btnNextHalf)
         Me.Controls.Add(Me.btnPDFNext)
         Me.Controls.Add(Me.btnPDFBack)
-        Me.Controls.Add(Me.btnPDFLast)
         Me.Controls.Add(Me.btnPDFFirst)
         Me.Name = "ctlPdf"
         Me.Size = New System.Drawing.Size(796, 133)
@@ -91,7 +80,6 @@
     End Sub
     Friend WithEvents btnPDFNext As Button
     Friend WithEvents btnPDFBack As Button
-    Friend WithEvents btnPDFLast As Button
     Friend WithEvents btnPDFFirst As Button
     Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
     Friend WithEvents btnNextHalf As Button

--- pdfsecondmonitor/ctlPdf.vb	(revision 49)
+++ pdfsecondmonitor/ctlPdf.vb	(revision 50)
@@ -21,7 +21,7 @@
         _viewer.PrePage()
     End Sub
 
-    Private Sub btnLast_Click(sender As Object, e As EventArgs) Handles btnPDFLast.Click
+    Private Sub btnLast_Click(sender As Object, e As EventArgs) 
         'todo
     End Sub
 #End Region

--- pdfsecondmonitor/frmOperation.Designer.vb	(revision 49)
+++ pdfsecondmonitor/frmOperation.Designer.vb	(revision 50)
@@ -178,6 +178,7 @@
         '
         'lstPDFFiles
         '
+        Me.lstPDFFiles.AllowDrop = True
         Me.lstPDFFiles.FormattingEnabled = True
         Me.lstPDFFiles.ItemHeight = 15
         Me.lstPDFFiles.Location = New System.Drawing.Point(34, 170)

--- pdfsecondmonitor/frmOperation.vb	(revision 49)
+++ pdfsecondmonitor/frmOperation.vb	(revision 50)
@@ -35,8 +35,12 @@
             Dim serializer As New System.Xml.Serialization.XmlSerializer(
                 GetType(List(Of FileViewParam)))
             '読み込むファイルを開く
+            Dim filename = "lstPDFFiles.xml"
+            If Not IO.File.Exists(filename) Then
+                Return
+            End If
             Using sr As New System.IO.StreamReader(
-                "lstPDFFiles.xml", New System.Text.UTF8Encoding(False))
+                filename, New System.Text.UTF8Encoding(False))
                 'XMLファイルから読み込み、逆シリアル化する
                 fvinfos =
                 DirectCast(serializer.Deserialize(sr), List(Of FileViewParam))
@@ -45,7 +49,9 @@
             For Each info In fvinfos
                 lstPDFFiles.Items.Add(info)
             Next
+
         Catch ex As Exception
+
             MessageBox.Show(ex.Message)
         End Try
         loading = False
@@ -207,7 +213,7 @@
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         OpenFileDialog1.Multiselect = True
-        OpenFileDialog1.Filter = "画像、動画、PDFファイル|*.pdf;*.bmp;*.gif;*.png;|All Files(*.*)|*.*;"
+        OpenFileDialog1.Filter = "画像、動画、PDFファイル|*.pdf;*.bmp;*.gif;*.png;*.jpeg;*jpg;|All Files(*.*)|*.*;"
         OpenFileDialog1.FileName = txtPDFFileName.Text
         Dim ret = OpenFileDialog1.ShowDialog()
         If ret = Windows.Forms.DialogResult.Cancel Then
@@ -227,12 +233,34 @@
         _dispacher.CloseViewers()
     End Sub
 
+    Private Sub lstPDFFiles_DragEnter(sender As Object, e As DragEventArgs) Handles lstPDFFiles.DragEnter
+        'コントロール内にドラッグされたとき実行される
+        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            'ドラッグされたデータ形式を調べ、ファイルのときはコピーとする
+            e.Effect = DragDropEffects.Copy
+        Else
+            'ファイル以外は受け付けない
+            e.Effect = DragDropEffects.None
+        End If
+    End Sub
 
+    Private Sub lstPDFFiles_DragDrop(sender As Object, e As DragEventArgs) Handles lstPDFFiles.DragDrop
+        Dim items = lstPDFFiles.Items
+        Dim fileName As String() = CType(
+                e.Data.GetData(DataFormats.FileDrop, False),
+                String())
+        'ListBoxに追加する
+        For Each f In fileName
+            items.Add(New FileViewParam(f))
+        Next
+    End Sub
 
 
 
 
 
+
+
 #End Region
 
 End Class
\ No newline at end of file