calendar-management/pages: Subclass AdwBin
It's simpler.
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
|
||||
struct _GcalCalendarsPage
|
||||
{
|
||||
GtkBox parent;
|
||||
AdwBin parent;
|
||||
|
||||
GtkListBoxRow *add_calendar_row;
|
||||
GtkListBox *listbox;
|
||||
@@ -50,7 +50,7 @@ static void on_calendar_color_changed_cb (GcalCalendar
|
||||
GParamSpec *pspec,
|
||||
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,
|
||||
gcal_calendar_management_page_iface_init))
|
||||
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <adwaita.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#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
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GcalCalendarsPage" parent="GtkBox">
|
||||
<property name="orientation">vertical</property>
|
||||
<template class="GcalCalendarsPage" parent="AdwBin">
|
||||
<child>
|
||||
<object class="GtkOverlay">
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
struct _GcalEditCalendarPage
|
||||
{
|
||||
GtkBox parent;
|
||||
AdwBin parent;
|
||||
|
||||
AdwActionRow *account_row;
|
||||
GtkColorDialogButton *calendar_color_button;
|
||||
@@ -45,7 +45,7 @@ struct _GcalEditCalendarPage
|
||||
|
||||
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,
|
||||
gcal_calendar_management_page_iface_init))
|
||||
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <adwaita.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#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
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GcalEditCalendarPage" parent="GtkBox">
|
||||
<property name="orientation">vertical</property>
|
||||
|
||||
<template class="GcalEditCalendarPage" parent="AdwBin">
|
||||
<child>
|
||||
<object class="AdwToolbarView">
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ typedef enum
|
||||
|
||||
struct _GcalNewCalendarPage
|
||||
{
|
||||
GtkBox parent;
|
||||
AdwBin parent;
|
||||
|
||||
GtkWidget *add_button;
|
||||
GtkEntry *calendar_address_entry;
|
||||
@@ -77,7 +77,7 @@ static void sources_discovered_cb (GObject
|
||||
|
||||
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,
|
||||
gcal_calendar_management_page_iface_init))
|
||||
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <adwaita.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#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
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GcalNewCalendarPage" parent="GtkBox">
|
||||
<property name="orientation">vertical</property>
|
||||
|
||||
<template class="GcalNewCalendarPage" parent="AdwBin">
|
||||
<child>
|
||||
<object class="AdwToolbarView">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user