From 8677eff491164e95ab7ed36af306c403e838c214 Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Tue, 10 May 2022 14:00:50 -0600
Subject: [PATCH] moved miner count and hashrate to top of tool

---
 tools/cfg_util/layout.py | 83 ++++++++++------------------------------
 1 file changed, 20 insertions(+), 63 deletions(-)

diff --git a/tools/cfg_util/layout.py b/tools/cfg_util/layout.py
index 9b5bc6a5..ba94deed 100644
--- a/tools/cfg_util/layout.py
+++ b/tools/cfg_util/layout.py
@@ -118,16 +118,11 @@ TABLE_KEYS = {
 }
 
 MINER_COUNT_BUTTONS = [
-    "scan_miner_count",
-    "cmd_miner_count",
-    "cfg_miner_count",
-    "pools_miner_count",
+    "miner_count",
 ]
 
 HASHRATE_TOTAL_BUTTONS = [
-    "scan_total_hashrate",
-    "cfg_total_hashrate",
-    "pools_total_hashrate",
+    "total_hashrate",
 ]
 
 BUTTON_KEYS = [
@@ -201,21 +196,6 @@ def get_scan_layout():
                 disabled_button_color=BTN_DISABLED,
                 mouseover_colors=BTN_DISABLED,
             ),
-            sg.Push(background_color=MAIN_TABS_BG),
-            sg.Button(
-                "Hashrate: 0 TH/s",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="scan_total_hashrate",
-            ),
-            sg.Button(
-                "Miners: 0",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="scan_miner_count",
-            ),
         ],
         [
             sg.Button(
@@ -291,14 +271,6 @@ def get_command_layout():
                 border_width=BTN_BORDER,
                 disabled_button_color=BTN_DISABLED,
             ),
-            sg.Push(background_color=MAIN_TABS_BG),
-            sg.Button(
-                "Miners: 0",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="cmd_miner_count",
-            ),
         ],
         [
             sg.Button(
@@ -389,22 +361,6 @@ def get_pools_layout():
                 border_width=BTN_BORDER,
                 disabled_button_color=BTN_DISABLED,
             ),
-            sg.Push(background_color=MAIN_TABS_BG),
-            sg.Button(
-                "Hashrate: 0 TH/s",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="pools_total_hashrate",
-            ),
-            sg.Button(
-                "Miners: 0",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="pools_miner_count",
-                pad=((5, 5), (0, 0)),
-            ),
         ],
         [
             sg.TabGroup(
@@ -563,23 +519,6 @@ def get_config_layout():
                 disabled_button_color=BTN_DISABLED,
                 pad=((0, 5), (5, 0)),
             ),
-            sg.Push(background_color=MAIN_TABS_BG),
-            sg.Button(
-                "Hashrate: 0 TH/s",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="cfg_total_hashrate",
-                pad=((0, 10), (3, 2)),
-            ),
-            sg.Button(
-                "Miners: 0",
-                disabled=True,
-                button_color=("black", "white smoke"),
-                disabled_button_color=("black", "white smoke"),
-                key="cfg_miner_count",
-                pad=((0, 5), (3, 2)),
-            ),
         ],
         [
             sg.Button(
@@ -655,6 +594,24 @@ layout = [
         ),
         sg.Text("", size=(20, 1), key="progress_percent", justification="r"),
     ],
+    [
+        sg.Push(),
+        sg.Button(
+            "Hashrate: 0 TH/s",
+            disabled=True,
+            button_color=("black", "white smoke"),
+            disabled_button_color=("black", "white smoke"),
+            key="total_hashrate",
+        ),
+        sg.Button(
+            "Miners: 0",
+            disabled=True,
+            button_color=("black", "white smoke"),
+            disabled_button_color=("black", "white smoke"),
+            key="miner_count",
+        ),
+        sg.Push(),
+    ],
     [
         sg.TabGroup(
             [