/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/UI/mainwindow.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/UI/mainwindow.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 188 by bh, Tue May 28 12:38:45 2002 UTC revision 1074 by bh, Tue May 27 17:39:43 2003 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]>  # Jan-Oliver Wagner <[email protected]>
4  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
5    # Frank Koormann <[email protected]>
6  #  #
7  # This program is free software under the GPL (>=v2)  # This program is free software under the GPL (>=v2)
8  # Read the file COPYING coming with Thuban for details.  # Read the file COPYING coming with Thuban for details.
# Line 12  The main window Line 13  The main window
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    
16    __ThubanVersion__ = "0.2" #"$THUBAN_0_2$"
17    #__BuildDate__ = "$Date$"
18    
19  import os  import os
20    
21  from wxPython.wx import *  from wxPython.wx import *
22    from wxPython.wx import __version__ as wxPython_version
23    
24    from wxPython.lib.dialogs import wxMultipleChoiceDialog
25    
26  import Thuban  import Thuban
27    import Thuban.version
28    
29    from Thuban import _
30  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
31  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
 from Thuban.Model.color import Color  
 from Thuban.Model.proj import Projection  
32    
33  import view  import view
34  import tree  import tree
 import proj4dialog  
35  import tableview, identifyview  import tableview, identifyview
36    from Thuban.UI.classifier import Classifier
37    import legend
38  from menu import Menu  from menu import Menu
39    
40  import main  from context import Context
41  from command import registry, Command  from command import registry, Command, ToolCommand
42  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
43    
44    from Thuban.UI.dock import DockFrame
45    from Thuban.UI.join import JoinDialog
46    
47    import resource
48    
49    import projdialog
50    
51    
 # the directory where the toolbar icons are stored  
 bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  
 bitmapext = ".xpm"  
52    
53    class MainWindow(DockFrame):
54    
55  class MainWindow(wxFrame):      # Some messages that can be subscribed/unsubscribed directly through
56        # the MapCanvas come in fact from other objects. This is a map to
57        # map those messages to the names of the instance variables they
58        # actually come from. This delegation is implemented in the
59        # Subscribe and unsubscribed methods
60        delegated_messages = {LAYER_SELECTED: "canvas",
61                              SHAPES_SELECTED: "canvas"}
62    
63      def __init__(self, parent, ID, interactor):      # Methods delegated to some instance variables. The delegation is
64          wxFrame.__init__(self, parent, ID, 'Thuban',      # implemented in the __getattr__ method.
65                           wxDefaultPosition, wxSize(400, 300))      delegated_methods = {"SelectLayer": "canvas",
66                             "SelectShapes": "canvas",
67                             "SelectedLayer": "canvas",
68                             "SelectedShapes": "canvas",
69                             }
70    
71          self.interactor = interactor      def __init__(self, parent, ID, title, application, interactor,
72                     initial_message = None, size = wxSize(-1, -1)):
73            DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
74            #wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
75    
76            self.application = application
77    
78          self.CreateStatusBar()          self.CreateStatusBar()
79          self.SetStatusText("This is the wxPython-based "          if initial_message:
80                        "Graphical User Interface for exploring geographic data")              self.SetStatusText(initial_message)
81    
82          self.identify_view = None          self.identify_view = None
83    
84          self.init_ids()          self.init_ids()
85    
86          #main_menu.print_menu()          # creat the menubar from the main_menu description
87          self.SetMenuBar(self.build_menu_bar(main_menu))          self.SetMenuBar(self.build_menu_bar(main_menu))
88    
89          # toolbar          # Similarly, create the toolbar from main_toolbar
90          toolbar = self.CreateToolBar(wxTB_3DBUTTONS)          toolbar = self.build_toolbar(main_toolbar)
   
         # set the size of the tools' bitmaps. Not needed on wxGTK, but  
         # on Windows. We probably shouldn't hardwire the bitmap size  
         # here  
         toolbar.SetToolBitmapSize(wxSize(24, 24))  
   
         for name in ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",  
                      "map_identify_tool", "map_label_tool", "map_full_extent"]:  
             self.add_toolbar_command(toolbar, name)  
