/[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 750 by jonathan, Fri Apr 25 14:22:52 2003 UTC revision 1056 by frank, Tue May 27 11:29:46 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    from wxPython.lib.dialogs import wxMultipleChoiceDialog
25    
26  import Thuban  import Thuban
27    import Thuban.version
28    
29  from Thuban import _  from Thuban import _
30  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
31  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
32  from Thuban.Model.color import Color  from Thuban.Model.color import Color
33  from Thuban.Model.proj import Projection  from Thuban.Model.proj import Projection
34    
# Line 39  from command import registry, Command, T Line 45  from command import registry, Command, T
45  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
46    
47  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
48    from Thuban.UI.join import JoinDialog
49    
50  import resource  import resource
51    
# Line 60  class MainWindow(DockFrame): Line 67  class MainWindow(DockFrame):
67      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
68      delegated_methods = {"SelectLayer": "canvas",      delegated_methods = {"SelectLayer": "canvas",
69                           "SelectShapes": "canvas",                           "SelectShapes": "canvas",
70                             "SelectedShapes": "canvas",
71                           }                           }
72    
73      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
# Line 98  class MainWindow(DockFrame): Line 106  class MainWindow(DockFrame):
106    
107          self.init_dialogs()          self.init_dialogs()
108    
109          EVT_CLOSE(self, self._OnClose)          EVT_CLOSE(self, self.OnClose)
110    
111      def Subscribe(self, channel, *args):      def Subscribe(self, channel, *args):
112          """Subscribe a function to a message channel.          """Subscribe a function to a message channel.
# Line 357  class MainWindow(DockFrame): Line 365  class MainWindow(DockFrame):
365                  d.Close()                  d.Close()
366    
367      def NewSession(self):      def NewSession(self):
368          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
369          self.prepare_new_session()              self.prepare_new_session()
370          self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
371    
372      def OpenSession(self):      def OpenSession(self):
373          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
374          dlg = wxFileDialog(self, _("Open Session"), ".", "", "*.thuban", wxOPEN)              dlg = wxFileDialog(self, _("Open Session"), ".", "",
375          if dlg.ShowModal() == wxID_OK:                                 "Thuban Session File (*.thuban)|*.thuban",
376              self.prepare_new_session()                                 wxOPEN)
377              self.application.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
378          dlg.Destroy()                  self.prepare_new_session()
379                    self.application.OpenSession(dlg.GetPath())
380                dlg.Destroy()
381    
382      def SaveSession(self):      def SaveSession(self):
383          if self.application.session.filename == None:          if self.application.session.filename == None:
# Line 377  class MainWindow(DockFrame): Line 387  class MainWindow(DockFrame):
387    
388      def SaveSessionAs(self):      def SaveSessionAs(self):
389          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
390                             "*.thuban", wxOPEN)                             "Thuban Session File (*.thuban)|*.thuban",
391                               wxSAVE|wxOVERWRITE_PROMPT)
392          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
393              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
394              self.application.SaveSession()              self.application.SaveSession()
# Line 386  class MainWindow(DockFrame): Line 397  class MainWindow(DockFrame):
397      def Exit(self):      def Exit(self):
398          self.Close(False)          self.Close(False)
399    
400      def _OnClose(self, event):      def OnClose(self, event):
401          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
402          if result == wxID_CANCEL:          if result == wxID_CANCEL:
403              event.Veto()              event.Veto()
# Line 395  class MainWindow(DockFrame): Line 406  class MainWindow(DockFrame):
406              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
407              # yet.              # yet.
408              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
409              DockFrame._OnClose(self, event)              DockFrame.OnClose(self, event)
410                for dlg in self.dialogs.values():
411                    dlg.Destroy()
412                self.canvas.Destroy()
413              self.Destroy()              self.Destroy()
414    
415      def SetMap(self, map):      def SetMap(self, map):
416          self.canvas.SetMap(map)          self.canvas.SetMap(map)
417          self.__SetTitle(map.Title())          self.__SetTitle(map.Title())
418          #self.legendPanel.SetMap(map)  
419            dialog = self.FindRegisteredDock("legend")
420            if dialog is not None:
421                dialog.GetPanel().SetMap(self.Map())
422    
423      def Map(self):      def Map(self):
424          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
425    
         # sanity check  
         #assert(self.canvas.Map() is self.legendPanel.GetMap())  
   
