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

calendar-management/pages: Subclass AdwBin

Browse Source 
It's simpler.
This commit is contained in:
Georges Basile Stavracas Neto
2023-06-22 00:20:21 +00:00
parent bdda09abb8
commit a13b4ae4f6
9 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/calendar-management/gcal-calendars-page.c
+2 -2
View File
@@ -30,7 +30,7 @@
struct _GcalCalendarsPage struct _GcalCalendarsPage
{ {
GtkBox parent; AdwBin parent;
GtkListBoxRow *add_calendar_row; GtkListBoxRow *add_calendar_row;
GtkListBox *listbox; GtkListBox *listbox;
@@ -50,7 +50,7 @@ static void on_calendar_color_changed_cb (GcalCalendar
GParamSpec *pspec, GParamSpec *pspec,
GtkImage *icon); GtkImage *icon);
G_DEFINE_TYPE_WITH_CODE (GcalCalendarsPage, gcal_calendars_page, GTK_TYPE_BOX, G_DEFINE_TYPE_WITH_CODE (GcalCalendarsPage, gcal_calendars_page, ADW_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE, G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE,
gcal_calendar_management_page_iface_init)) gcal_calendar_management_page_iface_init))
src/gui/calendar-management/gcal-calendars-page.h
+2 -2
View File
@@ -20,11 +20,11 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <adwaita.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GCAL_TYPE_CALENDARS_PAGE (gcal_calendars_page_get_type()) #define GCAL_TYPE_CALENDARS_PAGE (gcal_calendars_page_get_type())
G_DECLARE_FINAL_TYPE (GcalCalendarsPage, gcal_calendars_page, GCAL, CALENDARS_PAGE, GtkBox) G_DECLARE_FINAL_TYPE (GcalCalendarsPage, gcal_calendars_page, GCAL, CALENDARS_PAGE, AdwBin)
G_END_DECLS G_END_DECLS
src/gui/calendar-management/gcal-calendars-page.ui
+1 -2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<template class="GcalCalendarsPage" parent="GtkBox"> <template class="GcalCalendarsPage" parent="AdwBin">
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkOverlay"> <object class="GtkOverlay">
src/gui/calendar-management/gcal-edit-calendar-page.c
+2 -2
View File
@@ -28,7 +28,7 @@
struct _GcalEditCalendarPage struct _GcalEditCalendarPage
{ {
GtkBox parent; AdwBin parent;
AdwActionRow *account_row; AdwActionRow *account_row;
GtkColorDialogButton *calendar_color_button; GtkColorDialogButton *calendar_color_button;
@@ -45,7 +45,7 @@ struct _GcalEditCalendarPage
static void gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface); static void gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GcalEditCalendarPage, gcal_edit_calendar_page, GTK_TYPE_BOX, G_DEFINE_TYPE_WITH_CODE (GcalEditCalendarPage, gcal_edit_calendar_page, ADW_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE, G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE,
gcal_calendar_management_page_iface_init)) gcal_calendar_management_page_iface_init))
src/gui/calendar-management/gcal-edit-calendar-page.h
+2 -2
View File
@@ -20,11 +20,11 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <adwaita.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GCAL_TYPE_EDIT_CALENDAR_PAGE (gcal_edit_calendar_page_get_type()) #define GCAL_TYPE_EDIT_CALENDAR_PAGE (gcal_edit_calendar_page_get_type())
G_DECLARE_FINAL_TYPE (GcalEditCalendarPage, gcal_edit_calendar_page, GCAL, EDIT_CALENDAR_PAGE, GtkBox) G_DECLARE_FINAL_TYPE (GcalEditCalendarPage, gcal_edit_calendar_page, GCAL, EDIT_CALENDAR_PAGE, AdwBin)
G_END_DECLS G_END_DECLS
src/gui/calendar-management/gcal-edit-calendar-page.ui
+1 -3
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<template class="GcalEditCalendarPage" parent="GtkBox"> <template class="GcalEditCalendarPage" parent="AdwBin">
<property name="orientation">vertical</property>
<child> <child>
<object class="AdwToolbarView"> <object class="AdwToolbarView">
src/gui/calendar-management/gcal-new-calendar-page.c
+2 -2
View File
@@ -42,7 +42,7 @@ typedef enum
struct _GcalNewCalendarPage struct _GcalNewCalendarPage
{ {
GtkBox parent; AdwBin parent;
GtkWidget *add_button; GtkWidget *add_button;
GtkEntry *calendar_address_entry; GtkEntry *calendar_address_entry;
@@ -77,7 +77,7 @@ static void sources_discovered_cb (GObject
static void gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface); static void gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GcalNewCalendarPage, gcal_new_calendar_page, GTK_TYPE_BOX, G_DEFINE_TYPE_WITH_CODE (GcalNewCalendarPage, gcal_new_calendar_page, ADW_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE, G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE,
gcal_calendar_management_page_iface_init)) gcal_calendar_management_page_iface_init))
src/gui/calendar-management/gcal-new-calendar-page.h
+2 -2
View File
@@ -20,11 +20,11 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <adwaita.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GCAL_TYPE_NEW_CALENDAR_PAGE (gcal_new_calendar_page_get_type()) #define GCAL_TYPE_NEW_CALENDAR_PAGE (gcal_new_calendar_page_get_type())
G_DECLARE_FINAL_TYPE (GcalNewCalendarPage, gcal_new_calendar_page, GCAL, NEW_CALENDAR_PAGE, GtkBox) G_DECLARE_FINAL_TYPE (GcalNewCalendarPage, gcal_new_calendar_page, GCAL, NEW_CALENDAR_PAGE, AdwBin)
G_END_DECLS G_END_DECLS
src/gui/calendar-management/gcal-new-calendar-page.ui
+1 -3
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<template class="GcalNewCalendarPage" parent="GtkBox"> <template class="GcalNewCalendarPage" parent="AdwBin">
<property name="orientation">vertical</property>
<child> <child>
<object class="AdwToolbarView"> <object class="AdwToolbarView">