| Revision | 30c57de4f71c8c82b843acd3bb62d608102e720a (tree) |
|---|---|
| Zeit | 2022-02-01 04:52:59 |
| Autor | upsilon <kim.upsilon@bucy...> |
| Commiter | GitHub |
Merge pull request #99 from opentween/fix-settings-panel
設定ダイアログ関連の不具合修正
OpenTween/Resources/ChangeLog.txt (diff)
OpenTween/Setting/Panel/BasedPanel.Designer.cs (diff) OpenTween/Setting/Panel/BasedPanel.resx (diff) OpenTween/Setting/Panel/ShortUrlPanel.Designer.cs (diff) OpenTween/Setting/Panel/ShortUrlPanel.resx (diff)| @@ -14,6 +14,7 @@ | ||
| 14 | 14 | * FIX: DMの添付画像をブラウザで開く場合に使用するURLを変更 |
| 15 | 15 | * FIX: 大文字アルファベットを含むハッシュタグがユーザー情報画面で正しくリンク化されない不具合を修正 (thx @naminodarie!) |
| 16 | 16 | * FIX: 初回起動時の設定画面でブラウザパスを入力しても認可URLを開く際に適用されない不具合を修正 |
| 17 | + * FIX: URL自動短縮の設定値が正しく表示されない不具合を修正 | |
| 17 | 18 | |
| 18 | 19 | ==== Ver 2.4.3(2019/12/06) |
| 19 | 20 | * FIX: 関連発言表示のタブを読み込み中に閉じるとエラーが発生する不具合を修正 |
| @@ -34,6 +34,8 @@ | ||
| 34 | 34 | this.StartAuthButton = new System.Windows.Forms.Button(); |
| 35 | 35 | this.AuthClearButton = new System.Windows.Forms.Button(); |
| 36 | 36 | this.Label4 = new System.Windows.Forms.Label(); |
| 37 | + this.panel1 = new System.Windows.Forms.Panel(); | |
| 38 | + this.panel1.SuspendLayout(); | |
| 37 | 39 | this.SuspendLayout(); |
| 38 | 40 | // |
| 39 | 41 | // AuthUserCombo |
| @@ -67,18 +69,25 @@ | ||
| 67 | 69 | resources.ApplyResources(this.Label4, "Label4"); |
| 68 | 70 | this.Label4.Name = "Label4"; |
| 69 | 71 | // |
| 72 | + // panel1 | |
| 73 | + // | |
| 74 | + this.panel1.Controls.Add(this.AuthUserCombo); | |
| 75 | + this.panel1.Controls.Add(this.CreateAccountButton); | |
| 76 | + this.panel1.Controls.Add(this.StartAuthButton); | |
| 77 | + this.panel1.Controls.Add(this.AuthClearButton); | |
| 78 | + this.panel1.Controls.Add(this.Label4); | |
| 79 | + resources.ApplyResources(this.panel1, "panel1"); | |
| 80 | + this.panel1.Name = "panel1"; | |
| 81 | + // | |
| 70 | 82 | // BasedPanel |
| 71 | 83 | // |
| 72 | 84 | resources.ApplyResources(this, "$this"); |
| 73 | 85 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
| 74 | - this.Controls.Add(this.AuthUserCombo); | |
| 75 | - this.Controls.Add(this.CreateAccountButton); | |
| 76 | - this.Controls.Add(this.StartAuthButton); | |
| 77 | - this.Controls.Add(this.AuthClearButton); | |
| 78 | - this.Controls.Add(this.Label4); | |
| 86 | + this.Controls.Add(this.panel1); | |
| 79 | 87 | this.Name = "BasedPanel"; |
| 88 | + this.panel1.ResumeLayout(false); | |
| 89 | + this.panel1.PerformLayout(); | |
| 80 | 90 | this.ResumeLayout(false); |
| 81 | - this.PerformLayout(); | |
| 82 | 91 | |
| 83 | 92 | } |
| 84 | 93 |
| @@ -89,5 +98,6 @@ | ||
| 89 | 98 | internal System.Windows.Forms.Button StartAuthButton; |
| 90 | 99 | internal System.Windows.Forms.Button AuthClearButton; |
| 91 | 100 | internal System.Windows.Forms.Label Label4; |
| 101 | + private System.Windows.Forms.Panel panel1; | |
| 92 | 102 | } |
| 93 | 103 | } |
| @@ -9,53 +9,63 @@ | ||
| 9 | 9 | |
| 10 | 10 | <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"><value>96, 96</value></data> |
| 11 | 11 | <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"><value>True</value></metadata> |
| 12 | + <data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 0, 0</value></data> | |
| 12 | 13 | <data name=">>$this.Name"><value>BasedPanel</value></data> |
| 13 | - <data name=">>$this.Type"><value>OpenTween.Setting.Panel.SettingPanelBase, OpenTween, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</value></data> | |
| 14 | + <data name=">>$this.Type"><value>OpenTween.Setting.Panel.SettingPanelBase, OpenTween, Version=2.4.3.1, Culture=neutral, PublicKeyToken=null</value></data> | |
| 14 | 15 | <data name=">>AuthClearButton.Name"><value>AuthClearButton</value></data> |
| 15 | - <data name=">>AuthClearButton.Parent"><value>$this</value></data> | |
| 16 | + <data name=">>AuthClearButton.Parent"><value>panel1</value></data> | |
| 16 | 17 | <data name=">>AuthClearButton.Type"><value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> |
| 17 | 18 | <data name=">>AuthClearButton.ZOrder"><value>3</value></data> |
| 18 | 19 | <data name=">>AuthUserCombo.Name"><value>AuthUserCombo</value></data> |
| 19 | - <data name=">>AuthUserCombo.Parent"><value>$this</value></data> | |
| 20 | + <data name=">>AuthUserCombo.Parent"><value>panel1</value></data> | |
| 20 | 21 | <data name=">>AuthUserCombo.Type"><value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> |
| 21 | 22 | <data name=">>AuthUserCombo.ZOrder"><value>0</value></data> |
| 22 | 23 | <data name=">>CreateAccountButton.Name"><value>CreateAccountButton</value></data> |
| 23 | - <data name=">>CreateAccountButton.Parent"><value>$this</value></data> | |
| 24 | + <data name=">>CreateAccountButton.Parent"><value>panel1</value></data> | |
| 24 | 25 | <data name=">>CreateAccountButton.Type"><value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> |
| 25 | 26 | <data name=">>CreateAccountButton.ZOrder"><value>1</value></data> |
| 26 | 27 | <data name=">>Label4.Name"><value>Label4</value></data> |
| 27 | - <data name=">>Label4.Parent"><value>$this</value></data> | |
| 28 | + <data name=">>Label4.Parent"><value>panel1</value></data> | |
| 28 | 29 | <data name=">>Label4.Type"><value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> |
| 29 | 30 | <data name=">>Label4.ZOrder"><value>4</value></data> |
| 31 | + <data name=">>panel1.Name"><value>panel1</value></data> | |
| 32 | + <data name=">>panel1.Parent"><value>$this</value></data> | |
| 33 | + <data name=">>panel1.Type"><value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> | |
| 34 | + <data name=">>panel1.ZOrder"><value>0</value></data> | |
| 30 | 35 | <data name=">>StartAuthButton.Name"><value>StartAuthButton</value></data> |
| 31 | - <data name=">>StartAuthButton.Parent"><value>$this</value></data> | |
| 36 | + <data name=">>StartAuthButton.Parent"><value>panel1</value></data> | |
| 32 | 37 | <data name=">>StartAuthButton.Type"><value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data> |
| 33 | 38 | <data name=">>StartAuthButton.ZOrder"><value>2</value></data> |
| 34 | 39 | <data name="AuthClearButton.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data> |
| 35 | 40 | <data name="AuthClearButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data> |
| 36 | 41 | <data name="AuthClearButton.Location" type="System.Drawing.Point, System.Drawing"><value>293, 20</value></data> |
| 37 | 42 | <data name="AuthClearButton.Size" type="System.Drawing.Size, System.Drawing"><value>75, 25</value></data> |
| 38 | - <data name="AuthClearButton.TabIndex" type="System.Int32, mscorlib"><value>9</value></data> | |
| 43 | + <data name="AuthClearButton.TabIndex" type="System.Int32, mscorlib"><value>2</value></data> | |
| 39 | 44 | <data name="AuthClearButton.Text"><value>削除</value></data> |
| 40 | 45 | <data name="AuthUserCombo.Location" type="System.Drawing.Point, System.Drawing"><value>111, 22</value></data> |
| 41 | 46 | <data name="AuthUserCombo.Size" type="System.Drawing.Size, System.Drawing"><value>160, 20</value></data> |
| 42 | - <data name="AuthUserCombo.TabIndex" type="System.Int32, mscorlib"><value>8</value></data> | |
| 47 | + <data name="AuthUserCombo.TabIndex" type="System.Int32, mscorlib"><value>1</value></data> | |
| 43 | 48 | <data name="CreateAccountButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"><value>Bottom, Right</value></data> |
| 44 | 49 | <data name="CreateAccountButton.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data> |
| 45 | 50 | <data name="CreateAccountButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data> |
| 46 | 51 | <data name="CreateAccountButton.Location" type="System.Drawing.Point, System.Drawing"><value>310, 320</value></data> |
| 47 | 52 | <data name="CreateAccountButton.Size" type="System.Drawing.Size, System.Drawing"><value>186, 25</value></data> |
| 48 | - <data name="CreateAccountButton.TabIndex" type="System.Int32, mscorlib"><value>11</value></data> | |
| 53 | + <data name="CreateAccountButton.TabIndex" type="System.Int32, mscorlib"><value>4</value></data> | |
| 49 | 54 | <data name="CreateAccountButton.Text"><value>Twitter アカウントを作成する</value></data> |
| 50 | 55 | <data name="Label4.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data> |
| 51 | 56 | <data name="Label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data> |
| 52 | 57 | <data name="Label4.Location" type="System.Drawing.Point, System.Drawing"><value>23, 25</value></data> |
| 53 | 58 | <data name="Label4.Size" type="System.Drawing.Size, System.Drawing"><value>49, 12</value></data> |
| 54 | - <data name="Label4.TabIndex" type="System.Int32, mscorlib"><value>7</value></data> | |
| 59 | + <data name="Label4.TabIndex" type="System.Int32, mscorlib"><value>0</value></data> | |
| 55 | 60 | <data name="Label4.Text"><value>アカウント</value></data> |
| 61 | + <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"><value>Fill</value></data> | |
| 62 | + <data name="panel1.Location" type="System.Drawing.Point, System.Drawing"><value>0, 0</value></data> | |
| 63 | + <data name="panel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>20, 20, 20, 20</value></data> | |
| 64 | + <data name="panel1.Size" type="System.Drawing.Size, System.Drawing"><value>519, 368</value></data> | |
| 65 | + <data name="panel1.TabIndex" type="System.Int32, mscorlib"><value>0</value></data> | |
| 56 | 66 | <data name="StartAuthButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data> |
| 57 | 67 | <data name="StartAuthButton.Location" type="System.Drawing.Point, System.Drawing"><value>98, 63</value></data> |
| 58 | 68 | <data name="StartAuthButton.Size" type="System.Drawing.Size, System.Drawing"><value>321, 45</value></data> |
| 59 | - <data name="StartAuthButton.TabIndex" type="System.Int32, mscorlib"><value>10</value></data> | |
| 69 | + <data name="StartAuthButton.TabIndex" type="System.Int32, mscorlib"><value>3</value></data> | |
| 60 | 70 | <data name="StartAuthButton.Text"><value>認証開始</value></data> |
| 61 | 71 | </root> |
| @@ -77,8 +77,7 @@ | ||
| 77 | 77 | resources.GetString("ComboBoxAutoShortUrlFirst.Items1"), |
| 78 | 78 | resources.GetString("ComboBoxAutoShortUrlFirst.Items2"), |
| 79 | 79 | resources.GetString("ComboBoxAutoShortUrlFirst.Items3"), |
| 80 | - resources.GetString("ComboBoxAutoShortUrlFirst.Items4"), | |
| 81 | - resources.GetString("ComboBoxAutoShortUrlFirst.Items5")}); | |
| 80 | + resources.GetString("ComboBoxAutoShortUrlFirst.Items4")}); | |
| 82 | 81 | resources.ApplyResources(this.ComboBoxAutoShortUrlFirst, "ComboBoxAutoShortUrlFirst"); |
| 83 | 82 | this.ComboBoxAutoShortUrlFirst.Name = "ComboBoxAutoShortUrlFirst"; |
| 84 | 83 | this.ComboBoxAutoShortUrlFirst.SelectedIndexChanged += new System.EventHandler(this.ComboBoxAutoShortUrlFirst_SelectedIndexChanged); |
| @@ -62,10 +62,9 @@ | ||
| 62 | 62 | <data name="CheckTinyURL.Text"><value>短縮URLを解決する</value></data> |
| 63 | 63 | <data name="ComboBoxAutoShortUrlFirst.Items"><value>tinyurl</value></data> |
| 64 | 64 | <data name="ComboBoxAutoShortUrlFirst.Items1"><value>is.gd</value></data> |
| 65 | - <data name="ComboBoxAutoShortUrlFirst.Items2"><value>twurl.nl</value></data> | |
| 66 | - <data name="ComboBoxAutoShortUrlFirst.Items3"><value>bit.ly</value></data> | |
| 67 | - <data name="ComboBoxAutoShortUrlFirst.Items4"><value>j.mp</value></data> | |
| 68 | - <data name="ComboBoxAutoShortUrlFirst.Items5"><value>ux.nu</value></data> | |
| 65 | + <data name="ComboBoxAutoShortUrlFirst.Items2"><value>bit.ly</value></data> | |
| 66 | + <data name="ComboBoxAutoShortUrlFirst.Items3"><value>j.mp</value></data> | |
| 67 | + <data name="ComboBoxAutoShortUrlFirst.Items4"><value>ux.nu</value></data> | |
| 69 | 68 | <data name="ComboBoxAutoShortUrlFirst.Location" type="System.Drawing.Point, System.Drawing"><value>249, 98</value></data> |
| 70 | 69 | <data name="ComboBoxAutoShortUrlFirst.Size" type="System.Drawing.Size, System.Drawing"><value>246, 20</value></data> |
| 71 | 70 | <data name="ComboBoxAutoShortUrlFirst.TabIndex" type="System.Int32, mscorlib"><value>4</value></data> |
OpenTween
Fork