/[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 502 by jonathan, Mon Mar 10 15:11:53 2003 UTC revision 2163 by joey, Tue Apr 13 10:10:34 2004 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003, 2004 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 11  The main window Line 12  The main window
12  """  """
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    # $Source$
16    # $Id$
17    
18  import os  import os
19    import copy
20    
21  from wxPython.wx import *  from wxPython.wx import *
22    
23  import Thuban  import Thuban
24    
25  from Thuban import _  from Thuban import _
26    from Thuban.Model.messages import TITLE_CHANGED
27  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
28  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
29  from Thuban.Model.color import Color  from Thuban.Model.postgisdb import PostGISShapeStore, has_postgis_support
30  from Thuban.Model.proj import Projection  # XXX: replace this by
31    # from wxPython.lib.dialogs import wxMultipleChoiceDialog
32    # when Thuban does not support wxPython 2.4.0 any more.
33    from Thuban.UI.multiplechoicedialog import wxMultipleChoiceDialog
34    
35  import view  import view
36  import tree  import tree
 import proj4dialog  
37  import tableview, identifyview  import tableview, identifyview
38  import classifier  from Thuban.UI.classifier import Classifier
39    import legend
40  from menu import Menu  from menu import Menu
41    
42  from context import Context  from context import Context
43  from command import registry, Command, ToolCommand  from command import registry, Command, ToolCommand
44  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION, \
45         MAP_REPLACED
46    from about import About
47  # the directory where the toolbar icons are stored  
48  bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  from Thuban.UI.dock import DockFrame
49  bitmapext = ".xpm"  from Thuban.UI.join import JoinDialog
50    from Thuban.UI.dbdialog import DBFrame, DBDialog, ChooseDBTableDialog
51    import resource
52  class MainWindow(wxFrame):  import Thuban.Model.resource
53    
54    import projdialog
55    
56    
57    class MainWindow(DockFrame):
58    
59        # Some messages that can be subscribed/unsubscribed directly through
60        # the MapCanvas come in fact from other objects. This is a map to
61        # map those messages to the names of the instance variables they
62        # actually come from. This delegation is implemented in the
63        # Subscribe and unsubscribed methods
64        delegated_messages = {LAYER_SELECTED: "canvas",
65                              SHAPES_SELECTED: "canvas",
66                              MAP_REPLACED: "canvas"}
67    
68        # Methods delegated to some instance variables. The delegation is
69        # implemented in the __getattr__ method.
70        delegated_methods = {"SelectLayer": "canvas",
71                             "SelectShapes": "canvas",
72                             "SelectedLayer": "canvas",
73                             "SelectedShapes": "canvas",
74                             }
75    
76      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
77                   initial_message = None, size = wxSize(-1, -1)):                   initial_message = None, size = wxSize(-1, -1)):
78          wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)          DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
79            #wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
80    
81          self.application = application          self.application = application
         self.interactor = interactor  
82    
83          self.CreateStatusBar()          self.CreateStatusBar()
84          if initial_message:          if initial_message:
# Line 65  class MainWindow(wxFrame): Line 96  class MainWindow(wxFrame):
96          # call Realize to make sure that the tools appear.          # call Realize to make sure that the tools appear.
97          toolbar.Realize()          toolbar.Realize()
98    
99    
100          # Create the map canvas          # Create the map canvas
101          canvas = view.MapCanvas(self, -1, interactor)          canvas = view.MapCanvas(self, -1)
102          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
103            canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
104          self.canvas = canvas          self.canvas = canvas
105            self.canvas.Subscribe(TITLE_CHANGED, self.title_changed)
106    
107            self.SetMainWindow(self.canvas)
108    
109            self.SetAutoLayout(True)
110    
111          self.init_dialogs()          self.init_dialogs()
112    
113          interactor.Subscribe(SELECTED_SHAPE, self.identify_view_on_demand)          self.ShowLegend()
114    
115          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
116    
117        def Subscribe(self, channel, *args):
118            """Subscribe a function to a message channel.
119    
120            If channel is one of the delegated messages call the appropriate
121            object's Subscribe method. Otherwise do nothing.
122            """
123            if channel in self.delegated_messages:
124                object = getattr(self, self.delegated_messages[channel])
125                object.Subscribe(channel, *args)
126            else:
127                print "Trying to subscribe to unsupported channel %s" % channel
128    
129        def Unsubscribe(self, channel, *args):
130            """Unsubscribe a function from a message channel.
131    
132            If channel is one of the delegated messages call the appropriate
133            object's Unsubscribe method. Otherwise do nothing.
134            """
135            if channel in self.delegated_messages:
136                object = getattr(self, self.delegated_messages[channel])
137                try:
138                    object.Unsubscribe(channel, *args)
139                except wxPyDeadObjectError:
140                    # The object was a wxObject and has already been
141                    # destroyed. Hopefully it has unsubscribed all its
142                    # subscribers already so that it's OK if we do nothing
143                    # here
144                    pass
145    
146        def __getattr__(self, attr):
147            """If attr is one of the delegated methods return that method
148    
149            Otherwise raise AttributeError.
150            """
151            if attr in self.delegated_methods:
152                return getattr(getattr(self, self.delegated_methods[attr]), attr)
153            raise AttributeError(attr)
154    
155      def init_ids(self):      def init_ids(self):
156          """Initialize the ids"""          """Initialize the ids"""
157          self.current_id = 6000          self.current_id = 6000
# Line 185  class MainWindow(wxFrame): Line 261  class MainWindow(wxFrame):
261              command = registry.Command(name)              command = registry.Command(name)
262              if command is not None:              if command is not None:
263                  ID = self.get_id(name)                  ID = self.get_id(name)
264                  filename = os.path.join(bitmapdir, command.Icon()) + bitmapext                  bitmap = resource.GetBitmapResource(command.Icon(),
265                  bitmap = wxBitmap(filename, wxBITMAP_TYPE_XPM)                                                      wxBITMAP_TYPE_XPM)
266                  toolbar.AddTool(ID, bitmap,                  toolbar.AddTool(ID, bitmap,
267                                  shortHelpString = command.HelpText(),                                  shortHelpString = command.HelpText(),
268                                  isToggle = command.IsCheckCommand())                                  isToggle = command.IsCheckCommand())
# Line 296  class MainWindow(wxFrame): Line 372  class MainWindow(wxFrame):
372              result = wxID_NO              result = wxID_NO
373          return result          return result
374    
     def prepare_new_session(self):  
         for d in self.dialogs.values():  
             if not isinstance(d, tree.SessionTreeView):  
                 d.Close()  
   
