From aad74b8bb8b4afcdbffa263e46d9d7ff10a7c724 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Sun, 21 Mar 2010 10:33:08 +0000 Subject: [PATCH] 3690: Do not need to use underscore on text for file formats (import/export) svn: r14889 --- src/PluginUtils/_PluginWindows.py | 9 ++++++++- src/gen/plug/_manager.py | 2 +- src/gen/plug/_pluginreg.py | 17 ++++++++++++++++- src/plugins/export/export.gpr.py | 25 ++++++++++++++++--------- src/plugins/import/import.gpr.py | 2 +- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/PluginUtils/_PluginWindows.py b/src/PluginUtils/_PluginWindows.py index ec8e1d6b1..56cb22b77 100644 --- a/src/PluginUtils/_PluginWindows.py +++ b/src/PluginUtils/_PluginWindows.py @@ -200,7 +200,7 @@ class PluginStatus(ManagedWindow.ManagedWindow): gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)), None, self.title) - self.window.set_size_request(600, 400) + self.window.set_size_request(750, 400) self.window.connect('response', self.close) notebook = gtk.Notebook() @@ -218,15 +218,18 @@ class PluginStatus(ManagedWindow.ManagedWindow): self.list_reg.connect('button-press-event', self.button_press_reg) col0_reg = gtk.TreeViewColumn(_('Type'), gtk.CellRendererText(), text=0) col0_reg.set_sort_column_id(0) + col0_reg.set_resizable(True) self.list_reg.append_column(col0_reg) col = gtk.TreeViewColumn(_('Status'), gtk.CellRendererText(), markup=1) col.set_sort_column_id(1) self.list_reg.append_column(col) col2_reg = gtk.TreeViewColumn(_('Name'), gtk.CellRendererText(), text=2) col2_reg.set_sort_column_id(2) + col2_reg.set_resizable(True) self.list_reg.append_column(col2_reg) col = gtk.TreeViewColumn(_('Description'), gtk.CellRendererText(), text=3) col.set_sort_column_id(3) + col.set_resizable(True) self.list_reg.append_column(col) self.list_reg.set_search_column(2) @@ -267,10 +270,12 @@ class PluginStatus(ManagedWindow.ManagedWindow): col = gtk.TreeViewColumn(_('Loaded'), gtk.CellRendererText(), markup=0) col.set_sort_column_id(0) + col.set_resizable(True) self.list.append_column(col) col1 = gtk.TreeViewColumn(_('File'), gtk.CellRendererText(), text=1) col1.set_sort_column_id(1) + col1.set_resizable(True) self.list.append_column(col1) col = gtk.TreeViewColumn(_('Status'), gtk.CellRendererText(), markup=5) @@ -278,6 +283,7 @@ class PluginStatus(ManagedWindow.ManagedWindow): self.list.append_column(col) col2 = gtk.TreeViewColumn(_('Message'), gtk.CellRendererText(), text=2) col2.set_sort_column_id(2) + col2.set_resizable(True) self.list.append_column(col2) self.list.set_search_column(1) @@ -385,6 +391,7 @@ class PluginStatus(ManagedWindow.ManagedWindow): self.window.show_all() self.__populate_lists() + self.list_reg.columns_autosize() def __refresh_addon_list(self, obj): """ diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py index c693b7ba0..921c248f3 100644 --- a/src/gen/plug/_manager.py +++ b/src/gen/plug/_manager.py @@ -348,7 +348,7 @@ class BasePluginManager(object): if (pdata.export_options and hasattr(mod, pdata.export_options)): options = getattr(mod, pdata.export_options) - exp = gen.plug.ExportPlugin(name=pdata.name, + exp = gen.plug.ExportPlugin(name=pdata.name_accell, description = pdata.description, export_function = getattr(mod, pdata.export_function), extension = pdata.extension, diff --git a/src/gen/plug/_pluginreg.py b/src/gen/plug/_pluginreg.py index 505199231..31487ac15 100644 --- a/src/gen/plug/_pluginreg.py +++ b/src/gen/plug/_pluginreg.py @@ -168,6 +168,10 @@ class PluginData(object): settings. .. attribute:: name A friendly name to call this plugin (normally translated) + .. attribute:: name_accell + A friendly name to call this plugin (normally translated), with an + accellerator present (eg '_Descendant report', with D to be accellerator + key .. attribute:: description A friendly description of what the plugin does .. attribute:: version @@ -305,6 +309,7 @@ class PluginData(object): #base attributes self._id = None self._name = None + self._name_accell = None self._version = None self._gramps_target_version = None self._description = None @@ -372,6 +377,15 @@ class PluginData(object): def _get_name(self): return self._name + def _set_name_accell(self, name): + self._name_accell = name + + def _get_name_accell(self): + if self._name_accell is None: + return self._name + else: + return self._name_accell + def _set_description(self, description): self._description = description @@ -476,8 +490,9 @@ class PluginData(object): def _set_icondir(self, icondir): self._icondir = icondir - id = property(_get_id, _set_id) + id = property(_get_id, _set_id) name = property(_get_name, _set_name) + name_accell = property(_get_name_accell, _set_name_accell) description = property(_get_description, _set_description) version = property(_get_version, _set_version) gramps_target_version = property(_get_gramps_target_version, diff --git a/src/plugins/export/export.gpr.py b/src/plugins/export/export.gpr.py index 8efa68ee3..9fd89397c 100644 --- a/src/plugins/export/export.gpr.py +++ b/src/plugins/export/export.gpr.py @@ -28,7 +28,8 @@ plg = newplugin() plg.id = 'ex_csv' -plg.name = _("Comma _Separated Values Spreadsheet (CSV)") +plg.name = _("Comma Separated Values Spreadsheet (CSV)") +plg.name_accell = _("Comma _Separated Values Spreadsheet (CSV)") plg.description = _("CSV is a common spreadsheet format.") plg.version = '1.0' plg.gramps_target_version = '3.3' @@ -48,7 +49,8 @@ plg.extension = "csv" plg = newplugin() plg.id = 'ex_webfamtree' -plg.name = _('_Web Family Tree') +plg.name = _('Web Family Tree') +plg.name_accell = _('_Web Family Tree') plg.description = _("Web Family Tree format") plg.version = '1.0' plg.gramps_target_version = '3.3' @@ -68,7 +70,8 @@ plg.extension = "wft" plg = newplugin() plg.id = 'ex_ged' -plg.name = _('GE_DCOM') +plg.name = _('GEDCOM') +plg.name_accell = _('GE_DCOM') plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' 'Most genealogy software will accept a GEDCOM file as input.') plg.version = '1.0' @@ -89,7 +92,8 @@ plg.extension = "ged" plg = newplugin() plg.id = 'ex_geneweb' -plg.name = _('_GeneWeb') +plg.name = _('GeneWeb') +plg.name_accell = _('_GeneWeb') plg.description = _('GeneWeb is a web based genealogy program.') plg.version = '1.0' plg.gramps_target_version = '3.3' @@ -109,7 +113,8 @@ plg.extension = "gw" plg = newplugin() plg.id = 'ex_gpkg' -plg.name = _('Gra_mps XML Package (family tree and media)') +plg.name = _('Gramps XML Package (family tree and media)') +plg.name_accell = _('Gra_mps XML Package (family tree and media)') plg.description = _('Gramps package is an archived XML family tree together ' 'with the media object files.') plg.version = '1.0' @@ -130,7 +135,8 @@ plg.extension = "gpkg" plg = newplugin() plg.id = 'ex_gramps' -plg.name = _('Gramps _XML (family tree)') +plg.name = _('Gramps XML (family tree)') +plg.name_accell = _('Gramps _XML (family tree)') plg.description = _('Gramps XML export is a complete archived XML backup of a' ' Gramps family tree without the media object files.' ' Suitable for backup purposes.') @@ -152,7 +158,8 @@ plg.extension = "gramps" plg = newplugin() plg.id = 'ex_vcal' -plg.name = _('vC_alendar') +plg.name = _('vCalendar') +plg.name_accell = _('vC_alendar') plg.description = _('vCalendar is used in many calendaring and pim applications.') plg.version = '1.0' plg.gramps_target_version = '3.3' @@ -172,7 +179,8 @@ plg.extension = "vcs" plg = newplugin() plg.id = 'ex_vcard' -plg.name = _('_vCard') +plg.name = _('vCard') +plg.name_accell = _('_vCard') plg.description = _('vCard is used in many addressbook and pim applications.') plg.version = '1.0' plg.gramps_target_version = '3.3' @@ -183,4 +191,3 @@ plg.export_function = 'exportData' plg.export_options = 'CardWriterOptionBox' plg.export_options_title = ('vCard export options') plg.extension = "vcf" - diff --git a/src/plugins/import/import.gpr.py b/src/plugins/import/import.gpr.py index 17b2642c7..4ee667b98 100644 --- a/src/plugins/import/import.gpr.py +++ b/src/plugins/import/import.gpr.py @@ -30,7 +30,7 @@ _mime_type = "text/x-comma-separated-values" # CSV Document _mime_type_rfc_4180 = "text/csv" # CSV Document See rfc4180 for mime type plg = newplugin() plg.id = 'im_csv' -plg.name = _("Comma _Separated Values Spreadsheet (CSV)") +plg.name = _("Comma Separated Values Spreadsheet (CSV)") plg.description = _("Import data from CSV files") plg.version = '1.0' plg.gramps_target_version = '3.3'