diff options
Diffstat (limited to 'gi/overrides/Gtk.py')
| -rw-r--r-- | gi/overrides/Gtk.py | 157 |
1 files changed, 29 insertions, 128 deletions
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py index 002f22b..ab09a26 100644 --- a/gi/overrides/Gtk.py +++ b/gi/overrides/Gtk.py @@ -21,7 +21,7 @@ import sys from gi.repository import GObject -from ..overrides import override +from ..overrides import override, strip_boolean_result from ..module import get_introspection_module from gi import PyGIDeprecationWarning @@ -66,11 +66,7 @@ __all__.append('_construct_target_list') class Widget(Gtk.Widget): - def translate_coordinates(self, dest_widget, src_x, src_y): - success, dest_x, dest_y = super(Widget, self).translate_coordinates( - dest_widget, src_x, src_y) - if success: - return (dest_x, dest_y,) + translate_coordinates = strip_boolean_result(Gtk.Widget.translate_coordinates) def render_icon(self, stock_id, size, detail=None): return super(Widget, self).render_icon(stock_id, size, detail) @@ -107,10 +103,8 @@ class Container(Gtk.Container, Widget): # alias for Python 2.x object protocol __nonzero__ = __bool__ - def get_focus_chain(self): - success, widgets = super(Container, self).get_focus_chain() - if success: - return widgets + get_focus_chain = strip_boolean_result(Gtk.Container.get_focus_chain) + Container = override(Container) __all__.append('Container') @@ -119,16 +113,10 @@ __all__.append('Container') class Editable(Gtk.Editable): def insert_text(self, text, position): - pos = super(Editable, self).insert_text(text, -1, position) + return super(Editable, self).insert_text(text, -1, position) - return pos + get_selection_bounds = strip_boolean_result(Gtk.TextBuffer.get_selection_bounds, fail_ret=()) - def get_selection_bounds(self): - success, start_pos, end_pos = super(Editable, self).get_selection_bounds() - if success: - return (start_pos, end_pos,) - else: - return tuple() Editable = override(Editable) __all__.append("Editable") @@ -333,11 +321,7 @@ __all__.append('UIManager') class ComboBox(Gtk.ComboBox, Container): - - def get_active_iter(self): - success, aiter = super(ComboBox, self).get_active_iter() - if success: - return aiter + get_active_iter = strip_boolean_result(Gtk.ComboBox.get_active_iter) ComboBox = override(ComboBox) __all__.append('ComboBox') @@ -611,20 +595,9 @@ class IconView(Gtk.IconView): def __init__(self, model=None, **kwds): Gtk.IconView.__init__(self, model=model, **kwds) - def get_item_at_pos(self, x, y): - success, path, cell = super(IconView, self).get_item_at_pos(x, y) - if success: - return (path, cell,) - - def get_visible_range(self): - success, start_path, end_path = super(IconView, self).get_visible_range() - if success: - return (start_path, end_path,) - - def get_dest_item_at_pos(self, drag_x, drag_y): - success, path, pos = super(IconView, self).get_dest_item_at_pos(drag_x, drag_y) - if success: - return path, pos + get_item_at_pos = strip_boolean_result(Gtk.IconView.get_item_at_pos) + get_visible_range = strip_boolean_result(Gtk.IconView.get_visible_range) + get_dest_item_at_pos = strip_boolean_result(Gtk.IconView.get_dest_item_at_pos) IconView = override(IconView) __all__.append('IconView') @@ -640,22 +613,14 @@ __all__.append('ToolButton') class IMContext(Gtk.IMContext): - - def get_surrounding(self): - success, text, cursor_index = super(IMContext, self).get_surrounding() - if success: - return (text, cursor_index,) + get_surrounding = strip_boolean_result(Gtk.IMContext.get_surrounding) IMContext = override(IMContext) __all__.append('IMContext') class RecentInfo(Gtk.RecentInfo): - - def get_application_info(self, app_name): - success, app_exec, count, time = super(RecentInfo, self).get_application_info(app_name) - if success: - return (app_exec, count, time,) + get_application_info = strip_boolean_result(Gtk.RecentInfo.get_application_info) RecentInfo = override(RecentInfo) __all__.append('RecentInfo') @@ -739,12 +704,7 @@ class TextBuffer(Gtk.TextBuffer): Gtk.TextBuffer.insert_at_cursor(self, text, length) - def get_selection_bounds(self): - success, start, end = super(TextBuffer, self).get_selection_bounds() - if success: - return (start, end) - else: - return () + get_selection_bounds = strip_boolean_result(Gtk.TextBuffer.get_selection_bounds, fail_ret=()) TextBuffer = override(TextBuffer) __all__.append('TextBuffer') @@ -752,21 +712,8 @@ __all__.append('TextBuffer') class TextIter(Gtk.TextIter): - def forward_search(self, string, flags, limit): - success, match_start, match_end = super(TextIter, self).forward_search(string, - flags, limit) - if success: - return (match_start, match_end) - else: - return None - - def backward_search(self, string, flags, limit): - success, match_start, match_end = super(TextIter, self).backward_search(string, - flags, limit) - if success: - return (match_start, match_end) - else: - return None + forward_search = strip_boolean_result(Gtk.TextIter.forward_search) + backward_search = strip_boolean_result(Gtk.TextIter.backward_search) def begins_tag(self, tag=None): return super(TextIter, self).begins_tag(tag) @@ -831,6 +778,13 @@ class TreeModel(Gtk.TreeModel): def __iter__(self): return TreeModelRowIter(self, self.get_iter_first()) + get_iter_first = strip_boolean_result(Gtk.TreeModel.get_iter_first) + iter_children = strip_boolean_result(Gtk.TreeModel.iter_children) + iter_nth_child = strip_boolean_result(Gtk.TreeModel.iter_nth_child) + iter_parent = strip_boolean_result(Gtk.TreeModel.iter_parent) + get_iter_from_string = strip_boolean_result(Gtk.TreeModel.get_iter_from_string, + ValueError, 'invalid tree path') + def get_iter(self, path): path = self._coerce_path(path) success, aiter = super(TreeModel, self).get_iter(path) @@ -838,17 +792,6 @@ class TreeModel(Gtk.TreeModel): raise ValueError("invalid tree path '%s'" % path) return aiter - def get_iter_first(self): - success, aiter = super(TreeModel, self).get_iter_first() - if success: - return aiter - - def get_iter_from_string(self, path_string): - success, aiter = super(TreeModel, self).get_iter_from_string(path_string) - if not success: - raise ValueError("invalid tree path '%s'" % path_string) - return aiter - def iter_next(self, aiter): next_iter = aiter.copy() success = super(TreeModel, self).iter_next(next_iter) @@ -861,21 +804,6 @@ class TreeModel(Gtk.TreeModel): if success: return prev_iter - def iter_children(self, aiter): - success, child_iter = super(TreeModel, self).iter_children(aiter) - if success: - return child_iter - - def iter_nth_child(self, parent, n): - success, child_iter = super(TreeModel, self).iter_nth_child(parent, n) - if success: - return child_iter - - def iter_parent(self, aiter): - success, parent_iter = super(TreeModel, self).iter_parent(aiter) - if success: - return parent_iter - def _convert_row(self, row): # TODO: Accept a dictionary for row # model.append(None,{COLUMN_ICON: icon, COLUMN_NAME: name}) @@ -957,12 +885,7 @@ __all__.append('TreeModel') class TreeSortable(Gtk.TreeSortable, ): - def get_sort_column_id(self): - success, sort_column_id, order = super(TreeSortable, self).get_sort_column_id() - if success: - return (sort_column_id, order,) - else: - return (None, None,) + get_sort_column_id = strip_boolean_result(Gtk.TreeSortable.get_sort_column_id, fail_ret=(None, None)) def set_sort_func(self, sort_column_id, sort_func, user_data=None): super(TreeSortable, self).set_sort_func(sort_column_id, sort_func, user_data) @@ -1318,20 +1241,9 @@ class TreeView(Gtk.TreeView, Container): if model: self.set_model(model) - def get_path_at_pos(self, x, y): - success, path, column, cell_x, cell_y = super(TreeView, self).get_path_at_pos(x, y) - if success: - return (path, column, cell_x, cell_y,) - - def get_visible_range(self): - success, start_path, end_path = super(TreeView, self).get_visible_range() - if success: - return (start_path, end_path,) - - def get_dest_row_at_pos(self, drag_x, drag_y): - success, path, pos = super(TreeView, self).get_dest_row_at_pos(drag_x, drag_y) - if success: - return (path, pos,) + get_path_at_pos = strip_boolean_result(Gtk.TreeView.get_path_at_pos) + get_visible_range = strip_boolean_result(Gtk.TreeView.get_visible_range) + get_dest_row_at_pos = strip_boolean_result(Gtk.TreeView.get_dest_row_at_pos) def enable_model_drag_source(self, start_button_mask, targets, actions): target_entries = _construct_target_list(targets) @@ -1381,10 +1293,7 @@ class TreeViewColumn(Gtk.TreeViewColumn): for (name, value) in attributes.items(): self.add_attribute(cell_renderer, name, value) - def cell_get_position(self, cell_renderer): - success, start_pos, width = super(TreeViewColumn, self).cell_get_position(cell_renderer) - if success: - return (start_pos, width,) + cell_get_position = strip_boolean_result(Gtk.TreeViewColumn.cell_get_position) def set_cell_data_func(self, cell_renderer, func, func_data=None): super(TreeViewColumn, self).set_cell_data_func(cell_renderer, func, func_data) @@ -1587,16 +1496,8 @@ _Gtk_main_quit = Gtk.main_quit def main_quit(*args): _Gtk_main_quit() -_Gtk_stock_lookup = Gtk.stock_lookup - - -@override(Gtk.stock_lookup) -def stock_lookup(*args): - success, item = _Gtk_stock_lookup(*args) - if not success: - return None - - return item +stock_lookup = strip_boolean_result(Gtk.stock_lookup) +__all__.append('stock_lookup') initialized, argv = Gtk.init_check(sys.argv) sys.argv = list(argv) |