Commit: 36 - pdfSecondMonitor (svn)

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

Commit MetaInfo

• Revision: 36 (tree)
• Time: 2018-10-04 09:41:57
• Author: bellyoshi

Log Message

Change Summary

• modified: pdfsecondmonitor/FileViewParam.vb
• modified: pdfsecondmonitor/FormDispacher.vb
• modified: pdfsecondmonitor/ctlPdf.vb
• modified: pdfsecondmonitor/frmOperation.Designer.vb
• modified: pdfsecondmonitor/frmOperation.vb
• modified: pdfsecondmonitor/frmPdfViewer.Designer.vb
• modified: pdfsecondmonitor/frmPdfViewer.vb

Incremental Difference

--- pdfsecondmonitor/FileViewParam.vb	(revision 35)
+++ pdfsecondmonitor/FileViewParam.vb	(revision 36)
@@ -10,6 +10,7 @@
 
     Public Sub New(ByVal filename As String)
         Me.FileName = filename
+        Me.zoom = 100
     End Sub
 
     Public Sub New()

--- pdfsecondmonitor/FormDispacher.vb	(revision 35)
+++ pdfsecondmonitor/FormDispacher.vb	(revision 36)
@@ -17,7 +17,7 @@
     End Sub
     Public Function GetAxPDF() As AxAcroPDFLib.AxAcroPDF
 
-        Return frmPdfViewer.AxAcroPDF1
+        Return _frmPdfViewer.AxAcroPDF1
 
     End Function
 

--- pdfsecondmonitor/ctlPdf.vb	(revision 35)
+++ pdfsecondmonitor/ctlPdf.vb	(revision 36)
@@ -64,11 +64,11 @@
             Return
         End If
         _backFileName = f.FileName
-
+        nudPdfZoom.Value = _fileViewParam.zoom
         If Not BackgroundWorker1.IsBusy Then
             BackgroundWorker1.RunWorkerAsync()
         End If
-        nudPdfZoom.Value = _fileViewParam.zoom
+
     End Sub
 
 
@@ -111,18 +111,20 @@
     End Sub
 
     Sub setzoom()
-        ' frmView.SetZoom(nudPdfZoom.Value)
+        axPDF.setZoom(nudPdfZoom.Value)
     End Sub
 
     Sub hideScrollbars()
-        ' axPDF.setShowScrollbars(False)
+        axPDF.setShowScrollbars(False)
     End Sub
     Sub loadFile()
+        axPDF.LoadFile(_fileViewParam.FileName)
+        axPDF.Visible = True
         ' frmView.LoadFile(txtPDFFileName.Text)
     End Sub
 
     Sub Loadfile2()
-        ' frmView.LoadFile(txtPDFFileName.Text)
+        axPDF.LoadFile(_fileViewParam.FileName)
     End Sub
 
 
@@ -132,7 +134,7 @@
 
     Sub hideNabi()
         _dispacher.frmPdfViewHideNavi()
-
+        'todo:タスクパネルwinndowの非表示
     End Sub
 
     Private Sub btnNavigateHide_Click(sender As Object, e As EventArgs) Handles btnNavigateHide.Click

--- pdfsecondmonitor/frmOperation.Designer.vb	(revision 35)
+++ pdfsecondmonitor/frmOperation.Designer.vb	(revision 36)
@@ -36,6 +36,7 @@
         Me.btnStartStop = New System.Windows.Forms.Button()
         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.Label6 = New System.Windows.Forms.Label()
         Me.txtPDFFileName = New System.Windows.Forms.TextBox()
@@ -45,7 +46,6 @@
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
-        Me.CtlPdf1 = New pdfsecondmonitor.ctlPdf()
         Me.GroupBox1.SuspendLayout()
         Me.tpMediaPlayer.SuspendLayout()
         Me.tbcFileOpes.SuspendLayout()
@@ -173,6 +173,13 @@
         Me.tpAdobePDF.Text = "PDFの表示"
         Me.tpAdobePDF.UseVisualStyleBackColor = True
         '
+        'CtlPdf1
+        '
+        Me.CtlPdf1.Location = New System.Drawing.Point(22, 31)
+        Me.CtlPdf1.Name = "CtlPdf1"
+        Me.CtlPdf1.Size = New System.Drawing.Size(796, 438)
+        Me.CtlPdf1.TabIndex = 0
+        '
         'tpImage
         '
         Me.tpImage.Location = New System.Drawing.Point(4, 25)
@@ -245,13 +252,6 @@
         Me.Button2.Text = "ファイルを追加する"
         Me.Button2.UseVisualStyleBackColor = True
         '
-        'CtlPdf1
-        '
-        Me.CtlPdf1.Location = New System.Drawing.Point(22, 31)
-        Me.CtlPdf1.Name = "CtlPdf1"
-        Me.CtlPdf1.Size = New System.Drawing.Size(796, 438)
-        Me.CtlPdf1.TabIndex = 0
-        '
         'frmOperation
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)

--- pdfsecondmonitor/frmOperation.vb	(revision 35)
+++ pdfsecondmonitor/frmOperation.vb	(revision 36)
@@ -197,7 +197,10 @@
             Exit Sub
         End If
         txtPDFFileName.Text = fileviewinfo.FileName
-
+        Dim ext = IO.Path.GetExtension(fileviewinfo.FileName).ToLower()
+        If ext = ".pdf" Then
+            CtlPdf1.SetFileInfo(fileviewinfo)
+        End If
     End Sub
 
 
@@ -231,6 +234,8 @@
 
 
 
+
+
 #End Region
 
 End Class
\ No newline at end of file

--- pdfsecondmonitor/frmPdfViewer.Designer.vb	(revision 35)
+++ pdfsecondmonitor/frmPdfViewer.Designer.vb	(revision 36)
@@ -24,44 +24,31 @@
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmPdfViewer))
         Me.AxAcroPDF1 = New AxAcroPDFLib.AxAcroPDF()
-        Me.pnlCover = New System.Windows.Forms.Panel()
         CType(Me.AxAcroPDF1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.pnlCover.SuspendLayout()
         Me.SuspendLayout()
         '
         'AxAcroPDF1
         '
-        Me.AxAcroPDF1.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.AxAcroPDF1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.AxAcroPDF1.Enabled = True
-        Me.AxAcroPDF1.Location = New System.Drawing.Point(268, 104)
+        Me.AxAcroPDF1.Location = New System.Drawing.Point(0, 0)
         Me.AxAcroPDF1.Name = "AxAcroPDF1"
         Me.AxAcroPDF1.OcxState = CType(resources.GetObject("AxAcroPDF1.OcxState"), System.Windows.Forms.AxHost.State)
-        Me.AxAcroPDF1.Size = New System.Drawing.Size(240, 240)
+        Me.AxAcroPDF1.Size = New System.Drawing.Size(800, 450)
         Me.AxAcroPDF1.TabIndex = 2
         '
-        'pnlCover
-        '
-        Me.pnlCover.Controls.Add(Me.AxAcroPDF1)
-        Me.pnlCover.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlCover.Location = New System.Drawing.Point(0, 0)
-        Me.pnlCover.Name = "pnlCover"
-        Me.pnlCover.Size = New System.Drawing.Size(800, 450)
-        Me.pnlCover.TabIndex = 3
-        '
         'frmPdfViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
-        Me.Controls.Add(Me.pnlCover)
+        Me.Controls.Add(Me.AxAcroPDF1)
         Me.Name = "frmPdfViewer"
         Me.Text = "frmPdfViewer"
         CType(Me.AxAcroPDF1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.pnlCover.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
 
     Friend WithEvents AxAcroPDF1 As AxAcroPDFLib.AxAcroPDF
-    Friend WithEvents pnlCover As Panel
 End Class

--- pdfsecondmonitor/frmPdfViewer.vb	(revision 35)
+++ pdfsecondmonitor/frmPdfViewer.vb	(revision 36)
@@ -1,37 +1,43 @@
 Public Class frmPdfViewer
 
     Private Sub frmView_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        AxAcroPDF1.Top = 0
-        AxAcroPDF1.Left = 0
-        pnlCover.Top = 0
-        pnlCover.Left = 0
+        'AxAcroPDF1.Top = 0
+        'AxAcroPDF1.Left = 0
+
     End Sub
 
     Private Sub frmView_Resize(sender As Object, e As EventArgs) Handles MyBase.Resize
-        AxAcroPDF1.Top = 0
-        AxAcroPDF1.Left = 0
-        AxAcroPDF1.Size = Size
-        pnlCover.Size = Size
+        'AxAcroPDF1.Top = 0
+        'AxAcroPDF1.Left = 0
+        'AxAcroPDF1.Size = Size
     End Sub
 
-    Private loaded As Boolean = False
-    Public Sub LoadFile(fileName As String)
-        loaded = True
-        AxAcroPDF1.LoadFile(fileName)
-        AxAcroPDF1.Visible = True
-    End Sub
+    'Private loaded As Boolean = False
+    'Public Sub LoadFile(fileName As String)
+    '    loaded = True
+    '    AxAcroPDF1.LoadFile(fileName)
+    '    AxAcroPDF1.Visible = True
+    'End Sub
 
-    Private zoom As Single = 100
-    Public Sub SetZoom(ByVal zoom As Single)
-        'If Not loaded Then
-        '    Exit Sub
-        'End If
-        'If Math.Abs(Me.zoom - zoom) < 0.1 Then
-        '    Exit Sub
-        'End If
-        Me.zoom = zoom
+    'Private Sub pnlCover_Paint(sender As Object, e As PaintEventArgs)
 
+    'End Sub
 
-    End Sub
+    'Private Sub AxAcroPDF1_Enter(sender As Object, e As EventArgs) Handles AxAcroPDF1.Enter
 
+    'End Sub
+
+    'Private zoom As Single = 100
+    'Public Sub SetZoom(ByVal zoom As Single)
+    '    'If Not loaded Then
+    '    '    Exit Sub
+    '    'End If
+    '    'If Math.Abs(Me.zoom - zoom) < 0.1 Then
+    '    '    Exit Sub
+    '    'End If
+    '    Me.zoom = zoom
+
+
+    'End Sub
+
 End Class
\ No newline at end of file