GNOME.org
 

[evolution/wip/webkit-composer: 622/966] Move e-editor-selection.h enums to e-util-enums.h.

commit 27e707ae6d10ff41443fc4833e4f137916e2e2ad
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       |  163 -------------------------------------------
 2 files changed, 1 insertions(+), 203 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 1269c65..7dccd8c 100644
--- a/e-util/e-util-enums.h
+++ b/e-util/e-util-enums.h
@@ -164,169 +164,6 @@ typedef enum {
        E_EDITOR_SELECTION_GRANULARITY_WORD
 } EEditorSelectionGranularity;
 
-/**
- * EEditorWidgetCommand:
- * @E_EDITOR_WIDGET_COMMAND_BACKGROUND_COLOR:
- *   Sets background color to given value.
- * @E_EDITOR_WIDGET_COMMAND_BOLD:
- *   Toggles bold formatting of current selection.
- * @E_EDITOR_WIDGET_COMMAND_COPY:
- *   Copies current selection to clipboard.
- * @E_EDITOR_WIDGET_COMMAND_CREATE_LINK:
- *   Converts current selection to a link that points to URL in value
- * @E_EDITOR_WIDGET_COMMAND_CUT:
- *   Cuts current selection to clipboard.
- * @E_EDITOR_WIDGET_COMMAND_DEFAULT_PARAGRAPH_SEPARATOR:
- *   (XXX Explain me!)
- * @E_EDITOR_WIDGET_COMMAND_DELETE:
- *   Deletes current selection.
- * @E_EDITOR_WIDGET_COMMAND_FIND_STRING:
- *   Highlights given string.
- * @E_EDITOR_WIDGET_COMMAND_FONT_NAME:
- *   Sets font name to given value.
- * @E_EDITOR_WIDGET_COMMAND_FONT_SIZE:
- *   Sets font point size to given value (no units, just number)
- * @E_EDITOR_WIDGET_COMMAND_FONT_SIZE_DELTA:
- *   Changes font size by given delta value (no units, just number)
- * @E_EDITOR_WIDGET_COMMAND_FORE_COLOR:
- *   Sets font color to given value
- * @E_EDITOR_WIDGET_COMMAND_FORMAT_BLOCK:
- *   Sets block type of current paragraph to given format. Allowed formats
- *   are "BLOCKQUOTE", "H1", "H2", "H3", "H4", "H5", "H6", "P", "PRE" and
- *   "ADDRESS".
- * @E_EDITOR_WIDGET_COMMAND_FORWARD_DELETE:
- *   (XXX Explain me!)
- * @E_EDITOR_WIDGET_COMMAND_HILITE_COLOR:
- *   Sets color in which results of "FindString" command should be
- *   highlighted to given value.
- * @E_EDITOR_WIDGET_COMMAND_INDENT:
- *   Indents current paragraph by one level.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_HTML:
- *   Inserts give HTML code into document.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_HORIZONTAL_RULE:
- *   Inserts a horizontal rule (&lt;HR&gt;) on current line.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_IMAGE:
- *   Inserts an image with given source file.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_LINE_BREAK:
- *   Breaks line at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_NEW_LINE_IN_QUOTED_CONTENT:
- *   Breaks citation at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_ORDERED_LIST:
- *   Creates an ordered list environment at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_PARAGRAPH:
- *   Inserts a new paragraph at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_TEXT:
- *   Inserts given text at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_INSERT_UNORDERED_LIST:
- *   Creates an undordered list environment at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_ITALIC:
- *   Toggles italic formatting of current selection.
- * @E_EDITOR_WIDGET_COMMAND_JUSTIFY_CENTER:
- *   Aligns current paragraph to center.
- * @E_EDITOR_WIDGET_COMMAND_JUSTIFY_FULL:
- *   Justifies current paragraph to block.
- * @E_EDITOR_WIDGET_COMMAND_JUSTIFY_NONE:
- *   Removes any justification or alignment of current paragraph.
- * @E_EDITOR_WIDGET_COMMAND_JUSTIFY_RIGHT:
- *   Aligns current paragraph to right.
- * @E_EDITOR_WIDGET_COMMAND_OUTDENT:
- *   Outdents current paragraph by one level.
- * @E_EDITOR_WIDGET_COMMAND_PASTE:
- *   Pastes clipboard content at current cursor position.
- * @E_EDITOR_WIDGET_COMMAND_PASTE_AND_MATCH_STYLE:
- *   Pastes clipboard content and matches its style to style at current
- *   cursor position.
- * @E_EDITOR_WIDGET_COMMAND_PASTE_AS_PLAIN_TEXT:
- *   Pastes clipboard content at current cursor position removing any HTML
- *   formatting.
- * @E_EDITOR_WIDGET_COMMAND_PRINT:
- *   Print current document.
- * @E_EDITOR_WIDGET_COMMAND_REDO:
- *   Redoes last action.
- * @E_EDITOR_WIDGET_COMMAND_REMOVE_FORMAT:
- *   Removes any formatting of current selection.
- * @E_EDITOR_WIDGET_COMMAND_SELECT_ALL:
- *   Extends selects to the entire document.
- * @E_EDITOR_WIDGET_COMMAND_STRIKETHROUGH:
- *   Toggles strikethrough formatting.
- * @E_EDITOR_WIDGET_COMMAND_STYLE_WITH_CSS:
- *   Toggles whether style should be defined in CSS "style" attribute of
- *   elements or whether to use deprecated &lt;FONT&gt; tags. Depends on
- *   whether given value is "true" or "false".
- * @E_EDITOR_WIDGET_COMMAND_SUBSCRIPT:
- *   Toggles subscript of current selection.
- * @E_EDITOR_WIDGET_COMMAND_SUPERSCRIPT:
- *   Toggles superscript of current selection.
- * @E_EDITOR_WIDGET_COMMAND_TRANSPOSE:
- *   (XXX Explain me!)
- * @E_EDITOR_WIDGET_COMMAND_UNDERLINE:
- *   Toggles underline formatting of current selection.
- * @E_EDITOR_WIDGET_COMMAND_UNDO:
- *   Undoes last action.
- * @E_EDITOR_WIDGET_COMMAND_UNLINK:
- *   Removes active links (&lt;A&gt;) from current selection (if there's any).
- * @E_EDITOR_WIDGET_COMMAND_UNSELECT:
- *   Cancels current selection.
- * @E_EDITOR_WIDGET_COMMAND_USE_CSS:
- *   Whether to allow use of CSS or not depending on whether given value is
- *   "true" or "false".
- *
- * Specifies the DOM command to execute in e_editor_widget_exec_command().
- * Some commands require value to be passed in, which is always stated in the
- * documentation.
- */
-typedef enum {
-       E_EDITOR_WIDGET_COMMAND_BACKGROUND_COLOR,
-       E_EDITOR_WIDGET_COMMAND_BOLD,
-       E_EDITOR_WIDGET_COMMAND_COPY,
-       E_EDITOR_WIDGET_COMMAND_CREATE_LINK,
-       E_EDITOR_WIDGET_COMMAND_CUT,
-       E_EDITOR_WIDGET_COMMAND_DEFAULT_PARAGRAPH_SEPARATOR,
-       E_EDITOR_WIDGET_COMMAND_DELETE,
-       E_EDITOR_WIDGET_COMMAND_FIND_STRING,
-       E_EDITOR_WIDGET_COMMAND_FONT_NAME,
-       E_EDITOR_WIDGET_COMMAND_FONT_SIZE,
-       E_EDITOR_WIDGET_COMMAND_FONT_SIZE_DELTA,
-       E_EDITOR_WIDGET_COMMAND_FORE_COLOR,
-       E_EDITOR_WIDGET_COMMAND_FORMAT_BLOCK,
-       E_EDITOR_WIDGET_COMMAND_FORWARD_DELETE,
-       E_EDITOR_WIDGET_COMMAND_HILITE_COLOR,
-       E_EDITOR_WIDGET_COMMAND_INDENT,
-       E_EDITOR_WIDGET_COMMAND_INSERT_HTML,
-       E_EDITOR_WIDGET_COMMAND_INSERT_HORIZONTAL_RULE,
-       E_EDITOR_WIDGET_COMMAND_INSERT_IMAGE,
-       E_EDITOR_WIDGET_COMMAND_INSERT_LINE_BREAK,
-       E_EDITOR_WIDGET_COMMAND_INSERT_NEW_LINE_IN_QUOTED_CONTENT,
-       E_EDITOR_WIDGET_COMMAND_INSERT_ORDERED_LIST,
-       E_EDITOR_WIDGET_COMMAND_INSERT_PARAGRAPH,
-       E_EDITOR_WIDGET_COMMAND_INSERT_TEXT,
-       E_EDITOR_WIDGET_COMMAND_INSERT_UNORDERED_LIST,
-       E_EDITOR_WIDGET_COMMAND_ITALIC,
-       E_EDITOR_WIDGET_COMMAND_JUSTIFY_CENTER,
-       E_EDITOR_WIDGET_COMMAND_JUSTIFY_FULL,
-       E_EDITOR_WIDGET_COMMAND_JUSTIFY_LEFT,
-       E_EDITOR_WIDGET_COMMAND_JUSTIFY_NONE,
-       E_EDITOR_WIDGET_COMMAND_JUSTIFY_RIGHT,
-       E_EDITOR_WIDGET_COMMAND_OUTDENT,
-       E_EDITOR_WIDGET_COMMAND_PASTE,
-       E_EDITOR_WIDGET_COMMAND_PASTE_AND_MATCH_STYLE,
-       E_EDITOR_WIDGET_COMMAND_PASTE_AS_PLAIN_TEXT,
-       E_EDITOR_WIDGET_COMMAND_PRINT,
-       E_EDITOR_WIDGET_COMMAND_REDO,
-       E_EDITOR_WIDGET_COMMAND_REMOVE_FORMAT,
-       E_EDITOR_WIDGET_COMMAND_SELECT_ALL,
-       E_EDITOR_WIDGET_COMMAND_STRIKETHROUGH,
-       E_EDITOR_WIDGET_COMMAND_STYLE_WITH_CSS,
-       E_EDITOR_WIDGET_COMMAND_SUBSCRIPT,
-       E_EDITOR_WIDGET_COMMAND_SUPERSCRIPT,
-       E_EDITOR_WIDGET_COMMAND_TRANSPOSE,
-       E_EDITOR_WIDGET_COMMAND_UNDERLINE,
-       E_EDITOR_WIDGET_COMMAND_UNDO,
-       E_EDITOR_WIDGET_COMMAND_UNLINK,
-       E_EDITOR_WIDGET_COMMAND_UNSELECT,
-       E_EDITOR_WIDGET_COMMAND_USE_CSS
-} EEditorWidgetCommand;
-
 G_END_DECLS
 
 #endif /* E_UTIL_ENUMS_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]