/[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 1068 by bh, Tue May 27 15:02:37 2003 UTC revision 2551 by jonathan, Thu Jan 27 14:19:41 2005 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003, 2004, 2005 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
20    
21  from wxPython.wx import *  from wxPython.wx import *
 from wxPython.wx import __version__ as wxPython_version  
   
 from wxPython.lib.dialogs import wxMultipleChoiceDialog  
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, LAYER_PROJECTION_CHANGED, \
27         MAP_PROJECTION_CHANGED, MAP_LAYERS_ADDED, MAP_LAYERS_REMOVED
28    
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, has_postgis_support
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
39  import tableview, identifyview  import tableview, identifyview
 from Thuban.UI.classifier import Classifier  
40  import legend  import legend
41  from menu import Menu  from menu import Menu
42    
43  from context import Context  from context import Context
44  from command import registry, Command, ToolCommand  from command import registry, Command, ToolCommand
45  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION, \
46         MAP_REPLACED
47    from about import About
48    
49  from Thuban.UI.dock import DockFrame  from Thuban.UI.dock import DockFrame
50  from Thuban.UI.join import JoinDialog  from Thuban.UI.join import JoinDialog
51    from Thuban.UI.dbdialog import DBFrame, DBDialog, ChooseDBTableDialog
52  import resource  import resource
53    import Thuban.Model.resource
54    
55  import projdialog  import projdialog
56    
57    from Thuban.UI.classifier import Classifier
58    from Thuban.UI.rasterlayerproperties import RasterLayerProperties
59    from Thuban.Model.layer import RasterLayer
60    
61    from Thuban.Lib.classmapper import ClassMapper
62    
63    layer_properties_dialogs = ClassMapper()
64    layer_properties_dialogs.add(RasterLayer, RasterLayerProperties)
65    layer_properties_dialogs.add(Layer, Classifier)
66    
67  class MainWindow(DockFrame):  class MainWindow(DockFrame):
68    
# Line 58  class MainWindow(DockFrame): Line 72  class MainWindow(DockFrame):
72      # actually come from. This delegation is implemented in the      # actually come from. This delegation is implemented in the
73      # Subscribe and unsubscribed methods      # Subscribe and unsubscribed methods
74      delegated_messages = {LAYER_SELECTED: "canvas",      delegated_messages = {LAYER_SELECTED: "canvas",
75                            SHAPES_SELECTED: "canvas"}                            SHAPES_SELECTED: "canvas",
76                              MAP_REPLACED: "canvas"}
77    
78      # Methods delegated to some instance variables. The delegation is      # Methods delegated to some instance variables. The delegation is
79      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
80      delegated_methods = {"SelectLayer": "canvas",      delegated_methods = {"SelectLayer": "canvas",
81                           "SelectShapes": "canvas",                           "SelectShapes": "canvas",
82                             "SelectedLayer": "canvas",
83                           "SelectedShapes": "canvas",                           "SelectedShapes": "canvas",
84                           }                           }
85    
86        # Messages from the canvas that may require a status bar update.
87        # The update_status_bar method will be subscribed to these messages.
88        update_status_bar_messages = (VIEW_POSITION, LAYER_PROJECTION_CHANGED,
89                                      MAP_PROJECTION_CHANGED, MAP_LAYERS_ADDED,
90                                      MAP_LAYERS_REMOVED)
91    
92      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
93                   initial_message = None, size = wxSize(-1, -1)):                   initial_message = None, size = wxSize(-1, -1)):
94          DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)          DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
# Line 93  class MainWindow(DockFrame): Line 115  class MainWindow(DockFrame):
115    
116          # Create the map canvas          # Create the map canvas
117          canvas = view.MapCanvas(self, -1)          canvas = view.MapCanvas(self, -1)
         canvas.Subscribe(VIEW_POSITION, self.view_position_changed)  
