Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: Port to GTK4

Browse Source 
Subclass AdwApplication.
This commit is contained in:
Georges Basile Stavracas Neto
2022-02-11 09:18:38 -03:00
parent 9b56010b12
commit c6fab7675b
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-application.c
+4 -26
View File
@@ -32,11 +32,10 @@
#include <glib-object.h> #include <glib-object.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <handy.h>
struct _GcalApplication struct _GcalApplication
{ {
DzlApplication parent; AdwApplication parent;
GtkWidget *window; GtkWidget *window;
@@ -48,7 +47,7 @@ struct _GcalApplication
GcalContext *context; GcalContext *context;
}; };
G_DEFINE_TYPE (GcalApplication, gcal_application, DZL_TYPE_APPLICATION); G_DEFINE_TYPE (GcalApplication, gcal_application, ADW_TYPE_APPLICATION);
static gboolean show_version = FALSE; static gboolean show_version = FALSE;
@@ -135,18 +134,6 @@ gcal_application_launch_search (GSimpleAction *search,
{ {
} }
static void
on_about_response (GtkAboutDialog *about,
int response_id,
gpointer user_data)
{
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
g_return_if_fail (user_data == NULL);
if (response_id == GTK_RESPONSE_CANCEL)
gtk_widget_destroy (GTK_WIDGET (about));
}
static gchar* static gchar*
build_about_copyright (GcalApplication *self) build_about_copyright (GcalApplication *self)
{ {
@@ -222,10 +209,8 @@ gcal_application_show_about (GSimpleAction *simple,
GTK_TYPE_ABOUT_DIALOG, GTK_TYPE_ABOUT_DIALOG,
"copyright_label")); "copyright_label"));
gtk_label_set_markup (copyright_label, copyright); gtk_label_set_markup (copyright_label, copyright);
gtk_widget_show (GTK_WIDGET (copyright_label));
g_signal_connect (dialog, "response", G_CALLBACK (on_about_response), NULL); gtk_window_present (GTK_WINDOW (dialog));
gtk_widget_show (dialog);
} }
static void static void
@@ -235,7 +220,7 @@ gcal_application_quit (GSimpleAction *simple,
{ {
GcalApplication *self = GCAL_APPLICATION (user_data); GcalApplication *self = GCAL_APPLICATION (user_data);
gtk_widget_destroy (self->window); gtk_window_destroy (GTK_WINDOW (self->window));
} }
@@ -307,7 +292,6 @@ gcal_application_activate (GApplication *application)
"active-date", self->initial_date, "active-date", self->initial_date,
NULL); NULL);
g_signal_connect (self->window, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->window);
g_object_add_weak_pointer (G_OBJECT (self->window), (gpointer*) &self->window); g_object_add_weak_pointer (G_OBJECT (self->window), (gpointer*) &self->window);
gtk_widget_show (self->window); gtk_widget_show (self->window);
} }
@@ -359,12 +343,6 @@ gcal_application_startup (GApplication *app)
if ((g_application_get_flags (app) & G_APPLICATION_IS_SERVICE) != 0) if ((g_application_get_flags (app) & G_APPLICATION_IS_SERVICE) != 0)
g_application_set_inactivity_timeout (app, 3 * 60 * 1000); g_application_set_inactivity_timeout (app, 3 * 60 * 1000);
/* initialize libhandy */
hdy_init();
hdy_style_manager_set_color_scheme (hdy_style_manager_get_default (),
HDY_COLOR_SCHEME_PREFER_LIGHT);
/* Startup the manager */ /* Startup the manager */
gcal_context_startup (self->context); gcal_context_startup (self->context);
src/gui/gcal-application.h
+2 -2
View File
@@ -24,12 +24,12 @@
#include "gcal-context.h" #include "gcal-context.h"
#include "gcal-manager.h" #include "gcal-manager.h"
#include <dazzle.h> #include <adwaita.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GCAL_TYPE_APPLICATION (gcal_application_get_type ()) #define GCAL_TYPE_APPLICATION (gcal_application_get_type ())
G_DECLARE_FINAL_TYPE (GcalApplication, gcal_application, GCAL, APPLICATION, DzlApplication) G_DECLARE_FINAL_TYPE (GcalApplication, gcal_application, GCAL, APPLICATION, AdwApplication)
GcalApplication* gcal_application_new (void); GcalApplication* gcal_application_new (void);