From 09221f8516628291be7d586c96194c2cbee316e8 Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Wed, 22 Nov 2017 16:44:44 -0300 Subject: [PATCH] elm: Move legacy enums to elm_general.eot. efl_ui_text and friends uses some enums currently defined in elm_entry.eo. The latter is exported outside the elm public eolian eos and never generated. This commit moves the enums to the "transition" file elm_general.eot. --- src/lib/elementary/elm_entry.eo | 112 ---------------------------- src/lib/elementary/elm_general.eot | 114 +++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 112 deletions(-) diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 9bb1d6d3db..a2d9b2db92 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -3,118 +3,6 @@ import elm_general; type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]] type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]] -enum Elm.Text_Format -{ - [[Text Format types. - - See also @Elm.Entry.file_text_format. - ]] - plain_utf8, [[ Plain UTF8 type ]] - markup_utf8 [[ Markup UTF8 type ]] -} - -enum Elm.Input.Panel.Layout -{ - [[Input panel (virtual keyboard) layout types. - Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired. - See also @Elm.Entry.input_panel_layout.set. - ]] - normal, [[Default layout.]] - number, [[Number layout.]] - email, [[Email layout.]] - url, [[URL layout.]] - phonenumber, [[Phone Number layout.]] - ip, [[IP layout.]] - month, [[Month layout.]] - numberonly, [[Number Only layout.]] - invalid, [[Never use this.]] - hex, [[Hexadecimal layout.]] - terminal, [[Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization).]] - password, [[Like normal, but no auto-correct, no auto-capitalization etc.]] - datetime, [[Date and time layout - - @since 1.8]] - emoticon, [[Emoticon layout - - @since 1.10]] - voice [[Voice layout, but if the IME does not support voice layout, then normal layout will be shown. - - @since 1.19]] -} - -enum Elm.Input.Panel.Lang -{ - [[Input panel (virtual keyboard) language modes. - - See also @Elm.Entry.input_panel_language.set. - ]] - automatic, [[Automatic]] - alphabet [[Alphabet]] -} - -enum Elm.Autocapital.Type -{ - [[Autocapitalization Types. - Choose method of auto-capitalization. - - See also @Elm.Entry.autocapital_type.set. - ]] - none, [[No auto-capitalization when typing.]] - word, [[Autocapitalize each word typed.]] - sentence, [[Autocapitalize the start of each sentence.]] - allcharacter [[Autocapitalize all letters.]] -} - -enum Elm.Input.Panel.Return_Key.Type -{ - [["Return" Key types on the input panel (virtual keyboard). - See also @Elm.Entry.input_panel_return_key_type.set. - - ]] - default, [[Default.]] - done, [[Done.]] - go, [[Go.]] - join, [[Join.]] - login, [[Login.]] - next, [[Next.]] - search, [[Search string or magnifier icon.]] - send, [[Send.]] - signin [[Sign-in - - @since 1.8]] -} - -enum Elm.Input.Hints -{ - [[Enumeration that defines the types of Input Hints. - - @since 1.12 - ]] - legacy: elm_input_hint; - none = 0, [[No active hints - - @since 1.12]] - auto_complete = 1 << 0, [[Suggest word auto completion - - @since 1.12]] - sensitive_data = 1 << 1, [[Typed text should not be stored. - - @since 1.12]] -} - -enum Elm.Cnp_Mode -{ - [[ - Enum of entry's copy & paste policy. - - See also @Elm.Entry.cnp_mode.set, - @Elm.Entry.cnp_mode.get. - ]] - markup, [[ copy & paste text with markup tag ]] - no_image, [[ copy & paste text without item(image) tag ]] - plaintext, [[ copy & paste text without markup tag ]] -} - class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action) diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index 73d057c3d6..1a0dfadf68 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -139,3 +139,117 @@ enum Elm.Icon.Type /* FIXME: shouldn't exist */ struct @extern Elm_Gen_Item; struct @extern Efl_Access_Action_Data; + + +/* Enums from elm_entry.eo, also used by efl_ui_text */ +enum Elm.Text_Format +{ + [[Text Format types. + + See also @Elm.Entry.file_text_format. + ]] + plain_utf8, [[ Plain UTF8 type ]] + markup_utf8 [[ Markup UTF8 type ]] +} + +enum Elm.Input.Panel.Layout +{ + [[Input panel (virtual keyboard) layout types. + Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired. + See also @Elm.Entry.input_panel_layout.set. + ]] + normal, [[Default layout.]] + number, [[Number layout.]] + email, [[Email layout.]] + url, [[URL layout.]] + phonenumber, [[Phone Number layout.]] + ip, [[IP layout.]] + month, [[Month layout.]] + numberonly, [[Number Only layout.]] + invalid, [[Never use this.]] + hex, [[Hexadecimal layout.]] + terminal, [[Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization).]] + password, [[Like normal, but no auto-correct, no auto-capitalization etc.]] + datetime, [[Date and time layout + + @since 1.8]] + emoticon, [[Emoticon layout + + @since 1.10]] + voice [[Voice layout, but if the IME does not support voice layout, then normal layout will be shown. + + @since 1.19]] +} + +enum Elm.Input.Panel.Lang +{ + [[Input panel (virtual keyboard) language modes. + + See also @Elm.Entry.input_panel_language.set. + ]] + automatic, [[Automatic]] + alphabet [[Alphabet]] +} + +enum Elm.Autocapital.Type +{ + [[Autocapitalization Types. + Choose method of auto-capitalization. + + See also @Elm.Entry.autocapital_type.set. + ]] + none, [[No auto-capitalization when typing.]] + word, [[Autocapitalize each word typed.]] + sentence, [[Autocapitalize the start of each sentence.]] + allcharacter [[Autocapitalize all letters.]] +} + +enum Elm.Input.Panel.Return_Key.Type +{ + [["Return" Key types on the input panel (virtual keyboard). + See also @Elm.Entry.input_panel_return_key_type.set. + + ]] + default, [[Default.]] + done, [[Done.]] + go, [[Go.]] + join, [[Join.]] + login, [[Login.]] + next, [[Next.]] + search, [[Search string or magnifier icon.]] + send, [[Send.]] + signin [[Sign-in + + @since 1.8]] +} + +enum Elm.Input.Hints +{ + [[Enumeration that defines the types of Input Hints. + + @since 1.12 + ]] + legacy: elm_input_hint; + none = 0, [[No active hints + + @since 1.12]] + auto_complete = 1 << 0, [[Suggest word auto completion + + @since 1.12]] + sensitive_data = 1 << 1, [[Typed text should not be stored. + + @since 1.12]] +} + +enum Elm.Cnp_Mode +{ + [[ + Enum of entry's copy & paste policy. + + See also @Elm.Entry.cnp_mode.set, + @Elm.Entry.cnp_mode.get. + ]] + markup, [[ copy & paste text with markup tag ]] + no_image, [[ copy & paste text without item(image) tag ]] + plaintext, [[ copy & paste text without markup tag ]] +}