move preferences window to subdirectory

horizon-eda · Jul 12, 2020 · 09161dc · 09161dc
1 parent 5c7d99d
commit 09161dc
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -589,12 +589,12 @@ SRC_POOL_PRJ_MGR = \
 	src/preferences/preferences.cpp\
 	src/preferences/preferences_provider.cpp\
 	src/preferences/preferences_util.cpp\
-	src/pool-prj-mgr/preferences_window.cpp\
-	src/pool-prj-mgr/preferences_window_keys.cpp\
-	src/pool-prj-mgr/preferences_window_canvas.cpp\
-	src/pool-prj-mgr/preferences_window_pool.cpp\
-	src/pool-prj-mgr/preferences_window_partinfo.cpp\
-	src/pool-prj-mgr/preferences_window_misc.cpp\
+	src/pool-prj-mgr/preferences/preferences_window.cpp\
+	src/pool-prj-mgr/preferences/preferences_window_keys.cpp\
+	src/pool-prj-mgr/preferences/preferences_window_canvas.cpp\
+	src/pool-prj-mgr/preferences/preferences_window_pool.cpp\
+	src/pool-prj-mgr/preferences/preferences_window_partinfo.cpp\
+	src/pool-prj-mgr/preferences/preferences_window_misc.cpp\
 	src/imp/action.cpp\
 	src/imp/action_catalog.cpp\
 	src/widgets/unit_info_box.cpp\

diff --git a/imp.gresource.xml b/imp.gresource.xml
@@ -6,7 +6,7 @@
     <file>imp/layer_display_default.json</file>
     <file>imp/keys_default.json</file>
     <file>imp/app_menu.ui</file>
-    <file>pool-prj-mgr/preferences.ui</file>
+    <file>pool-prj-mgr/preferences/preferences.ui</file>
     <file>property_panels/property_panel.ui</file>
     <file>pool-update/schema.sql</file>
 

diff --git a/src/pool-prj-mgr/pool-prj-mgr-app.cpp b/src/pool-prj-mgr/pool-prj-mgr-app.cpp
@@ -9,7 +9,7 @@
 #include "nlohmann/json.hpp"
 #include "close_utils.hpp"
 #include "pool/pool_manager.hpp"
-#include "preferences_window.hpp"
+#include "preferences/preferences_window.hpp"
 #include "preferences/preferences_provider.hpp"
 #include "widgets/about_dialog.hpp"
 

diff --git a/src/pool-prj-mgr/pool-prj-mgr-app_win.cpp b/src/pool-prj-mgr/pool-prj-mgr-app_win.cpp
@@ -1,6 +1,6 @@
 #include "pool-prj-mgr-app_win.hpp"
 #include "pool-prj-mgr-app.hpp"
-#include "preferences_window.hpp"
+#include "preferences/preferences_window.hpp"
 #include <iostream>
 #include <thread>
 #include "util/util.hpp"

