/[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 1233 by jonathan, Wed Jun 18 14:47:19 2003 UTC revision 2102 by bh, Thu Mar 11 21:04:30 2004 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003, 2004 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]>  # Jan-Oliver Wagner <[email protected]>
4  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
# Line 12  The main window Line 12  The main window
12  """  """
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    # $Source$
16  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$"  # $Id$
 #__BuildDate__ = "$Date$"  
17    
18  import os  import os
19  import copy  import copy
20    
21  from wxPython.wx import *  from wxPython.wx import *
 from wxPython.wx import __version__ as wxPython_version  
22    
23  import Thuban  import Thuban
 import Thuban.version  
24    
25  from Thuban import _  from Thuban import _
26    from Thuban.Model.messages import TITLE_CHANGED
27  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
28  from Thuban.Model.layer import Layer, RasterLayer  from Thuban.Model.layer import Layer, RasterLayer
29    from Thuban.Model.postgisdb import PostGISShapeStore, has_postgis_support
30  # XXX: replace this by  # XXX: replace this by
31  # from wxPython.lib.dialogs import wxMultipleChoiceDialog  # from wxPython.lib.dialogs import wxMultipleChoiceDialog
32  # when Thuban does not support wxPython 2.4.0 any more.  # when Thuban does not support wxPython 2.4.0 any more.
# Line 43  from menu import Menu Line 41  from menu import Menu
41    
42  from context import Context  from context import Context
43  from command import registry, Command, ToolCommand  from command import registry, Command, ToolCommand
44  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION, \
45         MAP_REPLACED
46    from about import About
47    
48  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
49  from Thuban.UI.join import JoinDialog  from Thuban.UI.join import JoinDialog
50    from Thuban.UI.dbdialog import DBFrame, DBDialog, ChooseDBTableDialog
51  import resource  import resource
52  import Thuban.Model.resource  import Thuban.Model.resource
53    
54  import projdialog  import projdialog
55    
56    
57  class MainWindow(DockFrame):  class MainWindow(DockFrame):
58    
59      # Some messages that can be subscribed/unsubscribed directly through      # Some messages that can be subscribed/unsubscribed directly through
# Line 61  class MainWindow(DockFrame): Line 62  class MainWindow(DockFrame):
62      # actually come from. This delegation is implemented in the      # actually come from. This delegation is implemented in the
63      # Subscribe and unsubscribed methods      # Subscribe and unsubscribed methods
64      delegated_messages = {LAYER_SELECTED: "canvas",      delegated_messages = {LAYER_SELECTED: "canvas",
65                            SHAPES_SELECTED: "canvas"}                            SHAPES_SELECTED: "canvas",
66                              MAP_REPLACED: "canvas"}
67    
68      # Methods delegated to some instance variables. The delegation is      # Methods delegated to some instance variables. The delegation is
69      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
# Line 100  class MainWindow(DockFrame): Line 102  class MainWindow(DockFrame):
102          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
103          canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)          canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
104          self.canvas = canvas          self.canvas = canvas
105            self.canvas.Subscribe(TITLE_CHANGED, self.title_changed)
106    
107          self.SetMainWindow(self.canvas)          self.SetMainWindow(self.canvas)
108    
# Line 131  class MainWindow(DockFrame): Line 134  class MainWindow(DockFrame):
134          """          """
135          if channel in self.delegated_messages:          if channel in self.delegated_messages:
136              object = getattr(self, self.delegated_messages[channel])              object = getattr(self, self.delegated_messages[channel])
137              object.Unsubscribe(channel, *args)              try:
138                    object.Unsubscribe(channel, *args)
139                except wxPyDeadObjectError:
140                    # The object was a wxObject and has already been
141                    # destroyed. Hopefully it has unsubscribed all its
142                    # subscribers already so that it's OK if we do nothing
143                    # here
144                    pass
145    
146      def __getattr__(self, attr):      def __getattr__(self, attr):
147          """If attr is one of the delegated methods return that method          """If attr is one of the delegated methods return that method
# Line 362  class MainWindow(DockFrame): Line 372  class MainWindow(DockFrame):
372              result = wxID_NO              result = wxID_NO
373          return result          return result
374    
     def prepare_new_session(self):  
         for d in self.dialogs.values():  
             if not isinstance(d, tree.SessionTreeView):  
                 d.Close()  
   
375      def NewSession(self):      def NewSession(self):
376          if self.save_modified_session() != wxID_CANCEL:          if self.save_modified_session() != wxID_CANCEL:
             self.prepare_new_session()  
