画像投稿用の画像リソース差し替え

TL・画像投稿のパネルTabIndex変更（読み上げ対応）
投稿画像のFileStreamを確実に閉じるように

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@618 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/My Project/AssemblyInfo.vb b/Tween/My Project/AssemblyInfo.vb
index 36e65ea..047aaee 100644 (file)
--- a/Tween/My Project/AssemblyInfo.vb
+++ b/Tween/My Project/AssemblyInfo.vb
@@ -55,5 +55,5 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
 <Assembly: AssemblyVersion("0.1.0.0")> 
-<Assembly: AssemblyFileVersion("0.9.4.0")> 
+<Assembly: AssemblyFileVersion("0.9.4.1")> 
 

diff --git a/Tween/Resources/InitialImage.png b/Tween/Resources/InitialImage.png
index c8a468d..66fdcb6 100644 (file)
Binary files a/Tween/Resources/InitialImage.png and b/Tween/Resources/InitialImage.png differ

diff --git a/Tween/Resources/MultiMediaImage.png b/Tween/Resources/MultiMediaImage.png
index fdce055..9a8eba2 100644 (file)
Binary files a/Tween/Resources/MultiMediaImage.png and b/Tween/Resources/MultiMediaImage.png differ

diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb
index 32f21a8..13ca23f 100644 (file)
--- a/Tween/Tween.Designer.vb
+++ b/Tween/Tween.Designer.vb
@@ -43,15 +43,6 @@ Partial Class TweenMain
         Me.HashToggleMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HashManageMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.ImageSelectionPanel = New System.Windows.Forms.Panel()
-        Me.ImageSelectedPicture = New System.Windows.Forms.PictureBox()
-        Me.ImagePathPanel = New System.Windows.Forms.Panel()
-        Me.ImagefilePathText = New System.Windows.Forms.TextBox()
-        Me.FilePickButton = New System.Windows.Forms.Button()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.ImageServiceCombo = New System.Windows.Forms.ComboBox()
-        Me.ImageCancelButton = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
         Me.TimelinePanel = New System.Windows.Forms.Panel()
         Me.ListTab = New System.Windows.Forms.TabControl()
         Me.ContextMenuTabProperty = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -68,6 +59,15 @@ Partial Class TweenMain
         Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
         Me.DeleteTabMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.TabImage = New System.Windows.Forms.ImageList(Me.components)
+        Me.ImageSelectionPanel = New System.Windows.Forms.Panel()
+        Me.ImageSelectedPicture = New System.Windows.Forms.PictureBox()
+        Me.ImagePathPanel = New System.Windows.Forms.Panel()
+        Me.ImagefilePathText = New System.Windows.Forms.TextBox()
+        Me.FilePickButton = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.ImageServiceCombo = New System.Windows.Forms.ComboBox()
+        Me.ImageCancelButton = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.ProfilePanel = New System.Windows.Forms.Panel()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
         Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
@@ -271,11 +271,11 @@ Partial Class TweenMain
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
         Me.SplitContainer1.SuspendLayout()
+        Me.TimelinePanel.SuspendLayout()
+        Me.ContextMenuTabProperty.SuspendLayout()
         Me.ImageSelectionPanel.SuspendLayout()
         CType(Me.ImageSelectedPicture, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ImagePathPanel.SuspendLayout()
-        Me.TimelinePanel.SuspendLayout()
-        Me.ContextMenuTabProperty.SuspendLayout()
         Me.SplitContainer3.Panel1.SuspendLayout()
         Me.SplitContainer3.Panel2.SuspendLayout()
         Me.SplitContainer3.SuspendLayout()
@@ -428,8 +428,8 @@ Partial Class TweenMain
         '
         'SplitContainer1.Panel1
         '
-        Me.SplitContainer1.Panel1.Controls.Add(Me.ImageSelectionPanel)
         Me.SplitContainer1.Panel1.Controls.Add(Me.TimelinePanel)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ImageSelectionPanel)
         Me.SplitContainer1.Panel1.Controls.Add(Me.ProfilePanel)
         '
         'SplitContainer1.Panel2
@@ -437,67 +437,6 @@ Partial Class TweenMain
         Me.SplitContainer1.Panel2.Controls.Add(Me.SplitContainer3)
         Me.SplitContainer1.TabStop = False
         '