118          canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)          canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
119          self.canvas = canvas          self.canvas = canvas
120            self.canvas.Subscribe(TITLE_CHANGED, self.title_changed)
121    
122            for channel in self.update_status_bar_messages:
123                self.canvas.Subscribe(channel, self.update_status_bar)
124    
125          self.SetMainWindow(self.canvas)          self.SetMainWindow(self.canvas)
126    
# Line 103  class MainWindow(DockFrame): Line 128  class MainWindow(DockFrame):
128    
129          self.init_dialogs()          self.init_dialogs()
130    
131            self.ShowLegend()
132    
133          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
134    
135      def Subscribe(self, channel, *args):      def Subscribe(self, channel, *args):
# Line 125  class MainWindow(DockFrame): Line 152  class MainWindow(DockFrame):
152          """          """
153          if channel in self.delegated_messages:          if channel in self.delegated_messages:
154              object = getattr(self, self.delegated_messages[channel])              object = getattr(self, self.delegated_messages[channel])
155              object.Unsubscribe(channel, *args)              try:
156                    object.Unsubscribe(channel, *args)
157                except wxPyDeadObjectError:
158                    # The object was a wxObject and has already been
159                    # destroyed. Hopefully it has unsubscribed all its
160                    # subscribers already so that it's OK if we do nothing
161                    # here
162                    pass
163    
164      def __getattr__(self, attr):      def __getattr__(self, attr):
165          """If attr is one of the delegated methods return that method          """If attr is one of the delegated methods return that method
# Line 316  class MainWindow(DockFrame): Line 350  class MainWindow(DockFrame):
350      def get_open_dialog(self, name):      def get_open_dialog(self, name):
351          return self.dialogs.get(name)          return self.dialogs.get(name)
352    
353      def view_position_changed(self):      def update_status_bar(self, *args):
354            """Handler for a bunch of messages that may require a status bar update
355    
356            Currently this handles the canvas' VIEW_POSITION_CHANGED
357            messages as well as several messages about changes in the map
358            which may affect whether and how projections are used.
359    
360            These messages affect the text in the status bar in the following way:
361    
362            When VIEW_POSITION_CHANGED messages are sent and the mouse is
363            actually in the canvas window, display the current mouse
364            coordinates as defined by the canvas' CurrentPosition method.
365    
366            If there is no current position to show, check whether there is
367            a potential problem with the map and layer projections and
368            display a message about it.  Otherwise the status bar will
369            become empty.
370    
371            The text is displayed in the status bar using the
372            set_position_text method.
373            """
374            # Implementation note: We do not really have to know which
375            # message was sent.  We can simply call the canvas'
376            # CurrentPosition method and if that returns a tuple, it was a
377            # VIEW_POSITION_CHANGED message and we have to display it.
378            # Otherwise it was a VIEW_POSITION_CHANGED message where the
379            # mouse has left the canvas or it was a message about a change
380            # to the map, in which case we check the projections.
381            #
382            # When changing this method, keep in mind that the
383            # VIEW_POSITION_CHANGED message are sent for every mouse move in
384            # the canvas window, that is they happen very often, so the path
385            # taken in that case has to be fast.
386            text = ""
387          pos = self.canvas.CurrentPosition()          pos = self.canvas.CurrentPosition()
388          if pos is not None:          if pos is not None:
389              text = "(%10.10g, %10.10g)" % pos              text = "(%10.10g, %10.10g)" % pos
390          else:          else:
391              text = ""              for layer in self.canvas.Map().Layers():
392                    bbox = layer.LatLongBoundingBox()
393                    if bbox:
394                        left, bottom, right, top = bbox
395                        if not (-180 <= left <= 180 and
396                                -180 <= right <= 180 and
397                                -90 <= top <= 90 and
398                                -90 <= bottom <= 90):
399                            text = _("Select layer '%s' and pick a projection "
400                                     "using Layer/Projection...") % layer.title
401                            break
402    
403          self.set_position_text(text)          self.set_position_text(text)
404    
405      def set_position_text(self, text):      def set_position_text(self, text):
406          """Set the statusbar text showing the current position.          """Set the statusbar text to that created by update_status_bar
407    
408          By default the text is shown in field 0 of the status bar.          By default the text is shown in field 0 of the status bar.
409          Override this method in derived classes to put it into a          Override this method in derived classes to put it into a
410          different field of the statusbar.          different field of the statusbar.
411    
412            For historical reasons this method is called set_position_text
413            because at first the text was always either the current position
414            or the empty string.  Now it can contain other messages as well.
415            The method will be renamed at one point.
416          """          """
417            # Note: If this method is renamed we should perhaps think about
418            # some backwards compatibility measures for projects like
419            # GREAT-ER which override this method.
420          self.SetStatusText(text)          self.SetStatusText(text)
421    
422        def OpenOrRaiseDialog(self, name, dialog_class, *args, **kw):
423            """
424            Open or raise a dialog.
425    
426            If a dialog with the denoted name does already exist it is
427            raised.  Otherwise a new dialog, an instance of dialog_class,
428            is created, inserted into the main list and displayed.
429            """
430            dialog = self.get_open_dialog(name)
431    
432            if dialog is None:
433                dialog = dialog_class(self, name, *args, **kw)
434                self.add_dialog(name, dialog)
435                dialog.Show(True)
436            else:
437                dialog.Raise()
438                              
439      def save_modified_session(self, can_veto = 1):      def save_modified_session(self, can_veto = 1):
440          """If the current session has been modified, ask the user          """If the current session has been modified, ask the user
441          whether to save it and do so if requested. Return the outcome of          whether to save it and do so if requested. Return the outcome of
# Line 356  class MainWindow(DockFrame): Line 459  class MainWindow(DockFrame):
459              result = wxID_NO              result = wxID_NO
460          return result          return result
461    
     def prepare_new_session(self):  
         for d in self.dialogs.values():  
             if not isinstance(d, tree.SessionTreeView):  
                 d.Close()  
   
462      def NewSession(self):      def NewSession(self):
463          if self.save_modified_session() != wxID_CANCEL:          if self.save_modified_session() != wxID_CANCEL:
             self.prepare_new_session()  
