Merge pull request #27 from IceTheDev2/code-cleaning-optimise-create_password_labels

Code cleaning optimise create password labels

Author: IceTheCoder

code/generate_password_gui.py

@@ -120,10 +120,10 @@ def create_password_labels(event) -> None:
         for password_label in password_labels:
             password_label.bind('<ButtonRelease>', show_copy_button)
             password = generate_password_logic.validate_input(input_box.get(), lowercase_letters_var, uppercase_letters_var, digits_var, punctuation_var, no_character_set_error, input_box, double_error, invalid_input_error)
+            
+            # Check if an error was NOT returned.
             if password == None:
                 password = generate_password_logic.generate_password(input_box.get(), lowercase_letters_var, uppercase_letters_var, digits_var, punctuation_var)
-
-            if password != invalid_input_error and password != no_character_set_error and password != double_error:
                 show_password(password_label, password)
                 password_label.grid(column = 0, row = 5 + password_labels.index(password_label), pady = 10, padx = 10)
             else:

code/main.py

@@ -1,6 +1,8 @@
 import tkinter as tk
 from tkinter import ttk
+
 from PIL import ImageTk, Image
+
 import generate_password_gui
 import password_strength_gui
 

code/password_strength_gui.py

@@ -1,13 +1,17 @@
 import tkinter as tk
+
 from pynput.keyboard import Key, Controller
+
 import password_strength_logic
 
 keyboard = Controller()
 
 title_font = 'Helvetica 24'
 warning_font = 'Helvetica 16'
 
-def show_paste_button(event) -> None:
+copy_button_y_offest = 30
+
+def display_paste_button(event) -> None:
     '''
     Called when the user right-clicks on the input_box,
     this function uses the Tkinter module to display a contextual menu containing a 'paste' button on the x and y coordinates of the user's cursor,
@@ -18,7 +22,7 @@ def show_paste_button(event) -> None:
     event:
         Gets the coordinates of the mouse cursor when the user releases a mouse button on a password_label.
     '''
-    paste.tk_popup(event.x_root, event.y_root - 30)
+    paste.tk_popup(event.x_root, event.y_root - copy_button_y_offest)
 
 def paste_text() -> None:
     '''
@@ -54,7 +58,7 @@ def create_password_strength_frame(frame) -> None:
     input_box = tk.Entry(frame, width = 32, borderwidth = 2)
     input_box.grid(column = 0, row = 2)
     input_box.bind('<KeyRelease>', lambda abcdefgh: password_strength_logic.check_password_strength(None, warnings, first_label, input_box.get(), second_label, third_label, fourth_label))
-    input_box.bind('<Button-3>', show_paste_button)
+    input_box.bind('<Button-3>', display_paste_button)
 
     global first_label
     first_label = tk.Label(frame, font = warning_font, text = '')