横長のメインウィンドウの左右を入れ替えた横長2を追加する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / MainWindow.cs

diff --git a/KancolleSniffer/MainWindow.cs b/KancolleSniffer/MainWindow.cs
index bff0b83..81aa9ad 100644 (file)
--- a/KancolleSniffer/MainWindow.cs
+++ b/KancolleSniffer/MainWindow.cs
@@ -37,22 +37,24 @@ namespace KancolleSniffer
             // ReSharper disable UnusedAutoPropertyAccessor.Local\r
             public NotifyIcon notifyIconMain { get; set; }\r
             public HqPanel hqPanel { get; set; }\r
-            public MainFleetPanel mainFleetPanel { get; set; }\r
+            public FleetPanel fleetPanel { get; set; }\r
             public Label labelNDockCaption { get; set; }\r
             public NDockPanel ndockPanel { get; set; }\r
+            public Label labelKDockCaption { get; set; }\r
             public KDockPanel kdockPanel { get; set; }\r
             public Label labelMissionCaption { get; set; }\r
             public MissionPanel missionPanel { get; set; }\r
             public Label labelMaterialCaption { get; set; }\r
             public DropDownButton dropDownButtonMaterialHistory { get; set; }\r
             public MaterialHistoryPanel materialHistoryPanel { get; set; }\r
+            public Label labelQuestCaption { get; set; }\r
             public Label labelQuestCount { get; set; }\r
             public QuestPanel questPanel { get; set; }\r
             public Label labelAkashiRepair { get; set; }\r
             public Label labelAkashiRepairTimer { get; set; }\r
             public Label labelRepairListCaption { get; set; }\r
             public Label dropDownButtonRepairList { get; set; }\r
-            public RepairListForMain panelRepairList { get; set; }\r
+            public RepairListPanel panelRepairList { get; set; }\r
             // ReSharper restore InconsistentNaming\r
             // ReSharper restore UnusedAutoPropertyAccessor.Local\r
         }\r
@@ -92,10 +94,12 @@ namespace KancolleSniffer
         private void SetupView()\r
         {\r
             SetScaleFactorOfDpiScaling();\r
+            if (Config.Shape == "横長2")\r
+                ChangeHorizontalLayout();\r
             SetupQuestPanel();\r
             SetEventHandlers();\r
-            _c.mainFleetPanel.AkashiRepairTimer = _c.labelAkashiRepairTimer;\r
-            _c.mainFleetPanel.ShowShipOnList = ShowShipOnShipList;\r
+            _c.fleetPanel.AkashiRepairTimer = _c.labelAkashiRepairTimer;\r
+            _c.fleetPanel.ShowShipOnList = ShowShipOnShipList;\r
             _c.panelRepairList.CreateLabels(panelRepairList_Click);\r
             _c.ndockPanel.SetClickHandler(_c.labelNDockCaption);\r
             _c.missionPanel.SetClickHandler(_c.labelMissionCaption);\r
@@ -104,6 +108,28 @@ namespace KancolleSniffer
             PerformZoom();\r
         }\r
 \r