-        'ImageSelectionPanel
-        '
-        resources.ApplyResources(Me.ImageSelectionPanel, "ImageSelectionPanel")
-        Me.ImageSelectionPanel.Controls.Add(Me.ImageSelectedPicture)
-        Me.ImageSelectionPanel.Controls.Add(Me.ImagePathPanel)
-        Me.ImageSelectionPanel.Name = "ImageSelectionPanel"
-        '
-        'ImageSelectedPicture
-        '
-        resources.ApplyResources(Me.ImageSelectedPicture, "ImageSelectedPicture")
-        Me.ImageSelectedPicture.Image = Global.Tween.My.Resources.Resources.InitialImage
-        Me.ImageSelectedPicture.InitialImage = Global.Tween.My.Resources.Resources.InitialImage
-        Me.ImageSelectedPicture.Name = "ImageSelectedPicture"
-        Me.ImageSelectedPicture.TabStop = False
-        '
-        'ImagePathPanel
-        '
-        Me.ImagePathPanel.Controls.Add(Me.ImagefilePathText)
-        Me.ImagePathPanel.Controls.Add(Me.FilePickButton)
-        Me.ImagePathPanel.Controls.Add(Me.Label2)
-        Me.ImagePathPanel.Controls.Add(Me.ImageServiceCombo)
-        Me.ImagePathPanel.Controls.Add(Me.ImageCancelButton)
-        Me.ImagePathPanel.Controls.Add(Me.Label1)
-        resources.ApplyResources(Me.ImagePathPanel, "ImagePathPanel")
-        Me.ImagePathPanel.Name = "ImagePathPanel"
-        '
-        'ImagefilePathText
-        '
-        resources.ApplyResources(Me.ImagefilePathText, "ImagefilePathText")
-        Me.ImagefilePathText.Name = "ImagefilePathText"
-        '
-        'FilePickButton
-        '
-        resources.ApplyResources(Me.FilePickButton, "FilePickButton")
-        Me.FilePickButton.Name = "FilePickButton"
-        Me.FilePickButton.UseVisualStyleBackColor = True
-        '
-        'Label2
-        '
-        resources.ApplyResources(Me.Label2, "Label2")
-        Me.Label2.Name = "Label2"
-        '
-        'ImageServiceCombo
-        '
-        resources.ApplyResources(Me.ImageServiceCombo, "ImageServiceCombo")
-        Me.ImageServiceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ImageServiceCombo.FormattingEnabled = True
-        Me.ImageServiceCombo.Items.AddRange(New Object() {resources.GetString("ImageServiceCombo.Items"), resources.GetString("ImageServiceCombo.Items1")})
-        Me.ImageServiceCombo.Name = "ImageServiceCombo"
-        '
-        'ImageCancelButton
-        '
-        resources.ApplyResources(Me.ImageCancelButton, "ImageCancelButton")
-        Me.ImageCancelButton.Name = "ImageCancelButton"
-        Me.ImageCancelButton.UseVisualStyleBackColor = True
-        '
-        'Label1
-        '
-        resources.ApplyResources(Me.Label1, "Label1")
-        Me.Label1.Name = "Label1"
-        '
         'TimelinePanel
         '
         Me.TimelinePanel.Controls.Add(Me.ListTab)
@@ -592,6 +531,67 @@ Partial Class TweenMain
         resources.ApplyResources(Me.TabImage, "TabImage")
         Me.TabImage.TransparentColor = System.Drawing.Color.Transparent
         '
