/[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 431 by jonathan, Mon Feb 24 18:47:21 2003 UTC revision 723 by bh, Thu Apr 24 15:31:53 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 12  The main window Line 12  The main window
12    
13  __version__ = "$Revision$"  __version__ = "$Revision$"
14    
15    __ThubanVersion__ = "0.2" #"$THUBAN_0_2$"
16    #__BuildDate__ = "$Date$"
17    
18  import os  import os
19    
20  from wxPython.wx import *  from wxPython.wx import *
# Line 27  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    import resource
44    
45    import projdialog
46    
47    
48    
49  # the directory where the toolbar icons are stored  class MainWindow(DockFrame):
 bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  
 bitmapext = ".xpm"  
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  class MainWindow(wxFrame):      # 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 65  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          EVT_CLOSE(self, self.OnClose)          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        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 185  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 296  class MainWindow(wxFrame): Line 351  class MainWindow(wxFrame):
351              result = wxID_NO              result = wxID_NO
352          return result          return result
353    
354        def prepare_new_session(self):
355            for d in self.dialogs.values():
356                if not isinstance(d, tree.SessionTreeView):
357                    d.Close()
358    
359      def NewSession(self):      def NewSession(self):
360          self.save_modified_session()          self.save_modified_session()
361            self.prepare_new_session()
362          self.application.SetSession(create_empty_session())          self.application.SetSession(create_empty_session())
363    
364      def OpenSession(self):      def OpenSession(self):
365          self.save_modified_session()          self.save_modified_session()
366          dlg = wxFileDialog(self, _("Open Session"), ".", "",          dlg = wxFileDialog(self, _("Open Session"), ".", "", "*.thuban", wxOPEN)
                            "*.thuban", wxOPEN)  
367          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
368                self.prepare_new_session()
369              self.application.OpenSession(dlg.GetPath())              self.application.OpenSession(dlg.GetPath())
370          dlg.Destroy()          dlg.Destroy()
371    
372      def SaveSession(self):      def SaveSession(self):
373          if self.application.session.filename == None:          if self.application.session.filename == None:
374              self.SaveSessionAs()              self.SaveSessionAs()
375          self.application.SaveSession()          else:
376                self.application.SaveSession()
377    
378      def SaveSessionAs(self):      def SaveSessionAs(self):
379          dlg = wxFileDialog(self, _("Save Session As"), ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
# Line 322  class MainWindow(wxFrame): Line 384  class MainWindow(wxFrame):
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 333  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            #self.legendPanel.SetMap(map)
405    
406      def Map(self):      def Map(self):
407          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
408    
409            # sanity check
410            #assert(self.canvas.Map() is self.legendPanel.GetMap())
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:
419              dialog = tree.SessionTreeView(self, self.application, name)              dialog = tree.SessionTreeView(self, self.application, name)
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()
424              pass  
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"),
431                             _("Thuban is a program for\n"                             _("Thuban v%s\n"
432                                #"Build Date: %s\n"
433                                "\n"
434                                "Thuban is a program for\n"
435                              "exploring geographic data.\n"                              "exploring geographic data.\n"
436                              "Copyright (C) 2001-2003 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
437                              "Thuban is licensed under the GPL"),                              "Thuban is licensed under the GNU GPL"
438                               % __ThubanVersion__), #__BuildDate__)),
439                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
440    
441      def AddLayer(self):      def AddLayer(self):
# Line 367  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 378  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 391  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 399  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 416  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 choose_color(self):      def choose_color(self):
504          """Run the color selection dialog and return the selected color.          """Run the color selection dialog and return the selected color.
# Line 438  class MainWindow(wxFrame): Line 516  class MainWindow(wxFrame):
516          dlg.Destroy()          dlg.Destroy()
517          return color          return color
518    
     def LayerFillColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.classification.SetDefaultFill(color)  
   
     def LayerTransparentFill(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.classification.SetDefaultFill(None)  
   
     def LayerOutlineColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.classification.SetDefaultStroke(color)  
   
     def LayerNoOutline(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.classification.SetDefaultStroke(None)  
   
519      def HideLayer(self):      def HideLayer(self):
520          layer = self.current_layer()          layer = self.current_layer()
521          if layer is not None:          if layer is not None:
# Line 479  class MainWindow(wxFrame): Line 533  class MainWindow(wxFrame):
533              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
534              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
535              if dialog is None:              if dialog is None:
536                  dialog = tableview.LayerTableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
537                                                     _("Table: %s") % layer.Title(),                                                 _("Table: %s") % layer.Title(),
538                                                     layer, table)                                                     layer, table)
539                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
540                  dialog.Show(true)                  dialog.Show(true)
# Line 489  class MainWindow(wxFrame): Line 543  class MainWindow(wxFrame):
543                  pass                  pass
544    
545      def Projection(self):      def Projection(self):
546          map = self.canvas.Map()  
547          proj = map.projection          name = "projection"
548          if proj is None:          dialog = self.get_open_dialog(name)
549              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
550            if dialog is None:
551                map = self.canvas.Map()
552                dialog = projdialog.ProjFrame(self, name, map)
553                self.add_dialog(name, dialog)
554                dialog.Show()
555            dialog.Raise()
556    
557        def LayerEditProperties(self):
558    
559            #
560            # the menu option for this should only be available if there
561            # is a current layer, so we don't need to check if the
562            # current layer is None
563            #
564    
565            layer = self.current_layer()
566            self.OpenLayerProperties(layer)
567    
568        def OpenLayerProperties(self, layer, group = None):
569            name = "layer_properties" + str(id(layer))
570            dialog = self.get_open_dialog(name)
571    
572            if dialog is None:
573                dialog = Classifier(self, name, layer, group)
574                self.add_dialog(name, dialog)
575                dialog.Show()
576            dialog.Raise()
577    
578    
579        def ShowLegend(self):
580            if not self.LegendShown():
581                self.ToggleLegend()
582    
583        def ToggleLegend(self):
584            """Show the legend if it's not shown otherwise hide it again"""
585            name = "legend"
586            dialog = self.FindRegisteredDock(name)
587    
588            if dialog is None:
589                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
590                legend.LegendPanel(dialog, None, self)
591                dialog.Dock()
592                dialog.GetPanel().SetMap(self.Map())
593                dialog.Show()
594          else:          else:
595              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              dialog.Show(not dialog.IsShown())
596                                                 map.BoundingBox())  
597          if proj4Dlg.ShowModal() == wxID_OK:      def LegendShown(self):
598              params = proj4Dlg.GetParams()          """Return true iff the legend is currently open"""
599              if params is not None:          dialog = self.FindRegisteredDock("legend")
600                  proj = Projection(params)          return dialog is not None and dialog.IsShown()
             else:  
                 proj = None  
             map.SetProjection(proj)  
         proj4Dlg.Destroy()  
   
     def Classify(self):  
         classifyDlg = classifier.Classifier(NULL, self.current_layer())  
   
         classifyDlg.ShowModal()  
         classifyDlg.Destroy()  
601    
602      def ZoomInTool(self):      def ZoomInTool(self):
603          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 533  class MainWindow(wxFrame): Line 621  class MainWindow(wxFrame):
621      def PrintMap(self):      def PrintMap(self):
622          self.canvas.Print()          self.canvas.Print()
623    
624      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
625            dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",
626                                    self.Map().Title())
627            if dlg.ShowModal() == wxID_OK:
628                title = dlg.GetValue()
629                if title != "":
630                    self.Map().SetTitle(title)
631                    self.__SetTitle(title)
632    
633            dlg.Destroy()
634    
635        def identify_view_on_demand(self, layer, shapes):
636          name = "identify_view"          name = "identify_view"
637          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
638              if not self.dialog_open(name):              if not self.dialog_open(name):
639                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
640                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
641                  dialog.Show(true)                  dialog.Show(True)
642              else:              else:
643                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
644                  pass                  pass
645    
646        def __SetTitle(self, title):
647            self.SetTitle("Thuban - " + title)
648    
649  #  #
650  # Define all the commands available in the main window  # Define all the commands available in the main window
651  #  #
# Line 555  def call_method(context, methodname, *ar Line 657  def call_method(context, methodname, *ar
657      apply(getattr(context.mainwindow, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
658    
659  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
660                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
661      """Add a command implemented by a method of the mainwindow object"""      """Add a command implemented by a method of the mainwindow object"""
662      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
663                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
664                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
665    
666  def make_check_current_tool(toolname):  def make_check_current_tool(toolname):
667      """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 589  def _can_remove_layer(context): Line 691  def _can_remove_layer(context):
691    
692  def _has_tree_window_shown(context):  def _has_tree_window_shown(context):
693      """Return true if the tree window is shown"""      """Return true if the tree window is shown"""
694      return context.mainwindow.get_open_dialog("session_tree") is None      return context.mainwindow.SessionTreeShown()
695    
696  def _has_visible_map(context):  def _has_visible_map(context):
697      """Return true iff theres a visible map in the mainwindow.      """Return true iff theres a visible map in the mainwindow.
# Line 602  def _has_visible_map(context): Line 704  def _has_visible_map(context):
704                  return 1                  return 1
705      return 0      return 0
706    
707    def _has_legend_shown(context):
708        """Return true if the legend window is shown"""
709        return context.mainwindow.LegendShown()
710    
711    
712  # File menu  # File menu
713  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
714  _method_command("open_session", _("&Open Session"), "OpenSession")  _method_command("open_session", _("&Open Session"), "OpenSession")
715  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
716  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As"), "SaveSessionAs")
717  _method_command("show_session_tree", _("Show Session &Tree"), "ShowSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
718                  sensitive = _has_tree_window_shown)                  checked = _has_tree_window_shown)
719    _method_command("toggle_legend", _("Legend"), "ToggleLegend",
720                    checked = _has_legend_shown)
721  _method_command("exit", _("E&xit"), "Exit")  _method_command("exit", _("E&xit"), "Exit")
722    
723  # Help menu  # Help menu
# Line 640  _method_command("map_full_extent", _("&F Line 748  _method_command("map_full_extent", _("&F
748                sensitive = _has_visible_map)                sensitive = _has_visible_map)
749  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
750                  helptext = _("Print the map"))                  helptext = _("Print the map"))
751    _method_command("map_rename", _("&Rename"), "RenameMap",
752                    helptext = _("Rename the map"))
753    
754  # Layer menu  # Layer menu
755  _method_command("layer_add", _("&Add Layer"), "AddLayer",  _method_command("layer_add", _("&Add Layer"), "AddLayer",
# Line 647  _method_command("layer_add", _("&Add Lay Line 757  _method_command("layer_add", _("&Add Lay
757  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
758                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer(s)"),
759                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
 _method_command("layer_fill_color", _("&Fill Color"), "LayerFillColor",  
                 helptext = _("Set the fill color of selected layer(s)"),  
                 sensitive = _has_selected_layer)  
 _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)"),  
                 sensitive = _has_selected_layer)  
760  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
761                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer(s)"),
762                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
# Line 675  _method_command("layer_hide", _("&Hide") Line 772  _method_command("layer_hide", _("&Hide")
772  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
773                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
774                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
775    _method_command("layer_properties", _("Properties"), "LayerEditProperties",
 _method_command("layer_classifier", _("Classify"), "Classify",  
776                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
777    
778  # the menu structure  # the menu structure
# Line 684  main_menu = Menu("<main>", "<main>", Line 780  main_menu = Menu("<main>", "<main>",
780                   [Menu("file", _("&File"),                   [Menu("file", _("&File"),
781                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
782                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
783                          "show_session_tree", None,                          "toggle_session_tree", None,
784                          "exit"]),                          "exit"]),
785                    Menu("map", _("&Map"),                    Menu("map", _("&Map"),
786                         ["layer_add", "layer_remove",                         ["layer_add", "layer_remove",
# Line 696  main_menu = Menu("<main>", "<main>", Line 792  main_menu = Menu("<main>", "<main>",
792                          None,                          None,
793                          "map_full_extent",                          "map_full_extent",
794                          None,                          None,
795                          "map_print"]),                          "toggle_legend",
                   Menu("layer", _("&Layer"),  
                        ["layer_fill_color", "layer_transparent_fill",  
                         "layer_outline_color", "layer_no_outline",  
796                          None,                          None,
797                          "layer_raise", "layer_lower",                          "map_print",
798                            None,
799                            "map_rename"]),
800                      Menu("layer", _("&Layer"),
801                            ["layer_raise", "layer_lower",
802                          None,                          None,
803                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
804                          None,                          None,
805                          "layer_show_table",                          "layer_show_table",
806                          None,                          None,
807                          "layer_classifier"]),                          "layer_properties"]),
808                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
809                         ["help_about"])])                         ["help_about"])])
810    
Legend:
Removed from v.431  
changed lines
  Added in v.723
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26