From 15f4b137dab6e37801348b1a12bc220410835394 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Thu, 29 Nov 2007 06:32:59 +0000 Subject: [PATCH] 2007-11-29 Douglas S. Blank * src/ViewManager.py: use PluginsWindows * src/PluginUtils/_PluginStatus.py: moved from * src/PluginUtils/_PluginWindows.py: moved to * src/PluginUtils/__init__.py: use PluginsWindows * src/PluginUtils/_Plugins.py: use PluginsWindows svn: r9429 --- ChangeLog | 7 +++++++ .../{_PluginStatus.py => _PluginWindows.py} | 0 src/PluginUtils/_Plugins.py | 8 ++++---- src/PluginUtils/__init__.py | 2 +- src/ViewManager.py | 14 +++++++------- 5 files changed, 19 insertions(+), 12 deletions(-) rename src/PluginUtils/{_PluginStatus.py => _PluginWindows.py} (100%) diff --git a/ChangeLog b/ChangeLog index 2ba03571d..78ed3b77c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-29 Douglas S. Blank + * src/ViewManager.py: use PluginsWindows + * src/PluginUtils/_PluginStatus.py: moved from + * src/PluginUtils/_PluginWindows.py: moved to + * src/PluginUtils/__init__.py: use PluginsWindows + * src/PluginUtils/_Plugins.py: use PluginsWindows + 2007-11-28 Douglas S. Blank * src/PluginUtils/_MenuOptions.py: added comments * src/PluginUtils/_PluginStatus.py: added ToolManagedWindowBatch diff --git a/src/PluginUtils/_PluginStatus.py b/src/PluginUtils/_PluginWindows.py similarity index 100% rename from src/PluginUtils/_PluginStatus.py rename to src/PluginUtils/_PluginWindows.py diff --git a/src/PluginUtils/_Plugins.py b/src/PluginUtils/_Plugins.py index 09b3db974..ee3e7ef6a 100644 --- a/src/PluginUtils/_Plugins.py +++ b/src/PluginUtils/_Plugins.py @@ -56,7 +56,7 @@ import Errors from ReportBase import report, standalone_categories import _Tool import _PluginMgr -import _PluginStatus +import _PluginWindows import ManagedWindow #------------------------------------------------------------------------- @@ -380,12 +380,12 @@ class Reload(_Tool.Tool): if Config.get(Config.POP_PLUGIN_STATUS) \ and len(_PluginMgr.failmsg_list): try: - _PluginStatus.PluginStatus(dbstate,uistate) + _PluginWindows.PluginStatus(dbstate,uistate) except Errors.WindowActiveError: old_win = uistate.gwm.get_item_from_id( - _PluginStatus.PluginStatus) + _PluginWindows.PluginStatus) old_win.close() - _PluginStatus.PluginStatus(dbstate,uistate) + _PluginWindows.PluginStatus(dbstate,uistate) # Emit signal to re-generate tool and report menus uistate.emit('plugins-reloaded', diff --git a/src/PluginUtils/__init__.py b/src/PluginUtils/__init__.py index dc9f0fc22..2a815378d 100644 --- a/src/PluginUtils/__init__.py +++ b/src/PluginUtils/__init__.py @@ -40,7 +40,7 @@ from _PluginMgr import \ import _Tool as Tool import _Plugins as Plugins -import _PluginStatus as PluginStatus +import _PluginWindows as PluginWindows from _MenuOptions import MenuReportOptions, MenuToolOptions, \ NumberOption, BooleanOption, TextOption, \ EnumeratedListOption, FilterListOption, StringOption diff --git a/src/ViewManager.py b/src/ViewManager.py index 7e3ef43cd..e65a49065 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -57,7 +57,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Plugins, Tool, PluginStatus, \ +from PluginUtils import Plugins, Tool, PluginWindows, \ relationship_class, load_plugins, \ tool_list, report_list @@ -595,12 +595,12 @@ class ViewManager: # get to ssee if we need to open the plugin status window if Config.get(Config.POP_PLUGIN_STATUS) and error: try: - PluginStatus.PluginStatus(self.state, self.uistate, []) + PluginWindows.PluginStatus(self.state, self.uistate, []) except Errors.WindowActiveError: old_win = self.uistate.gwm.get_item_from_id( - PluginStatus.PluginStatus) + PluginWindows.PluginStatus) old_win.close() - PluginStatus.PluginStatus(self.state, self.uistate, []) + PluginWindows.PluginStatus(self.state, self.uistate, []) self.uistate.push_message(self.state, _('Ready')) @@ -724,12 +724,12 @@ class ViewManager: Display plugin status dialog """ try: - PluginStatus.PluginStatus(self.state, self.uistate, []) + PluginWindows.PluginStatus(self.state, self.uistate, []) except Errors.WindowActiveError: old_win = self.uistate.gwm.get_item_from_id( - PluginStatus.PluginStatus) + PluginWindows.PluginStatus) old_win.close() - PluginStatus.PluginStatus(self.state, self.uistate, []) + PluginWindows.PluginStatus(self.state, self.uistate, []) def sidebar_toggle(self, obj): """