/[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 1126 by bh, Mon Jun 2 14:15:43 2003 UTC revision 1622 by jan, Thu Aug 21 11:56:06 2003 UTC
# Line 13  The main window Line 13  The main window
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    
16  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$"  __ThubanVersion__ = "0.8" #"$THUBAN_0_2$"
17  #__BuildDate__ = "$Date$"  #__BuildDate__ = "$Date$"
18    
19  import os  import os
# Line 22  import copy Line 22  import copy
22  from wxPython.wx import *  from wxPython.wx import *
23  from wxPython.wx import __version__ as wxPython_version  from wxPython.wx import __version__ as wxPython_version
24    
 from wxPython.lib.dialogs import wxMultipleChoiceDialog  
   
25  import Thuban  import Thuban
26  import Thuban.version  import Thuban.version
27    
28  from Thuban import _  from Thuban import _
29  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
30  from Thuban.Model.layer import Layer, RasterLayer  from Thuban.Model.layer import Layer, RasterLayer
31    from Thuban.Model.postgisdb import PostGISShapeStore
32    # XXX: replace this by
33    # from wxPython.lib.dialogs import wxMultipleChoiceDialog
34    # when Thuban does not support wxPython 2.4.0 any more.
35    from Thuban.UI.multiplechoicedialog import wxMultipleChoiceDialog
36    
37  import view  import view
38  import tree  import tree
# Line 40  from menu import Menu Line 43  from menu import Menu
43    
44  from context import Context  from context import Context
45  from command import registry, Command, ToolCommand  from command import registry, Command, ToolCommand
46  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION, \
47         MAP_REPLACED
48    from about import About
49    
50  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
51  from Thuban.UI.join import JoinDialog  from Thuban.UI.join import JoinDialog
52    from Thuban.UI.dbdialog import DBFrame, ChooseDBTableDialog
53  import resource  import resource
54    import Thuban.Model.resource
55    
56  import projdialog  import projdialog
57    
58    
   
59  class MainWindow(DockFrame):  class MainWindow(DockFrame):
60    
61      # Some messages that can be subscribed/unsubscribed directly through      # Some messages that can be subscribed/unsubscribed directly through
# Line 59  class MainWindow(DockFrame): Line 64  class MainWindow(DockFrame):
64      # actually come from. This delegation is implemented in the      # actually come from. This delegation is implemented in the
65      # Subscribe and unsubscribed methods      # Subscribe and unsubscribed methods
66      delegated_messages = {LAYER_SELECTED: "canvas",      delegated_messages = {LAYER_SELECTED: "canvas",
67                            SHAPES_SELECTED: "canvas"}                            SHAPES_SELECTED: "canvas",
68                              MAP_REPLACED: "canvas"}
69    
70      # Methods delegated to some instance variables. The delegation is      # Methods delegated to some instance variables. The delegation is
71      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
# Line 105  class MainWindow(DockFrame): Line 111  class MainWindow(DockFrame):
111    
112          self.init_dialogs()          self.init_dialogs()
113    
114            self.ShowLegend()
115    
116          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
117    
118      def Subscribe(self, channel, *args):      def Subscribe(self, channel, *args):
# Line 358  class MainWindow(DockFrame): Line 366  class MainWindow(DockFrame):
366              result = wxID_NO              result = wxID_NO
367          return result          return result
368    
     def prepare_new_session(self):  
         for d in self.dialogs.values():  
             if not isinstance(d, tree.SessionTreeView):  
                 d.Close()  
   
369      def NewSession(self):      def NewSession(self):
370          if self.save_modified_session() != wxID_CANCEL:          if self.save_modified_session() != wxID_CANCEL:
             self.prepare_new_session()  
371              self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
372    
373      def OpenSession(self):      def OpenSession(self):
# Line 374  class MainWindow(DockFrame): Line 376  class MainWindow(DockFrame):
376                                 "Thuban Session File (*.thuban)|*.thuban",                                 "Thuban Session File (*.thuban)|*.thuban",
377                                 wxOPEN)                                 wxOPEN)
378              if dlg.ShowModal() == wxID_OK:              if dlg.ShowModal() == wxID_OK:
                 self.prepare_new_session()  