464              self.application.SetSession(create_empty_session())              self.application.SetSession(create_empty_session())
465    
466      def OpenSession(self):      def OpenSession(self):
467          if self.save_modified_session() != wxID_CANCEL:          if self.save_modified_session() != wxID_CANCEL:
468              dlg = wxFileDialog(self, _("Open Session"), ".", "",              dlg = wxFileDialog(self, _("Open Session"),
469                                   self.application.Path("data"), "",
470                                 "Thuban Session File (*.thuban)|*.thuban",                                 "Thuban Session File (*.thuban)|*.thuban",
471                                 wxOPEN)                                 wxOPEN)
472              if dlg.ShowModal() == wxID_OK:              if dlg.ShowModal() == wxID_OK:
473                  self.prepare_new_session()                  self.application.OpenSession(dlg.GetPath(),
474                  self.application.OpenSession(dlg.GetPath())                                               self.run_db_param_dialog)
475                    self.application.SetPath("data", dlg.GetPath())
476              dlg.Destroy()              dlg.Destroy()
477    
478        def run_db_param_dialog(self, parameters, message):
479            dlg = DBDialog(self, _("DB Connection Parameters"), parameters,
480                           message)
481            return dlg.RunDialog()
482    
483      def SaveSession(self):      def SaveSession(self):
484          if self.application.session.filename == None:          if self.application.session.filename == None:
485              self.SaveSessionAs()              self.SaveSessionAs()
# Line 383  class MainWindow(DockFrame): Line 487  class MainWindow(DockFrame):
487              self.application.SaveSession()              self.application.SaveSession()
488    
489      def SaveSessionAs(self):      def SaveSessionAs(self):
490          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"),
491                               self.application.Path("data"), "",
492                             "Thuban Session File (*.thuban)|*.thuban",                             "Thuban Session File (*.thuban)|*.thuban",
493                             wxSAVE|wxOVERWRITE_PROMPT)                             wxSAVE|wxOVERWRITE_PROMPT)
494          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
495              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
496              self.application.SaveSession()              self.application.SaveSession()
497                self.application.SetPath("data",dlg.GetPath())
498          dlg.Destroy()          dlg.Destroy()
499    
500      def Exit(self):      def Exit(self):
# Line 402  class MainWindow(DockFrame): Line 508  class MainWindow(DockFrame):
508              # FIXME: it would be better to tie the unsubscription to              # FIXME: it would be better to tie the unsubscription to
509              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
510              # yet.              # yet.
511              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              for channel in self.update_status_bar_messages:
512                    self.canvas.Unsubscribe(channel, self.update_status_bar)
513    
514              DockFrame.OnClose(self, event)              DockFrame.OnClose(self, event)
515              for dlg in self.dialogs.values():              for dlg in self.dialogs.values():
516                  dlg.Destroy()                  dlg.Destroy()
# Line 411  class MainWindow(DockFrame): Line 519  class MainWindow(DockFrame):
519    
520      def SetMap(self, map):      def SetMap(self, map):
521          self.canvas.SetMap(map)          self.canvas.SetMap(map)
522          self.__SetTitle(map.Title())          self.update_title()
523    
524          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
525          if dialog is not None:          if dialog is not None:
# Line 438  class MainWindow(DockFrame): Line 546  class MainWindow(DockFrame):
546          return self.get_open_dialog("session_tree") is not None          return self.get_open_dialog("session_tree") is not None
547    
548      def About(self):      def About(self):
549          self.RunMessageBox(_("About"),          dlg = About(self)
550                             _("Thuban %s\n"          dlg.ShowModal()
551                              #"Build Date: %s\n"          dlg.Destroy()
552                              "using:\n"  
553                              "  %s\n"      def DatabaseManagement(self):
554                              "  %s\n\n"          name = "dbmanagement"
555                              "Thuban is a program for\n"          dialog = self.get_open_dialog(name)
556                              "exploring geographic data.\n"          if dialog is None:
557                              "Copyright (C) 2001-2003 Intevation GmbH.\n"              map = self.canvas.Map()
558                              "Thuban is licensed under the GNU GPL"              dialog = DBFrame(self, name, self.application.Session())
559                              % (Thuban.version.longversion,              self.add_dialog(name, dialog)
560                                 "wxPython %s" % wxPython_version,              dialog.Show()
561                                 "Python %d.%d.%d" % sys.version_info[:3]          dialog.Raise()
                               )),  
 #                           % __ThubanVersion__), #__BuildDate__)),  
                            wxOK | wxICON_INFORMATION)  
