/[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 1014 by jan, Fri May 23 09:26:23 2003 UTC revision 1155 by jan, Thu Jun 12 12:17:11 2003 UTC
# Line 17  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$ Line 17  __ThubanVersion__ = "0.2" #"$THUBAN_0_2$
17  #__BuildDate__ = "$Date$"  #__BuildDate__ = "$Date$"
18    
19  import os  import os
20    import copy
21    
22  from wxPython.wx import *  from wxPython.wx import *
23  from wxPython.wx import __version__ as wxPython_version  from wxPython.wx import __version__ as wxPython_version
24    
 from wxPython.lib.dialogs import wxMultipleChoiceDialog  
   
25  import Thuban  import Thuban
26  import Thuban.version  import Thuban.version
27    
28  from Thuban import _  from Thuban import _
29  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
30  from Thuban.Model.layer import Layer, RasterLayer  from Thuban.Model.layer import Layer, RasterLayer
31  from Thuban.Model.color import Color  
32  from Thuban.Model.proj import Projection  # 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
 import proj4dialog  
39  import tableview, identifyview  import tableview, identifyview
40  from Thuban.UI.classifier import Classifier  from Thuban.UI.classifier import Classifier
41  import legend  import legend
# Line 67  class MainWindow(DockFrame): Line 68  class MainWindow(DockFrame):
68      # implemented in the __getattr__ method.      # implemented in the __getattr__ method.
69      delegated_methods = {"SelectLayer": "canvas",      delegated_methods = {"SelectLayer": "canvas",
70                           "SelectShapes": "canvas",                           "SelectShapes": "canvas",
71                             "SelectedLayer": "canvas",
72                           "SelectedShapes": "canvas",                           "SelectedShapes": "canvas",
73                           }                           }
74    
# Line 407  class MainWindow(DockFrame): Line 409  class MainWindow(DockFrame):
409              # yet.              # yet.
410              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
411              DockFrame.OnClose(self, event)              DockFrame.OnClose(self, event)
412                for dlg in self.dialogs.values():
413                    dlg.Destroy()
414                self.canvas.Destroy()
415              self.Destroy()              self.Destroy()
416    
417      def SetMap(self, map):      def SetMap(self, map):
# Line 547  class MainWindow(DockFrame): Line 552  class MainWindow(DockFrame):
552          layer = self.current_layer()          layer = self.current_layer()
553          if layer is not None:          if layer is not None:
554              layer.SetVisible(0)              layer.SetVisible(0)
555            
556      def ShowLayer(self):      def ShowLayer(self):
557          layer = self.current_layer()          layer = self.current_layer()
558          if layer is not None:          if layer is not None:
559              layer.SetVisible(1)              layer.SetVisible(1)
560    
561        def DuplicateLayer(self):
562            """Ceate a new layer above the selected layer with the same shapestore
563            """
564            layer = self.current_layer()
565            if layer is not None and hasattr(layer, "ShapeStore"):
566                new_layer = Layer(_("Copy of `%s'") % layer.Title(),
567                                  layer.ShapeStore(),
568                                  projection = layer.GetProjection())
569                new_classification = copy.deepcopy(layer.GetClassification())
570                new_layer.SetClassification(new_classification)
571                self.Map().AddLayer(new_layer)
572    
573        def CanDuplicateLayer(self):
574            """Return whether the DuplicateLayer method can create a duplicate"""
575            layer = self.current_layer()
576            return layer is not None and hasattr(layer, "ShapeStore")
577    
578      def LayerShowTable(self):      def LayerShowTable(self):
579          layer = self.current_layer()          layer = self.current_layer()
580          if layer is not None:          if layer is not None:
# Line 561  class MainWindow(DockFrame): Line 583  class MainWindow(DockFrame):
583              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
584              if dialog is None:              if dialog is None:
585                  dialog = tableview.LayerTableFrame(self, name,                  dialog = tableview.LayerTableFrame(self, name,
586                                                 _("Table: %s") % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
587                                                     layer, table)                                           layer, table)
588                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
589                  dialog.Show(true)                  dialog.Show(True)
590              else:              else:
591                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
592                  pass                  pass
# Line 613  class MainWindow(DockFrame): Line 635  class MainWindow(DockFrame):
635          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
636    
637          if dialog is None:          if dialog is None:
638              dialog = Classifier(self, name, layer, group)              dialog = Classifier(self, name, self.Map(), layer, group)
639              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
640              dialog.Show()              dialog.Show()
641          dialog.Raise()          dialog.Raise()
642    
643      def LayerJoinTable(self):      def LayerJoinTable(self):
644          print "LayerJoinTable"          layer = self.canvas.SelectedLayer()
645            if layer is not None:
646                dlg = JoinDialog(self, _("Join Layer with Table"),
647                                 self.application.session,
648                                 layer = layer)
649                dlg.ShowModal()
650    
651      def LayerUnjoinTable(self):      def LayerUnjoinTable(self):
652          print "LayerUnjoinTable"          layer = self.canvas.SelectedLayer()
653            if layer is not None:
654                orig_store = layer.ShapeStore().OrigShapeStore()
655                if orig_store:
656                    layer.SetShapeStore(orig_store)
657    
658      def ShowLegend(self):      def ShowLegend(self):
659          if not self.LegendShown():          if not self.LegendShown():
# Line 642  class MainWindow(DockFrame): Line 673  class MainWindow(DockFrame):
673          else:          else:
674              dialog.Show(not dialog.IsShown())              dialog.Show(not dialog.IsShown())
675    
676            self.canvas.FitMapToWindow()
677    
678      def LegendShown(self):      def LegendShown(self):
679          """Return true iff the legend is currently open"""          """Return true iff the legend is currently open"""
680          dialog = self.FindRegisteredDock("legend")          dialog = self.FindRegisteredDock("legend")
681          return dialog is not None and dialog.IsShown()          return dialog is not None and dialog.IsShown()
682    
683      def TableOpen(self):      def TableOpen(self):
         print "TableOpen: not implemented"  
684          dlg = wxFileDialog(self, _("Open Table"), ".", "",          dlg = wxFileDialog(self, _("Open Table"), ".", "",
685                             "DBF Files (*.dbf)|*.dbf|" +                             _("DBF Files (*.dbf)") + "|*.dbf|" +
686                             "CSV Files (*.csv)|*.csv|" +                             #_("CSV Files (*.csv)") + "|*.csv|" +
687                             "All Files (*.*)|*.*",                             _("All Files (*.*)") + "|*.*",
688                             wxOPEN)                             wxOPEN)
689          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
690              #self.application.session.OpenTable(dlg.GetPath())              filename = dlg.GetPath()
691              pass              dlg.Destroy()
692                try:
693          dlg.Destroy()                  table = self.application.session.OpenTableFile(filename)
694                except IOError:
695                    # the layer couldn't be opened
696                    self.RunMessageBox(_("Open Table"),
697                                       _("Can't open the file '%s'.") % filename)
698                else:
699                    self.ShowTableView(table)
700    
701      def TableClose(self):      def TableClose(self):
702          print "TableClose: not implemented"          tables = self.application.session.UnreferencedTables()
703    
704            lst = [(t.Title(), t) for t in tables]
705            lst.sort()
706            titles = [i[0] for i in lst]
707            dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
708                                         _("Close Table"), titles,
709                                         size = (400, 300),
710                                         style = wxDEFAULT_DIALOG_STYLE |
711                                                 wxRESIZE_BORDER)
712            if dlg.ShowModal() == wxID_OK:
713                for i in dlg.GetValue():
714                    self.application.session.RemoveTable(lst[i][1])
715    
716    
717      def TableShow(self):      def TableShow(self):
718          """Offer a multi-selection dialog for tables to be displayed          """Offer a multi-selection dialog for tables to be displayed
719            
720          The windows for the selected tables are opened or brought to          The windows for the selected tables are opened or brought to
721          the front.          the front.
722          """          """
723          tables = self.application.session.Tables()          tables = self.application.session.Tables()
         table_list = []  
         for table in tables:  
             table_list.append(table.Title())  
