diff --git a/src/gcal-enums.h b/src/gcal-enums.h new file mode 100644 index 00000000..b682fd51 --- /dev/null +++ b/src/gcal-enums.h @@ -0,0 +1,53 @@ +/* gcal-enums.h + * + * Copyright © 2018 Georges Basile Stavracas Neto + * + * 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 . + */ + +#pragma once + + +/** + * GcalWindowViewType: + * @GCAL_WINDOW_VIEW_DAY: Day view (not implemented) + * @GCAL_WINDOW_VIEW_WEEK: Week view + * @GCAL_WINDOW_VIEW_MONTH: Month view + * @GCAL_WINDOW_VIEW_YEAR: Year view + * @GCAL_WINDOW_VIEW_LIST: List (not implemented) + * @GCAL_WINDOW_VIEW_SEARCH: Search view (partially implemented) + * + * Enum with the available views. + */ +typedef enum +{ + GCAL_WINDOW_VIEW_DAY, + GCAL_WINDOW_VIEW_WEEK, + GCAL_WINDOW_VIEW_MONTH, + GCAL_WINDOW_VIEW_YEAR, + GCAL_WINDOW_VIEW_LIST, + GCAL_WINDOW_VIEW_SEARCH, +} GcalWindowViewType; + +typedef enum +{ + GCAL_WEEK_DAY_INVALID = 0, + GCAL_WEEK_DAY_SUNDAY = 1 << 0, + GCAL_WEEK_DAY_MONDAY = 1 << 1, + GCAL_WEEK_DAY_TUESDAY = 1 << 2, + GCAL_WEEK_DAY_WEDNESDAY = 1 << 3, + GCAL_WEEK_DAY_THURSDAY = 1 << 4, + GCAL_WEEK_DAY_FRIDAY = 1 << 5, + GCAL_WEEK_DAY_SATURDAY = 1 << 6 +} GcalWeekDay; diff --git a/src/gcal-utils.c b/src/gcal-utils.c index d1691d53..d5b93de4 100644 --- a/src/gcal-utils.c +++ b/src/gcal-utils.c @@ -20,6 +20,7 @@ #define G_LOG_DOMAIN "Utils" +#include "gcal-enums.h" #include "gcal-utils.h" #include "gcal-event-widget.h" #include "gcal-view.h" diff --git a/src/gcal-utils.h b/src/gcal-utils.h index 66297ebe..02f62ce8 100644 --- a/src/gcal-utils.h +++ b/src/gcal-utils.h @@ -38,39 +38,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (GWeatherLocation, gweather_location_unref) -/** - * GcalWindowViewType: - * @GCAL_WINDOW_VIEW_DAY: Day view (not implemented) - * @GCAL_WINDOW_VIEW_WEEK: Week view - * @GCAL_WINDOW_VIEW_MONTH: Month view - * @GCAL_WINDOW_VIEW_YEAR: Year view - * @GCAL_WINDOW_VIEW_LIST: List (not implemented) - * @GCAL_WINDOW_VIEW_SEARCH: Search view (partially implemented) - * - * Enum with the available views. - */ -typedef enum -{ - GCAL_WINDOW_VIEW_DAY, - GCAL_WINDOW_VIEW_WEEK, - GCAL_WINDOW_VIEW_MONTH, - GCAL_WINDOW_VIEW_YEAR, - GCAL_WINDOW_VIEW_LIST, - GCAL_WINDOW_VIEW_SEARCH, -} GcalWindowViewType; - -typedef enum -{ - GCAL_WEEK_DAY_INVALID = 0, - GCAL_WEEK_DAY_SUNDAY = 1 << 0, - GCAL_WEEK_DAY_MONDAY = 1 << 1, - GCAL_WEEK_DAY_TUESDAY = 1 << 2, - GCAL_WEEK_DAY_WEDNESDAY = 1 << 3, - GCAL_WEEK_DAY_THURSDAY = 1 << 4, - GCAL_WEEK_DAY_FRIDAY = 1 << 5, - GCAL_WEEK_DAY_SATURDAY = 1 << 6 -} GcalWeekDay; - GType icaltime_get_type (void) G_GNUC_CONST; gint datetime_compare_date (GDateTime *dt1, diff --git a/src/gcal-window.c b/src/gcal-window.c index e22e35e7..4f609c78 100644 --- a/src/gcal-window.c +++ b/src/gcal-window.c @@ -21,6 +21,7 @@ #include "gcal-debug.h" #include "gcal-edit-dialog.h" +#include "gcal-enums.h" #include "gcal-enum-types.h" #include "gcal-event-widget.h" #include "gcal-manager.h" diff --git a/src/meson.build b/src/meson.build index 4f0ef358..064fc93c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,6 @@ src_inc = include_directories('.') -enum_headers = files('gcal-utils.h') +enum_headers = files('gcal-enums.h') gcal_deps = [ gsettings_desktop_schemas_dep,