Commit: 28 - pdfSecondMonitor (svn)

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

Commit MetaInfo

• Revision: 28 (tree)
• Time: 2017-11-12 21:24:37
• Author: bellyoshi

Log Message

Change Summary

• modified: WindowsFormsApp2/Form1.Designer.cs
• modified: WindowsFormsApp2/Form1.cs
• modified: WindowsFormsApp2/Form1.resx
• modified: WindowsFormsApp2/Properties/AssemblyInfo.cs
• modified: WindowsFormsApp2/WindowsFormsApp2.csproj
• modified: pdfsecondmonitor/frmOperation.Designer.vb
• modified: pdfsecondmonitor/frmOperation.vb
• modified: pdfsecondmonitor/frmView.vb

Incremental Difference

--- WindowsFormsApp2/Form1.Designer.cs	(revision 27)
+++ WindowsFormsApp2/Form1.Designer.cs	(revision 28)
@@ -28,32 +28,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.button1 = new System.Windows.Forms.Button();
-            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.axAcroPDF1 = new AxAcroPDFLib.AxAcroPDF();
+            ((System.ComponentModel.ISupportInitialize)(this.axAcroPDF1)).BeginInit();
             this.SuspendLayout();
             // 
-            // button1
+            // axAcroPDF1
             // 
-            this.button1.Location = new System.Drawing.Point(136, 210);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
+            this.axAcroPDF1.Enabled = true;
+            this.axAcroPDF1.Location = new System.Drawing.Point(83, 108);
+            this.axAcroPDF1.Name = "axAcroPDF1";
+            this.axAcroPDF1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axAcroPDF1.OcxState")));
+            this.axAcroPDF1.Size = new System.Drawing.Size(240, 240);
+            this.axAcroPDF1.TabIndex = 0;
             // 
-            // openFileDialog1
-            // 
-            this.openFileDialog1.FileName = "openFileDialog1";
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(282, 253);
-            this.Controls.Add(this.button1);
+            this.Controls.Add(this.axAcroPDF1);
             this.Name = "Form1";
             this.Text = "Form1";
+            ((System.ComponentModel.ISupportInitialize)(this.axAcroPDF1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -60,8 +57,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.OpenFileDialog openFileDialog1;
+        private AxAcroPDFLib.AxAcroPDF axAcroPDF1;
     }
 }
 

--- WindowsFormsApp2/Form1.cs	(revision 27)
+++ WindowsFormsApp2/Form1.cs	(revision 28)
@@ -7,42 +7,20 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Windows;
-using System.Windows.Media;
 
-
 namespace WindowsFormsApp2
 {
     public partial class Form1 : Form
     {
+
+
         public Form1()
         {
             InitializeComponent();
+            axAcroPDF1.Dock = System.Windows.Forms.DockStyle.Fill;
+            axAcroPDF1.LoadFile("C:\\Users\\bellm\\Downloads\\CA-brpgm18_J.pdf");
+            axAcroPDF1.setZoom(100);
+            axAcroPDF1.Visible = true;
         }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            var ret = openFileDialog1.ShowDialog();
-            if (ret == DialogResult.Cancel)
-            {
-                return;
-            }
-
-            //
-            // Create a VideoDrawing.
-            //      
-            MediaPlayer player = new MediaPlayer();
-
-            player.Open(new Uri(openFileDialog1.FileName , UriKind.Absolute ));
-
-            VideoDrawing aVideoDrawing = new VideoDrawing();
-
-            aVideoDrawing.Rect = new Rect(0, 0, 100, 100);
-
-            aVideoDrawing.Player = player;
-
-            // Play the video once.
-            player.Play();
-        }
     }
 }

--- WindowsFormsApp2/Properties/AssemblyInfo.cs	(revision 27)
+++ WindowsFormsApp2/Properties/AssemblyInfo.cs	(revision 28)
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります
-[assembly: Guid("edc52062-9c75-4fd8-925e-5473faf2af2f")]
+[assembly: Guid("d24de68b-c8dd-4064-9c54-ff351bbd0ea4")]
 
 // アセンブリのバージョン情報は次の 4 つの値で構成されています:
 //

