v4.5

* hopefully fixed [issue #11](#11), edit the scaling in ow_config  
* changed watchlist format to csv

Author: ZaharX97

CheckVacWindow.py

@@ -3,10 +3,14 @@
 import myglobals as g
 import functions as f
 import blackTkClasses as btk
+import AlertWindow as AW
 
 
 class MyVacWindow:
     def checkk(self, root, count):
+        if g.thread_export.is_alive():
+            AW.MyAlertWindow(self.window, "Exporting WatchList in progress, please wait!")
+            return self.window.destroy()
         delay = self.entry_speed.text.get()
         try:
             delay = int(delay)

MainWindow.py

@@ -8,13 +8,11 @@ CSGO Overwatch revealer by sniffing packets
 
 ## Latest Version:  
 
-* v**4.4.4** [Download](https://github.com/ZaharX97/OWReveal/releases/latest)  
+* v**4.5** [Download](https://github.com/ZaharX97/OWReveal/releases/latest)  
 	* created a small site to show suspects from all people using this app  
 	* [zahar.one/owrev](https://zahar.one/owrev)  
-	* fixed [issue #12](https://github.com/ZaharX97/OWReveal/issues/12), net adapter is saved to settings  
-	* fixed [issue #14](https://github.com/ZaharX97/OWReveal/issues/14), right click to copy steamid  
-	* added some kind of format to renaming demos, [more info](https://github.com/ZaharX97/OWReveal#demo-rename-format)  
-	* fixed [issue #15](https://github.com/ZaharX97/OWReveal/issues/15), right click on the link to copy demo name
+	* hopefully fixed [issue #11](https://github.com/ZaharX97/OWReveal/issues/11), edit the scaling in ow_config  
+	* changed watchlist format to csv  
 
 ## How to use?
 1. Download and install npcap (https://nmap.org/npcap/)
@@ -63,14 +61,13 @@ more info here: [time format codes](https://docs.python.org/3/library/datetime.h
 
 ## Older Versions: 
 
-* v**4.3.6** [Download](https://github.com/ZaharX97/OWReveal/releases/tag/4.3.6)  
+* v**4.4.4** [Download](https://github.com/ZaharX97/OWReveal/releases/tag/4.4.4)  
 	* created a small site to show suspects from all people using this app  
 	* [zahar.one/owrev](https://zahar.one/owrev)  
-	* fixed: only 1 suspect was added to site, then a restart was needed  
-	* fixed: check vac didnt work in v4.3  
-	* fixed: unranked gamed didnt show team scores  
-	* added demo date
-	* (new) fixed: stats in wingman unranked (who plays that) were not shown correctly
+	* fixed [issue #12](https://github.com/ZaharX97/OWReveal/issues/12), net adapter is saved to settings  
+	* fixed [issue #14](https://github.com/ZaharX97/OWReveal/issues/14), right click to copy steamid  
+	* added some kind of format to renaming demos, [more info](https://github.com/ZaharX97/OWReveal#demo-rename-format)  
+	* fixed [issue #15](https://github.com/ZaharX97/OWReveal/issues/15), right click on the link to copy demo name
 
 * v**3.1.5** [Download](https://github.com/ZaharX97/OWReveal/releases/tag/3.1.5)  
   * changed npcap link to main site  

README.md

@@ -107,7 +107,7 @@ def __init__(self, root):
         self.window.title("Settings")
         self.window.minsize(580, 445)
         sizex = self.window.minsize()[0]
-        # sizey = self.window.minsize()[1]
+        sizey = self.window.minsize()[1]
         self.window.resizable(False, False)
         self.window.config(bg="#101010")
         self.window.protocol("WM_DELETE_WINDOW", self._destroy_checkname)
@@ -188,17 +188,17 @@ def lc_event3(event):
 
         self.label_skey = btk.MyLabelStyle(self.window, "API Key:")
         self.label_skey.frame.config(cursor="hand2")
-        self.label_skey.frame.grid(row=20, column=0, padx=5, pady=5)
+        self.label_skey.frame.grid(row=10, column=0, padx=5, pady=5)
         self.label_skey.frame.bind("<Button-1>", lc_event3)
         self.entry_steam_key = btk.MyEntryStyle(self.window, g.settings_dict["steam_api_key"])
         self.entry_steam_key.frame.config(state="normal")
-        self.entry_steam_key.frame.grid(row=20, column=1, sticky=tk.W + tk.E, padx=5, columnspan=3)
+        self.entry_steam_key.frame.grid(row=10, column=1, sticky=tk.W + tk.E, padx=5, columnspan=3)
 
         self.btn_save = btk.MyButtonStyle(self.window, "Save to file", self._update_on_save)
-        self.btn_save.btn.grid(row=21, column=3, sticky=tk.E, padx=5, pady=5)
+        self.btn_save.btn.grid(row=11, column=3, sticky=tk.E, padx=5, pady=5)
 
         self.btn_analyze = btk.MyButtonStyle(self.window, "Analyze a demo", self._analyze_demo)
-        self.btn_analyze.btn.grid(row=21, column=0, columnspan=2, sticky=tk.W, padx=5, pady=5)
+        self.btn_analyze.btn.grid(row=11, column=0, columnspan=2, sticky=tk.W, padx=5, pady=5)
 
         def lc_event1(event):
             if g.browser_path is None:
@@ -208,14 +208,28 @@ def lc_event1(event):
 
         self.label_github = btk.MyLabelStyle(self.window, "v{}   {}".format(g.VERSION, g.PROJECT_LINK))
         self.label_github.frame.config(cursor="hand2")
-        self.label_github.frame.grid(row=21, column=1, padx=5, pady=5, columnspan=2)
+        self.label_github.frame.grid(row=11, column=1, padx=5, pady=5, columnspan=2)
         self.label_github.frame.bind("<Button-1>", lc_event1)
 
         self._update_all_settings()
-        self.window.grid_columnconfigure(0, minsize=0.15 * sizex, weight=1)
-        self.window.grid_columnconfigure(1, minsize=0.5 * sizex, weight=1)
-        self.window.grid_columnconfigure(2, minsize=0.15 * sizex, weight=1)
-        self.window.grid_columnconfigure(3, minsize=0.2 * sizex, weight=1)
+        self.window.grid_columnconfigure(0, minsize=0.15 * sizex * g.settings_dict["scaling"], weight=1)
+        self.window.grid_columnconfigure(1, minsize=0.5 * sizex * g.settings_dict["scaling"], weight=1)
+        self.window.grid_columnconfigure(2, minsize=0.15 * sizex * g.settings_dict["scaling"], weight=1)
+        self.window.grid_columnconfigure(3, minsize=0.2 * sizex * g.settings_dict["scaling"], weight=1)
+
+        self.window.grid_rowconfigure(0, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(1, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(2, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(3, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(4, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(5, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(6, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(7, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(8, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(9, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(10, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+        self.window.grid_rowconfigure(11, minsize=0.083 * sizey * g.settings_dict["scaling"], weight=1)
+
         self.window.grid_propagate(False)
         self.window.update_idletasks()
         self.window.geometry("+%d+%d" % (f.calc_window_pos(root, self.window)))

SettingsWindow.py

@@ -0,0 +1,24 @@
+import tkinter as tk
+
+import functions as f
+import blackTkClasses as btk
+
+
+class MyWlextraWindow:
+    def __init__(self, root):
+        self.window = tk.Toplevel(root.window)
+        self.window.transient(root.window)
+        self.window.title("Extra Stuff")
+        # self.window.minsize(100, 50)
+        self.window.resizable(False, False)
+        self.window.attributes("-topmost")
+        self.window.config(bg="#101010")
+        self.window.protocol("WM_DELETE_WINDOW", self.window.destroy)
+        self.btn_close = btk.MyButtonStyle(self.window, "More Stats", lambda: [root._open_more_stats(), self.window.destroy()])
+        self.btn_close.btn.pack(padx=5, pady=5)
+        self.btn_close = btk.MyButtonStyle(self.window, "Export WL (CSV)", lambda: [root.close_and_update(), f.export_wl_csv(self.window), self.window.destroy()])
+        self.btn_close.btn.pack(padx=5, pady=5)
+        self.window.update_idletasks()
+        self.window.geometry("+%d+%d" % (f.calc_window_pos(root.window, self.window)))
+        self.window.grab_set()
+        self.window.focus_set()