375      def NewSession(self):      def NewSession(self):
376          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
377          self.prepare_new_session()              self.application.SetSession(create_empty_session())
         self.application.SetSession(create_empty_session())  
378    
379      def OpenSession(self):      def OpenSession(self):
380          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
381          dlg = wxFileDialog(self, _("Open Session"), ".", "", "*.thuban", wxOPEN)              dlg = wxFileDialog(self, _("Open Session"),
382          if dlg.ShowModal() == wxID_OK:                                 self.application.Path("data"), "",
383              self.prepare_new_session()                                 "Thuban Session File (*.thuban)|*.thuban",
384              self.application.OpenSession(dlg.GetPath())                                 wxOPEN)
385          dlg.Destroy()              if dlg.ShowModal() == wxID_OK:
386                    self.application.OpenSession(dlg.GetPath(),
387                                                 self.run_db_param_dialog)
388                    self.application.SetPath("data", dlg.GetPath())
389                dlg.Destroy()
390    
391        def run_db_param_dialog(self, parameters, message):
392            dlg = DBDialog(self, _("DB Connection Parameters"), parameters,
393                           message)
394            return dlg.RunDialog()
395    
396      def SaveSession(self):      def SaveSession(self):
397          if self.application.session.filename == None:          if self.application.session.filename == None:
# Line 321  class MainWindow(wxFrame): Line 400  class MainWindow(wxFrame):
400              self.application.SaveSession()              self.application.SaveSession()
401    
402      def SaveSessionAs(self):      def SaveSessionAs(self):
403          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"),
404                             "*.thuban", wxOPEN)                             self.application.Path("data"), "",
405                               "Thuban Session File (*.thuban)|*.thuban",
406                               wxSAVE|wxOVERWRITE_PROMPT)
407          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
408              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
409              self.application.SaveSession()              self.application.SaveSession()
410                self.application.SetPath("data",dlg.GetPath())
411          dlg.Destroy()          dlg.Destroy()
412    
413      def Exit(self):      def Exit(self):
414          self.Close(false)          self.Close(False)
415    
416      def OnClose(self, event):      def OnClose(self, event):
417          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
# Line 340  class MainWindow(wxFrame): Line 422  class MainWindow(wxFrame):
422              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
423              # yet.              # yet.
424              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
425                DockFrame.OnClose(self, event)
426                for dlg in self.dialogs.values():
427                    dlg.Destroy()
428                self.canvas.Destroy()
429              self.Destroy()              self.Destroy()
430    
431      def SetMap(self, map):      def SetMap(self, map):
432          self.canvas.SetMap(map)          self.canvas.SetMap(map)
433            self.update_title()
434    
435            dialog = self.FindRegisteredDock("legend")
436            if dialog is not None:
437                dialog.GetPanel().SetMap(self.Map())
438    
439      def Map(self):      def Map(self):
440          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
441    
442          return self.canvas.Map()          return self.canvas.Map()
443    
444      def ShowSessionTree(self):      def ToggleSessionTree(self):
445            """If the session tree is shown close it otherwise create a new tree"""
446          name = "session_tree"          name = "session_tree"
447          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
448          if dialog is None:          if dialog is None:
449              dialog = tree.SessionTreeView(self, self.application, name)              dialog = tree.SessionTreeView(self, self.application, name)
450              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
451              dialog.Show(true)              dialog.Show(True)
452          else:          else:
453              # FIXME: bring dialog to front here              dialog.Close()
454              pass  
455        def SessionTreeShown(self):
456            """Return true iff the session tree is currently shown"""
457            return self.get_open_dialog("session_tree") is not None
458    
459      def About(self):      def About(self):
460          self.RunMessageBox(_("About"),          dlg = About(self)
461                             _("Thuban is a program for\n"          dlg.ShowModal()
462                              "exploring geographic data.\n"          dlg.Destroy()
463                              "Copyright (C) 2001-2003 Intevation GmbH.\n"  
464                              "Thuban is licensed under the GPL"),      def DatabaseManagement(self):
465                             wxOK | wxICON_INFORMATION)          name = "dbmanagement"
466            dialog = self.get_open_dialog(name)
467            if dialog is None:
468                map = self.canvas.Map()
469                dialog = DBFrame(self, name, self.application.Session())
470                self.add_dialog(name, dialog)
471                dialog.Show()
472            dialog.Raise()
473    
474      def AddLayer(self):      def AddLayer(self):
475          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select one or more data files"),
476                               self.application.Path("data"), "",
477                               _("Shapefiles (*.shp)") + "|*.shp;*.SHP|" +
478                               _("All Files (*.*)") + "|*.*",
479                               wxOPEN | wxMULTIPLE)
480            if dlg.ShowModal() == wxID_OK:
481                filenames = dlg.GetPaths()
482                for filename in filenames:
483                    title = os.path.splitext(os.path.basename(filename))[0]
484                    map = self.canvas.Map()
485                    has_layers = map.HasLayers()
486                    try:
487                        store = self.application.Session().OpenShapefile(filename)
488                    except IOError:
489                        # the layer couldn't be opened
490                        self.RunMessageBox(_("Add Layer"),
491                                           _("Can't open the file '%s'.")%filename)
492                    else:
493                        layer = Layer(title, store)
494                        map.AddLayer(layer)
495                        if not has_layers:
496                            # if we're adding a layer to an empty map, fit the
497                            # new map to the window
498                            self.canvas.FitMapToWindow()
499                        self.application.SetPath("data",filename)
500            dlg.Destroy()
501    
502        def AddRasterLayer(self):
503            dlg = wxFileDialog(self, _("Select an image file"),
504                               self.application.Path("data"), "", "*.*",
505                             wxOPEN)                             wxOPEN)
506          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
507              filename = dlg.GetPath()              filename = dlg.GetPath()
508              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             layer = Layer(title, filename)  
509              map = self.canvas.Map()              map = self.canvas.Map()
510              has_layers = map.HasLayers()              has_layers = map.HasLayers()
511              try:              try:
512                  map.AddLayer(layer)                  layer = RasterLayer(title, filename)
513              except IOError:              except IOError:
514                  # the layer couldn't be opened                  # the layer couldn't be opened
515                  self.RunMessageBox(_("Add Layer"),                  self.RunMessageBox(_("Add Image Layer"),
516                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
517              else:              else:
518                    map.AddLayer(layer)
519                  if not has_layers:                  if not has_layers:
520                      # if we're adding a layer to an empty map, for the                      # if we're adding a layer to an empty map, fit the
521                      # new map to the window                      # new map to the window
522                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
523                    self.application.SetPath("data", filename)
524            dlg.Destroy()
525    
526        def AddDBLayer(self):
527            """Add a layer read from a database"""
528            session = self.application.Session()
529            dlg = ChooseDBTableDialog(self, self.application.Session())
530    
531            if dlg.ShowModal() == wxID_OK:
532                dbconn, dbtable, id_column, geo_column = dlg.GetTable()
533                try:
534                    title = str(dbtable)
535    
536                    # Chose the correct Interface for the database type
537                    store = session.OpenDBShapeStore(dbconn, dbtable,
538                                                     id_column = id_column,
539                                                     geometry_column = geo_column)
540                    layer = Layer(title, store)
541                except:
542                    # Some error occured while initializing the layer
543                    self.RunMessageBox(_("Add Layer from database"),
544                                       _("Can't open the database table '%s'")
545                                       % dbtable)
546                    return
547    
548                map = self.canvas.Map()
549    
550                has_layers = map.HasLayers()
551                map.AddLayer(layer)
552                if not has_layers:
553                    self.canvas.FitMapToWindow()
554    
555          dlg.Destroy()          dlg.Destroy()
556    
557      def RemoveLayer(self):      def RemoveLayer(self):
# Line 398  class MainWindow(wxFrame): Line 562  class MainWindow(wxFrame):
562      def CanRemoveLayer(self):      def CanRemoveLayer(self):
563          """Return true if the currently selected layer can be deleted.          """Return true if the currently selected layer can be deleted.
564    
565          If no layer is selected return false.          If no layer is selected return False.
566    
567          The return value of this method determines whether the remove          The return value of this method determines whether the remove
568          layer command is sensitive in menu.          layer command is sensitive in menu.
# Line 406  class MainWindow(wxFrame): Line 570  class MainWindow(wxFrame):
570          layer = self.current_layer()          layer = self.current_layer()
571          if layer is not None:          if layer is not None:
572              return self.canvas.Map().CanRemoveLayer(layer)              return self.canvas.Map().CanRemoveLayer(layer)
573          return 0          return False
574    
575      def RaiseLayer(self):      def RaiseLayer(self):
576          layer = self.current_layer()          layer = self.current_layer()
# Line 423  class MainWindow(wxFrame): Line 587  class MainWindow(wxFrame):
587    
588          If no layer is selected, return None          If no layer is selected, return None
589          """          """
590          return self.interactor.SelectedLayer()          return self.canvas.SelectedLayer()
591    
592      def has_selected_layer(self):      def has_selected_layer(self):
593          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
594          return self.interactor.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
   
     def choose_color(self):  
         """Run the color selection dialog and return the selected color.  
595    
596          If the user cancels, return None.      def has_selected_shape_layer(self):
597          """          """Return true if a shape layer is currently selected"""
598          dlg = wxColourDialog(self)          return isinstance(self.current_layer(), Layer)
599          color = None  
600          if dlg.ShowModal() == wxID_OK:      def has_selected_shapes(self):
601              data = dlg.GetColourData()          """Return true if a shape is currently selected"""
602              wxc = data.GetColour()          return self.canvas.HasSelectedShapes()
             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.GetClassification().SetDefaultFill(color)  
603    
604      def LayerTransparentFill(self):      def HideLayer(self):
605          layer = self.current_layer()          layer = self.current_layer()
606          if layer is not None:          if layer is not None:
607              layer.GetClassification().SetDefaultFill(Color.None)              layer.SetVisible(0)
608    
609      def LayerOutlineColor(self):      def ShowLayer(self):
610          layer = self.current_layer()          layer = self.current_layer()
611          if layer is not None:          if layer is not None:
612              color = self.choose_color()              layer.SetVisible(1)
             if color is not None:  
                 layer.GetClassification().SetDefaultLineColor(color)  
613    
614      def LayerNoOutline(self):      def DuplicateLayer(self):
615            """Ceate a new layer above the selected layer with the same shapestore
616            """
617          layer = self.current_layer()          layer = self.current_layer()
618          if layer is not None:          if layer is not None and hasattr(layer, "ShapeStore"):
619              layer.GetClassification().SetDefaultLineColor(Color.None)              new_layer = Layer(_("Copy of `%s'") % layer.Title(),
620                                  layer.ShapeStore(),
621                                  projection = layer.GetProjection())
622                new_classification = copy.deepcopy(layer.GetClassification())
623                new_layer.SetClassification(new_classification)
624                self.Map().AddLayer(new_layer)
625    
626      def HideLayer(self):      def CanDuplicateLayer(self):
627          layer = self.current_layer()          """Return whether the DuplicateLayer method can create a duplicate"""
         if layer is not None:  
             layer.SetVisible(0)  
           
     def ShowLayer(self):  
628          layer = self.current_layer()          layer = self.current_layer()
629          if layer is not None:          return layer is not None and hasattr(layer, "ShapeStore")
             layer.SetVisible(1)  
630    
631      def LayerShowTable(self):      def LayerShowTable(self):
632          layer = self.current_layer()          layer = self.current_layer()
633          if layer is not None:          if layer is not None:
634              table = layer.table              table = layer.ShapeStore().Table()
635              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
636              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
637              if dialog is None:              if dialog is None:
638                  dialog = tableview.LayerTableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
639                                                     _("Table: %s") % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
640                                                     layer, table)                                           layer, table)
641                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
642                  dialog.Show(true)                  dialog.Show(True)
643              else:              else:
644                  # FIXME: bring dialog to front here                  dialog.Raise()
                 pass  
