Code overhaul

Switched to Tkinter, added syntax highlighter, line numbers, dark theme and more.

Author: AlexMartin17

README.md

@@ -1,9 +1,20 @@
 # amdiff
 
-ASCII diff tool written in Python 3 using PyQt<br>
+ASCII diff tool written in Python 3<br>
 
-pip3 install pyqt5<br>
+Supporting Python syntax highlighting
+<br>
+<br>
+Download Windows executable at -
+Download macOS executable at -
+Linux users can run it with ./bin/amdiff
+<br>
+Supports command line syntax ./amdiff &lt;file1&gt; &lt;file2&gt;
+<br>
 
-<img src="https://raw.githubusercontent.com/AlexMartin17/amdiff-ascii-diff-tool/master/img/mainui.JPG">
-<img src="https://raw.githubusercontent.com/AlexMartin17/amdiff-ascii-diff-tool/master/img/files.JPG">
-<img src="https://raw.githubusercontent.com/AlexMartin17/amdiff-ascii-diff-tool/master/img/differenceui.JPG">
+<img src="D:\Alex-Martin\projects\software_engineering\python\amdiff-ascii-diff-tool\img\examples\example_files.JPG">
+<img src="D:\Alex-Martin\projects\software_engineering\python\amdiff-ascii-diff-tool\img\examples\example_files2.png">
+
+<img src="D:\Alex-Martin\projects\software_engineering\python\amdiff-ascii-diff-tool\img\examples\gui1.png">
+<img src="D:\Alex-Martin\projects\software_engineering\python\amdiff-ascii-diff-tool\img\examples\gui2.png">
+<img src="D:\Alex-Martin\projects\software_engineering\python\amdiff-ascii-diff-tool\img\examples\gui3.png">

bin/amdiff

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 ../src/main.py "$@"

bin/win32/amdiff.exe

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language id="python" name="Python">
+  <styles>
+    <style name="self" foreground="#BD11B8" />
+    <style name="False" foreground="#FF5733" />
+    <style name="None" foreground="#FF5733" />
+    <style name="True" foreground="#FF5733" />
+    <style name="and" foreground="#FF5733" />
+    <style name="as" foreground="#FF5733" />
+    <style name="assert" foreground="#FF5733" />
+    <style name="async" foreground="#FF5733" />
+    <style name="await" foreground="#FF5733" />
+    <style name="break" foreground="#FF5733" />
+    <style name="class" foreground="#FF5733" />
+    <style name="continue" foreground="#FF5733" />
+    <style name="def " foreground="#FF5733" />
+    <style name="del" foreground="#FF5733" />
+    <style name="elif" foreground="#FF5733" />
+    <style name="else" foreground="#FF5733" />
+    <style name="except" foreground="#FF5733" />
+    <style name="finally" foreground="#FF5733" />
+    <style name="for" foreground="#FF5733" />
+    <style name="from" foreground="#FF5733" />
+    <style name="global" foreground="#FF5733" />
+    <style name="if" foreground="#FF5733" />
+    <style name="import" foreground="#FF5733" />
+    <style name="in" foreground="#FF5733" />
+    <style name="is" foreground="#FF5733" />
+    <style name="lambda" foreground="#FF5733" />
+    <style name="nonlocal" foreground="#FF5733" />
+    <style name="not" foreground="#FF5733" />
+    <style name="or" foreground="#FF5733" />
+    <style name="pass" foreground="#FF5733" />
+    <style name="raise" foreground="#FF5733" />
+    <style name="return" foreground="#FF5733" />
+    <style name="try" foreground="#FF5733" />
+    <style name="while" foreground="#FF5733" />
+    <style name="with" foreground="#FF5733" />
+    <style name="yield" foreground="#FF5733" />
+    <style name="print" foreground="#FF5733" />
+  </styles>
+</language>

config/python.xml

@@ -0,0 +1,29 @@
+class Diff:
+    def __init__(self):
+        self.root = tk.Tk()
+        self.root.title("amdiff")
+
+        self.window_width = 265
+        self.window_height = 120
+
+        self.screen_width = self.root.winfo_screenwidth()
+        self.screen_height = self.root.winfo_screenheight()
+
+        x = (self.screen_width - self.window_width) // 2
+        y = (self.screen_height - self.window_height) // 2
+
+        self.root.geometry(f"{self.window_width}x{self.window_height}+{int(x)}+{int(y)}")
+        self.root.resizable(False, False)
+
+        self.entry1 = tk.Entry(self.root, width=30)
+        self.entry1.grid(row=1, column=0, padx=10, pady=10)
+        self.button1 = tk.Button(self.root, text="File 1", command=lambda: self.browse_file(1))
+        self.button1.grid(row=1, column=1, padx=10)
+
+        self.entry2 = tk.Entry(self.root, width=30)
+        self.entry2.grid(row=2, column=0, padx=10, pady=10)
+        self.button2 = tk.Button(self.root, text="File 2", command=lambda: self.browse_file(2))
+        self.button2.grid(row=2, column=1, padx=10)
+
+        self.button3 = tk.Button(self.root, text="Diff", width=10, command=self.diff)
+        self.button3.grid(row=3, column=0, padx=10)

examples/example_code1.py

@@ -0,0 +1,28 @@
+class Diff:
+    def __init__(self):
+        self.root = tk.Tk()
+        self.root.title("amdiff")
+
+        self.window_width = 265
+        self.window_height = 120
+
+        self.screen_width = self.root.winfo_screenwidth()
+        self.screen_height = self.root.winfo_screenheight()
+
+        x = (self.screen_width - self.window_width) // 2
+        y = (self.screen_height - self.window_height) // 2
+
+        self.root.geometry(f"{self.window_width}x{self.window_height}+{int(x)}+{int(y)}")
+        self.root.resizable(False, False)
+
+        self.entry1 = tk.Entry(self.root, width=30)
+        self.entry1.grid(row=1, column=0, padx=10, pady=10)
+        self.button1 = tk.Button(self.root, text="File 1", command=lambda: self.browse_file(1))
+
+        self.entry2 = tk.Entry(self.root, width=30)
+        self.entry2.grid(row=2, column=0, padx=10, pady=10)
+        self.button2 = tk.Button(self.root, text="File 2", command=lambda: self.browse_file(2))
+
+        self.button4 = tk.Button(self.root, text="Diff", width=10, command=self.diff)
+        self.button4.grid(row=3, column=0, padx=10)
+        print("Say what?")

examples/example_code2.py

@@ -0,0 +1,7 @@
+Diff tool written in Python3
+Examples:
+
+Same line
+
+Modified line
+Removed line

examples/example_file1.txt

@@ -0,0 +1,6 @@
+Diff tool written in Python3 using Tk
+Examples:
+
+Same line
+Added line
+Modified lInE