/[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 517 by jonathan, Tue Mar 11 17:28:39 2003 UTC revision 829 by jonathan, Tue May 6 12:06:38 2003 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003 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 30  import view Line 30  import view
30  import tree  import tree
31  import proj4dialog  import proj4dialog
32  import tableview, identifyview  import tableview, identifyview
33  import classifier  from Thuban.UI.classifier import Classifier
34    import legend
35  from menu import Menu  from menu import Menu
36    
37  from context import Context  from context import Context
38  from command import registry, Command, ToolCommand  from command import registry, Command, ToolCommand
39  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
40    
41    from Thuban.UI.dock import DockFrame
42    
43  # the directory where the toolbar icons are stored  import resource
 bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  
 bitmapext = ".xpm"  
44    
45    import projdialog
46    
47  class MainWindow(wxFrame):  
48    
49    class MainWindow(DockFrame):
50    
51        # Some messages that can be subscribed/unsubscribed directly through
52        # the MapCanvas come in fact from other objects. This is a map to
53        # map those messages to the names of the instance variables they
54        # actually come from. This delegation is implemented in the
55        # Subscribe and unsubscribed methods
56        delegated_messages = {LAYER_SELECTED: "canvas",
57                              SHAPES_SELECTED: "canvas"}
58    
59        # Methods delegated to some instance variables. The delegation is
60        # implemented in the __getattr__ method.
61        delegated_methods = {"SelectLayer": "canvas",
62                             "SelectShapes": "canvas",
63                             }
64    
65      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
66                   initial_message = None, size = wxSize(-1, -1)):                   initial_message = None, size = wxSize(-1, -1)):
67          wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)          DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
68            #wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
69    
70          self.application = application          self.application = application
         self.interactor = interactor  
71    
72          self.CreateStatusBar()          self.CreateStatusBar()
73          if initial_message:          if initial_message:
# Line 68  class MainWindow(wxFrame): Line 85  class MainWindow(wxFrame):
85          # call Realize to make sure that the tools appear.          # call Realize to make sure that the tools appear.
86          toolbar.Realize()          toolbar.Realize()
87    
88    
89          # Create the map canvas          # Create the map canvas
90          canvas = view.MapCanvas(self, -1, interactor)          canvas = view.MapCanvas(self, -1)
91          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
92            canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
93          self.canvas = canvas          self.canvas = canvas
94    
95            self.SetMainWindow(self.canvas)
96    
97            self.SetAutoLayout(True)
98    
99          self.init_dialogs()          self.init_dialogs()
100    
101          interactor.Subscribe(SELECTED_SHAPE, self.identify_view_on_demand)          EVT_CLOSE(self, self._OnClose)
102    
103        def Subscribe(self, channel, *args):
104            """Subscribe a function to a message channel.
105    
106            If channel is one of the delegated messages call the appropriate
107            object's Subscribe method. Otherwise do nothing.
108            """
109            if channel in self.delegated_messages:
110                object = getattr(self, self.delegated_messages[channel])
111                object.Subscribe(channel, *args)
112            else:
113                print "Trying to subscribe to unsupported channel %s" % channel
114    
115          EVT_CLOSE(self, self.OnClose)      def Unsubscribe(self, channel, *args):
116            """Unsubscribe a function from a message channel.
117    
118            If channel is one of the delegated messages call the appropriate
119            object's Unsubscribe method. Otherwise do nothing.
120            """
121            if channel in self.delegated_messages:
122                object = getattr(self, self.delegated_messages[channel])
123                object.Unsubscribe(channel, *args)
124    
125        def __getattr__(self, attr):
126            """If attr is one of the delegated methods return that method
127    
128            Otherwise raise AttributeError.
129            """
130            if attr in self.delegated_methods:
131                return getattr(getattr(self, self.delegated_methods[attr]), attr)
132            raise AttributeError(attr)
133    
134      def init_ids(self):      def init_ids(self):
135          """Initialize the ids"""          """Initialize the ids"""
# Line 188  class MainWindow(wxFrame): Line 240  class MainWindow(wxFrame):
240              command = registry.Command(name)              command = registry.Command(name)
241              if command is not None:              if command is not None:
242                  ID = self.get_id(name)                  ID = self.get_id(name)
243                  filename = os.path.join(bitmapdir, command.Icon()) + bitmapext                  bitmap = resource.GetBitmapResource(command.Icon(),
244                  bitmap = wxBitmap(filename, wxBITMAP_TYPE_XPM)                                                      wxBITMAP_TYPE_XPM)
245                  toolbar.AddTool(ID, bitmap,                  toolbar.AddTool(ID, bitmap,
246                                  shortHelpString = command.HelpText(),                                  shortHelpString = command.HelpText(),
247                                  isToggle = command.IsCheckCommand())                                  isToggle = command.IsCheckCommand())
# Line 325  class MainWindow(wxFrame): Line 377  class MainWindow(wxFrame):
377    
378      def SaveSessionAs(self):      def SaveSessionAs(self):
379          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
380                             "*.thuban", wxOPEN)                             "*.thuban", wxSAVE|wxOVERWRITE_PROMPT)
381          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
382              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
383              self.application.SaveSession()              self.application.SaveSession()
384          dlg.Destroy()          dlg.Destroy()
385    
386      def Exit(self):      def Exit(self):
387          self.Close(false)          self.Close(False)
388    
389      def OnClose(self, event):      def _OnClose(self, event):
390          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
391          if result == wxID_CANCEL:          if result == wxID_CANCEL:
392              event.Veto()              event.Veto()
# Line 343  class MainWindow(wxFrame): Line 395  class MainWindow(wxFrame):
395              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
396              # yet.              # yet.
397              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
398                DockFrame._OnClose(self, event)
399              self.Destroy()              self.Destroy()
400    
401      def SetMap(self, map):      def SetMap(self, map):
402          self.canvas.SetMap(map)          self.canvas.SetMap(map)
403            self.__SetTitle(map.Title())
404    
405            dialog = self.FindRegisteredDock("legend")
406            if dialog is not None:
407                dialog.GetPanel().SetMap(self.Map())
408    
409      def Map(self):      def Map(self):
410          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
411    
412          return self.canvas.Map()          return self.canvas.Map()
413    
414      def ShowSessionTree(self):      def ToggleSessionTree(self):
415            """If the session tree is shown close it otherwise create a new tree"""
416          name = "session_tree"          name = "session_tree"
417          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
418          if dialog is None:          if dialog is None:
# Line 360  class MainWindow(wxFrame): Line 420  class MainWindow(wxFrame):
420              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
421              dialog.Show(True)              dialog.Show(True)
422          else:          else:
423              # FIXME: bring dialog to front here              dialog.Close()
             pass  
