Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 307057a387 | |||
| 4917e5e9bd | |||
| 3f6b22abc8 | |||
| 6785a8f46d | |||
| dd51921784 | |||
| 15dc182a37 | |||
| 057e0a02de | |||
| 6c8ce7b208 | |||
| bcb4bb90d5 | |||
| 00a1e00c86 | |||
| 3d3a833d4f | |||
| 70b5fe5ef7 | |||
| 325f9214c7 | |||
| b50e0df01b | |||
| 8c5cb753cf | |||
| cca474b4c8 | |||
| bd1564540d | |||
| ca14ecea76 | |||
| 748519f45f | |||
| 1ee64f5d95 | |||
| 32eb0ee6c1 | |||
| 26e1d1f2da | |||
| dc86d8ce01 | |||
| 7ef1fca873 | |||
| e3d8b94bd6 | |||
| 889ec19c7a | |||
| d9ae7153a5 | |||
| 043cb0a626 | |||
| d9fee6dc57 | |||
| aae762ba28 | |||
| 72b4614d4d | |||
| bb31a52934 | |||
| 5e071503d0 | |||
| 2f30baeed2 | |||
| d23408ab47 | |||
| e3c7daddd3 | |||
| 974fce8a26 | |||
| 9c6669f349 | |||
| 139b951087 | |||
| 05599acd56 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -166,3 +166,7 @@ cython_debug/
|
|||||||
/.idea/modules.xml
|
/.idea/modules.xml
|
||||||
/.idea/inspectionProfiles/profiles_settings.xml
|
/.idea/inspectionProfiles/profiles_settings.xml
|
||||||
/.idea/inspectionProfiles/Project_Default.xml
|
/.idea/inspectionProfiles/Project_Default.xml
|
||||||
|
|
||||||
|
/deb-package/brovski-adressetiketten/usr/local/bin/brovski-adress-etiketten-verwaltung
|
||||||
|
/deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten
|
||||||
|
/brovski-adressetiketten.deb
|
||||||
|
|||||||
20
compile.sh
Executable file
20
compile.sh
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
if [ $VIRTUAL_ENV=="" ]
|
||||||
|
then
|
||||||
|
source venv/bin/activate
|
||||||
|
fi
|
||||||
|
version=$(cat version.txt)
|
||||||
|
echo "current version set to: $version"
|
||||||
|
new_version=""
|
||||||
|
read -r -p "Enter new version or empty to keep the current: " new_version
|
||||||
|
if [ "$new_version" != "" ]
|
||||||
|
then
|
||||||
|
echo "$new_version" | tee version.txt
|
||||||
|
fi
|
||||||
|
sed -i "s/VERSION = '[0-9]\.[0-9]\w'/VERSION = '$(cat version.txt)'/g" src/brovski-adress-etiketten-verwaltung.py
|
||||||
|
sed -i "s/Version: [0-9]\.[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control
|
||||||
|
|
||||||
|
pyinstaller --clean --onefile src/brovski-adress-etiketten-verwaltung.py
|
||||||
|
cp dist/brovski-adress-etiketten-verwaltung deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten
|
||||||
|
dpkg-deb --build deb-package/brovski-adressetiketten
|
||||||
|
mv deb-package/brovski-adressetiketten.deb ./
|
||||||
5
deb-package/brovski-adressetiketten/DEBIAN/control
Normal file
5
deb-package/brovski-adressetiketten/DEBIAN/control
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
Package: brovski-adressetiketten
|
||||||
|
Version: 0.6a
|
||||||
|
Maintainer: Ovski
|
||||||
|
Architecture: all
|
||||||
|
Description: manage csv files for glables address labels
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Brovski Adress Etiketten
|
Name=Brovski Adress Etiketten
|
||||||
GenericName=Brovski Adress Etiketten
|
GenericName=Brovski Adress Etiketten
|
||||||
Icon=/home/sroth/app/brovski-adress-etiketten-verwaltung/icon.svg
|
Icon=/usr/share/icons/hicolor/512x512/apps/brovski-adressetiketten.svg
|
||||||
Exec=/home/sroth/app/brovski-adress-etiketten-verwaltung/brovski-adress-etiketten-verwaltung
|
Exec=/usr/local/bin/brovski-adressetiketten
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Utility
|
Categories=Utility
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
@@ -1,3 +0,0 @@
|
|||||||
alpha muster-firma,otti,tottistrasse,1234 daheim
|
|
||||||
c3000,erich roth,zentralstrasse 120,5430 wettingen
|
|
||||||
muster-firma,Peter Muster,Peter-Musterstrasse 1,1234 Ort
|
|
||||||
|
@@ -2,131 +2,13 @@ import csv
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import tkinter as tk
|
import tkinter as tk
|
||||||
from tkinter import font, filedialog
|
|
||||||
from configparser import NoSectionError, NoOptionError
|
from configparser import NoSectionError, NoOptionError
|
||||||
from configparser import ConfigParser
|
|
||||||
from tkinter import messagebox
|
from tkinter import messagebox
|
||||||
from tkinter import ttk
|
from tkinter import ttk
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from PyInstaller.utils.hooks import collect_data_files
|
from config import Config
|
||||||
|
from windows import SettingsWindow, EditRecord, Window, show_error
|
||||||
|
|
||||||
class SettingsWindow(tk.Toplevel):
|
|
||||||
def __init__(self, root: tk.Tk):
|
|
||||||
super().__init__()
|
|
||||||
self.root = root
|
|
||||||
self.protocol("WM_DELETE_WINDOW", self.close_window)
|
|
||||||
self.geometry(f"500x330+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
|
|
||||||
|
|
||||||
self.config = Config()
|
|
||||||
|
|
||||||
self.json_file = tk.StringVar()
|
|
||||||
self.csv_file = tk.StringVar()
|
|
||||||
|
|
||||||
title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
|
|
||||||
tk.Label(self, text="Einstellungen", font=title).pack(pady=20)
|
|
||||||
|
|
||||||
path_frame = tk.Frame(self)
|
|
||||||
path_frame.pack(pady=(10, 40))
|
|
||||||
|
|
||||||
tk.Label(path_frame, text="Datenpfad JSON Datei").grid(row=0, column=0)
|
|
||||||
tk.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0)
|
|
||||||
tk.Button(path_frame, text="Pfad", command=self.set_json_path).grid(row=1, column=1)
|
|
||||||
|
|
||||||
tk.Label(path_frame, text="Datenpfad CSV Export Datei").grid(row=2, column=0)
|
|
||||||
tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0)
|
|
||||||
tk.Button(path_frame, text="Pfad", command=self.set_csv_path).grid(row=3, column=1)
|
|
||||||
|
|
||||||
bottom_frame = tk.Frame(self)
|
|
||||||
bottom_frame.pack()
|
|
||||||
tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
|
|
||||||
tk.Button(bottom_frame, text="Abbrechen", command=self.cancel).pack(side=tk.LEFT)
|
|
||||||
|
|
||||||
self.load_config()
|
|
||||||
|
|
||||||
def set_json_path(self):
|
|
||||||
self.json_file.set(filedialog.askdirectory(initialdir="~/", title="Datenpfad JSON Datei"))
|
|
||||||
|
|
||||||
def set_csv_path(self):
|
|
||||||
self.csv_file.set(filedialog.askdirectory(initialdir="~/", title="Datenpfad CSV Datei"))
|
|
||||||
|
|
||||||
def load_config(self):
|
|
||||||
try:
|
|
||||||
self.json_file.set(self.config.get("json", "path"))
|
|
||||||
except NoSectionError:
|
|
||||||
self.config.add_section("json")
|
|
||||||
self.config.set("json", "path", "")
|
|
||||||
except NoOptionError:
|
|
||||||
self.config.set("json", "path", "")
|
|
||||||
|
|
||||||
try:
|
|
||||||
self.csv_file.set(self.config.get("csv", "path"))
|
|
||||||
except NoSectionError:
|
|
||||||
self.config.add_section("csv")
|
|
||||||
self.config.set("csv", "path", "")
|
|
||||||
except NoOptionError:
|
|
||||||
self.config.set("csv", "path", "")
|
|
||||||
|
|
||||||
def ok(self):
|
|
||||||
self.config.set("json", "path", self.json_file.get())
|
|
||||||
self.config.set("csv", "path", self.csv_file.get())
|
|
||||||
self.close_window()
|
|
||||||
|
|
||||||
def cancel(self):
|
|
||||||
self.close_window()
|
|
||||||
|
|
||||||
def close_window(self):
|
|
||||||
if self.json_file.get() == "" or self.csv_file.get() == "":
|
|
||||||
messagebox.showwarning(title="Fehlerhafte Konfiguration", message="Pfad für JSON oder CSV Datei fehlt")
|
|
||||||
return
|
|
||||||
self.destroy_window()
|
|
||||||
|
|
||||||
def destroy_window(self):
|
|
||||||
self.root.update()
|
|
||||||
self.root.deiconify()
|
|
||||||
self.destroy()
|
|
||||||
|
|
||||||
|
|
||||||
class Config:
|
|
||||||
parser: ConfigParser
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
"""
|
|
||||||
Config parser reading config.ini
|
|
||||||
|
|
||||||
Attributes:
|
|
||||||
self.parser: ConfigParser holding list of sections and options
|
|
||||||
self.__filename: Path and name to the config file
|
|
||||||
"""
|
|
||||||
self.parser = ConfigParser()
|
|
||||||
|
|
||||||
self.config_file_name = "files/config.ini"
|
|
||||||
self.root_path = os.path.dirname(os.path.abspath(__file__))
|
|
||||||
self.config_file = os.path.join(self.root_path, self.config_file_name)
|
|
||||||
|
|
||||||
self._load()
|
|
||||||
|
|
||||||
def _save(self):
|
|
||||||
with open(self.config_file, 'w') as outfile:
|
|
||||||
self.parser.write(outfile)
|
|
||||||
|
|
||||||
def _load(self):
|
|
||||||
self.parser.read(self.config_file)
|
|
||||||
|
|
||||||
def add_section(self, section):
|
|
||||||
self._load()
|
|
||||||
self.parser.add_section(section)
|
|
||||||
self._save()
|
|
||||||
|
|
||||||
def set(self, section: str, option: str, value: str):
|
|
||||||
self._load()
|
|
||||||
self.parser.set(section, option, value)
|
|
||||||
self._save()
|
|
||||||
|
|
||||||
def get(self, section: str, option: str):
|
|
||||||
self._load()
|
|
||||||
return self.parser.get(section, option)
|
|
||||||
|
|
||||||
|
|
||||||
class Application:
|
class Application:
|
||||||
@@ -135,8 +17,9 @@ class Application:
|
|||||||
x_offset = 700
|
x_offset = 700
|
||||||
y_offset = 200
|
y_offset = 200
|
||||||
width = 1050
|
width = 1050
|
||||||
height = 1000
|
height = 700
|
||||||
title = "Brovski Adress-Etiketten Verwaltung"
|
VERSION = '0.6a'
|
||||||
|
title = f"Brovski Adress-Etiketten Verwaltung {VERSION}"
|
||||||
|
|
||||||
self.root = tk.Tk(className="BrovskiAdressEtiketten")
|
self.root = tk.Tk(className="BrovskiAdressEtiketten")
|
||||||
self.root.title(title)
|
self.root.title(title)
|
||||||
@@ -161,8 +44,10 @@ class Application:
|
|||||||
|
|
||||||
# leave application if settings are bad
|
# leave application if settings are bad
|
||||||
if not self.config_good:
|
if not self.config_good:
|
||||||
self.show_error("Fehler Konfiguration",
|
show_error(message_title="Fehler Konfiguration",
|
||||||
"Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini")
|
message="Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini",
|
||||||
|
parent=self.root
|
||||||
|
)
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
top_frame = tk.Frame(self.root)
|
top_frame = tk.Frame(self.root)
|
||||||
@@ -171,35 +56,10 @@ class Application:
|
|||||||
tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT)
|
tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT)
|
||||||
tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT)
|
tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT)
|
||||||
tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT)
|
tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT)
|
||||||
|
tk.Button(top_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).pack(side=tk.LEFT)
|
||||||
tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT)
|
tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT)
|
||||||
tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
|
tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
|
||||||
|
|
||||||
self.aktiv = tk.StringVar()
|
|
||||||
self.firma = tk.StringVar()
|
|
||||||
self.name = tk.StringVar()
|
|
||||||
self.strasse = tk.StringVar()
|
|
||||||
self.plz_ort = tk.StringVar()
|
|
||||||
|
|
||||||
edit_frame = tk.Frame(self.root)
|
|
||||||
edit_frame.pack(side=tk.TOP, fill=tk.X)
|
|
||||||
tk.Label(edit_frame, text="Aktiv").grid(row=0, column=0)
|
|
||||||
tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
|
|
||||||
tk.Label(edit_frame, text="Name").grid(row=0, column=2)
|
|
||||||
tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
|
|
||||||
tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
|
|
||||||
edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
|
|
||||||
edit_aktiv.grid(row=1, column=0)
|
|
||||||
edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
|
|
||||||
edit_firma.grid(row=1, column=1)
|
|
||||||
edit_name = tk.Entry(edit_frame, textvariable=self.name)
|
|
||||||
edit_name.grid(row=1, column=2)
|
|
||||||
edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
|
|
||||||
edit_strasse.grid(row=1, column=3)
|
|
||||||
edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
|
|
||||||
edit_plz_ort.grid(row=1, column=4)
|
|
||||||
tk.Button(edit_frame, text="Update", command=self.update_record, width=button_width).grid(row=1, column=5)
|
|
||||||
tk.Button(edit_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).grid(row=1, column=6)
|
|
||||||
|
|
||||||
data_frame = tk.Frame(self.root, bg="teal")
|
data_frame = tk.Frame(self.root, bg="teal")
|
||||||
data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
|
data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
|
||||||
|
|
||||||
@@ -217,6 +77,8 @@ class Application:
|
|||||||
scrollbar.pack(side=tk.LEFT, fill=tk.Y)
|
scrollbar.pack(side=tk.LEFT, fill=tk.Y)
|
||||||
|
|
||||||
self.table.bind("<ButtonRelease-1>", self.mouse_click)
|
self.table.bind("<ButtonRelease-1>", self.mouse_click)
|
||||||
|
self.table.bind("<Return>", self.mouse_click_double)
|
||||||
|
self.table.bind("<Double-1>", self.mouse_click_double)
|
||||||
|
|
||||||
self._load_json_file()
|
self._load_json_file()
|
||||||
|
|
||||||
@@ -226,6 +88,8 @@ class Application:
|
|||||||
try:
|
try:
|
||||||
self.json_path = self.config.get("json", "path")
|
self.json_path = self.config.get("json", "path")
|
||||||
self.csv_path = self.config.get("csv", "path")
|
self.csv_path = self.config.get("csv", "path")
|
||||||
|
if self.json_path == "" or self.csv_path == "":
|
||||||
|
raise ValueError("Empty JSON or CSV path")
|
||||||
self.config_good = True
|
self.config_good = True
|
||||||
except NoSectionError:
|
except NoSectionError:
|
||||||
self.show_config_error()
|
self.show_config_error()
|
||||||
@@ -233,24 +97,23 @@ class Application:
|
|||||||
except NoOptionError:
|
except NoOptionError:
|
||||||
self.show_config_error()
|
self.show_config_error()
|
||||||
self.show_settings()
|
self.show_settings()
|
||||||
|
except ValueError:
|
||||||
|
self.show_config_error()
|
||||||
|
self.show_settings()
|
||||||
|
|
||||||
def show_config_error(self):
|
def show_config_error(self):
|
||||||
if self.show_error("Fehlerhafte Konfiguration",
|
show_error(message_title="Fehlerhafte Konfiguration",
|
||||||
"Konnte benötigte Parameter in config.ini nicht finden"):
|
message="Konnte benötigte Parameter in config.ini nicht finden",
|
||||||
print("Fehlerhafte Konfiguration")
|
parent=self.root)
|
||||||
|
|
||||||
def on_close(self):
|
def on_close(self):
|
||||||
self.root.destroy()
|
self.root.destroy()
|
||||||
|
|
||||||
def show_settings(self):
|
def show_settings(self):
|
||||||
self.root.withdraw()
|
settings = self.open_window_settings()
|
||||||
settings = SettingsWindow(self.root)
|
|
||||||
settings.wait_window()
|
settings.wait_window()
|
||||||
|
|
||||||
def insert_record(self):
|
def insert_record(self):
|
||||||
if self.current_record is not None:
|
|
||||||
self.clear_entry_fields()
|
|
||||||
children = self.table.get_children()
|
|
||||||
values = [
|
values = [
|
||||||
"x",
|
"x",
|
||||||
"Firma",
|
"Firma",
|
||||||
@@ -258,8 +121,11 @@ class Application:
|
|||||||
"Strasse",
|
"Strasse",
|
||||||
"Plz/Ort",
|
"Plz/Ort",
|
||||||
]
|
]
|
||||||
self.table.insert('', 'end', values=values)
|
last_iid = self.table.get_children()[-1]
|
||||||
|
next_iid = int(last_iid) + 1
|
||||||
|
self.table.insert('', 'end', iid=next_iid, values=values)
|
||||||
self._save_json_file()
|
self._save_json_file()
|
||||||
|
self.deselect_tree()
|
||||||
|
|
||||||
def delete_record(self):
|
def delete_record(self):
|
||||||
if self.current_record is None:
|
if self.current_record is None:
|
||||||
@@ -270,23 +136,19 @@ class Application:
|
|||||||
"Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden"):
|
"Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden"):
|
||||||
self.table.delete(self.current_record)
|
self.table.delete(self.current_record)
|
||||||
|
|
||||||
self.clear_entry_fields()
|
self.deselect_tree()
|
||||||
self._save_json_file()
|
self._save_json_file()
|
||||||
|
|
||||||
def update_record(self):
|
def update_record(self, data: list):
|
||||||
if self.current_record is None:
|
if self.current_record is None:
|
||||||
return
|
return
|
||||||
values = {
|
values = {}
|
||||||
0: self.aktiv.get(),
|
for idx, value in enumerate(data):
|
||||||
1: self.firma.get(),
|
values[str(idx)] = value.get()
|
||||||
2: self.name.get(),
|
|
||||||
3: self.strasse.get(),
|
|
||||||
4: self.plz_ort.get(),
|
|
||||||
}
|
|
||||||
for key, value in values.items():
|
for key, value in values.items():
|
||||||
self.table.set(self.current_record, key, value)
|
self.table.set(self.current_record, key, value)
|
||||||
|
|
||||||
self.clear_entry_fields()
|
|
||||||
self._save_json_file()
|
self._save_json_file()
|
||||||
|
|
||||||
def toggle_active(self):
|
def toggle_active(self):
|
||||||
@@ -294,25 +156,33 @@ class Application:
|
|||||||
if len(items) == 0:
|
if len(items) == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
for id in items:
|
for record_id in items:
|
||||||
values = self.table.item(id, "values")
|
values = self.table.item(record_id, "values")
|
||||||
active = values[0]
|
active = values[0]
|
||||||
new_active = "x" if active == "" else ""
|
new_active = "x" if active == "" else ""
|
||||||
self.table.set(id, "0", new_active)
|
self.table.set(record_id, "0", new_active)
|
||||||
|
|
||||||
self.clear_entry_fields()
|
|
||||||
self._save_json_file()
|
self._save_json_file()
|
||||||
|
|
||||||
def clear_entry_fields(self):
|
def deselect_tree(self):
|
||||||
entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
|
while len(self.table.selection()) > 0:
|
||||||
for entry in entry_var_list:
|
self.table.selection_remove(self.table.selection()[0])
|
||||||
entry.set("")
|
|
||||||
self.current_record = None
|
self.current_record = None
|
||||||
|
|
||||||
def mouse_click(self, event):
|
def mouse_click(self, event):
|
||||||
|
self.current_record = self.table.focus()
|
||||||
region = self.table.identify("region", event.x, event.y)
|
region = self.table.identify("region", event.x, event.y)
|
||||||
|
match region:
|
||||||
|
case "heading":
|
||||||
|
self.click_on_header(event)
|
||||||
|
|
||||||
if region == "heading":
|
def mouse_click_double(self, event):
|
||||||
|
region = self.table.identify("region", event.x, event.y)
|
||||||
|
match region:
|
||||||
|
case "cell":
|
||||||
|
self.click_on_cell()
|
||||||
|
|
||||||
|
def click_on_header(self, event):
|
||||||
column = self.table.identify_column(event.x)
|
column = self.table.identify_column(event.x)
|
||||||
match column:
|
match column:
|
||||||
case "#1":
|
case "#1":
|
||||||
@@ -334,12 +204,10 @@ class Application:
|
|||||||
print(column)
|
print(column)
|
||||||
self.sort_order = not self.sort_order
|
self.sort_order = not self.sort_order
|
||||||
|
|
||||||
if region == "cell":
|
def click_on_cell(self):
|
||||||
self.current_record = self.table.focus()
|
self.current_record = self.table.focus()
|
||||||
values = self.table.item(self.current_record, "values")
|
values = self.table.item(self.current_record, "values")
|
||||||
entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
|
self.open_window_edit_records(values)
|
||||||
for i in range(len(values)):
|
|
||||||
entry_var_list[i].set(values[i])
|
|
||||||
|
|
||||||
def _load_json_file(self):
|
def _load_json_file(self):
|
||||||
try:
|
try:
|
||||||
@@ -347,9 +215,10 @@ class Application:
|
|||||||
self.address_list = json.load(f)
|
self.address_list = json.load(f)
|
||||||
self.address_list.sort(key=lambda x: (x[0], x[1]))
|
self.address_list.sort(key=lambda x: (x[0], x[1]))
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
self.show_error(
|
show_error(
|
||||||
message_title="Datei nicht gefunden",
|
message_title="Datei nicht gefunden",
|
||||||
message=f"{self.json_file_name} nicht gefunden, erstelle leere Datei unter {self.json_path}"
|
message=f"{self.json_file_name} nicht gefunden, erstelle leere Datei unter {self.json_path}",
|
||||||
|
parent=self.root
|
||||||
)
|
)
|
||||||
self.address_list = [["", "firma", "name", "adresse", "plz/ort"]]
|
self.address_list = [["", "firma", "name", "adresse", "plz/ort"]]
|
||||||
with open(self.json_file, "w", encoding="utf-8") as f:
|
with open(self.json_file, "w", encoding="utf-8") as f:
|
||||||
@@ -362,8 +231,10 @@ class Application:
|
|||||||
with open(self.json_file, "w", encoding="utf-8") as f:
|
with open(self.json_file, "w", encoding="utf-8") as f:
|
||||||
json.dump(self.address_list, f, indent=4, sort_keys=True)
|
json.dump(self.address_list, f, indent=4, sort_keys=True)
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
self.show_error(
|
show_error(
|
||||||
message_title="Unexpected Error: File not found?!", message=f"{self.json_file_name} not found"
|
message_title="Unexpected Error: File not found?!",
|
||||||
|
message=f"{self.json_file_name} not found",
|
||||||
|
parent=self.root
|
||||||
)
|
)
|
||||||
|
|
||||||
def export_csv(self):
|
def export_csv(self):
|
||||||
@@ -373,12 +244,15 @@ class Application:
|
|||||||
for address in self.address_list:
|
for address in self.address_list:
|
||||||
if address[0] != "x":
|
if address[0] != "x":
|
||||||
continue
|
continue
|
||||||
del address[0]
|
if address[1] == "":
|
||||||
if address[0] == "":
|
writer.writerow(address[2:])
|
||||||
del address[0]
|
else:
|
||||||
writer.writerow(address)
|
writer.writerow(address[1:])
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
self.show_error("Unexpected error", f"Could not write file {self.csv_file}")
|
show_error(message_title="Unexpected error",
|
||||||
|
message=f"Could not write file {self.csv_file}",
|
||||||
|
parent=self.root
|
||||||
|
)
|
||||||
|
|
||||||
def populate_table(self):
|
def populate_table(self):
|
||||||
self.delete_all_table_items()
|
self.delete_all_table_items()
|
||||||
@@ -396,9 +270,20 @@ class Application:
|
|||||||
for item in self.table.get_children():
|
for item in self.table.get_children():
|
||||||
self.table.delete(item)
|
self.table.delete(item)
|
||||||
|
|
||||||
@staticmethod
|
def open_window_settings(self):
|
||||||
def show_error(message_title: str, message: str):
|
window = SettingsWindow(self, self.root)
|
||||||
messagebox.showwarning(title=message_title, message=message)
|
window.wm_transient(self.root)
|
||||||
|
window.wait_visibility()
|
||||||
|
window.grab_set()
|
||||||
|
return window
|
||||||
|
|
||||||
|
def open_window_edit_records(self, data):
|
||||||
|
window = EditRecord(self, self.root, data)
|
||||||
|
window.wm_transient(self.root)
|
||||||
|
window.wait_visibility()
|
||||||
|
window.grab_set()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
pyinstaller --clean --add-data=files/config.ini:files brovski-adress-etiketten-verwaltung.py
|
|
||||||
45
src/config.py
Normal file
45
src/config.py
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import os
|
||||||
|
from configparser import ConfigParser
|
||||||
|
|
||||||
|
|
||||||
|
class Config:
|
||||||
|
parser: ConfigParser
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
"""
|
||||||
|
Config parser reading config.ini
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
self.parser: ConfigParser holding list of sections and options
|
||||||
|
self.__filename: Path and name to the config file
|
||||||
|
"""
|
||||||
|
self.parser = ConfigParser()
|
||||||
|
|
||||||
|
home_path = os.environ["HOME"]
|
||||||
|
full_path = os.path.join(home_path, ".config", "brovski-adress-etiketten" )
|
||||||
|
if not os.path.exists(full_path):
|
||||||
|
os.makedirs(full_path)
|
||||||
|
self.config_file = os.path.join(full_path, "config.ini")
|
||||||
|
|
||||||
|
self._load()
|
||||||
|
|
||||||
|
def _save(self):
|
||||||
|
with open(self.config_file, 'w') as outfile:
|
||||||
|
self.parser.write(outfile)
|
||||||
|
|
||||||
|
def _load(self):
|
||||||
|
self.parser.read(self.config_file)
|
||||||
|
|
||||||
|
def add_section(self, section):
|
||||||
|
self._load()
|
||||||
|
self.parser.add_section(section)
|
||||||
|
self._save()
|
||||||
|
|
||||||
|
def set(self, section: str, option: str, value: str):
|
||||||
|
self._load()
|
||||||
|
self.parser.set(section, option, value)
|
||||||
|
self._save()
|
||||||
|
|
||||||
|
def get(self, section: str, option: str):
|
||||||
|
self._load()
|
||||||
|
return self.parser.get(section, option)
|
||||||
148
src/windows.py
Normal file
148
src/windows.py
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
import tkinter as tk
|
||||||
|
from configparser import NoSectionError, NoOptionError
|
||||||
|
from tkinter import font, filedialog, messagebox
|
||||||
|
|
||||||
|
from config import Config
|
||||||
|
|
||||||
|
|
||||||
|
def show_error(message_title: str, message: str, parent: tk.Tk | tk.Toplevel):
|
||||||
|
messagebox.showwarning(
|
||||||
|
title=message_title,
|
||||||
|
message=message,
|
||||||
|
parent=parent
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Window(tk.Toplevel):
|
||||||
|
def __init__(self, parent, root: tk.Tk):
|
||||||
|
super().__init__(root)
|
||||||
|
self.parent = parent
|
||||||
|
self.root = root
|
||||||
|
self.protocol("WM_DELETE_WINDOW", self.close_window)
|
||||||
|
self.bind("<Escape>", self.close_window)
|
||||||
|
|
||||||
|
def close_window(self, event = None):
|
||||||
|
self._destroy_window()
|
||||||
|
|
||||||
|
def _destroy_window(self):
|
||||||
|
self.root.update()
|
||||||
|
self.destroy()
|
||||||
|
|
||||||
|
|
||||||
|
class EditRecord(Window):
|
||||||
|
def __init__(self, parent, root: tk.Tk, data: tuple):
|
||||||
|
super().__init__(parent, root)
|
||||||
|
self.bind("<Return>", self._update)
|
||||||
|
|
||||||
|
self.data = data
|
||||||
|
button_width = 8
|
||||||
|
self.title("Adresse bearbeiten")
|
||||||
|
self.aktiv = tk.StringVar()
|
||||||
|
self.firma = tk.StringVar()
|
||||||
|
self.name = tk.StringVar()
|
||||||
|
self.strasse = tk.StringVar()
|
||||||
|
self.plz_ort = tk.StringVar()
|
||||||
|
|
||||||
|
self.field_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
|
||||||
|
for argument, field in zip(self.data, self.field_list):
|
||||||
|
field.set(argument)
|
||||||
|
|
||||||
|
edit_frame = tk.Frame(self)
|
||||||
|
edit_frame.pack(side=tk.TOP, fill=tk.X, pady=20, padx=20)
|
||||||
|
tk.Label(edit_frame, text="Aktiv", anchor=tk.W).grid(row=0, column=0)
|
||||||
|
tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
|
||||||
|
tk.Label(edit_frame, text="Name").grid(row=0, column=2)
|
||||||
|
tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
|
||||||
|
tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
|
||||||
|
edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
|
||||||
|
edit_aktiv.grid(row=1, column=0)
|
||||||
|
edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
|
||||||
|
edit_firma.grid(row=1, column=1)
|
||||||
|
edit_name = tk.Entry(edit_frame, textvariable=self.name)
|
||||||
|
edit_name.grid(row=1, column=2)
|
||||||
|
edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
|
||||||
|
edit_strasse.grid(row=1, column=3)
|
||||||
|
edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
|
||||||
|
edit_plz_ort.grid(row=1, column=4)
|
||||||
|
|
||||||
|
button_frame = tk.Frame(self)
|
||||||
|
button_frame.pack(side=tk.TOP, pady=10)
|
||||||
|
tk.Button(button_frame, text="Save", command=self._update, width=button_width).pack(side=tk.LEFT)
|
||||||
|
tk.Button(button_frame, text="Abbrechen", command=self.close_window, width=button_width).pack(side=tk.LEFT)
|
||||||
|
|
||||||
|
def _update(self, event = None):
|
||||||
|
self.parent.update_record(self.field_list)
|
||||||
|
self.close_window()
|
||||||
|
|
||||||
|
|
||||||
|
class SettingsWindow(Window):
|
||||||
|
def __init__(self, parent, root: tk.Tk):
|
||||||
|
super().__init__(parent, root)
|
||||||
|
self.geometry(f"500x330+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
|
||||||
|
self.config = Config()
|
||||||
|
self.json_file = tk.StringVar()
|
||||||
|
self.csv_file = tk.StringVar()
|
||||||
|
|
||||||
|
title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
|
||||||
|
tk.Label(self, text="Einstellungen", font=title).pack(pady=20)
|
||||||
|
|
||||||
|
path_frame = tk.Frame(self)
|
||||||
|
path_frame.pack(pady=(10, 40))
|
||||||
|
|
||||||
|
tk.Label(path_frame, text="Datenpfad JSON Datei").grid(row=0, column=0)
|
||||||
|
tk.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0)
|
||||||
|
tk.Button(path_frame, text="Pfad", command=lambda: self.set_json_path(self.json_file.get())).grid(row=1,
|
||||||
|
column=1)
|
||||||
|
|
||||||
|
tk.Label(path_frame, text="Datenpfad CSV Export Datei").grid(row=2, column=0)
|
||||||
|
tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0)
|
||||||
|
tk.Button(path_frame, text="Pfad", command=lambda: self.set_csv_path(self.csv_file.get())).grid(row=3, column=1)
|
||||||
|
|
||||||
|
bottom_frame = tk.Frame(self)
|
||||||
|
bottom_frame.pack()
|
||||||
|
tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
|
||||||
|
tk.Button(bottom_frame, text="Abbrechen", command=self.cancel).pack(side=tk.LEFT)
|
||||||
|
|
||||||
|
self.load_config()
|
||||||
|
|
||||||
|
def set_json_path(self, initial_dir: str = ""):
|
||||||
|
initial_dir = "~/" if initial_dir == "" else initial_dir
|
||||||
|
new_path = filedialog.askdirectory(initialdir=initial_dir, title="Datenpfad JSON Datei")
|
||||||
|
new_path = initial_dir if len(new_path) == 0 else new_path
|
||||||
|
self.json_file.set(new_path)
|
||||||
|
|
||||||
|
def set_csv_path(self, initial_dir: str = ""):
|
||||||
|
initial_dir = "~/" if initial_dir == "" else initial_dir
|
||||||
|
new_path = filedialog.askdirectory(initialdir=initial_dir, title="Datenpfad CSV Datei")
|
||||||
|
new_path = initial_dir if len(new_path) == 0 else new_path
|
||||||
|
self.csv_file.set(new_path)
|
||||||
|
|
||||||
|
def load_config(self):
|
||||||
|
try:
|
||||||
|
self.json_file.set(self.config.get("json", "path"))
|
||||||
|
except NoSectionError:
|
||||||
|
self.config.add_section("json")
|
||||||
|
self.config.set("json", "path", "")
|
||||||
|
except NoOptionError:
|
||||||
|
self.config.set("json", "path", "")
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.csv_file.set(self.config.get("csv", "path"))
|
||||||
|
except NoSectionError:
|
||||||
|
self.config.add_section("csv")
|
||||||
|
self.config.set("csv", "path", "")
|
||||||
|
except NoOptionError:
|
||||||
|
self.config.set("csv", "path", "")
|
||||||
|
|
||||||
|
def ok(self):
|
||||||
|
if self.json_file.get() == "" or self.csv_file.get() == "":
|
||||||
|
show_error(message_title="Fehlerhafte Konfiguration",
|
||||||
|
message="Pfad für JSON oder CSV Datei fehlt",
|
||||||
|
parent=self)
|
||||||
|
return
|
||||||
|
self.config.set("json", "path", self.json_file.get())
|
||||||
|
self.config.set("csv", "path", self.csv_file.get())
|
||||||
|
self.close_window()
|
||||||
|
|
||||||
|
def cancel(self):
|
||||||
|
self.close_window()
|
||||||
1
version.txt
Normal file
1
version.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
0.6a
|
||||||
Reference in New Issue
Block a user