377              self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
378    
379      def OpenSession(self):      def OpenSession(self):
380          if self.save_modified_session() != wxID_CANCEL:          if self.save_modified_session() != wxID_CANCEL:
381              dlg = wxFileDialog(self, _("Open Session"), ".", "",              dlg = wxFileDialog(self, _("Open Session"),
382                                   self.application.Path("data"), "",
383                                 "Thuban Session File (*.thuban)|*.thuban",                                 "Thuban Session File (*.thuban)|*.thuban",
384                                 wxOPEN)                                 wxOPEN)
385              if dlg.ShowModal() == wxID_OK:              if dlg.ShowModal() == wxID_OK:
386                  self.prepare_new_session()                  self.application.OpenSession(dlg.GetPath(),
387                  self.application.OpenSession(dlg.GetPath())                                               self.run_db_param_dialog)
388                    self.application.SetPath("data", dlg.GetPath())
389              dlg.Destroy()              dlg.Destroy()
390    
391        def run_db_param_dialog(self, parameters, message):
392            dlg = DBDialog(self, _("DB Connection Parameters"), parameters,
393                           message)
394            return dlg.RunDialog()
395    
396      def SaveSession(self):      def SaveSession(self):
397          if self.application.session.filename == None:          if self.application.session.filename == None:
398              self.SaveSessionAs()              self.SaveSessionAs()
# Line 389  class MainWindow(DockFrame): Line 400  class MainWindow(DockFrame):
400              self.application.SaveSession()              self.application.SaveSession()
401    
402      def SaveSessionAs(self):      def SaveSessionAs(self):
403          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"),
404                               self.application.Path("data"), "",
405                             "Thuban Session File (*.thuban)|*.thuban",                             "Thuban Session File (*.thuban)|*.thuban",
406                             wxSAVE|wxOVERWRITE_PROMPT)                             wxSAVE|wxOVERWRITE_PROMPT)
407          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
408              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
409              self.application.SaveSession()              self.application.SaveSession()
410                self.application.SetPath("data",dlg.GetPath())
411          dlg.Destroy()          dlg.Destroy()
412    
413      def Exit(self):      def Exit(self):
# Line 417  class MainWindow(DockFrame): Line 430  class MainWindow(DockFrame):
430    
431      def SetMap(self, map):      def SetMap(self, map):
432          self.canvas.SetMap(map)          self.canvas.SetMap(map)
433          self.__SetTitle(map.Title())          self.update_title()
434    
435          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
436          if dialog is not None:          if dialog is not None:
# Line 444  class MainWindow(DockFrame): Line 457  class MainWindow(DockFrame):
457          return self.get_open_dialog("session_tree") is not None          return self.get_open_dialog("session_tree") is not None
458    
459      def About(self):      def About(self):
460          self.RunMessageBox(_("About"),          dlg = About(self)
461                             _("Thuban %s\n"          dlg.ShowModal()
462                              #"Build Date: %s\n"          dlg.Destroy()
463                              "using:\n"  
464                              "  %s\n"      def DatabaseManagement(self):
465                              "  %s\n\n"          name = "dbmanagement"
466                              "Thuban is a program for\n"          dialog = self.get_open_dialog(name)
467                              "exploring geographic data.\n"          if dialog is None:
468                              "Copyright (C) 2001-2003 Intevation GmbH.\n"              map = self.canvas.Map()
469                              "Thuban is licensed under the GNU GPL"              dialog = DBFrame(self, name, self.application.Session())
470                              % (Thuban.version.longversion,              self.add_dialog(name, dialog)
471                                 "wxPython %s" % wxPython_version,              dialog.Show()
472                                 "Python %d.%d.%d" % sys.version_info[:3]          dialog.Raise()
                               )),  
 #                           % __ThubanVersion__), #__BuildDate__)),  
                            wxOK | wxICON_INFORMATION)  
