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

Legend:
Removed from v.102  
changed lines
  Added in v.1068

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26