Merge branch 'unique-content-containers' of github.com:TheWiseNoob/OM…

…P into unique-content-containers
TheWiseNoob · May 19, 2024 · 545236f · 545236f
2 parents 58c4422 + f2b6342
commit 545236f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 5 deletions.
diff --git a/src/content.c b/src/content.c
@@ -6,13 +6,15 @@
 #include "app.h"
 #include "appwin.h"
 #include "sidebar.h"
+#include "panels/context/context-panel.h"
 
 #include "taglib/tag_c.h"
 
 struct _OMPContent {
     AdwBin parent;
 
     GtkWidget* content_label;
+    GtkWidget* context_container;
     GtkWidget* open_sidebar_overlay_button;
     GtkWidget* tag_label;
 };
@@ -125,6 +127,8 @@ omp_content_show_sidebar (OMPSidebar* sidebar, OMPContent* content)
 static void
 omp_content_init (OMPContent* content)
 {
+    g_type_ensure (OMP_CONTEXT_PANEL_TYPE);
+
     gtk_widget_init_template (GTK_WIDGET (content));
 
     omp_app_set_content (OMP_APP (g_application_get_default ()), content);
@@ -181,6 +185,9 @@ omp_content_class_init (OMPContentClass* self)
     gtk_widget_class_bind_template_child (
         GTK_WIDGET_CLASS (self), OMPContent, tag_label
     );
+    gtk_widget_class_bind_template_child (
+        GTK_WIDGET_CLASS (self), OMPContent, context_container
+    );
 
     // Callbacks
     gtk_widget_class_bind_template_callback (

diff --git a/src/panels/context/context-panel.c b/src/panels/context/context-panel.c
@@ -15,7 +15,7 @@ omp_context_panel_class_init (OMPContextPanelClass* klass)
 
     gtk_widget_class_set_template_from_resource (
         widget_class,
-        "/org/gnome/control-center/bluetooth/cc-bluetooth-panel.ui"
+        "/com/openmusicplayer/omp/ui/context.ui"
     );
 }
 

diff --git a/src/panels/context/context-panel.h b/src/panels/context/context-panel.h
@@ -5,9 +5,9 @@
 
 G_BEGIN_DECLS
 
-#define OMP_TYPE_CONTEXT_PANEL (omp_context_panel_get_type ())
+#define OMP_CONTEXT_PANEL_TYPE (omp_context_panel_get_type ())
 G_DECLARE_FINAL_TYPE (
-    OMPContextPanel, omp_context_panel, OMP, CONTEXT_PANEL, AdwBin
+    OMPContextPanel, omp_context_panel, OMP, APP_CONTEXT_PANEL, AdwBin
 )
 
 G_END_DECLS
diff --git a/src/panels/context/meson.build b/src/panels/context/meson.build
@@ -1,7 +1,7 @@
 context_sources = [
-  'context-panel.c',
+    'context-panel.c',
 ]
 
 foreach context_source: context_sources
-  sources += 'panels/context/' + context_source
+    sources += 'panels/context/' + context_source
 endforeach
diff --git a/src/resources/omp.gresource.xml b/src/resources/omp.gresource.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/com/openmusicplayer/omp">
+    <file preprocess="xml-stripblanks">ui/context.ui</file>
     <file preprocess="xml-stripblanks">ui/content.ui</file>
     <file preprocess="xml-stripblanks">ui/sidebar.ui</file>
     <file preprocess="xml-stripblanks">ui/window.ui</file>

diff --git a/src/resources/ui/content.blp b/src/resources/ui/content.blp
@@ -39,6 +39,10 @@ template $OMPContent : Adw.Bin {
                     };
                 }
 
+                [end]
+                $OMPContextPanel context_container {
+                }
+
                 [end]
                 Label tag_label {
                     label: "";

diff --git a/src/resources/ui/context.blp b/src/resources/ui/context.blp
@@ -0,0 +1,8 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $OMPContextPanel : Adw.Bin {
+    Gtk.Label {
+        label: 'Herpa';
+    }
+}
diff --git a/src/resources/ui/meson.build b/src/resources/ui/meson.build
@@ -1,5 +1,6 @@
 blueprints = custom_target('blueprints',
   input: files(
+      'context.blp',
       'content.blp',
       'sidebar.blp',
       'window.blp'
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,10 @@ template $OMPContent : Adw.Bin { @@
                         };
                     }
+                    [end]
+                    $OMPContextPanel context_container {
+                    }
                     [end]
                     Label tag_label {
                         label: "";
@@ Expand Down @@