+        'ImageSelectionPanel
+        '
+        resources.ApplyResources(Me.ImageSelectionPanel, "ImageSelectionPanel")
+        Me.ImageSelectionPanel.Controls.Add(Me.ImageSelectedPicture)
+        Me.ImageSelectionPanel.Controls.Add(Me.ImagePathPanel)
+        Me.ImageSelectionPanel.Name = "ImageSelectionPanel"
+        '
+        'ImageSelectedPicture
+        '
+        resources.ApplyResources(Me.ImageSelectedPicture, "ImageSelectedPicture")
+        Me.ImageSelectedPicture.Image = Global.Tween.My.Resources.Resources.InitialImage
+        Me.ImageSelectedPicture.InitialImage = Global.Tween.My.Resources.Resources.InitialImage
+        Me.ImageSelectedPicture.Name = "ImageSelectedPicture"
+        Me.ImageSelectedPicture.TabStop = False
+        '
+        'ImagePathPanel
+        '
+        Me.ImagePathPanel.Controls.Add(Me.ImagefilePathText)
+        Me.ImagePathPanel.Controls.Add(Me.FilePickButton)
+        Me.ImagePathPanel.Controls.Add(Me.Label2)
+        Me.ImagePathPanel.Controls.Add(Me.ImageServiceCombo)
+        Me.ImagePathPanel.Controls.Add(Me.ImageCancelButton)
+        Me.ImagePathPanel.Controls.Add(Me.Label1)
+        resources.ApplyResources(Me.ImagePathPanel, "ImagePathPanel")
+        Me.ImagePathPanel.Name = "ImagePathPanel"
+        '
+        'ImagefilePathText
+        '
+        resources.ApplyResources(Me.ImagefilePathText, "ImagefilePathText")
+        Me.ImagefilePathText.Name = "ImagefilePathText"
+        '
+        'FilePickButton
+        '
+        resources.ApplyResources(Me.FilePickButton, "FilePickButton")
+        Me.FilePickButton.Name = "FilePickButton"
+        Me.FilePickButton.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        resources.ApplyResources(Me.Label2, "Label2")
+        Me.Label2.Name = "Label2"
+        '
+        'ImageServiceCombo
+        '
+        resources.ApplyResources(Me.ImageServiceCombo, "ImageServiceCombo")
+        Me.ImageServiceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.ImageServiceCombo.FormattingEnabled = True
+        Me.ImageServiceCombo.Items.AddRange(New Object() {resources.GetString("ImageServiceCombo.Items"), resources.GetString("ImageServiceCombo.Items1")})
+        Me.ImageServiceCombo.Name = "ImageServiceCombo"
+        '
+        'ImageCancelButton
+        '
+        resources.ApplyResources(Me.ImageCancelButton, "ImageCancelButton")
+        Me.ImageCancelButton.Name = "ImageCancelButton"
+        Me.ImageCancelButton.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        resources.ApplyResources(Me.Label1, "Label1")
+        Me.Label1.Name = "Label1"
+        '
         'ProfilePanel
         '
         resources.ApplyResources(Me.ProfilePanel, "ProfilePanel")
@@ -1657,12 +1657,12 @@ Partial Class TweenMain
         Me.SplitContainer1.Panel1.ResumeLayout(False)
         Me.SplitContainer1.Panel2.ResumeLayout(False)
         Me.SplitContainer1.ResumeLayout(False)
+        Me.TimelinePanel.ResumeLayout(False)
+        Me.ContextMenuTabProperty.ResumeLayout(False)
         Me.ImageSelectionPanel.ResumeLayout(False)
         CType(Me.ImageSelectedPicture, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ImagePathPanel.ResumeLayout(False)
         Me.ImagePathPanel.PerformLayout()
-        Me.TimelinePanel.ResumeLayout(False)
-        Me.ContextMenuTabProperty.ResumeLayout(False)
         Me.SplitContainer3.Panel1.ResumeLayout(False)
         Me.SplitContainer3.Panel2.ResumeLayout(False)
         Me.SplitContainer3.ResumeLayout(False)

diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index 7b01ada..a1285f7 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -532,7 +532,7 @@
     <value>453, 166</value>
   </data>
   <data name="ImageSelectionPanel.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="ImageSelectionPanel.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -670,7 +670,7 @@
     <value>453, 166</value>
   </data>
   <data name="TimelinePanel.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;TimelinePanel.Name" xml:space="preserve">
     <value>TimelinePanel</value>

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index a678abf..08a2aac 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -9402,12 +9402,13 @@ RETRY:
                     ImageSelectedPicture.Image = ImageSelectedPicture.InitialImage
                     ImageSelectedPicture.Tag = UploadFileType.Invalid
                 Case UploadFileType.Picture
-                    Dim fs As New FileStream(ImagefilePathText.Text, FileMode.Open, FileAccess.Read)
-                    ImageSelectedPicture.Image = (New HttpVarious).CheckValidImage( _
-                                Image.FromStream(fs), _
-                                ImageSelectedPicture.Width, _
-                                ImageSelectedPicture.Height)
-                    fs.Close()
+                    Using fs As New FileStream(ImagefilePathText.Text, FileMode.Open, FileAccess.Read)
+                        ImageSelectedPicture.Image = (New HttpVarious).CheckValidImage( _
+                                    Image.FromStream(fs), _
+                                    ImageSelectedPicture.Width, _
+                                    ImageSelectedPicture.Height)
+                        fs.Close()
+                    End Using
                     ImageSelectedPicture.Tag = UploadFileType.Picture
                 Case UploadFileType.MultiMedia
                     ''' TODO:動画アップロード用画像へ変更