From 18e53ca462a3fce95acf119f9909adc073b13d32 Mon Sep 17 00:00:00 2001 From: Christian Lauinger Date: Sun, 9 Jun 2024 23:42:15 +0200 Subject: [PATCH] fixes after flake8 --- photocollage/gtkgui.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/photocollage/gtkgui.py b/photocollage/gtkgui.py index 18c722f..d6a3449 100644 --- a/photocollage/gtkgui.py +++ b/photocollage/gtkgui.py @@ -41,8 +41,9 @@ # cp po/photocollage.pot po/fr.po # msgfmt -o po/fr.mo po/fr.po + def settings_folder_check(): - app_folder = os.path.expanduser("~") + "/.PhotoCollage" + app_folder = os.path.expanduser("~") + "/.local/share/PhotoCollage" if not os.path.lexists(app_folder): os.makedirs(app_folder) return app_folder @@ -50,7 +51,7 @@ def settings_folder_check(): def settings_load_lastsettings(): app_folder = settings_folder_check() - settings_file = app_folder + "/lastsettings.json" + settings_file = app_folder + "/lastsettings.json" if os.path.isfile(settings_file): with open(settings_file, "r") as openfile: json_object = json.load(openfile) @@ -70,7 +71,7 @@ def settings_load_lastsettings(): def settings_store_lastsettings(settings): app_folder = settings_folder_check() - settings_file = app_folder + "/lastsettings.json" + settings_file = app_folder + "/lastsettings.json" dictionary = { "border_w": settings.border_w, "border_c": settings.border_c, @@ -80,23 +81,24 @@ def settings_store_lastsettings(settings): with open(settings_file, "w") as openfile: json.dump(dictionary, openfile, indent=4) + def templates_load_presets(): app_folder = settings_folder_check() - templates_file = app_folder + "/templates.json" + templates_file = app_folder + "/templates.json" if os.path.isfile(templates_file): with open(templates_file, "r") as openfile: json_object = json.load(openfile) else: dictionary = { - "" : None, - "800 × 600" : (800, 600), - "1600 × 1200" : (1600, 1200), - "A4 landscape (300ppi)" : (3508, 2480), - "A4 portrait (300ppi)" : (2480, 3508), - "A3 landscape (300ppi)" : (4960, 3508), - "A3 portrait (300ppi)" : (3508, 4960), - "US-Letter landscape (300ppi)" : (3300, 2550), - "US-Letter portrait (300ppi)" : (2550, 3300) + "": None, + "800 × 600": (800, 600), + "1600 × 1200": (1600, 1200), + "A4 landscape (300ppi)": (3508, 2480), + "A4 portrait (300ppi)": (2480, 3508), + "A3 landscape (300ppi)": (4960, 3508), + "A3 portrait (300ppi)": (3508, 4960), + "US-Letter landscape (300ppi)": (3300, 2550), + "US-Letter portrait (300ppi)": (2550, 3300) } with open(templates_file, "w") as openfile: json.dump(dictionary, openfile, indent=4) @@ -720,7 +722,6 @@ def __init__(self, parent): json_object = templates_load_presets() templates = json_object.items() - def apply_template(combo): t = combo.get_model()[combo.get_active_iter()][1] if t: