OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

KancolleSniffer: Commit


Commit MetaInfo

Revision01d20dda5b1a04ea92f8ecbea5b6cbc58152b2a0 (tree)
Zeit2019-12-29 15:20:33
AutorKazuhiro Fujieda <fujieda@user...>
CommiterKazuhiro Fujieda

Log Message

一覧を戦況に自動で切り替えるかを設定可能にする

Ändern Zusammenfassung

Diff

--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -62,10 +62,11 @@ namespace KancolleSniffer
6262 public Size Size { get; set; }
6363 public string Mode { get; set; }
6464 public ShipCategory ShipCategories { get; set; } = ShipCategory.All;
65- public bool ShipType;
65+ public bool ShipType { get; set; }
6666 public bool ShowHpInPercent { get; set; }
6767 public ListForm.SortOrder SortOrder { get; set; } = ListForm.SortOrder.ExpToNext;
6868 public List<List<int>> ShipGroup { get; set; }
69+ public bool AutoBattleResult { get; set; } = true;
6970
7071 public ShipListConfig()
7172 {
--- a/KancolleSniffer/ConfigDialog.Designer.cs
+++ b/KancolleSniffer/ConfigDialog.Designer.cs
@@ -71,6 +71,7 @@ namespace KancolleSniffer
7171 this.checkBoxBalloon = new System.Windows.Forms.CheckBox();
7272 this.checkBoxFlash = new System.Windows.Forms.CheckBox();
7373 this.tabPageAchievement = new System.Windows.Forms.TabPage();
74+ this.checkBoxAutoBattleResult = new System.Windows.Forms.CheckBox();
7475 this.checkBoxWarnBadDamageWithDamecon = new System.Windows.Forms.CheckBox();
7576 this.checkBoxPresetAkashi = new System.Windows.Forms.CheckBox();
7677 this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -493,6 +494,7 @@ namespace KancolleSniffer
493494 //
494495 // tabPageAchievement
495496 //
497+ this.tabPageAchievement.Controls.Add(this.checkBoxAutoBattleResult);
496498 this.tabPageAchievement.Controls.Add(this.checkBoxWarnBadDamageWithDamecon);
497499 this.tabPageAchievement.Controls.Add(this.checkBoxPresetAkashi);
498500 this.tabPageAchievement.Controls.Add(this.groupBox3);
@@ -505,24 +507,34 @@ namespace KancolleSniffer
505507 this.tabPageAchievement.Text = "機能";
506508 this.tabPageAchievement.UseVisualStyleBackColor = true;
507509 //
510+ // checkBoxAutoBattleResult
511+ //
512+ this.checkBoxAutoBattleResult.AutoSize = true;
513+ this.checkBoxAutoBattleResult.Location = new System.Drawing.Point(143, 134);
514+ this.checkBoxAutoBattleResult.Name = "checkBoxAutoBattleResult";
515+ this.checkBoxAutoBattleResult.Size = new System.Drawing.Size(96, 16);
516+ this.checkBoxAutoBattleResult.TabIndex = 21;
517+ this.checkBoxAutoBattleResult.Text = "戦況自動切替";
518+ this.checkBoxAutoBattleResult.UseVisualStyleBackColor = true;
519+ //
508520 // checkBoxWarnBadDamageWithDamecon
509521 //
510522 this.checkBoxWarnBadDamageWithDamecon.AutoSize = true;
511- this.checkBoxWarnBadDamageWithDamecon.Location = new System.Drawing.Point(20, 114);
523+ this.checkBoxWarnBadDamageWithDamecon.Location = new System.Drawing.Point(20, 112);
512524 this.checkBoxWarnBadDamageWithDamecon.Name = "checkBoxWarnBadDamageWithDamecon";
513- this.checkBoxWarnBadDamageWithDamecon.Size = new System.Drawing.Size(168, 16);
525+ this.checkBoxWarnBadDamageWithDamecon.Size = new System.Drawing.Size(124, 16);
514526 this.checkBoxWarnBadDamageWithDamecon.TabIndex = 20;
515- this.checkBoxWarnBadDamageWithDamecon.Text = "ダメコン装備でも大破警告する";
527+ this.checkBoxWarnBadDamageWithDamecon.Text = "ダメコンあり大破警告";
516528 this.checkBoxWarnBadDamageWithDamecon.UseVisualStyleBackColor = true;
517529 //
518530 // checkBoxPresetAkashi
519531 //
520532 this.checkBoxPresetAkashi.AutoSize = true;
521- this.checkBoxPresetAkashi.Location = new System.Drawing.Point(20, 135);
533+ this.checkBoxPresetAkashi.Location = new System.Drawing.Point(20, 134);
522534 this.checkBoxPresetAkashi.Name = "checkBoxPresetAkashi";
523- this.checkBoxPresetAkashi.Size = new System.Drawing.Size(141, 16);
535+ this.checkBoxPresetAkashi.Size = new System.Drawing.Size(113, 16);
524536 this.checkBoxPresetAkashi.TabIndex = 19;
525- this.checkBoxPresetAkashi.Text = "プリセット明石修理を使う";
537+ this.checkBoxPresetAkashi.Text = "プリセット明石修理";
526538 this.checkBoxPresetAkashi.UseVisualStyleBackColor = true;
527539 //
528540 // groupBox3
@@ -1330,5 +1342,6 @@ namespace KancolleSniffer
13301342 private System.Windows.Forms.Label label17;
13311343 private System.Windows.Forms.Label label18;
13321344 private System.Windows.Forms.CheckBox checkBoxWarnBadDamageWithDamecon;
1345+ private System.Windows.Forms.CheckBox checkBoxAutoBattleResult;
13331346 }
13341347 }
\ No newline at end of file
--- a/KancolleSniffer/ConfigDialog.cs
+++ b/KancolleSniffer/ConfigDialog.cs
@@ -94,6 +94,7 @@ namespace KancolleSniffer
9494 checkBoxNextCell.Checked = (_config.Spoilers & Spoiler.NextCell) != 0;
9595 checkBoxPresetAkashi.Checked = _config.UsePresetAkashi;
9696 checkBoxWarnBadDamageWithDamecon.Checked = _config.WarnBadDamageWithDameCon;
97+ checkBoxAutoBattleResult.Checked = _config.ShipList.AutoBattleResult;
9798
9899 numericUpDownSoundVolume.Value = _config.Sounds.Volume;
99100 foreach (var name in Config.NotificationNames)
@@ -200,6 +201,7 @@ namespace KancolleSniffer
200201 (checkBoxNextCell.Checked ? Spoiler.NextCell : 0);
201202 _config.UsePresetAkashi = checkBoxPresetAkashi.Checked;
202203 _config.WarnBadDamageWithDameCon = checkBoxWarnBadDamageWithDamecon.Checked;
204+ _config.ShipList.AutoBattleResult = checkBoxAirBattleResult.Checked;
203205
204206 _config.Sounds.Volume = (int)numericUpDownSoundVolume.Value;
205207 foreach (var name in Config.NotificationNames)
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -169,7 +169,8 @@ namespace KancolleSniffer
169169
170170 private void MoveToBattleResult()
171171 {
172- if (comboBoxGroup.SelectedIndex == BattleResultIndex || _sniffer.InSortie == -1)
172+ if (!_config.ShipList.AutoBattleResult || comboBoxGroup.SelectedIndex == BattleResultIndex ||
173+ _sniffer.InSortie == -1)
173174 return;
174175 _prevSelectedIndex = comboBoxGroup.SelectedIndex;
175176 comboBoxGroup.SelectedIndex = BattleResultIndex;
Show on old repository browser