473    
474      def AddLayer(self):      def AddLayer(self):
475          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select one or more data files"),
476                             wxOPEN)                             self.application.Path("data"), "",
477                               _("Shapefiles (*.shp)") + "|*.shp;*.SHP|" +
478                               _("All Files (*.*)") + "|*.*",
479                               wxOPEN | wxMULTIPLE)
480          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
481              filename = dlg.GetPath()              filenames = dlg.GetPaths()
482              title = os.path.splitext(os.path.basename(filename))[0]              for filename in filenames:
483              map = self.canvas.Map()                  title = os.path.splitext(os.path.basename(filename))[0]
484              has_layers = map.HasLayers()                  map = self.canvas.Map()
485              try:                  has_layers = map.HasLayers()
486                  store = self.application.Session().OpenShapefile(filename)                  try:
487              except IOError:                      store = self.application.Session().OpenShapefile(filename)
488                  # the layer couldn't be opened                  except IOError:
489                  self.RunMessageBox(_("Add Layer"),                      # the layer couldn't be opened
490                                     _("Can't open the file '%s'.") % filename)                      self.RunMessageBox(_("Add Layer"),
491              else:                                         _("Can't open the file '%s'.")%filename)
492                  layer = Layer(title, store)                  else:
493                  map.AddLayer(layer)                      layer = Layer(title, store)
494                  if not has_layers:                      map.AddLayer(layer)
495                      # if we're adding a layer to an empty map, fit the                      if not has_layers:
496                      # new map to the window                          # if we're adding a layer to an empty map, fit the
497                      self.canvas.FitMapToWindow()                          # new map to the window
498                            self.canvas.FitMapToWindow()
499                        self.application.SetPath("data",filename)
500          dlg.Destroy()          dlg.Destroy()
501    
502      def AddRasterLayer(self):      def AddRasterLayer(self):
503          dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select an image file"),
504                               self.application.Path("data"), "", "*.*",
505                             wxOPEN)                             wxOPEN)
506          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
507              filename = dlg.GetPath()              filename = dlg.GetPath()
# Line 504  class MainWindow(DockFrame): Line 520  class MainWindow(DockFrame):
520                      # if we're adding a layer to an empty map, fit the                      # if we're adding a layer to an empty map, fit the
521                      # new map to the window                      # new map to the window
522                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
523                    self.application.SetPath("data", filename)
524            dlg.Destroy()
525    
526        def AddDBLayer(self):
527            """Add a layer read from a database"""
528            session = self.application.Session()
529            dlg = ChooseDBTableDialog(self, self.application.Session())
530    
531            if dlg.ShowModal() == wxID_OK:
532                dbconn, dbtable, id_column, geo_column = dlg.GetTable()
533                try:
534                    title = str(dbtable)
535    
536                    # Chose the correct Interface for the database type
537                    store = session.OpenDBShapeStore(dbconn, dbtable,
538                                                     id_column = id_column,
539                                                     geometry_column = geo_column)
540                    layer = Layer(title, store)
541                except:
542                    # Some error occured while initializing the layer
543                    self.RunMessageBox(_("Add Layer from database"),
544                                       _("Can't open the database table '%s'")
545                                       % dbtable)
546                    return
547    
548                map = self.canvas.Map()
549    
550                has_layers = map.HasLayers()
551                map.AddLayer(layer)
552                if not has_layers:
553                    self.canvas.FitMapToWindow()
554    
555          dlg.Destroy()          dlg.Destroy()
556    
557      def RemoveLayer(self):      def RemoveLayer(self):
# Line 545  class MainWindow(DockFrame): Line 593  class MainWindow(DockFrame):
593          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
594          return self.canvas.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
595    
596        def has_selected_shape_layer(self):
597            """Return true if a shape layer is currently selected"""
598            return isinstance(self.current_layer(), Layer)
599    
600      def has_selected_shapes(self):      def has_selected_shapes(self):
601          """Return true if a shape is currently selected"""          """Return true if a shape is currently selected"""
602          return self.canvas.HasSelectedShapes()          return self.canvas.HasSelectedShapes()
# Line 674  class MainWindow(DockFrame): Line 726  class MainWindow(DockFrame):
726          else:          else:
727              dialog.Show(not dialog.IsShown())              dialog.Show(not dialog.IsShown())
728    
         self.canvas.FitMapToWindow()  
   
