From aa0ecdb4f421f91b76b87fbf3e10dafb68d40d99 Mon Sep 17 00:00:00 2001
From: Paul Kulchenko <paul@kulchenko.com>
Date: Tue, 20 May 2014 18:37:55 -0700
Subject: [PATCH] Added `Edit | Source` sub-menu.

---
 src/editor/ids.lua       |  1 +
 src/editor/menu_edit.lua | 32 ++++++++++++++------------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/editor/ids.lua b/src/editor/ids.lua
index 61f1fcc03a..db5af52d97 100644
--- a/src/editor/ids.lua
+++ b/src/editor/ids.lua
@@ -51,6 +51,7 @@ ID_AUTOCOMPLETEENABLE = NewID()
 ID_COMMENT          = NewID()
 ID_FOLD             = NewID()
 ID_CLEARDYNAMICWORDS = NewID()
+ID_SOURCE           = NewID()
 ID_BOOKMARK         = NewID()
 ID_BOOKMARKTOGGLE   = NewID()
 ID_BOOKMARKNEXT     = NewID()
diff --git a/src/editor/menu_edit.lua b/src/editor/menu_edit.lua
index 3e85ad62fa..c983d19c58 100644
--- a/src/editor/menu_edit.lua
+++ b/src/editor/menu_edit.lua
@@ -23,27 +23,23 @@ local editMenu = wx.wxMenu{
   { ID_AUTOCOMPLETE, TR("Complete &Identifier")..KSC(ID_AUTOCOMPLETE), TR("Complete the current identifier") },
   { ID_AUTOCOMPLETEENABLE, TR("Auto Complete Identifiers")..KSC(ID_AUTOCOMPLETEENABLE), TR("Auto complete while typing"), wx.wxITEM_CHECK },
   { },
-  { },
+}
+
+editMenu:Append(ID_SOURCE, TR("Source"), wx.wxMenu{
   { ID_COMMENT, TR("C&omment/Uncomment")..KSC(ID_COMMENT), TR("Comment or uncomment current or selected lines") },
   { ID_FOLD, TR("&Fold/Unfold All")..KSC(ID_FOLD), TR("Fold or unfold all code folds") },
   { ID_SORT, TR("&Sort")..KSC(ID_SORT), TR("Sort selected lines") },
-  { },
-}
-
-local bookmarkmenu = wx.wxMenu{
-  {ID_BOOKMARKTOGGLE, TR("Toggle Bookmark")..KSC(ID_BOOKMARKTOGGLE)},
-  {ID_BOOKMARKNEXT, TR("Go To Next Bookmark")..KSC(ID_BOOKMARKNEXT)},
-  {ID_BOOKMARKPREV, TR("Go To Previous Bookmark")..KSC(ID_BOOKMARKPREV)},
-}
-local bookmark = wx.wxMenuItem(editMenu, ID_BOOKMARK,
-  TR("Bookmark")..KSC(ID_BOOKMARK), TR("Bookmark"), wx.wxITEM_NORMAL, bookmarkmenu)
-editMenu:Insert(12, bookmark)
-
-local preferencesMenu = wx.wxMenu{
-  {ID_PREFERENCESSYSTEM, TR("Settings: System")..KSC(ID_PREFERENCESSYSTEM)},
-  {ID_PREFERENCESUSER, TR("Settings: User")..KSC(ID_PREFERENCESUSER)},
-}
-editMenu:Append(ID_PREFERENCES, TR("Preferences"), preferencesMenu)
+})
+editMenu:Append(ID_BOOKMARK, TR("Bookmark"), wx.wxMenu{
+  { ID_BOOKMARKTOGGLE, TR("Toggle Bookmark")..KSC(ID_BOOKMARKTOGGLE) },
+  { ID_BOOKMARKNEXT, TR("Go To Next Bookmark")..KSC(ID_BOOKMARKNEXT) },
+  { ID_BOOKMARKPREV, TR("Go To Previous Bookmark")..KSC(ID_BOOKMARKPREV) },
+})
+editMenu:AppendSeparator()
+editMenu:Append(ID_PREFERENCES, TR("Preferences"), wx.wxMenu {
+  { ID_PREFERENCESSYSTEM, TR("Settings: System")..KSC(ID_PREFERENCESSYSTEM) },
+  { ID_PREFERENCESUSER, TR("Settings: User")..KSC(ID_PREFERENCESUSER) },
+})
 menuBar:Append(editMenu, TR("&Edit"))
 
 editMenu:Check(ID_AUTOCOMPLETEENABLE, ide.config.autocomplete)