424    
425        def SessionTreeShown(self):
426            """Return true iff the session tree is currently shown"""
427            return self.get_open_dialog("session_tree") is not None
428    
429      def About(self):      def About(self):
430          self.RunMessageBox(_("About"),          self.RunMessageBox(_("About"),
# Line 382  class MainWindow(wxFrame): Line 444  class MainWindow(wxFrame):
444          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
445              filename = dlg.GetPath()              filename = dlg.GetPath()
446              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
447              layer = Layer(title, filename)              store = self.application.Session().OpenShapefile(filename)
448                layer = Layer(title, store)
449              map = self.canvas.Map()              map = self.canvas.Map()
450              has_layers = map.HasLayers()              has_layers = map.HasLayers()
451              try:              try:
# Line 393  class MainWindow(wxFrame): Line 456  class MainWindow(wxFrame):
456                                     _("Can't open the file '%s'.") % filename)                                     _("Can't open the file '%s'.") % filename)
457              else:              else:
458                  if not has_layers:                  if not has_layers:
459                      # if we're adding a layer to an empty map, for the                      # if we're adding a layer to an empty map, fit the
460                      # new map to the window                      # new map to the window
461                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
462          dlg.Destroy()          dlg.Destroy()
# Line 406  class MainWindow(wxFrame): Line 469  class MainWindow(wxFrame):
469      def CanRemoveLayer(self):      def CanRemoveLayer(self):
470          """Return true if the currently selected layer can be deleted.          """Return true if the currently selected layer can be deleted.
471    
472          If no layer is selected return false.          If no layer is selected return False.
473    
474          The return value of this method determines whether the remove          The return value of this method determines whether the remove
475          layer command is sensitive in menu.          layer command is sensitive in menu.
# Line 414  class MainWindow(wxFrame): Line 477  class MainWindow(wxFrame):
477          layer = self.current_layer()          layer = self.current_layer()
478          if layer is not None:          if layer is not None:
479              return self.canvas.Map().CanRemoveLayer(layer)              return self.canvas.Map().CanRemoveLayer(layer)
480          return 0          return False
481    
482      def RaiseLayer(self):      def RaiseLayer(self):
483          layer = self.current_layer()          layer = self.current_layer()
# Line 431  class MainWindow(wxFrame): Line 494  class MainWindow(wxFrame):
494    
495          If no layer is selected, return None          If no layer is selected, return None
496          """          """
497          return self.interactor.SelectedLayer()          return self.canvas.SelectedLayer()
498    
499      def has_selected_layer(self):      def has_selected_layer(self):
500          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
501          return self.interactor.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
502    
503        def has_selected_shapes(self):
504            """Return true if a shape is currently selected"""
505            return self.canvas.HasSelectedShapes()
506    
507      def choose_color(self):      def choose_color(self):
508          """Run the color selection dialog and return the selected color.          """Run the color selection dialog and return the selected color.
# Line 453  class MainWindow(wxFrame): Line 520  class MainWindow(wxFrame):
520          dlg.Destroy()          dlg.Destroy()
521          return color          return color
522    
     def LayerFillColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.GetClassification().SetDefaultFill(color)  
   
     def LayerTransparentFill(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.GetClassification().SetDefaultFill(Color.None)  
   
     def LayerOutlineColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.GetClassification().SetDefaultLineColor(color)  
   
     def LayerNoOutline(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.GetClassification().SetDefaultLineColor(Color.None)  
   
523      def HideLayer(self):      def HideLayer(self):
524          layer = self.current_layer()          layer = self.current_layer()
525          if layer is not None:          if layer is not None:
# Line 494  class MainWindow(wxFrame): Line 537  class MainWindow(wxFrame):
537              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
538              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
539              if dialog is None:              if dialog is None:
540                  dialog = tableview.LayerTableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
541                                                     _("Table: %s") % layer.Title(),                                                 _("Table: %s") % layer.Title(),
542                                                     layer, table)                                                     layer, table)
543                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
544                  dialog.Show(true)                  dialog.Show(true)
# Line 503  class MainWindow(wxFrame): Line 546  class MainWindow(wxFrame):
546                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
547                  pass                  pass
548    
549      def Projection(self):      def MapProjection(self):
550          map = self.canvas.Map()  
551          proj = map.projection          name = "map_projection"
552          if proj is None:          dialog = self.get_open_dialog(name)
553              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
554          else:          if dialog is None:
555              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              map = self.canvas.Map()
556                                                 map.BoundingBox())              dialog = projdialog.ProjFrame(self, name,
557          if proj4Dlg.ShowModal() == wxID_OK:                       _("Map Projection: %s") % map.Title(), map)
558              params = proj4Dlg.GetParams()              self.add_dialog(name, dialog)
559              if params is not None:              dialog.Show()
560                  proj = Projection(params)          dialog.Raise()
             else:  
                 proj = None  
             map.SetProjection(proj)  
         proj4Dlg.Destroy()  