562    
563      def AddLayer(self):      def AddLayer(self):
564          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select one or more data files"),
565                             wxOPEN)                             self.application.Path("data"), "",
566                               _("Shapefiles (*.shp)") + "|*.shp;*.SHP|" +
567                               _("All Files (*.*)") + "|*.*",
568                               wxOPEN | wxMULTIPLE)
569          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
570              filename = dlg.GetPath()              filenames = dlg.GetPaths()
571              title = os.path.splitext(os.path.basename(filename))[0]              for filename in filenames:
572              map = self.canvas.Map()                  title = os.path.splitext(os.path.basename(filename))[0]
573              has_layers = map.HasLayers()                  map = self.canvas.Map()
574              try:                  has_layers = map.HasLayers()
575                  store = self.application.Session().OpenShapefile(filename)                  try:
576              except IOError:                      store = self.application.Session().OpenShapefile(filename)
577                  # the layer couldn't be opened                  except IOError:
578                  self.RunMessageBox(_("Add Layer"),                      # the layer couldn't be opened
579                                     _("Can't open the file '%s'.") % filename)                      self.RunMessageBox(_("Add Layer"),
580              else:                                         _("Can't open the file '%s'.")%filename)
581                  layer = Layer(title, store)                  else:
582                  map.AddLayer(layer)                      layer = Layer(title, store)
583                  if not has_layers:                      map.AddLayer(layer)
584                      # if we're adding a layer to an empty map, fit the                      if not has_layers:
585                      # new map to the window                          # if we're adding a layer to an empty map, fit the
586                      self.canvas.FitMapToWindow()                          # new map to the window
587                            self.canvas.FitMapToWindow()
588                        self.application.SetPath("data",filename)
589          dlg.Destroy()          dlg.Destroy()
590    
591      def AddRasterLayer(self):      def AddRasterLayer(self):
592          dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",          dlg = wxFileDialog(self, _("Select an image file"),
593                               self.application.Path("data"), "", "*.*",
594                             wxOPEN)                             wxOPEN)
595          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
596              filename = dlg.GetPath()              filename = dlg.GetPath()
# Line 498  class MainWindow(DockFrame): Line 609  class MainWindow(DockFrame):
609                      # if we're adding a layer to an empty map, fit the                      # if we're adding a layer to an empty map, fit the
610                      # new map to the window                      # new map to the window
611                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
612                    self.application.SetPath("data", filename)
613            dlg.Destroy()
614    
615        def AddDBLayer(self):
616            """Add a layer read from a database"""
617            session = self.application.Session()
618            dlg = ChooseDBTableDialog(self, self.application.Session())
619    
620            if dlg.ShowModal() == wxID_OK:
621                dbconn, dbtable, id_column, geo_column = dlg.GetTable()
622                try:
623                    title = str(dbtable)
624    
625                    # Chose the correct Interface for the database type
626                    store = session.OpenDBShapeStore(dbconn, dbtable,
627                                                     id_column = id_column,
628                                                     geometry_column = geo_column)
629                    layer = Layer(title, store)
630                except:
631                    # Some error occured while initializing the layer
632                    self.RunMessageBox(_("Add Layer from database"),
633                                       _("Can't open the database table '%s'")
634                                       % dbtable)
635                    return
636    
637                map = self.canvas.Map()
638    
639                has_layers = map.HasLayers()
640                map.AddLayer(layer)
641                if not has_layers:
642                    self.canvas.FitMapToWindow()
643    
644          dlg.Destroy()          dlg.Destroy()
645    
646      def RemoveLayer(self):      def RemoveLayer(self):
# Line 518  class MainWindow(DockFrame): Line 661  class MainWindow(DockFrame):
661              return self.canvas.Map().CanRemoveLayer(layer)              return self.canvas.Map().CanRemoveLayer(layer)
662          return False          return False
663    
664        def LayerToTop(self):
665            layer = self.current_layer()
666            if layer is not None:
667                self.canvas.Map().MoveLayerToTop(layer)
668    
669      def RaiseLayer(self):      def RaiseLayer(self):
670          layer = self.current_layer()          layer = self.current_layer()
671          if layer is not None:          if layer is not None:
# Line 528  class MainWindow(DockFrame): Line 676  class MainWindow(DockFrame):
676          if layer is not None:          if layer is not None:
677              self.canvas.Map().LowerLayer(layer)              self.canvas.Map().LowerLayer(layer)
678    
679        def LayerToBottom(self):
680            layer = self.current_layer()
681            if layer is not None:
682                self.canvas.Map().MoveLayerToBottom(layer)
683    
684      def current_layer(self):      def current_layer(self):
685          """Return the currently selected layer.          """Return the currently selected layer.
686    
# Line 539  class MainWindow(DockFrame): Line 692  class MainWindow(DockFrame):
692          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
693          return self.canvas.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
694    
695        def has_selected_shape_layer(self):
696            """Return true if a shape layer is currently selected"""
697            return isinstance(self.current_layer(), Layer)
698    
699      def has_selected_shapes(self):      def has_selected_shapes(self):
700          """Return true if a shape is currently selected"""          """Return true if a shape is currently selected"""
701          return self.canvas.HasSelectedShapes()          return self.canvas.HasSelectedShapes()
# Line 546  class MainWindow(DockFrame): Line 703  class MainWindow(DockFrame):
703      def HideLayer(self):      def HideLayer(self):
704          layer = self.current_layer()          layer = self.current_layer()
705          if layer is not None:          if layer is not None:
706              layer.SetVisible(0)              layer.SetVisible(False)
707            
708      def ShowLayer(self):      def ShowLayer(self):
709          layer = self.current_layer()          layer = self.current_layer()
710          if layer is not None:          if layer is not None:
711              layer.SetVisible(1)              layer.SetVisible(True)
712    
713        def ToggleLayerVisibility(self):
714            layer = self.current_layer()
715            layer.SetVisible(not layer.Visible())
716    
717        def DuplicateLayer(self):
718            """Ceate a new layer above the selected layer with the same shapestore
719            """
720            layer = self.current_layer()
721            if layer is not None and hasattr(layer, "ShapeStore"):
722                new_layer = Layer(_("Copy of `%s'") % layer.Title(),
723                                  layer.ShapeStore(),
724                                  projection = layer.GetProjection())
725                new_classification = copy.deepcopy(layer.GetClassification())
726                new_layer.SetClassificationColumn(
727                        layer.GetClassificationColumn())
728                new_layer.SetClassification(new_classification)
729                self.Map().AddLayer(new_layer)
730    
731        def CanDuplicateLayer(self):
732            """Return whether the DuplicateLayer method can create a duplicate"""
733            layer = self.current_layer()
734            return layer is not None and hasattr(layer, "ShapeStore")
735    
736      def LayerShowTable(self):      def LayerShowTable(self):
737            """
738            Present a TableView Window for the current layer.
739            In case the window is already open, bring it to the front.
740            In case, there is no active layer, do nothing.
741            In case, the layer has no ShapeStore, do nothing.
742            """
743          layer = self.current_layer()          layer = self.current_layer()
744          if layer is not None:          if layer is not None:
745              table = layer.table              if not hasattr(layer, "ShapeStore"):
746                    return
747                table = layer.ShapeStore().Table()
748              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
749              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
750              if dialog is None:              if dialog is None:
# Line 566  class MainWindow(DockFrame): Line 754  class MainWindow(DockFrame):
754                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
755                  dialog.Show(True)                  dialog.Show(True)
756              else:              else:
757                  # FIXME: bring dialog to front here                  dialog.Raise()
                 pass  
