From 36daacbf422db8f122ef847e0fcb27bf8b626dda Mon Sep 17 00:00:00 2001
From: "DESKTOP-JVKHS7I\\Adam" <adsau59@gmail.com>
Date: Thu, 23 Apr 2020 14:21:28 +0530
Subject: [PATCH] ui fix: start button and andoid ip label, fixed shorcut

---
 fishy/FishybotESO.lnk | Bin 2220 -> 2958 bytes
 fishy/__init__.py     |   2 +-
 fishy/__main__.py     |   5 +----
 fishy/systems/gui.py  |   4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fishy/FishybotESO.lnk b/fishy/FishybotESO.lnk
index 4b51d48493215408bcd2ed978978f6d793416718..6416db21d390cbab0d3e3f995f04ea54a3d1b6dd 100644
GIT binary patch
delta 681
zcmZ1@*e5<g#PYWj2ZI6w14GD*gFR}qt}@QMbO?oJaAN_=GB7ZLNd#d!(O0iNjKL5r
zG9kcWh5$o&W?o8uc`<_n11AFu!~1>3err@fGI~HY*Ly^PBs)Ssn5Dj4pD~;vlOc~G
zg(07zoS_&fD#j26HFavhGd}@_;L75X)LdgD1_mc2b3t-?^+4r+Ct)-AwtG24FheEK
zz!HX3hFk_?2B3Zh35GBb4fIj2|FvudhUDB7z0`_SxPw8WAPjOagN-ndU<R=m{(wmk
zk#t;=AsJ|13WFZd-1-V20dg?|gBK9X05K?-K(sCpgMcRx3j#67AVu%_{{(<EgR@l(
zG^}D^zKemmg+U!?v>rnYP7*1+WPtvQ!SH7c#D$Y*FnOv9G3YZm1LGGI4v7p!KvIDr
z4H)3X3>m=C0r>&wg~<<?qBqZGe!#2^avduJ!va+xeHVy9KH&!P%l!^YJ!gvb+wP*b
zab4hy?LfK7R?LQufpe1LOB7!TZae#-OeW(=x`Cg*1b=_2b8Gv#wR30r<e|%p0D}P-
xLJL%#{e6Q2T%A=XE3*C;R0TTGpTQUCkpKo)AX{~_B5NPx<PXf5o2%Ik838R6nacnG

delta 629
zcmeAZUn4j{#PYTS2ZI6w14HSNONniw*BH_1=!uL#Sq26O31)(c*%N*B>SGuT!JLi&
zlM(@jV1KueaK}2JkP8DR0}I3ZeO$f=IXeOzOZ0%M_~(I)5CyA85XbK-F$6Q@Go&$;
zFqAVSG88eSG86-)B^ctMX4?j2W(hF(dir@f`-9AOgPQH)$5_7;BndLyWk1MpS%kS@
z*7XDO489DR40%AD474PVAq8lKF;Gr|Aq;B#q=3meK&K}cWfqhaGdREvciIV(0h#?o
zNf1afgH1#b-J6~;)CU8NEdm-|0CYXb)nW`W3`Pu~AOmSuU`Wd>&ZyK&tw@E32uK`e
zaGaF{P!9*fOfU;%a2n9eVulQcN(Mb(cvJu}$jJ;05kM>h#30WC=_m$WAOi%#ff(jW
zMeq6l1VDn$Rx!c(X(i=}MXALxzL|NM$@zIHiN-Nd&&D8J$Dj|iNDt_EI5}B~$(lO`
z;gHE9OrDdQnW84YWHT^$vQ40Ted8;^?E)XlWHO$l8~Eu<@b{NGx3-^KJ9m~(9=iPI
OyG#$5H^*`rG6DdrB#+ww

diff --git a/fishy/__init__.py b/fishy/__init__.py
index bb9d58d..168b65f 100644
--- a/fishy/__init__.py
+++ b/fishy/__init__.py
@@ -1,2 +1,2 @@
 from fishy.__main__ import main
-__version__ = "0.2.6"
+__version__ = "0.2.8"
diff --git a/fishy/__main__.py b/fishy/__main__.py
index 8c26167..bf1ad98 100644
--- a/fishy/__main__.py
+++ b/fishy/__main__.py
@@ -45,12 +45,11 @@ class Fishy:
         FishingMode("look", 2, LookEvent())
         FishingMode("idle", 3, IdleEvent(ip != ""))
 
-        logging.info("Starting the bot engine, look at the fishing hole to start fishing")
-
         self.fishPixWindow = Window(color=cv2.COLOR_RGB2HSV)
 
         # check for game window and stuff
         self.gui.call(GUIFunction.STARTED, (True,))
+        logging.info("Starting the bot engine, look at the fishing hole to start fishing")
         Thread(target=wait_and_check).start()
         while self.start:
             # Services to be ran in the start of the main loop
@@ -116,8 +115,6 @@ def initialize(c: Config, gui):
         sys.excepthook = helper.unhandled_exception_logging
 
 
-
-
 def wait_and_check():
     time.sleep(10)
     if not G.FishingStarted:
diff --git a/fishy/systems/gui.py b/fishy/systems/gui.py
index 2adcafb..d8c9a63 100644
--- a/fishy/systems/gui.py
+++ b/fishy/systems/gui.py
@@ -116,7 +116,7 @@ class GUI:
         # region controls
         left_frame = Frame(controls_frame)
 
-        # Label(left_frame, text="Android IP").grid(row=0, column=0)
+        Label(left_frame, text="Android IP").grid(row=0, column=0)
         ip = Entry(left_frame)
         ip.insert(0, self.config.get("ip", ""))
         ip.grid(row=0, column=1)
@@ -182,7 +182,7 @@ class GUI:
             if func[0] == GUIFunction.LOG:
                 self._write_to_console(func[1][0])
             elif func[0] == GUIFunction.STARTED:
-                # self._bot_running = func[1][0]
+                self._bot_running = func[1][0]
                 self.start_button["text"] = "STOP" if self._bot_running else "START"
             elif func[0] == GUIFunction.ASK_DIRECTORY:
                 messagebox.showinfo("Directory?", func[1][1])