91          # call Realize to make sure that the tools appear.          # call Realize to make sure that the tools appear.
92          toolbar.Realize()          toolbar.Realize()
93    
94    
95          # Create the map canvas          # Create the map canvas
96          canvas = view.MapCanvas(self, -1, interactor)          canvas = view.MapCanvas(self, -1)
97          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
98            canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
99          self.canvas = canvas          self.canvas = canvas
100    
101          self.init_dialogs()          self.SetMainWindow(self.canvas)
102    
103            self.SetAutoLayout(True)
104    
105          interactor.Subscribe(SELECTED_SHAPE, self.identify_view_on_demand)          self.init_dialogs()
106    
107          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
108    
109        def Subscribe(self, channel, *args):
110            """Subscribe a function to a message channel.
111    
112            If channel is one of the delegated messages call the appropriate
113            object's Subscribe method. Otherwise do nothing.
114            """
115            if channel in self.delegated_messages:
116                object = getattr(self, self.delegated_messages[channel])
117                object.Subscribe(channel, *args)
118            else:
119                print "Trying to subscribe to unsupported channel %s" % channel
120    
121        def Unsubscribe(self, channel, *args):
122            """Unsubscribe a function from a message channel.
123    
124            If channel is one of the delegated messages call the appropriate
125            object's Unsubscribe method. Otherwise do nothing.
126            """
127            if channel in self.delegated_messages:
128                object = getattr(self, self.delegated_messages[channel])
129                object.Unsubscribe(channel, *args)
130    
131        def __getattr__(self, attr):
132            """If attr is one of the delegated methods return that method
133    
134            Otherwise raise AttributeError.
135            """
136            if attr in self.delegated_methods:
137                return getattr(getattr(self, self.delegated_methods[attr]), attr)
138            raise AttributeError(attr)
139    
140      def init_ids(self):      def init_ids(self):
141          """Initialize the ids"""          """Initialize the ids"""
142          self.current_id = 6000          self.current_id = 6000
143          self.id_to_name = {}          self.id_to_name = {}
144          self.name_to_id = {}          self.name_to_id = {}
145            self.events_bound = {}
146    
147      def get_id(self, name):      def get_id(self, name):
148          """Return the wxWindows id for the command named name.          """Return the wxWindows id for the command named name.
# Line 100  class MainWindow(wxFrame): Line 156  class MainWindow(wxFrame):
156              self.id_to_name[ID] = name              self.id_to_name[ID] = name
157          return ID          return ID
158    
159        def bind_command_events(self, command, ID):
160            """Bind the necessary events for the given command and ID"""
161            if not self.events_bound.has_key(ID):
162                # the events haven't been bound yet
163                EVT_MENU(self, ID, self.invoke_command)
164                if command.IsDynamic():
165                    EVT_UPDATE_UI(self, ID, self.update_command_ui)
166    
167      def build_menu_bar(self, menudesc):      def build_menu_bar(self, menudesc):
168          """Build and return the menu bar from the menu description"""          """Build and return the menu bar from the menu description"""
169          menu_bar = wxMenuBar()          menu_bar = wxMenuBar()
# Line 111  class MainWindow(wxFrame): Line 175  class MainWindow(wxFrame):
175          return menu_bar          return menu_bar
176    
177      def build_menu(self, menudesc):      def build_menu(self, menudesc):
178          """Build and return a wxMenu from a menudescription"""          """Return a wxMenu built from the menu description menudesc"""
179          wxmenu = wxMenu()          wxmenu = wxMenu()
180          last = None          last = None
181          for item in menudesc.items:          for item in menudesc.items:
             # here the items must all be Menu instances themselves  
182              if item is None:              if item is None:
183                  # a separator. Only add one if the last item was not a                  # a separator. Only add one if the last item was not a
184                  # separator                  # separator
# Line 130  class MainWindow(wxFrame): Line 193  class MainWindow(wxFrame):
193              last = item              last = item
194          return wxmenu          return wxmenu
195    
196        def build_toolbar(self, toolbardesc):
197            """Build and return the main toolbar window from a toolbar description
198    
199            The parameter should be an instance of the Menu class but it
200            should not contain submenus.
201            """
202            toolbar = self.CreateToolBar(wxTB_3DBUTTONS)
203    
204            # set the size of the tools' bitmaps. Not needed on wxGTK, but
205            # on Windows, although it doesn't work very well there. It seems
206            # that only 16x16 icons are really supported on windows.
207            # We probably shouldn't hardwire the bitmap size here.
208            toolbar.SetToolBitmapSize(wxSize(24, 24))
209    
210            for item in toolbardesc.items:
211                if item is None:
212                    toolbar.AddSeparator()
213                else:
214                    # assume it's a string.
215                    self.add_toolbar_command(toolbar, item)
216    
217            return toolbar
218    
219      def add_menu_command(self, menu, name):      def add_menu_command(self, menu, name):
220          """Add the command with name name to the menu menu.          """Add the command with name name to the menu menu.
221    
# Line 143  class MainWindow(wxFrame): Line 229  class MainWindow(wxFrame):
229                  ID = self.get_id(name)                  ID = self.get_id(name)
230                  menu.Append(ID, command.Title(), command.HelpText(),                  menu.Append(ID, command.Title(), command.HelpText(),
231                              command.IsCheckCommand())                              command.IsCheckCommand())
232                  EVT_MENU(self, ID, self.invoke_command)                  self.bind_command_events(command, ID)
                 if command.IsDynamic():  
                     EVT_UPDATE_UI(self, ID, self.update_command_ui)  
