[evolution/wip/webkit-composer: 317/966] Move e-editor-selection.h enums to e-util-enums.h.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 317/966] Move e-editor-selection.h enums to e-util-enums.h.
- Date: Wed, 23 Apr 2014 10:20:04 +0000 (UTC)
commit e9ebf15a7a5776ea3b66ce17b1ae64e0cec07e26
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jan 17 16:10:13 2013 -0500
Move e-editor-selection.h enums to e-util-enums.h.
e-util/e-editor-selection.h | 41 +----------------------------------------
e-util/e-util-enums.h | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 40 deletions(-)
---
diff --git a/e-util/e-editor-selection.h b/e-util/e-editor-selection.h
index 1f8756d..2cfc3d5 100644
--- a/e-util/e-editor-selection.h
+++ b/e-util/e-editor-selection.h
@@ -26,6 +26,7 @@
#define E_EDITOR_SELECTION_H
#include <gtk/gtk.h>
+#include <e-util/e-util-enums.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_SELECTION \
@@ -48,50 +49,10 @@
G_BEGIN_DECLS
-typedef struct _EEditorWidget EEditorWidget;
typedef struct _EEditorSelection EEditorSelection;
typedef struct _EEditorSelectionClass EEditorSelectionClass;
typedef struct _EEditorSelectionPrivate EEditorSelectionPrivate;
-typedef enum {
- E_EDITOR_SELECTION_BLOCK_FORMAT_NONE = 0,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H1,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H2,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H3,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H4,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H5,
- E_EDITOR_SELECTION_BLOCK_FORMAT_H6,
- E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH,
- E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE,
- E_EDITOR_SELECTION_BLOCK_FORMAT_PRE,
- E_EDITOR_SELECTION_BLOCK_FORMAT_ADDRESS,
- E_EDITOR_SELECTION_BLOCK_FORMAT_UNORDERED_LIST,
- E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST,
- E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ROMAN,
- E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ALPHA,
-} EEditorSelectionBlockFormat;
-
-typedef enum {
- E_EDITOR_SELECTION_FONT_SIZE_TINY = 1, /* The values match actual */
- E_EDITOR_SELECTION_FONT_SIZE_SMALL = 2, /* size in <font size="X"> */
- E_EDITOR_SELECTION_FONT_SIZE_NORMAL = 3,
- E_EDITOR_SELECTION_FONT_SIZE_BIG = 4,
- E_EDITOR_SELECTION_FONT_SIZE_BIGGER = 5,
- E_EDITOR_SELECTION_FONT_SIZE_LARGE = 6,
- E_EDITOR_SELECTION_FONT_SIZE_VERY_LARGE = 7
-} EEditorSelectionFontSize;
-
-typedef enum {
- E_EDITOR_SELECTION_ALIGNMENT_LEFT,
- E_EDITOR_SELECTION_ALIGNMENT_CENTER,
- E_EDITOR_SELECTION_ALIGNMENT_RIGHT
-} EEditorSelectionAlignment;
-
-typedef enum {
- E_EDITOR_SELECTION_GRANULARITY_CHARACTER,
- E_EDITOR_SELECTION_GRANULARITY_WORD
-} EEditorSelectionGranularity;
-
struct _EEditorSelection {
GObject parent;
EEditorSelectionPrivate *priv;
diff --git a/e-util/e-util-enums.h b/e-util/e-util-enums.h
index 9913e4d..7dccd8c 100644
--- a/e-util/e-util-enums.h
+++ b/e-util/e-util-enums.h
@@ -124,6 +124,46 @@ typedef enum {
E_DURATION_DAYS
} EDurationType;
+typedef enum {
+ E_EDITOR_SELECTION_BLOCK_FORMAT_NONE = 0,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H1,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H2,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H3,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H4,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H5,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_H6,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_PRE,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_ADDRESS,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_UNORDERED_LIST,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ROMAN,
+ E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ALPHA,
+} EEditorSelectionBlockFormat;
+
+/* The values match the actual size in <font size="n"> */
+typedef enum {
+ E_EDITOR_SELECTION_FONT_SIZE_TINY = 1,
+ E_EDITOR_SELECTION_FONT_SIZE_SMALL = 2,
+ E_EDITOR_SELECTION_FONT_SIZE_NORMAL = 3,
+ E_EDITOR_SELECTION_FONT_SIZE_BIG = 4,
+ E_EDITOR_SELECTION_FONT_SIZE_BIGGER = 5,
+ E_EDITOR_SELECTION_FONT_SIZE_LARGE = 6,
+ E_EDITOR_SELECTION_FONT_SIZE_VERY_LARGE = 7
+} EEditorSelectionFontSize;
+
+typedef enum {
+ E_EDITOR_SELECTION_ALIGNMENT_LEFT,
+ E_EDITOR_SELECTION_ALIGNMENT_CENTER,
+ E_EDITOR_SELECTION_ALIGNMENT_RIGHT
+} EEditorSelectionAlignment;
+
+typedef enum {
+ E_EDITOR_SELECTION_GRANULARITY_CHARACTER,
+ E_EDITOR_SELECTION_GRANULARITY_WORD
+} EEditorSelectionGranularity;
+
G_END_DECLS
#endif /* E_UTIL_ENUMS_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]