diff --git a/PfandApplication/images/monster.png b/PfandApplication/images/monster.png deleted file mode 100644 index beead2b..0000000 Binary files a/PfandApplication/images/monster.png and /dev/null differ diff --git a/PfandApplication/main.py b/PfandApplication/main.py index 0a42f4a..7c5991c 100644 --- a/PfandApplication/main.py +++ b/PfandApplication/main.py @@ -540,6 +540,12 @@ class PfandCalculator: # ref@todo/main.py def create_todo_list(self): + #try: + # import tkFont + #except ImportError as e: + # print(f"error as -> {e}") + + todo = tk.Toplevel(self.root) todo.title("Todo Liste") todo.resizable(True, True) @@ -552,6 +558,7 @@ class PfandCalculator: label_todo = tk.Label( todo, text=todo_instance.load_todo(), + #font="Segoe UI", padx=10, pady=10, justify="left", @@ -1749,7 +1756,6 @@ class PfandCalculator: "Kasten", "Dose", "Plastikflasche", - "Monster", "Joghurt Glas", ] self.PRICES = { @@ -1758,7 +1764,6 @@ class PfandCalculator: "Kasten": 3.00, "Dose": 0.25, "Plastikflasche": 0.25, - "Monster": 0.25, "Joghurt Glas": 0.17, } self.save_products() diff --git a/PfandApplication/tgtg_orderchecker/key.py b/PfandApplication/tgtg_orderchecker/key.py index 9f419ec..dcec32f 100644 --- a/PfandApplication/tgtg_orderchecker/key.py +++ b/PfandApplication/tgtg_orderchecker/key.py @@ -2,6 +2,10 @@ # # # AUTOGENERATED BY SETUPKEYTOOL V1.0.03 # # THIS IS SENSITIVE INFORMATION # +# # +# THIS IS FILLED IN BY THE # +# GUI ASSISTANT # +# # # @ZockerKatze/@rattatwinko # # # ######################################### @@ -11,4 +15,4 @@ from tgtg import TgtgClient # Don't ever give this Info to someone you dont trust! # This is the Private Key to your TGTG Account -client = TgtgClient(access_token="asdf", refresh_token="asdf", cookie="asdf") +client = TgtgClient(access_token="", refresh_token="", cookie="") diff --git a/PfandApplication/tgtg_orderchecker/setupkey.py b/PfandApplication/tgtg_orderchecker/setupkey.py index 386e2da..9171c36 100644 --- a/PfandApplication/tgtg_orderchecker/setupkey.py +++ b/PfandApplication/tgtg_orderchecker/setupkey.py @@ -61,10 +61,10 @@ def ask_for_tokens(): # Create Tkinter window root = tk.Tk() - root.title("Enter API Credentials") + root.title("API Kredenzen") - title_label = tk.Label(root, text="Enter your API Credentials", font=("Arial", 14, "bold")) + title_label = tk.Label(root, text="Gebe deine API Kredenzen ein!", font=("Arial", 14, "bold")) title_label.grid(row=0, columnspan=2, pady=10) # Add labels and entry fields for the tokens and cookie @@ -81,7 +81,7 @@ def ask_for_tokens(): cookie_entry.grid(row=3, column=1) # Submit button to process the tokens - submit_button = tk.Button(root, text="Submit", command=submit_tokens) + submit_button = tk.Button(root, text="Speichern", command=submit_tokens) submit_button.grid(row=4, columnspan=2) # Keep the window on top diff --git a/PfandApplication/todo/main.py b/PfandApplication/todo/main.py index 78ecf82..c00ac72 100644 --- a/PfandApplication/todo/main.py +++ b/PfandApplication/todo/main.py @@ -1,16 +1,4 @@ -""" -Quick TLDR: - If you see any "ref" in the main.py file you are probably looking at a reference to a certain file. - example: ref@todo/main.py , element int(x) - This is refering to the todo list with element of X - This can be for other things too, such as other Methods in Classes. - example: ref@tgtg_orderchecker/main.py@12:32 - This is refering to the tgtg oc at main 12:32. - - if you see any "@" , you are probably seeing a reference to the todo list. - for example element 3 in todo (@LocalImportStructure) -""" class todo: @@ -19,9 +7,10 @@ class todo: self.todo: str = """ TODO: [] main.py@GENERAL - refactor to make the ChatGPT Code actually readable. + [] main.py@TODO - Refactor and make it look nicer! PRIO: HIGH [] @Project_Structure - Fix this shit - Isnt too bad , we can work with the structure. - [] @ImportStructure - Fix the Import structure, it currently looks like ass. At least the local ImportStructure. + [x] @ImportStructure - Fix the Import structure, it currently looks like ass. At least the local ImportStructure. - @LocalImportStructure => Fix by end of next week. (KW25) """ # ------------------------------------------------------------------------------------------------------------------# @@ -37,6 +26,20 @@ Changelog: 12.JUN.25@21:20 => Fixed Todo List Load Bug. Now loads properly. It was a import issue. """ # ------------------------------------------------------------------------------------------------------------------# + self.tldr : str = """ +Quick TLDR: + If you see any "ref" in the main.py file you are probably looking at a reference to a certain file. + example: ref@todo/main.py , element int(x) + This is refering to the todo list with element of X + + This can be for other things too, such as other Methods in Classes. + example: ref@tgtg_orderchecker/main.py@12:32 + This is refering to the tgtg oc at main 12:32. + + if you see any "@" , you are probably seeing a reference to the todo list. + for example element 3 in todo (@LocalImportStructure) + """ + # ---------------------------------------------------------------------------------------------------------------------# # Methods to return the things we want. def load_todo(self) -> str: @@ -45,6 +48,8 @@ Changelog: def load_changelog(self) -> str: return self.changelog + def load_tldr(self) -> str: + return self.tldr # toodoo bug may also reside here. idk todo_instance = todo() diff --git a/products.json b/products.json index 410df66..f5ebba9 100644 --- a/products.json +++ b/products.json @@ -1,22 +1 @@ -{ - "products": [ - "Flaschen", - "Bierflasche", - "Kasten", - "Dose", - "Plastikflasche", - "Monster", - "Joghurt Glas", - "nigger" - ], - "prices": { - "Flaschen": 0.25, - "Bierflasche": 0.2, - "Kasten": 3.0, - "Dose": 0.25, - "Plastikflasche": 0.25, - "Monster": 0.25, - "Joghurt Glas": 0.17, - "nigger": 200.0 - } -} \ No newline at end of file +{"products": ["Flaschen", "Bierflasche", "Kasten", "Dose", "Plastikflasche", "Joghurt Glas"], "prices": {"Flaschen": 0.25, "Bierflasche": 0.2, "Kasten": 3.0, "Dose": 0.25, "Plastikflasche": 0.25, "Joghurt Glas": 0.17}} \ No newline at end of file