From 8e815e63aca3a7147b8553d9146045fe8d2ca9aa Mon Sep 17 00:00:00 2001
From: Philipp Unger <philipp.unger.1988@gmail.com>
Date: Wed, 6 Apr 2022 19:56:18 +0200
Subject: [PATCH] move Settings*.ui files into ui folder

---
 prefs.js                                      | 66 +++++++++++--------
 SettingsAbout.ui => ui/SettingsAbout.ui       |  0
 SettingsAction.ui => ui/SettingsAction.ui     |  0
 SettingsBehavior.ui => ui/SettingsBehavior.ui |  0
 SettingsFineTune.ui => ui/SettingsFineTune.ui |  0
 SettingsPosition.ui => ui/SettingsPosition.ui |  0
 SettingsStyle.ui => ui/SettingsStyle.ui       |  0
 7 files changed, 37 insertions(+), 29 deletions(-)
 rename SettingsAbout.ui => ui/SettingsAbout.ui (100%)
 rename SettingsAction.ui => ui/SettingsAction.ui (100%)
 rename SettingsBehavior.ui => ui/SettingsBehavior.ui (100%)
 rename SettingsFineTune.ui => ui/SettingsFineTune.ui (100%)
 rename SettingsPosition.ui => ui/SettingsPosition.ui (100%)
 rename SettingsStyle.ui => ui/SettingsStyle.ui (100%)

diff --git a/prefs.js b/prefs.js
index 13ff119..45a5b95 100644
--- a/prefs.js
+++ b/prefs.js
@@ -164,8 +164,42 @@ const Preferences = class {
         this._builder = new Gtk.Builder();
         this._builder.set_scope(new BuilderScope(this));
         this._builder.set_translation_domain(Me.metadata['gettext-domain']);
-        this._builder.add_from_file(Me.path + '/Settings.ui');
-        this.notebook = this._builder.get_object('settings_notebook');
+
+        if (window) {
+            this._builder.add_from_file(Me.path + '/ui/SettingsPosition.ui');
+            let pagePosition = this._builder.get_object('position');
+            window.add(pagePosition);
+
+            this._builder.add_from_file(Me.path + '/ui/SettingsStyle.ui');
+            let pageStyle = this._builder.get_object('style');
+            window.add(pageStyle);
+
+            this._builder.add_from_file(Me.path + '/ui/SettingsBehavior.ui');
+            let pageBehavior = this._builder.get_object('behavior');
+            window.add(pageBehavior);
+
+            this._builder.add_from_file(Me.path + '/ui/SettingsAction.ui');
+            let pageAction = this._builder.get_object('action');
+            window.add(pageAction);
+
+            this._builder.add_from_file(Me.path + '/ui/SettingsFineTune.ui');
+            let pageFineTune = this._builder.get_object('finetune');
+            window.add(pageFineTune);
+
+            this._builder.add_from_file(Me.path + '/ui/SettingsAbout.ui');
+            let pageAbout = this._builder.get_object('about');
+            window.add(pageAbout);
+
+            // set the window as notebook, it is being used as parent for dialogs
+            this.notebook = window;
+
+            // TODO return for now, many things are still missing
+            return;
+
+        } else {
+            this._builder.add_from_file(Me.path + '/Settings.ui');
+            this.notebook = this._builder.get_object('settings_notebook');
+        }
 
         // Timeout to delay the update of the settings
         this._panel_size_timeout = 0;
@@ -2462,33 +2496,7 @@ function init() {
 function fillPreferencesWindow(window) {
     window.set_default_size(680, 740);
 
-    builder = new Gtk.Builder();
-    builder.set_scope(new BuilderScope());
-    builder.set_translation_domain(Me.metadata['gettext-domain']);
-
-    builder.add_from_file(Me.path + '/SettingsPosition.ui');
-    let pagePosition = builder.get_object('position');
-    window.add(pagePosition);
-
-    builder.add_from_file(Me.path + '/SettingsStyle.ui');
-    let pageStyle = builder.get_object('style');
-    window.add(pageStyle);
-
-    builder.add_from_file(Me.path + '/SettingsBehavior.ui');
-    let pageBehavior = builder.get_object('behavior');
-    window.add(pageBehavior);
-
-    builder.add_from_file(Me.path + '/SettingsAction.ui');
-    let pageAction = builder.get_object('action');
-    window.add(pageAction);
-
-    builder.add_from_file(Me.path + '/SettingsFineTune.ui');
-    let pageFineTune = builder.get_object('finetune');
-    window.add(pageFineTune);
-
-    builder.add_from_file(Me.path + '/SettingsAbout.ui');
-    let pageAbout = builder.get_object('about');
-    window.add(pageAbout);
+    let preferences = new Preferences(window);
 }
 
 function buildPrefsWidget() {
diff --git a/SettingsAbout.ui b/ui/SettingsAbout.ui
similarity index 100%
rename from SettingsAbout.ui
rename to ui/SettingsAbout.ui
diff --git a/SettingsAction.ui b/ui/SettingsAction.ui
similarity index 100%
rename from SettingsAction.ui
rename to ui/SettingsAction.ui
diff --git a/SettingsBehavior.ui b/ui/SettingsBehavior.ui
similarity index 100%
rename from SettingsBehavior.ui
rename to ui/SettingsBehavior.ui
diff --git a/SettingsFineTune.ui b/ui/SettingsFineTune.ui
similarity index 100%
rename from SettingsFineTune.ui
rename to ui/SettingsFineTune.ui
diff --git a/SettingsPosition.ui b/ui/SettingsPosition.ui
similarity index 100%
rename from SettingsPosition.ui
rename to ui/SettingsPosition.ui
diff --git a/SettingsStyle.ui b/ui/SettingsStyle.ui
similarity index 100%
rename from SettingsStyle.ui
rename to ui/SettingsStyle.ui