From b2c8e4ca45c6872cb2891dcb9334e905995bd59e Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 5 Jun 2025 14:38:37 +0200
Subject: gui: reintroduce Preferences

---
 gui/src/preferences.cpp | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'gui/src/preferences.cpp')

diff --git a/gui/src/preferences.cpp b/gui/src/preferences.cpp
index cd6cdbf..24bc952 100644
--- a/gui/src/preferences.cpp
+++ b/gui/src/preferences.cpp
@@ -3,32 +3,28 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-#include "turns/ui/preferences.hpp"
+#include "preferences.hpp"
 
-#include "turns/core/settings.hpp"
-#include "turns/ui/template_widget.hpp"
+#include "settings.hpp"
+#include "template_widget.hpp"
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include <adwaitamm/switchrow.hpp>
+#include <gdkmm/rgba.h>
+#include <giomm/settings.h>
 #include <glibmm/binding.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
-
-#include <giomm/settings.h>
-
 #include <gtkmm/button.h>
 #include <gtkmm/colordialog.h>
 #include <gtkmm/colordialogbutton.h>
 #include <gtkmm/enums.h>
 
-#include <adwaitamm/switchrow.hpp>
-
-#include <gdkmm/rgba.h>
-
-namespace turns::ui
+namespace Turns::gui
 {
   namespace
   {
@@ -53,14 +49,14 @@ namespace turns::ui
       return;
     }
 
-    bind_reset(core::settings::key::disposition_friendly_color, m_friendly_reset_button);
-    bind_setting(core::settings::key::disposition_friendly_color, m_friendly_color_button);
-    bind_reset(core::settings::key::disposition_hostile_color, m_hostile_reset_button);
-    bind_setting(core::settings::key::disposition_hostile_color, m_hostile_color_button);
-    bind_reset(core::settings::key::disposition_secret_color, m_secret_reset_button);
-    bind_setting(core::settings::key::disposition_secret_color, m_secret_color_button);
+    bind_reset(settings::key::disposition_friendly_color, m_friendly_reset_button);
+    bind_setting(settings::key::disposition_friendly_color, m_friendly_color_button);
+    bind_reset(settings::key::disposition_hostile_color, m_hostile_reset_button);
+    bind_setting(settings::key::disposition_hostile_color, m_hostile_color_button);
+    bind_reset(settings::key::disposition_secret_color, m_secret_reset_button);
+    bind_setting(settings::key::disposition_secret_color, m_secret_color_button);
 
-    m_settings->bind(core::settings::key::skip_defeated, m_skip_defeated->property_active());
+    m_settings->bind(settings::key::skip_defeated, m_skip_defeated->property_active());
   }
 
   auto Preferences::bind_reset(Glib::ustring const & key, Gtk::Button * button) -> void
@@ -83,4 +79,4 @@ namespace turns::ui
     button->set_sensitive(m_settings->get_user_value(key, v));
   }
 
-}  // namespace turns::ui::widgets
\ No newline at end of file
+}  // namespace Turns::gui
\ No newline at end of file
-- 
cgit v1.2.3