729      def LegendShown(self):      def LegendShown(self):
730          """Return true iff the legend is currently open"""          """Return true iff the legend is currently open"""
731          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
732          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
733    
734      def TableOpen(self):      def TableOpen(self):
735          dlg = wxFileDialog(self, _("Open Table"), ".", "",          dlg = wxFileDialog(self, _("Open Table"),
736                               self.application.Path("data"), "",
737                             _("DBF Files (*.dbf)") + "|*.dbf|" +                             _("DBF Files (*.dbf)") + "|*.dbf|" +
738                             #_("CSV Files (*.csv)") + "|*.csv|" +                             #_("CSV Files (*.csv)") + "|*.csv|" +
739                             _("All Files (*.*)") + "|*.*",                             _("All Files (*.*)") + "|*.*",
# Line 698  class MainWindow(DockFrame): Line 749  class MainWindow(DockFrame):
749                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
750              else:              else:
751                  self.ShowTableView(table)                  self.ShowTableView(table)
752                    self.application.SetPath("data",filename)
753    
754      def TableClose(self):      def TableClose(self):
755          tables = self.application.session.UnreferencedTables()          tables = self.application.session.UnreferencedTables()
# Line 751  class MainWindow(DockFrame): Line 803  class MainWindow(DockFrame):
803                                                 table)                                                 table)
804              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
805              dialog.Show(True)              dialog.Show(True)
806          # FIXME: else bring dialog to front          dialog.Raise()
807    
808      def TableRename(self):      def TableRename(self):
809          """Let the user rename a table"""          """Let the user rename a table"""
# Line 774  class MainWindow(DockFrame): Line 826  class MainWindow(DockFrame):
826    
827          # Second, let the user rename the layers          # Second, let the user rename the layers
828          for table in to_rename:          for table in to_rename:
829              dlg = wxTextEntryDialog(self, "Table Title: ", "Rename Table",              dlg = wxTextEntryDialog(self, _("Table Title:"), _("Rename Table"),
830                                      table.Title())                                      table.Title())
831              try:              try:
832                  if dlg.ShowModal() == wxID_OK:                  if dlg.ShowModal() == wxID_OK:
# Line 823  class MainWindow(DockFrame): Line 875  class MainWindow(DockFrame):
875          self.canvas.Print()          self.canvas.Print()
876    
877      def RenameMap(self):      def RenameMap(self):
878          dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",          dlg = wxTextEntryDialog(self, _("Map Title:"), _("Rename Map"),
879                                  self.Map().Title())                                  self.Map().Title())
880          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
881              title = dlg.GetValue()              title = dlg.GetValue()
882              if title != "":              if title != "":
883                  self.Map().SetTitle(title)                  self.Map().SetTitle(title)
                 self.__SetTitle(title)  
