Rework folder hierarchy

parent 1441436e
Pipeline #179554 failed with stages
in 10 minutes and 47 seconds
......@@ -26,19 +26,6 @@ service = configure_file(
configuration: service_conf
)
gnome.mkenums(
'org.gnome.todo.enums.xml',
sources: enum_headers,
comments: '<!-- @comment@ -->',
fhead: '<schemalist>',
vhead: ' <@type@ id="org.gnome.todo.@EnumName@">',
vprod: ' <value nick="@valuenick@" value="@valuenum@"/>',
vtail: ' </@type@>',
ftail: '</schemalist>',
install_header: true,
install_dir: gnome_todo_schemadir
)
install_data(
'org.gnome.todo.gschema.xml',
install_dir: gnome_todo_schemadir
......
......@@ -20,18 +20,18 @@
#include "models/gtd-list-store.h"
#include "models/gtd-task-model-private.h"
#include "interfaces/gtd-provider.h"
#include "interfaces/gtd-panel.h"
#include "interfaces/gtd-workspace.h"
#include "notification/gtd-notification.h"
#include "gtd-clock.h"
#include "gtd-debug.h"
#include "gtd-manager.h"
#include "gtd-manager-protected.h"
#include "gtd-notification.h"
#include "gtd-panel.h"
#include "gtd-plugin-manager.h"
#include "gtd-provider.h"
#include "gtd-task.h"
#include "gtd-task-list.h"
#include "gtd-utils.h"
#include "gtd-workspace.h"
#include <glib/gi18n.h>
......
......@@ -18,10 +18,10 @@
#define G_LOG_DOMAIN "GtdPluginManager"
#include "interfaces/gtd-activatable.h"
#include "interfaces/gtd-panel.h"
#include "interfaces/gtd-provider.h"
#include "gtd-activatable.h"
#include "gtd-manager.h"
#include "gtd-panel.h"
#include "gtd-provider.h"
#include "gtd-plugin-manager.h"
#include "gtd-theme-manager.h"
......
......@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "GtdTaskList"
#include "interfaces/gtd-provider.h"
#include "gtd-debug.h"
#include "gtd-provider.h"
#include "gtd-task.h"
#include "gtd-task-list.h"
......
......@@ -22,7 +22,6 @@
#include <libpeas/peas.h>
#include "gtd-activatable.h"
#include "gtd-enums.h"
#include "gtd-list-model-filter.h"
#include "gtd-list-model-sort.h"
#include "gtd-list-store.h"
......
/*** BEGIN file-header ***/
#include "gtd-enum-types.h"
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
#include "@filename@"
/*** END file-production ***/
/*** BEGIN value-header ***/
GType
@enum_name@_get_type (void)
{
static GType the_type = 0;
if (the_type == 0)
{
static const G@Type@Value values[] = {
/*** END value-header ***/
/*** BEGIN value-production ***/
{ @VALUENAME@,
"@VALUENAME@",
"@valuenick@" },
/*** END value-production ***/
/*** BEGIN value-tail ***/
{ 0, NULL, NULL }
};
the_type = g_@type@_register_static (
g_intern_static_string ("@EnumName@"),
values);
}
return the_type;
}
/*** END value-tail ***/
/*** BEGIN file-header ***/
#ifndef __GTD_ENUMS_H__
#define __GTD_ENUMS_H__
#include <glib-object.h>
G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
/* Enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN enumeration-production ***/
#define GTD_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** END enumeration-production ***/
/*** BEGIN file-tail ***/
G_END_DECLS
#endif /* __GTD_ENUMS_H__ */
/*** END file-tail ***/
/* gtd-enums.h
*
* Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges.stavracas@gmail.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 GTD_ENUMS_H
#define GTD_ENUMS_H
#include <glib-object.h>
G_BEGIN_DECLS
G_END_DECLS
#endif /* GTD_ENUMS_H */
......@@ -21,8 +21,6 @@
#include <glib-object.h>
#include "gtd-enums.h"
G_BEGIN_DECLS
typedef struct _GtdActivatable GtdActivatable;
......
/* gtd-color-button.c
*
* Copyright 2018 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
* Copyright 2018-2020 Georges Basile Stavracas Neto <georges.stavracas@gmail.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
......@@ -20,7 +20,7 @@
#define G_LOG_DOMAIN "GtdColorButton"
#include "widgets/gtd-color-button.h"
#include "gtd-color-button.h"
#include "gtd-utils.h"
#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
......
......@@ -456,7 +456,7 @@ gtd_edit_pane_class_init (GtdEditPaneClass *klass)
GTD_TYPE_TASK);
/* template class */
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/task-list-view/gtd-edit-pane.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-edit-pane.ui");
gtk_widget_class_bind_template_child (widget_class, GtdEditPane, calendar);
gtk_widget_class_bind_template_child (widget_class, GtdEditPane, date_label);
......
/* gtd-initial-setup-window.c
*
* Copyright (C) 2015 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
* Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges.stavracas@gmail.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
......@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "GtdInitialSetupWindow"
#include "interfaces/gtd-provider.h"
#include "gtd-provider.h"
#include "gtd-application.h"
#include "gtd-provider-selector.h"
#include "gtd-initial-setup-window.h"
......
......@@ -306,7 +306,7 @@ gtd_new_task_row_class_init (GtdNewTaskRowClass *klass)
G_TYPE_NONE,
0);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/task-list-view/gtd-new-task-row.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-new-task-row.ui");
gtk_widget_class_bind_template_child (widget_class, GtdNewTaskRow, entry);
gtk_widget_class_bind_template_child (widget_class, GtdNewTaskRow, tasklist_popover);
......
......@@ -208,7 +208,7 @@ gtd_notification_widget_class_init (GtdNotificationWidgetClass *klass)
object_class->finalize = gtd_notification_widget_finalize;
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/notification/gtd-notification-widget.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-notification-widget.ui");
gtk_widget_class_bind_template_child (widget_class, GtdNotificationWidget, secondary_button);
gtk_widget_class_bind_template_child (widget_class, GtdNotificationWidget, spinner);
......
......@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "GtdPluginDialog"
#include "interfaces/gtd-activatable.h"
#include "gtd-activatable.h"
#include "gtd-manager.h"
#include "gtd-manager-protected.h"
#include "gtd-plugin-manager.h"
......
......@@ -19,7 +19,7 @@
#define G_LOG_DOMAIN "GtdProviderPopover"
#include "gtd-manager.h"
#include "interfaces/gtd-provider.h"
#include "gtd-provider.h"
#include "gtd-provider-popover.h"
#include "gtd-provider-selector.h"
#include "gtd-task-list.h"
......@@ -215,7 +215,7 @@ gtd_provider_popover_class_init (GtdProviderPopoverClass *klass)
g_type_ensure (GTD_TYPE_PROVIDER_SELECTOR);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/provider/gtd-provider-popover.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-provider-popover.ui");
gtk_widget_class_bind_template_child (widget_class, GtdProviderPopover, change_location_button);
gtk_widget_class_bind_template_child (widget_class, GtdProviderPopover, location_provider_image);
......
/* gtd-provider-row.c
*
* Copyright (C) 2015 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
* Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges.stavracas@gmail.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
......@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "GtdProviderRow"
#include "interfaces/gtd-provider.h"
#include "gtd-provider.h"
#include "gtd-provider-row.h"
#include <glib/gi18n.h>
......@@ -153,7 +153,7 @@ gtd_provider_row_class_init (GtdProviderRowClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/provider/gtd-provider-row.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-provider-row.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtdProviderRow, icon);
gtk_widget_class_bind_template_child_private (widget_class, GtdProviderRow, name);
......
......@@ -20,7 +20,7 @@
#include "gtd-application.h"
#include "gtd-manager.h"
#include "interfaces/gtd-provider.h"
#include "gtd-provider.h"
#include "gtd-provider-row.h"
#include "gtd-provider-selector.h"
......@@ -458,7 +458,7 @@ gtd_provider_selector_class_init (GtdProviderSelectorClass *klass)
TRUE,
G_PARAM_READWRITE));
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/provider/gtd-provider-selector.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-provider-selector.ui");
gtk_widget_class_bind_template_child (widget_class, GtdProviderSelector, exchange_stub_row);
gtk_widget_class_bind_template_child (widget_class, GtdProviderSelector, google_stub_row);
......
......@@ -222,7 +222,7 @@ gtd_task_list_popover_class_init (GtdTaskListPopoverClass *klass)
GTD_TYPE_TASK_LIST,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/task-list-view/gtd-task-list-popover.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-task-list-popover.ui");
gtk_widget_class_bind_template_child (widget_class, GtdTaskListPopover, listbox);
gtk_widget_class_bind_template_child (widget_class, GtdTaskListPopover, search_entry);
......
......@@ -1156,7 +1156,7 @@ gtd_task_list_view_class_init (GtdTaskListViewClass *klass)
TRUE,
G_PARAM_READWRITE));
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/task-list-view/gtd-task-list-view.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-task-list-view.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtdTaskListView, due_date_sizegroup);
gtk_widget_class_bind_template_child_private (widget_class, GtdTaskListView, listbox);
......
......@@ -693,7 +693,7 @@ gtd_task_row_class_init (GtdTaskRowClass *klass)
G_TYPE_NONE,
0);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/task-list-view/gtd-task-row.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-task-row.ui");
gtk_widget_class_bind_template_child (widget_class, GtdTaskRow, content_box);
gtk_widget_class_bind_template_child (widget_class, GtdTaskRow, dnd_box);
......
......@@ -20,24 +20,24 @@
#include "config.h"
#include "interfaces/gtd-activatable.h"
#include "interfaces/gtd-provider.h"
#include "interfaces/gtd-panel.h"
#include "interfaces/gtd-workspace.h"
#include "widgets/gtd-menu-button.h"
#include "gtd-activatable.h"
#include "gtd-application.h"
#include "gtd-debug.h"
#include "gtd-enum-types.h"
#include "gtd-task-list-view.h"
#include "gtd-manager.h"
#include "gtd-manager-protected.h"
#include "gtd-menu-button.h"
#include "gtd-notification.h"
#include "gtd-notification-widget.h"
#include "gtd-omni-area.h"
#include "gtd-plugin-manager.h"
#include "gtd-provider.h"
#include "gtd-panel.h"
#include "gtd-task.h"
#include "gtd-task-list.h"
#include "gtd-window.h"
#include "gtd-workspace.h"
#include <glib/gi18n.h>
#include <libpeas/peas.h>
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/todo/ui">
<file compressed="true" preprocess="xml-stripblanks">gtd-dnd-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-edit-pane.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-empty-list-widget.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-initial-setup-window.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-new-task-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-notification-widget.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-omni-area.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-plugin-dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-plugin-dialog-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-provider-popover.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-provider-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-provider-selector.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-task-list-popover.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-task-list-view.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-task-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtd-window.ui</file>
</gresource>
</gresources>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment