From c8caa98743a6e5ab425a6a6c2ceb1a8f95565d56 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 9 May 2024 06:30:09 +0100
Subject: [PATCH] Fix duplicated settings in db and structs

---
 modules/db.py      | 6 ++----
 modules/structs.py | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/db.py b/modules/db.py
index 871ddf7..9163d14 100644
--- a/modules/db.py
+++ b/modules/db.py
@@ -161,10 +161,9 @@ async def connect():
             "browser":                     f'INTEGER DEFAULT {Browser.get(0).hash}',
             "cell_image_ratio":            f'REAL    DEFAULT 3.0',
             "check_notifs":                f'INTEGER DEFAULT {int(True)}',
+            "compact_timeline":            f'INTEGER DEFAULT {int(False)}',
             "confirm_on_remove":           f'INTEGER DEFAULT {int(True)}',
             "copy_urls_as_bbcode":         f'INTEGER DEFAULT {int(False)}',
-            "compact_timeline":            f'INTEGER DEFAULT {int(False)}',
-            "display_tab":                 f'INTEGER DEFAULT NULL',
             "datestamp_format":            f'TEXT    DEFAULT "%d/%m/%Y"',
             "default_exe_dir":             f'TEXT    DEFAULT "{{}}"',
             "default_tab_is_new":          f'INTEGER DEFAULT {int(False)}',
@@ -176,10 +175,9 @@ async def connect():
             "filter_all_tabs":             f'INTEGER DEFAULT {int(False)}',
             "fit_images":                  f'INTEGER DEFAULT {int(False)}',
             "grid_columns":                f'INTEGER DEFAULT 3',
+            "hidden_timeline_events":      f'TEXT    DEFAULT "[]"',
             "hide_empty_tabs":             f'INTEGER DEFAULT {int(False)}',
             "highlight_tags":              f'INTEGER DEFAULT {int(True)}',
-            "hidden_timeline_events":      f'TEXT    DEFAULT "[]"',
-            "independent_tab_views":       f'INTEGER DEFAULT {int(False)}',
             "ignore_semaphore_timeouts":   f'INTEGER DEFAULT {int(False)}',
             "independent_tab_views":       f'INTEGER DEFAULT {int(False)}',
             "interface_scaling":           f'REAL    DEFAULT 1.0',
diff --git a/modules/structs.py b/modules/structs.py
index 8053978..2166318 100644
--- a/modules/structs.py
+++ b/modules/structs.py
@@ -676,10 +676,9 @@ class Settings:
     browser_private             : bool
     cell_image_ratio            : float
     check_notifs                : bool
+    compact_timeline            : bool
     confirm_on_remove           : bool
     copy_urls_as_bbcode         : bool
-    compact_timeline            : bool
-    display_tab                 : Tab.get
     datestamp_format            : str
     default_exe_dir             : dict[Os, str]
     default_tab_is_new          : bool
@@ -691,10 +690,9 @@ class Settings:
     filter_all_tabs             : bool
     fit_images                  : bool
     grid_columns                : int
+    hidden_timeline_events      : list[TimelineEventType]
     hide_empty_tabs             : bool
     highlight_tags              : bool
-    hidden_timeline_events      : list[TimelineEventType]
-    independent_tab_views       : bool
     ignore_semaphore_timeouts   : bool
     independent_tab_views       : bool
     interface_scaling           : float