From b666cc1867e04d697f381fa8033803b9e7d0f61d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Oct 2009 21:12:52 -0500 Subject: Building a basic library starting out. --- src/libcustomindicator/custom-indicator.c | 57 +++++++++++++++++++++++++++++++ src/libcustomindicator/custom-indicator.h | 31 +++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 src/libcustomindicator/custom-indicator.c create mode 100644 src/libcustomindicator/custom-indicator.h (limited to 'src/libcustomindicator') diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c new file mode 100644 index 0000000..e0fecbb --- /dev/null +++ b/src/libcustomindicator/custom-indicator.c @@ -0,0 +1,57 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "custom-indicator.h" + +typedef struct _CustomIndicatorPrivate CustomIndicatorPrivate; +struct _CustomIndicatorPrivate { + int placeholder; +}; + +#define CUSTOM_INDICATOR_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), CUSTOM_INDICATOR_TYPE, CustomIndicatorPrivate)) + +static void custom_indicator_class_init (CustomIndicatorClass *klass); +static void custom_indicator_init (CustomIndicator *self); +static void custom_indicator_dispose (GObject *object); +static void custom_indicator_finalize (GObject *object); + +G_DEFINE_TYPE (CustomIndicator, custom_indicator, G_TYPE_OBJECT); + +static void +custom_indicator_class_init (CustomIndicatorClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (CustomIndicatorPrivate)); + + object_class->dispose = custom_indicator_dispose; + object_class->finalize = custom_indicator_finalize; + + return; +} + +static void +custom_indicator_init (CustomIndicator *self) +{ + + return; +} + +static void +custom_indicator_dispose (GObject *object) +{ + + G_OBJECT_CLASS (custom_indicator_parent_class)->dispose (object); + return; +} + +static void +custom_indicator_finalize (GObject *object) +{ + + G_OBJECT_CLASS (custom_indicator_parent_class)->finalize (object); + return; +} + diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h new file mode 100644 index 0000000..6e94d3f --- /dev/null +++ b/src/libcustomindicator/custom-indicator.h @@ -0,0 +1,31 @@ +#ifndef __CUSTOM_INDICATOR_H__ +#define __CUSTOM_INDICATOR_H__ + +#include +#include + +G_BEGIN_DECLS + +#define CUSTOM_INDICATOR_TYPE (custom_indicator_get_type ()) +#define CUSTOM_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicator)) +#define CUSTOM_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) +#define IS_CUSTOM_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CUSTOM_INDICATOR_TYPE)) +#define IS_CUSTOM_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CUSTOM_INDICATOR_TYPE)) +#define CUSTOM_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) + +typedef struct _CustomIndicator CustomIndicator; +typedef struct _CustomIndicatorClass CustomIndicatorClass; + +struct _CustomIndicatorClass { + GObjectClass parent_class; +}; + +struct _CustomIndicator { + GObject parent; +}; + +GType custom_indicator_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 1101075695054df49e96d815fec28b4e9ea0287a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Oct 2009 12:33:31 -0500 Subject: Building a basic prototype of the API for the lib. --- src/libcustomindicator/custom-indicator.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'src/libcustomindicator') diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index 6e94d3f..9bdae11 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -13,6 +13,9 @@ G_BEGIN_DECLS #define IS_CUSTOM_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CUSTOM_INDICATOR_TYPE)) #define CUSTOM_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) +typedef int custom_indicator_category_t; +typedef int custom_indicator_status_t; + typedef struct _CustomIndicator CustomIndicator; typedef struct _CustomIndicatorClass CustomIndicatorClass; @@ -24,7 +27,30 @@ struct _CustomIndicator { GObject parent; }; -GType custom_indicator_get_type (void); +/* GObject Stuff */ +GType custom_indicator_get_type (void); + +/* Set properties */ +void custom_indicator_set_id (CustomIndicator * ci, + const gchar * id); +void custom_indicator_set_category (CustomIndicator * ci, + custom_indicator_category_t category); +void custom_indicator_set_status (CustomIndicator * ci, + custom_indicator_status_t status); +void custom_indicator_set_icon (CustomIndicator * ci, + const gchar * icon_name); +void custom_indicator_set_attention_icon (CustomIndicator * ci, + const gchar * icon_name); +void custom_indicator_set_menu (CustomIndicator * ci, + void * menu); + +/* Get properties */ +const gchar * custom_indicator_get_id (CustomIndicator * ci); +custom_indicator_category_t custom_indicator_get_category (CustomIndicator * ci); +custom_indicator_status_t custom_indicator_get_status (CustomIndicator * ci); +const gchar * custom_indicator_get_icon (CustomIndicator * ci); +const gchar * custom_indicator_get_attention_icon (CustomIndicator * ci); +void * custom_indicator_get_menu (CustomIndicator * ci); G_END_DECLS -- cgit v1.2.3 From ba81d4a04a4291ad065c64f4fc79fd51c4b68bc9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Oct 2009 13:43:47 -0500 Subject: Putting in the enum templates and building them. --- .../custom-indicator-enum-types.c.in | 33 +++++++++++++++++++++ .../custom-indicator-enum-types.h.in | 34 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 src/libcustomindicator/custom-indicator-enum-types.c.in create mode 100644 src/libcustomindicator/custom-indicator-enum-types.h.in (limited to 'src/libcustomindicator') diff --git a/src/libcustomindicator/custom-indicator-enum-types.c.in b/src/libcustomindicator/custom-indicator-enum-types.c.in new file mode 100644 index 0000000..51512f6 --- /dev/null +++ b/src/libcustomindicator/custom-indicator-enum-types.c.in @@ -0,0 +1,33 @@ +/*** BEGIN file-header ***/ +#include "libcustomindicator/custom-indicator-enum-types.h" + +/*** END file-header ***/ + +/*** BEGIN file-production ***/ +#include "@filename@" +/*** END file-production ***/ + +/*** BEGIN value-header ***/ +GType +@enum_name@_get_type (void) +{ + static GType etype = 0; + if (G_UNLIKELY(etype == 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} + }; + + etype = g_@type@_register_static (g_intern_static_string("@EnumName@"), values); + } + + return etype; +} + +/*** END value-tail ***/ diff --git a/src/libcustomindicator/custom-indicator-enum-types.h.in b/src/libcustomindicator/custom-indicator-enum-types.h.in new file mode 100644 index 0000000..8afe619 --- /dev/null +++ b/src/libcustomindicator/custom-indicator-enum-types.h.in @@ -0,0 +1,34 @@ +/*** BEGIN file-header ***/ +#ifndef __CUSTOM_INDICATOR_ENUM_TYPES_H__ +#define __CUSTOM_INDICATOR_ENUM_TYPES_H__ + +#include + +G_BEGIN_DECLS + +/*** END file-header ***/ + +/*** BEGIN file-tail ***/ + +G_END_DECLS + +#endif /* __CUSTOM_INDICATOR_ENUM_TYPES_H__ */ +/*** END file-tail ***/ + +/*** BEGIN file-production ***/ +/* Enumerations from file: "@filename@" */ +/*** END file-production ***/ + +/*** BEGIN value-header ***/ +/** + @enum_name@_get_type: + + Builds a glib type for the @enum_name@ enumeration + defined in the file @filename@. + + Return value: A registered type for the enum +*/ +GType @enum_name@_get_type (void) G_GNUC_CONST; +#define CLUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) + +/*** END value-header ***/ -- cgit v1.2.3 From 0b6ffb4f6ba06d90d2744fb29d929b9872947a9f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Oct 2009 14:31:35 -0500 Subject: Filling out the enums to have values. --- src/libcustomindicator/custom-indicator.h | 37 +++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'src/libcustomindicator') diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index 9bdae11..200e55f 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -13,8 +13,41 @@ G_BEGIN_DECLS #define IS_CUSTOM_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CUSTOM_INDICATOR_TYPE)) #define CUSTOM_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) -typedef int custom_indicator_category_t; -typedef int custom_indicator_status_t; +/** + custom_indicator_category_t: + @CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application. + @CUSTOM_INDICATOR_CATEGORY_COMMUNICATIONS: The application is used for communication with other people. + @CUSTOM_INDICATOR_CATEGORY_SYSTEM_SERVICES: A system indicator relating to something in the user's system. + @CUSTOM_INDICATOR_CATEGORY_HARDWARE: An indicator relating to the user's hardware. + @CUSTOM_INDICATOR_CATEGORY_OTHER: Something not defined in this enum, please don't use unless you really need it. + + The category provides grouping for the indicators so that + users can find indicators that are similar together. +*/ +typedef enum { /*< prefix=CUSTOM_INDICATOR_CATEGORY >*/ + CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS, + CUSTOM_INDICATOR_CATEGORY_COMMUNICATIONS, + CUSTOM_INDICATOR_CATEGORY_SYSTEM_SERVICES, + CUSTOM_INDICATOR_CATEGORY_HARDWARE, + CUSTOM_INDICATOR_CATEGORY_OTHER +} custom_indicator_category_t; + +/** + custom_indicator_status_t: + @CUSTOM_INDICATOR_STATUS_OFF: The indicator should not be shown to the user. + @CUSTOM_INDICATOR_STATUS_ON: The indicator should be shown in it's default state. + @CUSTOM_INDICATOR_STATUS_ATTENTION: The indicator should show it's attention icon. + + These are the states that the indicator can be on in + the user's panel. The indicator by default starts + in the state @CUSTOM_INDICATOR_STATUS_OFF and can be + shown by setting it to @CUSTOM_INDICATOR_STATUS_ON. +*/ +typedef enum { /*< prefix=CUSTOM_INDICATOR_STATUS >*/ + CUSTOM_INDICATOR_STATUS_OFF, + CUSTOM_INDICATOR_STATUS_ON, + CUSTOM_INDICATOR_STATUS_ATTENTION +} custom_indicator_status_t; typedef struct _CustomIndicator CustomIndicator; typedef struct _CustomIndicatorClass CustomIndicatorClass; -- cgit v1.2.3 From 00c47642a916ef41e7237b7ab84a488557876640 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Oct 2009 14:31:50 -0500 Subject: Fixing the templates. --- src/libcustomindicator/custom-indicator-enum-types.c.in | 2 +- src/libcustomindicator/custom-indicator-enum-types.h.in | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libcustomindicator') diff --git a/src/libcustomindicator/custom-indicator-enum-types.c.in b/src/libcustomindicator/custom-indicator-enum-types.c.in index 51512f6..3f97040 100644 --- a/src/libcustomindicator/custom-indicator-enum-types.c.in +++ b/src/libcustomindicator/custom-indicator-enum-types.c.in @@ -9,7 +9,7 @@ /*** BEGIN value-header ***/ GType -@enum_name@_get_type (void) +@EnumName@_get_type (void) { static GType etype = 0; if (G_UNLIKELY(etype == 0)) { diff --git a/src/libcustomindicator/custom-indicator-enum-types.h.in b/src/libcustomindicator/custom-indicator-enum-types.h.in index 8afe619..4f636d4 100644 --- a/src/libcustomindicator/custom-indicator-enum-types.h.in +++ b/src/libcustomindicator/custom-indicator-enum-types.h.in @@ -21,14 +21,13 @@ G_END_DECLS /*** BEGIN value-header ***/ /** - @enum_name@_get_type: + @EnumName@_get_type: - Builds a glib type for the @enum_name@ enumeration - defined in the file @filename@. + Builds a glib type for the @EnumName@ enumeration. Return value: A registered type for the enum */ -GType @enum_name@_get_type (void) G_GNUC_CONST; -#define CLUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) +GType @EnumName@_get_type (void) G_GNUC_CONST; +#define CLUTTER_TYPE_@ENUMSHORT@ (@EnumName@_get_type()) /*** END value-header ***/ -- cgit v1.2.3