233              else:              else:
234                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
235    
236      def add_toolbar_command(self, toolbar, name):      def add_toolbar_command(self, toolbar, name):
237          """Add the command with name name to the toolbar toolbar.          """Add the command with name name to the toolbar toolbar.
# Line 162  class MainWindow(wxFrame): Line 246  class MainWindow(wxFrame):
246              command = registry.Command(name)              command = registry.Command(name)
247              if command is not None:              if command is not None:
248                  ID = self.get_id(name)                  ID = self.get_id(name)
249                  filename = os.path.join(bitmapdir, command.Icon()) + bitmapext                  bitmap = resource.GetBitmapResource(command.Icon(),
250                  bitmap = wxBitmap(filename, wxBITMAP_TYPE_XPM)                                                      wxBITMAP_TYPE_XPM)
251                  toolbar.AddTool(ID, bitmap,                  toolbar.AddTool(ID, bitmap,
252                                  shortHelpString = command.HelpText(),                                  shortHelpString = command.HelpText(),
253                                  isToggle = command.IsCheckCommand())                                  isToggle = command.IsCheckCommand())
254                    self.bind_command_events(command, ID)
255              else:              else:
256                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
257    
258        def Context(self):
259            """Return the context object for a command invoked from this window
260            """
261            return Context(self.application, self.application.Session(), self)
262    
263      def invoke_command(self, event):      def invoke_command(self, event):
264          name = self.id_to_name.get(event.GetId())          name = self.id_to_name.get(event.GetId())
265          if name is not None:          if name is not None:
266              command = registry.Command(name)              command = registry.Command(name)
267              command.Execute(self)              command.Execute(self.Context())
268          else:          else:
269              print "Unknown command ID %d" % event.GetId()              print _("Unknown command ID %d") % event.GetId()
270    
271      def update_command_ui(self, event):      def update_command_ui(self, event):
272          #print "update_command_ui", self.id_to_name[event.GetId()]          #print "update_command_ui", self.id_to_name[event.GetId()]
273            context = self.Context()
274          command = registry.Command(self.id_to_name[event.GetId()])          command = registry.Command(self.id_to_name[event.GetId()])
275          if command is not None:          if command is not None:
276              event.Enable(command.Sensitive(self))              sensitive = command.Sensitive(context)
277              event.SetText(command.DynText(self))              event.Enable(sensitive)
278                if command.IsTool() and not sensitive and command.Checked(context):
279                    # When a checked tool command is disabled deselect all
280                    # tools. Otherwise the tool would remain active but it
281                    # might lead to errors if the tools stays active. This
282                    # problem occurred in GREAT-ER and this fixes it, but
283                    # it's not clear to me whether this is really the best
284                    # way to do it (BH, 20021206).
285                    self.canvas.SelectTool(None)
286                event.SetText(command.DynText(context))
287              if command.IsCheckCommand():              if command.IsCheckCommand():
288                  event.Check(command.Checked(self))                      event.Check(command.Checked(context))
289    
290      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):
291          """Run a modal message box with the given text, title and flags          """Run a modal message box with the given text, title and flags
292          and return the result"""          and return the result"""
293          dlg = wxMessageDialog(self, text, title, flags)          dlg = wxMessageDialog(self, text, title, flags)
294            dlg.CenterOnParent()
295          result = dlg.ShowModal()          result = dlg.ShowModal()
296          dlg.Destroy()          dlg.Destroy()
297          return result          return result
# Line 204  class MainWindow(wxFrame): Line 305  class MainWindow(wxFrame):
305    
306      def add_dialog(self, name, dialog):      def add_dialog(self, name, dialog):
307          if self.dialogs.has_key(name):          if self.dialogs.has_key(name):
308              raise RuntimeError("The Dialog named %s is already open" % name)              raise RuntimeError(_("The Dialog named %s is already open") % name)
309          self.dialogs[name] = dialog          self.dialogs[name] = dialog
310    
311      def dialog_open(self, name):      def dialog_open(self, name):
# Line 222  class MainWindow(wxFrame): Line 323  class MainWindow(wxFrame):
323              text = "(%10.10g, %10.10g)" % pos              text = "(%10.10g, %10.10g)" % pos
324          else:          else:
325              text = ""              text = ""
326            self.set_position_text(text)
327    
328        def set_position_text(self, text):
329            """Set the statusbar text showing the current position.
330    
331            By default the text is shown in field 0 of the status bar.
332            Override this method in derived classes to put it into a
333            different field of the statusbar.
334            """
335          self.SetStatusText(text)          self.SetStatusText(text)
336    
337      def save_modified_session(self, can_veto = 1):      def save_modified_session(self, can_veto = 1):
# Line 233  class MainWindow(wxFrame): Line 343  class MainWindow(wxFrame):
343          If the can_veto parameter is true (default) the dialog includes          If the can_veto parameter is true (default) the dialog includes
344          a cancel button, otherwise not.          a cancel button, otherwise not.
345          """          """
346          if main.app.session.WasModified():          if self.application.session.WasModified():
347              flags = wxYES_NO | wxICON_QUESTION              flags = wxYES_NO | wxICON_QUESTION
348              if can_veto:              if can_veto:
349                  flags = flags | wxCANCEL                  flags = flags | wxCANCEL
350              result = self.RunMessageBox("Exit",              result = self.RunMessageBox(_("Exit"),
351                                          ("The session has been modified."                                          _("The session has been modified."
352                                           " Do you want to save it?"),                                           " Do you want to save it?"),
353                                          flags)                                          flags)
354              if result == wxID_YES:              if result == wxID_YES:
# Line 247  class MainWindow(wxFrame): Line 357  class MainWindow(wxFrame):
357              result = wxID_NO              result = wxID_NO
358          return result          return result
359    
360        def prepare_new_session(self):
361            for d in self.dialogs.values():
362                if not isinstance(d, tree.SessionTreeView):
363                    d.Close()
364    
365      def NewSession(self):      def NewSession(self):
366          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
367          main.app.SetSession(create_empty_session())              self.prepare_new_session()
368                self.application.SetSession(create_empty_session())
369    
370      def OpenSession(self):      def OpenSession(self):
371          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
372          dlg = wxFileDialog(self, "Select a session file", ".", "",              dlg = wxFileDialog(self, _("Open Session"), ".", "",
373                             "*.thuban", wxOPEN)                                 "Thuban Session File (*.thuban)|*.thuban",
374          if dlg.ShowModal() == wxID_OK:                                 wxOPEN)
375              main.app.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
376          dlg.Destroy()                  self.prepare_new_session()
377                    self.application.OpenSession(dlg.GetPath())
378                dlg.Destroy()
379    
380      def SaveSession(self):      def SaveSession(self):
381          if main.app.session.filename == None:          if self.application.session.filename == None:
382              self.SaveSessionAs()              self.SaveSessionAs()
383          main.app.SaveSession()          else:
384                self.application.SaveSession()
385    
386      def SaveSessionAs(self):      def SaveSessionAs(self):
387          dlg = wxFileDialog(self, "Enter a filename for session", ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
388                             "*.thuban", wxOPEN)                             "Thuban Session File (*.thuban)|*.thuban",
389                               wxSAVE|wxOVERWRITE_PROMPT)
390          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
391              main.app.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
392              main.app.SaveSession()              self.application.SaveSession()
393          dlg.Destroy()          dlg.Destroy()
394    
395      def Exit(self):      def Exit(self):
396          self.Close(false)          self.Close(False)
397    
398      def OnClose(self, event):      def OnClose(self, event):
399          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
400          if result == wxID_CANCEL:          if result == wxID_CANCEL:
401              event.Veto()              event.Veto()
402          else:          else:
403                # FIXME: it would be better to tie the unsubscription to
404                # wx's destroy event, but that isn't implemented for wxGTK
405                # yet.
406                self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
407                DockFrame.OnClose(self, event)
408                for dlg in self.dialogs.values():
409                    dlg.Destroy()
410                self.canvas.Destroy()
411              self.Destroy()              self.Destroy()
412    
413      def SetMap(self, map):      def SetMap(self, map):
414          self.canvas.SetMap(map)          self.canvas.SetMap(map)
415            self.__SetTitle(map.Title())
416    
417            dialog = self.FindRegisteredDock("legend")
418            if dialog is not None:
419                dialog.GetPanel().SetMap(self.Map())
420    
421        def Map(self):
422            """Return the map displayed by this mainwindow"""
423    
424            return self.canvas.Map()
425    
426      def ShowSessionTree(self):      def ToggleSessionTree(self):
427            """If the session tree is shown close it otherwise create a new tree"""
428          name = "session_tree"          name = "session_tree"
429          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
430          if dialog is None:          if dialog is None:
431              dialog = tree.SessionTreeView(self, main.app, name)              dialog = tree.SessionTreeView(self, self.application, name)
432              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
433              dialog.Show(true)              dialog.Show(True)
434          else:          else:
435              # FIXME: bring dialog to front here              dialog.Close()
436              pass  
437        def SessionTreeShown(self):
438            """Return true iff the session tree is currently shown"""
439            return self.get_open_dialog("session_tree") is not None
440    
441      def About(self):      def About(self):
442          self.RunMessageBox("About",          self.RunMessageBox(_("About"),
443                             ("Thuban is a program for\n"                             _("Thuban %s\n"
444                                #"Build Date: %s\n"
445                                "using:\n"
446                                "  %s\n"
447                                "  %s\n\n"
448                                "Thuban is a program for\n"
449                              "exploring geographic data.\n"                              "exploring geographic data.\n"
450                              "Copyright (C) 2001 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
451                              "Thuban is licensed under the GPL"),                              "Thuban is licensed under the GNU GPL"
452                                % (Thuban.version.longversion,
453                                   "wxPython %s" % wxPython_version,
454                                   "Python %d.%d.%d" % sys.version_info[:3]
455                                  )),
456    #                           % __ThubanVersion__), #__BuildDate__)),
457                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
458    
459      def AddLayer(self):      def AddLayer(self):
460          dlg = wxFileDialog(self, "Select a data file", ".", "", "*.*",          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",
461                             wxOPEN)                             wxOPEN)
462          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
463              filename = dlg.GetPath()              filename = dlg.GetPath()
464              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             layer = Layer(title, filename)  
465              map = self.canvas.Map()              map = self.canvas.Map()
466              has_layers = map.HasLayers()              has_layers = map.HasLayers()
467              try:              try:
468                    store = self.application.Session().OpenShapefile(filename)
469                except IOError:
470                    # the layer couldn't be opened
471                    self.RunMessageBox(_("Add Layer"),
472                                       _("Can't open the file '%s'.") % filename)
473                else:
474                    layer = Layer(title, store)
475                  map.AddLayer(layer)                  map.AddLayer(layer)
476                    if not has_layers:
477                        # if we're adding a layer to an empty map, fit the
478                        # new map to the window
479                        self.canvas.FitMapToWindow()
480            dlg.Destroy()
481    
482        def AddRasterLayer(self):
483            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
484                               wxOPEN)
485            if dlg.ShowModal() == wxID_OK:
486                filename = dlg.GetPath()
487                title = os.path.splitext(os.path.basename(filename))[0]
488                map = self.canvas.Map()
489                has_layers = map.HasLayers()
490                try:
491                    layer = RasterLayer(title, filename)
492              except IOError:              except IOError:
493                  # the layer couldn't be opened                  # the layer couldn't be opened
494                  self.RunMessageBox("Add Layer",                  self.RunMessageBox(_("Add Image Layer"),
495                                     "Can't open the file '%s'." % filename)                                     _("Can't open the file '%s'.") % filename)
496              else:              else:
497                    map.AddLayer(layer)
498                  if not has_layers:                  if not has_layers:
499                      # if we're adding a layer to an empty map, for the                      # if we're adding a layer to an empty map, fit the
500                      # new map to the window                      # new map to the window
501                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
502          dlg.Destroy()          dlg.Destroy()
# Line 331  class MainWindow(wxFrame): Line 506  class MainWindow(wxFrame):
506          if layer is not None:          if layer is not None:
507              self.canvas.Map().RemoveLayer(layer)              self.canvas.Map().RemoveLayer(layer)
508    
509        def CanRemoveLayer(self):
510            """Return true if the currently selected layer can be deleted.
511    
512            If no layer is selected return False.
513    
514            The return value of this method determines whether the remove
515            layer command is sensitive in menu.
516            """
517            layer = self.current_layer()
518            if layer is not None:
519                return self.canvas.Map().CanRemoveLayer(layer)
520            return False
521    
522      def RaiseLayer(self):      def RaiseLayer(self):
523          layer = self.current_layer()          layer = self.current_layer()
524          if layer is not None:          if layer is not None:
525              self.canvas.Map().RaiseLayer(layer)              self.canvas.Map().RaiseLayer(layer)
526            
527      def LowerLayer(self):      def LowerLayer(self):
528          layer = self.current_layer()          layer = self.current_layer()
529          if layer is not None:          if layer is not None:
# Line 346  class MainWindow(wxFrame): Line 534  class MainWindow(wxFrame):
534    
535          If no layer is selected, return None          If no layer is selected, return None
536          """          """
537          return self.interactor.SelectedLayer()          return self.canvas.SelectedLayer()
538    
539      def has_selected_layer(self):      def has_selected_layer(self):
540          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
541          return self.interactor.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
   
     def choose_color(self):  
         """Run the color selection dialog and return the selected color.  
   
         If the user cancels, return None.  
         """  
         dlg = wxColourDialog(self)  
         color = None  
         if dlg.ShowModal() == wxID_OK:  
             data = dlg.GetColourData()  
             wxc = data.GetColour()  
             color = Color(wxc.Red() / 255.0,  
                           wxc.Green() / 255.0,  
                           wxc.Blue() / 255.0)  
         dlg.Destroy()  
         return color  
   
     def LayerFillColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.SetFill(color)  
   
     def LayerTransparentFill(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.SetFill(None)  
   
     def LayerOutlineColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.SetStroke(color)  
542    
543      def LayerNoOutline(self):      def has_selected_shapes(self):
544          layer = self.current_layer()          """Return true if a shape is currently selected"""
545          if layer is not None:          return self.canvas.HasSelectedShapes()
             layer.SetStroke(None)  
546    
547      def HideLayer(self):      def HideLayer(self):
548          layer = self.current_layer()          layer = self.current_layer()
# Line 409  class MainWindow(wxFrame): Line 561  class MainWindow(wxFrame):
561              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
562              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
563              if dialog is None:              if dialog is None:
564                  dialog = tableview.TableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
565                                                "Table: %s" % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
566                                                layer, table)                                           layer, table)
567                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
568                  dialog.Show(true)                  dialog.Show(True)
569              else:              else:
570                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
571                  pass                  pass
572    
573      def Projection(self):      def MapProjection(self):
574          map = self.canvas.Map()  
575          proj = map.projection          name = "map_projection"
576          if proj is None:          dialog = self.get_open_dialog(name)
577              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
578            if dialog is None:
579                map = self.canvas.Map()
580                dialog = projdialog.ProjFrame(self, name,
581                         _("Map Projection: %s") % map.Title(), map)
582                self.add_dialog(name, dialog)
583                dialog.Show()
584            dialog.Raise()
585    
586        def LayerProjection(self):
587    
588            layer = self.current_layer()
589    
590            name = "layer_projection" + str(id(layer))
591            dialog = self.get_open_dialog(name)
592    
593            if dialog is None:
594                map = self.canvas.Map()
595                dialog = projdialog.ProjFrame(self, name,
596                         _("Layer Projection: %s") % layer.Title(), layer)
597                self.add_dialog(name, dialog)
598                dialog.Show()
599            dialog.Raise()
600    
601        def LayerEditProperties(self):
602    
603            #
604            # the menu option for this should only be available if there
605            # is a current layer, so we don't need to check if the
606            # current layer is None
607            #
608    
609            layer = self.current_layer()
610            self.OpenLayerProperties(layer)
611    
612        def OpenLayerProperties(self, layer, group = None):
613            name = "layer_properties" + str(id(layer))
614            dialog = self.get_open_dialog(name)
615    
616            if dialog is None:
617                dialog = Classifier(self, name, layer, group)
618                self.add_dialog(name, dialog)
619                dialog.Show()
620            dialog.Raise()
621    
622        def LayerJoinTable(self):
623            layer = self.canvas.SelectedLayer()
624            if layer is not None:
625                dlg = JoinDialog(self, _("Join Layer with Table"),
626                                 self.application.session,
627                                 layer = layer)
628                dlg.ShowModal()
629    
630        def LayerUnjoinTable(self):
631            layer = self.canvas.SelectedLayer()
632            if layer is not None:
633                orig_store = layer.ShapeStore().OrigShapeStore()
634                if orig_store:
635                    layer.SetShapeStore(orig_store)
636    
637        def ShowLegend(self):
638            if not self.LegendShown():
639                self.ToggleLegend()
640    
641        def ToggleLegend(self):
642            """Show the legend if it's not shown otherwise hide it again"""
643            name = "legend"
644            dialog = self.FindRegisteredDock(name)
645    
646            if dialog is None:
647                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
648                legend.LegendPanel(dialog, None, self)
649                dialog.Dock()
650                dialog.GetPanel().SetMap(self.Map())
651                dialog.Show()
652          else:          else:
653              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              dialog.Show(not dialog.IsShown())
654                                                 map.BoundingBox())  
655          if proj4Dlg.ShowModal() == wxID_OK:      def LegendShown(self):
656              params = proj4Dlg.GetParams()          """Return true iff the legend is currently open"""
657              if params is not None:          dialog = self.FindRegisteredDock("legend")
658                  proj = Projection(params)          return dialog is not None and dialog.IsShown()
659    
660        def TableOpen(self):
661            dlg = wxFileDialog(self, _("Open Table"), ".", "",
662                               _("DBF Files (*.dbf)") + "|*.dbf|" +
663                               #_("CSV Files (*.csv)") + "|*.csv|" +
664                               _("All Files (*.*)") + "|*.*",
665                               wxOPEN)
666            if dlg.ShowModal() == wxID_OK:
667                filename = dlg.GetPath()
668                dlg.Destroy()
669                try:
670                    table = self.application.session.OpenTableFile(filename)
671                except IOError:
672                    # the layer couldn't be opened
673                    self.RunMessageBox(_("Open Table"),
674                                       _("Can't open the file '%s'.") % filename)
675              else:              else:
676                  proj = None                  self.ShowTableView(table)
677              map.SetProjection(proj)  
678          proj4Dlg.Destroy()      def TableClose(self):
679            tables = self.application.session.UnreferencedTables()
680    
681            dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
682                                         _("Close Table"),
683                                         [t.Title() for t in tables],
684                                         size = (400, 300), style=wxRESIZE_BORDER)
685            if dlg.ShowModal() == wxID_OK:
686                for i in dlg.GetValue():
687                    self.application.session.RemoveTable(tables[i])
688    
689    
690        def TableShow(self):
691            """Offer a multi-selection dialog for tables to be displayed
692    
693            The windows for the selected tables are opened or brought to
694            the front.
695            """
696            tables = self.application.session.Tables()
697    
698            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
699                                         _("Show Table"),
700                                         [t.Title() for t in tables],
701                                         size = (400,300), style = wxRESIZE_BORDER)
702            if (dlg.ShowModal() == wxID_OK):
703                for i in dlg.GetValue():
704                    # XXX: if the table belongs to a layer, open a
705                    # LayerTableFrame instead of QueryTableFrame
706                    self.ShowTableView(tables[i])
707    
708        def TableJoin(self):
709            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
710            dlg.ShowModal()
711    
712        def ShowTableView(self, table):
713            """Open a table view for the table and optionally"""
714            name = "table_view%d" % id(table)
715            dialog = self.get_open_dialog(name)
716            if dialog is None:
717                dialog = tableview.QueryTableFrame(self, name,
718                                                   _("Table: %s") % table.Title(),
719                                                   table)
720                self.add_dialog(name, dialog)
721                dialog.Show(True)
722            # FIXME: else bring dialog to front
723    
724      def ZoomInTool(self):      def ZoomInTool(self):
725          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 454  class MainWindow(wxFrame): Line 740  class MainWindow(wxFrame):
740      def FullExtent(self):      def FullExtent(self):
741          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
742    
743        def FullLayerExtent(self):
744            self.canvas.FitLayerToWindow(self.current_layer())
745    
746        def FullSelectionExtent(self):
747            self.canvas.FitSelectedToWindow()
748    
749        def ExportMap(self):
750            self.canvas.Export()
751    
752      def PrintMap(self):      def PrintMap(self):
753          self.canvas.Print()          self.canvas.Print()
754    
755      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
756            dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",
757                                    self.Map().Title())
758            if dlg.ShowModal() == wxID_OK:
759                title = dlg.GetValue()
760                if title != "":
761                    self.Map().SetTitle(title)
762                    self.__SetTitle(title)
763    
764            dlg.Destroy()
765    
766        def identify_view_on_demand(self, layer, shapes):
767            """Subscribed to the canvas' SHAPES_SELECTED message
768    
769            If the current tool is the identify tool, at least one shape is
770            selected and the identify dialog is not shown, show the dialog.
771            """
772            # If the selection has become empty we don't need to do
773            # anything. Otherwise it could happen that the dialog was popped
774            # up when the selection became empty, e.g. when a new selection
775            # is opened while the identify tool is active and dialog had
776            # been closed
777            if not shapes:
778                return
779    
780          name = "identify_view"          name = "identify_view"
781          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
782              if not self.dialog_open(name):              if not self.dialog_open(name):
783                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
784                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
785                  dialog.Show(true)                  dialog.Show(True)
786              else:              else:
787                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
788                  pass                  pass
789    
790        def __SetTitle(self, title):
791            self.SetTitle("Thuban - " + title)
792    
793  #  #
794  # Define all the commands available in the main window  # Define all the commands available in the main window
795  #  #
# Line 475  class MainWindow(wxFrame): Line 797  class MainWindow(wxFrame):
797    
798  # Helper functions to define common command implementations  # Helper functions to define common command implementations
799  def call_method(context, methodname, *args):  def call_method(context, methodname, *args):
800      """Call the context's method methodname with args *args"""      """Call the mainwindow's method methodname with args *args"""
801      apply(getattr(context, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
802    
803  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
804                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
805      """Add a command implemented by a method of the context object"""      """Add a command implemented by a method of the mainwindow object"""
806      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
807                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
808                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
809    
810    def make_check_current_tool(toolname):
811        """Return a function that tests if the currently active tool is toolname
812    
813        The returned function can be called with the context and returns
814        true iff the currently active tool's name is toolname. It's directly
815        usable as the 'checked' callback of a command.
816        """
817        def check_current_tool(context, name=toolname):
818            return context.mainwindow.canvas.CurrentTool() == name
819        return check_current_tool
820    
821  def _tool_command(name, title, method, toolname, helptext = "",  def _tool_command(name, title, method, toolname, helptext = "",
822                    icon = ""):                    icon = "", sensitive = None):
823      """Add a tool command"""      """Add a tool command"""
824      def check_current_tool(context, name=toolname):      registry.Add(ToolCommand(name, title, call_method, args=(method,),
825          return context.canvas.CurrentTool() == name                               helptext = helptext, icon = icon,
826      registry.Add(Command(name, title, call_method, args=(method,),                               checked = make_check_current_tool(toolname),
827                           helptext = helptext, icon = icon,                               sensitive = sensitive))
                          checked = check_current_tool))  
828    
829  def _has_selected_layer(context):  def _has_selected_layer(context):
830      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
831      return context.has_selected_layer()      return context.mainwindow.has_selected_layer()
832    
833    def _has_selected_shapes(context):
834        """Return true if a layer is selected in the context"""
835        return context.mainwindow.has_selected_shapes()
836    
837    def _can_remove_layer(context):
838        return context.mainwindow.CanRemoveLayer()
839    
840    def _has_tree_window_shown(context):
841        """Return true if the tree window is shown"""
842        return context.mainwindow.SessionTreeShown()
843    
844    def _has_visible_map(context):
845        """Return true iff theres a visible map in the mainwindow.
846    
847        A visible map is a map with at least one visible layer."""
848        map = context.mainwindow.Map()
849        if map is not None:
850            for layer in map.Layers():
851                if layer.Visible():
852                    return 1
853        return 0
854    
855    def _has_legend_shown(context):
856        """Return true if the legend window is shown"""
857        return context.mainwindow.LegendShown()
858    
859    
860  # File menu  # File menu
861  _method_command("new_session", "&New Session", "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
862  _method_command("open_session", "&Open Session", "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
863  _method_command("save_session", "&Save Session", "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
864  _method_command("save_session_as", "Save Session &As", "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
865  _method_command("show_session_tree", "Show Session &Tree", "ShowSessionTree")  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
866  _method_command("exit", "&Exit", "Exit")                  checked = _has_tree_window_shown)
867    _method_command("toggle_legend", _("Legend"), "ToggleLegend",
868                    checked = _has_legend_shown)
869    _method_command("exit", _("E&xit"), "Exit")
870    
871  # Help menu  # Help menu
872  _method_command("help_about", "&About", "About")  _method_command("help_about", _("&About..."), "About")
873    
874    
875  # Map menu  # Map menu
876  _method_command("map_projection", "Pro&jection", "Projection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
877    
878  _tool_command("map_zoom_in_tool", "&Zoom in", "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
879                helptext = "Switch to map-mode 'zoom-in'", icon = "zoom_in")                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
880  _tool_command("map_zoom_out_tool", "Zoom &out", "ZoomOutTool", "ZoomOutTool",                sensitive = _has_visible_map)
881                helptext = "Switch to map-mode 'zoom-out'", icon = "zoom_out")  _tool_command("map_zoom_out_tool", _("Zoom &out"), "ZoomOutTool", "ZoomOutTool",
882  _tool_command("map_pan_tool", "&Pan", "PanTool", "PanTool",                helptext = _("Switch to map-mode 'zoom-out'"), icon = "zoom_out",
883                helptext = "Switch to map-mode 'pan'", icon = "pan")                sensitive = _has_visible_map)
884  _tool_command("map_identify_tool", "&Identify", "IdentifyTool", "IdentifyTool",  _tool_command("map_pan_tool", _("&Pan"), "PanTool", "PanTool",
885                helptext = "Switch to map-mode 'identify'", icon = "identify")                helptext = _("Switch to map-mode 'pan'"), icon = "pan",
886  _tool_command("map_label_tool", "&Label", "LabelTool", "LabelTool",                sensitive = _has_visible_map)
887                helptext = "Add/Remove labels", icon = "label")  _tool_command("map_identify_tool", _("&Identify"), "IdentifyTool",
888  _method_command("map_full_extent", "&Full extent", "FullExtent",                "IdentifyTool",
889                 helptext = "Full Extent", icon = "fullextent")                helptext = _("Switch to map-mode 'identify'"), icon = "identify",
890  _method_command("map_print", "Prin&t", "PrintMap", helptext = "Print the map")                sensitive = _has_visible_map)
891    _tool_command("map_label_tool", _("&Label"), "LabelTool", "LabelTool",
892                  helptext = _("Add/Remove labels"), icon = "label",
893                  sensitive = _has_visible_map)
894    _method_command("map_full_extent", _("&Full extent"), "FullExtent",
895                   helptext = _("Full Extent"), icon = "fullextent",
896                  sensitive = _has_visible_map)
897    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
898                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
899                  sensitive = _has_selected_layer)
900    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
901                   helptext = _("Full Selection Extent"), icon = "fullselextent",
902                  sensitive = _has_selected_shapes)
903    _method_command("map_export", _("E&xport"), "ExportMap",
904                        helptext = _("Export the map to file"))
905    _method_command("map_print", _("Prin&t"), "PrintMap",
906                    helptext = _("Print the map"))
907    _method_command("map_rename", _("&Rename..."), "RenameMap",
908                    helptext = _("Rename the map"))
909    _method_command("layer_add", _("&Add Layer..."), "AddLayer",
910                    helptext = _("Add a new layer to active map"))
911    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
912                    helptext = _("Add a new image layer to active map"))
913    _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
914                    helptext = _("Remove selected layer(s)"),
915                    sensitive = _can_remove_layer)
916    
917  # Layer menu  # Layer menu
918  _method_command("layer_add", "&Add Layer", "AddLayer",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
                 helptext = "Add a new layer to active map")  
 _method_command("layer_remove", "&Remove Layer", "RemoveLayer",  
                 helptext = "Remove selected layer(s)",  
                 sensitive = _has_selected_layer)  
 _method_command("layer_fill_color", "&Fill Color", "LayerFillColor",  
                 helptext = "Set the fill color of selected layer(s)",  
                 sensitive = _has_selected_layer)  
 _method_command("layer_transparent_fill", "&Transparent Fill",  
                 "LayerTransparentFill",  
                 helptext = "Do not fill the selected layer(s)",  
919                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
920  _method_command("layer_outline_color", "&Outline Color", "LayerOutlineColor",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
921                  helptext = "Set the outline color of selected layer(s)",                  helptext = _("Raise selected layer(s)"),
922                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
923  _method_command("layer_no_outline", "&No Outline", "LayerNoOutline",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
924                  helptext = "Do not draw the outline of the selected layer(s)",                  helptext = _("Lower selected layer(s)"),
925                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
926  _method_command("layer_raise", "&Raise", "RaiseLayer",  _method_command("layer_show", _("&Show"), "ShowLayer",
927                  helptext = "Raise selected layer(s)",                  helptext = _("Make selected layer(s) visible"),
928                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
929  _method_command("layer_lower", "&Lower", "LowerLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
930                  helptext = "Lower selected layer(s)",                  helptext = _("Make selected layer(s) unvisible"),
931                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
932  _method_command("layer_show", "&Show", "ShowLayer",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
933                  helptext = "Make selected layer(s) visible",                  helptext = _("Show the selected layer's table"),
934                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
935  _method_command("layer_hide", "&Hide", "HideLayer",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
                 helptext = "Make selected layer(s) unvisible",  
936                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
937  _method_command("layer_show_table", "Show Ta&ble", "LayerShowTable",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
                 helptext = "Show the selected layer's table",  
938                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
939    
940    def _can_unjoin(context):
941        layer = context.mainwindow.SelectedLayer()
942        return bool(layer and layer.ShapeStore().OrigShapeStore() is not None)
943    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
944                    sensitive = _can_unjoin)
945    
946    # Table menu
947    _method_command("table_open", _("&Open..."), "TableOpen")
948    _method_command("table_close", _("&Close"), "TableClose",
949           sensitive = lambda context: bool(context.session.UnreferencedTables()))
950    _method_command("table_show", _("&Show"), "TableShow")
951    _method_command("table_join", _("&Join..."), "TableJoin")
952    
953  # the menu structure  #  Export only under Windows ...
954  main_menu = Menu("<main>", "<main>",  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
                  [Menu("file", "&File",  
                        ["new_session", "open_session", None,  
                         "save_session", "save_session_as", None,  
                         "show_session_tree", None,  
                         "exit"]),  
                   Menu("map", "&Map",  
                        ["layer_add", "layer_remove",  
955                          None,                          None,
956                          "map_projection",                          "map_projection",
957                          None,                          None,
958                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
959                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
960                            "map_full_extent",
961                            "layer_full_extent",
962                            "selected_full_extent",
963                          None,                          None,
964                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
965                          None,                          None,
966                          "map_print"]),                          "toggle_legend",
967                    Menu("layer", "&Layer",                          None]
968                         ["layer_fill_color", "layer_transparent_fill",  if wxPlatform == '__WXMSW__':
969                          "layer_outline_color", "layer_no_outline",      map_menu.append("map_export")
970                          None,  map_menu.append("map_print")
971                          "layer_raise", "layer_lower",  
972    # the menu structure
973    main_menu = Menu("<main>", "<main>",
974                     [Menu("file", _("&File"),
975                           ["new_session", "open_session", None,
976                            "save_session", "save_session_as", None,
977                            "toggle_session_tree", None,
978                            "exit"]),
979                      Menu("map", _("&Map"), map_menu),
980                      Menu("layer", _("&Layer"),
981                            ["layer_raise", "layer_lower",
982                          None,                          None,
983                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
984                          None,                          None,
985                          "layer_show_table"]),                          "layer_projection",
986                    Menu("help", "&Help",                          None,
987                            "layer_show_table",
988                            "layer_jointable",
989                            "layer_unjointable",
990                            None,
991                            "layer_properties"]),
992                      Menu("table", _("&Table"),
993                           ["table_open", "table_close",
994                           None,
995                           "table_show",
996                           None,
997                           "table_join"]),
998                      Menu("help", _("&Help"),
999                         ["help_about"])])                         ["help_about"])])
1000    
1001    # the main toolbar
1002    
1003    main_toolbar = Menu("<toolbar>", "<toolbar>",
1004                        ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
1005                         "map_full_extent",
1006                         "layer_full_extent",
1007                         "selected_full_extent",
1008                         None,
1009                         "map_identify_tool", "map_label_tool"])

Legend:
Removed from v.188  
changed lines
  Added in v.1074

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26