+        private void ChangeHorizontalLayout()\r
+        {\r
+            var diff = _c.missionPanel.Left - _c.hqPanel.Left;\r
+            foreach (var control in new Control[]\r
+            {\r
+                _c.hqPanel, _c.questPanel, _c.labelQuestCaption, _c.labelQuestCount, _c.materialHistoryPanel,\r
+                _c.dropDownButtonMaterialHistory, _c.labelMaterialCaption\r
+            })\r
+            {\r
+                control.Left += diff;\r
+            }\r
+            foreach (var control in new Control[]\r
+            {\r
+                _c.missionPanel, _c.labelMissionCaption, _c.labelRepairListCaption, _c.panelRepairList,\r
+                _c.dropDownButtonRepairList, _c.labelAkashiRepair, _c.labelAkashiRepairTimer,\r
+                _c.ndockPanel, _c.labelNDockCaption, _c.kdockPanel, _c.labelKDockCaption\r
+            })\r
+            {\r
+                control.Left -= diff;\r
+            }\r
+        }\r
+\r
         private void SetEventHandlers()\r
         {\r
             SetMainFormEventHandler();\r
@@ -151,13 +177,13 @@ namespace KancolleSniffer
         {\r
             _updateable = new IUpdateContext[]\r
             {\r
-                _c.hqPanel, _c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.materialHistoryPanel, _c.mainFleetPanel,\r
+                _c.hqPanel, _c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.materialHistoryPanel, _c.fleetPanel,\r
                 Notifier\r
             };\r
             var context = new UpdateContext(Sniffer, Config, () => _main.Step);\r
             foreach (var updateable in _updateable)\r
                 updateable.Context = context;\r
-            _timers = new IUpdateTimers[] {_c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.mainFleetPanel};\r
+            _timers = new IUpdateTimers[] {_c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.fleetPanel};\r
         }\r
 \r
         private void SetScaleFactorOfDpiScaling()\r
@@ -169,7 +195,7 @@ namespace KancolleSniffer
 \r
         private void SetupQuestPanel()\r
         {\r
-            int prevHeight = _c.questPanel.Height;\r
+            var prevHeight = _c.questPanel.Height;\r
             _c.questPanel.CreateLabels(Config.QuestLines);\r
             Form.Height += _c.questPanel.Height - prevHeight;\r
         }\r
@@ -179,7 +205,7 @@ namespace KancolleSniffer
             if (update == Sniffer.Update.Start)\r
             {\r
                 _c.hqPanel.Login.Visible = false;\r
-                _c.mainFleetPanel.Start();\r
+                _c.fleetPanel.Start();\r
                 Notifier.StopAllRepeat();\r
                 return;\r
             }\r
@@ -210,10 +236,10 @@ namespace KancolleSniffer
             if (Config.HideOnMinimized && Form.WindowState == FormWindowState.Minimized)\r
                 Form.ShowInTaskbar = false;\r
             if (Config.ShowHpInPercent)\r
-                _c.mainFleetPanel.ToggleHpPercent();\r
+                _c.fleetPanel.ToggleHpPercent();\r
             if (Config.ShipList.Visible)\r
                 _listFormGroup.Show();\r
-            _main.CheckVersionUpMain(_c.mainFleetPanel.Guide);\r
+            _main.CheckVersionUpMain(_c.fleetPanel.Guide);\r
         }\r
 \r
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
@@ -229,7 +255,7 @@ namespace KancolleSniffer
             }\r
             _listFormGroup.Close();\r
             Config.Location = (Form.WindowState == FormWindowState.Normal ? Form.Bounds : Form.RestoreBounds).Location;\r
-            Config.ShowHpInPercent = _c.mainFleetPanel.ShowHpInPercent;\r
+            Config.ShowHpInPercent = _c.fleetPanel.ShowHpInPercent;\r
         }\r
 \r
         private void MainForm_Resize(object sender, EventArgs e)\r
@@ -307,7 +333,7 @@ namespace KancolleSniffer
             var prev = Form.CurrentAutoScaleDimensions;\r
             foreach (var control in new Control[]\r
             {\r
-                Form, _c.mainFleetPanel.Guide, _c.hqPanel.Login,\r
+                Form, _c.fleetPanel.Guide, _c.hqPanel.Login,\r
                 _contextMenuMain\r
             }.Concat(_main.Controls))\r
             {\r
@@ -376,7 +402,7 @@ namespace KancolleSniffer
 \r
         private void UpdateShipInfo()\r
         {\r
-            _c.mainFleetPanel.Update();\r
+            _c.fleetPanel.Update();\r
             Notifier.NotifyDamagedShip();\r
             UpdateChargeInfo();\r
             UpdateRepairList();\r
@@ -389,7 +415,7 @@ namespace KancolleSniffer
         {\r
             _listFormGroup.UpdateBattleResult();\r
             _listFormGroup.UpdateAirBattleResult();\r
-            _c.mainFleetPanel.UpdateBattleInfo();\r
+            _c.fleetPanel.UpdateBattleInfo();\r
         }\r
 \r
         private void UpdateCellInfo()\r
@@ -399,7 +425,7 @@ namespace KancolleSniffer
 \r
         private void UpdateChargeInfo()\r
         {\r
-            _c.mainFleetPanel.UpdateChargeInfo();\r
+            _c.fleetPanel.UpdateChargeInfo();\r
         }\r
 \r
         private void UpdateNDocLabels()\r