724    
725            lst = [(t.Title(), t) for t in tables]
726            lst.sort()
727            titles = [i[0] for i in lst]
728          dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),          dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
729                                       _("Show Table"), table_list)                                       _("Show Table"), titles,
730                                         size = (400,300),
731                                         style = wxDEFAULT_DIALOG_STYLE |
732                                                 wxRESIZE_BORDER)
733          if (dlg.ShowModal() == wxID_OK):          if (dlg.ShowModal() == wxID_OK):
734              for i in dlg.GetValue():              for i in dlg.GetValue():
735                  # XXX: First check whether the dialog is already open                  # XXX: if the table belongs to a layer, open a
736                  # and if so, bring it to the front.                  # LayerTableFrame instead of QueryTableFrame
737                  dialog = tableview.QueryTableFrame(self, table_list[i],                  self.ShowTableView(lst[i][1])
                                               _("Table: %s") % table_list[i],  
                                               tables[i])  
                 self.add_dialog(table_list[i], dialog)  
                 dialog.Show(true)  
   
         # XXX: just some analyis code, remove it when the above XXX is  
         # resolved.  
         for d in self.dialogs.values():  
             if isinstance(d, tableview.LayerTableFrame):  
                 print "LayerTable:", d.GetTitle()  
             elif isinstance(d, tableview.QueryTableFrame):  
                 print "QueryTable:", d.GetTitle()  
             else:  
                 print "Other:", d.GetTitle()  
   
     def TableHide(self):  
         print "TableHide: not implemented"  