645    
646      def Projection(self):      def MapProjection(self):
647          map = self.canvas.Map()  
648          proj = map.projection          name = "map_projection"
649          if proj is None:          dialog = self.get_open_dialog(name)
650              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
651          else:          if dialog is None:
652              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              map = self.canvas.Map()
653                                                 map.BoundingBox())              dialog = projdialog.ProjFrame(self, name,
654          if proj4Dlg.ShowModal() == wxID_OK:                       _("Map Projection: %s") % map.Title(), map)
655              params = proj4Dlg.GetParams()              self.add_dialog(name, dialog)
656              if params is not None:              dialog.Show()
657                  proj = Projection(params)          dialog.Raise()
658              else:  
659                  proj = None      def LayerProjection(self):
660              map.SetProjection(proj)  
661          proj4Dlg.Destroy()          layer = self.current_layer()
662    
663            name = "layer_projection" + str(id(layer))
664            dialog = self.get_open_dialog(name)
665    
666            if dialog is None:
667                map = self.canvas.Map()
668                dialog = projdialog.ProjFrame(self, name,
669                         _("Layer Projection: %s") % layer.Title(), layer)
670                self.add_dialog(name, dialog)
671                dialog.Show()
672            dialog.Raise()
673    
674      def Classify(self):      def LayerEditProperties(self):
675    
676          #          #
677          # the menu option for this should only be available if there          # the menu option for this should only be available if there
# Line 521  class MainWindow(wxFrame): Line 680  class MainWindow(wxFrame):
680          #          #
681    
682          layer = self.current_layer()          layer = self.current_layer()
683          name = "classifier" + str(id(layer))          self.OpenLayerProperties(layer)
684    
685        def OpenLayerProperties(self, layer, group = None):
686            name = "layer_properties" + str(id(layer))
687          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
688    
689          if dialog is None:          if dialog is None:
690              dialog = classifier.Classifier(self, self.interactor,              dialog = Classifier(self, name, self.Map(), layer, group)
                                            name, self.current_layer())  
