grim/glibre

fix the menubar stuff and a few other things

2022-03-29, Gary Kramlich
7e4888a238db
Parents 888fbe86d1c6
Children 5fb00db01bdd
fix the menubar stuff and a few other things
4 files changed, 19 insertions(+), 10 deletions(-)
  • +3 -1
    meson.build
  • +12 -6
    src/glibre-application.c
  • +3 -2
    src/glibre-window.c
  • +1 -1
    src/resources/window.ui
    • --- a/meson.build Mon Mar 28 23:34:36 2022 -0500
    +++ b/meson.build Tue Mar 29 01:22:59 2022 -0500
    @@ -1,4 +1,6 @@
    -project('glibre', 'c', version : '0.0.3-dev')
    +project('glibre', 'c', version : '0.0.3-dev',
    + default_options : ['c_std=c99', 'warning_level=2'],
    +)
    GLIB = dependency('glib-2.0', version : '>=2.52.0')
    GTK3 = dependency('gtk4', version : '>=4.6.0')
    --- a/src/glibre-application.c Mon Mar 28 23:34:36 2022 -0500
    +++ b/src/glibre-application.c Tue Mar 29 01:22:59 2022 -0500
    @@ -30,8 +30,9 @@
    * GActions
    *****************************************************************************/
    static void
    -glibre_application_about(GSimpleAction *action, GVariant *parameter,
    - gpointer data)
    +glibre_application_about(G_GNUC_UNUSED GSimpleAction *action,
    + G_GNUC_UNUSED GVariant *parameter,
    + G_GNUC_UNUSED gpointer data)
    {
    static GtkWidget *about = NULL;
    @@ -50,15 +51,16 @@
    }
    static void
    -glibre_application_quit(GSimpleAction *action, GVariant *parameter,
    +glibre_application_quit(G_GNUC_UNUSED GSimpleAction *action,
    + G_GNUC_UNUSED GVariant *parameter,
    gpointer data)
    {
    g_application_quit(G_APPLICATION(data));
    }
    static GActionEntry app_entries[] = {
    - { "about", glibre_application_about, NULL, NULL, NULL },
    - { "quit", glibre_application_quit, NULL, NULL, NULL }
    + { .name = "about", .activate = glibre_application_about },
    + { .name = "quit", .activate = glibre_application_quit }
    };
    /******************************************************************************
    @@ -71,7 +73,11 @@
    static void
    glibre_application_activate(GApplication *app) {
    - GtkWidget *window = glibre_window_new(GTK_APPLICATION(app));
    + static GtkWidget *window = NULL;
    +
    + if(!GTK_IS_WIDGET(window)) {
    + window = glibre_window_new(GTK_APPLICATION(app));
    + }
    gtk_window_present(GTK_WINDOW(window));
    }
    --- a/src/glibre-window.c Mon Mar 28 23:34:36 2022 -0500
    +++ b/src/glibre-window.c Tue Mar 29 01:22:59 2022 -0500
    @@ -292,7 +292,7 @@
    * Callbacks
    *****************************************************************************/
    static void
    -glibre_buffer_changed_cb(GtkTextBuffer *buffer, gpointer data) {
    +glibre_buffer_changed_cb(G_GNUC_UNUSED GtkTextBuffer *buffer, gpointer data) {
    GlibreWindow *window = GLIBRE_WINDOW(data);
    if(window->loaded) {
    @@ -301,7 +301,7 @@
    }
    static void
    -glibre_toggle_toggled_cb(GtkToggleButton *button, gpointer data) {
    +glibre_toggle_toggled_cb(G_GNUC_UNUSED GtkToggleButton *button, gpointer data) {
    GlibreWindow *window = GLIBRE_WINDOW(data);
    if(window->loaded) {
    @@ -380,5 +380,6 @@
    return g_object_new(
    GLIBRE_TYPE_WINDOW,
    "application", application,
    + "show-menubar", TRUE,
    NULL);
    }
    --- a/src/resources/window.ui Mon Mar 28 23:34:36 2022 -0500
    +++ b/src/resources/window.ui Tue Mar 29 01:22:59 2022 -0500
    @@ -21,7 +21,7 @@
    </object>
    <template class="GlibreWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="1">Glibre</property>
    - <property name="show-menubar">0</property>
    + <property name="show-menubar">1</property>
    <child>
    <object class="GtkBox">
    <property name="orientation">vertical</property>