diff --git a/src/gen/ggettext.py b/src/gen/ggettext.py index 293f4111e..89287b7c4 100644 --- a/src/gen/ggettext.py +++ b/src/gen/ggettext.py @@ -86,4 +86,4 @@ def sgettext(msgid, sep='|'): if msgval == msgid: sep_idx = msgid.rfind(sep) msgval = msgid[sep_idx+1:] - return unicode(msgval) \ No newline at end of file + return unicode(msgval) diff --git a/src/gen/mime/_gnomemime.py b/src/gen/mime/_gnomemime.py index 23b07eead..07fd32d51 100644 --- a/src/gen/mime/_gnomemime.py +++ b/src/gen/mime/_gnomemime.py @@ -68,4 +68,4 @@ def _is_good_command(cmd): for sub in [ "%m", "%i", "%c" ]: if cmd.find(sub) != -1: return False - return True \ No newline at end of file + return True diff --git a/src/gen/plug/_docgenplugin.py b/src/gen/plug/_docgenplugin.py index 5a2dc4a04..9c3c3c890 100644 --- a/src/gen/plug/_docgenplugin.py +++ b/src/gen/plug/_docgenplugin.py @@ -106,4 +106,4 @@ class DocGenPlugin(Plugin): @return: bool: True if DrawDoc is supported; False if DrawDoc is not supported. """ - return bool(issubclass(self.__basedoc, DrawDoc)) \ No newline at end of file + return bool(issubclass(self.__basedoc, DrawDoc)) diff --git a/src/gen/plug/_plugin.py b/src/gen/plug/_plugin.py index 181fb56ca..4f1f7cf47 100644 --- a/src/gen/plug/_plugin.py +++ b/src/gen/plug/_plugin.py @@ -69,4 +69,4 @@ class Plugin(object): @return: a string representing the name of the module for this plugin """ return self.__mod_name - \ No newline at end of file + diff --git a/src/gen/plug/docbackend/__init__.py b/src/gen/plug/docbackend/__init__.py index 88eebc0bc..bbe748903 100644 --- a/src/gen/plug/docbackend/__init__.py +++ b/src/gen/plug/docbackend/__init__.py @@ -29,4 +29,4 @@ gen data specific for output (eg markup in gen/lib) and output where needed from docbackend import DocBackendError, DocBackend from cairobackend import CairoBackend -#__all__ = [ DocBackend, CairoBackend, LateXBackend ] \ No newline at end of file +#__all__ = [ DocBackend, CairoBackend, LateXBackend ] diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py index 3ac7959ff..ba53d9f0e 100644 --- a/src/gui/editors/editname.py +++ b/src/gui/editors/editname.py @@ -463,4 +463,4 @@ class EditName(EditSecondary): # can't use group_over, see Note in gen/lib/name/Name.set_group_as(). if not self.group_as.obj.get_editable(): self.obj.set_group_as("") - EditSecondary._cleanup_on_exit(self) \ No newline at end of file + EditSecondary._cleanup_on_exit(self) diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 073fbe171..e7abf5791 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -212,20 +212,20 @@ UIDEFAULT = ''' - - - - - - - - - - - - - - + + + + + + + + + + + + + + ''' @@ -743,11 +743,11 @@ class ViewManager(CLIManager): """ self._file_action_list = [ ('FileMenu', None, _('_Family Trees')), - ('Open', 'gramps-db', _('_Manage Family Trees...'), "o", + ('Open', 'gramps-db', _('_Manage Family Trees...'), "o", _("Manage databases"), self.__open_activate), ('OpenRecent', None, _('Open _Recent'), None, _("Open an existing database")), - ('Quit', Gtk.STOCK_QUIT, _('_Quit'), "q", None, + ('Quit', Gtk.STOCK_QUIT, _('_Quit'), "q", None, self.quit), ('ViewMenu', None, _('_View')), ('EditMenu', None, _('_Edit')), @@ -775,7 +775,7 @@ class ViewManager(CLIManager): ] self._readonly_action_list = [ - ('Export', 'gramps-export', _('_Export...'), "e", None, + ('Export', 'gramps-export', _('_Export...'), "e", None, self.export_data), ('Backup', None, _("Make Backup..."), None, _("Make a Gramps XML backup of the database"), self.quick_backup), @@ -795,48 +795,48 @@ class ViewManager(CLIManager): ('F8', None, 'F9', "F8", None, self.__keypress), ('F9', None, 'F9', "F9", None, self.__keypress), ('F11', None, 'F11', "F11", None, self.__keypress), - ('1', None, '1', "1", None, self.__gocat), - ('2', None, '2', "2", None, self.__gocat), - ('3', None, '3', "3", None, self.__gocat), - ('4', None, '4', "4", None, self.__gocat), - ('5', None, '5', "5", None, self.__gocat), - ('6', None, '6', "6", None, self.__gocat), - ('7', None, '7', "7", None, self.__gocat), - ('8', None, '8', "8", None, self.__gocat), - ('9', None, '9', "9", None, self.__gocat), - ('0', None, '0', "0", None, self.__gocat), + ('1', None, '1', "1", None, self.__gocat), + ('2', None, '2', "2", None, self.__gocat), + ('3', None, '3', "3", None, self.__gocat), + ('4', None, '4', "4", None, self.__gocat), + ('5', None, '5', "5", None, self.__gocat), + ('6', None, '6', "6", None, self.__gocat), + ('7', None, '7', "7", None, self.__gocat), + ('8', None, '8', "8", None, self.__gocat), + ('9', None, '9', "9", None, self.__gocat), + ('0', None, '0', "0", None, self.__gocat), # NOTE: CTRL+ALT+NUMBER is set in src/plugins/sidebar/cat...py - ('BackSpace', None, 'BackSpace', - "BackSpace", None, self.__keypress), - ('Delete', None, 'Delete', - "Delete", None, self.__keypress), - ('Insert', None, 'Insert', - "Insert", None, self.__keypress), + ('BackSpace', None, 'BackSpace', + "BackSpace", None, self.__keypress), + ('Delete', None, 'Delete', + "Delete", None, self.__keypress), + ('Insert', None, 'Insert', + "Insert", None, self.__keypress), ('F12', None, 'F12', "F12", None, self.__keypress), - ('J', None, 'J', - "J", None, self.__keypress), - ('N', None, 'N', "N", None, + ('J', None, 'J', + "J", None, self.__keypress), + ('N', None, 'N', "N", None, self.__next_view), - ('P', None, 'P', "P", None, + ('P', None, 'P', "P", None, self.__prev_view), ] self._action_action_list = [ - ('Clipboard', Gtk.STOCK_PASTE, _('Clip_board'), "b", + ('Clipboard', Gtk.STOCK_PASTE, _('Clip_board'), "b", _("Open the Clipboard dialog"), self.clipboard), - ('Import', 'gramps-import', _('_Import...'), "i", None, + ('Import', 'gramps-import', _('_Import...'), "i", None, self.import_data), ('Tools', 'gramps-tools', _('_Tools'), None, _("Open the tools dialog"), self.tools_clicked), ('BookMenu', None, _('_Bookmarks')), ('ToolsMenu', None, _('_Tools')), ('ConfigView', 'gramps-config', _('_Configure View...'), - 'c', _('Configure the active view'), + 'c', _('Configure the active view'), self.config_view), ] self._file_toggle_action_list = [ - ('Navigator', None, _('_Navigator'), "m", None, + ('Navigator', None, _('_Navigator'), "m", None, self.navigator_toggle, self.show_navigator ), ('Toolbar', None, _('_Toolbar'), None, None, self.toolbar_toggle, self.show_toolbar ), @@ -845,18 +845,18 @@ class ViewManager(CLIManager): ] self._undo_action_list = [ - ('Undo', Gtk.STOCK_UNDO, _('_Undo'), 'z', None, + ('Undo', Gtk.STOCK_UNDO, _('_Undo'), 'z', None, self.undo), ] self._redo_action_list = [ - ('Redo', Gtk.STOCK_REDO, _('_Redo'), 'z', None, + ('Redo', Gtk.STOCK_REDO, _('_Redo'), 'z', None, self.redo), ] self._undo_history_action_list = [ ('UndoHistory', 'gramps-undo-history', - _('Undo History...'), "H", None, self.undo_history), + _('Undo History...'), "H", None, self.undo_history), ] def __keypress(self, action): @@ -1424,11 +1424,11 @@ class ViewManager(CLIManager): self.undoactions = Gtk.ActionGroup('Undo') if label: self.undoactions.add_actions([ - ('Undo', Gtk.STOCK_UNDO, label, 'z', None, self.undo)]) + ('Undo', Gtk.STOCK_UNDO, label, 'z', None, self.undo)]) else: self.undoactions.add_actions([ ('Undo', Gtk.STOCK_UNDO, _('_Undo'), - 'z', None, self.undo)]) + 'z', None, self.undo)]) self.undoactions.set_sensitive(False) self.uimanager.insert_action_group(self.undoactions, 1) @@ -1440,12 +1440,12 @@ class ViewManager(CLIManager): self.redoactions = Gtk.ActionGroup('Redo') if label: self.redoactions.add_actions([ - ('Redo', Gtk.STOCK_REDO, label, 'z', + ('Redo', Gtk.STOCK_REDO, label, 'z', None, self.redo)]) else: self.redoactions.add_actions([ ('Redo', Gtk.STOCK_UNDO, _('_Redo'), - 'z', None, self.redo)]) + 'z', None, self.redo)]) self.redoactions.set_sensitive(False) self.uimanager.insert_action_group(self.redoactions, 1) diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index 2ae7b31b7..f6da5309a 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -202,9 +202,9 @@ class ListView(NavigationView): self.edit_action = Gtk.ActionGroup(self.title + '/ChangeOrder') self.edit_action.add_actions([ - ('Add', Gtk.STOCK_ADD, _("_Add..."), "Insert", + ('Add', Gtk.STOCK_ADD, _("_Add..."), "Insert", self.ADD_MSG, self.add), - ('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "Delete", + ('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "Delete", self.DEL_MSG, self.remove), ('Merge', 'gramps-merge', _('_Merge...'), None, self.MERGE_MSG, self.merge), @@ -215,7 +215,7 @@ class ListView(NavigationView): self._add_action_group(self.edit_action) self._add_action('Edit', Gtk.STOCK_EDIT, _("action|_Edit..."), - accel="Return", + accel="Return", tip=self.EDIT_MSG, callback=self.edit) diff --git a/src/gui/views/navigationview.py b/src/gui/views/navigationview.py index 307349c3e..ab246537c 100644 --- a/src/gui/views/navigationview.py +++ b/src/gui/views/navigationview.py @@ -270,10 +270,10 @@ class NavigationView(PageView): self.book_action = Gtk.ActionGroup(self.title + '/Bookmark') self.book_action.add_actions([ ('AddBook', 'gramps-bookmark-new', _('_Add Bookmark'), - 'd', None, self.add_bookmark), + 'd', None, self.add_bookmark), ('EditBook', 'gramps-bookmark-edit', _("%(title)s...") % {'title': _("Organize Bookmarks")}, - 'D', None, + 'D', None, self.edit_bookmarks), ]) diff --git a/src/gui/views/pageview.py b/src/gui/views/pageview.py index 917bb4df1..9795185d1 100644 --- a/src/gui/views/pageview.py +++ b/src/gui/views/pageview.py @@ -405,10 +405,10 @@ class PageView(DbGUIElement): self.action_toggle_list in this function. """ self._add_toggle_action('Sidebar', None, _('_Sidebar'), - "R", None, self.__sidebar_toggled, + "R", None, self.__sidebar_toggled, self.sidebar.get_property('visible')) self._add_toggle_action('Bottombar', None, _('_Bottombar'), - "B", None, self.__bottombar_toggled, + "B", None, self.__bottombar_toggled, self.bottombar.get_property('visible')) def __build_action_group(self): diff --git a/src/gui/widgets/styledtexteditor.py b/src/gui/widgets/styledtexteditor.py index 311d670e5..7b96c1f52 100644 --- a/src/gui/widgets/styledtexteditor.py +++ b/src/gui/widgets/styledtexteditor.py @@ -512,9 +512,9 @@ class StyledTextEditor(Gtk.TextView): # action accelerators self.action_accels = { - 'i': str(StyledTextTagType.ITALIC), - 'b': str(StyledTextTagType.BOLD), - 'u': str(StyledTextTagType.UNDERLINE), + 'i': str(StyledTextTagType.ITALIC), + 'b': str(StyledTextTagType.BOLD), + 'u': str(StyledTextTagType.UNDERLINE), } # create the action group and insert all the actions diff --git a/src/gui/widgets/toolcomboentry.py b/src/gui/widgets/toolcomboentry.py index 871553df5..99766702d 100644 --- a/src/gui/widgets/toolcomboentry.py +++ b/src/gui/widgets/toolcomboentry.py @@ -74,4 +74,4 @@ class ToolComboEntry(ValueToolItem): self.get_child().set_active_data(value) def get_value(self): - return self.get_child().get_active_data() \ No newline at end of file + return self.get_child().get_active_data() diff --git a/src/gui/widgets/valueaction.py b/src/gui/widgets/valueaction.py index e745636ad..802556e31 100644 --- a/src/gui/widgets/valueaction.py +++ b/src/gui/widgets/valueaction.py @@ -167,4 +167,4 @@ class ValueAction(Gtk.Action): def get_value(self): """Get the value from the action.""" - return self._value \ No newline at end of file + return self._value diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py index 9c323691c..67808f5b1 100644 --- a/src/plugins/lib/libpersonview.py +++ b/src/plugins/lib/libpersonview.py @@ -141,8 +141,8 @@ class BasePersonView(ListView): markup=BasePersonView.MARKUP_COLS) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) uistate.connect('nameformat-changed', self.build_tree) @@ -353,7 +353,7 @@ class BasePersonView(ListView): ('FilterEdit', None, _('Person Filter Editor'), None, None, self.filter_editor), ('Edit', Gtk.STOCK_EDIT, _("action|_Edit..."), - "Return", self.EDIT_MSG, self.edit), + "Return", self.EDIT_MSG, self.edit), ('QuickReport', None, _("Quick View"), None, None, None), ('WebConnect', None, _("Web Connection"), None, None, None), ('Dummy', None, ' ', None, None, self.dummy_report), @@ -362,9 +362,9 @@ class BasePersonView(ListView): self.edit_action.add_actions( [ - ('Add', Gtk.STOCK_ADD, _("_Add..."), "Insert", + ('Add', Gtk.STOCK_ADD, _("_Add..."), "Insert", self.ADD_MSG, self.add), - ('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "Delete", + ('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "Delete", self.DEL_MSG, self.remove), ('Merge', 'gramps-merge', _('_Merge...'), None, self.MERGE_MSG, self.merge), diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py index 23841ca81..ac6d4e41a 100644 --- a/src/plugins/lib/libplaceview.py +++ b/src/plugins/lib/libplaceview.py @@ -147,8 +147,8 @@ class PlaceBaseView(ListView): filter_class=PlaceSidebarFilter, markup=markup) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/sidebar/categorysidebar.py b/src/plugins/sidebar/categorysidebar.py index 40c4b1fcc..e93174d07 100644 --- a/src/plugins/sidebar/categorysidebar.py +++ b/src/plugins/sidebar/categorysidebar.py @@ -131,7 +131,7 @@ class CategorySidebar(BaseSidebar): uitoolitems += '\n' % pageid # id, stock, button text, UI, tooltip, page if view_num < 9: - modifier = "%d" % ((view_num % 9) + 1) + modifier = "%d" % ((view_num % 9) + 1) else: modifier = "" diff --git a/src/plugins/view/citationlistview.py b/src/plugins/view/citationlistview.py index 6301ea896..7b047cf58 100644 --- a/src/plugins/view/citationlistview.py +++ b/src/plugins/view/citationlistview.py @@ -145,8 +145,8 @@ class CitationListView(ListView): markup = CitationListView.MARKUP_COLS) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py index 630e5657b..546adc0b6 100644 --- a/src/plugins/view/citationtreeview.py +++ b/src/plugins/view/citationtreeview.py @@ -150,8 +150,8 @@ class CitationTreeView(ListView): markup = CitationTreeView.MARKUP_COLS) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index c84263170..86e650737 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -124,8 +124,8 @@ class EventView(ListView): markup = EventView.MARKUP_COLS) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) uistate.connect('nameformat-changed', self.build_tree) diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index 2f4615ffc..0e12b244e 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -122,8 +122,8 @@ class FamilyView(ListView): markup=FamilyView.MARKUP_COLS) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) uistate.connect('nameformat-changed', self.build_tree) diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index b47093c7b..bf7ad895e 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -135,8 +135,8 @@ class MediaView(ListView): multiple=True) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index baf176194..15177b254 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -113,8 +113,8 @@ class NoteView(ListView): multiple=True) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py index f1937cfff..f000a0521 100644 --- a/src/plugins/view/pedigreeview.py +++ b/src/plugins/view/pedigreeview.py @@ -711,7 +711,7 @@ class PedigreeView(NavigationView): self.func_list.update({ 'F2' : self.kb_goto_home, - 'J' : self.jump, + 'J' : self.jump, }) self.dbstate = dbstate diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py index 2e86c16ee..194c9fc79 100644 --- a/src/plugins/view/relview.py +++ b/src/plugins/view/relview.py @@ -144,7 +144,7 @@ class RelationshipView(NavigationView): nav_group) self.func_list.update({ - 'J' : self.jump, + 'J' : self.jump, }) dbstate.connect('database-changed', self.change_db) @@ -395,7 +395,7 @@ class RelationshipView(NavigationView): self.family_action = Gtk.ActionGroup(self.title + '/Family') self.family_action.add_actions([ - ('Edit', Gtk.STOCK_EDIT, _('Edit...'), "Return", + ('Edit', Gtk.STOCK_EDIT, _('Edit...'), "Return", _("Edit the active person"), self.edit_active), ('AddSpouse', 'gramps-spouse', _('Partner'), None , _("Add a new family with person as parent"), self.add_spouse), diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index a937d528c..6be7e81e6 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -130,8 +130,8 @@ class RepositoryView(ListView): filter_class=RepoSidebarFilter) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui()) diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index 5a8e30ff2..e6eb7efdd 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -117,8 +117,8 @@ class SourceView(ListView): filter_class=SourceSidebarFilter) self.func_list.update({ - 'J' : self.jump, - 'BackSpace' : self.key_delete, + 'J' : self.jump, + 'BackSpace' : self.key_delete, }) self.additional_uis.append(self.additional_ui())