691              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
692              dialog.Show()              dialog.Show()
693            dialog.Raise()
694    
695        def LayerJoinTable(self):
696            layer = self.canvas.SelectedLayer()
697            if layer is not None:
698                dlg = JoinDialog(self, _("Join Layer with Table"),
699                                 self.application.session,
700                                 layer = layer)
701                dlg.ShowModal()
702    
703        def LayerUnjoinTable(self):
704            layer = self.canvas.SelectedLayer()
705            if layer is not None:
706                orig_store = layer.ShapeStore().OrigShapeStore()
707                if orig_store:
708                    layer.SetShapeStore(orig_store)
709    
710        def ShowLegend(self):
711            if not self.LegendShown():
712                self.ToggleLegend()
713    
714        def ToggleLegend(self):
715            """Show the legend if it's not shown otherwise hide it again"""
716            name = "legend"
717            dialog = self.FindRegisteredDock(name)
718    
719            if dialog is None:
720                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
721                legend.LegendPanel(dialog, None, self)
722                dialog.Dock()
723                dialog.GetPanel().SetMap(self.Map())
724                dialog.Show()
725            else:
726                dialog.Show(not dialog.IsShown())
727    
728        def LegendShown(self):
729            """Return true iff the legend is currently open"""
730            dialog = self.FindRegisteredDock("legend")
731            return dialog is not None and dialog.IsShown()
732    
733        def TableOpen(self):
734            dlg = wxFileDialog(self, _("Open Table"),
735                               self.application.Path("data"), "",
736                               _("DBF Files (*.dbf)") + "|*.dbf|" +
737                               #_("CSV Files (*.csv)") + "|*.csv|" +
738                               _("All Files (*.*)") + "|*.*",
739                               wxOPEN)
740            if dlg.ShowModal() == wxID_OK:
741                filename = dlg.GetPath()
742                dlg.Destroy()
743                try:
744                    table = self.application.session.OpenTableFile(filename)
745                except IOError:
746                    # the layer couldn't be opened
747                    self.RunMessageBox(_("Open Table"),
748                                       _("Can't open the file '%s'.") % filename)
749                else:
750                    self.ShowTableView(table)
751                    self.application.SetPath("data",filename)
752    
753        def TableClose(self):
754            tables = self.application.session.UnreferencedTables()
755    
756            lst = [(t.Title(), t) for t in tables]
757            lst.sort()
758            titles = [i[0] for i in lst]
759            dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
760                                         _("Close Table"), titles,
761                                         size = (400, 300),
762                                         style = wxDEFAULT_DIALOG_STYLE |
763                                                 wxRESIZE_BORDER)
764            if dlg.ShowModal() == wxID_OK:
765                for i in dlg.GetValue():
766                    self.application.session.RemoveTable(lst[i][1])
767    
768    
769        def TableShow(self):
770            """Offer a multi-selection dialog for tables to be displayed
771    
772            The windows for the selected tables are opened or brought to
773            the front.
774            """
775            tables = self.application.session.Tables()
776    
777            lst = [(t.Title(), t) for t in tables]
778            lst.sort()
779            titles = [i[0] for i in lst]
780            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
781                                         _("Show Table"), titles,
782                                         size = (400,300),
783                                         style = wxDEFAULT_DIALOG_STYLE |
784                                                 wxRESIZE_BORDER)
785            if (dlg.ShowModal() == wxID_OK):
786                for i in dlg.GetValue():
787                    # XXX: if the table belongs to a layer, open a
788                    # LayerTableFrame instead of QueryTableFrame
789                    self.ShowTableView(lst[i][1])
790    
791        def TableJoin(self):
792            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
793            dlg.ShowModal()
794    
795        def ShowTableView(self, table):
796            """Open a table view for the table and optionally"""
797            name = "table_view%d" % id(table)
798            dialog = self.get_open_dialog(name)
799            if dialog is None:
800                dialog = tableview.QueryTableFrame(self, name,
801                                                   _("Table: %s") % table.Title(),
802                                                   table)
803                self.add_dialog(name, dialog)
804                dialog.Show(True)
805            dialog.Raise()
806    
807        def TableRename(self):
808            """Let the user rename a table"""
809    
810            # First, let the user select a table
811            tables = self.application.session.Tables()
812            lst = [(t.Title(), t) for t in tables]
813            lst.sort()
814            titles = [i[0] for i in lst]
815            dlg = wxMultipleChoiceDialog(self, _("Pick the table to rename:"),
816                                         _("Rename Table"), titles,
817                                         size = (400,300),
818                                         style = wxDEFAULT_DIALOG_STYLE |
819                                                 wxRESIZE_BORDER)
820            if (dlg.ShowModal() == wxID_OK):
821                to_rename = [lst[i][1] for i in dlg.GetValue()]
822                dlg.Destroy()
823            else:
824                to_rename = []
825    
826            # Second, let the user rename the layers
827            for table in to_rename:
828                dlg = wxTextEntryDialog(self, _("Table Title:"), _("Rename Table"),
829                                        table.Title())
830                try:
831                    if dlg.ShowModal() == wxID_OK:
832                        title = dlg.GetValue()
833                        if title != "":
834                            table.SetTitle(title)
835    
836                            # Make sure the session is marked as modified.
837                            # FIXME: This should be handled automatically,
838                            # but that requires more changes to the tables
839                            # than I have time for currently.
840                            self.application.session.changed()
841                finally:
842                    dlg.Destroy()
843    
844    
845      def ZoomInTool(self):      def ZoomInTool(self):
846          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 549  class MainWindow(wxFrame): Line 861  class MainWindow(wxFrame):
861      def FullExtent(self):      def FullExtent(self):
862          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
863    
864        def FullLayerExtent(self):
865            self.canvas.FitLayerToWindow(self.current_layer())
866    
867        def FullSelectionExtent(self):
868            self.canvas.FitSelectedToWindow()
869    
870        def ExportMap(self):
871            self.canvas.Export()
872    
873      def PrintMap(self):      def PrintMap(self):
874          self.canvas.Print()          self.canvas.Print()
875    
876      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
877            dlg = wxTextEntryDialog(self, _("Map Title:"), _("Rename Map"),
878                                    self.Map().Title())
879            if dlg.ShowModal() == wxID_OK:
880                title = dlg.GetValue()
881                if title != "":
882                    self.Map().SetTitle(title)
883    
884            dlg.Destroy()
885    
886        def RenameLayer(self):
887            """Let the user rename the currently selected layer"""
888            layer = self.current_layer()
889            if layer is not None:
890                dlg = wxTextEntryDialog(self, _("Layer Title:"), _("Rename Layer"),
891                                        layer.Title())
892                try:
893                    if dlg.ShowModal() == wxID_OK:
894                        title = dlg.GetValue()
895                        if title != "":
896                            layer.SetTitle(title)
897                finally:
898                    dlg.Destroy()
899    
900        def identify_view_on_demand(self, layer, shapes):
901            """Subscribed to the canvas' SHAPES_SELECTED message
902    
903            If the current tool is the identify tool, at least one shape is
904            selected and the identify dialog is not shown, show the dialog.
905            """
906            # If the selection has become empty we don't need to do
907            # anything. Otherwise it could happen that the dialog was popped
908            # up when the selection became empty, e.g. when a new selection
909            # is opened while the identify tool is active and dialog had
910            # been closed
911            if not shapes:
912                return
913    
914          name = "identify_view"          name = "identify_view"
915          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
916              if not self.dialog_open(name):              if not self.dialog_open(name):
917                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
918                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
919                  dialog.Show(true)                  dialog.Show(True)
920              else:              else:
921                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
922                  pass                  pass
923    
924        def title_changed(self, map):
925            """Subscribed to the canvas' TITLE_CHANGED messages"""
926            self.update_title()
927    
928        def update_title(self):
929            """Update the window's title according to it's current state.
930    
931            In this default implementation the title is 'Thuban - ' followed
932            by the map's title or simply 'Thuban' if there is not map.
933            Derived classes should override this method to get different
934            titles.
935    
936            This method is called automatically by other methods when the
937            title may have to change. For the methods implemented in this
938            class this usually only means that a different map has been set
939            or the current map's title has changed.
940            """
941            map = self.Map()
942            if map is not None:
943                title = _("Thuban - %s") % (map.Title(),)
944            else:
945                title = _("Thuban")
946            self.SetTitle(title)
947    
948    
949  #  #
950  # Define all the commands available in the main window  # Define all the commands available in the main window
951  #  #
# Line 574  def call_method(context, methodname, *ar Line 957  def call_method(context, methodname, *ar
957      apply(getattr(context.mainwindow, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
958    
959  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
960                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
961      """Add a command implemented by a method of the mainwindow object"""      """Add a command implemented by a method of the mainwindow object"""
962      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
963                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
964                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
965    
966  def make_check_current_tool(toolname):  def make_check_current_tool(toolname):
967      """Return a function that tests if the currently active tool is toolname      """Return a function that tests if the currently active tool is toolname
# Line 603  def _has_selected_layer(context): Line 986  def _has_selected_layer(context):
986      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
987      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
988    
989    def _has_selected_shape_layer(context):
990        """Return true if a shape layer is selected in the context"""
991        return context.mainwindow.has_selected_shape_layer()
992    
993    def _has_selected_shapes(context):
994        """Return true if a layer is selected in the context"""
995        return context.mainwindow.has_selected_shapes()
996    
997  def _can_remove_layer(context):  def _can_remove_layer(context):
998      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
999    
1000  def _has_tree_window_shown(context):  def _has_tree_window_shown(context):
1001      """Return true if the tree window is shown"""      """Return true if the tree window is shown"""
1002      return context.mainwindow.get_open_dialog("session_tree") is None      return context.mainwindow.SessionTreeShown()
1003    
1004  def _has_visible_map(context):  def _has_visible_map(context):
1005      """Return true iff theres a visible map in the mainwindow.      """Return true iff theres a visible map in the mainwindow.
# Line 621  def _has_visible_map(context): Line 1012  def _has_visible_map(context):
1012                  return 1                  return 1
1013      return 0      return 0
1014    
1015    def _has_legend_shown(context):
1016        """Return true if the legend window is shown"""
1017        return context.mainwindow.LegendShown()
1018    
1019    def _has_gdal_support(context):
1020        """Return True if the GDAL is available"""
1021        return Thuban.Model.resource.has_gdal_support()
1022    
1023    def _has_dbconnections(context):
1024        """Return whether the the session has database connections"""
1025        return context.session.HasDBConnections()
1026    
1027    def _has_postgis_support(context):
1028        return has_postgis_support()
1029    
1030    
1031  # File menu  # File menu
1032  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession",
1033  _method_command("open_session", _("&Open Session"), "OpenSession")                  helptext = _("Start a new session"))
1034  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("open_session", _("&Open Session..."), "OpenSession",
1035  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")                  helptext = _("Open a session file"))
1036  _method_command("show_session_tree", _("Show Session &Tree"), "ShowSessionTree",  _method_command("save_session", _("&Save Session"), "SaveSession",
1037                  sensitive = _has_tree_window_shown)                  helptext =_("Save this session to the file it was opened from"))
1038  _method_command("exit", _("E&xit"), "Exit")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs",
1039                    helptext = _("Save this session to a new file"))
1040    _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
1041                    checked = _has_tree_window_shown,
1042                    helptext = _("Toggle on/off the session tree analysis window"))
1043    _method_command("toggle_legend", _("Legend"), "ToggleLegend",
1044                    checked = _has_legend_shown,
1045                    helptext = _("Toggle Legend on/off"))
1046    _method_command("database_management", _("&Database Connections..."),
1047                    "DatabaseManagement",
1048                    sensitive = _has_postgis_support)
1049    _method_command("exit", _("E&xit"), "Exit",
1050                    helptext = _("Finish working with Thuban"))
1051    
1052  # Help menu  # Help menu
1053  _method_command("help_about", _("&About"), "About")  _method_command("help_about", _("&About..."), "About",
1054                    helptext = _("Info about Thuban authors, version and modules"))
1055    
1056    
1057  # Map menu  # Map menu
1058  _method_command("map_projection", _("Pro&jection"), "Projection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection",
1059                    helptext = _("Set or change the map projection"))
1060    
1061  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
1062                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 655  _tool_command("map_label_tool", _("&Labe Line 1075  _tool_command("map_label_tool", _("&Labe
1075                helptext = _("Add/Remove labels"), icon = "label",                helptext = _("Add/Remove labels"), icon = "label",
1076                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1077  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
1078                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Zoom to the full map extent"), icon = "fullextent",
1079                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1080    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
1081                    helptext = _("Zoom to the full layer extent"),
1082                    icon = "fulllayerextent", sensitive = _has_selected_layer)
1083    _method_command("selected_full_extent", _("&Full selection extent"),
1084                    "FullSelectionExtent",
1085                    helptext = _("Zoom to the full selection extent"),
1086                    icon = "fullselextent", sensitive = _has_selected_shapes)
1087    _method_command("map_export", _("E&xport"), "ExportMap",
1088                    helptext = _("Export the map to file"))
1089  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
1090                  helptext = _("Print the map"))                  helptext = _("Print the map"))
1091    _method_command("map_rename", _("&Rename..."), "RenameMap",
1092  # Layer menu                  helptext = _("Rename the map"))
1093  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
1094                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to the map"))
1095    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
1096                    helptext = _("Add a new image layer to the map"),
1097                    sensitive = _has_gdal_support)
1098    _method_command("layer_add_db", _("Add &Database Layer..."), "AddDBLayer",
1099                    helptext = _("Add a new database layer to active map"),
1100                    sensitive = _has_dbconnections)
1101  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
1102                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer"),
1103                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
1104  _method_command("layer_fill_color", _("&Fill Color"), "LayerFillColor",  
1105                  helptext = _("Set the fill color of selected layer(s)"),  # Layer menu
1106                  sensitive = _has_selected_layer)  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
1107  _method_command("layer_transparent_fill", _("&Transparent Fill"),                  sensitive = _has_selected_layer,
1108                  "LayerTransparentFill",                  helptext = _("Specify projection for selected layer"))
1109                  helptext = _("Do not fill the selected layer(s)"),  _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",
1110                  sensitive = _has_selected_layer)                  helptext = _("Duplicate selected layer"),
1111  _method_command("layer_outline_color", _("&Outline Color"), "LayerOutlineColor",            sensitive = lambda context: context.mainwindow.CanDuplicateLayer())
1112                  helptext = _("Set the outline color of selected layer(s)"),  _method_command("layer_rename", _("Re&name ..."), "RenameLayer",
1113                  sensitive = _has_selected_layer)                  helptext = _("Rename selected layer"),
 _method_command("layer_no_outline", _("&No Outline"), "LayerNoOutline",  
                 helptext= _("Do not draw the outline of the selected layer(s)"),  
1114                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1115  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
1116                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer"),
1117                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1118  _method_command("layer_lower", _("&Lower"), "LowerLayer",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
1119                  helptext = _("Lower selected layer(s)"),                  helptext = _("Lower selected layer"),
1120                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1121  _method_command("layer_show", _("&Show"), "ShowLayer",  _method_command("layer_show", _("&Show"), "ShowLayer",
1122                  helptext = _("Make selected layer(s) visible"),                  helptext = _("Make selected layer visible"),
1123                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1124  _method_command("layer_hide", _("&Hide"), "HideLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
1125                  helptext = _("Make selected layer(s) unvisible"),                  helptext = _("Make selected layer unvisible"),
1126                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1127  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
1128                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
1129                  sensitive = _has_selected_layer)                  sensitive = _has_selected_shape_layer)
1130    _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
1131                    sensitive = _has_selected_layer,
1132                    helptext = _("Edit the properties of the selected layer"))
1133    _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
1134                    sensitive = _has_selected_shape_layer,
1135                    helptext = _("Join and attach a table to the selected layer"))
1136    
1137  _method_command("layer_classifier", _("Classify"), "Classify",  def _can_unjoin(context):
1138                  sensitive = _has_selected_layer)      """Return whether the Layer/Unjoin command can be executed.
1139    
1140  # the menu structure      This is the case if a layer is selected and that layer has a
1141  main_menu = Menu("<main>", "<main>",      shapestore that has an original shapestore.
1142                   [Menu("file", _("&File"),      """
1143                         ["new_session", "open_session", None,      layer = context.mainwindow.SelectedLayer()
1144                          "save_session", "save_session_as", None,      if layer is None:
1145                          "show_session_tree", None,          return 0
1146                          "exit"]),      getstore = getattr(layer, "ShapeStore", None)
1147                    Menu("map", _("&Map"),      if getstore is not None:
1148                         ["layer_add", "layer_remove",          return getstore().OrigShapeStore() is not None
1149        else:
1150            return 0
1151    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
1152                    sensitive = _can_unjoin,
1153                    helptext = _("Undo the last join operation"))
1154    
1155    
1156    def _has_tables(context):
1157        return bool(context.session.Tables())
1158    
1159    # Table menu
1160    _method_command("table_open", _("&Open..."), "TableOpen",
1161                    helptext = _("Open a DBF-table from a file"))
1162    _method_command("table_close", _("&Close..."), "TableClose",
1163           sensitive = lambda context: bool(context.session.UnreferencedTables()),
1164                    helptext = _("Close one or more tables from a list"))
1165    _method_command("table_rename", _("&Rename..."), "TableRename",
1166                    sensitive = _has_tables,
1167                    helptext = _("Rename one or more tables"))
1168    _method_command("table_show", _("&Show..."), "TableShow",
1169                    sensitive = _has_tables,
1170                    helptext = _("Show one or more tables in a dialog"))
1171    _method_command("table_join", _("&Join..."), "TableJoin",
1172                    sensitive = _has_tables,
1173                    helptext = _("Join two tables creating a new one"))
1174    
1175    #  Export only under Windows ...
1176    map_menu = ["layer_add", "layer_add_db", "rasterlayer_add", "layer_remove",
1177                          None,                          None,
1178                            "map_rename",
1179                          "map_projection",                          "map_projection",
1180                          None,                          None,
1181                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
1182                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
                         None,  
1183                          "map_full_extent",                          "map_full_extent",
1184                            "layer_full_extent",
1185                            "selected_full_extent",
1186                            None,
1187                            "map_identify_tool", "map_label_tool",
1188                          None,                          None,
1189                          "map_print"]),                          "toggle_legend",
1190                            None]
1191    if wxPlatform == '__WXMSW__':
1192        map_menu.append("map_export")
1193    map_menu.append("map_print")
1194    
1195    # the menu structure
1196    main_menu = Menu("<main>", "<main>",
1197                     [Menu("file", _("&File"),
1198                           ["new_session", "open_session", None,
1199                            "save_session", "save_session_as", None,
1200                            "database_management", None,
1201                            "toggle_session_tree", None,
1202                            "exit"]),
1203                      Menu("map", _("&Map"), map_menu),
1204                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
1205                         ["layer_fill_color", "layer_transparent_fill",                         ["layer_rename", "layer_duplicate",
                         "layer_outline_color", "layer_no_outline",  
1206                          None,                          None,
1207                          "layer_raise", "layer_lower",                          "layer_raise", "layer_lower",
1208                          None,                          None,
1209                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
1210                          None,                          None,
1211                            "layer_projection",
1212                            None,
1213                          "layer_show_table",                          "layer_show_table",
1214                            "layer_jointable",
1215                            "layer_unjointable",
1216                          None,                          None,
1217                          "layer_classifier"]),                          "layer_properties"]),
1218                      Menu("table", _("&Table"),
1219                           ["table_open", "table_close", "table_rename",
1220                           None,
1221                           "table_show",
1222                           None,
1223                           "table_join"]),
1224                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
1225                         ["help_about"])])                         ["help_about"])])
1226    
# Line 734  main_menu = Menu("<main>", "<main>", Line 1228  main_menu = Menu("<main>", "<main>",
1228    
1229  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
1230                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
1231                       "map_full_extent", None,                       "map_full_extent",
1232                         "layer_full_extent",
1233                         "selected_full_extent",
1234                         None,
1235                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
1236    

Legend:
Removed from v.502  
changed lines
  Added in v.2163

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26