diff --git a/ChangeLog b/ChangeLog index e87fcc208..d71a37008 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +2008-01-29 Raphael Ackermann + * src/ViewManager.py: 0001641: add ... ellipsis to menu items. + * src/plugins/Calendar.py: 0001641: add ... ellipsis to menu items. + * src/PluginUtils/__init__.py: pep8 fixes + * src/PluginUtils/_PluginMgr.py: pylint and doc fixes + 2008-01-29 Peter Landgren * src/plugins/ExportVCalendar.py: * src/plugins/ExportVCard.py: - Encoding according to sys.getfilesystemencoding() in stead of hardcoded iso-8859-1 + Encoding according to sys.getfilesystemencoding() in stead of hardcoded + iso-8859-1 2008-01-29 Raphael Ackermann * src/plugins/EventNames.py: doc fixes and removal of self.label @@ -16,7 +23,7 @@ one prefix and multiple surnames with or without hyphen(s) 2008-01-28 Duncan Lithgow - Raphael Ackermann + Raphael Ackermann * src/plugins/Summary.py * src/plugins/WebCal.py * src/plugins/KinshipReport.py diff --git a/src/PluginUtils/_PluginMgr.py b/src/PluginUtils/_PluginMgr.py index 43565a209..a1f77c89d 100644 --- a/src/PluginUtils/_PluginMgr.py +++ b/src/PluginUtils/_PluginMgr.py @@ -287,19 +287,12 @@ def register_report( _register_cl_report(name,category,report_class,options_class, translated_name,unsupported, require_active) -def _register_standalone(report_class, - options_class, - translated_name, - name, - category, - description=_unavailable, - status=_("Unknown"), - author_name=_("Unknown"), - author_email=_("Unknown"), - unsupported=False, - require_active=True, - ): - """Register a report with the plugin system""" +def _register_standalone(report_class, options_class, translated_name, name, + category, description=_unavailable, + status=_("Unknown"), author_name=_("Unknown"), + author_email=_("Unknown"), unsupported=False, + require_active=True): + """Register a report with the plugin system.""" del_index = -1 for i in range(0,len(report_list)): @@ -310,14 +303,13 @@ def _register_standalone(report_class, del report_list[del_index] report_list.append((report_class, options_class, translated_name, - category, name, description, status, - author_name, author_email, unsupported, - require_active)) + category, name, description, status, author_name, + author_email, unsupported, require_active)) mod2text[report_class.__module__] = description def register_book_item(translated_name, category, report_class, option_class, name, unsupported, require_active): - """Register a book item""" + """Register a book item.""" del_index = -1 for i in range(0,len(bkitems_list)): @@ -330,8 +322,8 @@ def register_book_item(translated_name, category, report_class, bkitems_list.append((translated_name, category, report_class, option_class, name, unsupported, require_active)) -def _register_cl_report(name,category,report_class,options_class, - translated_name,unsupported, require_active): +def _register_cl_report(name, category, report_class, options_class, + translated_name, unsupported, require_active): del_index = -1 for i in range(0,len(cl_list)): val = cl_list[i] @@ -339,8 +331,8 @@ def _register_cl_report(name,category,report_class,options_class, del_index = i if del_index != -1: del cl_list[del_index] - cl_list.append((name,category,report_class,options_class, - translated_name,unsupported, require_active)) + cl_list.append((name, category, report_class, options_class, + translated_name, unsupported, require_active)) #------------------------------------------------------------------------- # @@ -348,8 +340,8 @@ def _register_cl_report(name,category,report_class,options_class, # #------------------------------------------------------------------------- def register_text_doc(name,classref, table, paper, style, ext, - print_report_label=None,clname=''): - """Register a text document generator""" + print_report_label=None, clname=''): + """Register a text document generator.""" del_index = -1 for i in range(0,len(textdoc_list)): val = textdoc_list[i] diff --git a/src/PluginUtils/__init__.py b/src/PluginUtils/__init__.py index 55d86f902..7897fc321 100644 --- a/src/PluginUtils/__init__.py +++ b/src/PluginUtils/__init__.py @@ -28,21 +28,19 @@ #Better would be to do: import _PluginMgr as PluginMgr and then access # the list as PluginUtils.PluginMgr, or use a function that returns the pointer # of the list. -from _MenuOptions import \ - NumberOption, BooleanOption, TextOption, \ - EnumeratedListOption, FilterOption, StringOption, ColourOption, \ - PersonOption, PersonListOption, SurnameColourOption, FamilyOption +from _MenuOptions import (NumberOption, BooleanOption, TextOption, + EnumeratedListOption, FilterOption, StringOption, + ColourOption, PersonOption, PersonListOption, + SurnameColourOption, FamilyOption) from _GuiOptions import GuiMenuOptions -from _PluginMgr import \ - register_export, register_import, \ - register_tool, register_report, \ - register_relcalc, relationship_class, \ - textdoc_list, drawdoc_list, bookdoc_list, \ - bkitems_list, cl_list, cli_tool_list, \ - load_plugins, import_list, export_list,\ - report_list, quick_report_list, tool_list, \ - register_text_doc, register_draw_doc, register_book_doc,\ - register_quick_report +from _PluginMgr import (register_export, register_import, register_tool, + register_report, register_relcalc, relationship_class, + textdoc_list, drawdoc_list, bookdoc_list, + bkitems_list, cl_list, cli_tool_list, load_plugins, + import_list, export_list, report_list, + quick_report_list, tool_list, register_text_doc, + register_draw_doc, register_book_doc, + register_quick_report) import _Tool as Tool import _Plugins as Plugins diff --git a/src/ViewManager.py b/src/ViewManager.py index 8c34d58dc..4da1620f9 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -394,7 +394,7 @@ class ViewManager: self.quit), ('ViewMenu', None, _('_View')), ('EditMenu', None, _('_Edit')), - ('Preferences', gtk.STOCK_PREFERENCES, _('_Preferences'), None, + ('Preferences', gtk.STOCK_PREFERENCES, _('_Preferences...'), None, None, self.preferences_activate), ('HelpMenu', None, _('_Help')), ('HomePage', None, _('GRAMPS _Home Page'), None, None, diff --git a/src/plugins/Calendar.py b/src/plugins/Calendar.py index 5ced3ed29..7a3d82093 100644 --- a/src/plugins/Calendar.py +++ b/src/plugins/Calendar.py @@ -935,7 +935,7 @@ register_report( report_class = Calendar, options_class = CalendarOptions, modes = MODE_GUI | MODE_BKI | MODE_CLI, - translated_name = _("Calendar"), + translated_name = _("Calendar..."), status = _("Stable"), author_name = "Douglas S. Blank", author_email = "dblank@cs.brynmawr.edu", @@ -948,7 +948,7 @@ register_report( report_class = CalendarReport, options_class = CalendarReportOptions, modes = MODE_GUI | MODE_BKI | MODE_CLI, - translated_name = _("Birthday and Anniversary Report"), + translated_name = _("Birthday and Anniversary Report..."), status = _("Stable"), author_name = "Douglas S. Blank", author_email = "dblank@cs.brynmawr.edu",