• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

OpenTweenのfork


Commit MetaInfo

Revision6e9819a4b4d002aee9fc1a808412308971e7384d (tree)
Time2012-02-18 23:14:16
Authorkiri_feather <kiri_feather@user...>
CommiterKimura Youichi

Log Message

画像投稿用の画像リソース差し替え
TL・画像投稿のパネルTabIndex変更(読み上げ対応)
投稿画像のFileStreamを確実に閉じるように

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

Change Summary

Incremental Difference

--- a/Tween/My Project/AssemblyInfo.vb
+++ b/Tween/My Project/AssemblyInfo.vb
@@ -55,5 +55,5 @@ Imports System.Runtime.InteropServices
5555 ' <Assembly: AssemblyVersion("1.0.*")>
5656
5757 <Assembly: AssemblyVersion("0.1.0.0")>
58-<Assembly: AssemblyFileVersion("0.9.4.0")>
58+<Assembly: AssemblyFileVersion("0.9.4.1")>
5959
Binary files a/Tween/Resources/InitialImage.png and b/Tween/Resources/InitialImage.png differ
Binary files a/Tween/Resources/MultiMediaImage.png and b/Tween/Resources/MultiMediaImage.png differ
--- a/Tween/Tween.Designer.vb
+++ b/Tween/Tween.Designer.vb
@@ -43,15 +43,6 @@ Partial Class TweenMain
4343 Me.HashToggleMenuItem = New System.Windows.Forms.ToolStripMenuItem()
4444 Me.HashManageMenuItem = New System.Windows.Forms.ToolStripMenuItem()
4545 Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
46- Me.ImageSelectionPanel = New System.Windows.Forms.Panel()
47- Me.ImageSelectedPicture = New System.Windows.Forms.PictureBox()
48- Me.ImagePathPanel = New System.Windows.Forms.Panel()
49- Me.ImagefilePathText = New System.Windows.Forms.TextBox()
50- Me.FilePickButton = New System.Windows.Forms.Button()
51- Me.Label2 = New System.Windows.Forms.Label()
52- Me.ImageServiceCombo = New System.Windows.Forms.ComboBox()
53- Me.ImageCancelButton = New System.Windows.Forms.Button()
54- Me.Label1 = New System.Windows.Forms.Label()
5546 Me.TimelinePanel = New System.Windows.Forms.Panel()
5647 Me.ListTab = New System.Windows.Forms.TabControl()
5748 Me.ContextMenuTabProperty = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -68,6 +59,15 @@ Partial Class TweenMain
6859 Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
6960 Me.DeleteTabMenuItem = New System.Windows.Forms.ToolStripMenuItem()
7061 Me.TabImage = New System.Windows.Forms.ImageList(Me.components)
62+ Me.ImageSelectionPanel = New System.Windows.Forms.Panel()
63+ Me.ImageSelectedPicture = New System.Windows.Forms.PictureBox()
64+ Me.ImagePathPanel = New System.Windows.Forms.Panel()
65+ Me.ImagefilePathText = New System.Windows.Forms.TextBox()
66+ Me.FilePickButton = New System.Windows.Forms.Button()
67+ Me.Label2 = New System.Windows.Forms.Label()
68+ Me.ImageServiceCombo = New System.Windows.Forms.ComboBox()
69+ Me.ImageCancelButton = New System.Windows.Forms.Button()
70+ Me.Label1 = New System.Windows.Forms.Label()
7171 Me.ProfilePanel = New System.Windows.Forms.Panel()
7272 Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
7373 Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
@@ -271,11 +271,11 @@ Partial Class TweenMain
271271 Me.SplitContainer1.Panel1.SuspendLayout()
272272 Me.SplitContainer1.Panel2.SuspendLayout()
273273 Me.SplitContainer1.SuspendLayout()
274+ Me.TimelinePanel.SuspendLayout()
275+ Me.ContextMenuTabProperty.SuspendLayout()
274276 Me.ImageSelectionPanel.SuspendLayout()
275277 CType(Me.ImageSelectedPicture, System.ComponentModel.ISupportInitialize).BeginInit()
276278 Me.ImagePathPanel.SuspendLayout()
277- Me.TimelinePanel.SuspendLayout()
278- Me.ContextMenuTabProperty.SuspendLayout()
279279 Me.SplitContainer3.Panel1.SuspendLayout()
280280 Me.SplitContainer3.Panel2.SuspendLayout()
281281 Me.SplitContainer3.SuspendLayout()
@@ -428,8 +428,8 @@ Partial Class TweenMain
428428 '
429429 'SplitContainer1.Panel1
430430 '
431- Me.SplitContainer1.Panel1.Controls.Add(Me.ImageSelectionPanel)
432431 Me.SplitContainer1.Panel1.Controls.Add(Me.TimelinePanel)
432+ Me.SplitContainer1.Panel1.Controls.Add(Me.ImageSelectionPanel)
433433 Me.SplitContainer1.Panel1.Controls.Add(Me.ProfilePanel)
434434 '
435435 'SplitContainer1.Panel2
@@ -437,67 +437,6 @@ Partial Class TweenMain
437437 Me.SplitContainer1.Panel2.Controls.Add(Me.SplitContainer3)
438438 Me.SplitContainer1.TabStop = False
439439 '
440- 'ImageSelectionPanel
441- '
442- resources.ApplyResources(Me.ImageSelectionPanel, "ImageSelectionPanel")
443- Me.ImageSelectionPanel.Controls.Add(Me.ImageSelectedPicture)
444- Me.ImageSelectionPanel.Controls.Add(Me.ImagePathPanel)
445- Me.ImageSelectionPanel.Name = "ImageSelectionPanel"
446- '
447- 'ImageSelectedPicture
448- '
449- resources.ApplyResources(Me.ImageSelectedPicture, "ImageSelectedPicture")
450- Me.ImageSelectedPicture.Image = Global.Tween.My.Resources.Resources.InitialImage
451- Me.ImageSelectedPicture.InitialImage = Global.Tween.My.Resources.Resources.InitialImage
452- Me.ImageSelectedPicture.Name = "ImageSelectedPicture"
453- Me.ImageSelectedPicture.TabStop = False
454- '
455- 'ImagePathPanel
456- '
457- Me.ImagePathPanel.Controls.Add(Me.ImagefilePathText)
458- Me.ImagePathPanel.Controls.Add(Me.FilePickButton)
459- Me.ImagePathPanel.Controls.Add(Me.Label2)
460- Me.ImagePathPanel.Controls.Add(Me.ImageServiceCombo)
461- Me.ImagePathPanel.Controls.Add(Me.ImageCancelButton)
462- Me.ImagePathPanel.Controls.Add(Me.Label1)
463- resources.ApplyResources(Me.ImagePathPanel, "ImagePathPanel")
464- Me.ImagePathPanel.Name = "ImagePathPanel"
465- '
466- 'ImagefilePathText
467- '
468- resources.ApplyResources(Me.ImagefilePathText, "ImagefilePathText")
469- Me.ImagefilePathText.Name = "ImagefilePathText"
470- '
471- 'FilePickButton
472- '
473- resources.ApplyResources(Me.FilePickButton, "FilePickButton")
474- Me.FilePickButton.Name = "FilePickButton"
475- Me.FilePickButton.UseVisualStyleBackColor = True
476- '
477- 'Label2
478- '
479- resources.ApplyResources(Me.Label2, "Label2")
480- Me.Label2.Name = "Label2"
481- '
482- 'ImageServiceCombo
483- '
484- resources.ApplyResources(Me.ImageServiceCombo, "ImageServiceCombo")
485- Me.ImageServiceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
486- Me.ImageServiceCombo.FormattingEnabled = True
487- Me.ImageServiceCombo.Items.AddRange(New Object() {resources.GetString("ImageServiceCombo.Items"), resources.GetString("ImageServiceCombo.Items1")})
488- Me.ImageServiceCombo.Name = "ImageServiceCombo"
489- '
490- 'ImageCancelButton
491- '
492- resources.ApplyResources(Me.ImageCancelButton, "ImageCancelButton")
493- Me.ImageCancelButton.Name = "ImageCancelButton"
494- Me.ImageCancelButton.UseVisualStyleBackColor = True
495- '
496- 'Label1
497- '
498- resources.ApplyResources(Me.Label1, "Label1")
499- Me.Label1.Name = "Label1"
500- '
501440 'TimelinePanel
502441 '
503442 Me.TimelinePanel.Controls.Add(Me.ListTab)
@@ -592,6 +531,67 @@ Partial Class TweenMain
592531 resources.ApplyResources(Me.TabImage, "TabImage")
593532 Me.TabImage.TransparentColor = System.Drawing.Color.Transparent
594533 '
534+ 'ImageSelectionPanel
535+ '
536+ resources.ApplyResources(Me.ImageSelectionPanel, "ImageSelectionPanel")
537+ Me.ImageSelectionPanel.Controls.Add(Me.ImageSelectedPicture)
538+ Me.ImageSelectionPanel.Controls.Add(Me.ImagePathPanel)
539+ Me.ImageSelectionPanel.Name = "ImageSelectionPanel"
540+ '
541+ 'ImageSelectedPicture
542+ '
543+ resources.ApplyResources(Me.ImageSelectedPicture, "ImageSelectedPicture")
544+ Me.ImageSelectedPicture.Image = Global.Tween.My.Resources.Resources.InitialImage
545+ Me.ImageSelectedPicture.InitialImage = Global.Tween.My.Resources.Resources.InitialImage
546+ Me.ImageSelectedPicture.Name = "ImageSelectedPicture"
547+ Me.ImageSelectedPicture.TabStop = False
548+ '
549+ 'ImagePathPanel
550+ '
551+ Me.ImagePathPanel.Controls.Add(Me.ImagefilePathText)
552+ Me.ImagePathPanel.Controls.Add(Me.FilePickButton)
553+ Me.ImagePathPanel.Controls.Add(Me.Label2)
554+ Me.ImagePathPanel.Controls.Add(Me.ImageServiceCombo)
555+ Me.ImagePathPanel.Controls.Add(Me.ImageCancelButton)
556+ Me.ImagePathPanel.Controls.Add(Me.Label1)
557+ resources.ApplyResources(Me.ImagePathPanel, "ImagePathPanel")
558+ Me.ImagePathPanel.Name = "ImagePathPanel"
559+ '
560+ 'ImagefilePathText
561+ '
562+ resources.ApplyResources(Me.ImagefilePathText, "ImagefilePathText")
563+ Me.ImagefilePathText.Name = "ImagefilePathText"
564+ '
565+ 'FilePickButton
566+ '
567+ resources.ApplyResources(Me.FilePickButton, "FilePickButton")
568+ Me.FilePickButton.Name = "FilePickButton"
569+ Me.FilePickButton.UseVisualStyleBackColor = True
570+ '
571+ 'Label2
572+ '
573+ resources.ApplyResources(Me.Label2, "Label2")
574+ Me.Label2.Name = "Label2"
575+ '
576+ 'ImageServiceCombo
577+ '
578+ resources.ApplyResources(Me.ImageServiceCombo, "ImageServiceCombo")
579+ Me.ImageServiceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
580+ Me.ImageServiceCombo.FormattingEnabled = True
581+ Me.ImageServiceCombo.Items.AddRange(New Object() {resources.GetString("ImageServiceCombo.Items"), resources.GetString("ImageServiceCombo.Items1")})
582+ Me.ImageServiceCombo.Name = "ImageServiceCombo"
583+ '
584+ 'ImageCancelButton
585+ '
586+ resources.ApplyResources(Me.ImageCancelButton, "ImageCancelButton")
587+ Me.ImageCancelButton.Name = "ImageCancelButton"
588+ Me.ImageCancelButton.UseVisualStyleBackColor = True
589+ '
590+ 'Label1
591+ '
592+ resources.ApplyResources(Me.Label1, "Label1")
593+ Me.Label1.Name = "Label1"
594+ '
595595 'ProfilePanel
596596 '
597597 resources.ApplyResources(Me.ProfilePanel, "ProfilePanel")
@@ -1657,12 +1657,12 @@ Partial Class TweenMain
16571657 Me.SplitContainer1.Panel1.ResumeLayout(False)
16581658 Me.SplitContainer1.Panel2.ResumeLayout(False)
16591659 Me.SplitContainer1.ResumeLayout(False)
1660+ Me.TimelinePanel.ResumeLayout(False)
1661+ Me.ContextMenuTabProperty.ResumeLayout(False)
16601662 Me.ImageSelectionPanel.ResumeLayout(False)
16611663 CType(Me.ImageSelectedPicture, System.ComponentModel.ISupportInitialize).EndInit()
16621664 Me.ImagePathPanel.ResumeLayout(False)
16631665 Me.ImagePathPanel.PerformLayout()
1664- Me.TimelinePanel.ResumeLayout(False)
1665- Me.ContextMenuTabProperty.ResumeLayout(False)
16661666 Me.SplitContainer3.Panel1.ResumeLayout(False)
16671667 Me.SplitContainer3.Panel2.ResumeLayout(False)
16681668 Me.SplitContainer3.ResumeLayout(False)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -532,7 +532,7 @@
532532 <value>453, 166</value>
533533 </data>
534534 <data name="ImageSelectionPanel.TabIndex" type="System.Int32, mscorlib">
535- <value>0</value>
535+ <value>1</value>
536536 </data>
537537 <data name="ImageSelectionPanel.Visible" type="System.Boolean, mscorlib">
538538 <value>False</value>
@@ -670,7 +670,7 @@
670670 <value>453, 166</value>
671671 </data>
672672 <data name="TimelinePanel.TabIndex" type="System.Int32, mscorlib">
673- <value>1</value>
673+ <value>0</value>
674674 </data>
675675 <data name="&gt;&gt;TimelinePanel.Name" xml:space="preserve">
676676 <value>TimelinePanel</value>
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -9402,12 +9402,13 @@ RETRY:
94029402 ImageSelectedPicture.Image = ImageSelectedPicture.InitialImage
94039403 ImageSelectedPicture.Tag = UploadFileType.Invalid
94049404 Case UploadFileType.Picture
9405- Dim fs As New FileStream(ImagefilePathText.Text, FileMode.Open, FileAccess.Read)
9406- ImageSelectedPicture.Image = (New HttpVarious).CheckValidImage( _
9407- Image.FromStream(fs), _
9408- ImageSelectedPicture.Width, _
9409- ImageSelectedPicture.Height)
9410- fs.Close()
9405+ Using fs As New FileStream(ImagefilePathText.Text, FileMode.Open, FileAccess.Read)
9406+ ImageSelectedPicture.Image = (New HttpVarious).CheckValidImage( _
9407+ Image.FromStream(fs), _
9408+ ImageSelectedPicture.Width, _
9409+ ImageSelectedPicture.Height)
9410+ fs.Close()
9411+ End Using
94119412 ImageSelectedPicture.Tag = UploadFileType.Picture
94129413 Case UploadFileType.MultiMedia
94139414 ''' TODO:動画アップロード用画像へ変更