diff --git a/src/pool-prj-mgr/preferences.ui → src/pool-prj-mgr/preferences/preferences.ui b/src/pool-prj-mgr/preferences.ui → src/pool-prj-mgr/preferences/preferences.ui
diff --git a/src/pool-prj-mgr/preferences_window.cpp → ...rj-mgr/preferences/preferences_window.cpp b/src/pool-prj-mgr/preferences_window.cpp → ...rj-mgr/preferences/preferences_window.cpp
diff --git a/src/pool-prj-mgr/preferences_window.hpp → ...rj-mgr/preferences/preferences_window.hpp b/src/pool-prj-mgr/preferences_window.hpp → ...rj-mgr/preferences/preferences_window.hpp
diff --git a/...ool-prj-mgr/preferences_window_canvas.cpp → ...preferences/preferences_window_canvas.cpp b/...ool-prj-mgr/preferences_window_canvas.cpp → ...preferences/preferences_window_canvas.cpp
@@ -542,7 +542,7 @@ CanvasPreferencesEditor *CanvasPreferencesEditor::create(Preferences &prefs, boo
     std::vector<Glib::ustring> widgets = {"canvas_box",  "adjustment1", "adjustment2",
                                           "adjustment3", "adjustment4", "adjustment7",
                                           "adjustment8", "adjustment9", "color_preset_menu"};
-    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences.ui", widgets);
+    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences/preferences.ui", widgets);
     x->get_widget_derived("canvas_box", w, prefs, layered);
     w->reference();
     return w;

diff --git a/...ool-prj-mgr/preferences_window_canvas.hpp → ...preferences/preferences_window_canvas.hpp b/...ool-prj-mgr/preferences_window_canvas.hpp → ...preferences/preferences_window_canvas.hpp
diff --git a/src/pool-prj-mgr/preferences_window_keys.cpp → ...r/preferences/preferences_window_keys.cpp b/src/pool-prj-mgr/preferences_window_keys.cpp → ...r/preferences/preferences_window_keys.cpp
@@ -259,7 +259,7 @@ KeySequencesPreferencesEditor *KeySequencesPreferencesEditor::create(Preferences
 {
     KeySequencesPreferencesEditor *w;
     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
-    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences.ui", "key_sequences_box");
+    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences/preferences.ui", "key_sequences_box");
     x->get_widget_derived("key_sequences_box", w, prefs);
     w->reference();
     return w;
@@ -381,7 +381,7 @@ ActionEditor *ActionEditor::create(Preferences &prefs, ActionToolID action,
 {
     ActionEditor *w;
     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
-    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences.ui", "action_editor");
+    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences/preferences.ui", "action_editor");
     x->get_widget_derived("action_editor", w, prefs, action, availability, title, parent);
     w->reference();
     return w;

diff --git a/src/pool-prj-mgr/preferences_window_keys.hpp → ...r/preferences/preferences_window_keys.hpp b/src/pool-prj-mgr/preferences_window_keys.hpp → ...r/preferences/preferences_window_keys.hpp
diff --git a/src/pool-prj-mgr/preferences_window_misc.cpp → ...r/preferences/preferences_window_misc.cpp b/src/pool-prj-mgr/preferences_window_misc.cpp → ...r/preferences/preferences_window_misc.cpp
diff --git a/src/pool-prj-mgr/preferences_window_misc.hpp → ...r/preferences/preferences_window_misc.hpp b/src/pool-prj-mgr/preferences_window_misc.hpp → ...r/preferences/preferences_window_misc.hpp
diff --git a/...l-prj-mgr/preferences_window_partinfo.cpp → ...eferences/preferences_window_partinfo.cpp b/...l-prj-mgr/preferences_window_partinfo.cpp → ...eferences/preferences_window_partinfo.cpp
@@ -88,7 +88,7 @@ PartinfoPreferencesEditor *PartinfoPreferencesEditor::create(Preferences &prefs)
     PartinfoPreferencesEditor *w;
     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
     std::vector<Glib::ustring> widgets = {"partinfo_box", "adjustment5", "adjustment6"};
-    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences.ui", widgets);
+    x->add_from_resource("/org/horizon-eda/horizon/pool-prj-mgr/preferences/preferences.ui", widgets);
     x->get_widget_derived("partinfo_box", w, prefs);
     w->reference();
     return w;

diff --git a/...l-prj-mgr/preferences_window_partinfo.hpp → ...eferences/preferences_window_partinfo.hpp b/...l-prj-mgr/preferences_window_partinfo.hpp → ...eferences/preferences_window_partinfo.hpp
diff --git a/src/pool-prj-mgr/preferences_window_pool.cpp → ...r/preferences/preferences_window_pool.cpp b/src/pool-prj-mgr/preferences_window_pool.cpp → ...r/preferences/preferences_window_pool.cpp
diff --git a/src/pool-prj-mgr/preferences_window_pool.hpp → ...r/preferences/preferences_window_pool.hpp b/src/pool-prj-mgr/preferences_window_pool.hpp → ...r/preferences/preferences_window_pool.hpp
diff --git a/src/pool-prj-mgr/welcome_window.cpp b/src/pool-prj-mgr/welcome_window.cpp
@@ -1,7 +1,7 @@
 #include "welcome_window.hpp"
 #include "pool-prj-mgr-app_win.hpp"
 #include "pool-prj-mgr-app.hpp"
-#include "preferences_window.hpp"
+#include "preferences/preferences_window.hpp"
 
 namespace horizon {
 WelcomeWindow *WelcomeWindow::create(PoolProjectManagerAppWindow *aw)