Merge pull request #27 from WhenLifeHandsYouLemons/v1.6.1

v1.6.1

Author: WhenLifeHandsYouLemons

Encryptext.pyw

@@ -58,6 +58,7 @@ Variables
 debug = False
 # UPDATE MODE HERE
 update = False# UPDATE MODE HERE
+version = "1.6.1"
 
 save_location = ""
 file_extension = ""
@@ -516,7 +517,7 @@ def openPreferences():
     pref_window.mainloop()
 
 def update_menu(Event=None):
-    messagebox.showinfo("Update Encryptext", "1. Run the updater\n2. When it asks for the old enryption keys, copy and paste the ones shown in the text editor window.\n\nClick 'Ok' to view the keys.\n\nDO NOT SAVE THE DOCUMENT WITH THE KEYS.")
+    messagebox.showinfo("Update Encryptext", """1. Run the new version's installer\n2. When it asks whether you're installing or updating, choose updating.\n3. When it asks for the old enryption key and other strings, copy and paste the ones shown in the text editor here.\n\nClick 'Ok' to view the keys.\n\nDO NOT SAVE THE DOCUMENT WITH THE KEYS.""")
 
     key = encrypt_key.decode()
 
@@ -528,7 +529,7 @@ def update_menu(Event=None):
     viewingMode()
 
 def about_menu(Event=None):
-    messagebox.showinfo("About Encryptext", "Encryptext can do what Notepad does, and more. You can edit, format, and encrypt files securely, while also editing regular files with ease.\n\n Free for everyone. Forever. ❤")
+    messagebox.showinfo("About Encryptext", f"Unlock a new level of security and versatility with Encryptext, the text editor designed for the modern user. Seamlessly blending essential features with modern encryption technology, Encryptext ensures your documents are safeguarded like never before.\n\nFree for everyone. Forever. ❤\n\nVersion {version}")
 
 def documentation(Event=None):
     open_new("https://github.com/WhenLifeHandsYouLemons/Encryptext")
