From 9cb7dbaade0b4ea7cbc47e3b7f4d71a3f81f350d Mon Sep 17 00:00:00 2001
From: Krifa75 <yahiaoui.fakhri@gmail.com>
Date: Thu, 17 Nov 2022 01:22:50 +0100
Subject: main: Move fullscreen headerbar widgets to GtkBuilder

---
 data/totem.ui      | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/totem-object.c | 35 +++++-------------------------
 2 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/data/totem.ui b/data/totem.ui
index ddd743c76..0b2a0e863 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -338,6 +338,69 @@
                     <property name="opacity">0.86</property>
                     <property name="halign">fill</property>
                     <property name="hexpand">True</property>
+                    <child>
+                      <object class="GtkButton">
+                        <property name="visible">True</property>
+                        <property name="no-show-all">True</property>
+                        <property name="valign">center</property>
+                        <property name="action-name">app.fullscreen</property>
+                        <style>
+                          <class name="image-button"/>
+                        </style>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="icon-name">view-restore-symbolic</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="pack-type">end</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkMenuButton" id="fullscreen_gear_button">
+                        <property name="visible">True</property>
+                        <property name="valign">center</property>
+                        <property name="use-popover">True</property>
+                        <property name="menu-model">playermenu</property>
+                        <style>
+                          <class name="image-button"/>
+                        </style>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="icon-name">view-more-symbolic</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="pack-type">end</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkMenuButton" id="fullscreen_subtitles_button">
+                        <property name="visible">True</property>
+                        <property name="valign">center</property>
+                        <property name="use-popover">True</property>
+                        <property name="menu-model">subtitlesmenu</property>
+                        <style>
+                          <class name="image-button"/>
+                        </style>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="icon-name">media-view-subtitles-symbolic</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="pack-type">end</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
diff --git a/src/totem-object.c b/src/totem-object.c
index 573094229..2a8532f2c 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -4039,9 +4039,6 @@ static void
 add_fullscreen_toolbar (TotemObject *totem,
 			GtkWidget   *container)
 {
-	GtkWidget *item;
-	GMenuModel *menu;
-
 	totem->fullscreen_header = GTK_WIDGET (gtk_builder_get_object (totem->xml, "fullscreen_header"));
 	g_object_bind_property (totem->header, "title",
 				totem->fullscreen_header, "title", 0);
@@ -4050,35 +4047,13 @@ add_fullscreen_toolbar (TotemObject *totem,
 	g_signal_connect (G_OBJECT (totem->fullscreen_header), "back-clicked",
 			  G_CALLBACK (back_button_clicked_cb), totem);
 
-	item = totem_interface_create_header_button (totem->fullscreen_header,
-						     gtk_button_new (),
-						     "view-restore-symbolic",
-						     GTK_PACK_END);
-	gtk_actionable_set_action_name (GTK_ACTIONABLE (item), "app.fullscreen");
-
-	item = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-	gtk_header_bar_pack_end (GTK_HEADER_BAR (totem->fullscreen_header), item);
-	gtk_style_context_add_class (gtk_widget_get_style_context (item), "header-bar-separator");
-
-	item = totem_interface_create_header_button (totem->fullscreen_header,
-						     gtk_menu_button_new (),
-						     "view-more-symbolic",
-						     GTK_PACK_END);
-	menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "playermenu");
-	gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu);
-	g_signal_connect (G_OBJECT (item), "toggled",
+	totem->fullscreen_gear_button = GTK_WIDGET (gtk_builder_get_object (totem->xml, "fullscreen_gear_button"));
+	g_signal_connect (G_OBJECT (totem->fullscreen_gear_button), "toggled",
 			  G_CALLBACK (popup_menu_shown_cb), totem);
-	totem->fullscreen_gear_button = item;
-
-	item = totem_interface_create_header_button (totem->fullscreen_header,
-						     gtk_menu_button_new (),
-						     "media-view-subtitles-symbolic",
-						     GTK_PACK_END);
-	menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "subtitlesmenu");
-	gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu);
-	g_signal_connect (G_OBJECT (item), "toggled",
+
+	totem->fullscreen_subtitles_button = GTK_WIDGET (gtk_builder_get_object (totem->xml, "fullscreen_subtitles_button"));
+	g_signal_connect (G_OBJECT (totem->fullscreen_subtitles_button), "toggled",
 			  G_CALLBACK (popup_menu_shown_cb), totem);
-	totem->fullscreen_subtitles_button = item;
 }
 
 void
-- 
cgit v1.2.1