379                  self.application.OpenSession(dlg.GetPath())                  self.application.OpenSession(dlg.GetPath())
380              dlg.Destroy()              dlg.Destroy()
381    
# Line 440  class MainWindow(DockFrame): Line 441  class MainWindow(DockFrame):
441          return self.get_open_dialog("session_tree") is not None          return self.get_open_dialog("session_tree") is not None
442    
443      def About(self):      def About(self):
444          self.RunMessageBox(_("About"),          dlg = About(self)
445                             _("Thuban %s\n"          dlg.ShowModal()
446                              #"Build Date: %s\n"          dlg.Destroy()
447                              "using:\n"  
448                              "  %s\n"      def DatabaseManagement(self):
449                              "  %s\n\n"          name = "dbmanagement"
450                              "Thuban is a program for\n"          dialog = self.get_open_dialog(name)
451                              "exploring geographic data.\n"          if dialog is None:
452                              "Copyright (C) 2001-2003 Intevation GmbH.\n"              map = self.canvas.Map()
453                              "Thuban is licensed under the GNU GPL"              dialog = DBFrame(self, name, self.application.Session())
454                              % (Thuban.version.longversion,              self.add_dialog(name, dialog)
455                                 "wxPython %s" % wxPython_version,              dialog.Show()
456                                 "Python %d.%d.%d" % sys.version_info[:3]          dialog.Raise()
                               )),  
 #                           % __ThubanVersion__), #__BuildDate__)),  
                            wxOK | wxICON_INFORMATION)  
457    
458      def AddLayer(self):      def AddLayer(self):
459          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select one or more data files"), ".", "",
460                             wxOPEN)                             _("Shapefiles (*.shp)") + "|*.shp|" +
461                               _("All Files (*.*)") + "|*.*",
462                               wxOPEN | wxMULTIPLE)
463          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
464              filename = dlg.GetPath()              filenames = dlg.GetPaths()
465              title = os.path.splitext(os.path.basename(filename))[0]              for filename in filenames:
466              map = self.canvas.Map()                  title = os.path.splitext(os.path.basename(filename))[0]
467              has_layers = map.HasLayers()                  map = self.canvas.Map()
468              try:                  has_layers = map.HasLayers()
469                  store = self.application.Session().OpenShapefile(filename)                  try:
470              except IOError:                      store = self.application.Session().OpenShapefile(filename)
471                  # the layer couldn't be opened                  except IOError:
472                  self.RunMessageBox(_("Add Layer"),                      # the layer couldn't be opened
473                                     _("Can't open the file '%s'.") % filename)                      self.RunMessageBox(_("Add Layer"),
474              else:                                         _("Can't open the file '%s'.")%filename)
475                  layer = Layer(title, store)                  else:
476                  map.AddLayer(layer)                      layer = Layer(title, store)
477                  if not has_layers:                      map.AddLayer(layer)
478                      # if we're adding a layer to an empty map, fit the                      if not has_layers:
479                      # new map to the window                          # if we're adding a layer to an empty map, fit the
480                      self.canvas.FitMapToWindow()                          # new map to the window
481                            self.canvas.FitMapToWindow()
482          dlg.Destroy()          dlg.Destroy()
483    
484      def AddRasterLayer(self):      def AddRasterLayer(self):
# Line 502  class MainWindow(DockFrame): Line 503  class MainWindow(DockFrame):
503                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
504          dlg.Destroy()          dlg.Destroy()
505    
506        def AddDBLayer(self):
507            """Add a layer read from a database"""
508            session = self.application.Session()
509            dlg = ChooseDBTableDialog(self.application.Session(), self,-1, "")
510    
511            if dlg.ShowModal() == wxID_OK:
512                dbconn, dbtable = dlg.GetTable()
513                try:
514                    title = str(dbtable)
515    
516                    # Chose the correct Interface for the database type
517                    store = PostGISShapeStore(dbconn, dbtable)
518                    session.AddShapeStore(store)
519                    layer = Layer(title, store)
520                except:
521                    # Some error occured while initializing the layer
522                    self.RunMessageBox(_("Add Layer from database"),
523                                       _("Can't open the database table '%s'")
524                                       % dbtable)
525    
526                map = self.canvas.Map()
527    
528                has_layers = map.HasLayers()
529                map.AddLayer(layer)
530                if not has_layers:
531                    self.canvas.FitMapToWindow()
532    
533            dlg.Destroy()
534    
535      def RemoveLayer(self):      def RemoveLayer(self):
536          layer = self.current_layer()          layer = self.current_layer()
537          if layer is not None:          if layer is not None:
# Line 575  class MainWindow(DockFrame): Line 605  class MainWindow(DockFrame):
605      def LayerShowTable(self):      def LayerShowTable(self):
606          layer = self.current_layer()          layer = self.current_layer()
607          if layer is not None:          if layer is not None:
608              table = layer.table              table = layer.ShapeStore().Table()
609              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
610              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
611              if dialog is None:              if dialog is None:
# Line 632  class MainWindow(DockFrame): Line 662  class MainWindow(DockFrame):
662          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
663    
664          if dialog is None:          if dialog is None:
665              dialog = Classifier(self, name, layer, group)              dialog = Classifier(self, name, self.Map(), layer, group)
666              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
667              dialog.Show()              dialog.Show()
668          dialog.Raise()          dialog.Raise()
# Line 670  class MainWindow(DockFrame): Line 700  class MainWindow(DockFrame):
700          else:          else:
701              dialog.Show(not dialog.IsShown())              dialog.Show(not dialog.IsShown())
702    
         self.canvas.FitMapToWindow()  
   
