/[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 729 by jonathan, Thu Apr 24 16:06:51 2003 UTC revision 1001 by frank, Thu May 22 19:40:27 2003 UTC
# Line 2  Line 2 
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 18  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$ Line 19  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$
19  import os  import os
20    
21  from wxPython.wx import *  from wxPython.wx import *
22    from wxPython.wx import __version__ as wxPython_version
23    
24  import Thuban  import Thuban
25    import Thuban.version
26    
27  from Thuban import _  from Thuban import _
28  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
29  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
30  from Thuban.Model.color import Color  from Thuban.Model.color import Color
31  from Thuban.Model.proj import Projection  from Thuban.Model.proj import Projection
32    
# Line 39  from command import registry, Command, T Line 43  from command import registry, Command, T
43  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
44    
45  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
46    from Thuban.UI.join import JoinDialog
47    
48  import resource  import resource
49    
# Line 60  class MainWindow(DockFrame): Line 65  class MainWindow(DockFrame):
65      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
66      delegated_methods = {"SelectLayer": "canvas",      delegated_methods = {"SelectLayer": "canvas",
67                           "SelectShapes": "canvas",                           "SelectShapes": "canvas",
68                             "SelectedShapes": "canvas",
69                           }                           }
70    
71      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
# Line 98  class MainWindow(DockFrame): Line 104  class MainWindow(DockFrame):
104    
105          self.init_dialogs()          self.init_dialogs()
106    
107          EVT_CLOSE(self, self._OnClose)          EVT_CLOSE(self, self.OnClose)
108    
109      def Subscribe(self, channel, *args):      def Subscribe(self, channel, *args):
110          """Subscribe a function to a message channel.          """Subscribe a function to a message channel.
# Line 357  class MainWindow(DockFrame): Line 363  class MainWindow(DockFrame):
363                  d.Close()                  d.Close()
364    
365      def NewSession(self):      def NewSession(self):
366          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
367          self.prepare_new_session()              self.prepare_new_session()
368          self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
369    
370      def OpenSession(self):      def OpenSession(self):
371          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
372          dlg = wxFileDialog(self, _("Open Session"), ".", "", "*.thuban", wxOPEN)              dlg = wxFileDialog(self, _("Open Session"), ".", "",
373          if dlg.ShowModal() == wxID_OK:                                 "Thuban Session File (*.thuban)|*.thuban",
374              self.prepare_new_session()                                 wxOPEN)
375              self.application.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
376          dlg.Destroy()                  self.prepare_new_session()
377                    self.application.OpenSession(dlg.GetPath())
378                dlg.Destroy()
379    
380      def SaveSession(self):      def SaveSession(self):
381          if self.application.session.filename == None:          if self.application.session.filename == None:
# Line 377  class MainWindow(DockFrame): Line 385  class MainWindow(DockFrame):
385    
386      def SaveSessionAs(self):      def SaveSessionAs(self):
387          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
388                             "*.thuban", wxOPEN)                             "Thuban Session File (*.thuban)|*.thuban",
389                               wxSAVE|wxOVERWRITE_PROMPT)
390          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
391              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
392              self.application.SaveSession()              self.application.SaveSession()
# Line 386  class MainWindow(DockFrame): Line 395  class MainWindow(DockFrame):
395      def Exit(self):      def Exit(self):
396          self.Close(False)          self.Close(False)
397    
398      def _OnClose(self, event):      def OnClose(self, event):
399          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
400          if result == wxID_CANCEL:          if result == wxID_CANCEL:
401              event.Veto()              event.Veto()
# Line 395  class MainWindow(DockFrame): Line 404  class MainWindow(DockFrame):
404              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
405              # yet.              # yet.
406              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
407              DockFrame._OnClose(self, event)              DockFrame.OnClose(self, event)
408              self.Destroy()              self.Destroy()
409    
410      def SetMap(self, map):      def SetMap(self, map):
411          self.canvas.SetMap(map)          self.canvas.SetMap(map)
412          self.__SetTitle(map.Title())          self.__SetTitle(map.Title())
413          #self.legendPanel.SetMap(map)  
414            dialog = self.FindRegisteredDock("legend")
415            if dialog is not None:
416                dialog.GetPanel().SetMap(self.Map())
417    
418      def Map(self):      def Map(self):
419          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
420    
         # sanity check  
         #assert(self.canvas.Map() is self.legendPanel.GetMap())  
   