561    
562      def Classify(self):      def LayerProjection(self):
563    
564            layer = self.current_layer()
565    
566            name = "layer_projection" + str(id(layer))
567            dialog = self.get_open_dialog(name)
568    
569            if dialog is None:
570                map = self.canvas.Map()
571                dialog = projdialog.ProjFrame(self, name,
572                         _("Layer Projection: %s") % layer.Title(), layer)
573                self.add_dialog(name, dialog)
574                dialog.Show()
575            dialog.Raise()
576    
577        def LayerEditProperties(self):
578    
579          #          #
580          # the menu option for this should only be available if there          # the menu option for this should only be available if there
# Line 529  class MainWindow(wxFrame): Line 583  class MainWindow(wxFrame):
583          #          #
584    
585          layer = self.current_layer()          layer = self.current_layer()
586          name = "classifier" + str(id(layer))          self.OpenLayerProperties(layer)
587    
588        def OpenLayerProperties(self, layer, group = None):
589            name = "layer_properties" + str(id(layer))
590          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
591    
592          if dialog is None:          if dialog is None:
593              dialog = classifier.Classifier(self, self.interactor,              dialog = Classifier(self, name, layer, group)
                                            name, self.current_layer())  
594              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
595              dialog.Show()              dialog.Show()
596            dialog.Raise()
597    
598    
599        def ShowLegend(self):
600            if not self.LegendShown():
601                self.ToggleLegend()
602    
603        def ToggleLegend(self):
604            """Show the legend if it's not shown otherwise hide it again"""
605            name = "legend"
606            dialog = self.FindRegisteredDock(name)
607    
608            if dialog is None:
609                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
610                legend.LegendPanel(dialog, None, self)
611                dialog.Dock()
612                dialog.GetPanel().SetMap(self.Map())
613                dialog.Show()
614            else:
615                dialog.Show(not dialog.IsShown())
616    
617        def LegendShown(self):
618            """Return true iff the legend is currently open"""
619            dialog = self.FindRegisteredDock("legend")
620            return dialog is not None and dialog.IsShown()
621    
622      def ZoomInTool(self):      def ZoomInTool(self):
623          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 557  class MainWindow(wxFrame): Line 638  class MainWindow(wxFrame):
638      def FullExtent(self):      def FullExtent(self):
639          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
640    
641        def FullLayerExtent(self):
642            self.canvas.FitLayerToWindow(self.current_layer())
643    
644        def FullSelectionExtent(self):
645            self.canvas.FitSelectedToWindow()
646    
647      def PrintMap(self):      def PrintMap(self):
648          self.canvas.Print()          self.canvas.Print()
649    
650      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
651            dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",
652                                    self.Map().Title())
653            if dlg.ShowModal() == wxID_OK:
654                title = dlg.GetValue()
655                if title != "":
656                    self.Map().SetTitle(title)
657                    self.__SetTitle(title)
658    
659            dlg.Destroy()
660    
661        def identify_view_on_demand(self, layer, shapes):
662            """Subscribed to the canvas' SHAPES_SELECTED message
663    
664            If the current tool is the identify tool, at least one shape is
665            selected and the identify dialog is not shown, show the dialog.
666            """
667            # If the selection has become empty we don't need to do
668            # anything. Otherwise it could happen that the dialog was popped
669            # up when the selection became empty, e.g. when a new selection
670            # is opened while the identify tool is active and dialog had
671            # been closed
672            if not shapes:
673                return
674    
675          name = "identify_view"          name = "identify_view"
676          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
677              if not self.dialog_open(name):              if not self.dialog_open(name):
678                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
679                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
680                  dialog.Show(true)                  dialog.Show(True)
681              else:              else:
682                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
683                  pass                  pass
684    
685        def __SetTitle(self, title):
686            self.SetTitle("Thuban - " + title)
687    
688  #  #
689  # Define all the commands available in the main window  # Define all the commands available in the main window
690  #  #
# Line 582  def call_method(context, methodname, *ar Line 696  def call_method(context, methodname, *ar
696      apply(getattr(context.mainwindow, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
697    
698  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
699                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
700      """Add a command implemented by a method of the mainwindow object"""      """Add a command implemented by a method of the mainwindow object"""
701      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
702                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
703                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
704    
705  def make_check_current_tool(toolname):  def make_check_current_tool(toolname):
706      """Return a function that tests if the currently active tool is toolname      """Return a function that tests if the currently active tool is toolname
# Line 611  def _has_selected_layer(context): Line 725  def _has_selected_layer(context):
725      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
726      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
727    
728    def _has_selected_shapes(context):
729        """Return true if a layer is selected in the context"""
730        return context.mainwindow.has_selected_shapes()
731    
732  def _can_remove_layer(context):  def _can_remove_layer(context):
733      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
734    
735  def _has_tree_window_shown(context):  def _has_tree_window_shown(context):
736      """Return true if the tree window is shown"""      """Return true if the tree window is shown"""
737      return context.mainwindow.get_open_dialog("session_tree") is None      return context.mainwindow.SessionTreeShown()
738    
739  def _has_visible_map(context):  def _has_visible_map(context):
740      """Return true iff theres a visible map in the mainwindow.      """Return true iff theres a visible map in the mainwindow.
# Line 629  def _has_visible_map(context): Line 747  def _has_visible_map(context):
747                  return 1                  return 1
748      return 0      return 0
749    
750    def _has_legend_shown(context):
751        """Return true if the legend window is shown"""
752        return context.mainwindow.LegendShown()
753    
754    
755  # File menu  # File menu
756  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
757  _method_command("open_session", _("&Open Session"), "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
758  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
759  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
760  _method_command("show_session_tree", _("Show Session &Tree"), "ShowSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
761                  sensitive = _has_tree_window_shown)                  checked = _has_tree_window_shown)
762    _method_command("toggle_legend", _("Legend"), "ToggleLegend",
763                    checked = _has_legend_shown)
764  _method_command("exit", _("E&xit"), "Exit")  _method_command("exit", _("E&xit"), "Exit")
765    
766  # Help menu  # Help menu
767  _method_command("help_about", _("&About"), "About")  _method_command("help_about", _("&About..."), "About")
768    
769    
770  # Map menu  # Map menu
771  _method_command("map_projection", _("Pro&jection"), "Projection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
772    
773  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
774                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 665  _tool_command("map_label_tool", _("&Labe Line 789  _tool_command("map_label_tool", _("&Labe
789  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
790                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Full Extent"), icon = "fullextent",
791                sensitive = _has_visible_map)                sensitive = _has_visible_map)
792    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
793                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
794                  sensitive = _has_selected_layer)
795    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
796                   helptext = _("Full Selection Extent"), icon = "fullselextent",
797                  sensitive = _has_selected_shapes)
798  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
799                  helptext = _("Print the map"))                  helptext = _("Print the map"))
800    _method_command("map_rename", _("&Rename..."), "RenameMap",
801  # Layer menu                  helptext = _("Rename the map"))
802  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
803                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to active map"))
804  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
805                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer(s)"),
806                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
807  _method_command("layer_fill_color", _("&Fill Color"), "LayerFillColor",  
808                  helptext = _("Set the fill color of selected layer(s)"),  # Layer menu
809                  sensitive = _has_selected_layer)  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
 _method_command("layer_transparent_fill", _("&Transparent Fill"),  
                 "LayerTransparentFill",  
                 helptext = _("Do not fill the selected layer(s)"),  
                 sensitive = _has_selected_layer)  
 _method_command("layer_outline_color", _("&Outline Color"), "LayerOutlineColor",  
                 helptext = _("Set the outline color of selected layer(s)"),  
                 sensitive = _has_selected_layer)  
 _method_command("layer_no_outline", _("&No Outline"), "LayerNoOutline",  
                 helptext= _("Do not draw the outline of the selected layer(s)"),  
810                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
811  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
812                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer(s)"),
# Line 702  _method_command("layer_hide", _("&Hide") Line 823  _method_command("layer_hide", _("&Hide")
823  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
824                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
825                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
826    _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
 _method_command("layer_classifier", _("Classify"), "Classify",  
827                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
828    
829  # the menu structure  # the menu structure
# Line 711  main_menu = Menu("<main>", "<main>", Line 831  main_menu = Menu("<main>", "<main>",
831                   [Menu("file", _("&File"),                   [Menu("file", _("&File"),
832                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
833                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
834                          "show_session_tree", None,                          "toggle_session_tree", None,
835                          "exit"]),                          "exit"]),
836                    Menu("map", _("&Map"),                    Menu("map", _("&Map"),
837                         ["layer_add", "layer_remove",                         ["layer_add", "layer_remove", "map_rename",
838                          None,                          None,
839                          "map_projection",                          "map_projection",
840                          None,                          None,
841                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
842                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
843                            "map_full_extent",
844                            "layer_full_extent",
845                            "selected_full_extent",
846                          None,                          None,
847                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
848                            None,
849                            "toggle_legend",
850                          None,                          None,
851                          "map_print"]),                          "map_print"]),
852                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
853                         ["layer_fill_color", "layer_transparent_fill",                          ["layer_raise", "layer_lower",
                         "layer_outline_color", "layer_no_outline",  
                         None,  
                         "layer_raise", "layer_lower",  
854                          None,                          None,
855                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
856                          None,                          None,
857                          "layer_show_table",                          "layer_show_table",
858                          None,                          None,
859                          "layer_classifier"]),                          "layer_projection",
860                            "layer_properties"]),
861                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
862                         ["help_about"])])                         ["help_about"])])
863    
# Line 742  main_menu = Menu("<main>", "<main>", Line 865  main_menu = Menu("<main>", "<main>",
865    
866  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
867                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
868                       "map_full_extent", None,                       "map_full_extent",
869                         "layer_full_extent",
870                         "selected_full_extent",
871                         None,
872                       "map_identify_tool", "map_label_tool"])                       "map_identify_tool", "map_label_tool"])
Legend:
Removed from v.517  
changed lines
  Added in v.829
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26