コミットメタ情報

リビジョン4069d0d004fbc5d4123eaa5fa99b7631a487dcec (tree)
日時2018-11-11 17:08:25
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

タイマーと終了時刻の切り替えをわかりやすくする

変更サマリ

差分

--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -49,6 +49,7 @@ namespace KancolleSniffer
4949 this.panelHeadquarters = new System.Windows.Forms.Panel();
5050 this.labelPlayLog = new System.Windows.Forms.Label();
5151 this.labelLogin = new System.Windows.Forms.Label();
52+ this.labelBucketHistoryButton = new System.Windows.Forms.Label();
5253 this.labelAchievement = new System.Windows.Forms.Label();
5354 this.label28 = new System.Windows.Forms.Label();
5455 this.labelNumOfBuckets = new System.Windows.Forms.Label();
@@ -80,7 +81,7 @@ namespace KancolleSniffer
8081 this.labelBulletHistory = new System.Windows.Forms.Label();
8182 this.label35 = new System.Windows.Forms.Label();
8283 this.labelFuelHistory = new System.Windows.Forms.Label();
83- this.labelRepair = new System.Windows.Forms.Label();
84+ this.labelNDock = new System.Windows.Forms.Label();
8485 this.panelDock = new System.Windows.Forms.Panel();
8586 this.label8 = new System.Windows.Forms.Label();
8687 this.label7 = new System.Windows.Forms.Label();
@@ -113,12 +114,6 @@ namespace KancolleSniffer
113114 this.label13 = new System.Windows.Forms.Label();
114115 this.timerMain = new System.Windows.Forms.Timer(this.components);
115116 this.panel3 = new System.Windows.Forms.Panel();
116- this.labelQuestCount1 = new KancolleSniffer.View.ShipLabel();
117- this.labelQuestCount2 = new KancolleSniffer.View.ShipLabel();
118- this.labelQuestCount3 = new KancolleSniffer.View.ShipLabel();
119- this.labelQuestCount4 = new KancolleSniffer.View.ShipLabel();
120- this.labelQuestCount5 = new KancolleSniffer.View.ShipLabel();
121- this.labelQuestCount6 = new KancolleSniffer.View.ShipLabel();
122117 this.labelQuestColor6 = new System.Windows.Forms.Label();
123118 this.labelQuestColor5 = new System.Windows.Forms.Label();
124119 this.labelQuestColor4 = new System.Windows.Forms.Label();
@@ -158,7 +153,6 @@ namespace KancolleSniffer
158153 this.imageListBullSq = new System.Windows.Forms.ImageList(this.components);
159154 this.labelAkashiRepair = new System.Windows.Forms.Label();
160155 this.labelClearQuest = new System.Windows.Forms.Label();
161- this.panelRepairList = new KancolleSniffer.View.RepairListForMain();
162156 this.labelBullSq4 = new System.Windows.Forms.Label();
163157 this.labelFuelSq4 = new System.Windows.Forms.Label();
164158 this.labelBullSq3 = new System.Windows.Forms.Label();
@@ -173,7 +167,13 @@ namespace KancolleSniffer
173167 this.labelCheckFleet3 = new System.Windows.Forms.Label();
174168 this.labelCheckFleet4 = new System.Windows.Forms.Label();
175169 this.labelCheckFleet1 = new System.Windows.Forms.Label();
176- this.labelBucketHistoryButton = new System.Windows.Forms.Label();
170+ this.panelRepairList = new KancolleSniffer.View.RepairListForMain();
171+ this.labelQuestCount1 = new KancolleSniffer.View.ShipLabel();
172+ this.labelQuestCount2 = new KancolleSniffer.View.ShipLabel();
173+ this.labelQuestCount3 = new KancolleSniffer.View.ShipLabel();
174+ this.labelQuestCount4 = new KancolleSniffer.View.ShipLabel();
175+ this.labelQuestCount5 = new KancolleSniffer.View.ShipLabel();
176+ this.labelQuestCount6 = new KancolleSniffer.View.ShipLabel();
177177 this.panelHeadquarters.SuspendLayout();
178178 this.panelShipInfo.SuspendLayout();
179179 this.panelBattleInfo.SuspendLayout();
@@ -225,6 +225,16 @@ namespace KancolleSniffer
225225 this.labelLogin.Text = "艦これにログインしてください。\r\nログイン中ならログインし直してください。";
226226 this.labelLogin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
227227 //
228+ // labelBucketHistoryButton
229+ //
230+ this.labelBucketHistoryButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
231+ this.labelBucketHistoryButton.Image = ((System.Drawing.Image)(resources.GetObject("labelBucketHistoryButton.Image")));
232+ this.labelBucketHistoryButton.Location = new System.Drawing.Point(146, 15);
233+ this.labelBucketHistoryButton.Name = "labelBucketHistoryButton";
234+ this.labelBucketHistoryButton.Size = new System.Drawing.Size(14, 14);
235+ this.labelBucketHistoryButton.TabIndex = 9;
236+ this.labelBucketHistoryButton.Click += new System.EventHandler(this.labelBucketHistoryButton_Click);
237+ //
228238 // labelAchievement
229239 //
230240 this.labelAchievement.Location = new System.Drawing.Point(166, 18);
@@ -518,14 +528,16 @@ namespace KancolleSniffer
518528 this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;
519529 this.labelFuelHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);
520530 //
521- // labelRepair
531+ // labelNDock
522532 //
523- this.labelRepair.AutoSize = true;
524- this.labelRepair.Location = new System.Drawing.Point(8, 195);
525- this.labelRepair.Name = "labelRepair";
526- this.labelRepair.Size = new System.Drawing.Size(29, 12);
527- this.labelRepair.TabIndex = 3;
528- this.labelRepair.Text = "入渠";
533+ this.labelNDock.AutoSize = true;
534+ this.labelNDock.Cursor = System.Windows.Forms.Cursors.Hand;
535+ this.labelNDock.Location = new System.Drawing.Point(8, 195);
536+ this.labelNDock.Name = "labelNDock";
537+ this.labelNDock.Size = new System.Drawing.Size(29, 12);
538+ this.labelNDock.TabIndex = 3;
539+ this.labelNDock.Text = "入渠";
540+ this.labelNDock.Click += new System.EventHandler(this.labelNDock_Click);
529541 //
530542 // panelDock
531543 //
@@ -686,11 +698,13 @@ namespace KancolleSniffer
686698 // labelMission
687699 //
688700 this.labelMission.AutoSize = true;
701+ this.labelMission.Cursor = System.Windows.Forms.Cursors.Hand;
689702 this.labelMission.Location = new System.Drawing.Point(8, 276);
690703 this.labelMission.Name = "labelMission";
691704 this.labelMission.Size = new System.Drawing.Size(29, 12);
692705 this.labelMission.TabIndex = 10;
693706 this.labelMission.Text = "遠征";
707+ this.labelMission.Click += new System.EventHandler(this.labelMission_Click);
694708 //
695709 // panel2
696710 //
@@ -859,72 +873,6 @@ namespace KancolleSniffer
859873 this.panel3.Size = new System.Drawing.Size(220, 94);
860874 this.panel3.TabIndex = 13;
861875 //
862- // labelQuestCount1
863- //
864- this.labelQuestCount1.AnchorRight = true;
865- this.labelQuestCount1.AutoSize = true;
866- this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);
867- this.labelQuestCount1.Name = "labelQuestCount1";
868- this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;
869- this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);
870- this.labelQuestCount1.TabIndex = 54;
871- this.labelQuestCount1.UseMnemonic = false;
872- //
873- // labelQuestCount2
874- //
875- this.labelQuestCount2.AnchorRight = true;
876- this.labelQuestCount2.AutoSize = true;
877- this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);
878- this.labelQuestCount2.Name = "labelQuestCount2";
879- this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;
880- this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);
881- this.labelQuestCount2.TabIndex = 53;
882- this.labelQuestCount2.UseMnemonic = false;
883- //
884- // labelQuestCount3
885- //
886- this.labelQuestCount3.AnchorRight = true;
887- this.labelQuestCount3.AutoSize = true;
888- this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);
889- this.labelQuestCount3.Name = "labelQuestCount3";
890- this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;
891- this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);
892- this.labelQuestCount3.TabIndex = 52;
893- this.labelQuestCount3.UseMnemonic = false;
894- //
895- // labelQuestCount4
896- //
897- this.labelQuestCount4.AnchorRight = true;
898- this.labelQuestCount4.AutoSize = true;
899- this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);
900- this.labelQuestCount4.Name = "labelQuestCount4";
901- this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;
902- this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);
903- this.labelQuestCount4.TabIndex = 51;
904- this.labelQuestCount4.UseMnemonic = false;
905- //
906- // labelQuestCount5
907- //
908- this.labelQuestCount5.AnchorRight = true;
909- this.labelQuestCount5.AutoSize = true;
910- this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);
911- this.labelQuestCount5.Name = "labelQuestCount5";
912- this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;
913- this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);
914- this.labelQuestCount5.TabIndex = 50;
915- this.labelQuestCount5.UseMnemonic = false;
916- //
917- // labelQuestCount6
918- //
919- this.labelQuestCount6.AnchorRight = true;
920- this.labelQuestCount6.AutoSize = true;
921- this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);
922- this.labelQuestCount6.Name = "labelQuestCount6";
923- this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;
924- this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);
925- this.labelQuestCount6.TabIndex = 49;
926- this.labelQuestCount6.UseMnemonic = false;
927- //
928876 // labelQuestColor6
929877 //
930878 this.labelQuestColor6.Location = new System.Drawing.Point(2, 79);
@@ -1258,16 +1206,6 @@ namespace KancolleSniffer
12581206 this.labelClearQuest.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseDown);
12591207 this.labelClearQuest.MouseUp += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseUp);
12601208 //
1261- // panelRepairList
1262- //
1263- this.panelRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
1264- this.panelRepairList.Location = new System.Drawing.Point(6, 207);
1265- this.panelRepairList.Name = "panelRepairList";
1266- this.panelRepairList.Size = new System.Drawing.Size(129, 21);
1267- this.panelRepairList.TabIndex = 4;
1268- this.panelRepairList.Visible = false;
1269- this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);
1270- //
12711209 // labelBullSq4
12721210 //
12731211 this.labelBullSq4.ImageIndex = 0;
@@ -1395,15 +1333,81 @@ namespace KancolleSniffer
13951333 this.labelCheckFleet1.Size = new System.Drawing.Size(5, 14);
13961334 this.labelCheckFleet1.TabIndex = 16;
13971335 //
1398- // labelBucketHistoryButton
1336+ // panelRepairList
13991337 //
1400- this.labelBucketHistoryButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
1401- this.labelBucketHistoryButton.Image = ((System.Drawing.Image)(resources.GetObject("labelBucketHistoryButton.Image")));
1402- this.labelBucketHistoryButton.Location = new System.Drawing.Point(146, 15);
1403- this.labelBucketHistoryButton.Name = "labelBucketHistoryButton";
1404- this.labelBucketHistoryButton.Size = new System.Drawing.Size(14, 14);
1405- this.labelBucketHistoryButton.TabIndex = 9;
1406- this.labelBucketHistoryButton.Click += new System.EventHandler(this.labelBucketHistoryButton_Click);
1338+ this.panelRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
1339+ this.panelRepairList.Location = new System.Drawing.Point(6, 207);
1340+ this.panelRepairList.Name = "panelRepairList";
1341+ this.panelRepairList.Size = new System.Drawing.Size(129, 21);
1342+ this.panelRepairList.TabIndex = 4;
1343+ this.panelRepairList.Visible = false;
1344+ this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);
1345+ //
1346+ // labelQuestCount1
1347+ //
1348+ this.labelQuestCount1.AnchorRight = true;
1349+ this.labelQuestCount1.AutoSize = true;
1350+ this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);
1351+ this.labelQuestCount1.Name = "labelQuestCount1";
1352+ this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;
1353+ this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);
1354+ this.labelQuestCount1.TabIndex = 54;
1355+ this.labelQuestCount1.UseMnemonic = false;
1356+ //
1357+ // labelQuestCount2
1358+ //
1359+ this.labelQuestCount2.AnchorRight = true;
1360+ this.labelQuestCount2.AutoSize = true;
1361+ this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);
1362+ this.labelQuestCount2.Name = "labelQuestCount2";
1363+ this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;
1364+ this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);
1365+ this.labelQuestCount2.TabIndex = 53;
1366+ this.labelQuestCount2.UseMnemonic = false;
1367+ //
1368+ // labelQuestCount3
1369+ //
1370+ this.labelQuestCount3.AnchorRight = true;
1371+ this.labelQuestCount3.AutoSize = true;
1372+ this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);
1373+ this.labelQuestCount3.Name = "labelQuestCount3";
1374+ this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;
1375+ this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);
1376+ this.labelQuestCount3.TabIndex = 52;
1377+ this.labelQuestCount3.UseMnemonic = false;
1378+ //
1379+ // labelQuestCount4
1380+ //
1381+ this.labelQuestCount4.AnchorRight = true;
1382+ this.labelQuestCount4.AutoSize = true;
1383+ this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);
1384+ this.labelQuestCount4.Name = "labelQuestCount4";
1385+ this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;
1386+ this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);
1387+ this.labelQuestCount4.TabIndex = 51;
1388+ this.labelQuestCount4.UseMnemonic = false;
1389+ //
1390+ // labelQuestCount5
1391+ //
1392+ this.labelQuestCount5.AnchorRight = true;
1393+ this.labelQuestCount5.AutoSize = true;
1394+ this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);
1395+ this.labelQuestCount5.Name = "labelQuestCount5";
1396+ this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;
1397+ this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);
1398+ this.labelQuestCount5.TabIndex = 50;
1399+ this.labelQuestCount5.UseMnemonic = false;
1400+ //
1401+ // labelQuestCount6
1402+ //
1403+ this.labelQuestCount6.AnchorRight = true;
1404+ this.labelQuestCount6.AutoSize = true;
1405+ this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);
1406+ this.labelQuestCount6.Name = "labelQuestCount6";
1407+ this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;
1408+ this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);
1409+ this.labelQuestCount6.TabIndex = 49;
1410+ this.labelQuestCount6.UseMnemonic = false;
14071411 //
14081412 // MainForm
14091413 //
@@ -1443,7 +1447,7 @@ namespace KancolleSniffer
14431447 this.Controls.Add(this.panel1);
14441448 this.Controls.Add(this.labelConstruct);
14451449 this.Controls.Add(this.panelDock);
1446- this.Controls.Add(this.labelRepair);
1450+ this.Controls.Add(this.labelNDock);
14471451 this.Controls.Add(this.panelShipInfo);
14481452 this.Controls.Add(this.labelFleet1);
14491453 this.Controls.Add(this.panelHeadquarters);
@@ -1489,7 +1493,7 @@ namespace KancolleSniffer
14891493 private System.Windows.Forms.Label labelNumOfShips;
14901494 private System.Windows.Forms.Label label1;
14911495 private System.Windows.Forms.Panel panelShipInfo;
1492- private System.Windows.Forms.Label labelRepair;
1496+ private System.Windows.Forms.Label labelNDock;
14931497 private System.Windows.Forms.Panel panelDock;
14941498 private System.Windows.Forms.Label label8;
14951499 private System.Windows.Forms.Label label7;
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -808,12 +808,18 @@ namespace KancolleSniffer
808808 private void UpdateNDocLabels()
809809 {
810810 _mainLabels.SetNDockLabels(_sniffer.NDock);
811+ SetNDockLabel();
811812 }
812813
814+ private void SetNDockLabel()
815+ {
816+ labelNDock.Text = (_config.ShowEndTime & TimerKind.NDock) != 0 ? "入渠終了" : "入渠";
817+ }
813818
814819 private void labelNDock_Click(object sender, EventArgs e)
815820 {
816821 _config.ShowEndTime ^= TimerKind.NDock;
822+ SetNDockLabel();
817823 UpdateTimers();
818824 }
819825
@@ -832,6 +838,12 @@ namespace KancolleSniffer
832838 }
833839 nameLabels[i].Text = names[i];
834840 }
841+ SetMissionLabel();
842+ }
843+
844+ private void SetMissionLabel()
845+ {
846+ labelMission.Text = (_config.ShowEndTime & TimerKind.Mission) != 0 ? "遠征終了" : "遠征";
835847 }
836848
837849 private string GenerateFleetParamsForMission(int fleetNumber)
@@ -854,6 +866,7 @@ namespace KancolleSniffer
854866 private void labelMission_Click(object sender, EventArgs e)
855867 {
856868 _config.ShowEndTime ^= TimerKind.Mission;
869+ SetMissionLabel();
857870 UpdateTimers();
858871 }
859872
旧リポジトリブラウザで表示