758    
759      def MapProjection(self):      def MapProjection(self):
760    
# Line 609  class MainWindow(DockFrame): Line 796  class MainWindow(DockFrame):
796          self.OpenLayerProperties(layer)          self.OpenLayerProperties(layer)
797    
798      def OpenLayerProperties(self, layer, group = None):      def OpenLayerProperties(self, layer, group = None):
799          name = "layer_properties" + str(id(layer))          """
800          dialog = self.get_open_dialog(name)          Open or raise the properties dialog.
801    
802          if dialog is None:          This method opens or raises the properties dialog for the
803              dialog = Classifier(self, name, layer, group)          currently selected layer if one is defined for this layer
804              self.add_dialog(name, dialog)          type.
805              dialog.Show()          """
806          dialog.Raise()          dialog_class = layer_properties_dialogs.get(layer)
807    
808            if dialog_class is not None:
809                name = "layer_properties" + str(id(layer))
810                self.OpenOrRaiseDialog(name, dialog_class, layer, group = group)
811    
812      def LayerJoinTable(self):      def LayerJoinTable(self):
813          print "LayerJoinTable: Not implemented."          layer = self.canvas.SelectedLayer()
814            if layer is not None:
815                dlg = JoinDialog(self, _("Join Layer with Table"),
816                                 self.application.session,
817                                 layer = layer)
818                dlg.ShowModal()
819    
820      def LayerUnjoinTable(self):      def LayerUnjoinTable(self):
821          print "LayerUnjoinTable: Not implemented."          layer = self.canvas.SelectedLayer()
822            if layer is not None:
823                orig_store = layer.ShapeStore().OrigShapeStore()
824                if orig_store:
825                    layer.SetShapeStore(orig_store)
826    
827      def ShowLegend(self):      def ShowLegend(self):
828          if not self.LegendShown():          if not self.LegendShown():
# Line 648  class MainWindow(DockFrame): Line 848  class MainWindow(DockFrame):
848          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
849    
850      def TableOpen(self):      def TableOpen(self):
851          dlg = wxFileDialog(self, _("Open Table"), ".", "",          dlg = wxFileDialog(self, _("Open Table"),
852                               self.application.Path("data"), "",
853                             _("DBF Files (*.dbf)") + "|*.dbf|" +                             _("DBF Files (*.dbf)") + "|*.dbf|" +
854                             #_("CSV Files (*.csv)") + "|*.csv|" +                             #_("CSV Files (*.csv)") + "|*.csv|" +
855                             _("All Files (*.*)") + "|*.*",                             _("All Files (*.*)") + "|*.*",
# Line 664  class MainWindow(DockFrame): Line 865  class MainWindow(DockFrame):
865                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
866              else:              else:
867                  self.ShowTableView(table)                  self.ShowTableView(table)
868                    self.application.SetPath("data",filename)
869    
870      def TableClose(self):      def TableClose(self):
871          tables = self.application.session.UnreferencedTables()          tables = self.application.session.UnreferencedTables()
872    
873            lst = [(t.Title(), t) for t in tables]
874            lst.sort()
875            titles = [i[0] for i in lst]
876          dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),          dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
877                                       _("Close Table"),                                       _("Close Table"), titles,
878                                       [t.Title() for t in tables],                                       size = (400, 300),
879                                       size = (400, 300), style=wxRESIZE_BORDER)                                       style = wxDEFAULT_DIALOG_STYLE |
880                                                 wxRESIZE_BORDER)
881          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
882              for i in dlg.GetValue():              for i in dlg.GetValue():
883                  self.application.session.RemoveTable(tables[i])                  self.application.session.RemoveTable(lst[i][1])
884    
885    
886      def TableShow(self):      def TableShow(self):
# Line 685  class MainWindow(DockFrame): Line 891  class MainWindow(DockFrame):
891          """          """
892          tables = self.application.session.Tables()          tables = self.application.session.Tables()
893    
894            lst = [(t.Title(), t) for t in tables]
895            lst.sort()
896            titles = [i[0] for i in lst]
897          dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),          dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
898                                       _("Show Table"),                                       _("Show Table"), titles,
899                                       [t.Title() for t in tables],                                       size = (400,300),
900                                       size = (400,300), style = wxRESIZE_BORDER)                                       style = wxDEFAULT_DIALOG_STYLE |
901                                                 wxRESIZE_BORDER)
902          if (dlg.ShowModal() == wxID_OK):          if (dlg.ShowModal() == wxID_OK):
903              for i in dlg.GetValue():              for i in dlg.GetValue():
904                  # XXX: if the table belongs to a layer, open a                  # XXX: if the table belongs to a layer, open a
905                  # LayerTableFrame instead of QueryTableFrame                  # LayerTableFrame instead of QueryTableFrame
906                  self.ShowTableView(tables[i])                  self.ShowTableView(lst[i][1])
907    
908      def TableJoin(self):      def TableJoin(self):
909          dlg = JoinDialog(self, _("Join Tables"), self.application.session)          dlg = JoinDialog(self, _("Join Tables"), self.application.session)
# Line 709  class MainWindow(DockFrame): Line 919  class MainWindow(DockFrame):
919                                                 table)                                                 table)
920              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
921              dialog.Show(True)              dialog.Show(True)
922          # FIXME: else bring dialog to front          dialog.Raise()
923    
924        def TableRename(self):
925            """Let the user rename a table"""
926    
927            # First, let the user select a table
928            tables = self.application.session.Tables()
929            lst = [(t.Title(), t) for t in tables]
930            lst.sort()
931            titles = [i[0] for i in lst]
932            dlg = wxMultipleChoiceDialog(self, _("Pick the table to rename:"),
933                                         _("Rename Table"), titles,
934                                         size = (400,300),
935                                         style = wxDEFAULT_DIALOG_STYLE |
936                                                 wxRESIZE_BORDER)
937            if (dlg.ShowModal() == wxID_OK):
938                to_rename = [lst[i][1] for i in dlg.GetValue()]
939                dlg.Destroy()
940            else:
941                to_rename = []
942    
943            # Second, let the user rename the layers
944            for table in to_rename:
945                dlg = wxTextEntryDialog(self, _("Table Title:"), _("Rename Table"),
946                                        table.Title())
947                try:
948                    if dlg.ShowModal() == wxID_OK:
949                        title = dlg.GetValue()
950                        if title != "":
951                            table.SetTitle(title)
952    
953                            # Make sure the session is marked as modified.
954                            # FIXME: This should be handled automatically,
955                            # but that requires more changes to the tables
956                            # than I have time for currently.
957                            self.application.session.changed()
958                finally:
959                    dlg.Destroy()
960    
961    
962      def ZoomInTool(self):      def ZoomInTool(self):
963          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 743  class MainWindow(DockFrame): Line 991  class MainWindow(DockFrame):
991          self.canvas.Print()          self.canvas.Print()
992    
993      def RenameMap(self):      def RenameMap(self):
994          dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",          dlg = wxTextEntryDialog(self, _("Map Title:"), _("Rename Map"),
995                                  self.Map().Title())                                  self.Map().Title())
996          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
997              title = dlg.GetValue()              title = dlg.GetValue()
998              if title != "":              if title != "":
999                  self.Map().SetTitle(title)                  self.Map().SetTitle(title)
                 self.__SetTitle(title)  
