コミットメタ情報

リビジョン3b14d84194f411d3d744144bf8572878a62bef62 (tree)
日時2018-03-26 22:00:23
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

入渠と遠征のタイマーをクリック可能だとわかるようにする

変更サマリ

差分

--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -109,12 +109,6 @@ namespace KancolleSniffer
109109 this.label13 = new System.Windows.Forms.Label();
110110 this.timerMain = new System.Windows.Forms.Timer(this.components);
111111 this.panel3 = new System.Windows.Forms.Panel();
112- this.labelQuestCount1 = new KancolleSniffer.ShipLabel();
113- this.labelQuestCount2 = new KancolleSniffer.ShipLabel();
114- this.labelQuestCount3 = new KancolleSniffer.ShipLabel();
115- this.labelQuestCount4 = new KancolleSniffer.ShipLabel();
116- this.labelQuestCount5 = new KancolleSniffer.ShipLabel();
117- this.labelQuestCount6 = new KancolleSniffer.ShipLabel();
118112 this.labelQuestColor6 = new System.Windows.Forms.Label();
119113 this.labelQuestColor5 = new System.Windows.Forms.Label();
120114 this.labelQuestColor4 = new System.Windows.Forms.Label();
@@ -170,6 +164,12 @@ namespace KancolleSniffer
170164 this.labelAkashiRepair = new System.Windows.Forms.Label();
171165 this.labelClearQuest = new System.Windows.Forms.Label();
172166 this.panelRepairList = new KancolleSniffer.RepairListForMain();
167+ this.labelQuestCount1 = new KancolleSniffer.ShipLabel();
168+ this.labelQuestCount2 = new KancolleSniffer.ShipLabel();
169+ this.labelQuestCount3 = new KancolleSniffer.ShipLabel();
170+ this.labelQuestCount4 = new KancolleSniffer.ShipLabel();
171+ this.labelQuestCount5 = new KancolleSniffer.ShipLabel();
172+ this.labelQuestCount6 = new KancolleSniffer.ShipLabel();
173173 this.panelHeadquarters.SuspendLayout();
174174 this.panelShipInfo.SuspendLayout();
175175 this.panelBattleInfo.SuspendLayout();
@@ -742,29 +742,32 @@ namespace KancolleSniffer
742742 //
743743 // labelMission3
744744 //
745- this.labelMission3.Location = new System.Drawing.Point(171, 33);
745+ this.labelMission3.Cursor = System.Windows.Forms.Cursors.Hand;
746+ this.labelMission3.Location = new System.Drawing.Point(171, 32);
746747 this.labelMission3.Name = "labelMission3";
747- this.labelMission3.Size = new System.Drawing.Size(47, 12);
748+ this.labelMission3.Size = new System.Drawing.Size(47, 15);
748749 this.labelMission3.TabIndex = 8;
749- this.labelMission3.TextAlign = System.Drawing.ContentAlignment.TopRight;
750+ this.labelMission3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
750751 this.labelMission3.Click += new System.EventHandler(this.labelMission_Click);
751752 //
752753 // labelMission2
753754 //
754- this.labelMission2.Location = new System.Drawing.Point(171, 18);
755+ this.labelMission2.Cursor = System.Windows.Forms.Cursors.Hand;
756+ this.labelMission2.Location = new System.Drawing.Point(171, 17);
755757 this.labelMission2.Name = "labelMission2";
756- this.labelMission2.Size = new System.Drawing.Size(47, 12);
758+ this.labelMission2.Size = new System.Drawing.Size(47, 15);
757759 this.labelMission2.TabIndex = 7;
758- this.labelMission2.TextAlign = System.Drawing.ContentAlignment.TopRight;
760+ this.labelMission2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
759761 this.labelMission2.Click += new System.EventHandler(this.labelMission_Click);
760762 //
761763 // labelMission1
762764 //
763- this.labelMission1.Location = new System.Drawing.Point(171, 3);
765+ this.labelMission1.Cursor = System.Windows.Forms.Cursors.Hand;
766+ this.labelMission1.Location = new System.Drawing.Point(171, 2);
764767 this.labelMission1.Name = "labelMission1";
765- this.labelMission1.Size = new System.Drawing.Size(47, 12);
768+ this.labelMission1.Size = new System.Drawing.Size(47, 15);
766769 this.labelMission1.TabIndex = 6;
767- this.labelMission1.TextAlign = System.Drawing.ContentAlignment.TopRight;
770+ this.labelMission1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
768771 this.labelMission1.Click += new System.EventHandler(this.labelMission_Click);
769772 //
770773 // label15
@@ -835,72 +838,6 @@ namespace KancolleSniffer
835838 this.panel3.Size = new System.Drawing.Size(220, 94);
836839 this.panel3.TabIndex = 13;
837840 //
838- // labelQuestCount1
839- //
840- this.labelQuestCount1.AnchorRight = true;
841- this.labelQuestCount1.AutoSize = true;
842- this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);
843- this.labelQuestCount1.Name = "labelQuestCount1";
844- this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;
845- this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);
846- this.labelQuestCount1.TabIndex = 54;
847- this.labelQuestCount1.UseMnemonic = false;
848- //
849- // labelQuestCount2
850- //
851- this.labelQuestCount2.AnchorRight = true;
852- this.labelQuestCount2.AutoSize = true;
853- this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);
854- this.labelQuestCount2.Name = "labelQuestCount2";
855- this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;
856- this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);
857- this.labelQuestCount2.TabIndex = 53;
858- this.labelQuestCount2.UseMnemonic = false;
859- //
860- // labelQuestCount3
861- //
862- this.labelQuestCount3.AnchorRight = true;
863- this.labelQuestCount3.AutoSize = true;
864- this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);
865- this.labelQuestCount3.Name = "labelQuestCount3";
866- this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;
867- this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);
868- this.labelQuestCount3.TabIndex = 52;
869- this.labelQuestCount3.UseMnemonic = false;
870- //
871- // labelQuestCount4
872- //
873- this.labelQuestCount4.AnchorRight = true;
874- this.labelQuestCount4.AutoSize = true;
875- this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);
876- this.labelQuestCount4.Name = "labelQuestCount4";
877- this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;
878- this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);
879- this.labelQuestCount4.TabIndex = 51;
880- this.labelQuestCount4.UseMnemonic = false;
881- //
882- // labelQuestCount5
883- //
884- this.labelQuestCount5.AnchorRight = true;
885- this.labelQuestCount5.AutoSize = true;
886- this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);
887- this.labelQuestCount5.Name = "labelQuestCount5";
888- this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;
889- this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);
890- this.labelQuestCount5.TabIndex = 50;
891- this.labelQuestCount5.UseMnemonic = false;
892- //
893- // labelQuestCount6
894- //
895- this.labelQuestCount6.AnchorRight = true;
896- this.labelQuestCount6.AutoSize = true;
897- this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);
898- this.labelQuestCount6.Name = "labelQuestCount6";
899- this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;
900- this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);
901- this.labelQuestCount6.TabIndex = 49;
902- this.labelQuestCount6.UseMnemonic = false;
903- //
904841 // labelQuestColor6
905842 //
906843 this.labelQuestColor6.Location = new System.Drawing.Point(2, 79);
@@ -1381,6 +1318,72 @@ namespace KancolleSniffer
13811318 this.panelRepairList.Visible = false;
13821319 this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);
13831320 //
1321+ // labelQuestCount1
1322+ //
1323+ this.labelQuestCount1.AnchorRight = true;
1324+ this.labelQuestCount1.AutoSize = true;
1325+ this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);
1326+ this.labelQuestCount1.Name = "labelQuestCount1";
1327+ this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;
1328+ this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);
1329+ this.labelQuestCount1.TabIndex = 54;
1330+ this.labelQuestCount1.UseMnemonic = false;
1331+ //
1332+ // labelQuestCount2
1333+ //
1334+ this.labelQuestCount2.AnchorRight = true;
1335+ this.labelQuestCount2.AutoSize = true;
1336+ this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);
1337+ this.labelQuestCount2.Name = "labelQuestCount2";
1338+ this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;
1339+ this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);
1340+ this.labelQuestCount2.TabIndex = 53;
1341+ this.labelQuestCount2.UseMnemonic = false;
1342+ //
1343+ // labelQuestCount3
1344+ //
1345+ this.labelQuestCount3.AnchorRight = true;
1346+ this.labelQuestCount3.AutoSize = true;
1347+ this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);
1348+ this.labelQuestCount3.Name = "labelQuestCount3";
1349+ this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;
1350+ this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);
1351+ this.labelQuestCount3.TabIndex = 52;
1352+ this.labelQuestCount3.UseMnemonic = false;
1353+ //
1354+ // labelQuestCount4
1355+ //
1356+ this.labelQuestCount4.AnchorRight = true;
1357+ this.labelQuestCount4.AutoSize = true;
1358+ this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);
1359+ this.labelQuestCount4.Name = "labelQuestCount4";
1360+ this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;
1361+ this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);
1362+ this.labelQuestCount4.TabIndex = 51;
1363+ this.labelQuestCount4.UseMnemonic = false;
1364+ //
1365+ // labelQuestCount5
1366+ //
1367+ this.labelQuestCount5.AnchorRight = true;
1368+ this.labelQuestCount5.AutoSize = true;
1369+ this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);
1370+ this.labelQuestCount5.Name = "labelQuestCount5";
1371+ this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;
1372+ this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);
1373+ this.labelQuestCount5.TabIndex = 50;
1374+ this.labelQuestCount5.UseMnemonic = false;
1375+ //
1376+ // labelQuestCount6
1377+ //
1378+ this.labelQuestCount6.AnchorRight = true;
1379+ this.labelQuestCount6.AutoSize = true;
1380+ this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);
1381+ this.labelQuestCount6.Name = "labelQuestCount6";
1382+ this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;
1383+ this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);
1384+ this.labelQuestCount6.TabIndex = 49;
1385+ this.labelQuestCount6.UseMnemonic = false;
1386+ //
13841387 // MainForm
13851388 //
13861389 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
--- a/KancolleSniffer/MainFormLabels.cs
+++ b/KancolleSniffer/MainFormLabels.cs
@@ -337,19 +337,23 @@ namespace KancolleSniffer
337337
338338 public void CreateNDockLabels(Control parent, EventHandler onClick)
339339 {
340+ const int lh = 15;
340341 for (var i = 0; i < _ndockLabels.Length; i++)
341342 {
342- var y = 3 + i * 15;
343+ var y = i * lh;
343344 parent.Controls.AddRange(
344345 _ndockLabels[i] = new[]
345346 {
346347 new ShipLabel
347348 {
348- Location = new Point(138, y),
349+ Location = new Point(138, y + 2),
349350 AutoSize = true,
350- AnchorRight = true
351+ AnchorRight = true,
352+ MinimumSize = new Size(0, lh),
353+ TextAlign = ContentAlignment.MiddleLeft,
354+ Cursor = Cursors.Hand
351355 },
352- new ShipLabel {Location = new Point(29, y), AutoSize = true} // 名前のZ-orderを下に
356+ new ShipLabel {Location = new Point(29, y + 3), AutoSize = true} // 名前のZ-orderを下に
353357 });
354358 foreach (var label in _ndockLabels[i])
355359 {
旧リポジトリブラウザで表示