738    
739      def TableJoin(self):      def TableJoin(self):
740          dlg = JoinDialog(self, _("Join Tables"), self.application.session)          dlg = JoinDialog(self, _("Join Tables"), self.application.session)
741          dlg.ShowModal()          dlg.ShowModal()
742    
743        def ShowTableView(self, table):
744            """Open a table view for the table and optionally"""
745            name = "table_view%d" % id(table)
746            dialog = self.get_open_dialog(name)
747            if dialog is None:
748                dialog = tableview.QueryTableFrame(self, name,
749                                                   _("Table: %s") % table.Title(),
750                                                   table)
751                self.add_dialog(name, dialog)
752                dialog.Show(True)
753            # FIXME: else bring dialog to front
754    
755        def TableRename(self):
756            """Let the user rename a table"""
757    
758            # First, let the user select a table
759            tables = self.application.session.Tables()
760            lst = [(t.Title(), t) for t in tables]
761            lst.sort()
762            titles = [i[0] for i in lst]
763            dlg = wxMultipleChoiceDialog(self, _("Pick the table to rename:"),
764                                         _("Rename Table"), titles,
765                                         size = (400,300),
766                                         style = wxDEFAULT_DIALOG_STYLE |
767                                                 wxRESIZE_BORDER)
768            if (dlg.ShowModal() == wxID_OK):
769                to_rename = [lst[i][1] for i in dlg.GetValue()]
770                dlg.Destroy()
771            else:
772                to_rename = []
773    
774            # Second, let the user rename the layers
775            for table in to_rename:
776                dlg = wxTextEntryDialog(self, "Table Title: ", "Rename Table",
777                                        table.Title())
778                try:
779                    if dlg.ShowModal() == wxID_OK:
780                        title = dlg.GetValue()
781                        if title != "":
782                            table.SetTitle(title)
783    
784                            # Make sure the session is marked as modified.
785                            # FIXME: This should be handled automatically,
786                            # but that requires more changes to the tables
787                            # than I have time for currently.
788                            self.application.session.changed()
789                finally:
790                    dlg.Destroy()
791    
792    
793      def ZoomInTool(self):      def ZoomInTool(self):
794          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
795    
# Line 745  class MainWindow(DockFrame): Line 832  class MainWindow(DockFrame):
832    
833          dlg.Destroy()          dlg.Destroy()
834    
835        def RenameLayer(self):
836            """Let the user rename the currently selected layer"""
837            layer = self.current_layer()
838            if layer is not None:
839                dlg = wxTextEntryDialog(self, "Layer Title: ", "Rename Layer",
840                                        layer.Title())
841                try:
842                    if dlg.ShowModal() == wxID_OK:
843                        title = dlg.GetValue()
844                        if title != "":
845                            layer.SetTitle(title)
846                finally:
847                    dlg.Destroy()
848    
849      def identify_view_on_demand(self, layer, shapes):      def identify_view_on_demand(self, layer, shapes):
850          """Subscribed to the canvas' SHAPES_SELECTED message          """Subscribed to the canvas' SHAPES_SELECTED message
851    
# Line 840  def _has_legend_shown(context): Line 941  def _has_legend_shown(context):
941    
942    
943  # File menu  # File menu
944  _method_command("new_session", _("&New Session"), "NewSession")  _method_command("new_session", _("&New Session"), "NewSession",
945  _method_command("open_session", _("&Open Session..."), "OpenSession")                  helptext = _("Start a new session"))
946  _method_command("save_session", _("&Save Session"), "SaveSession")  _method_command("open_session", _("&Open Session..."), "OpenSession",
947  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")                  helptext = _("Open a session file"))
948    _method_command("save_session", _("&Save Session"), "SaveSession",
949                    helptext =_("Save this session to the file it was opened from"))
950    _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs",
951                    helptext = _("Save this session to a new file"))
952  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
953                  checked = _has_tree_window_shown)                  checked = _has_tree_window_shown,
954                    helptext = _("Toggle on/off the session tree analysis window"))
955  _method_command("toggle_legend", _("Legend"), "ToggleLegend",  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
956                  checked = _has_legend_shown)                  checked = _has_legend_shown,
957  _method_command("exit", _("E&xit"), "Exit")                  helptext = _("Toggle Legend on/off"))
958    _method_command("exit", _("E&xit"), "Exit",
959                    helptext = _("Finish working with Thuban"))
960    
961  # Help menu  # Help menu
962  _method_command("help_about", _("&About..."), "About")  _method_command("help_about", _("&About..."), "About",
963                    helptext = _("Info about Thuban authors, version and modules"))
964    
965    
966  # Map menu  # Map menu
967  _method_command("map_projection", _("Pro&jection..."), "MapProjection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection",
968                    helptext = _("Set or change the map projection"))
969    
970  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
971                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
# Line 874  _tool_command("map_label_tool", _("&Labe Line 984  _tool_command("map_label_tool", _("&Labe
984                helptext = _("Add/Remove labels"), icon = "label",                helptext = _("Add/Remove labels"), icon = "label",
985                sensitive = _has_visible_map)                sensitive = _has_visible_map)
986  _method_command("map_full_extent", _("&Full extent"), "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
987                 helptext = _("Full Extent"), icon = "fullextent",                 helptext = _("Zoom to the full map extent"), icon = "fullextent",
988                sensitive = _has_visible_map)                sensitive = _has_visible_map)
989  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
990                 helptext = _("Full Layer Extent"), icon = "fulllayerextent",                  helptext = _("Zoom to the full layer extent"),
991                sensitive = _has_selected_layer)                  icon = "fulllayerextent", sensitive = _has_selected_layer)
992  _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",  _method_command("selected_full_extent", _("&Full selection extent"),
993                 helptext = _("Full Selection Extent"), icon = "fullselextent",                  "FullSelectionExtent",
994                sensitive = _has_selected_shapes)                  helptext = _("Zoom to the full selection extent"),
995                    icon = "fullselextent", sensitive = _has_selected_shapes)
996  _method_command("map_export", _("E&xport"), "ExportMap",  _method_command("map_export", _("E&xport"), "ExportMap",
997                      helptext = _("Export the map to file"))                  helptext = _("Export the map to file"))
998  _method_command("map_print", _("Prin&t"), "PrintMap",  _method_command("map_print", _("Prin&t"), "PrintMap",
999                  helptext = _("Print the map"))                  helptext = _("Print the map"))
1000  _method_command("map_rename", _("&Rename..."), "RenameMap",  _method_command("map_rename", _("&Rename..."), "RenameMap",
1001                  helptext = _("Rename the map"))                  helptext = _("Rename the map"))
1002  _method_command("layer_add", _("&Add Layer..."), "AddLayer",  _method_command("layer_add", _("&Add Layer..."), "AddLayer",
1003                  helptext = _("Add a new layer to active map"))                  helptext = _("Add a new layer to the map"))
1004  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",  _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
1005                  helptext = _("Add a new image layer to active map"))                  helptext = _("Add a new image layer to the map"))
1006  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",  _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
1007                  helptext = _("Remove selected layer(s)"),                  helptext = _("Remove selected layer"),
1008                  sensitive = _can_remove_layer)                  sensitive = _can_remove_layer)
1009    
1010  # Layer menu  # Layer menu
1011  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
1012                    sensitive = _has_selected_layer,
1013                    helptext = _("Specify projection for selected layer"))
1014    _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",
1015                    helptext = _("Duplicate selected layer"),
1016              sensitive = lambda context: context.mainwindow.CanDuplicateLayer())
1017    _method_command("layer_rename", _("Re&name ..."), "RenameLayer",
1018                    helptext = _("Rename selected layer"),
1019                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1020  _method_command("layer_raise", _("&Raise"), "RaiseLayer",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
1021                  helptext = _("Raise selected layer(s)"),                  helptext = _("Raise selected layer"),
1022                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1023  _method_command("layer_lower", _("&Lower"), "LowerLayer",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
1024                  helptext = _("Lower selected layer(s)"),                  helptext = _("Lower selected layer"),
1025                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1026  _method_command("layer_show", _("&Show"), "ShowLayer",  _method_command("layer_show", _("&Show"), "ShowLayer",
1027                  helptext = _("Make selected layer(s) visible"),                  helptext = _("Make selected layer visible"),
1028                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1029  _method_command("layer_hide", _("&Hide"), "HideLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
1030                  helptext = _("Make selected layer(s) unvisible"),                  helptext = _("Make selected layer unvisible"),
1031                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1032  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
1033                  helptext = _("Show the selected layer's table"),                  helptext = _("Show the selected layer's table"),
1034                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
1035  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
1036                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1037                    helptext = _("Edit the properties of the selected layer"))
1038  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
1039                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer,
1040                    helptext = _("Join and attach a table to the selected layer"))
1041    
1042    def _can_unjoin(context):
1043        """Return whether the Layer/Unjoin command can be executed.
1044    
1045        This is the case if a layer is selected and that layer has a
1046        shapestore that has an original shapestore.
1047        """
1048        layer = context.mainwindow.SelectedLayer()
1049        if layer is None:
1050            return 0
1051        getstore = getattr(layer, "ShapeStore", None)
1052        if getstore is not None:
1053            return getstore().OrigShapeStore() is not None
1054        else:
1055            return 0
1056  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
1057                  sensitive = _has_selected_layer)                  sensitive = _can_unjoin,
1058                    helptext = _("Undo the last join operation"))
1059    
1060    
1061    def _has_tables(context):
1062        return bool(context.session.Tables())
1063    
1064  # Table menu  # Table menu
1065  _method_command("table_open", _("&Open..."), "TableOpen")  _method_command("table_open", _("&Open..."), "TableOpen",
1066  _method_command("table_close", _("&Close"), "TableClose")                  helptext = _("Open a DBF-table from a file"))
1067  _method_command("table_show", _("&Show"), "TableShow")  _method_command("table_close", _("&Close..."), "TableClose",
1068  _method_command("table_hide", _("&Hide"), "TableHide")         sensitive = lambda context: bool(context.session.UnreferencedTables()),
1069  _method_command("table_join", _("&Join..."), "TableJoin")                  helptext = _("Close one or more tables from a list"))
1070    _method_command("table_rename", _("&Rename..."), "TableRename",
1071                    sensitive = _has_tables,
1072                    helptext = _("Rename one or more tables"))
1073    _method_command("table_show", _("&Show..."), "TableShow",
1074                    sensitive = _has_tables,
1075                    helptext = _("Show one or more tables in a dialog"))
1076    _method_command("table_join", _("&Join..."), "TableJoin",
1077                    sensitive = _has_tables,
1078                    helptext = _("Join two tables creating a new one"))
1079    
1080  #  Export only under Windows ...  #  Export only under Windows ...
1081  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
# Line 956  main_menu = Menu("<main>", "<main>", Line 1105  main_menu = Menu("<main>", "<main>",
1105                          "exit"]),                          "exit"]),
1106                    Menu("map", _("&Map"), map_menu),                    Menu("map", _("&Map"), map_menu),
1107                    Menu("layer", _("&Layer"),                    Menu("layer", _("&Layer"),
1108                          ["layer_raise", "layer_lower",                         ["layer_rename", "layer_duplicate",
1109                            None,
1110                            "layer_raise", "layer_lower",
1111                          None,                          None,
1112                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
1113                          None,                          None,
# Line 968  main_menu = Menu("<main>", "<main>", Line 1119  main_menu = Menu("<main>", "<main>",
1119                          None,                          None,
1120                          "layer_properties"]),                          "layer_properties"]),
1121                    Menu("table", _("&Table"),                    Menu("table", _("&Table"),
1122                         ["table_open", "table_close",                         ["table_open", "table_close", "table_rename",
1123                         None,                         None,
1124                         "table_show", "table_hide",                         "table_show",
1125                         None,                         None,
1126                         "table_join"]),                         "table_join"]),
1127                    Menu("help", _("&Help"),                    Menu("help", _("&Help"),
Legend:
Removed from v.1014  
changed lines
  Added in v.1155
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26