diff --git a/HtmlRenderer/Properties/AssemblyInfo.cs b/HtmlRenderer/Properties/AssemblyInfo.cs index 147cd1867..c348996eb 100644 --- a/HtmlRenderer/Properties/AssemblyInfo.cs +++ b/HtmlRenderer/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.1")] +[assembly: AssemblyVersion("1.0.1.2")] diff --git a/HtmlRenderer/Renderer.cs b/HtmlRenderer/Renderer.cs index c04e837e3..f9accf98d 100644 --- a/HtmlRenderer/Renderer.cs +++ b/HtmlRenderer/Renderer.cs @@ -140,6 +140,24 @@ public void SendMouseWheel(int x, int y, int delta, bool isVertical) } } + public void SendActivate() + { + if (this.Browser != null) + { + var host = this.Browser.GetHost(); + host.SendFocusEvent(true); + } + } + + public void SendDeactivate() + { + if (this.Browser != null) + { + var host = this.Browser.GetHost(); + host.SendFocusEvent(false); + } + } + private bool IsContinuousClick(int x, int y, CefMouseButtonType button) { // ダブルクリックとして認識するクリックの間隔よりも大きかった場合は継続的なクリックとみなさない @@ -158,6 +176,16 @@ private bool IsContinuousClick(int x, int y, CefMouseButtonType button) return true; } + public void SendKeyEvent(CefKeyEvent keyEvent) + { + if (this.Browser != null) + { + var host = this.Browser.GetHost(); + + host.SendKeyEvent(keyEvent); + } + } + internal void OnCreated(CefBrowser browser) { this.Browser = browser; diff --git a/OverlayPlugin.Common/Properties/AssemblyInfo.cs b/OverlayPlugin.Common/Properties/AssemblyInfo.cs index 424780841..43baff4b5 100644 --- a/OverlayPlugin.Common/Properties/AssemblyInfo.cs +++ b/OverlayPlugin.Common/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.3.2")] \ No newline at end of file +[assembly: AssemblyVersion("0.3.3.3")] \ No newline at end of file diff --git a/OverlayPlugin.Core/NativeMethods.cs b/OverlayPlugin.Core/NativeMethods.cs index 2e43be0d7..ac09e9d55 100644 --- a/OverlayPlugin.Core/NativeMethods.cs +++ b/OverlayPlugin.Core/NativeMethods.cs @@ -213,5 +213,16 @@ uint uFlags // ウィンドウ位置のオプション public const uint SWP_NOSIZE = 0x0001; public const uint SWP_NOMOVE = 0x0002; public const uint SWP_NOACTIVATE = 0x0010; + + [DllImport("user32.dll")] + public static extern short GetKeyState(int nVirtKey); + + + public const int WM_KEYDOWN = 0x0100; + public const int WM_KEYUP = 0x0101; + public const int WM_CHAR = 0x0102; + public const int WM_SYSKEYDOWN = 0x0104; + public const int WM_SYSKEYUP = 0x0105; + public const int WM_SYSCHAR = 0x0106; } } diff --git a/OverlayPlugin.Core/OverlayBase.cs b/OverlayPlugin.Core/OverlayBase.cs index 0918a8a4f..3498f36d9 100644 --- a/OverlayPlugin.Core/OverlayBase.cs +++ b/OverlayPlugin.Core/OverlayBase.cs @@ -267,14 +267,7 @@ public virtual void Dispose() public virtual void Navigate(string url) { - if (this.Overlay.Url != url) - { this.Overlay.Url = url; - } - else - { - this.Overlay.Reload(); - } } protected void Log(LogLevel level, string message) diff --git a/OverlayPlugin.Core/OverlayForm.Designer.cs b/OverlayPlugin.Core/OverlayForm.Designer.cs index f2b8e25aa..cfee424cd 100644 --- a/OverlayPlugin.Core/OverlayForm.Designer.cs +++ b/OverlayPlugin.Core/OverlayForm.Designer.cs @@ -30,6 +30,8 @@ private void InitializeComponent() this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "OverlayForm"; + this.Activated += new System.EventHandler(this.OverlayForm_Activated); + this.Deactivate += new System.EventHandler(this.OverlayForm_Deactivate); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OverlayForm_FormClosed); this.Load += new System.EventHandler(this.OverlayForm_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OverlayForm_KeyDown); diff --git a/OverlayPlugin.Core/OverlayForm.cs b/OverlayPlugin.Core/OverlayForm.cs index beffd70d0..1a38510ca 100644 --- a/OverlayPlugin.Core/OverlayForm.cs +++ b/OverlayPlugin.Core/OverlayForm.cs @@ -35,11 +35,8 @@ public string Url get { return this.url; } set { - if (this.url != value) - { - this.url = value; - UpdateRender(); - } + this.url = value; + UpdateRender(); } } @@ -124,6 +121,15 @@ protected override void WndProc(ref Message m) } } + if (m.Msg == NativeMethods.WM_KEYDOWN || + m.Msg == NativeMethods.WM_KEYUP || + m.Msg == NativeMethods.WM_CHAR || + m.Msg == NativeMethods.WM_SYSKEYDOWN || + m.Msg == NativeMethods.WM_SYSKEYUP || + m.Msg == NativeMethods.WM_SYSCHAR) + { + OnKeyEvent(ref m); + } } private void UpdateLayeredWindowBitmap() @@ -496,6 +502,7 @@ private void OverlayForm_KeyDown(object sender, KeyEventArgs e) this.altKeyPressed = e.Alt; this.shiftKeyPressed = e.Shift; this.controlKeyPressed = e.Control; + } private void OverlayForm_KeyUp(object sender, KeyEventArgs e) @@ -504,5 +511,133 @@ private void OverlayForm_KeyUp(object sender, KeyEventArgs e) this.shiftKeyPressed = e.Shift; this.controlKeyPressed = e.Control; } + + private void OnKeyEvent(ref Message m) + { + + var keyEvent = new CefKeyEvent(); + keyEvent.WindowsKeyCode = m.WParam.ToInt32(); + keyEvent.NativeKeyCode = (int)m.LParam.ToInt64(); + keyEvent.IsSystemKey = m.Msg == NativeMethods.WM_SYSCHAR || + m.Msg == NativeMethods.WM_SYSKEYDOWN || + m.Msg == NativeMethods.WM_SYSKEYUP; + + if (m.Msg == NativeMethods.WM_KEYDOWN || m.Msg == NativeMethods.WM_SYSKEYDOWN) + { + keyEvent.EventType = CefKeyEventType.RawKeyDown; + } + else if (m.Msg == NativeMethods.WM_KEYUP || m.Msg == NativeMethods.WM_SYSKEYUP) + { + keyEvent.EventType = CefKeyEventType.KeyUp; + } + else + { + keyEvent.EventType = CefKeyEventType.Char; + } + keyEvent.Modifiers = GetKeyboardModifiers(ref m); + + if (this.Renderer != null) + { + this.Renderer.SendKeyEvent(keyEvent); + } + } + + private CefEventFlags GetKeyboardModifiers(ref Message m) + { + var modifiers = CefEventFlags.None; + + if (IsKeyDown(Keys.Shift)) modifiers |= CefEventFlags.ShiftDown; + if (IsKeyDown(Keys.Control)) modifiers |= CefEventFlags.ControlDown; + if (IsKeyDown(Keys.Menu)) modifiers |= CefEventFlags.AltDown; + + if (IsKeyToggled(Keys.NumLock)) modifiers |= CefEventFlags.NumLockOn; + if (IsKeyToggled(Keys.Capital)) modifiers |= CefEventFlags.CapsLockOn; + + switch ((Keys)m.WParam) + { + case Keys.Return: + if (((m.LParam.ToInt64() >> 48) & 0x0100) != 0) + modifiers |= CefEventFlags.IsKeyPad; + break; + case Keys.Insert: + case Keys.Delete: + case Keys.Home: + case Keys.End: + case Keys.Prior: + case Keys.Next: + case Keys.Up: + case Keys.Down: + case Keys.Left: + case Keys.Right: + if (!(((m.LParam.ToInt64() >> 48) & 0x0100) != 0)) + modifiers |= CefEventFlags.IsKeyPad; + break; + case Keys.NumLock: + case Keys.NumPad0: + case Keys.NumPad1: + case Keys.NumPad2: + case Keys.NumPad3: + case Keys.NumPad4: + case Keys.NumPad5: + case Keys.NumPad6: + case Keys.NumPad7: + case Keys.NumPad8: + case Keys.NumPad9: + case Keys.Divide: + case Keys.Multiply: + case Keys.Subtract: + case Keys.Add: + case Keys.Decimal: + case Keys.Clear: + modifiers |= CefEventFlags.IsKeyPad; + break; + case Keys.Shift: + if (IsKeyDown(Keys.LShiftKey)) modifiers |= CefEventFlags.IsLeft; + else modifiers |= CefEventFlags.IsRight; + break; + case Keys.Control: + if (IsKeyDown(Keys.LControlKey)) modifiers |= CefEventFlags.IsLeft; + else modifiers |= CefEventFlags.IsRight; + break; + case Keys.Alt: + if (IsKeyDown(Keys.LMenu)) modifiers |= CefEventFlags.IsLeft; + else modifiers |= CefEventFlags.IsRight; + break; + case Keys.LWin: + modifiers |= CefEventFlags.IsLeft; + break; + case Keys.RWin: + modifiers |= CefEventFlags.IsRight; + break; + } + + return modifiers; + } + + private bool IsKeyDown(Keys key) + { + return (NativeMethods.GetKeyState((int)key) & 0x8000) != 0; + } + + private bool IsKeyToggled(Keys key) + { + return (NativeMethods.GetKeyState((int)key) & 1) == 1; + } + + private void OverlayForm_Activated(object sender, EventArgs e) + { + if (this.Renderer != null) + { + this.Renderer.SendActivate(); + } + } + + private void OverlayForm_Deactivate(object sender, EventArgs e) + { + if (this.Renderer != null) + { + this.Renderer.SendDeactivate(); + } + } } } diff --git a/OverlayPlugin.Core/Overlays/LabelOverlayConfig.cs b/OverlayPlugin.Core/Overlays/LabelOverlayConfig.cs index fba4ad24f..e5b6b120e 100644 --- a/OverlayPlugin.Core/Overlays/LabelOverlayConfig.cs +++ b/OverlayPlugin.Core/Overlays/LabelOverlayConfig.cs @@ -58,7 +58,8 @@ public bool HtmlModeEnabled public LabelOverlayConfig(string name) : base(name) { - + this.Text = ""; + this.HtmlModeEnabled = false; } // XmlSerializer用 diff --git a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.Designer.cs b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.Designer.cs index 9c97382ba..00cbed38a 100644 --- a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.Designer.cs +++ b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.Designer.cs @@ -100,12 +100,14 @@ private void InitializeComponent() resources.ApplyResources(this.checkMiniParseVisible, "checkMiniParseVisible"); this.checkMiniParseVisible.Name = "checkMiniParseVisible"; this.checkMiniParseVisible.UseVisualStyleBackColor = true; + this.checkMiniParseVisible.CheckedChanged += new System.EventHandler(this.checkWindowVisible_CheckedChanged); // // checkMiniParseClickthru // resources.ApplyResources(this.checkMiniParseClickthru, "checkMiniParseClickthru"); this.checkMiniParseClickthru.Name = "checkMiniParseClickthru"; this.checkMiniParseClickthru.UseVisualStyleBackColor = true; + this.checkMiniParseClickthru.CheckedChanged += new System.EventHandler(this.checkMouseClickthru_CheckedChanged); // // label7 // diff --git a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.ja-JP.resx b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.ja-JP.resx index df9a2b345..55b0c5e4b 100644 --- a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.ja-JP.resx +++ b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.ja-JP.resx @@ -135,6 +135,14 @@ 移動とリサイズを制限する + + + Fill + + + + 403, 16 + ※ホットキーの変更を有効にするためにはプラグインの再起動が必要です diff --git a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.resx b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.resx index 6b457593f..e5f0549d1 100644 --- a/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.resx +++ b/OverlayPlugin.Core/Overlays/LabelOverlayConfigPanel.resx @@ -128,11 +128,11 @@ 149, 22 - - 25 + + 1 - - MiddleLeft + + 7 4 @@ -147,8 +147,8 @@ 6 - - NoControl + + MiddleLeft 1 @@ -156,17 +156,17 @@ 28 - - MiddleLeft - NoControl 26 - - label7 + + 0, 0 + + + tableLayoutPanel1 tableLayoutPanel1 @@ -174,8 +174,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 22 + + 31 tableLayoutPanel1 @@ -195,36 +195,33 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 149, 22 + + + 30 + + + 22 Fill - - 9 + + NoControl 0 - - Fill - tableLayoutPanel3 - - 0 - - - Fill + + 3, 259 True - - 2 - 11 @@ -240,17 +237,14 @@ NoControl - - Fill + + MiddleLeft 158, 262 - - 7 - - - label5 + + 0 True @@ -258,23 +252,20 @@ 0 - + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Fill 20 - - True - 156, 67 - - NoControl + + 1 24 @@ -282,14 +273,14 @@ 6, 12 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 31 + + 1 - - 149, 22 + + Consolas, 9pt NoControl @@ -309,26 +300,23 @@ Show overlay - - NoControl + + Fill 1, 1, 1, 1 - - True - True 19 - + NoControl - - 2 + + True 403, 49 @@ -342,8 +330,8 @@ tableLayoutPanel1 - - 158, 25 + + True label1 @@ -351,11 +339,11 @@ Vertical - - 1 + + 149, 22 - - tableLayoutPanel1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 buttonCopyUpdateScript @@ -363,26 +351,20 @@ 407, 19 - - tableLayoutPanel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Global hotkey + + True Fill - - True + + tableLayoutPanel1 196, 43 - - tableLayoutPanel1 + + label5 149, 22 @@ -390,9 +372,6 @@ 158, 150 - - NoControl - 407, 20 @@ -411,8 +390,8 @@ 3, 66 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill 37, 19 @@ -420,20 +399,17 @@ 3, 147 - - 3, 259 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 0, 0 True - - 149, 22 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 buttonReloadBrowser @@ -447,53 +423,47 @@ tableLayoutPanel3 - - 564, 336 - Display text as HTML - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 149, 22 - 14 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 158, 284 - Fill - - Fill + + NoControl - - 16 + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill 149, 22 - - tableLayoutPanel1 + + $this NoControl + + MiddleLeft + MiddleLeft 3, 110 - - MiddleLeft + + 0 10 @@ -501,9 +471,6 @@ 5 - - Fill - tableLayoutPanel1 @@ -528,29 +495,23 @@ 13 - - 15 - tableLayoutPanel2 403, 106 - - 204, 3 - - - True + + 2 - - $this + + tableLayoutPanel1 tableLayoutPanel1 - - tableLayoutPanel3 + + NoControl 21 @@ -561,20 +522,17 @@ checkHTML - - 1 - - - 149, 22 + + 158, 25 NoControl - - label4 + + True - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tableLayoutPanel3 Fill @@ -582,6 +540,9 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Enable global hotkey @@ -597,8 +558,8 @@ 158, 47 - - ※You need restarting this plugin to apply framerate and hotkey settings. + + 25 tableLayoutPanel2 @@ -624,17 +585,14 @@ 1 - - textBox + + 9 checkLock - - 370, 19 - - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 564, 336 15, 14 @@ -651,20 +609,23 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="buttonReloadBrowser" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonCopyUpdateScript" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> - - NoControl + + label2 + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 2 + + 3, 0, 3, 3 + Copy the update variable to clipboard - - MiddleLeft - - - tableLayoutPanel1 + + True label13 @@ -675,8 +636,8 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tableLayoutPanel1 + + Fill Fill @@ -687,14 +648,17 @@ Enable clickthru + + MiddleLeft + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 textGlobalHotkey - - 156, 111 + + NoControl NoControl @@ -714,8 +678,8 @@ Fill - - 0, 0 + + 2 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkMiniParseVisible" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="checkMiniParseClickthru" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label7" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label8" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkEnableGlobalHotkey" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textGlobalHotkey" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label9" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkLock" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label13" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textBox" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="9" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label5" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="checkHTML" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Absolute,155,Percent,100" /><Rows Styles="Absolute,22,Absolute,22,Absolute,22,Absolute,22,Absolute,22,Absolute,22,AutoSize,0,Percent,100,Absolute,22,Absolute,55" /></TableLayoutSettings> @@ -723,20 +687,29 @@ 8 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + textBox + + + 16 + + + 370, 19 149, 112 - - NoControl - - + tableLayoutPanel1 - - True + + 15 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -750,14 +723,14 @@ True + + tableLayoutPanel1 + Text - - 0, 0 - - - 20 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -765,6 +738,9 @@ checkMiniParseVisible + + 3, 22 + Fill @@ -774,36 +750,51 @@ Fill - - MiddleLeft + + Fill NoControl - - 3, 22 + + MiddleLeft - - 0 + + Global hotkey - - label2 + + 204, 3 - - 3, 0, 3, 3 + + label4 + + + 20 + + + checkMiniParseClickthru NoControl - - tableLayoutPanel1 + + 158, 132 + + + label7 tableLayoutPanel1 + + 156, 111 + Fill + + tableLayoutPanel1 + 10 @@ -819,14 +810,17 @@ 2 - - MiddleLeft - 370, 0 - - 158, 132 + + NoControl + + + 149, 22 + + + NoControl Fill @@ -834,8 +828,11 @@ 403, 16 - - 158, 91 + + MiddleLeft + + + tableLayoutPanel1 checkEnableGlobalHotkey @@ -843,20 +840,23 @@ NoControl - - checkMiniParseClickthru + + ※You need restarting this plugin to apply framerate and hotkey settings. - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 158, 91 + + + 149, 22 27 - + tableLayoutPanel1 - - 30 + + tableLayoutPanel1 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -864,14 +864,14 @@ ... - + True URL - - Consolas, 9pt + + 158, 284 4 diff --git a/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.ja-JP.resx b/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.ja-JP.resx index ca74e2525..0510e11ca 100644 --- a/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.ja-JP.resx +++ b/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.ja-JP.resx @@ -153,4 +153,12 @@ 移動とリサイズを制限する + + + Fill + + + + 443, 16 + \ No newline at end of file diff --git a/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.resx b/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.resx index d2e30db91..f41234948 100644 --- a/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.resx +++ b/OverlayPlugin.Core/Overlays/MiniParseConfigPanel.resx @@ -121,25 +121,22 @@ 4 - - tableLayoutPanel2 - - - - 149, 22 - - - Fill + + 0, 0, 0, 0 + + + tableLayoutPanel1 label6 + MiddleLeft - - checkLock + + 1, 1, 1, 1 Fill @@ -159,14 +156,17 @@ 8 + + MiddleLeft + 0 NoControl - - textGlobalHotkey + + MiddleLeft 0, 0 @@ -207,24 +207,30 @@ 3, 44 + + 4 + tableLayoutPanel1 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 149, 22 + 5 22 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Fill - - 8 - 0 @@ -234,8 +240,11 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + label13 + + + 149, 22 14 @@ -249,20 +258,11 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="textMiniParseUrl" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="buttonMiniParseSelectFile" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,Absolute,37" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - 4 - - - 1 - NoControl - - MiddleLeft - - - ※You need restarting this plugin to apply framerate and hotkey settings. + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Fill @@ -279,9 +279,6 @@ 0 - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fill @@ -321,14 +318,11 @@ 158, 304 - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 447, 20 - - 1, 1, 1, 1 + + Sort type True @@ -339,8 +333,14 @@ 19 - - 2 + + True + + + NoControl + + + 0 9 @@ -354,8 +354,8 @@ tableLayoutPanel1 - - 158, 25 + + True NoControl @@ -363,32 +363,35 @@ 2 - - 149, 22 + + 4 - - 12 + + 443, 51 12 - - tableLayoutPanel1 + + 149, 22 447, 19 + + tableLayoutPanel1 + Global hotkey Fill - - 21 + + tableLayoutPanel1 - - True + + tableLayoutPanel1 label5 @@ -396,6 +399,9 @@ 149, 22 + + NoControl + 447, 20 @@ -414,6 +420,9 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 3, 66 @@ -429,8 +438,8 @@ 1 - - 0 + + 158, 198 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -441,11 +450,8 @@ tableLayoutPanel3 - - tableLayoutPanel3 - - - Sort type + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -453,12 +459,15 @@ 37, 19 - - 2 + + 149, 22 3 + + 0, 0 + 1 @@ -471,11 +480,8 @@ Fill - - 156, 111 - - - Fill + + ... Fill @@ -483,8 +489,8 @@ 9 - - 1, 1, 1, 1 + + Reload overlay 156, 89 @@ -492,6 +498,9 @@ $this + + MiddleLeft + MiddleLeft @@ -501,17 +510,14 @@ tableLayoutPanel1 - - label7 - 19 3, 110 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 215, 45 MiddleLeft @@ -528,14 +534,14 @@ label9 - - tableLayoutPanel1 - 0 - - 0, 0, 0, 0 + + NoControl + + + tableLayoutPanel3 10 @@ -546,29 +552,23 @@ Fill - - Enable global hotkey + + 2 tableLayoutPanel1 - - 11 - tableLayoutPanel1 Fill - - NoControl - 443, 51 - - True + + 21 3, 3 @@ -576,8 +576,8 @@ 7 - - 149, 22 + + 158, 25 NoControl @@ -588,17 +588,14 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill Fill - - tableLayoutPanel3 - - - tableLayoutPanel1 + + Enable global hotkey 158, 3 @@ -618,12 +615,15 @@ 158, 47 - - 1, 1, 1, 1 + + 0 tableLayoutPanel2 + + 156, 67 + True @@ -633,14 +633,11 @@ 0 - - 3, 22 - nudMaxFrameRate - - 215, 45 + + 2 443, 16 @@ -654,8 +651,8 @@ tableLayoutPanel1 - - True + + checkLock 604, 358 @@ -675,36 +672,30 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="buttonMiniParseReloadBrowser" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="buttonMiniParseCopyActXiv" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> - - 149, 22 - - - NoControl - - - 4 - - - True + + 1, 1, 1, 1 - - MiddleLeft + + tableLayoutPanel1 Fill + + NoControl + 3 - - checkMiniParseClickthru - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 + + 447, 19 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -720,15 +711,15 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ... + + textGlobalHotkey + + + checkMiniParseVisible True - - Fill - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -753,8 +744,11 @@ 17 - - label8 + + True + + + 1 Fill @@ -762,17 +756,17 @@ 149, 22 - - tableLayoutPanel1 + + NoControl tableLayoutPanel1 - - True + + Fill - - 0 + + label8 Fill @@ -795,23 +789,23 @@ 443, 103 - - 0, 0 + + tableLayoutPanel2 - - checkMiniParseVisible + + 0 tableLayoutPanel1 - - tableLayoutPanel1 + + 149, 22 buttonMiniParseCopyActXiv - - NoControl + + Fill System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -822,11 +816,14 @@ Fill + + MiddleLeft + NoControl - - MiddleLeft + + ※You need restarting this plugin to apply framerate and hotkey settings. 1 @@ -837,8 +834,8 @@ 149, 22 - - Fill + + 443, 16 16 @@ -846,11 +843,11 @@ panel1 - - NoControl + + 3, 22 - - 0 + + 1, 1, 1, 1 20 @@ -858,14 +855,11 @@ buttonMiniParseReloadBrowser - - NoControl - - - 0 + + 8 - - tableLayoutPanel1 + + label7 224, 3 @@ -873,8 +867,8 @@ 156, 177 - - 447, 19 + + 0 11 @@ -882,38 +876,44 @@ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 67 + + 5 - - label13 + + tableLayoutPanel3 - - 158, 198 + + NoControl - - 149, 22 + + 156, 111 + + + True MiddleLeft - - 443, 16 + + 11 - - MiddleLeft + + Fill checkEnableGlobalHotkey - - NoControl + + True + + + checkMiniParseClickthru 158, 157 - - Reload overlay + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -921,14 +921,14 @@ textMiniParseSortKey - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tableLayoutPanel1 1, 1, 1, 1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12 3, 132 @@ -936,14 +936,14 @@ 410, 0 - + True Sort key - - 443, 51 + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Fill diff --git a/OverlayPlugin.Core/Properties/AssemblyInfo.cs b/OverlayPlugin.Core/Properties/AssemblyInfo.cs index af1ddff8d..84bb00714 100644 --- a/OverlayPlugin.Core/Properties/AssemblyInfo.cs +++ b/OverlayPlugin.Core/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.3.2")] +[assembly: AssemblyVersion("0.3.3.3")] diff --git a/OverlayPlugin/Properties/AssemblyInfo.cs b/OverlayPlugin/Properties/AssemblyInfo.cs index 306e2b011..fee48b495 100644 --- a/OverlayPlugin/Properties/AssemblyInfo.cs +++ b/OverlayPlugin/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.3.2")] +[assembly: AssemblyVersion("0.3.3.3")]