/[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 787 by bh, Wed Apr 30 10:57:24 2003 UTC revision 1072 by bh, Tue May 27 16:47:48 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
 from Thuban.Model.color import Color  
 from Thuban.Model.proj import Projection  
32    
33  import view  import view
34  import tree  import tree
 import proj4dialog  
35  import tableview, identifyview  import tableview, identifyview
36  from Thuban.UI.classifier import Classifier  from Thuban.UI.classifier import Classifier
37  import legend  import legend
# Line 39  from command import registry, Command, T Line 42  from command import registry, Command, T
42  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
43    
44  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
45    from Thuban.UI.join import JoinDialog
46    
47  import resource  import resource
48    
# Line 60  class MainWindow(DockFrame): Line 64  class MainWindow(DockFrame):
64      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
65      delegated_methods = {"SelectLayer": "canvas",      delegated_methods = {"SelectLayer": "canvas",
66                           "SelectShapes": "canvas",                           "SelectShapes": "canvas",
67                             "SelectedShapes": "canvas",
68                           }                           }
69    
70      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
# Line 98  class MainWindow(DockFrame): Line 103  class MainWindow(DockFrame):
103    
104          self.init_dialogs()          self.init_dialogs()
105    
106          EVT_CLOSE(self, self._OnClose)          EVT_CLOSE(self, self.OnClose)
107    
108      def Subscribe(self, channel, *args):      def Subscribe(self, channel, *args):
109          """Subscribe a function to a message channel.          """Subscribe a function to a message channel.
# Line 357  class MainWindow(DockFrame): Line 362  class MainWindow(DockFrame):
362                  d.Close()                  d.Close()
363    
364      def NewSession(self):      def NewSession(self):
365          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
366          self.prepare_new_session()              self.prepare_new_session()
367          self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
368    
369      def OpenSession(self):      def OpenSession(self):
370          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
371          dlg = wxFileDialog(self, _("Open Session"), ".", "", "*.thuban", wxOPEN)              dlg = wxFileDialog(self, _("Open Session"), ".", "",
372          if dlg.ShowModal() == wxID_OK:                                 "Thuban Session File (*.thuban)|*.thuban",
373              self.prepare_new_session()                                 wxOPEN)
374              self.application.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
375          dlg.Destroy()                  self.prepare_new_session()
376                    self.application.OpenSession(dlg.GetPath())
377                dlg.Destroy()
378    
379      def SaveSession(self):      def SaveSession(self):
380          if self.application.session.filename == None:          if self.application.session.filename == None:
# Line 377  class MainWindow(DockFrame): Line 384  class MainWindow(DockFrame):
384    
385      def SaveSessionAs(self):      def SaveSessionAs(self):
386          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
387                             "*.thuban", wxSAVE|wxOVERWRITE_PROMPT)                             "Thuban Session File (*.thuban)|*.thuban",
388                               wxSAVE|wxOVERWRITE_PROMPT)
389          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
390              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
391              self.application.SaveSession()              self.application.SaveSession()
# Line 386  class MainWindow(DockFrame): Line 394  class MainWindow(DockFrame):
394      def Exit(self):      def Exit(self):
395          self.Close(False)          self.Close(False)
396    
397      def _OnClose(self, event):      def OnClose(self, event):
398          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
399          if result == wxID_CANCEL:          if result == wxID_CANCEL:
400              event.Veto()              event.Veto()
# Line 395  class MainWindow(DockFrame): Line 403  class MainWindow(DockFrame):
403              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
404              # yet.              # yet.
405              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
406              DockFrame._OnClose(self, event)              DockFrame.OnClose(self, event)
407                for dlg in self.dialogs.values():
408                    dlg.Destroy()
409                self.canvas.Destroy()
410              self.Destroy()              self.Destroy()
411    
412      def SetMap(self, map):      def SetMap(self, map):
# Line 428  class MainWindow(DockFrame): Line 439  class MainWindow(DockFrame):
439    
440      def About(self):      def About(self):
441          self.RunMessageBox(_("About"),          self.RunMessageBox(_("About"),
442                             _("Thuban v%s\n"                             _("Thuban %s\n"
443                              #"Build Date: %s\n"                              #"Build Date: %s\n"
444                              "\n"                              "using:\n"
445                                "  %s\n"
446                                "  %s\n\n"
447                              "Thuban is a program for\n"                              "Thuban is a program for\n"
448                              "exploring geographic data.\n"                              "exploring geographic data.\n"
449                              "Copyright (C) 2001-2003 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
450                              "Thuban is licensed under the GNU GPL"                              "Thuban is licensed under the GNU GPL"
451                             % __ThubanVersion__), #__BuildDate__)),                              % (Thuban.version.longversion,
452                                   "wxPython %s" % wxPython_version,
453                                   "Python %d.%d.%d" % sys.version_info[:3]
454                                  )),
455    #                           % __ThubanVersion__), #__BuildDate__)),
456                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
457    
458      def AddLayer(self):      def AddLayer(self):
# Line 444  class MainWindow(DockFrame): Line 461  class MainWindow(DockFrame):
461          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
462              filename = dlg.GetPath()              filename = dlg.GetPath()
463              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             store = self.application.Session().OpenShapefile(filename)  
             layer = Layer(title, store)  
464              map = self.canvas.Map()              map = self.canvas.Map()
465              has_layers = map.HasLayers()              has_layers = map.HasLayers()
466              try:              try:
467                  map.AddLayer(layer)                  store = self.application.Session().OpenShapefile(filename)
468              except IOError:              except IOError:
469                  # the layer couldn't be opened                  # the layer couldn't be opened
470                  self.RunMessageBox(_("Add Layer"),                  self.RunMessageBox(_("Add Layer"),
471                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
472              else:              else:
473                    layer = Layer(title, store)
474                    map.AddLayer(layer)
475                    if not has_layers:
476                        # if we're adding a layer to an empty map, fit the
477                        # new map to the window
478                        self.canvas.FitMapToWindow()
479            dlg.Destroy()
480    
481        def AddRasterLayer(self):
482            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
483                               wxOPEN)
484            if dlg.ShowModal() == wxID_OK:
485                filename = dlg.GetPath()
486                title = os.path.splitext(os.path.basename(filename))[0]
487                map = self.canvas.Map()
488                has_layers = map.HasLayers()
489                try:
490                    layer = RasterLayer(title, filename)
491                except IOError:
492                    # the layer couldn't be opened
493                    self.RunMessageBox(_("Add Image Layer"),
494                                       _("Can't open the file '%s'.") % filename)
495                else:
496                    map.AddLayer(layer)
497                  if not has_layers:                  if not has_layers:
498                      # if we're adding a layer to an empty map, fit the                      # if we're adding a layer to an empty map, fit the
499                      # new map to the window                      # new map to the window
# Line 500  class MainWindow(DockFrame): Line 539  class MainWindow(DockFrame):
539          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
540          return self.canvas.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
541    
542      def choose_color(self):      def has_selected_shapes(self):
543          """Run the color selection dialog and return the selected color.          """Return true if a shape is currently selected"""
544            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  
545    
546      def HideLayer(self):      def HideLayer(self):
547          layer = self.current_layer()          layer = self.current_layer()
# Line 534  class MainWindow(DockFrame): Line 561  class MainWindow(DockFrame):
561              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
562              if dialog is None:              if dialog is None:
563                  dialog = tableview.LayerTableFrame(self, name,                  dialog = tableview.LayerTableFrame(self, name,
564                                                 _("Table: %s") % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
565                                                     layer, table)                                           layer, table)
566                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
567                  dialog.Show(true)                  dialog.Show(True)
568              else:              else:
569                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
570                  pass                  pass
# Line 591  class MainWindow(DockFrame): Line 618  class MainWindow(DockFrame):
618              dialog.Show()              dialog.Show()
619          dialog.Raise()          dialog.Raise()
620    
621        def LayerJoinTable(self):
622            layer = self.canvas.SelectedLayer()
623            if layer is not None:
624                dlg = JoinDialog(self, _("Join Layer with Table"),
625                                 self.application.session,
626                                 layer = layer)
627                dlg.ShowModal()
628    
629        def LayerUnjoinTable(self):
630            print "LayerUnjoinTable: Not implemented."
631    
632      def ShowLegend(self):      def ShowLegend(self):
633          if not self.LegendShown():          if not self.LegendShown():
# Line 615  class MainWindow(DockFrame): Line 652  class MainWindow(DockFrame):
652          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
653          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
654    
655        def TableOpen(self):
656            dlg = wxFileDialog(self, _("Open Table"), ".", "",
657                               _("DBF Files (*.dbf)") + "|*.dbf|" +
658                               #_("CSV Files (*.csv)") + "|*.csv|" +
659                               _("All Files (*.*)") + "|*.*",
660                               wxOPEN)
661            if dlg.ShowModal() == wxID_OK:
662                filename = dlg.GetPath()
663                dlg.Destroy()
664                try:
665                    table = self.application.session.OpenTableFile(filename)
666                except IOError:
667                    # the layer couldn't be opened
668                    self.RunMessageBox(_("Open Table"),
669                                       _("Can't open the file '%s'.") % filename)
670                else:
671                    self.ShowTableView(table)
672    
673        def TableClose(self):
674            tables = self.application.session.UnreferencedTables()
675    
676            dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
677                                         _("Close Table"),
678                                         [t.Title() for t in tables],
679                                         size = (400, 300), style=wxRESIZE_BORDER)
680            if dlg.ShowModal() == wxID_OK:
681                for i in dlg.GetValue():
682                    self.application.session.RemoveTable(tables[i])
683    
684    
685        def TableShow(self):
686            """Offer a multi-selection dialog for tables to be displayed
687    
688            The windows for the selected tables are opened or brought to
689            the front.
690            """
691            tables = self.application.session.Tables()
692    
693            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
694                                         _("Show Table"),
695                                         [t.Title() for t in tables],
696                                         size = (400,300), style = wxRESIZE_BORDER)
697            if (dlg.ShowModal() == wxID_OK):
698                for i in dlg.GetValue():
699                    # XXX: if the table belongs to a layer, open a
700                    # LayerTableFrame instead of QueryTableFrame
701                    self.ShowTableView(tables[i])
702    
703        def TableJoin(self):
704            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
705            dlg.ShowModal()
706    
707        def ShowTableView(self, table):
708            """Open a table view for the table and optionally"""
709            name = "table_view%d" % id(table)
710            dialog = self.get_open_dialog(name)
711            if dialog is None:
712                dialog = tableview.QueryTableFrame(self, name,
713                                                   _("Table: %s") % table.Title(),
714                                                   table)
715                self.add_dialog(name, dialog)
716                dialog.Show(True)
717            # FIXME: else bring dialog to front
718    
719      def ZoomInTool(self):      def ZoomInTool(self):
720          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
721    
# Line 634  class MainWindow(DockFrame): Line 735  class MainWindow(DockFrame):
735      def FullExtent(self):      def FullExtent(self):
736          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
737    
738        def FullLayerExtent(self):
739            self.canvas.FitLayerToWindow(self.current_layer())
740    
741        def FullSelectionExtent(self):
742            self.canvas.FitSelectedToWindow()
743    
744        def ExportMap(self):
745            self.canvas.Export()
746    
747      def PrintMap(self):      def PrintMap(self):
748          self.canvas.Print()          self.canvas.Print()
749    
# Line 715  def _has_selected_layer(context): Line 825  def _has_selected_layer(context):
825      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
826      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
827    
828    def _has_selected_shapes(context):
829        """Return true if a layer is selected in the context"""
830        return context.mainwindow.has_selected_shapes()
831    
832  def _can_remove_layer(context):  def _can_remove_layer(context):
833      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
834    
# Line 740  def _has_legend_shown(context): Line 854  def _has_legend_shown(context):
854    
855  # File menu  # File menu
856  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
857  _method_command("open_session", _("&Open Session"), "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
858  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
859  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
860  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
861                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown)
862  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
# Line 750  _method_command("toggle_legend", _("Lege Line 864  _method_command("toggle_legend", _("Lege
864  _method_command("exit", _("E&xit"), "Exit")  _method_command("exit", _("E&xit"), "Exit")
865    
866  # Help menu  # Help menu
867  _method_command("help_about", _("&About"), "About")  _method_command("help_about", _("&About..."), "About")
868    
869    
870  # Map menu  # Map menu
871  _method_command("map_projection", _("Pro&jection"), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
872    
873  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
874                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 775  _tool_command("map_label_tool", _("&Labe Line 889  _tool_command("map_label_tool", _("&Labe
889  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
890                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Full Extent"), icon = "fullextent",
891                sensitive = _has_visible_map)                sensitive = _has_visible_map)
892    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
893                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
894                  sensitive = _has_selected_layer)
895    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
896                   helptext = _("Full Selection Extent"), icon = "fullselextent",
897                  sensitive = _has_selected_shapes)
898    _method_command("map_export", _("E&xport"), "ExportMap",
899                        helptext = _("Export the map to file"))
900  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
901                  helptext = _("Print the map"))                  helptext = _("Print the map"))
902  _method_command("map_rename", _("&Rename"), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
903                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
904  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
905                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to active map"))
906    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
907                    helptext = _("Add a new image layer to active map"))
908  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
909                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer(s)"),
910                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
911    
912  # Layer menu  # Layer menu
913  _method_command("layer_projection", _("Pro&jection"), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
914                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
915  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
916                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer(s)"),
# Line 803  _method_command("layer_hide", _("&Hide") Line 927  _method_command("layer_hide", _("&Hide")
927  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
928                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
929                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
930  _method_command("layer_properties", _("Properties"), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
931                    sensitive = _has_selected_layer)
932    _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
933                    sensitive = _has_selected_layer)
934    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
935                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
936    
937  # the menu structure  # Table menu
938  main_menu = Menu("<main>", "<main>",  _method_command("table_open", _("&Open..."), "TableOpen")
939                   [Menu("file", _("&File"),  _method_command("table_close", _("&Close"), "TableClose",
940                         ["new_session", "open_session", None,         sensitive = lambda context: bool(context.session.UnreferencedTables()))
941                          "save_session", "save_session_as", None,  _method_command("table_show", _("&Show"), "TableShow")
942                          "toggle_session_tree", None,  _method_command("table_join", _("&Join..."), "TableJoin")
943                          "exit"]),  
944                    Menu("map", _("&Map"),  #  Export only under Windows ...
945                         ["layer_add", "layer_remove",  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
946                          None,                          None,
947                          "map_projection",                          "map_projection",
948                          None,                          None,
949                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
950                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
951                            "map_full_extent",
952                            "layer_full_extent",
953                            "selected_full_extent",
954                          None,                          None,
955                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
956                          None,                          None,
957                          "toggle_legend",                          "toggle_legend",
958                          None,                          None]
959                          "map_print",  if wxPlatform == '__WXMSW__':
960                          None,      map_menu.append("map_export")
961                          "map_rename"]),  map_menu.append("map_print")
962    
963    # the menu structure
964    main_menu = Menu("<main>", "<main>",
965                     [Menu("file", _("&File"),
966                           ["new_session", "open_session", None,
967                            "save_session", "save_session_as", None,
968                            "toggle_session_tree", None,
969                            "exit"]),
970                      Menu("map", _("&Map"), map_menu),
971                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
972                          ["layer_raise", "layer_lower",                          ["layer_raise", "layer_lower",
973                          None,                          None,
974                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
975                          None,                          None,
976                          "layer_show_table",                          "layer_projection",
977                          None,                          None,
978                          "layer_properties",                          "layer_show_table",
979                            "layer_jointable",
980                            "layer_unjointable",
981                          None,                          None,
982                          "layer_projection"]),                          "layer_properties"]),
983                      Menu("table", _("&Table"),
984                           ["table_open", "table_close",
985                           None,
986                           "table_show",
987                           None,
988                           "table_join"]),
989                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
990                         ["help_about"])])                         ["help_about"])])
991    
# Line 845  main_menu = Menu("<main>", "<main>", Line 993  main_menu = Menu("<main>", "<main>",
993    
994  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
995                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
996                       "map_full_extent", None,                       "map_full_extent",
997                         "layer_full_extent",
998                         "selected_full_extent",
999                         None,
1000                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
Legend:
Removed from v.787  
changed lines
  Added in v.1072
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26