[E-devel] Efl: make distcheck fails
Running make distcheck in efl (not just for me) gets the following error
message:
yossi@yossi-laptop:~/e17/efl$ make distcheck
if test -d efl-1.9.99.25206; then find efl-1.9.99.25206 -type d !
-perm -200 -exec chmod u+w {} ';' rm -rf efl-1.9.99.25206 || {
sleep 5 rm -rf efl-1.9.99.25206; }; else :; fi
test -d efl-1.9.99.25206 || mkdir efl-1.9.99.25206
(cd src make --no-print-directory top_distdir=../efl-1.9.99.25206
distdir=../efl-1.9.99.25206/src \
am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=:
distdir)
make[1]: *** No rule to make target
`modules/evas/savers/tgv/evas_image_load_tgv.c', needed by `distdir'. Stop.
make: *** [distdir] Error 1
Thanks.
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [bindings/python/python-efl] master 02/02: Follow Eolian wrt. widget naming
2014-04-05 5:55 GMT+02:00 Kai Huuhko kai.huu...@gmail.com: kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=78442b6e9dd8a6e7111c298ae6588faa612111b1 commit 78442b6e9dd8a6e7111c298ae6588faa612111b1 Author: Kai Huuhko kai.huu...@gmail.com Date: Sat Apr 5 06:53:56 2014 +0300 Follow Eolian wrt. widget naming Shouldn't this be fixed in Eolian itself ? really we want class names as: Elc_Fileselector, Elc_Hoversel, etc ?? Note the prefix: was Elm_ , now is Elc_ is this really wanted, or maybe an error in the Eolian transition? --- efl/elementary/ctxpopup.pyx| 4 ++-- efl/elementary/fileselector.pyx| 2 +- efl/elementary/fileselector_button.pyx | 2 +- efl/elementary/fileselector_entry.pyx | 2 +- efl/elementary/hoversel.pyx| 4 ++-- efl/elementary/multibuttonentry.pyx| 2 +- efl/elementary/naviframe.pyx | 2 +- efl/elementary/popup.pyx | 2 +- efl/elementary/video.pyx | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx index 26e560c..ab36d02 100644 --- a/efl/elementary/ctxpopup.pyx +++ b/efl/elementary/ctxpopup.pyx @@ -322,7 +322,7 @@ cdef class Ctxpopup(LayoutClass): Use this property when you want ctxpopup not to hide automatically. By default, ctxpopup is dismissed whenever mouse clicked its background area, language is changed, and its parent geometry is updated(changed). - + :type: bool .. versionadded:: 1.9 @@ -373,4 +373,4 @@ cdef class Ctxpopup(LayoutClass): def callback_unfocused_del(self, func): self._callback_del(unfocused, func) -_object_mapping_register(Elm_Ctxpopup, Ctxpopup) +_object_mapping_register(Elc_Ctxpopup, Ctxpopup) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index 1c7246b..ceb79e4 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -592,4 +592,4 @@ cdef class Fileselector(LayoutClass): self._callback_del_full(done, _cb_string_conv, func) -_object_mapping_register(Elm_Fileselector, Fileselector) +_object_mapping_register(Elc_Fileselector, Fileselector) diff --git a/efl/elementary/fileselector_button.pyx b/efl/elementary/fileselector_button.pyx index 2b89245..82b633a 100644 --- a/efl/elementary/fileselector_button.pyx +++ b/efl/elementary/fileselector_button.pyx @@ -295,4 +295,4 @@ cdef class FileselectorButton(Button): def callback_language_changed_del(self, func): self._callback_del(language,changed, func) -_object_mapping_register(Elm_Fileselector_Button, FileselectorButton) +_object_mapping_register(Elc_Fileselector_Button, FileselectorButton) diff --git a/efl/elementary/fileselector_entry.pyx b/efl/elementary/fileselector_entry.pyx index d95a5b4..42a9bf7 100644 --- a/efl/elementary/fileselector_entry.pyx +++ b/efl/elementary/fileselector_entry.pyx @@ -431,4 +431,4 @@ cdef class FileselectorEntry(LayoutClass): def callback_language_changed_del(self, func): self._callback_del(language,changed, func) -_object_mapping_register(Elm_Fileselector_Entry, FileselectorEntry) +_object_mapping_register(Elc_Fileselector_Entry, FileselectorEntry) diff --git a/efl/elementary/hoversel.pyx b/efl/elementary/hoversel.pyx index 5f20d9d..2c9ca98 100644 --- a/efl/elementary/hoversel.pyx +++ b/efl/elementary/hoversel.pyx @@ -394,7 +394,7 @@ cdef class Hoversel(Button): def callback_expanded_add(self, func, *args, **kwargs): The hover is expanded. - + .. versionadded:: 1.9 @@ -404,4 +404,4 @@ cdef class Hoversel(Button): self._callback_del(expanded, func) -_object_mapping_register(Elm_Hoversel, Hoversel) +_object_mapping_register(Elc_Hoversel, Hoversel) diff --git a/efl/elementary/multibuttonentry.pyx b/efl/elementary/multibuttonentry.pyx index 9d3d5e9..e1537f8 100644 --- a/efl/elementary/multibuttonentry.pyx +++ b/efl/elementary/multibuttonentry.pyx @@ -533,4 +533,4 @@ cdef class MultiButtonEntry(Object): self._callback_del(expand,state,changed, func) -_object_mapping_register(Elm_Multibuttonentry, MultiButtonEntry) +_object_mapping_register(Elc_Multibuttonentry, MultiButtonEntry) diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx index ecf23e2..63b4158 100644 --- a/efl/elementary/naviframe.pyx +++ b/efl/elementary/naviframe.pyx @@ -601,4 +601,4 @@ cdef class Naviframe(LayoutClass): def callback_unfocused_del(self, func): self._callback_del(unfocused, func) -_object_mapping_register(Elm_Naviframe, Naviframe) +_object_mapping_register(Elc_Naviframe, Naviframe) diff --git a/efl/elementary/popup.pyx b/efl/elementary/popup.pyx index 08349d0..40f6935 100644 --- a/efl/elementary/popup.pyx +++ b/efl/elementary/popup.pyx @@
[EGIT] [bindings/python/python-efl] master 01/01: setup.py: no need to set cython directives for each module
davemds pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=4661bc4d6fd4cd002b93583567834d8134c25dcc
commit 4661bc4d6fd4cd002b93583567834d8134c25dcc
Author: davemds d...@gurumeditation.it
Date: Sun Apr 6 12:24:34 2014 +0200
setup.py: no need to set cython directives for each module
---
setup.py | 44 ++--
1 file changed, 6 insertions(+), 38 deletions(-)
diff --git a/setup.py b/setup.py
index 7b80461..f3d552a 100755
--- a/setup.py
+++ b/setup.py
@@ -143,10 +143,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = eo_cflags,
extra_link_args = eo_libs + eina_libs
)
-eo_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(eo_ext)
@@ -168,11 +164,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_link_args = eina_libs,
),
]
-for e in utils_ext:
-e.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules += utils_ext
packages.append(efl.utils)
@@ -189,10 +180,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = evas_cflags,
extra_link_args = evas_libs + eina_libs,
)
-evas_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(evas_ext)
# compatibility
@@ -214,10 +201,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = ecore_cflags + ecore_file_cflags,
extra_link_args = ecore_libs + ecore_file_libs + eina_libs +
evas_libs,
)
-ecore_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(ecore_ext)
# compatibility
@@ -237,10 +220,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = edje_cflags,
extra_link_args = edje_libs + eina_libs + evas_libs,
)
-edje_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(edje_ext)
# compatibility
@@ -254,10 +233,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = edje_cflags,
extra_link_args = edje_libs + eina_libs + evas_libs,
)
-edje_edit_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(edje_edit_ext)
@@ -273,10 +248,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = emotion_cflags,
extra_link_args = emotion_libs + eina_libs + evas_libs,
)
-emotion_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(emotion_ext)
# compatibility
@@ -297,10 +268,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = dbus_cflags + ecore_cflags,
extra_link_args = dbus_libs + ecore_libs,
)
-dbus_ml_ext.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(dbus_ml_ext)
# compatibility
@@ -399,10 +366,6 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
extra_compile_args = elm_cflags,
extra_link_args = elm_libs + eina_libs + evas_libs,
)
-e.cython_directives = {
-c_string_type: unicode,
-c_string_encoding: utf-8,
-}
modules.append(e)
packages.append(efl.elementary)
@@ -439,5 +402,10 @@ setup(
package_dir = package_dirs,
packages = packages,
ext_package = efl, # The prefix for ext modules/packages
-ext_modules = cythonize(modules, include_path=[include]),
+ext_modules = cythonize(modules, include_path=[include],
+compiler_directives={
+c_string_type: unicode,
+c_string_encoding: utf-8,
+}
+),
)
--
Re: [E-devel] [EGIT] [bindings/python/python-efl] master 02/02: Follow Eolian wrt. widget naming
Cedric Bail On Apr 6, 2014 6:19 PM, Davide Andreoli d...@gurumeditation.it wrote: 2014-04-05 5:55 GMT+02:00 Kai Huuhko kai.huu...@gmail.com: kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=78442b6e9dd8a6e7111c298ae6588faa612111b1 commit 78442b6e9dd8a6e7111c298ae6588faa612111b1 Author: Kai Huuhko kai.huu...@gmail.com Date: Sat Apr 5 06:53:56 2014 +0300 Follow Eolian wrt. widget naming Shouldn't this be fixed in Eolian itself ? really we want class names as: Elc_Fileselector, Elc_Hoversel, etc ?? Note the prefix: was Elm_ , now is Elc_ is this really wanted, or maybe an error in the Eolian transition? Not a fan of that naming either. --- efl/elementary/ctxpopup.pyx| 4 ++-- efl/elementary/fileselector.pyx| 2 +- efl/elementary/fileselector_button.pyx | 2 +- efl/elementary/fileselector_entry.pyx | 2 +- efl/elementary/hoversel.pyx| 4 ++-- efl/elementary/multibuttonentry.pyx| 2 +- efl/elementary/naviframe.pyx | 2 +- efl/elementary/popup.pyx | 2 +- efl/elementary/video.pyx | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx index 26e560c..ab36d02 100644 --- a/efl/elementary/ctxpopup.pyx +++ b/efl/elementary/ctxpopup.pyx @@ -322,7 +322,7 @@ cdef class Ctxpopup(LayoutClass): Use this property when you want ctxpopup not to hide automatically. By default, ctxpopup is dismissed whenever mouse clicked its background area, language is changed, and its parent geometry is updated(changed). - + :type: bool .. versionadded:: 1.9 @@ -373,4 +373,4 @@ cdef class Ctxpopup(LayoutClass): def callback_unfocused_del(self, func): self._callback_del(unfocused, func) -_object_mapping_register(Elm_Ctxpopup, Ctxpopup) +_object_mapping_register(Elc_Ctxpopup, Ctxpopup) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index 1c7246b..ceb79e4 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -592,4 +592,4 @@ cdef class Fileselector(LayoutClass): self._callback_del_full(done, _cb_string_conv, func) -_object_mapping_register(Elm_Fileselector, Fileselector) +_object_mapping_register(Elc_Fileselector, Fileselector) diff --git a/efl/elementary/fileselector_button.pyx b/efl/elementary/fileselector_button.pyx index 2b89245..82b633a 100644 --- a/efl/elementary/fileselector_button.pyx +++ b/efl/elementary/fileselector_button.pyx @@ -295,4 +295,4 @@ cdef class FileselectorButton(Button): def callback_language_changed_del(self, func): self._callback_del(language,changed, func) -_object_mapping_register(Elm_Fileselector_Button, FileselectorButton) +_object_mapping_register(Elc_Fileselector_Button, FileselectorButton) diff --git a/efl/elementary/fileselector_entry.pyx b/efl/elementary/fileselector_entry.pyx index d95a5b4..42a9bf7 100644 --- a/efl/elementary/fileselector_entry.pyx +++ b/efl/elementary/fileselector_entry.pyx @@ -431,4 +431,4 @@ cdef class FileselectorEntry(LayoutClass): def callback_language_changed_del(self, func): self._callback_del(language,changed, func) -_object_mapping_register(Elm_Fileselector_Entry, FileselectorEntry) +_object_mapping_register(Elc_Fileselector_Entry, FileselectorEntry) diff --git a/efl/elementary/hoversel.pyx b/efl/elementary/hoversel.pyx index 5f20d9d..2c9ca98 100644 --- a/efl/elementary/hoversel.pyx +++ b/efl/elementary/hoversel.pyx @@ -394,7 +394,7 @@ cdef class Hoversel(Button): def callback_expanded_add(self, func, *args, **kwargs): The hover is expanded. - + .. versionadded:: 1.9 @@ -404,4 +404,4 @@ cdef class Hoversel(Button): self._callback_del(expanded, func) -_object_mapping_register(Elm_Hoversel, Hoversel) +_object_mapping_register(Elc_Hoversel, Hoversel) diff --git a/efl/elementary/multibuttonentry.pyx b/efl/elementary/multibuttonentry.pyx index 9d3d5e9..e1537f8 100644 --- a/efl/elementary/multibuttonentry.pyx +++ b/efl/elementary/multibuttonentry.pyx @@ -533,4 +533,4 @@ cdef class MultiButtonEntry(Object): self._callback_del(expand,state,changed, func) -_object_mapping_register(Elm_Multibuttonentry, MultiButtonEntry) +_object_mapping_register(Elc_Multibuttonentry, MultiButtonEntry) diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx index ecf23e2..63b4158 100644 --- a/efl/elementary/naviframe.pyx +++ b/efl/elementary/naviframe.pyx @@ -601,4 +601,4 @@ cdef class Naviframe(LayoutClass): def callback_unfocused_del(self, func): self._callback_del(unfocused, func)
[EGIT] [bindings/python/python-efl] master 01/01: setup.py: removed the conditional compilation of packages.
davemds pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=2d1740325024a88f940a5f2bded5c2f523392ca3
commit 2d1740325024a88f940a5f2bded5c2f523392ca3
Author: davemds d...@gurumeditation.it
Date: Sun Apr 6 12:52:52 2014 +0200
setup.py: removed the conditional compilation of packages.
All the stuff is now required, this avoid half/broken installation of the
bindings and simplify setup logic.
---
setup.py | 231 +--
1 file changed, 92 insertions(+), 139 deletions(-)
diff --git a/setup.py b/setup.py
index f3d552a..196301d 100755
--- a/setup.py
+++ b/setup.py
@@ -67,11 +67,9 @@ def pkg_config(name, require, min_vers=None):
return (cflags, libs)
except (OSError, subprocess.CalledProcessError):
-print(Did not find + name + with 'pkg-config'.)
-return None
+raise SystemExit(Did not find + name + with 'pkg-config'.)
except (AssertionError):
-print(name+ version mismatch. Found: +ver+ Needed: +min_vers)
-return None
+raise SystemExit(name+ version mismatch. Found: +ver+ Needed:
+min_vers)
# use cython or pre-generated c files
@@ -121,29 +119,18 @@ package_dirs = {}
if set((build, build_ext, install, bdist, sdist)) set(sys.argv):
# === Eina ===
-eina_pkg_config = pkg_config('Eina', 'eina', EFL_MIN_VERSION)
-
-if eina_pkg_config is None:
-raise SystemExit(Eina required but not found!)
-else:
-eina_cflags, eina_libs = eina_pkg_config
+eina_cflags, eina_libs = pkg_config('Eina', 'eina', EFL_MIN_VERSION)
# === Eo ===
-eo_pkg_config = pkg_config('Eo', 'eo', EFL_MIN_VERSION)
-
-if eo_pkg_config is None:
-raise SystemExit(Eo required but not found!)
-else:
-eo_cflags, eo_libs = eo_pkg_config
-
-eo_ext = Extension(eo, [efl/eo/efl.eo+module_suffix],
-define_macros = [('EFL_BETA_API_SUPPORT', None)],
-include_dirs = ['include/'],
-extra_compile_args = eo_cflags,
-extra_link_args = eo_libs + eina_libs
-)
-modules.append(eo_ext)
+eo_cflags, eo_libs = pkg_config('Eo', 'eo', EFL_MIN_VERSION)
+eo_ext = Extension(eo, [efl/eo/efl.eo+module_suffix],
+ define_macros = [('EFL_BETA_API_SUPPORT', None)],
+ include_dirs = ['include/'],
+ extra_compile_args = eo_cflags,
+ extra_link_args = eo_libs + eina_libs
+ )
+modules.append(eo_ext)
# === Utilities ===
@@ -169,110 +156,84 @@ if set((build, build_ext, install, bdist,
sdist)) set(sys.argv):
# === Evas ===
-evas_pkg_config = pkg_config('Evas', 'evas', EFL_MIN_VERSION)
-
-if evas_pkg_config is not None:
-
-evas_cflags, evas_libs = evas_pkg_config
+evas_cflags, evas_libs = pkg_config('Evas', 'evas', EFL_MIN_VERSION)
+evas_ext = Extension(evas, [efl/evas/efl.evas+module_suffix],
+ include_dirs = ['include/'],
+ extra_compile_args = evas_cflags,
+ extra_link_args = evas_libs + eina_libs,
+)
+modules.append(evas_ext)
-evas_ext = Extension(evas, [efl/evas/efl.evas+module_suffix],
-include_dirs = ['include/'],
-extra_compile_args = evas_cflags,
-extra_link_args = evas_libs + eina_libs,
-)
-modules.append(evas_ext)
-
-# compatibility
-packages.append(evas)
-package_dirs[evas] = compat/evas
+# compatibility
+packages.append(evas)
+package_dirs[evas] = compat/evas
# === Ecore ===
-ecore_pkg_config = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION)
-ecore_file_pkg_config = pkg_config('EcoreFile', 'ecore-file', 1.8.0)
+ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION)
+ecore_file_cflags, ecore_file_libs = pkg_config('EcoreFile', 'ecore-file',
1.8.0)
+ecore_ext = Extension(ecore, [efl/ecore/efl.ecore+module_suffix],
+ include_dirs = ['include/'],
+ extra_compile_args = ecore_cflags +
ecore_file_cflags,
+ extra_link_args = ecore_libs + ecore_file_libs +
eina_libs + evas_libs,
+ )
+modules.append(ecore_ext)
-if ecore_pkg_config is not None and ecore_file_pkg_config is not None and
evas_pkg_config is not None:
-
-ecore_cflags, ecore_libs = ecore_pkg_config
-ecore_file_cflags, ecore_file_libs = ecore_file_pkg_config
-
-ecore_ext = Extension(ecore, [efl/ecore/efl.ecore+module_suffix],
-include_dirs = ['include/'],
-extra_compile_args = ecore_cflags + ecore_file_cflags,
-extra_link_args = ecore_libs + ecore_file_libs + eina_libs +
evas_libs,
-)
-
Re: [E-devel] Korea e dinner
On 04/03/14 16:58, Carsten Haitzler wrote: On Thu, 3 Apr 2014 16:42:29 +0900 Cedric BAIL cedric.b...@free.fr said: Cedric Bail On Apr 3, 2014 4:24 PM, Carsten Haitzler ras...@rasterman.com wrote: On Thu, 3 Apr 2014 11:47:30 +0900 Cedric BAIL cedric.b...@free.fr said: Hello, As most of you know by now, I will move to France for some time in a little bit more than a week or so. So let's have a farewell Korea e dinner on Saturday 12 ! So what time (late afternoon? Dinner? ) and where? 7. itaewon of course! :) So unexpected! Maybe a little bit earlier? 6:07. itaewon! :) I'll be there too :-) -- Jérôme Pinot http://ngc891.blogdns.net/ signature.asc Description: Digital signature -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: terminology supports fraktur!!
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=02856cbdec511e08cf579b08e906499d9583f018
commit 02856cbdec511e08cf579b08e906499d9583f018
Author: Boris Faure bill...@gmail.com
Date: Sun Apr 6 14:42:38 2014 +0200
terminology supports fraktur!!
---
src/bin/termpty.h| 1 +
src/bin/termptyesc.c | 6 +-
src/bin/termptygfx.c | 15 +--
src/bin/termptygfx.h | 4 +++-
src/bin/termptyops.c | 5 +++--
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index 0fc0e6e..e2e05e2 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -69,6 +69,7 @@ struct _Termatt
unsigned short autowrapped : 1;
unsigned short newline : 1;
unsigned short tab : 1;
+ unsigned short fraktur : 1;
#if defined(SUPPORT_80_132_COLUMNS)
unsigned short is_80_132_mode_allowed : 1;
#endif
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index c5b5d72..9e30809 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -162,6 +162,9 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr)
case 9: // strikethrough
ty-state.att.strike = 1;
break;
+case 20: // fraktur!
+ ty-state.att.fraktur = 1;
+ break;
case 21: // no bold/bright
ty-state.att.bold = 0;
break;
@@ -169,10 +172,11 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr)
ty-state.att.bold = 0;
ty-state.att.faint = 0;
break;
-case 23: // no italic
+case 23: // no italic, not fraktur
#if defined(SUPPORT_ITALIC)
ty-state.att.italic = 0;
#endif
+ ty-state.att.fraktur = 0;
break;
case 24: // no underline
ty-state.att.underline = 0;
diff --git a/src/bin/termptygfx.c b/src/bin/termptygfx.c
index 3a6a607..00ffabf 100644
--- a/src/bin/termptygfx.c
+++ b/src/bin/termptygfx.c
@@ -34,9 +34,9 @@ static const unsigned short vt100_to_unicode[62] =
};
Eina_Unicode
-_termpty_charset_trans(Eina_Unicode g, int chset)
+_termpty_charset_trans(Eina_Unicode g, Termstate *state)
{
- switch (chset)
+ switch (state-charsetch)
{
case '0': /* DEC Special Character Line Drawing Set */
if ((g = 0x41) (g = 0x7e)
@@ -49,5 +49,16 @@ _termpty_charset_trans(Eina_Unicode g, int chset)
default:
break;
}
+ if (state-att.fraktur)
+ {
+if (g = 'a' g = 'z')
+ {
+ g += 0x1d51e - 'a';
+ }
+else if (g = 'A' g = 'Z')
+ {
+ g += 0x1d504 - 'A';
+ }
+ }
return g;
}
diff --git a/src/bin/termptygfx.h b/src/bin/termptygfx.h
index 770cd9d..a7bbaad 100644
--- a/src/bin/termptygfx.h
+++ b/src/bin/termptygfx.h
@@ -1,6 +1,8 @@
#ifndef _TERMPTY_GFX_H__
#define _TERMPTY_GFX_H__ 1
-Eina_Unicode _termpty_charset_trans(Eina_Unicode g, int chset);
+#include termpty.h
+
+Eina_Unicode _termpty_charset_trans(Eina_Unicode g, Termstate *state);
#endif
diff --git a/src/bin/termptyops.c b/src/bin/termptyops.c
index 34b9c9b..ac84866 100644
--- a/src/bin/termptyops.c
+++ b/src/bin/termptyops.c
@@ -196,8 +196,8 @@ _termpty_text_append(Termpty *ty, const Eina_Unicode
*codepoints, int len)
termpty_cell_copy(ty, (cells[j - 1]), (cells[j]), 1);
}
-g = _termpty_charset_trans(codepoints[i], ty-state.charsetch);
-
+g = _termpty_charset_trans(codepoints[i], ty-state);
+
termpty_cell_codepoint_att_fill(ty, g, ty-state.att,
(cells[ty-state.cx]), 1);
#if defined(SUPPORT_DBLWIDTH)
@@ -360,6 +360,7 @@ _termpty_reset_att(Termatt *att)
att-autowrapped = 0;
att-newline = 0;
att-tab = 0;
+ att-fraktur = 0;
}
void
--
[EGIT] [bindings/python/python-efl] master 01/01: doc: automatically show parameters in functions and methods documentation
davemds pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=b84c109fefb81b6a502d1a9380b0e2d2b9dc1c6c
commit b84c109fefb81b6a502d1a9380b0e2d2b9dc1c6c
Author: davemds d...@gurumeditation.it
Date: Sun Apr 6 16:17:27 2014 +0200
doc: automatically show parameters in functions and methods documentation
This require the Cython embedsignature directive, that automatically add
the signature in the first line of the docstring.
Then the Sphinx Autodoc module parse the docstring and extract the
signature.
Signature is also cleaned using the 'autodoc-process-signature' callback to
remove the 'self' param and all the cython params type,
---
doc/conf.py | 44 ++--
setup.py| 1 +
2 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index f9be31b..7127244 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -24,13 +24,13 @@ d = lib.%s-%s-%d.%d % (
sys.version_info[1]
)
sys.path.insert(0, os.path.abspath(../build/+d))
-
#sys.path.insert(0, os.path.abspath('../build/lib.linux-i686-3.2'))
+
# -- General configuration
-
# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.1'
# Add any Sphinx extension module names here, as strings. They can be
extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -46,7 +46,8 @@ except ImportError:
else:
extensions.append('sphinx.ext.inheritance_diagram')
graphviz_output_format = svg # png (default) or svg
-graphviz_dot_args = [-Gbgcolor=transparent, -Ncolor=#4399FF,
-Nfontcolor=white, -Ecolor=blue]
+graphviz_dot_args = [-Gbgcolor=transparent, -Ncolor=#4399FF,
+ -Nfontcolor=white, -Ecolor=blue]
try:
import sphinxcontrib.youtube
@@ -55,13 +56,6 @@ except ImportError:
else:
extensions.append('sphinxcontrib.youtube')
-autodoc_default_flags = [
-'members',
-#'inherited-members',
-'show-inheritance'
-]
-autoclass_content = both
-autodoc_docstring_signature = True
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -148,6 +142,36 @@ pygments_style = 'sphinx'
# ('py:obj', 'datetime.date'),
# ]
+
+# -- Autodoc configuration
-
+
+autodoc_default_flags = [
+'members',
+'show-inheritance',
+# 'inherited-members',
+# 'undoc-members',
+]
+autoclass_content = both
+autodoc_docstring_signature = True
+# autodoc_member_order = bysource
+
+def setup(app):
+app.connect('autodoc-process-signature', autodoc_process_signature)
+
+def autodoc_process_signature(app, what, name, obj, options, signature,
return_annotation):
+Cleanup params: remove the 'self' param and all the cython types
+
+if what not in ('function', 'method'):
+return
+
+params = list()
+for param in (p.strip() for p in signature[1:-1].split(',')):
+if param != 'self':
+params.append(param.rpartition(' ')[2])
+
+return ('(%s)' % ', '.join(params), return_annotation)
+
+
# -- Options for HTML output
---
# The theme to use for HTML and HTML Help pages. See the documentation for
diff --git a/setup.py b/setup.py
index 196301d..229b59c 100755
--- a/setup.py
+++ b/setup.py
@@ -359,6 +359,7 @@ setup(
compiler_directives={
c_string_type: unicode,
c_string_encoding: utf-8,
+embedsignature: True,
}
),
)
--
[EGIT] [bindings/python/python-efl] master 01/01: doc: ignore cython generated signature for classes
davemds pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=c259d3f78369934481325a086141cffa03d0d8ed
commit c259d3f78369934481325a086141cffa03d0d8ed
Author: davemds d...@gurumeditation.it
Date: Sun Apr 6 16:25:08 2014 +0200
doc: ignore cython generated signature for classes
---
doc/conf.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/doc/conf.py b/doc/conf.py
index 7127244..8ba635d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -156,7 +156,9 @@ autodoc_docstring_signature = True
# autodoc_member_order = bysource
def setup(app):
+from sphinx.ext.autodoc import cut_lines
app.connect('autodoc-process-signature', autodoc_process_signature)
+app.connect('autodoc-process-docstring', cut_lines(2, what=['class']))
def autodoc_process_signature(app, what, name, obj, options, signature,
return_annotation):
Cleanup params: remove the 'self' param and all the cython types
--
[EGIT] [bindings/python/python-efl] master 01/01: docs: remove the signatures from the docstring, are now autimatically added by cython
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=5c3ced421cdcf26bd1c30f4fbccb8ada91b7f638 commit 5c3ced421cdcf26bd1c30f4fbccb8ada91b7f638 Author: davemds d...@gurumeditation.it Date: Sun Apr 6 17:03:58 2014 +0200 docs: remove the signatures from the docstring, are now autimatically added by cython --- efl/ecore/efl.ecore_animator.pxi | 14 ++-- efl/ecore/efl.ecore_fd_handler.pxi | 6 ++-- efl/ecore/efl.ecore_file_download.pxi | 12 +++ efl/ecore/efl.ecore_timer.pxi | 8 ++--- efl/edje/efl.edje_object.pxi | 14 +++- efl/emotion/efl.emotion.pyx| 8 ++--- efl/evas/efl.evas.pyx | 8 ++--- efl/evas/efl.evas_map.pxi | 63 +- efl/evas/efl.evas_object.pxi | 41 +- efl/evas/efl.evas_object_grid.pxi | 16 +++-- efl/evas/efl.evas_object_image.pxi | 26 -- efl/evas/efl.evas_object_line.pxi | 4 +-- efl/evas/efl.evas_object_polygon.pxi | 4 +-- efl/evas/efl.evas_object_rectangle.pxi | 4 +-- efl/evas/efl.evas_object_smart.pxi | 4 +-- efl/evas/efl.evas_object_table.pxi | 24 - efl/evas/efl.evas_object_text.pxi | 13 ++- efl/evas/efl.evas_object_textblock.pxi | 11 ++ efl/evas/efl.evas_object_textgrid.pxi | 21 +++- efl/evas/efl.evas_rect.pxi | 36 +-- 20 files changed, 83 insertions(+), 254 deletions(-) diff --git a/efl/ecore/efl.ecore_animator.pxi b/efl/ecore/efl.ecore_animator.pxi index 16ab916..4b5a6a3 100644 --- a/efl/ecore/efl.ecore_animator.pxi +++ b/efl/ecore/efl.ecore_animator.pxi @@ -17,10 +17,7 @@ cdef class Animator(Eo): - - - -Creates an animator to tick off at every animaton tick during main loop +Creates an animator to tick off at every animaton tick during main loop execution. This class represents an animator that will call the given ``func`` @@ -89,10 +86,7 @@ cdef Eina_Bool _ecore_timeline_cb(void *data, double pos) with gil: return ret cdef class AnimatorTimeline(Animator): - - - -Add an animator that runs for a limited time +Add an animator that runs for a limited time :param runtime: The time to run in seconds :param func: The function to call when it ticks off @@ -128,9 +122,7 @@ cdef class AnimatorTimeline(Animator): return self.func(*self.args, **self.kargs) def animator_add(func, *args, **kargs): - - -Animator factory, for C-api compatibility. +Animator factory, for C-api compatibility. func signature:: diff --git a/efl/ecore/efl.ecore_fd_handler.pxi b/efl/ecore/efl.ecore_fd_handler.pxi index f92bc01..2d950ba 100644 --- a/efl/ecore/efl.ecore_fd_handler.pxi +++ b/efl/ecore/efl.ecore_fd_handler.pxi @@ -199,8 +199,7 @@ cdef class FdHandler(object): return bool(ecore_main_fd_handler_active_get(self.obj, ECORE_FD_ERROR)) def prepare_callback_set(self, func, *args, **kargs): - -Set a function to call becore doing the select() on the fd. +Set a function to call becore doing the select() on the fd. Expected signature:: @@ -220,8 +219,7 @@ cdef class FdHandler(object): def fd_handler_add(fd, int flags, func, *args, **kargs): - -:py:class:`FdHandler` factory, for C-api compatibility. +:py:class:`FdHandler` factory, for C-api compatibility. ``func`` signature:: diff --git a/efl/ecore/efl.ecore_file_download.pxi b/efl/ecore/efl.ecore_file_download.pxi index 125ebd5..3d0d7b7 100644 --- a/efl/ecore/efl.ecore_file_download.pxi +++ b/efl/ecore/efl.ecore_file_download.pxi @@ -138,8 +138,7 @@ cdef class FileDownload(object): def file_download(url, dst, completion_cb, progress_cb, *args, **kargs): - -efl.ecore.FileDownload} factory, for C-api compatibility. +efl.ecore.FileDownload} factory, for C-api compatibility. :param url: The complete url to download :param dst: Where to download the file @@ -156,21 +155,18 @@ def file_download(url, dst, completion_cb, progress_cb, *args, **kargs): return FileDownload(url, dst, completion_cb, progress_cb, *args, **kargs) def file_download_abort(instance): - -C-api compatibility +C-api compatibility Abort the given download an free internal resources instance.abort() def file_download_abort_all(): - -This will abort all the download currently in progrss, use with caution. +This will abort all the download currently in progrss, use with caution. ecore_file_download_abort_all() def file_download_protocol_available(protocol): - -Check if the given download protocol is available, available protocols +Check if the given download protocol is available, available protocols are: http://;, ftp://; and file://. Note that ecore can be compiled without CURL support and thus
[EGIT] [core/elementary] master 01/02: test_list: Removed wrong box packing from list focus example.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0a9a01700a71181b7c14bee091ce6355d8d9fcf2 commit 0a9a01700a71181b7c14bee091ce6355d8d9fcf2 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Mon Apr 7 00:58:22 2014 +0900 test_list: Removed wrong box packing from list focus example. --- src/bin/test_list.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/test_list.c b/src/bin/test_list.c index fb2922e..4939f2f 100644 --- a/src/bin/test_list.c +++ b/src/bin/test_list.c @@ -1532,7 +1532,6 @@ _test_list_focus(const char *name, const char *title, Eina_Bool horiz) elm_box_pack_end(bx_opt, chk); evas_object_show(chk); - elm_box_pack_end(bx, bx_opt); // Focus Movement Policy fr = elm_frame_add(bx); elm_object_text_set(fr, Focus Movement Policy); --
[EGIT] [core/elementary] master 02/02: list: Fixed _elm_list_item_content_focus_set misbehavior.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=eb9b9635c365692aaca85ac6bb3ed5f4e2112400
commit eb9b9635c365692aaca85ac6bb3ed5f4e2112400
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Mon Apr 7 03:08:20 2014 +0900
list: Fixed _elm_list_item_content_focus_set misbehavior.
- Moved a check for direction at the start of the function based on the
horizontal mode configuration.
- Removed unnecessary focus set to edje object. In this case, that item
will get the focus automatically by elm widget item focus
infrastructure.
But this focus_on_selection feature is still broken. I need to fix them
more.
---
src/lib/elm_list.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 5a44e83..bc4a9c8 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -213,6 +213,9 @@ _elm_list_item_content_focus_set(Elm_List_Item *it,
Elm_Focus_Direction dir,
ELM_LIST_DATA_GET(WIDGET(it), sd);
if (!sd-focus_on_selection_enabled) return EINA_FALSE;
+ if ((h_mode (dir != ELM_FOCUS_UP) (dir != ELM_FOCUS_DOWN)) ||
+ (!h_mode (dir != ELM_FOCUS_LEFT) (dir != ELM_FOCUS_RIGHT)))
+ return EINA_FALSE;
int focus_objs = 0;
Evas_Object *focus_chain[2];
@@ -225,10 +228,7 @@ _elm_list_item_content_focus_set(Elm_List_Item *it,
Elm_Focus_Direction dir,
focus_chain[focus_objs++] = it-end;
if (!focus_objs)
- {
-elm_object_focus_set(VIEW(it), EINA_TRUE);
-return EINA_FALSE;
- }
+ return EINA_FALSE;
for (idx = 0; idx focus_objs; idx++)
{
@@ -254,10 +254,6 @@ _elm_list_item_content_focus_set(Elm_List_Item *it,
Elm_Focus_Direction dir,
return EINA_TRUE;
}
-if ((h_mode (dir != ELM_FOCUS_UP) (dir != ELM_FOCUS_DOWN)) ||
-(!h_mode (dir != ELM_FOCUS_LEFT) (dir != ELM_FOCUS_RIGHT)))
- return EINA_FALSE;
-
idx += ((dir == ELM_FOCUS_UP) || (dir == ELM_FOCUS_LEFT)) ? -1 : 1;
if (idx 0) idx = focus_objs - 1;
if (idx = focus_objs) idx = 0;
--
[EGIT] [core/elementary] master 02/02: list: Fixed _elm_list_item_content_focus_set in case the first content is focused.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2647ab7b80d6514feb0ba095b5d9091f0c687cc2
commit 2647ab7b80d6514feb0ba095b5d9091f0c687cc2
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Mon Apr 7 04:13:01 2014 +0900
list: Fixed _elm_list_item_content_focus_set in case the first content
is focused.
The function should return true when the first content of an item is
focused.
@fix
---
src/lib/elm_list.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index e2709bc..969da13 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -242,7 +242,7 @@ _elm_list_item_content_focus_set(Elm_List_Item *it,
Elm_Focus_Direction dir,
if (!focused)
{
elm_object_focus_set(focus_chain[0], EINA_TRUE);
-return EINA_FALSE;
+return EINA_TRUE;
}
if (dir != ELM_FOCUS_PREVIOUS)
--
[EGIT] [core/elementary] master 01/02: list: Refactor direction key event handling routine in list.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f91a21a583d759562b33c4d377dec2899185517e
commit f91a21a583d759562b33c4d377dec2899185517e
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Mon Apr 7 04:01:32 2014 +0900
list: Refactor direction key event handling routine in list.
- Added internal function _elm_list_elm_widget_event_direction.
- Simplified cascaded if statements.
- Note: focus_on_selection feature is still broken.
---
src/lib/elm_list.c | 281 +
1 file changed, 111 insertions(+), 170 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index bc4a9c8..e2709bc 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -307,6 +307,95 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction
dir)
return EINA_FALSE;
}
+static Eina_Bool
+_elm_list_elm_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction
dir, Evas_Event_Key_Down *ev)
+{
+ Elm_List_Item *it = NULL;
+ ELM_LIST_DATA_GET(obj, sd);
+ Eina_Bool ret = EINA_FALSE;
+ Evas_Coord v = 0;
+ Evas_Coord min = 0;
+ Eina_Bool focus_only = EINA_FALSE;
+
+ // check if the content can get the focus by direction key
+ it = (Elm_List_Item *)elm_object_focused_item_get(obj);
+ if (_elm_list_item_content_focus_set(it, dir, sd-h_mode))
+ return EINA_TRUE;
+
+ if ((sd-h_mode (dir != ELM_FOCUS_LEFT) (dir != ELM_FOCUS_RIGHT)) ||
+ (!sd-h_mode (dir != ELM_FOCUS_UP) (dir != ELM_FOCUS_DOWN)))
+ return EINA_FALSE;
+
+ // get content size and viewport size
+ if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_RIGHT))
+ {
+eo_do(obj,
+ elm_interface_scrollable_content_viewport_size_get(v, NULL),
+ elm_interface_scrollable_content_size_get(min, NULL));
+ }
+ else
+ {
+eo_do(obj,
+ elm_interface_scrollable_content_viewport_size_get(NULL, v),
+ elm_interface_scrollable_content_size_get(NULL, min));
+ }
+
+ // move focus or selection according to the configuration
+ focus_only = _elm_config-item_select_on_focus_disable
elm_widget_focus_highlight_enabled_get(obj);
+ if (focus_only)
+ ret = _item_focused_next(obj, dir);
+ else
+ {
+if (evas_key_modifier_is_set(ev-modifiers, Shift))
+ {
+ if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_UP))
+ ret = _item_multi_select_up(sd);
+ else
+ ret = _item_multi_select_down(sd);
+ }
+else
+ {
+ if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_UP))
+ ret = _item_single_select_up(sd);
+ else
+ ret = _item_single_select_down(sd);
+ }
+ }
+ if (ret)
+ return EINA_TRUE;
+
+ // handle item loop feature
+ if (sd-item_loop_enable)
+ {
+if (min v)
+ {
+ if (dir == ELM_FOCUS_LEFT)
+ elm_layout_signal_emit(obj, elm,action,looping,left, elm);
+ else if (dir == ELM_FOCUS_RIGHT)
+ elm_layout_signal_emit(obj, elm,action,looping,right, elm);
+ else if (dir == ELM_FOCUS_UP)
+ elm_layout_signal_emit(obj, elm,action,looping,up, elm);
+ else if (dir == ELM_FOCUS_DOWN)
+ elm_layout_signal_emit(obj, elm,action,looping,down, elm);
+ }
+else
+ {
+ if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_UP))
+ it = (Elm_List_Item *)elm_list_last_item_get(obj);
+ else
+ it = (Elm_List_Item *)elm_list_first_item_get(obj);
+
+ if (focus_only)
+ elm_object_item_focus_set((Elm_Object_Item *)it, EINA_TRUE);
+ else
+ elm_list_item_selected_set((Elm_Object_Item *)it, EINA_TRUE);
+ }
+return EINA_TRUE;
+ }
+
+ return EINA_FALSE;
+}
+
EOLIAN static Eina_Bool
_elm_list_elm_widget_event(Eo *obj, Elm_List_Data *sd, Evas_Object *src,
Evas_Callback_Type type, void *event_info)
{
@@ -321,11 +410,7 @@ _elm_list_elm_widget_event(Eo *obj, Elm_List_Data *sd,
Evas_Object *src, Evas_Ca
Evas_Coord step_y = 0;
Evas_Coord page_x = 0;
Evas_Coord page_y = 0;
- Evas_Coord minw = 0;
- Evas_Coord minh = 0;
Elm_List_Item *it = NULL;
- Eina_Bool sel_ret = EINA_FALSE;
- Eina_Bool foc_ret = EINA_FALSE;
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
@@ -336,197 +421,53 @@ _elm_list_elm_widget_event(Eo *obj, Elm_List_Data *sd,
Evas_Object *src, Evas_Ca
elm_interface_scrollable_content_pos_get(x, y),
elm_interface_scrollable_step_size_get(step_x, step_y),
elm_interface_scrollable_page_size_get(page_x, page_y),
- elm_interface_scrollable_content_viewport_size_get(v_w, v_h),
-
[EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It is less
confusing if there is just one place where you can click throuw the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190 ++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+ _entrance_conf_log_begin,
+ _entrance_conf_log_end,
+ _entrance_conf_log_build,
+ _entrance_conf_log_check,
+ _entrance_conf_log_apply);
+}
+
+void
+entrance_conf_log_shutdown(void)
+{
+ PT(conf log shutdown\n);
+}
+
diff --git a/src/bin/entrance_conf_log.h b/src/bin/entrance_conf_log.h
new file mode 100644
index 000..d1ead6b
--- /dev/null
+++ b/src/bin/entrance_conf_log.h
@@ -0,0 +1,7 @@
+#ifndef ENTRANCE_CONF_LOG_H_
+#define ENTRANCE_CONF_LOG_H_
+
+void entrance_conf_log_init(void);
+void entrance_conf_log_shutdown(void);
+
+#endif /* ENTRANCE_CONF_MAIN_H_ */
diff --git a/src/bin/entrance_conf_main.c b/src/bin/entrance_conf_main.c
index 9cf2efb..3f0c086 100644
--- a/src/bin/entrance_conf_main.c
+++ b/src/bin/entrance_conf_main.c
@@ -102,31 +102,78 @@ _entrance_conf_scale_changed(void *data EINA_UNUSED,
Evas_Object *obj, void *eve
entrance_conf_changed();
}
-static void
-_entrance_conf_toolbar_click(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+static Evas_Object *
+_entrance_conf_main_build(Evas_Object *obj)
{
- Evas_Object *o = data, *old;
+ Evas_Object *tb, *bx_over,
[EGIT] [bindings/python/python-efl] master 01/01: added docs for Eo
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=beff74c28aa33b7295900a20dda4f00d61147cff commit beff74c28aa33b7295900a20dda4f00d61147cff Author: davemds d...@gurumeditation.it Date: Sun Apr 6 23:35:53 2014 +0200 added docs for Eo --- doc/eo/eo.rst | 26 ++ doc/index.rst | 7 +++ efl/eo/efl.eo.pyx | 37 ++--- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/doc/eo/eo.rst b/doc/eo/eo.rst new file mode 100644 index 000..eb6046c --- /dev/null +++ b/doc/eo/eo.rst @@ -0,0 +1,26 @@ +:mod:`efl.eo` Module +=== + +.. module:: efl.eo + + +What is Eo? +-- + +Eo is the generic object system of the whole set of libraries. It is +designed to be the base object system for the EFL. + +The :class:`Eo` class is the base for (quite) all the objects in the EFL, +in other words every EFL object inherit from :class:`Eo` and so you can +use the methods defined here on every other object. + +In practice you will never directly use the :class:`Eo` class, in fact you +cannot create an instance of the class. As a user you will just use a small +number of methods from derived class, like :meth:`Eo.delete()` or +:meth:`Eo.is_deleted()` + + +Reference +- + +.. autoclass:: efl.eo.Eo diff --git a/doc/index.rst b/doc/index.rst index 5738076..2e56615 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -35,6 +35,13 @@ EFL .. toctree:: efl.rst + +EO +--- + +.. toctree:: eo/eo.rst + + Ecore - diff --git a/efl/eo/efl.eo.pyx b/efl/eo/efl.eo.pyx index 33557d2..42817ab 100644 --- a/efl/eo/efl.eo.pyx +++ b/efl/eo/efl.eo.pyx @@ -200,8 +200,7 @@ cdef Eina_Bool _eo_event_del_cb(void *data, cEo *obj, cdef class Eo(object): -Base class used by all the Eo object in the bindings, its not meant to be -used by users, but only by internal classes. +Base class used by all the object in the EFL. @@ -250,27 +249,59 @@ cdef class Eo(object): return 1 def delete(self): +Delete the object and free internal resources. + +.. note:: This will not delete the python object, but only the internal +C one. The python object will be automatically deleted by the +garbage collector when there are no more reference to it. + + eo_del(self.obj) def is_deleted(self): -Check if the object has been deleted thus leaving the object shallow +Check if the object has been deleted thus leaving the object shallow. + +:return: True if the object has been deleted yet, False otherwise. +:rtype: bool + + return bool(self.obj == NULL) def parent_set(self, Eo parent): +Set the parent object. + +:param parent: The object to set as parent. +:type parent: :class:`Eo` + + eo_do(self.obj, eo_parent_set(parent.obj)) def parent_get(self): +Get the parent object. + +:return: The parent object +:rtype: :class:`Eo` + + cdef cEo *parent = NULL eo_do(self.obj, eo_parent_get(parent)) return object_from_instance(parent) def event_freeze(self): +Pause event propagation for this object. eo_do(self.obj, eo_event_freeze()) def event_thaw(self): +Restart event propagation for this object. eo_do(self.obj, eo_event_thaw()) def event_freeze_get(self): +Get the event freeze count for this object. + +:return: the freeze count +:rtype: int + + cdef int fcount eo_do(self.obj, eo_event_freeze_get(fcount)) return fcount --
[EGIT] [bindings/python/python-efl] master 01/01: setup.py: Disable automatic string encoding
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=ab778fc86b4c15777ae04c3cec544a03c1661a92
commit ab778fc86b4c15777ae04c3cec544a03c1661a92
Author: Kai Huuhko kai.huu...@gmail.com
Date: Mon Apr 7 00:39:23 2014 +0300
setup.py: Disable automatic string encoding
---
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 229b59c..8d77d7d 100755
--- a/setup.py
+++ b/setup.py
@@ -357,8 +357,8 @@ setup(
ext_package = efl, # The prefix for ext modules/packages
ext_modules = cythonize(modules, include_path=[include],
compiler_directives={
-c_string_type: unicode,
-c_string_encoding: utf-8,
+#c_string_type: unicode,
+#c_string_encoding: utf-8,
embedsignature: True,
}
),
--
[EGIT] [core/efl] master 01/01: configure: Fix the possible build break after 83af91c8b
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=89d6e0b142af61b7501ed7f894017592da6ece1b commit 89d6e0b142af61b7501ed7f894017592da6ece1b Author: Ryuan Choi ryuan.c...@gmail.com Date: Mon Apr 7 10:21:19 2014 +0900 configure: Fix the possible build break after 83af91c8b Added eet into internal dependencies for ecore_evas_connect, ethumb, ethumb_client I got below errors for ecore_evas_connect, ethumb, ethumb_client lib/evas/.libs/libevas.so: undefined reference to `eet_data_image_colorspace_get' lib/evas/.libs/libevas.so: undefined reference to `eet_data_image_read_to_cspace_surface_cipher' collect2: error: ld returned 1 exit status --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 409e48e..01d4ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -3459,6 +3459,7 @@ EFL_PLATFORM_DEPEND([ECORE_EVAS], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore]) +EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eet]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina]) @@ -3975,6 +3976,7 @@ EFL_PLATFORM_DEPEND([ETHUMB], [evil]) EFL_PLATFORM_DEPEND([EINA], [evil]) EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina]) +EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eet]) EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas]) EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo]) EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore]) @@ -4019,6 +4021,7 @@ EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil]) ### Checks for libraries EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina]) EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo]) +EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eet]) EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore]) EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje]) EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eldbus]) --
