grim/glibre

Get stuff working with gtk4 but stuff is broke in weird ways and I'm done debugging it

2022-03-28, Gary Kramlich
888fbe86d1c6
Parents 267ec7f57bc0
Children 7e4888a238db
Get stuff working with gtk4 but stuff is broke in weird ways and I'm done debugging it
9 files changed, 242 insertions(+), 614 deletions(-)
  • +1 -1
    meson.build
  • +0 -52
    src/glibre-about-window.c
  • +0 -36
    src/glibre-about-window.h
  • +14 -3
    src/glibre-application.c
  • +0 -2
    src/meson.build
  • +8 -53
    src/resources/about.ui
  • +5 -4
    src/resources/glibre.gresource.xml
  • +35 -0
    src/resources/gtk/menus.ui
  • +179 -463
    src/resources/window.ui
    • --- a/meson.build Tue Sep 21 02:23:35 2021 -0500
    +++ b/meson.build Mon Mar 28 23:34:36 2022 -0500
    @@ -1,7 +1,7 @@
    project('glibre', 'c', version : '0.0.3-dev')
    GLIB = dependency('glib-2.0', version : '>=2.52.0')
    -GTK3 = dependency('gtk+-3.0', version : '>=3.24.0')
    +GTK3 = dependency('gtk4', version : '>=4.6.0')
    add_project_arguments(
    '-DGLIBRE_VERSION="@0@"'.format(meson.project_version()),
    --- a/src/glibre-about-window.c Tue Sep 21 02:23:35 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,52 +0,0 @@
    -/*
    - * GlibRe - The glib regex tester
    - * Copyright (C) 2010-2021 Gary Kramlich <grim@reaperworld.com>
    - *
    - * This program is free software: you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License as published by
    - * the Free Software Foundation, either version 3 of the License, or
    - * (at your option) any later version.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program. If not, see <http://www.gnu.org/licenses/>.
    - */
    -
    -#include "glibre-about-window.h"
    -
    -struct _GlibreAboutWindow {
    - GtkAboutDialog parent;
    -};
    -
    -G_DEFINE_TYPE(GlibreAboutWindow, glibre_about_window, GTK_TYPE_ABOUT_DIALOG)
    -
    -/******************************************************************************
    - * GObject Implementation
    - *****************************************************************************/
    -static void
    -glibre_about_window_init(GlibreAboutWindow *window) {
    - gtk_widget_init_template(GTK_WIDGET(window));
    -}
    -
    -static void
    -glibre_about_window_class_init(GlibreAboutWindowClass *klass) {
    - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    -
    - gtk_widget_class_set_template_from_resource(widget_class,
    - "/org/imfreedom/keep/grim/glibre/about.ui");
    -}
    -
    -/******************************************************************************
    - * Public API
    - *****************************************************************************/
    -GtkWidget *
    -glibre_about_window_new(void) {
    - return g_object_new(
    - GLIBRE_TYPE_ABOUT_WINDOW,
    - "version", GLIBRE_VERSION,
    - NULL);
    -}
    --- a/src/glibre-about-window.h Tue Sep 21 02:23:35 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,36 +0,0 @@
    -/*
    - * GlibRe - The glib regex tester
    - * Copyright (C) 2010-2021 Gary Kramlich <grim@reaperworld.com>
    - *
    - * This program is free software: you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License as published by
    - * the Free Software Foundation, either version 3 of the License, or
    - * (at your option) any later version.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program. If not, see <http://www.gnu.org/licenses/>.
    - */
    -#ifndef GLIBRE_ABOUT_WINDOW_H
    -#define GLIBRE_ABOUT_WINDOW_H
    -
    -#include <glib.h>
    -#include <glib-object.h>
    -
    -#include <gtk/gtk.h>
    -
    -G_BEGIN_DECLS
    -
    -#define GLIBRE_TYPE_ABOUT_WINDOW (glibre_about_window_get_type())
    -G_DECLARE_FINAL_TYPE(GlibreAboutWindow, glibre_about_window, GLIBRE,
    - ABOUT_WINDOW, GtkAboutDialog)
    -
    -GtkWidget *glibre_about_window_new(void);
    -
    -G_END_DECLS
    -
    -#endif /* GLIBRE_ABOUT_WINDOW_H */
    --- a/src/glibre-application.c Tue Sep 21 02:23:35 2021 -0500
    +++ b/src/glibre-application.c Mon Mar 28 23:34:36 2022 -0500
    @@ -18,7 +18,6 @@
    #include "glibre-application.h"
    -#include "glibre-about-window.h"
    #include "glibre-window.h"
    struct _GlibreApplication {
    @@ -34,9 +33,20 @@
    glibre_application_about(GSimpleAction *action, GVariant *parameter,
    gpointer data)
    {
    - GtkWidget *about = glibre_about_window_new();
    + static GtkWidget *about = NULL;
    +
    + if(!GTK_IS_WIDGET(about)) {
    + GtkBuilder *builder = NULL;
    - gtk_window_present(GTK_WINDOW(about));
    + builder = gtk_builder_new_from_resource("/org/imfreedom/keep/grim/glibre/about.ui");
    + about = GTK_WIDGET(gtk_builder_get_object(builder, "GlibreAboutWindow"));
    +
    + g_object_add_weak_pointer(G_OBJECT(about), (gpointer)&about);
    +
    + g_object_unref(builder);
    + }
    +
    + gtk_window_present(GTK_WINDOW(about));
    }
    static void
    @@ -91,5 +101,6 @@
    return g_object_new(
    GLIBRE_TYPE_APPLICATION,
    "application-id", "org.imfreedom.keep.grim.glibre",
    + "register-session", TRUE,
    NULL);
    }
    --- a/src/meson.build Tue Sep 21 02:23:35 2021 -0500
    +++ b/src/meson.build Mon Mar 28 23:34:36 2022 -0500
    @@ -7,8 +7,6 @@
    source_dir: 'resources')
    glibre = executable('glibre',
    - 'glibre-about-window.c',
    - 'glibre-about-window.h',
    'glibre-application.c',
    'glibre-application.h',
    'glibre-main.c',
    --- a/src/resources/about.ui Tue Sep 21 02:23:35 2021 -0500
    +++ b/src/resources/about.ui Mon Mar 28 23:34:36 2022 -0500
    @@ -1,61 +1,16 @@
    <?xml version="1.0" encoding="UTF-8"?>
    -<!-- Generated with glade 3.38.2
    -
    -Copyright (C) Copyright (C) 2010-2021
    -
    -This file is part of glibre.
    -
    -glibre is free software: you can redistribute it and/or modify
    -it under the terms of the GNU General Public License as published by
    -the Free Software Foundation, either version 3 of the License, or
    -(at your option) any later version.
    -
    -glibre is distributed in the hope that it will be useful,
    -but WITHOUT ANY WARRANTY; without even the implied warranty of
    -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    -GNU General Public License for more details.
    -
    -You should have received a copy of the GNU General Public License
    -along with glibre. If not, see <http://www.gnu.org/licenses/>.
    -
    -Author: Gary Kramlich <grim@reaperworld.com>
    -
    --->
    <interface domain="glibre">
    - <requires lib="gtk+" version="3.24"/>
    - <!-- interface-license-type gplv3 -->
    - <!-- interface-name glibre -->
    - <!-- interface-description A GLib Regex Testing Tool -->
    - <!-- interface-copyright Copyright (C) 2010-2021 -->
    - <!-- interface-authors Gary Kramlich <grim@reaperworld.com> -->
    - <template class="GlibreAboutWindow" parent="GtkAboutDialog">
    - <property name="can-focus">False</property>
    - <property name="type-hint">dialog</property>
    + <requires lib="gtk" version="4.0"/>
    + <object id="GlibreAboutWindow" class="GtkAboutDialog">
    <property name="program-name">Glibre</property>
    - <property name="copyright" translatable="yes">Copyright © 2010-2019 Gary Kramlich &lt;grim@reaperworld.com&gt;</property>
    + <property name="copyright" translatable="1">Copyright © 2010-2022 Gary Kramlich &lt;grim@reaperworld.com&gt;</property>
    <property name="website">https://keep.imfreedom.org/grim/glibre</property>
    - <property name="website-label" translatable="yes">keep.imfreedom.org/grim/glibre</property>
    - <property name="license" translatable="yes">This program comes with absolutely no warranty.
    -See the &lt;a href="https://www.gnu.org/licenses/gpl-3.0.html"&gt;GNU General Public License, version 3 or later&lt;/a&gt; for details.</property>
    + <property name="website-label" translatable="1">keep.imfreedom.org/grim/glibre</property>
    + <property name="license" translatable="1">This program comes with absolutely no warranty.
    +See the &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU General Public License, version 3 or later&lt;/a&gt; for details.</property>
    <property name="authors">Gary Kramlich &lt;grim@reaperworld.com&gt;</property>
    <property name="logo-icon-name">edit-find-replace</property>
    - <property name="wrap-license">True</property>
    + <property name="wrap-license">1</property>
    <property name="license-type">gpl-3-0</property>
    - <child internal-child="vbox">
    - <object class="GtkBox">
    - <property name="can-focus">False</property>
    - <signal name="delete-event" handler="gtk_widget_destroy" swapped="yes"/>
    - <child internal-child="action_area">
    - <object class="GtkButtonBox">
    - <property name="can-focus">False</property>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">False</property>
    - <property name="position">0</property>
    - </packing>
    - </child>
    - </object>
    - </child>
    - </template>
    + </object>
    </interface>
    --- a/src/resources/glibre.gresource.xml Tue Sep 21 02:23:35 2021 -0500
    +++ b/src/resources/glibre.gresource.xml Mon Mar 28 23:34:36 2022 -0500
    @@ -1,7 +1,8 @@
    <?xml version="1.0" encoding="utf-8"?>
    <gresources>
    - <gresource prefix="org/imfreedom/keep/grim/glibre">
    - <file compressed="true">about.ui</file>
    - <file compressed="true">window.ui</file>
    - </gresource>
    + <gresource prefix="/org/imfreedom/keep/grim/glibre/">
    + <file compressed="true">about.ui</file>
    + <file compressed="true">gtk/menus.ui</file>
    + <file compressed="true">window.ui</file>
    + </gresource>
    </gresources>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/src/resources/gtk/menus.ui Mon Mar 28 23:34:36 2022 -0500
    @@ -0,0 +1,35 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<interface>
    + <requires lib="gtk" version="4.0"/>
    + <requires lib="gtk" version="4.0"/>
    + <menu id="menubar">
    + <submenu>
    + <attribute name="label" translatable="yes">_File</attribute>
    + <section>
    + <item>
    + <attribute name="label" translatable="yes">_Quit</attribute>
    + <attribute name="action">app.quit</attribute>
    + <attribute name="accel">&lt;Primary&gt;Q</attribute>
    + </item>
    + </section>
    + </submenu>
    + <submenu>
    + <attribute name="label" translatable="yes">_Edit</attribute>
    + <section>
    + <item>
    + <attribute name="label" translatable="yes">_Clear</attribute>
    + <attribute name="action">win.clear</attribute>
    + </item>
    + </section>
    + </submenu>
    + <submenu>
    + <attribute name="label" translatable="yes">_Help</attribute>
    + <section>
    + <item>
    + <attribute name="label" translatable="yes">About</attribute>
    + <attribute name="action">app.about</attribute>
    + </item>
    + </section>
    + </submenu>
    + </menu>
    +</interface>
    --- a/src/resources/window.ui Tue Sep 21 02:23:35 2021 -0500
    +++ b/src/resources/window.ui Mon Mar 28 23:34:36 2022 -0500
    @@ -1,15 +1,12 @@
    <?xml version="1.0" encoding="UTF-8"?>
    -<!-- Generated with glade 3.38.2 -->
    <interface>
    - <requires lib="gtk+" version="3.20"/>
    + <requires lib="gtk" version="4.0"/>
    <object class="GtkTextBuffer" id="data_buffer">
    <signal name="changed" handler="glibre_buffer_changed_cb" object="GlibreWindow" swapped="no"/>
    </object>
    <object class="GtkTreeStore" id="groups_store">
    <columns>
    - <!-- column-name Group -->
    <column type="gchararray"/>
    - <!-- column-name Data -->
    <column type="gchararray"/>
    </columns>
    </object>
    @@ -23,698 +20,438 @@
    <signal name="changed" handler="glibre_buffer_changed_cb" object="GlibreWindow" swapped="no"/>
    </object>
    <template class="GlibreWindow" parent="GtkApplicationWindow">
    - <property name="can-focus">False</property>
    - <property name="title" translatable="yes">Glibre</property>
    + <property name="title" translatable="1">Glibre</property>
    + <property name="show-menubar">0</property>
    <child>
    <object class="GtkBox">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    <property name="orientation">vertical</property>
    <child>
    - <object class="GtkMenuBar">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">_File</property>
    - <property name="use-underline">True</property>
    - <child type="submenu">
    - <object class="GtkMenu">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="action-name">app.quit</property>
    - <property name="label" translatable="yes">_Quit</property>
    - <property name="use-underline">True</property>
    - </object>
    - </child>
    + <object class="GtkFrame">
    + <property name="child">
    + <object class="GtkScrolledWindow">
    + <property name="focusable">1</property>
    + <property name="child">
    + <object class="GtkTextView" id="regex_entry">
    + <property name="focusable">1</property>
    + <property name="buffer">regex_buffer</property>
    </object>
    - </child>
    + </property>
    </object>
    - </child>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">_Edit</property>
    - <property name="use-underline">True</property>
    - <child type="submenu">
    - <object class="GtkMenu">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="action-name">win.clear</property>
    - <property name="label" translatable="yes">_Clear</property>
    - <property name="use-underline">True</property>
    - </object>
    - </child>
    - </object>
    - </child>
    - </object>
    - </child>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">_Help</property>
    - <property name="use-underline">True</property>
    - <child type="submenu">
    - <object class="GtkMenu">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <child>
    - <object class="GtkMenuItem">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="action-name">app.about</property>
    - <property name="label" translatable="yes">gtk-about</property>
    - <property name="use-underline">True</property>
    - </object>
    - </child>
    - </object>
    - </child>
    + </property>
    + <child type="label">
    + <object class="GtkLabel">
    + <property name="label" translatable="1">Regex</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">0</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkFrame">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label-xalign">0</property>
    - <property name="shadow-type">none</property>
    - <child>
    - <object class="GtkScrolledWindow">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="shadow-type">in</property>
    - <child>
    - <object class="GtkTextView" id="regex_entry">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="buffer">regex_buffer</property>
    - </object>
    - </child>
    - </object>
    - </child>
    - <child type="label">
    - <object class="GtkLabel">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Regex</property>
    - </object>
    - </child>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">1</property>
    - </packing>
    </child>
    <child>
    <object class="GtkExpander">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <child>
    <object class="GtkFlowBox">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    - <object class="GtkRadioButton" id="method_match_one">
    - <property name="label" translatable="yes">Match One</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="focusable">1</property>
    + <property name="child">
    + <object class="GtkCheckButton" id="method_match_one">
    + <property name="label" translatable="1">Match One</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    - <object class="GtkRadioButton" id="method_match_all">
    - <property name="label" translatable="yes">Match All</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="focusable">1</property>
    + <property name="child">
    + <object class="GtkCheckButton" id="method_match_all">
    + <property name="label" translatable="1">Match All</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <property name="group">method_match_one</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <child>
    - <object class="GtkRadioButton" id="method_split">
    - <property name="label" translatable="yes">Split</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="child">
    + <object class="GtkCheckButton" id="method_split">
    + <property name="label" translatable="1">Split</property>
    + <property name="active">1</property>
    <property name="group">method_match_one</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    </object>
    </child>
    <child type="label">
    <object class="GtkLabel" id="expander_method">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Method</property>
    + <property name="label" translatable="1">Method</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">2</property>
    - </packing>
    </child>
    <child>
    <object class="GtkExpander">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <child>
    <object class="GtkFlowBox">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_caseless">
    - <property name="label" translatable="yes">Caseless</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Caseless</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_multiline">
    - <property name="label" translatable="yes">Multiline</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Multiline</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_dotall">
    - <property name="label" translatable="yes">Dotall</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Dotall</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_extended">
    - <property name="label" translatable="yes">Extended</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Extended</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_anchored">
    - <property name="label" translatable="yes">Anchored</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Anchored</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_dollar_endonly">
    - <property name="label" translatable="yes">Dollar Endonly</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Dollar Endonly</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_ungreedy">
    - <property name="label" translatable="yes">Ungreedy</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Ungreedy</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_raw">
    - <property name="label" translatable="yes">Raw</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Raw</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_no_auto_capture">
    - <property name="label" translatable="yes">No Auto Capture</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">No Auto Capture</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_optimize">
    - <property name="label" translatable="yes">Optimize</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Optimize</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_dupnames">
    - <property name="label" translatable="yes">Dupnames</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Dupnames</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_newline_cr">
    - <property name="label" translatable="yes">Newline CR</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Newline CR</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="draw-indicator">True</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="c_newline_lf">
    - <property name="label" translatable="yes">Newline LF</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    + <property name="label" translatable="1">Newline LF</property>
    + <property name="focusable">1</property>
    <property name="halign">start</property>
    - <property name="active">True</property>
    - <property name="draw-indicator">True</property>
    + <property name="active">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    </object>
    </child>
    <child type="label">
    <object class="GtkLabel" id="expander_compile_options">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Compile Flags</property>
    + <property name="label" translatable="1">Compile Flags</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">3</property>
    - </packing>
    </child>
    <child>
    <object class="GtkExpander">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <child>
    <object class="GtkFlowBox">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_anchored">
    - <property name="label" translatable="yes">Anchored</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Anchored</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_not_bol">
    - <property name="label" translatable="yes">Not BOL</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Not BOL</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_not_eol">
    - <property name="label" translatable="yes">Not EOL</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Not EOL</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_not_empty">
    - <property name="label" translatable="yes">Not Empty</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Not Empty</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_partial">
    - <property name="label" translatable="yes">Partial</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Partial</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_newline_cr">
    - <property name="label" translatable="yes">Newline CR</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Newline CR</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_newline_lf">
    - <property name="label" translatable="yes">Newline LF</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Newline LF</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    <child>
    <object class="GtkFlowBoxChild">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkCheckButton" id="m_newline_any">
    - <property name="label" translatable="yes">Newline Any</property>
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="receives-default">False</property>
    - <property name="draw-indicator">True</property>
    + <property name="label" translatable="1">Newline Any</property>
    + <property name="focusable">1</property>
    <signal name="toggled" handler="glibre_toggle_toggled_cb" object="GlibreWindow" swapped="no"/>
    </object>
    - </child>
    + </property>
    </object>
    </child>
    </object>
    </child>
    <child type="label">
    <object class="GtkLabel" id="expander_match_options">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Match Flags</property>
    + <property name="label" translatable="1">Match Flags</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">4</property>
    - </packing>
    </child>
    <child>
    <object class="GtkFrame">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label-xalign">0</property>
    - <property name="shadow-type">none</property>
    - <child>
    + <property name="child">
    <object class="GtkScrolledWindow">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="shadow-type">in</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkTextView" id="replacement_entry">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <property name="buffer">replacement_buffer</property>
    </object>
    - </child>
    + </property>
    </object>
    - </child>
    + </property>
    <child type="label">
    <object class="GtkLabel">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Replacement</property>
    + <property name="label" translatable="1">Replacement</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">5</property>
    - </packing>
    </child>
    <child>
    <object class="GtkFrame">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label-xalign">0</property>
    - <property name="shadow-type">none</property>
    - <child>
    + <property name="child">
    <object class="GtkScrolledWindow">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="shadow-type">in</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkTextView" id="data_entry">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <property name="buffer">data_buffer</property>
    </object>
    - </child>
    + </property>
    </object>
    - </child>
    + </property>
    <child type="label">
    <object class="GtkLabel">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Data</property>
    + <property name="label" translatable="1">Data</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">6</property>
    - </packing>
    </child>
    <child>
    <object class="GtkFrame">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label-xalign">0</property>
    - <property name="shadow-type">none</property>
    - <child>
    + <property name="child">
    <object class="GtkScrolledWindow">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="shadow-type">in</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkTreeView" id="groups_tree">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <property name="model">groups_store</property>
    <child internal-child="selection">
    <object class="GtkTreeSelection"/>
    </child>
    <child>
    <object class="GtkTreeViewColumn">
    - <property name="title" translatable="yes">Group</property>
    + <property name="title" translatable="1">Group</property>
    <child>
    <object class="GtkCellRendererText"/>
    <attributes>
    @@ -725,7 +462,7 @@
    </child>
    <child>
    <object class="GtkTreeViewColumn">
    - <property name="title" translatable="yes">Data</property>
    + <property name="title" translatable="1">Data</property>
    <child>
    <object class="GtkCellRendererText"/>
    <attributes>
    @@ -735,56 +472,35 @@
    </object>
    </child>
    </object>
    - </child>
    + </property>
    </object>
    - </child>
    + </property>
    <child type="label">
    <object class="GtkLabel">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Groups</property>
    + <property name="label" translatable="1">Groups</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">7</property>
    - </packing>
    </child>
    <child>
    <object class="GtkFrame">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label-xalign">0</property>
    - <property name="shadow-type">none</property>
    - <child>
    + <property name="child">
    <object class="GtkScrolledWindow">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    - <property name="shadow-type">in</property>
    - <child>
    + <property name="focusable">1</property>
    + <property name="child">
    <object class="GtkTextView" id="results_entry">
    - <property name="visible">True</property>
    - <property name="can-focus">True</property>
    + <property name="focusable">1</property>
    <property name="buffer">results_buffer</property>
    </object>
    - </child>
    + </property>
    </object>
    - </child>
    + </property>
    <child type="label">
    <object class="GtkLabel">
    - <property name="visible">True</property>
    - <property name="can-focus">False</property>
    - <property name="label" translatable="yes">Results</property>
    + <property name="label" translatable="1">Results</property>
    </object>
    </child>
    </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">8</property>
    - </packing>
    </child>
    </object>
    </child>