421          return self.canvas.Map()          return self.canvas.Map()
422    
423      def ToggleSessionTree(self):      def ToggleSessionTree(self):
# Line 428  class MainWindow(DockFrame): Line 437  class MainWindow(DockFrame):
437    
438      def About(self):      def About(self):
439          self.RunMessageBox(_("About"),          self.RunMessageBox(_("About"),
440                             _("Thuban v%s\n"                             _("Thuban %s\n"
441                              #"Build Date: %s\n"                              #"Build Date: %s\n"
442                              "\n"                              "using:\n"
443                                "  %s\n"
444                                "  %s\n\n"
445                              "Thuban is a program for\n"                              "Thuban is a program for\n"
446                              "exploring geographic data.\n"                              "exploring geographic data.\n"
447                              "Copyright (C) 2001-2003 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
448                              "Thuban is licensed under the GNU GPL"                              "Thuban is licensed under the GNU GPL"
449                             % __ThubanVersion__), #__BuildDate__)),                              % (Thuban.version.longversion,
450                                   "wxPython %s" % wxPython_version,
451                                   "Python %d.%d.%d" % sys.version_info[:3]
452                                  )),
453    #                           % __ThubanVersion__), #__BuildDate__)),
454                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
455    
456      def AddLayer(self):      def AddLayer(self):
# Line 444  class MainWindow(DockFrame): Line 459  class MainWindow(DockFrame):
459          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
460              filename = dlg.GetPath()              filename = dlg.GetPath()
461              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             store = self.application.Session().OpenShapefile(filename)  
             layer = Layer(title, store)  
462              map = self.canvas.Map()              map = self.canvas.Map()
463              has_layers = map.HasLayers()              has_layers = map.HasLayers()
464              try:              try:
465                  map.AddLayer(layer)                  store = self.application.Session().OpenShapefile(filename)
466              except IOError:              except IOError:
467                  # the layer couldn't be opened                  # the layer couldn't be opened
468                  self.RunMessageBox(_("Add Layer"),                  self.RunMessageBox(_("Add Layer"),
469                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
470              else:              else:
471                    layer = Layer(title, store)
472                    map.AddLayer(layer)
473                    if not has_layers:
474                        # if we're adding a layer to an empty map, fit the
475                        # new map to the window
476                        self.canvas.FitMapToWindow()
477            dlg.Destroy()
478    
479        def AddRasterLayer(self):
480            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
481                               wxOPEN)
482            if dlg.ShowModal() == wxID_OK:
483                filename = dlg.GetPath()
484                title = os.path.splitext(os.path.basename(filename))[0]
485                map = self.canvas.Map()
486                has_layers = map.HasLayers()
487                try:
488                    layer = RasterLayer(title, filename)
489                except IOError:
490                    # the layer couldn't be opened
491                    self.RunMessageBox(_("Add Image Layer"),
492                                       _("Can't open the file '%s'.") % filename)
493                else:
494                    map.AddLayer(layer)
495                  if not has_layers:                  if not has_layers:
496                      # if we're adding a layer to an empty map, fit the                      # if we're adding a layer to an empty map, fit the
497                      # new map to the window                      # new map to the window
# Line 500  class MainWindow(DockFrame): Line 537  class MainWindow(DockFrame):
537          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
538          return self.canvas.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
539    
540      def choose_color(self):      def has_selected_shapes(self):
541          """Run the color selection dialog and return the selected color.          """Return true if a shape is currently selected"""
542            return self.canvas.HasSelectedShapes()
         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  
543    
544      def HideLayer(self):      def HideLayer(self):
545          layer = self.current_layer()          layer = self.current_layer()
# Line 549  class MainWindow(DockFrame): Line 574  class MainWindow(DockFrame):
574    
575          if dialog is None:          if dialog is None:
576              map = self.canvas.Map()              map = self.canvas.Map()
577              dialog = projdialog.ProjFrame(self, name, map)              dialog = projdialog.ProjFrame(self, name,
578                         _("Map Projection: %s") % map.Title(), map)
579              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
580              dialog.Show()              dialog.Show()
581          dialog.Raise()          dialog.Raise()
# Line 563  class MainWindow(DockFrame): Line 589  class MainWindow(DockFrame):
589    
590          if dialog is None:          if dialog is None:
591              map = self.canvas.Map()              map = self.canvas.Map()
592              dialog = projdialog.ProjFrame(self, name, layer)              dialog = projdialog.ProjFrame(self, name,
593                         _("Layer Projection: %s") % layer.Title(), layer)
594              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
595              dialog.Show()              dialog.Show()
596          dialog.Raise()          dialog.Raise()
# Line 589  class MainWindow(DockFrame): Line 616  class MainWindow(DockFrame):
616              dialog.Show()              dialog.Show()
617          dialog.Raise()          dialog.Raise()
618    
619        def LayerJoinTable(self):
620            print "LayerJoinTable"
621    
622        def LayerUnjoinTable(self):
623            print "LayerUnjoinTable"
624    
625      def ShowLegend(self):      def ShowLegend(self):
626          if not self.LegendShown():          if not self.LegendShown():
# Line 613  class MainWindow(DockFrame): Line 645  class MainWindow(DockFrame):
645          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
646          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
647    
648        def TableOpen(self):
649            print "TableOpen"
650            dlg = wxFileDialog(self, _("Open Table"), ".", "",
651                               "DBF Files (*.dbf)|*.dbf|" +
652                               "CSV Files (*.csv)|*.csv|" +
653                               "All Files (*.*)|*.*",
654                               wxOPEN)
655            if dlg.ShowModal() == wxID_OK:
656                #self.application.session.OpenTable(dlg.GetPath())
657                pass
658    
659            dlg.Destroy()
660    
661        def TableClose(self):
662            print "TableClose"
663    
664        def TableShow(self):
665            print "TableShow"
666    
667        def TableHide(self):
668            print "TableHide"
669    
670        def TableJoin(self):
671            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
672            dlg.ShowModal()
673    
674      def ZoomInTool(self):      def ZoomInTool(self):
675          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
676    
# Line 632  class MainWindow(DockFrame): Line 690  class MainWindow(DockFrame):
690      def FullExtent(self):      def FullExtent(self):
691          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
692    
693        def FullLayerExtent(self):
694            self.canvas.FitLayerToWindow(self.current_layer())
695    
696        def FullSelectionExtent(self):
697            self.canvas.FitSelectedToWindow()
698    
699        def ExportMap(self):
700            self.canvas.Export()
701    
702      def PrintMap(self):      def PrintMap(self):
703          self.canvas.Print()          self.canvas.Print()
704    
# Line 647  class MainWindow(DockFrame): Line 714  class MainWindow(DockFrame):
714          dlg.Destroy()          dlg.Destroy()
715    
716      def identify_view_on_demand(self, layer, shapes):      def identify_view_on_demand(self, layer, shapes):
717            """Subscribed to the canvas' SHAPES_SELECTED message
718    
719            If the current tool is the identify tool, at least one shape is
720            selected and the identify dialog is not shown, show the dialog.
721            """
722            # If the selection has become empty we don't need to do
723            # anything. Otherwise it could happen that the dialog was popped
724            # up when the selection became empty, e.g. when a new selection
725            # is opened while the identify tool is active and dialog had
726            # been closed
727            if not shapes:
728                return
729    
730          name = "identify_view"          name = "identify_view"
731          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
732              if not self.dialog_open(name):              if not self.dialog_open(name):
# Line 700  def _has_selected_layer(context): Line 780  def _has_selected_layer(context):
780      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
781      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
782    
783    def _has_selected_shapes(context):
784        """Return true if a layer is selected in the context"""
785        return context.mainwindow.has_selected_shapes()
786    
787  def _can_remove_layer(context):  def _can_remove_layer(context):
788      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
789    
# Line 725  def _has_legend_shown(context): Line 809  def _has_legend_shown(context):
809    
810  # File menu  # File menu
811  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
812  _method_command("open_session", _("&Open Session"), "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
813  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
814  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
815  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
816                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown)
817  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
# Line 735  _method_command("toggle_legend", _("Lege Line 819  _method_command("toggle_legend", _("Lege
819  _method_command("exit", _("E&xit"), "Exit")  _method_command("exit", _("E&xit"), "Exit")
820    
821  # Help menu  # Help menu
822  _method_command("help_about", _("&About"), "About")  _method_command("help_about", _("&About..."), "About")
823    
824    
825  # Map menu  # Map menu
826  _method_command("map_projection", _("Pro&jection"), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
827    
828  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
829                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 760  _tool_command("map_label_tool", _("&Labe Line 844  _tool_command("map_label_tool", _("&Labe
844  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
845                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Full Extent"), icon = "fullextent",
846                sensitive = _has_visible_map)                sensitive = _has_visible_map)
847    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
848                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
849                  sensitive = _has_selected_layer)
850    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
851                   helptext = _("Full Selection Extent"), icon = "fullselextent",
852                  sensitive = _has_selected_shapes)
853    _method_command("map_export", _("E&xport"), "ExportMap",
854                        helptext = _("Export the map to file"))
855  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
856                  helptext = _("Print the map"))                  helptext = _("Print the map"))
857  _method_command("map_rename", _("&Rename"), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
858                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
859  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
860                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to active map"))
861    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
862                    helptext = _("Add a new image layer to active map"))
863  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
864                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer(s)"),
865                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
866    
867  # Layer menu  # Layer menu
868  _method_command("layer_projection", _("Pro&jection"), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
869                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
870  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
871                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer(s)"),
# Line 788  _method_command("layer_hide", _("&Hide") Line 882  _method_command("layer_hide", _("&Hide")
882  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
883                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
884                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
885  _method_command("layer_properties", _("Properties"), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
886                    sensitive = _has_selected_layer)
887    _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
888                    sensitive = _has_selected_layer)
889    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
890                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
891    
892  # the menu structure  # Table menu
893  main_menu = Menu("<main>", "<main>",  _method_command("table_open", _("&Open..."), "TableOpen")
894                   [Menu("file", _("&File"),  _method_command("table_close", _("&Close"), "TableClose")
895                         ["new_session", "open_session", None,  _method_command("table_show", _("&Show"), "TableShow")
896                          "save_session", "save_session_as", None,  _method_command("table_hide", _("&Hide"), "TableHide")
897                          "toggle_session_tree", None,  _method_command("table_join", _("&Join..."), "TableJoin")
898                          "exit"]),  
899                    Menu("map", _("&Map"),  #  Export only under Windows ...
900                         ["layer_add", "layer_remove",  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
901                          None,                          None,
902                          "map_projection",                          "map_projection",
903                          None,                          None,
904                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
905                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
906                            "map_full_extent",
907                            "layer_full_extent",
908                            "selected_full_extent",
909                          None,                          None,
910                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
911                          None,                          None,
912                          "toggle_legend",                          "toggle_legend",
913                          None,                          None]
914                          "map_print",  if wxPlatform == '__WXMSW__':
915                          None,      map_menu.append("map_export")
916                          "map_rename"]),  map_menu.append("map_print")
917    
918    # the menu structure
919    main_menu = Menu("<main>", "<main>",
920                     [Menu("file", _("&File"),
921                           ["new_session", "open_session", None,
922                            "save_session", "save_session_as", None,
923                            "toggle_session_tree", None,
924                            "exit"]),
925                      Menu("map", _("&Map"), map_menu),
926                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
927                          ["layer_raise", "layer_lower",                          ["layer_raise", "layer_lower",
928                          None,                          None,
929                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
930                          None,                          None,
931                          "layer_show_table",                          "layer_projection",
932                          None,                          None,
933                          "layer_properties",                          "layer_show_table",
934                            "layer_jointable",
935                            "layer_unjointable",
936                          None,                          None,
937                          "layer_projection"]),                          "layer_properties"]),
938                      Menu("table", _("&Table"),
939                           ["table_open", "table_close",
940                           None,
941                           "table_show", "table_hide",
942                           None,
943                           "table_join"]),
944                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
945                         ["help_about"])])                         ["help_about"])])
946    
# Line 830  main_menu = Menu("<main>", "<main>", Line 948  main_menu = Menu("<main>", "<main>",
948    
949  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
950                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
951                       "map_full_extent", None,                       "map_full_extent",
952                         "layer_full_extent",
953                         "selected_full_extent",
954                         None,
955                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])

Legend:
Removed from v.729  
changed lines
  Added in v.1001

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26