Skip to content

Commit

Permalink
Add widget locking
Browse files Browse the repository at this point in the history 
Follow OverlayPlugin 0.3.3.1

Bump version 1.3.0.0
  • Loading branch information
@xtuaok
xtuaok committed Mar 23, 2015
1 parent 1aebb63 commit af1d286
Show file tree
Hide file tree
Showing 6 changed files with 532 additions and 722 deletions.
2 changes: 1 addition & 1 deletion EnmityPlugin/EnmityOverlay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Tamagawa.EnmityPlugin
[Serializable()]
internal class ScanFailedException : Exception
{
private string message;
private string message = String.Empty;
public ScanFailedException() : base() { message = "Failed to signature scan"; }
public ScanFailedException(string message) : base(message) { }
public ScanFailedException(string message, System.Exception inner) : base(message, inner) { }
Expand Down
38 changes: 28 additions & 10 deletions EnmityPlugin/EnmityOverlayConfigPanel.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions EnmityPlugin/EnmityOverlayConfigPanel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ private void SetupControlProperties()
{
this.checkEnmityVisible.Checked = this.config.IsVisible;
this.checkEnmityClickThru.Checked = this.config.IsClickThru;
this.checkLock.Checked = this.config.IsLocked;
this.textEnmityUrl.Text = this.config.Url;
this.nudEnmityMaxFrameRate.Value = this.config.MaxFrameRate;
this.nudEnmityScanInterval.Value = this.config.ScanInterval;
Expand All @@ -57,6 +58,13 @@ private void SetupConfigEventHandlers()
this.checkEnmityClickThru.Checked = e.IsClickThru;
});
};
this.config.LockChanged += (o, e) =>
{
this.InvokeIfRequired(() =>
{
this.checkLock.Checked = e.IsLocked;
});
};
this.config.UrlChanged += (o, e) =>
{
this.InvokeIfRequired(() =>
Expand Down Expand Up @@ -134,6 +142,11 @@ private void checkEnmityClickThru_CheckedChanged(object sender, EventArgs e)
this.config.IsClickThru = this.checkEnmityClickThru.Checked;
}

private void checkLock_CheckedChanged(object sender, EventArgs e)
{
this.config.IsLocked = this.checkLock.Checked;
}

private void textEnmityUrl_TextChanged(object sender, EventArgs e)
{
this.config.Url = this.textEnmityUrl.Text;
Expand Down
56 changes: 6 additions & 50 deletions EnmityPlugin/EnmityOverlayConfigPanel.ja-JP.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label11.Size" type="System.Drawing.Size, System.Drawing">
<value>441, 223</value>
</data>
<data name="label11.Text" xml:space="preserve">
<value>※最大フレームレートおよびホットキーの変更を有効にするためにはプラグインの再起動が必要です</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>最大フレームレート</value>
</data>
<data name="nudEnmityMaxFrameRate.Size" type="System.Drawing.Size, System.Drawing">
<value>445, 19</value>
</data>
<data name="label15.Text" xml:space="preserve">
<value>クリックを透過させる</value>
</data>
Expand All @@ -139,64 +132,27 @@
<data name="label17.Text" xml:space="preserve">
<value>表示するURL</value>
</data>
<data name="checkEnmityVisible.Size" type="System.Drawing.Size, System.Drawing">
<value>441, 16</value>
</data>
<data name="checkEnmityClickThru.Size" type="System.Drawing.Size, System.Drawing">
<value>441, 16</value>
</data>
<data name="buttonEnmityReloadBrowser.Location" type="System.Drawing.Point, System.Drawing">
<value>223, 3</value>
</data>
<data name="buttonEnmityReloadBrowser.Size" type="System.Drawing.Size, System.Drawing">
<value>215, 45</value>
</data>
<data name="buttonEnmityReloadBrowser.Text" xml:space="preserve">
<value>オーバーレイの表示をリロード</value>
</data>
<data name="buttonEnmityCopyActXiv.Size" type="System.Drawing.Size, System.Drawing">
<value>214, 45</value>
</data>
<data name="buttonEnmityCopyActXiv.Text" xml:space="preserve">
<value>ActXiv変数をクリップボードにコピー</value>
</data>
<data name="tableLayoutPanel8.Size" type="System.Drawing.Size, System.Drawing">
<value>441, 51</value>
</data>
<data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
<value>158, 358</value>
</data>
<data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
<value>441, 51</value>
</data>
<data name="textEnmityUrl.Size" type="System.Drawing.Size, System.Drawing">
<value>408, 19</value>
</data>
<data name="buttonEnmitySelectFile.Location" type="System.Drawing.Point, System.Drawing">
<value>408, 0</value>
</data>
<data name="tableLayoutPanel9.Size" type="System.Drawing.Size, System.Drawing">
<value>445, 20</value>
</data>
<data name="label18.Text" xml:space="preserve">
<value>スキャン間隔 (ミリ秒)</value>
</data>
<data name="nudEnmityScanInterval.Size" type="System.Drawing.Size, System.Drawing">
<value>445, 19</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>グローバルホットキーを使用</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="textEnmityGlobalHotkey.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 19</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>447, 22</value>
</data>
<data name="tableLayoutPanel7.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<data name="label2.Text" xml:space="preserve">
<value>移動とリサイズを制限する</value>
</data>
<data name="tableLayoutPanel7.Size" type="System.Drawing.Size, System.Drawing">
<value>602, 412</value>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableLayoutPanel7.RowCount" type="System.Int32, mscorlib">
<value>9</value>
</data>
</root>
Loading

0 comments on commit af1d286

Please sign in to comment.