From d2623985fbcf6ae7a611d2a3b1cedf780527f54f Mon Sep 17 00:00:00 2001
From: joelnir <joel.oscarsson@hotmail.com>
Date: Sun, 3 Jan 2016 13:55:20 +0100
Subject: [PATCH] Bug Fixes

Committing some bugfixes and addition of update_GUI function. This
function is not yet implemented in the rest of the project.
---
 __pycache__/config.cpython-35.pyc        | Bin 910 -> 910 bytes
 __pycache__/ls_connection.cpython-35.pyc | Bin 2862 -> 2800 bytes
 config.py                                |   2 +-
 main_window.py                           |  33 ++++++++++++++++++++---
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/__pycache__/config.cpython-35.pyc b/__pycache__/config.cpython-35.pyc
index 125b08fbd91ef96b6b04f888df2e11fdffd71b66..01bfb86d1eda24f5bd7f537cf9c01383804a8d96 100644
GIT binary patch
delta 53
zcmeBU?_*~d<K^XwX7Aj{9?r<0If0RZ;TD^RtEan1NT$x@T*j}A+>?`;wy}vaFfbH}
JPL^lR2LM_74HN(X

delta 53
zcmeBU?_*~d<K^WN5bM~;9?r=B@&p3|!!0%sS5J43kjyWWa~Z!f@=Q)<+QudZlqeFL
IEYF+|0D4CbSpWb4

diff --git a/__pycache__/ls_connection.cpython-35.pyc b/__pycache__/ls_connection.cpython-35.pyc
index d122df607e4906d41197791439b5a408534502e9..b5a3957720032db10d4797428bc2dd683513d924 100644
GIT binary patch
delta 280
zcmX|*ze)o^5QleX_x5g={gZH9E*cKe;=;D+4C%yxK0qLiMIK?(1ky|TsT6z#L2T@N
z9SaLnq<06wVm^j%e$344=%>*m=giCIu)2NIC-8zXrgPoo+Ro96OI#|C8}Y#<PGmQX
zB9(cTDgq_(L7q928&(S5alth{%DubFVhf}pHRy}4VNXVpQGrWH<M&dXL(yh2!@j!U
zEiS85=0e}scNC@@tO^jgfi%S@{plzj;qQeWkEX_*3HACvT?A0HJmRy7vCBSLf+rM&
WhA<}3t~4b?{5IFxTWPIr?cf*UD=Lcs

delta 412
zcmX|+J4*vW5XWct_MYB((P$DAM59HxkVaC7wFr_Xk_2B7R4!42a0#0$M0^xB_WKd+
z17a&!+gTrefRr}2;!FgWo!`#>=drV2^P`NN@jU10_;L5-+5YC!0svBIn`pyR<!Z&X
zDu`IXr3117>{bJIorYM48x0;9unvRf-a&^0ZVcXOu&>s&*Lx!|!+sQX!#FX}IqRJ#
zV!PgKC1R)EXeIX6RoETGy?&JF1KEq>Ku8nclor88B&;hPx=b)do{pG98@dQEHMYoR
znZvSt5(ycpxad@EapA3^Gvp+3nNuHPJX0dYAjR;R;Ii=YuIIU)N1>|5<`T=Rw!NT=
z)+c&DRxMql0-6adpZm<=vWyvT9#sVVZ{$FgoR#$9f2QtpgPK>=krM>Vs7o4HP7~-4
YGDj#7sE;fYDr)3x*uE=V*Uh@AU%lN)X8-^I

diff --git a/config.py b/config.py
index a4af114..755a2d1 100644
--- a/config.py
+++ b/config.py
@@ -17,7 +17,7 @@ LS_COMMANDS = {
 }
 
 #Default Window Size
-DEFAULT_WINDOW = {"WIDTH": 200, "HEIGHT": 500, "TITLE": "SplitNotes"}
+DEFAULT_WINDOW = {"WIDTH": 400, "HEIGHT": 300, "TITLE": "SplitNotes"}
 
 #Color Scheme
 COLOR_SCHEME = {}
diff --git a/main_window.py b/main_window.py
index 7d67804..cc7a4c4 100644
--- a/main_window.py
+++ b/main_window.py
@@ -93,7 +93,24 @@ def update(window, com_socket, text1, text2):
 	
 	
 	#self looping
-	window.after(int(config.POLLING_TIME * 1000), update, window, com_socket, text1, text2)					
+	window.after(int(config.POLLING_TIME * 1000), update, window, com_socket, text1, text2)
+
+
+def	update_GUI(window, com_socket, text1, text2):
+	#TODO implemement this function
+	index = runtime_info["active_split"]
+	
+	if index == -1:
+		index = 0
+	
+	if runtime_info["timer_running"]:
+		#Does not test connection if it fails
+		split_name = con.get_split_name(com_socket)
+	else:
+		split_name = False
+		
+	update_notes(window, text1, text2, index)
+	set_title_notes(window, index, split_name)
 	
 	
 def test_connection(com_socket, window, text1, text2):
@@ -208,9 +225,19 @@ def load_notes(window, text1, text2):
 			
 			split_c = len(notes)
 			show_info(("Notes Loaded", ("Loaded notes with " + str(split_c) + " splits.")))
-
+			
+			if not runtime_info["timer_running"]:
+				runtime_info["active_split"] = -1
+				
 			update_notes(window, text1, text2, runtime_info["active_split"])
-			set_title_notes(window, 0, split_name = False)
+			
+			#Make sure right number is displayed after notes have been loaded.
+			if runtime_info["active_split"] == -1:
+				disp_index = 0
+			else:
+				disp_index = runtime_info["active_split"]
+				
+			set_title_notes(window, disp_index)
 		else:
 			show_info(config.ERRORS["NOTES_EMPTY"], True)