[GRASS-SVN] r53897 - in grass/trunk/gui/wxpython: . gmodeler gui_core lmgr modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 18 08:32:37 PST 2012
Author: annakrat
Date: 2012-11-18 08:32:36 -0800 (Sun, 18 Nov 2012)
New Revision: 53897
Modified:
grass/trunk/gui/wxpython/gmodeler/dialogs.py
grass/trunk/gui/wxpython/gui_core/goutput.py
grass/trunk/gui/wxpython/gui_core/menu.py
grass/trunk/gui/wxpython/gui_core/widgets.py
grass/trunk/gui/wxpython/lmgr/frame.py
grass/trunk/gui/wxpython/modules/extensions.py
grass/trunk/gui/wxpython/wxpythonlib.dox
Log:
wxGUI/SearchModule: rename classes
Modified: grass/trunk/gui/wxpython/gmodeler/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/dialogs.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/gmodeler/dialogs.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -32,7 +32,7 @@
from core import globalvar
from core import utils
from core.modulesdata import ModulesData
-from gui_core.widgets import SearchModuleWindow, EVT_MODULE_SELECTED
+from gui_core.widgets import SearchModuleWidget, EVT_MODULE_SELECTED
from core.gcmd import GError, EncodeString
from gui_core.dialogs import ElementDialog, MapLayersDialogForModeler
from gui_core.prompt import GPromptSTC
@@ -137,7 +137,7 @@
modulesData = ModulesData()
self.cmd_prompt = GPromptSTC(parent = self, modulesData = modulesData)
- self.search = SearchModuleWindow(parent = self.panel,
+ self.search = SearchModuleWidget(parent = self.panel,
modulesData = modulesData,
showTip = True)
self.search.Bind(EVT_MODULE_SELECTED,
Modified: grass/trunk/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/goutput.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/gui_core/goutput.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -43,7 +43,7 @@
from gui_core.prompt import GPromptSTC
from core.debug import Debug
from core.settings import UserSettings, GetDisplayVectSettings
-from gui_core.widgets import SearchModuleWindow, EVT_MODULE_SELECTED
+from gui_core.widgets import SearchModuleWidget, EVT_MODULE_SELECTED
from core.modulesdata import ModulesData
wxCmdOutput, EVT_CMD_OUTPUT = NewEvent()
@@ -398,7 +398,7 @@
"""!Create search pane"""
border = wx.BoxSizer(wx.VERTICAL)
- self.search = SearchModuleWindow(parent = pane,
+ self.search = SearchModuleWidget(parent = pane,
modulesData = modulesData)
border.Add(item = self.search, proportion = 0,
Modified: grass/trunk/gui/wxpython/gui_core/menu.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/menu.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/gui_core/menu.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -5,7 +5,7 @@
Classes:
- menu::Menu
- - menu::MenuTreeWindow
+ - menu::SearchModuleWindow
- menu::MenuTree
(C) 2010-2012 by the GRASS Development Team
@@ -27,7 +27,7 @@
from core.modulesdata import ModulesData
from core.gcmd import EncodeString
from core.settings import UserSettings
-from gui_core.widgets import ItemTree, SearchModuleWindow
+from gui_core.widgets import ItemTree, SearchModuleWidget
from lmgr.menudata import LayerManagerMenuData
class Menu(wx.MenuBar):
@@ -124,7 +124,7 @@
# but in this case just call Skip so the default is done
event.Skip()
-class MenuTreeWindow(wx.Panel):
+class SearchModuleWindow(wx.Panel):
"""!Show menu tree"""
def __init__(self, parent, id = wx.ID_ANY, **kwargs):
self.parent = parent # LayerManager
@@ -139,7 +139,7 @@
self.tree.Load()
# search widget
- self.search = SearchModuleWindow(parent = self,
+ self.search = SearchModuleWidget(parent = self,
modulesData = ModulesData(menuData.GetModules()),
showChoice = False)
Modified: grass/trunk/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/widgets.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/gui_core/widgets.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -15,7 +15,7 @@
- widgets::FloatValidator
- widgets::ItemTree
- widgets::GListCtrl
- - widgets::SearchModuleWindow
+ - widgets::SearchModuleWidget
(C) 2008-2012 by the GRASS Development Team
@@ -712,8 +712,8 @@
gModuleSelected, EVT_MODULE_SELECTED = NewEvent()
-class SearchModuleWindow(wx.Panel):
- """!Search module window (used in MenuTreeWindow)"""
+class SearchModuleWidget(wx.Panel):
+ """!Search module widget (used in SearchModuleWindow)"""
def __init__(self, parent, modulesData, id = wx.ID_ANY,
showChoice = True, showTip = False, **kwargs):
self.showTip = showTip
Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/lmgr/frame.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -54,7 +54,7 @@
from gui_core.dialogs import EVT_APPLY_MAP_LAYERS
from gui_core.dialogs import LocationDialog, MapsetDialog, CreateNewVector, GroupDialog
from modules.colorrules import RasterColorTable, VectorColorTable
-from gui_core.menu import Menu, MenuTreeWindow
+from gui_core.menu import Menu, SearchModuleWindow
from gmodeler.model import Model
from gmodeler.frame import ModelFrame
from psmap.frame import PsMapFrame
@@ -262,7 +262,7 @@
# create 'search module' notebook page
if not UserSettings.Get(group = 'manager', key = 'hideTabs', subkey = 'search'):
- self.search = MenuTreeWindow(parent = self)
+ self.search = SearchModuleWindow(parent = self)
self.notebook.AddPage(page = self.search, text = _("Search module"), name = 'search')
else:
self.search = None
Modified: grass/trunk/gui/wxpython/modules/extensions.py
===================================================================
--- grass/trunk/gui/wxpython/modules/extensions.py 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/modules/extensions.py 2012-11-18 16:32:36 UTC (rev 53897)
@@ -34,7 +34,7 @@
from core.gcmd import GError, RunCommand
from core.utils import SetAddOnPath
from gui_core.forms import GUI
-from gui_core.widgets import ItemTree, GListCtrl, SearchModuleWindow
+from gui_core.widgets import ItemTree, GListCtrl, SearchModuleWidget
class InstallExtensionWindow(wx.Frame):
@@ -58,7 +58,7 @@
label = _("Fetch full info including description and keywords"))
self.fullDesc.SetValue(True)
- self.search = SearchModuleWindow(parent = self.panel, modulesData = None)
+ self.search = SearchModuleWidget(parent = self.panel, modulesData = None)
self.search.SetSelection(0)
self.tree = ExtensionTree(parent = self.panel, log = parent.GetLogWindow())
Modified: grass/trunk/gui/wxpython/wxpythonlib.dox
===================================================================
--- grass/trunk/gui/wxpython/wxpythonlib.dox 2012-11-18 16:13:44 UTC (rev 53896)
+++ grass/trunk/gui/wxpython/wxpythonlib.dox 2012-11-18 16:32:36 UTC (rev 53897)
@@ -149,7 +149,7 @@
- mapwindow::MapWindow
- gui_core::menu
- menu::Menu
- - menu::MenuTreeWindow
+ - menu::SearchModuleWindow
- menu::MenuTree
- gui_core::preferences
- preferences::PreferencesBaseDialog
@@ -176,7 +176,7 @@
- widgets::FloatValidator
- widgets::NTCValidator
- widgets::ItemTree
- - widgets::SearchModuleWindow
+ - widgets::SearchModuleWidget
\subsection lmgr Layer Manager
More information about the grass-commit
mailing list