Merge branch 'master' into eolian

This commit is contained in:
Kai Huuhko 2014-09-15 15:27:55 +03:00
commit 53a8742878
5 changed files with 155 additions and 21 deletions

View File

@ -1,6 +1,6 @@
##################
PYTHON-EFL 1.10.99
##################
#################
PYTHON-EFL 1.11.0
#################
EFL is a collection of libraries for handling many common tasks a
developer man have such as data structures, communication, rendering,

View File

@ -76,12 +76,147 @@ i {
<h1>Automatically generated list of changes</h1>
<ul>
<li><a href="#1.11"><b>version 1.11</b></a></li>
<li><a href="#1.10"><b>version 1.10</b></a></li>
<li><a href="#1.9"><b>version 1.9</b></a></li>
<li><a href="#1.8"><b>version 1.8</b></a></li>
</ul>
<a name="1.11"><h2>Automatically generated list of changes in version 1.11</h2></a>
<h4>efl.ecore.x</h4>
<ul>
<li><b>screensaver_blank_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_blank_set</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_custom_blanking_disable</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_custom_blanking_enable</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_event_available_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_event_listen_set</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_expose_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_expose_set</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_idle_time_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_interval_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_interval_set</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_resume</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_set</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_supend</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_timeout_get</b>: <i>added:</i> New in version 1.11.</li>
<li><b>screensaver_timeout_set</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.general</h4>
<ul>
<li><b>ELM_GLOB_MATCH_NO_ESCAPE</b>: <i>added:</i> New in version 1.11.</li>
<li><b>ELM_GLOB_MATCH_PATH</b>: <i>added:</i> New in version 1.11.</li>
<li><b>ELM_GLOB_MATCH_PERIOD</b>: <i>added:</i> New in version 1.11.</li>
<li><b>ELM_GLOB_MATCH_NOCASE</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.gengrid</h4>
<ul>
<li><b>ELM_GENGRID_REORDER_TYPE_NORMAL</b>: <i>added:</i> New in version 1.11.</li>
<li><b>ELM_GENGRID_REORDER_TYPE_SWAP</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Gengrid.reorder_type</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Gengrid.search_by_text_item_get</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.genlist</h4>
<ul>
<li><b>Genlist.search_by_text_item_get</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.map</h4>
<ul>
<li><b>Map.region_zoom_bring_in</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.panes</h4>
<ul>
<li><b>Panes.content_left_min_relative_size</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Panes.content_left_min_size</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Panes.content_right_min_relative_size</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Panes.content_right_min_size</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.elementary.toolbar</h4>
<ul>
<li><b>Toolbar.callback_selected_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Toolbar.callback_unselected_add</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<h4>efl.emotion</h4>
<ul>
<li><b>Emotion.on_open_done_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_open_done_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_playback_started_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_playback_started_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_load_failed_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_load_failed_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_load_succeed_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_load_succeed_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_save_failed_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_save_failed_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_save_succeed_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_save_succeed_del</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_update_add</b>: <i>added:</i> New in version 1.11.</li>
<li><b>Emotion.on_position_update_del</b>: <i>added:</i> New in version 1.11.</li>
</ul>
<a name="1.10"><h2>Automatically generated list of changes in version 1.10</h2></a>
<h4>efl.elementary.configuration</h4>

View File

@ -1,3 +1,3 @@
__version__ = "1.10.99"
__version_info__ = ( 1, 10, 99 )
__version__ = "1.11.0"
__version_info__ = ( 1, 11, 0 )

View File

@ -508,7 +508,7 @@ cdef class Web(Object):
def __set__(self, url):
if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url)
if not elm_web_url_set(self.obj, url):
raise RuntimeWarning
raise RuntimeWarning("Cannot set url")
def __get__(self):
return _ctouni(elm_web_url_get(self.obj))
@ -516,7 +516,7 @@ cdef class Web(Object):
def url_set(self, url):
if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url)
if not elm_web_url_set(self.obj, url):
raise RuntimeWarning
raise RuntimeWarning("Cannot set url")
def url_get(self):
return _ctouni(elm_web_url_get(self.obj))
@ -670,7 +670,7 @@ cdef class Web(Object):
"""
if not elm_web_text_matches_unmark_all(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot clear marked matches")
property text_matches_highlight:
"""
@ -685,7 +685,7 @@ cdef class Web(Object):
"""
def __set__(self, bint highlight):
if not elm_web_text_matches_highlight_set(self.obj, highlight):
raise RuntimeWarning
raise RuntimeWarning("Cannot set matched marks highlighting")
def __get__(self):
return bool(elm_web_text_matches_highlight_get(self.obj))
@ -719,7 +719,7 @@ cdef class Web(Object):
"""
if not elm_web_stop(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot stop")
def reload(self):
"""
@ -730,7 +730,7 @@ cdef class Web(Object):
"""
if not elm_web_reload(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot reload")
def reload_full(self):
"""
@ -741,7 +741,7 @@ cdef class Web(Object):
"""
if not elm_web_reload_full(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot reload without caches")
def back(self):
"""
@ -759,7 +759,7 @@ cdef class Web(Object):
"""
if not elm_web_back(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot go back")
def forward(self):
"""
@ -777,7 +777,7 @@ cdef class Web(Object):
"""
if not elm_web_forward(self.obj):
raise RuntimeWarning
raise RuntimeWarning("Cannot go forward")
def navigate(self, int steps):
"""

View File

@ -2,7 +2,6 @@
# encoding: utf-8
from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL
from efl import ecore
from efl import elementary
from efl.elementary.window import StandardWindow
from efl.elementary.box import Box
@ -133,14 +132,14 @@ def web_clicked(obj):
en.show()
# Sync navigation entry and current URI
def do_change_uri(en):
web.uri = en.entry
def do_change_url(en):
web.url = en.entry
def did_change_uri(web, uri, en):
en.entry = uri
def did_change_url(web, url, en):
en.entry = url
en.callback_activated_add(do_change_uri)
web.callback_uri_changed_add(did_change_uri, en)
en.callback_activated_add(do_change_url)
web.callback_url_changed_add(did_change_url, en)
# Sync title
def did_change_title(web, title, win):