--- pdfsecondmonitor/frmOperation.Designer.vb	(revision 27)
+++ pdfsecondmonitor/frmOperation.Designer.vb	(revision 28)
@@ -52,6 +52,7 @@
         Me.cmbPDFView = New System.Windows.Forms.ComboBox()
         Me.btnPDFLast = New System.Windows.Forms.Button()
         Me.btnPDFFirst = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         CType(Me.nudWidth, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.nudHeight, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -132,9 +133,6 @@
         Me.Label3.TabIndex = 13
         Me.Label3.Text = "高さ"
         '
-        'Timer1
-        '
-        '
         'tpMediaPlayer
         '
         Me.tpMediaPlayer.Controls.Add(Me.btnOpenMediaFile)
@@ -336,11 +334,21 @@
         Me.btnPDFFirst.Text = "最初へ"
         Me.btnPDFFirst.UseVisualStyleBackColor = True
         '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(695, 60)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 13
+        Me.Button1.Text = "Button1"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
         'frmOperation
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(782, 465)
+        Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.tbcFileOpes)
         Me.Controls.Add(Me.GroupBox1)
         Me.Name = "frmOperation"
@@ -387,4 +395,5 @@
     Friend WithEvents btnInsert As Button
     Friend WithEvents lstPDFFiles As ListBox
     Friend WithEvents btnDelete As Button
+    Friend WithEvents Button1 As Button
 End Class

--- pdfsecondmonitor/frmOperation.vb	(revision 27)
+++ pdfsecondmonitor/frmOperation.vb	(revision 28)
@@ -50,7 +50,7 @@
                 lstPDFFiles.Items.Add(info)
             Next
         Catch ex As Exception
-
+            MessageBox.Show(ex.Message)
         End Try
 
     End Sub
@@ -103,9 +103,9 @@
         If cmbDisplay.SelectedItem Is Nothing Then
             Exit Sub
         End If
-        'フォームを表示するディスプレイのScreenを取得する
+        '        'フォームを表示するディスプレイのScreenを取得する
         Dim s As Screen = DirectCast(Me.cmbDisplay.SelectedItem, Screen)
-        'フォームの開始位置をディスプレイの左上座標に設定する
+        '        'フォームの開始位置をディスプレイの左上座標に設定する
         frmView.StartPosition = FormStartPosition.Manual
         frmView.Location = s.Bounds.Location
         frmView.Size = s.Bounds.Size
@@ -157,8 +157,8 @@
         If axPDF Is Nothing Then
             Exit Sub
         End If
-        axPDF.setZoom(nudPdfZoom.Value)
-        setLstZoom(nudPdfZoom.Value)
+        frmView.SetZoom(nudPdfZoom.Value)
+        SetLstZoom(nudPdfZoom.Value)
     End Sub
 
     ''' <summary>
@@ -173,7 +173,7 @@
 
 
 #Region "PDFファイルを開く"
-    Private backFileName As String
+    '    Private backFileName As String
     Private Sub btnFileOpen_Click(sender As Object, e As EventArgs) Handles btnOpenPDFFile.Click
         OpenFileDialog1.Filter = "PDFファイル (*.pdf) |*.pdf"
         OpenFileDialog1.FileName = txtPDFFileName.Text
@@ -194,15 +194,15 @@
             Return
         End If
         frmView.pnlCover.Visible = False
-        If backFileName = txtPDFFileName.Text Then
-            Return
-        End If
-        axPDF.Visible = True
-        axPDF.LoadFile(txtPDFFileName.Text)
-        'todo : pdfが開けなかったときの処理
-        backFileName = txtPDFFileName.Text
-        axPDF.setShowToolbar(False)
-        axPDF.setShowScrollbars(False)
+        'If backFileName = txtPDFFileName.Text Then
+        '    Return
+        'End If
+
+        frmView.LoadFile(txtPDFFileName.Text)
+        '        'todo : pdfが開けなかったときの処理
+        '        backFileName = txtPDFFileName.Text
+        'axPDF.setShowToolbar(False)
+        'axPDF.setShowScrollbars(False)
     End Sub
 
 
@@ -277,6 +277,10 @@
         frmView.Width = nudWidth.Value
     End Sub
 
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        axPDF.LoadFile("C:\Users\bellm\Downloads\CA-brpgm18_J.pdf")
+    End Sub
+
 #Region "リストボックス処理"
 
     Private Sub btnInsert_Click(sender As Object, e As EventArgs) Handles btnInsert.Click

--- pdfsecondmonitor/frmView.vb	(revision 27)
+++ pdfsecondmonitor/frmView.vb	(revision 28)
@@ -12,7 +12,28 @@
     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
     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
+        AxAcroPDF1.setZoom(zoom)
+    End Sub
 End Class