Merge pull request #1 from BitTim/v1.6

v1.6

Author: BitTim

README.md

@@ -1,6 +1,6 @@
 # VexTrack
 
-![Status badge](https://img.shields.io/badge/Status-Stable-green?style=for-the-badge "Development Status") [![Language badge](https://img.shields.io/badge/Language-Python_3.8.2-inactive?logo=python&logoColor=ffffff&style=for-the-badge)](https://python.org "Language") 
+![Status badge](https://img.shields.io/badge/Status-Stable-green?style=for-the-badge "Development Status") [![Language badge](https://img.shields.io/badge/Language-Python_3.9.6-inactive?logo=python&logoColor=ffffff&style=for-the-badge)](https://python.org "Language") 
 ![GitHub License](https://img.shields.io/github/license/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "License")
 ![GitHub repo size](https://img.shields.io/github/repo-size/BitTim/ValorantXPCalc?logo=github&style=for-the-badge) ![GitHub contributors](https://img.shields.io/github/contributors/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "Contributors") ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "Last commit")
 

VexTrack.png

@@ -5,9 +5,11 @@
 NUM_EPLOGUE_XP_PER_LEVEL = 36500
 
 LEVEL2_OFFSET = 500
-BUFFER_DAYS = 8
 
-CONFIG_PATH = "dat/config.json"
+DATA_PATH = "dat/data.json"
+SETTINGS_PATH = "dat/settings.json"
+OLD_DATA_PATH = "dat/config.json"
+
 UPDATER_PATH = "Updater.exe"
 VERSION_PATH = "version.json"
 OLD_VERSION_PATH = "version"
@@ -23,13 +25,22 @@
 LEGACY_LAST_APP = 1.4
 LEGACY_LAST_UPDATER = 1.15
 
-NONE_BG_COLOR = "#939393"
-NONE_FG_COLOR = "#000000"
-WIN_BG_COLOR = "#AFE0D2"
-WIN_FG_COLOR = "#000000"
-LOSS_BG_COLOR = "#F7AAA8"
-LOSS_FG_COLOR = "#000000"
-DRAW_BG_COLOR = "#C3C3C3"
-DRAW_FG_COLOR = "#000000"
-SELECTED_BG_COLOR = "#0078D7"
-SELECTED_FG_COLOR = "#FFFFFF"
+# ================================
+#  Default Settings
+# ================================
+
+DEFAULT_BUFFER_DAYS = 8
+DEFAULT_USE_HISTORY_COLORS = 1
+DEFAULT_IGNORE_INACTIVE_DAYS = 0
+
+DEFAULT_NONE_BG_COLOR = "#939393"
+DEFAULT_WIN_BG_COLOR = "#AFE0D2"
+DEFAULT_LOSS_BG_COLOR = "#F7AAA8"
+DEFAULT_DRAW_BG_COLOR = "#C3C3C3"
+DEFAULT_SELECTED_BG_COLOR = "#0078D7"
+
+DEFAULT_NONE_FG_COLOR = "#000000"
+DEFAULT_WIN_FG_COLOR = "#000000"
+DEFAULT_LOSS_FG_COLOR = "#000000"
+DEFAULT_DRAW_FG_COLOR = "#000000"
+DEFAULT_SELECTED_FG_COLOR = "#FFFFFF"

src/VexTrack.py

@@ -0,0 +1,27 @@
+from tkinter import *  
+from tkinter import ttk
+from vars import *
+
+class AboutDiag(Toplevel):
+    def __init__(self, parent, title, versionString, updaterVersionString):
+        super().__init__(parent)
+        self.title(title)
+        self.transient()
+        self.iconbitmap("VexTrack.exe")
+        self.resizable(False, False)
+
+        self.img = PhotoImage(file="VexTrack.png")
+        self.img = self.img.subsample(4, 4)
+        Label(self, image=self.img).grid(padx=8, pady=8, row=0, sticky="nswe", columnspan=2)
+
+        ttk.Label(self, text="VexTrack", font=('TkDefaultFont', 16,'bold')).grid(columnspan=2, row=1)
+
+        ttk.Label(self, text="Version:").grid(column=0, row=2)
+        ttk.Label(self, text=versionString).grid(column=1, row=2)
+        ttk.Label(self, text="Updater Version:").grid(column=0, row=3)
+        ttk.Label(self, text=updaterVersionString).grid(column=1, row=3)
+
+        ttk.Label(self, text="").grid(columnspan=2, row=4)
+        ttk.Label(self, text="Created by BitTim").grid(columnspan=2, row=5)
+        ttk.Label(self, text="https://github.com/BitTim/VexTrack").grid(columnspan=2, row=6)
+        ttk.Label(self, text="").grid(columnspan=2, row=7)

src/vars.py

@@ -1,5 +1,6 @@
 from tkinter import * 
-from tkinter import simpledialog, messagebox, ttk, colorchooser
+from tkinter import simpledialog, messagebox, ttk
+from vextrackLib import colorButton
 
 class AddGoalDiag(simpledialog.Dialog):
     def __init__(self, parent, title, name=None, amount=None, color="#FF0000", edit=False):
@@ -11,8 +12,7 @@ def __init__(self, parent, title, name=None, amount=None, color="#FF0000", edit=
         super().__init__(parent, title)
 
     def changeColor(self):
-        self.color = colorchooser.askcolor(title="Choose Color", color=self.color)[1]
-        self.colorPreview.configure(bg=self.color)
+        self.color = self.colorBtn.color
 
     def body(self, frame):
         self.iconbitmap("VexTrack.exe")
@@ -30,11 +30,9 @@ def body(self, frame):
         if self.xpAmount != None: self.xpAmountBox.insert(0, self.xpAmount)
 
         ttk.Label(frame, text="Color").grid(padx=8, pady=4, column=0, row=2, sticky="w")
-        self.colorPreview = Frame(frame, width=16, height=16, bg=self.color)
-        self.colorPreview.grid(padx=8, pady=4, column=1, row=2, sticky="w")
 
-        colorBtn = ttk.Button(frame, text="Change Color", command=self.changeColor)
-        colorBtn.grid(padx=8, pady=4, column=2, row=2, sticky="e")
+        self.colorBtn = colorButton.ColorButton(frame, color=self.color, command=self.changeColor)
+        self.colorBtn.grid(padx=8, pady=4, column=2, row=2, sticky="we")
 
         self.changeStartXPVar = IntVar()
 

src/vextrackLib/aboutDiag.py

@@ -0,0 +1,33 @@
+from tkinter import *
+from tkinter import colorchooser
+
+class ColorButton(Frame):
+    def __init__(self, container, color="#ff0000", command=None, *args, **kwargs):
+        super().__init__(container, *args, **kwargs)
+        self.color = color
+        self.command = command
+        self.hovering = False
+        self.configure(bg=self.color)
+
+        self.configure(width=16, height=16)
+
+        self.bind("<Button-1>", self.onClick)
+        self.bind("<Enter>", lambda event: self.setHover(True))
+        self.bind("<Leave>", lambda event: self.setHover(False))
+
+    def setHover(self, state):
+        self.hovering = state
+
+    def onClick(self, event):
+        color = colorchooser.askcolor(title="Select Color", color=self.color)[1]
+        if color != None:
+            self.color = color
+            self.configure(bg=self.color)
+
+        if self.command != None: self.command()
+    
+    def setValues(self, color=None, command=None):
+        if command != None: self.command = command
+        if color != None:
+            self.color = color
+            self.configure(bg=self.color)