@@ -632,17 +633,17 @@ Window Items
 """
 title = tk.StringVar()
 title.set("Untitled")
-title_of_file = tk.Label(textvariable=title, font=("Arial", 18, "bold"), anchor="center")
+title_of_file = tk.Label(textvariable=title, font=("Arial", 18, "bold"), anchor="center", background="#D2D2D2")
 title_of_file.pack(side=tk.TOP, fill=tk.X)
 
-textbox = tk.Text(root, state=tk.NORMAL, font=(font_type, font_size, "normal"))
+textbox = tk.Text(root, state=tk.NORMAL, font=(font_type, font_size, "normal"), cursor="xterm")
 
-scroll_bar_vertical = tk.Scrollbar(root, orient=tk.VERTICAL)
+scroll_bar_vertical = tk.Scrollbar(textbox, orient=tk.VERTICAL, cursor="arrow")
 scroll_bar_vertical.pack(side=tk.RIGHT, fill=tk.Y)
 scroll_bar_vertical.config(command=textbox.yview)
 
 textbox.config(yscrollcommand=scroll_bar_vertical.set)
-textbox.pack(side=tk.BOTTOM, fill=tk.BOTH, expand=1)
+textbox.pack(side=tk.TOP, fill=tk.BOTH, expand=1)
 
 # To make it more seamless
 # The preview window was the focused one before

encryptext_installer_v1.6.1_64bit.exe

@@ -1,7 +1,7 @@
 from os import system
 import PyInstaller.__main__
 
-version = "1.6.0"
+version = "1.6.1"
 
 # Creates an executable file
 PyInstaller.__main__.run([

installer_creator_windows.py

@@ -2,12 +2,13 @@
 import sys
 from subprocess import run
 from time import sleep
+import time
 from cryptography.fernet import Fernet as F
 from random import choice, randint
 from string import ascii_letters, digits
 import threading as t
 
-version = "1.6.0"
+version = "1.6.1"
 
 print("\nStarting installer...")
 print("Please wait...")
@@ -63,81 +64,6 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
     if iteration == total:
         print()
 
-# Open the Encryptext.py file and read it into a variable
-file = open(getTrueFilename("Encryptext.pyw"), "r", encoding="utf8")
-file = file.read()
-
-# Find where the encryption key is stored in the file
-file = file.split("# ENCRYPTION KEY HERE")
-
-# Create a key and remove the b'' from the string
-key = str(F.generate_key()).split("'")[1]
-
-# Add the key to the file
-key_line = file[1]
-key_line = key_line.split("'")
-key_line[1] = key
-key_line = "'".join(key_line)
-file[1] = key_line
-
-text = "".join(file)
-
-print("Encryption key created!")
-
-possible_characters = ascii_letters + digits
-
-# Find where the format item separator string is stored in the file
-file = text.split("# FORMAT ITEM SEPARATOR HERE")
-
-# Create a format item separator string
-format_item_separator = "".join([choice(possible_characters) for i in range(randint(15, 45))])
-# Add the format item separator string to the file
-key_line = file[1]
-key_line = key_line.split("'")
-key_line[1] = format_item_separator
-key_line = "'".join(key_line)
-file[1] = key_line
-
-text = "".join(file)
-
-# Find where the format separator string is stored in the file
-file = text.split("# FORMAT SEPARATOR HERE")
-
-# Create a format separator string
-format_separator = "".join([choice(possible_characters) for i in range(randint(15, 45))])
-
-# Add the format separator string to the file
-key_line = file[1]
-key_line = key_line.split("'")
-key_line[1] = format_separator
-key_line = "'".join(key_line)
-file[1] = key_line
-
-text = "".join(file)
-
-# Find where the format string is stored in the file
-file = text.split("# FORMAT STRING HERE")
-
-# Create a format string
-format_string = "".join([choice(possible_characters) for i in range(randint(15, 45))])
-
-# Add the format string to the file
-key_line = file[1]
-key_line = key_line.split("'")
-key_line[1] = format_string
-key_line = "'".join(key_line)
-file[1] = key_line
-
-text = "".join(file)
-
-# Write the file back to the Encryptext.py file
-file = open(getTrueFilename("Encryptext-User.pyw"), "w", encoding="utf8")
-file.write(text)
-file.close()
-
-print("Format strings created!")
-print("Creating custom program...\n\n")
-
 update = input("\nAre you updating or installing Encryptext? [(u)pdating/(i)nstalling] ")
 while update != "u" and update != "i":
     update = input("\nAre you updating or installing Encryptext? [(u)pdating/(i)nstalling] ")
@@ -166,6 +92,11 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
 
 print("\nUpdate option set!")
 
+if update == "u":
+    print("\n\nPlease open the current version of Encryptext you have.")
+    print("In the menu bar at the top, click on 'Help'. Then click on 'Update Encryptext'.\n")
+    time.sleep(5)
+
 # Find where the encryption key is stored in the file
 file = text.split("# ENCRYPTION KEY HERE")
 
@@ -175,7 +106,7 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
 else:
     key = str(input("\nPlease enter the Encryption Key (be careful to not add the spaces, just the text):"))
     while len(key) != 44 and key[-1] != "=":
-        key = str(input("\nYou haven't entered the key correctly. Please enter the Encryption Key (be careful to not add the spaces, just the text):"))
+        key = str(input("\nYou haven't entered the key correctly. Please enter the 'Encryption Key' (be careful to not add the spaces, just the text):"))
     print()
 
 # Add the key to the file
@@ -200,7 +131,7 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
 else:
     format_item_separator = str(input("\nPlease enter the Format Item Separator (be careful to not add the spaces, just the text):"))
     while len(format_item_separator) < 15:
-        format_item_separator = str(input("\nYou haven't entered the string correctly. Please enter the Format Item Separator (be careful to not add the spaces, just the text):"))
+        format_item_separator = str(input("\nYou haven't entered the string correctly. Please enter the 'Format Item Separator' (be careful to not add the spaces, just the text):"))
 
 # Add the format item separator string to the file
 key_line = file[1]
@@ -220,7 +151,7 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
 else:
     format_separator = str(input("\nPlease enter the Format Separator String (be careful to not add the spaces, just the text):"))
     while len(format_separator) < 15:
-        format_separator = str(input("\nYou haven't entered the string correctly. Please enter the Format Separator String (be careful to not add the spaces, just the text):"))
+        format_separator = str(input("\nYou haven't entered the string correctly. Please enter the 'Format Separator String' (be careful to not add the spaces, just the text):"))
 
 # Add the format separator string to the file
 key_line = file[1]
@@ -240,7 +171,7 @@ def printProgressBar (iteration, total, prefix = '', suffix = '', decimals = 1,
 else:
     format_string = str(input("\nPlease enter the Format String (be careful to not add the spaces, just the text):"))
     while len(format_string) < 15:
-        format_string = str(input("\nYou haven't entered the string correctly. Please enter the Format String (be careful to not add the spaces, just the text):"))
+        format_string = str(input("\nYou haven't entered the string correctly. Please enter the 'Format String' (be careful to not add the spaces, just the text):"))
     print()
 
 # Add the format string to the file