1000    
1001          dlg.Destroy()          dlg.Destroy()
1002    
1003        def RenameLayer(self):
1004            """Let the user rename the currently selected layer"""
1005            layer = self.current_layer()
1006            if layer is not None:
1007                dlg = wxTextEntryDialog(self, _("Layer Title:"), _("Rename Layer"),
1008                                        layer.Title())
1009                try:
1010                    if dlg.ShowModal() == wxID_OK:
1011                        title = dlg.GetValue()
1012                        if title != "":
1013                            layer.SetTitle(title)
1014                finally:
1015                    dlg.Destroy()
1016    
1017      def identify_view_on_demand(self, layer, shapes):      def identify_view_on_demand(self, layer, shapes):
1018          """Subscribed to the canvas' SHAPES_SELECTED message          """Subscribed to the canvas' SHAPES_SELECTED message
1019    
# Line 777  class MainWindow(DockFrame): Line 1038  class MainWindow(DockFrame):
1038                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
1039                  pass                  pass
1040    
1041      def __SetTitle(self, title):      def title_changed(self, map):
1042          self.SetTitle("Thuban - " + title)          """Subscribed to the canvas' TITLE_CHANGED messages"""
1043            self.update_title()
1044    
1045        def update_title(self):
1046            """Update the window's title according to it's current state.
1047    
1048            In this default implementation the title is 'Thuban - ' followed
1049            by the map's title or simply 'Thuban' if there is not map.
1050            Derived classes should override this method to get different
1051            titles.
1052    
1053            This method is called automatically by other methods when the
1054            title may have to change. For the methods implemented in this
1055            class this usually only means that a different map has been set
1056            or the current map's title has changed.
1057            """
1058            map = self.Map()
1059            if map is not None:
1060                title = _("Thuban - %s") % (map.Title(),)
1061            else:
1062                title = _("Thuban")
1063            self.SetTitle(title)
1064    
1065    
1066  #  #
1067  # Define all the commands available in the main window  # Define all the commands available in the main window
# Line 820  def _has_selected_layer(context): Line 1103  def _has_selected_layer(context):
1103      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
1104      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
1105    
1106    def _has_selected_layer_visible(context):
1107        """Return true if a layer is selected in the context which is
1108        visible."""
1109        if context.mainwindow.has_selected_layer():
1110            layer = context.mainwindow.current_layer()
1111            if layer.Visible(): return True
1112        return False
1113    
1114    def _has_selected_shape_layer(context):
1115        """Return true if a shape layer is selected in the context"""
1116        return context.mainwindow.has_selected_shape_layer()
1117    
1118  def _has_selected_shapes(context):  def _has_selected_shapes(context):
1119      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
1120      return context.mainwindow.has_selected_shapes()      return context.mainwindow.has_selected_shapes()
# Line 839  def _has_visible_map(context): Line 1134  def _has_visible_map(context):
1134      if map is not None:      if map is not None:
1135          for layer in map.Layers():          for layer in map.Layers():
1136              if layer.Visible():              if layer.Visible():
1137                  return 1                  return True
1138      return 0      return False
1139    
1140  def _has_legend_shown(context):  def _has_legend_shown(context):
1141      """Return true if the legend window is shown"""      """Return true if the legend window is shown"""
1142      return context.mainwindow.LegendShown()      return context.mainwindow.LegendShown()
1143    
1144    def _has_gdal_support(context):
1145        """Return True if the GDAL is available"""
1146        return Thuban.Model.resource.has_gdal_support()
1147    
1148    def _has_dbconnections(context):
1149        """Return whether the the session has database connections"""
1150        return context.session.HasDBConnections()
1151    
1152    def _has_postgis_support(context):
1153        return has_postgis_support()
1154    
1155    
1156  # File menu  # File menu
1157  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession",
1158  _method_command("open_session", _("&Open Session..."), "OpenSession")                  helptext = _("Start a new session"))
1159  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("open_session", _("&Open Session..."), "OpenSession",
1160  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")                  helptext = _("Open a session file"))
1161    _method_command("save_session", _("&Save Session"), "SaveSession",
1162                    helptext =_("Save this session to the file it was opened from"))
1163    _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs",
1164                    helptext = _("Save this session to a new file"))
1165  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
1166                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown,
1167                    helptext = _("Toggle on/off the session tree analysis window"))
1168  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
1169                  checked = _has_legend_shown)                  checked = _has_legend_shown,
1170  _method_command("exit", _("E&xit"), "Exit")                  helptext = _("Toggle Legend on/off"))
1171    _method_command("database_management", _("&Database Connections..."),
1172                    "DatabaseManagement",
1173                    sensitive = _has_postgis_support)
1174    _method_command("exit", _("E&xit"), "Exit",
1175                    helptext = _("Finish working with Thuban"))
1176    
1177  # Help menu  # Help menu
1178  _method_command("help_about", _("&About..."), "About")  _method_command("help_about", _("&About..."), "About",
1179                    helptext = _("Info about Thuban authors, version and modules"))
1180    
1181    
1182  # Map menu  # Map menu
1183  _method_command("map_projection", _("Pro&jection..."), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection",
1184                    helptext = _("Set or change the map projection"))
1185    
1186  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
1187                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 882  _tool_command("map_label_tool", _("&Labe Line 1200  _tool_command("map_label_tool", _("&Labe
1200                helptext = _("Add/Remove labels"), icon = "label",                helptext = _("Add/Remove labels"), icon = "label",
1201                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1202  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
1203                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Zoom to the full map extent"), icon = "fullextent",
1204                sensitive = _has_visible_map)                sensitive = _has_visible_map)
1205  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
1206                 helptext = _("Full Layer Extent"), icon = "fulllayerextent",                  helptext = _("Zoom to the full layer extent"),
1207                sensitive = _has_selected_layer)                  icon = "fulllayerextent", sensitive = _has_selected_layer)
1208  _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",  _method_command("selected_full_extent", _("&Full selection extent"),
1209                 helptext = _("Full Selection Extent"), icon = "fullselextent",                  "FullSelectionExtent",
1210                sensitive = _has_selected_shapes)                  helptext = _("Zoom to the full selection extent"),
1211                    icon = "fullselextent", sensitive = _has_selected_shapes)
1212  _method_command("map_export", _("E&xport"), "ExportMap",  _method_command("map_export", _("E&xport"), "ExportMap",
1213                      helptext = _("Export the map to file"))                  helptext = _("Export the map to file"))
1214  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
1215                  helptext = _("Print the map"))                  helptext = _("Print the map"))
1216  _method_command("map_rename", _("&Rename..."), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
1217                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
1218  _method_command("layer_add", _("&Add Layer..."), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
1219                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to the map"))
1220  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
1221                  helptext = _("Add a new image layer to active map"))                  helptext = _("Add a new image layer to the map"),
1222                    sensitive = _has_gdal_support)
1223    _method_command("layer_add_db", _("Add &Database Layer..."), "AddDBLayer",
1224                    helptext = _("Add a new database layer to active map"),
1225                    sensitive = _has_dbconnections)
1226  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
1227                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer"),
1228                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
1229    
1230  # Layer menu  # Layer menu
1231  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
1232                    sensitive = _has_selected_layer,
1233                    helptext = _("Specify projection for selected layer"))
1234    _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",
1235                    helptext = _("Duplicate selected layer"),
1236              sensitive = lambda context: context.mainwindow.CanDuplicateLayer())
1237    _method_command("layer_rename", _("Re&name ..."), "RenameLayer",
1238                    helptext = _("Rename selected layer"),
1239                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1240  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
1241                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer"),
1242                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1243  _method_command("layer_lower", _("&Lower"), "LowerLayer",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
1244                  helptext = _("Lower selected layer(s)"),                  helptext = _("Lower selected layer"),
1245                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1246  _method_command("layer_show", _("&Show"), "ShowLayer",  _method_command("layer_show", _("&Show"), "ShowLayer",
1247                  helptext = _("Make selected layer(s) visible"),                  helptext = _("Make selected layer visible"),
1248                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1249  _method_command("layer_hide", _("&Hide"), "HideLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
1250                  helptext = _("Make selected layer(s) unvisible"),                  helptext = _("Make selected layer unvisible"),
1251                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1252  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
1253                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
1254                  sensitive = _has_selected_layer)                  sensitive = _has_selected_shape_layer)
1255  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
1256                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1257                    helptext = _("Edit the properties of the selected layer"))
1258  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
1259                    sensitive = _has_selected_shape_layer,
1260                    helptext = _("Join and attach a table to the selected layer"))
1261    
1262    # further layer methods:
1263    _method_command("layer_to_top", _("&Top"), "LayerToTop",
1264                    helptext = _("Put selected layer to the top"),
1265                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1266  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",  _method_command("layer_to_bottom", _("&Bottom"), "LayerToBottom",
1267                    helptext = _("Put selected layer to the bottom"),
1268                    sensitive = _has_selected_layer)
1269    _method_command("layer_visibility", _("&Visible"), "ToggleLayerVisibility",
1270                    checked = _has_selected_layer_visible,
1271                    helptext = _("Toggle visibility of selected layer"),
1272                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1273    
1274    def _can_unjoin(context):
1275        """Return whether the Layer/Unjoin command can be executed.
1276    
1277        This is the case if a layer is selected and that layer has a
1278        shapestore that has an original shapestore.
1279        """
1280        layer = context.mainwindow.SelectedLayer()
1281        if layer is None:
1282            return 0
1283        getstore = getattr(layer, "ShapeStore", None)
1284        if getstore is not None:
1285            return getstore().OrigShapeStore() is not None
1286        else:
1287            return 0
1288    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
1289                    sensitive = _can_unjoin,
1290                    helptext = _("Undo the last join operation"))
1291    
1292    
1293    def _has_tables(context):
1294        return bool(context.session.Tables())
1295    
1296  # Table menu  # Table menu
1297  _method_command("table_open", _("&Open..."), "TableOpen")  _method_command("table_open", _("&Open..."), "TableOpen",
1298  _method_command("table_close", _("&Close"), "TableClose")                  helptext = _("Open a DBF-table from a file"))
1299  _method_command("table_show", _("&Show"), "TableShow")  _method_command("table_close", _("&Close..."), "TableClose",
1300  _method_command("table_join", _("&Join..."), "TableJoin")         sensitive = lambda context: bool(context.session.UnreferencedTables()),
1301                    helptext = _("Close one or more tables from a list"))
1302    _method_command("table_rename", _("&Rename..."), "TableRename",
1303                    sensitive = _has_tables,
1304                    helptext = _("Rename one or more tables"))
1305    _method_command("table_show", _("&Show..."), "TableShow",
1306                    sensitive = _has_tables,
1307                    helptext = _("Show one or more tables in a dialog"))
1308    _method_command("table_join", _("&Join..."), "TableJoin",
1309                    sensitive = _has_tables,
1310                    helptext = _("Join two tables creating a new one"))
1311    
1312  #  Export only under Windows ...  #  Export only under Windows ...
1313  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",  map_menu = ["layer_add", "layer_add_db", "rasterlayer_add", "layer_remove",
1314                          None,                          None,
1315                            "map_rename",
1316                          "map_projection",                          "map_projection",
1317                          None,                          None,
1318                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
1319                          "map_pan_tool",                          "map_pan_tool",
1320                          "map_full_extent",                          "map_full_extent",
1321                          "layer_full_extent",                          "layer_full_extent",
1322                          "selected_full_extent",                          "selected_full_extent",
1323                          None,                          None,
# Line 959  main_menu = Menu("<main>", "<main>", Line 1334  main_menu = Menu("<main>", "<main>",
1334                   [Menu("file", _("&File"),                   [Menu("file", _("&File"),
1335                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
1336                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
1337                            "database_management", None,
1338                          "toggle_session_tree", None,                          "toggle_session_tree", None,
1339                          "exit"]),                          "exit"]),
1340                    Menu("map", _("&Map"), map_menu),                    Menu("map", _("&Map"), map_menu),
1341                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
1342                          ["layer_raise", "layer_lower",                         ["layer_rename", "layer_duplicate",
1343                            None,
1344                            "layer_raise", "layer_lower",
1345                          None,                          None,
1346                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
1347                          None,                          None,
# Line 975  main_menu = Menu("<main>", "<main>", Line 1353  main_menu = Menu("<main>", "<main>",
1353                          None,                          None,
1354                          "layer_properties"]),                          "layer_properties"]),
1355                    Menu("table", _("&Table"),                    Menu("table", _("&Table"),
1356                         ["table_open", "table_close",                         ["table_open", "table_close", "table_rename",
1357                         None,                         None,
1358                         "table_show",                         "table_show",
1359                         None,                         None,
# Line 992  main_toolbar = Menu("<toolbar>", "<toolb Line 1370  main_toolbar = Menu("<toolbar>", "<toolb
1370                       "selected_full_extent",                       "selected_full_extent",
1371                       None,                       None,
1372                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
1373    
Legend:
Removed from v.1068  
changed lines
  Added in v.2551
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26