884    
885          dlg.Destroy()          dlg.Destroy()
886    
# Line 837  class MainWindow(DockFrame): Line 888  class MainWindow(DockFrame):
888          """Let the user rename the currently selected layer"""          """Let the user rename the currently selected layer"""
889          layer = self.current_layer()          layer = self.current_layer()
890          if layer is not None:          if layer is not None:
891              dlg = wxTextEntryDialog(self, "Layer Title: ", "Rename Layer",              dlg = wxTextEntryDialog(self, _("Layer Title:"), _("Rename Layer"),
892                                      layer.Title())                                      layer.Title())
893              try:              try:
894                  if dlg.ShowModal() == wxID_OK:                  if dlg.ShowModal() == wxID_OK:
# Line 871  class MainWindow(DockFrame): Line 922  class MainWindow(DockFrame):
922                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
923                  pass                  pass
924    
925      def __SetTitle(self, title):      def title_changed(self, map):
926          self.SetTitle("Thuban - " + title)          """Subscribed to the canvas' TITLE_CHANGED messages"""
927            self.update_title()
928    
929        def update_title(self):
930            """Update the window's title according to it's current state.
931    
932            In this default implementation the title is 'Thuban - ' followed
933            by the map's title or simply 'Thuban' if there is not map.
934            Derived classes should override this method to get different
935            titles.
936    
937            This method is called automatically by other methods when the
938            title may have to change. For the methods implemented in this
939            class this usually only means that a different map has been set
940            or the current map's title has changed.
941            """
942            map = self.Map()
943            if map is not None:
944                title = _("Thuban - %s") % (map.Title(),)
945            else:
946                title = _("Thuban")
947            self.SetTitle(title)
948    
949    
950  #  #
951  # Define all the commands available in the main window  # Define all the commands available in the main window
# Line 914  def _has_selected_layer(context): Line 987  def _has_selected_layer(context):
987      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
988      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
989    
990    def _has_selected_shape_layer(context):
991        """Return true if a shape layer is selected in the context"""
992        return context.mainwindow.has_selected_shape_layer()
993    
994  def _has_selected_shapes(context):  def _has_selected_shapes(context):
995      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
996      return context.mainwindow.has_selected_shapes()      return context.mainwindow.has_selected_shapes()
# Line 944  def _has_gdal_support(context): Line 1021  def _has_gdal_support(context):
1021      """Return True if the GDAL is available"""      """Return True if the GDAL is available"""
1022      return Thuban.Model.resource.has_gdal_support()      return Thuban.Model.resource.has_gdal_support()
1023    
1024    def _has_dbconnections(context):
1025        """Return whether the the session has database connections"""
1026        return context.session.HasDBConnections()
1027    
1028    def _has_postgis_support(context):
1029        return has_postgis_support()
1030    
1031    
1032  # File menu  # File menu
1033  _method_command("new_session", _("&New Session"), "NewSession",  _method_command("new_session", _("&New Session"), "NewSession",
1034                  helptext = _("Start a new session"))                  helptext = _("Start a new session"))
# Line 959  _method_command("toggle_session_tree", _ Line 1044  _method_command("toggle_session_tree", _
1044  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
1045                  checked = _has_legend_shown,                  checked = _has_legend_shown,
1046                  helptext = _("Toggle Legend on/off"))                  helptext = _("Toggle Legend on/off"))
1047    _method_command("database_management", _("&Database Connections..."),
1048                    "DatabaseManagement",
1049                    sensitive = _has_postgis_support)
1050  _method_command("exit", _("E&xit"), "Exit",  _method_command("exit", _("E&xit"), "Exit",
1051                  helptext = _("Finish working with Thuban"))                  helptext = _("Finish working with Thuban"))
1052    
# Line 1008  _method_command("layer_add", _("&Add Lay Line 1096  _method_command("layer_add", _("&Add Lay
1096  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
1097                  helptext = _("Add a new image layer to the map"),                  helptext = _("Add a new image layer to the map"),
1098                  sensitive = _has_gdal_support)                  sensitive = _has_gdal_support)
1099    _method_command("layer_add_db", _("Add &Database Layer..."), "AddDBLayer",
1100                    helptext = _("Add a new database layer to active map"),
1101                    sensitive = _has_dbconnections)
1102  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
1103                  helptext = _("Remove selected layer"),                  helptext = _("Remove selected layer"),
1104                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
# Line 1036  _method_command("layer_hide", _("&Hide") Line 1127  _method_command("layer_hide", _("&Hide")
1127                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1128  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
1129                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
1130                  sensitive = _has_selected_layer)                  sensitive = _has_selected_shape_layer)
1131  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
1132                  sensitive = _has_selected_layer,                  sensitive = _has_selected_layer,
1133                  helptext = _("Edit the properties of the selected layer"))                  helptext = _("Edit the properties of the selected layer"))
1134  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
1135                  sensitive = _has_selected_layer,                  sensitive = _has_selected_shape_layer,
1136                  helptext = _("Join and attach a table to the selected layer"))                  helptext = _("Join and attach a table to the selected layer"))
1137    
1138  def _can_unjoin(context):  def _can_unjoin(context):
# Line 1083  _method_command("table_join", _("&Join.. Line 1174  _method_command("table_join", _("&Join..
1174                  helptext = _("Join two tables creating a new one"))                  helptext = _("Join two tables creating a new one"))
1175    
1176  #  Export only under Windows ...  #  Export only under Windows ...
1177  map_menu = ["layer_add", "rasterlayer_add", "layer_remove",  map_menu = ["layer_add", "layer_add_db", "rasterlayer_add", "layer_remove",
1178                          None,                          None,
1179                          "map_rename",                          "map_rename",
1180                          "map_projection",                          "map_projection",
1181                          None,                          None,
1182                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
1183                          "map_pan_tool",                          "map_pan_tool",
1184                          "map_full_extent",                          "map_full_extent",
1185                          "layer_full_extent",                          "layer_full_extent",
1186                          "selected_full_extent",                          "selected_full_extent",
1187                          None,                          None,
# Line 1107  main_menu = Menu("<main>", "<main>", Line 1198  main_menu = Menu("<main>", "<main>",
1198                   [Menu("file", _("&File"),                   [Menu("file", _("&File"),
1199                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
1200                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
1201                            "database_management", None,
1202                          "toggle_session_tree", None,                          "toggle_session_tree", None,
1203                          "exit"]),                          "exit"]),
1204                    Menu("map", _("&Map"), map_menu),                    Menu("map", _("&Map"), map_menu),
# Line 1142  main_toolbar = Menu("<toolbar>", "<toolb Line 1234  main_toolbar = Menu("<toolbar>", "<toolb
1234                       "selected_full_extent",                       "selected_full_extent",
1235                       None,                       None,
1236                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
1237    

Legend:
Removed from v.1233  
changed lines
  Added in v.2102

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26