[gedit] replace-open-button: remove open button UI

[Sébastien Wilmet <swilmet src gnome org>]

commit 3a8c5bbc2aed3ff07391025fd441d51408f59bb4
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Nov 26 08:29:09 2019 +0100

    replace-open-button: remove open button UI

 gedit/gedit-window-private.h       |  7 +--
 gedit/gedit-window.c               | 22 +---------
 gedit/resources/ui/gedit-window.ui | 89 --------------------------------------
 3 files changed, 3 insertions(+), 115 deletions(-)
---
diff --git a/gedit/gedit-window-private.h b/gedit/gedit-window-private.h
index fac2f7109..222896c43 100644
--- a/gedit/gedit-window-private.h
+++ b/gedit/gedit-window-private.h
@@ -58,9 +58,7 @@ struct _GeditWindowPrivate
        GtkWidget      *fullscreen_eventbox;
        GtkWidget      *fullscreen_headerbar;
        GtkMenuButton  *fullscreen_gear_button;
-
-       GtkWidget       *fullscreen_new_button;
-       GtkWidget       *fullscreen_open_button;
+       GtkWidget      *fullscreen_new_button;
 
        /* statusbar and context ids for statusbar messages */
        GtkWidget      *statusbar;
@@ -81,8 +79,7 @@ struct _GeditWindowPrivate
        GtkWidget      *side_headerbar;
        GtkWidget      *headerbar;
 
-       GtkWidget       *new_button;
-       GtkWidget       *open_button;
+       GtkWidget      *new_button;
 
        GtkMenuButton  *gear_button;
 
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index f3a8df091..0e525fb5f 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -457,7 +457,6 @@ gedit_window_class_init (GeditWindowClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, side_headerbar);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, headerbar);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, new_button);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, open_button);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, gear_button);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, hpaned);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, side_panel_box);
@@ -475,7 +474,6 @@ gedit_window_class_init (GeditWindowClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, fullscreen_eventbox);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, fullscreen_headerbar);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, fullscreen_new_button);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, fullscreen_open_button);
        gtk_widget_class_bind_template_child_private (widget_class, GeditWindow, fullscreen_gear_button);
 }
 
@@ -1744,15 +1742,12 @@ real_fullscreen_controls_leave_notify_event (gpointer data)
 {
        GeditWindow *window = GEDIT_WINDOW (data);
        gboolean hamburger_menu_state;
-       gboolean fullscreen_open_button_state;
 
        hamburger_menu_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(window->priv->fullscreen_gear_button));
-       fullscreen_open_button_state =
-                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(window->priv->fullscreen_open_button));
 
        window->priv->in_fullscreen_eventbox = FALSE;
 
-       if (!hamburger_menu_state && !fullscreen_open_button_state)
+       if (!hamburger_menu_state)
        {
                gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->fullscreen_controls), FALSE);
        }
@@ -2170,16 +2165,6 @@ on_fullscreen_gear_button_toggled (GtkToggleButton *fullscreen_gear_button,
                                       button_active || window->priv->in_fullscreen_eventbox);
 }
 
-static void
-on_fullscreen_file_menu_button_toggled (GtkMenuButton *fullscreen_open_button,
-                                        GeditWindow   *window)
-{
-       gboolean button_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fullscreen_open_button));
-
-       gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->fullscreen_controls),
-                                      button_active || window->priv->in_fullscreen_eventbox);
-}
-
 static void
 side_panel_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation,
@@ -2712,11 +2697,6 @@ gedit_window_init (GeditWindow *window)
                gtk_widget_set_no_show_all (GTK_WIDGET (window->priv->fullscreen_gear_button), TRUE);
        }
 
-       g_signal_connect (GTK_TOGGLE_BUTTON (window->priv->fullscreen_open_button),
-                         "toggled",
-                         G_CALLBACK (on_fullscreen_file_menu_button_toggled),
-                         window);
-
        g_signal_connect (GTK_TOGGLE_BUTTON (window->priv->fullscreen_gear_button),
                          "toggled",
                          G_CALLBACK (on_fullscreen_gear_button_toggled),
diff --git a/gedit/resources/ui/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
index 8ebd0a5c2..09c8042b6 100644
--- a/gedit/resources/ui/gedit-window.ui
+++ b/gedit/resources/ui/gedit-window.ui
@@ -27,50 +27,6 @@
           <object class="GtkHeaderBar" id="headerbar">
             <property name="visible">True</property>
             <property name="show_close_button">True</property>
-            <child>
-              <object class="GtkMenuButton" id="open_button">
-                <property name="visible">True</property>
-                <property name="tooltip_text" translatable="yes">Open a file</property>
-                <property name="valign">center</property>
-                <property name="use_popover">True</property>
-                <style>
-                  <class name="text-button"/>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkBox" id="open_button_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_focus">False</property>
-                    <property name="is_focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="open_button_name">
-                        <property name="label" translatable="yes">_Open</property>
-                        <property name="use-underline">True</property>
-                        <property name="visible">True</property>
-                        <property name="valign">baseline</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="open_button_arrow">
-                        <property name="visible">True</property>
-                        <property name="valign">baseline</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="open_button_a11y">
-                    <property name="accessible-name" translatable="yes">Open</property>
-                    <property name="accessible-description" translatable="yes">Open a file</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="pack_type">start</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkButton" id="new_button">
                 <property name="visible">True</property>
@@ -365,47 +321,6 @@
                 <child>
                   <object class="GtkHeaderBar" id="fullscreen_headerbar">
                     <property name="visible">True</property>
-                    <child>
-                      <object class="GtkMenuButton" id="fullscreen_open_button">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Open a file dialog</property>
-                        <property name="valign">center</property>
-                        <property name="use_popover">True</property>
-                        <style>
-                          <class name="text-button"/>
-                          <class name="image-button"/>
-                        </style>
-                        <child>
-                          <object class="GtkBox" id="fullscreen_open_button_box">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="has_focus">False</property>
-                            <property name="is_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="fullscreen_open_button_name">
-                                <property name="label" translatable="yes">Open</property>
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="fullscreen_open_button_arrow">
-                                <property name="visible">True</property>
-                                <property name="icon_name">pan-down-symbolic</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="fullscreen_open_button_a11y">
-                            <property name="accessible-name" translatable="yes">Open</property>
-                            <property name="accessible-description" translatable="yes">Open a file</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="pack_type">start</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkButton" id="fullscreen_new_button">
                         <property name="visible">True</property>
@@ -514,20 +429,16 @@
     <property name="mode">vertical</property>
     <widgets>
       <widget name="new_button"/>
-      <widget name="open_button"/>
       <widget name="gear_button"/>
       <widget name="save_button"/>
-      <widget name="open_button"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
     <property name="mode">vertical</property>
     <widgets>
       <widget name="fullscreen_new_button"/>
-      <widget name="fullscreen_open_button"/>
       <widget name="fullscreen_gear_button"/>
       <widget name="fullscreen_save_button"/>
-      <widget name="fullscreen_open_button"/>
       <widget name="leave_fullscreen_button"/>
     </widgets>
   </object>