703      def LegendShown(self):      def LegendShown(self):
704          """Return true iff the legend is currently open"""          """Return true iff the legend is currently open"""
705          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
# Line 747  class MainWindow(DockFrame): Line 775  class MainWindow(DockFrame):
775                                                 table)                                                 table)
776              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
777              dialog.Show(True)              dialog.Show(True)
778          # FIXME: else bring dialog to front          dialog.Raise()
779    
780      def TableRename(self):      def TableRename(self):
781          """Let the user rename a table"""          """Let the user rename a table"""
# Line 936  def _has_legend_shown(context): Line 964  def _has_legend_shown(context):
964      """Return true if the legend window is shown"""      """Return true if the legend window is shown"""
965      return context.mainwindow.LegendShown()      return context.mainwindow.LegendShown()
966    
967    def _has_gdal_support(context):
968        """Return True if the GDAL is available"""
969        return Thuban.Model.resource.has_gdal_support()
970    
971    def _has_dbconnections(context):
972        """Return whether the the session has database connections"""
973        return context.session.HasDBConnections()
974    
975  # File menu  # File menu
976  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession",
977  _method_command("open_session", _("&Open Session..."), "OpenSession")                  helptext = _("Start a new session"))
978  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("open_session", _("&Open Session..."), "OpenSession",
979  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")                  helptext = _("Open a session file"))
980    _method_command("save_session", _("&Save Session"), "SaveSession",
981                    helptext =_("Save this session to the file it was opened from"))
982    _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs",
983                    helptext = _("Save this session to a new file"))
984  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
985                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown,
986                    helptext = _("Toggle on/off the session tree analysis window"))
987  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
988                  checked = _has_legend_shown)                  checked = _has_legend_shown,
989  _method_command("exit", _("E&xit"), "Exit")                  helptext = _("Toggle Legend on/off"))
990    _method_command("database_management", _("&Database Connections..."),
991                    "DatabaseManagement")
992    _method_command("exit", _("E&xit"), "Exit",
993                    helptext = _("Finish working with Thuban"))
994    
995  # Help menu  # Help menu
996  _method_command("help_about", _("&About..."), "About")  _method_command("help_about", _("&About..."), "About",
997                    helptext = _("Info about Thuban authors, version and modules"))
998    
999    
1000  # Map menu  # Map menu
1001  _method_command("map_projection", _("Pro&jection..."), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection",
1002                    helptext = _("Set or change the map projection"))
1003    
1004  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
1005                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 972  _tool_command("map_label_tool", _("&Labe Line 1018  _tool_command("map_label_tool", _("&Labe
1018                helptext = _("Add/Remove labels"), icon = "label",                helptext = _("Add/Remove labels"), icon = "label",
1019                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1020  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
1021                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Zoom to the full map extent"), icon = "fullextent",
1022                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1023  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
1024                 helptext = _("Full Layer Extent"), icon = "fulllayerextent",                  helptext = _("Zoom to the full layer extent"),
1025                sensitive = _has_selected_layer)                  icon = "fulllayerextent", sensitive = _has_selected_layer)
1026  _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",  _method_command("selected_full_extent", _("&Full selection extent"),
1027                 helptext = _("Full Selection Extent"), icon = "fullselextent",                  "FullSelectionExtent",
1028                sensitive = _has_selected_shapes)                  helptext = _("Zoom to the full selection extent"),
1029                    icon = "fullselextent", sensitive = _has_selected_shapes)
1030  _method_command("map_export", _("E&xport"), "ExportMap",  _method_command("map_export", _("E&xport"), "ExportMap",
1031                      helptext = _("Export the map to file"))                  helptext = _("Export the map to file"))
1032  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
1033                  helptext = _("Print the map"))                  helptext = _("Print the map"))
1034  _method_command("map_rename", _("&Rename..."), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
1035                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
1036  _method_command("layer_add", _("&Add Layer..."), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
1037                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to the map"))
1038  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
1039                  helptext = _("Add a new image layer to active map"))                  helptext = _("Add a new image layer to the map"),
1040                    sensitive = _has_gdal_support)
1041    _method_command("layer_add_db", _("Add &Database Layer..."), "AddDBLayer",
1042                    helptext = _("Add a new database layer to active map"),
1043                    sensitive = _has_dbconnections)
1044  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
1045                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer"),
1046                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
1047    
1048  # Layer menu  # Layer menu
1049  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
1050                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1051                    helptext = _("Specify projection for selected layer"))
1052  _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",  _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",
1053                  helptext = _("Duplicate selected layer(s)"),                  helptext = _("Duplicate selected layer"),
1054            sensitive = lambda context: context.mainwindow.CanDuplicateLayer())            sensitive = lambda context: context.mainwindow.CanDuplicateLayer())
1055  _method_command("layer_rename", _("Re&name ..."), "RenameLayer",  _method_command("layer_rename", _("Re&name ..."), "RenameLayer",
1056                  helptext = _("Rename selected layer"),                  helptext = _("Rename selected layer"),
1057                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1058  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
1059                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer"),
1060                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1061  _method_command("layer_lower", _("&Lower"), "LowerLayer",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
1062                  helptext = _("Lower selected layer(s)"),                  helptext = _("Lower selected layer"),
1063                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1064  _method_command("layer_show", _("&Show"), "ShowLayer",  _method_command("layer_show", _("&Show"), "ShowLayer",
1065                  helptext = _("Make selected layer(s) visible"),                  helptext = _("Make selected layer visible"),
1066                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1067  _method_command("layer_hide", _("&Hide"), "HideLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
1068                  helptext = _("Make selected layer(s) unvisible"),                  helptext = _("Make selected layer unvisible"),
1069                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1070  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
1071                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
1072                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1073  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
1074                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1075                    helptext = _("Edit the properties of the selected layer"))
1076  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
1077                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1078                    helptext = _("Join and attach a table to the selected layer"))
1079    
1080  def _can_unjoin(context):  def _can_unjoin(context):
1081      """Return whether the Layer/Unjoin command can be executed.      """Return whether the Layer/Unjoin command can be executed.
# Line 1038  def _can_unjoin(context): Line 1092  def _can_unjoin(context):
1092      else:      else:
1093          return 0          return 0
1094  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
1095                  sensitive = _can_unjoin)                  sensitive = _can_unjoin,
1096                    helptext = _("Undo the last join operation"))
1097    
1098    
1099  def _has_tables(context):  def _has_tables(context):
1100      return bool(context.session.Tables())      return bool(context.session.Tables())
1101    
1102  # Table menu  # Table menu
1103  _method_command("table_open", _("&Open..."), "TableOpen")  _method_command("table_open", _("&Open..."), "TableOpen",
1104  _method_command("table_close", _("&Close"), "TableClose",                  helptext = _("Open a DBF-table from a file"))
1105         sensitive = lambda context: bool(context.session.UnreferencedTables()))  _method_command("table_close", _("&Close..."), "TableClose",
1106           sensitive = lambda context: bool(context.session.UnreferencedTables()),
1107                    helptext = _("Close one or more tables from a list"))
1108  _method_command("table_rename", _("&Rename..."), "TableRename",  _method_command("table_rename", _("&Rename..."), "TableRename",
1109                  sensitive = _has_tables)                  sensitive = _has_tables,
1110  _method_command("table_show", _("&Show"), "TableShow",                  helptext = _("Rename one or more tables"))
1111                  sensitive = _has_tables)  _method_command("table_show", _("&Show..."), "TableShow",
1112                    sensitive = _has_tables,
1113                    helptext = _("Show one or more tables in a dialog"))
1114  _method_command("table_join", _("&Join..."), "TableJoin",  _method_command("table_join", _("&Join..."), "TableJoin",
1115                  sensitive = _has_tables)                  sensitive = _has_tables,
1116                    helptext = _("Join two tables creating a new one"))
1117    
1118  #  Export only under Windows ...  #  Export only under Windows ...
1119  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",  map_menu = ["layer_add", "layer_add_db", "rasterlayer_add", "layer_remove",
1120                          None,                          None,
1121                            "map_rename",
1122                          "map_projection",                          "map_projection",
1123                          None,                          None,
1124                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
1125                          "map_pan_tool",                          "map_pan_tool",
1126                          "map_full_extent",                          "map_full_extent",
1127                          "layer_full_extent",                          "layer_full_extent",
1128                          "selected_full_extent",                          "selected_full_extent",
1129                          None,                          None,
# Line 1079  main_menu = Menu("<main>", "<main>", Line 1140  main_menu = Menu("<main>", "<main>",
1140                   [Menu("file", _("&File"),                   [Menu("file", _("&File"),
1141                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
1142                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
1143                            "database_management", None,
1144                          "toggle_session_tree", None,                          "toggle_session_tree", None,
1145                          "exit"]),                          "exit"]),
1146                    Menu("map", _("&Map"), map_menu),                    Menu("map", _("&Map"), map_menu),
# Line 1114  main_toolbar = Menu("<toolbar>", "<toolb Line 1176  main_toolbar = Menu("<toolbar>", "<toolb
1176                       "selected_full_extent",                       "selected_full_extent",
1177                       None,                       None,
1178                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
1179    

Legend:
Removed from v.1126  
changed lines
  Added in v.1622

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26