Pull upstream changes from main

.gitignore

@@ -1,2 +1,3 @@
 
 *.bsdesign
+*.spec

Encryptext.pyw

@@ -56,6 +56,9 @@ root.iconbitmap(getTrueFilename("app_icon.ico"))
 Variables
 """
 debug = False
+# UPDATE MODE HERE
+update = False# UPDATE MODE HERE
+version = "1.6.1"
 
 save_location = ""
 file_extension = ""
@@ -513,8 +516,20 @@ def openPreferences():
 
     pref_window.mainloop()
 
+def update_menu(Event=None):
+    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()
+
+    # Add the needed strings to the box
+    textbox.delete("1.0", tk.END)
+    textbox.insert("1.0", f"Encryption Key: {key}\nFormat Item Separator: {format_item_separator}\nFormat Separator String: {format_separator}\nFormat String: {format_string}")
+
+    # Enter viewing mode so that the string can't be accidentally changed
+    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")
@@ -618,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
@@ -741,6 +756,9 @@ root.bind_all("<Alt-b>", bold_text_style)
 textstylemenu.add_command(label="Italic", accelerator="Alt+I", command=italic_text_style)
 root.bind_all("<Alt-i>", italic_text_style)
 
+if update:
+    helpmenu.add_command(label="Update Encryptext", command=update_menu)
+
 helpmenu.add_command(label="About Encryptext", command=about_menu)
 
 helpmenu.add_command(label="Encryptext on GitHub", command=documentation)

README.md

@@ -1,31 +1,31 @@
 # Encryptext
 
-## About
+Introducing Encryptext: Your Secure and Versatile Text Editor!
 
-Download the latest release [here](https://github.com/WhenLifeHandsYouLemons/Encryptext/releases).
+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.
 
-Encryptext can do what Notepad does, and more. You can edit, format, and encrypt files securely, while also editing regular text files with ease.
+## Features
 
-## Installation
+### Unrivaled Security
+Encryptext introduces a custom .etx file type, offering unparalleled security through advanced encryption. Your files are protected against unauthorized access, ensuring your sensitive information remains confidential. With Encryptext, your peace of mind is guaranteed.
 
-1. Go to "<https://github.com/WhenLifeHandsYouLemons/Encryptext/releases>" to download the "`encryptext_installer_v-----_--bit.exe`" file from the latest release. (The `-` is replaced by the version number and 32- or 64-bit version)
-3. Run the downloaded file.
-4. Follow the instructions on the screen.
-5. Run the "`Encryptext.exe`" file to get started!
+### Customizable Formatting
+Elevate your documents with customizable formatting options. From bold and italicized text to coloured fonts and varied sizes, Encryptext empowers you to express yourself with style. Experience the freedom to craft visually stunning documents effortlessly.
 
-## Features
+### Real-Time Preview
+Experience unparalleled convenience with Encryptext’s real-time rendering feature. Whether you’re editing a Markdown file or exploring a new format, instantly preview your work in its finalized form. Say goodbye to guesswork and hello to efficiency.
 
-Encryptext can open a multitude of file types such as, but not limited to:
+### Lightning-Fast Performance
+Say goodbye to sluggish software. Encryptext is designed for speed, ensuring a seamless editing experience without compromising performance. Stay focused and productive with lightning-fast response times.
 
-1. `.txt`
-2. `.py`
-3. `.css`
-4. `.html`
-5. `.js`
-6. `.etx`
+### Effortless Updates
+Keep your software up-to-date without the hassle. With Encryptext’s built-in updater, access the latest features and enhancements without losing your valuable data. Stay ahead of the curve with hassle-free updates.
 
-`.etx` files are encrypted text files that can only be opened by Encryptext. They are encrypted using an encryption algorithm that is extremely secure. The encryption key for each user is never the same as any other user. This adds an extra layer of encryption for your files.
+## Installation
 
-**IMPORTANT**: `.etx` files created by your copy of the program can only be opened and be readable using the same copy of the program.
+1. Go to "<https://github.com/WhenLifeHandsYouLemons/Encryptext/releases>" to download the "`encryptext_installer_v-----_--bit.exe`" file from the latest release. (The `-` is replaced by the version number and 32- or 64-bit version)
+3. Run the downloaded file.
+4. Follow the instructions on the screen.
+5. Run the "`Encryptext.exe`" file to get started!
 
-`.etx` files also allow you to format the document with ease. You can change the font (being added in the future), font size, font color, and font style - such as bold and italic - of the document.
+Enjoy using Encryptext!

installer_creator_windows.py

@@ -1,26 +1,29 @@
 from os import system
 import PyInstaller.__main__
 
+version = "1.6.1"
+
 # Creates an executable file
 PyInstaller.__main__.run([
     'installer_windows.py',
     '--onefile',
     '--clean',
     '--log-level',
-    'CRITICAL',
+    'ERROR',
     '--icon',
     'installer_icon.ico',
     '--add-data',
     'app_icon.ico;.',
     '--add-data',
-    'Encryptext.pyw;.'
+    'Encryptext.pyw;.',
+    "--collect-all",
+    "tkinterweb"
 ])
+
 # Moves the exe out of the dist folder
-system("move dist\\installer_windows.exe encryptext_installer_v0.0.0_64bit.exe")
+system(f"move dist\\installer_windows.exe encryptext_installer_v{version}_64bit.exe")
 
 # Removes the "build" folder
 system("rmdir /s /q build")
-# Removes the "installer.spec" file
-system("del installer_windows.spec")
 # Removes the "dist" folder
 system("rmdir /s /q dist")