426          return self.canvas.Map()          return self.canvas.Map()
427    
428      def ToggleSessionTree(self):      def ToggleSessionTree(self):
# Line 428  class MainWindow(DockFrame): Line 442  class MainWindow(DockFrame):
442    
443      def About(self):      def About(self):
444          self.RunMessageBox(_("About"),          self.RunMessageBox(_("About"),
445                             _("Thuban v%s\n"                             _("Thuban %s\n"
446                              #"Build Date: %s\n"                              #"Build Date: %s\n"
447                              "\n"                              "using:\n"
448                                "  %s\n"
449                                "  %s\n\n"
450                              "Thuban is a program for\n"                              "Thuban is a program for\n"
451                              "exploring geographic data.\n"                              "exploring geographic data.\n"
452                              "Copyright (C) 2001-2003 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
453                              "Thuban is licensed under the GNU GPL"                              "Thuban is licensed under the GNU GPL"
454                             % __ThubanVersion__), #__BuildDate__)),                              % (Thuban.version.longversion,
455                                   "wxPython %s" % wxPython_version,
456                                   "Python %d.%d.%d" % sys.version_info[:3]
457                                  )),
458    #                           % __ThubanVersion__), #__BuildDate__)),
459                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
460    
461      def AddLayer(self):      def AddLayer(self):
# Line 444  class MainWindow(DockFrame): Line 464  class MainWindow(DockFrame):
464          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
465              filename = dlg.GetPath()              filename = dlg.GetPath()
466              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)  
467              map = self.canvas.Map()              map = self.canvas.Map()
468              has_layers = map.HasLayers()              has_layers = map.HasLayers()
469              try:              try:
470                  map.AddLayer(layer)                  store = self.application.Session().OpenShapefile(filename)
471              except IOError:              except IOError:
472                  # the layer couldn't be opened                  # the layer couldn't be opened
473                  self.RunMessageBox(_("Add Layer"),                  self.RunMessageBox(_("Add Layer"),
474                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
475              else:              else:
476                    layer = Layer(title, store)
477                    map.AddLayer(layer)
478                    if not has_layers:
479                        # if we're adding a layer to an empty map, fit the
480                        # new map to the window
481                        self.canvas.FitMapToWindow()
482            dlg.Destroy()
483    
484        def AddRasterLayer(self):
485            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
486                               wxOPEN)
487            if dlg.ShowModal() == wxID_OK:
488                filename = dlg.GetPath()
489                title = os.path.splitext(os.path.basename(filename))[0]
490                map = self.canvas.Map()
491                has_layers = map.HasLayers()
492                try:
493                    layer = RasterLayer(title, filename)
494                except IOError:
495                    # the layer couldn't be opened
496                    self.RunMessageBox(_("Add Image Layer"),
497                                       _("Can't open the file '%s'.") % filename)
498                else:
499                    map.AddLayer(layer)
500                  if not has_layers:                  if not has_layers:
501                      # if we're adding a layer to an empty map, fit the                      # if we're adding a layer to an empty map, fit the
502                      # new map to the window                      # new map to the window
# Line 500  class MainWindow(DockFrame): Line 542  class MainWindow(DockFrame):
542          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
543          return self.canvas.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
544    
545      def choose_color(self):      def has_selected_shapes(self):
546          """Run the color selection dialog and return the selected color.          """Return true if a shape is currently selected"""
547            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  
548    
549      def HideLayer(self):      def HideLayer(self):
550          layer = self.current_layer()          layer = self.current_layer()
# Line 534  class MainWindow(DockFrame): Line 564  class MainWindow(DockFrame):
564              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
565              if dialog is None:              if dialog is None:
566                  dialog = tableview.LayerTableFrame(self, name,                  dialog = tableview.LayerTableFrame(self, name,
567                                                 _("Table: %s") % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
568                                                     layer, table)                                           layer, table)
569                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
570                  dialog.Show(true)                  dialog.Show(True)
571              else:              else:
572                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
573                  pass                  pass
# Line 591  class MainWindow(DockFrame): Line 621  class MainWindow(DockFrame):
621              dialog.Show()              dialog.Show()
622          dialog.Raise()          dialog.Raise()
623    
624        def LayerJoinTable(self):
625            print "LayerJoinTable: Not implemented."
626    
627        def LayerUnjoinTable(self):
628            print "LayerUnjoinTable: Not implemented."
629    
630      def ShowLegend(self):      def ShowLegend(self):
631          if not self.LegendShown():          if not self.LegendShown():
# Line 615  class MainWindow(DockFrame): Line 650  class MainWindow(DockFrame):
650          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
651          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
652    
653        def TableOpen(self):
654            dlg = wxFileDialog(self, _("Open Table"), ".", "",
655                               _("DBF Files (*.dbf)") + "|*.dbf|" +
656                               #_("CSV Files (*.csv)") + "|*.csv|" +
657                               _("All Files (*.*)") + "|*.*",
658                               wxOPEN)
659            if dlg.ShowModal() == wxID_OK:
660                filename = dlg.GetPath()
661                dlg.Destroy()
662                try:
663                    table = self.application.session.OpenTableFile(filename)
664                except IOError:
665                    # the layer couldn't be opened
666                    self.RunMessageBox(_("Open Table"),
667                                       _("Can't open the file '%s'.") % filename)
668                else:
669                    self.ShowTableView(table)
670    
671        def TableClose(self):
672            print "TableClose: not implemented"
673    
674        def TableShow(self):
675            """Offer a multi-selection dialog for tables to be displayed
676    
677            The windows for the selected tables are opened or brought to
678            the front.
679            """
680            tables = self.application.session.Tables()
681    
682            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
683                                         _("Show Table"),
684                                         [t.Title() for t in tables],
685                                         size = (400,300), style = wxRESIZE_BORDER)
686            if (dlg.ShowModal() == wxID_OK):
687                for i in dlg.GetValue():
688                    # XXX: if the table belongs to a layer, open a
689                    # LayerTableFrame instead of QueryTableFrame
690                    self.ShowTableView(tables[i])
691    
692        def TableJoin(self):
693            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
694            dlg.ShowModal()
695    
696        def ShowTableView(self, table):
697            """Open a table view for the table and optionally"""
698            name = "table_view%d" % id(table)
699            dialog = self.get_open_dialog(name)
700            if dialog is None:
701                dialog = tableview.QueryTableFrame(self, name,
702                                                   _("Table: %s") % table.Title(),
703                                                   table)
704                self.add_dialog(name, dialog)
705                dialog.Show(True)
706            # FIXME: else bring dialog to front
707    
708      def ZoomInTool(self):      def ZoomInTool(self):
709          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
710    
# Line 634  class MainWindow(DockFrame): Line 724  class MainWindow(DockFrame):
724      def FullExtent(self):      def FullExtent(self):
725          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
726    
727        def FullLayerExtent(self):
728            self.canvas.FitLayerToWindow(self.current_layer())
729    
730        def FullSelectionExtent(self):
731            self.canvas.FitSelectedToWindow()
732    
733        def ExportMap(self):
734            self.canvas.Export()
735    
736      def PrintMap(self):      def PrintMap(self):
737          self.canvas.Print()          self.canvas.Print()
738    
# Line 649  class MainWindow(DockFrame): Line 748  class MainWindow(DockFrame):
748          dlg.Destroy()          dlg.Destroy()
749    
750      def identify_view_on_demand(self, layer, shapes):      def identify_view_on_demand(self, layer, shapes):
751            """Subscribed to the canvas' SHAPES_SELECTED message
752    
753            If the current tool is the identify tool, at least one shape is
754            selected and the identify dialog is not shown, show the dialog.
755            """
756            # If the selection has become empty we don't need to do
757            # anything. Otherwise it could happen that the dialog was popped
758            # up when the selection became empty, e.g. when a new selection
759            # is opened while the identify tool is active and dialog had
760            # been closed
761            if not shapes:
762                return
763    
764          name = "identify_view"          name = "identify_view"
765          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
766              if not self.dialog_open(name):              if not self.dialog_open(name):
# Line 702  def _has_selected_layer(context): Line 814  def _has_selected_layer(context):
814      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
815      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
816    
817    def _has_selected_shapes(context):
818        """Return true if a layer is selected in the context"""
819        return context.mainwindow.has_selected_shapes()
820    
821  def _can_remove_layer(context):  def _can_remove_layer(context):
822      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
823    
# Line 727  def _has_legend_shown(context): Line 843  def _has_legend_shown(context):
843    
844  # File menu  # File menu
845  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
846  _method_command("open_session", _("&Open Session"), "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
847  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
848  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
849  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
850                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown)
851  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
# Line 737  _method_command("toggle_legend", _("Lege Line 853  _method_command("toggle_legend", _("Lege
853  _method_command("exit", _("E&xit"), "Exit")  _method_command("exit", _("E&xit"), "Exit")
854    
855  # Help menu  # Help menu
856  _method_command("help_about", _("&About"), "About")  _method_command("help_about", _("&About..."), "About")
857    
858    
859  # Map menu  # Map menu
860  _method_command("map_projection", _("Pro&jection"), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
861    
862  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
863                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 762  _tool_command("map_label_tool", _("&Labe Line 878  _tool_command("map_label_tool", _("&Labe
878  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
879                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Full Extent"), icon = "fullextent",
880                sensitive = _has_visible_map)                sensitive = _has_visible_map)
881    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
882                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
883                  sensitive = _has_selected_layer)
884    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
885                   helptext = _("Full Selection Extent"), icon = "fullselextent",
886                  sensitive = _has_selected_shapes)
887    _method_command("map_export", _("E&xport"), "ExportMap",
888                        helptext = _("Export the map to file"))
889  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
890                  helptext = _("Print the map"))                  helptext = _("Print the map"))
891  _method_command("map_rename", _("&Rename"), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
892                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
893  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
894                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to active map"))
895    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
896                    helptext = _("Add a new image layer to active map"))
897  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
898                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer(s)"),
899                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
900    
901  # Layer menu  # Layer menu
902  _method_command("layer_projection", _("Pro&jection"), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
903                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
904  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
905                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer(s)"),
# Line 790  _method_command("layer_hide", _("&Hide") Line 916  _method_command("layer_hide", _("&Hide")
916  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
917                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
918                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
919  _method_command("layer_properties", _("Properties"), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
920                    sensitive = _has_selected_layer)
921    _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
922                    sensitive = _has_selected_layer)
923    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
924                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
925    
926  # the menu structure  # Table menu
927  main_menu = Menu("<main>", "<main>",  _method_command("table_open", _("&Open..."), "TableOpen")
928                   [Menu("file", _("&File"),  _method_command("table_close", _("&Close"), "TableClose")
929                         ["new_session", "open_session", None,  _method_command("table_show", _("&Show"), "TableShow")
930                          "save_session", "save_session_as", None,  _method_command("table_join", _("&Join..."), "TableJoin")
931                          "toggle_session_tree", None,  
932                          "exit"]),  #  Export only under Windows ...
933                    Menu("map", _("&Map"),  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
                        ["layer_add", "layer_remove",  
934                          None,                          None,
935                          "map_projection",                          "map_projection",
936                          None,                          None,
937                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
938                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
939                            "map_full_extent",
940                            "layer_full_extent",
941                            "selected_full_extent",
942                          None,                          None,
943                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
944                          None,                          None,
945                          "toggle_legend",                          "toggle_legend",
946                          None,                          None]
947                          "map_print",  if wxPlatform == '__WXMSW__':
948                          None,      map_menu.append("map_export")
949                          "map_rename"]),  map_menu.append("map_print")
950    
951    # the menu structure
952    main_menu = Menu("<main>", "<main>",
953                     [Menu("file", _("&File"),
954                           ["new_session", "open_session", None,
955                            "save_session", "save_session_as", None,
956                            "toggle_session_tree", None,
957                            "exit"]),
958                      Menu("map", _("&Map"), map_menu),
959                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
960                          ["layer_raise", "layer_lower",                          ["layer_raise", "layer_lower",
961                          None,                          None,
962                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
963                          None,                          None,
964                          "layer_show_table",                          "layer_projection",
965                          None,                          None,
966                          "layer_properties",                          "layer_show_table",
967                            "layer_jointable",
968                            "layer_unjointable",
969                          None,                          None,
970                          "layer_projection"]),                          "layer_properties"]),
971                      Menu("table", _("&Table"),
972                           ["table_open", "table_close",
973                           None,
974                           "table_show",
975                           None,
976                           "table_join"]),
977                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
978                         ["help_about"])])                         ["help_about"])])
979    
# Line 832  main_menu = Menu("<main>", "<main>", Line 981  main_menu = Menu("<main>", "<main>",
981    
982  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
983                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
984                       "map_full_extent", None,                       "map_full_extent",
985                         "layer_full_extent",
986                         "selected_full_extent",
987                         None,
988                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])

Legend:
Removed from v.750  
changed lines
  Added in v.1056

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26