From 4fc6cee3734b314ca94c9a8b0c868cc57822e56e Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 10 Sep 2015 09:46:06 +0200
Subject: [PATCH] Menu xml is now hardcoded in menu.cc. Now we do not have to
 worry about how to update the menu for those already having a ~/.juci
 directory. menu.xml is no longer created in this directory.

---
 src/config.cc |  3 +--
 src/files.h   | 56 -------------------------------------------------
 src/menu.cc   | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/menu.h    |  2 +-
 src/window.cc |  2 --
 5 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/src/config.cc b/src/config.cc
index cb434b7..d7bcaa1 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -20,14 +20,13 @@ MainConfig::MainConfig() {
 }
 
 void MainConfig::find_or_create_config_files() {
-  std::vector<std::string> files = {"config.json", "menu.xml", "plugins.py"};
+  std::vector<std::string> files = {"config.json", "plugins.py"};
   boost::filesystem::create_directories(boost::filesystem::path(Singleton::config_dir()));
   for (auto &file : files) {
     auto path = boost::filesystem::path(Singleton::config_dir() + file);
     if (!boost::filesystem::is_regular_file(path)) {
       if (file == "config.json") juci::filesystem::write(path, configjson);
       if (file == "plugins.py") juci::filesystem::write(path, pluginspy);
-      if (file == "menu.xml") juci::filesystem::write(path, menuxml);
     }
   }
   
diff --git a/src/files.h b/src/files.h
index 50476c7..6ded01b 100644
--- a/src/files.h
+++ b/src/files.h
@@ -83,62 +83,6 @@ const std::string configjson =
 "    }\n"
 "}\n";
 
-const std::string menuxml =
-"<ui>\n"
-"  <menubar name=\"MenuBar\">\n"
-"    <menu action=\"FileMenu\">\n"
-"      <menuitem action=\"FileNewFile\"/>\n"
-"      <menuitem action=\"FileNewFolder\"/>\n"
-"      <menu action=\"FileNewProject\">\n"
-"        <menuitem action=\"FileNewProjectCpp\"/>\n"
-"      </menu>\n"
-"      <separator/>\n"
-"      <menuitem action=\"FileOpenFile\"/>\n"
-"      <menuitem action=\"FileOpenFolder\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"FileSave\"/>\n"
-"      <menuitem action=\"FileSaveAs\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"FileQuit\"/>\n"
-"    </menu>\n"
-"    <menu action=\"EditMenu\">\n"
-"      <menuitem action=\"EditUndo\"/>\n"
-"      <menuitem action=\"EditRedo\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"EditCopy\"/>\n"
-"      <menuitem action=\"EditCut\"/>\n"
-"      <menuitem action=\"EditPaste\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"EditFind\"/>\n"
-"    </menu>\n"
-"    <menu action=\"SourceMenu\">\n"
-"      <menuitem action=\"SourceGotoLine\"/>\n"
-"      <menuitem action=\"SourceCenterCursor\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"SourceGotoDeclaration\"/>\n"
-"      <menuitem action=\"SourceGotoMethod\"/>\n"
-"      <menuitem action=\"SourceRename\"/>\n"
-"    </menu>\n"
-"    <menu action=\"ProjectMenu\">\n"
-"      <menuitem action=\"ProjectCompileAndRun\"/>\n"
-"      <menuitem action=\"ProjectCompile\"/>\n"
-"      <separator/>\n"
-"      <menuitem action=\"ProjectRunCommand\"/>\n"
-"      <menuitem action=\"ProjectKillLastRunning\"/>\n"
-"      <menuitem action=\"ProjectForceKillLastRunning\"/>\n"
-"    </menu>\n"
-"    <menu action=\"WindowMenu\">\n"
-"      <menuitem action=\"WindowCloseTab\"/>\n"
-"      <menuitem action=\"WindowSplitWindow\"/>\n"
-"    </menu>\n"
-"    <menu action=\"PluginMenu\">\n"
-"    </menu>\n"
-"    <menu action=\"HelpMenu\">\n"
-"      <menuitem action=\"HelpAbout\"/>\n"
-"    </menu>\n"
-"  </menubar>\n"
-"</ui>\n";
-
 const std::string juci_light_style =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "\n"
diff --git a/src/menu.cc b/src/menu.cc
index 10daca9..6f0d2ef 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -14,6 +14,62 @@ Menu::Menu() : box(Gtk::ORIENTATION_VERTICAL) {
   action_group->add(Gtk::Action::create("SourceMenu", "_Source"));
   action_group->add(Gtk::Action::create("PluginMenu", "_Plugins"));
   action_group->add(Gtk::Action::create("HelpMenu", "Help"));
+  
+  ui_xml =
+  "<ui>\n"
+  "  <menubar name=\"MenuBar\">\n"
+  "    <menu action=\"FileMenu\">\n"
+  "      <menuitem action=\"FileNewFile\"/>\n"
+  "      <menuitem action=\"FileNewFolder\"/>\n"
+  "      <menu action=\"FileNewProject\">\n"
+  "        <menuitem action=\"FileNewProjectCpp\"/>\n"
+  "      </menu>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"FileOpenFile\"/>\n"
+  "      <menuitem action=\"FileOpenFolder\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"FileSave\"/>\n"
+  "      <menuitem action=\"FileSaveAs\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"FileQuit\"/>\n"
+  "    </menu>\n"
+  "    <menu action=\"EditMenu\">\n"
+  "      <menuitem action=\"EditUndo\"/>\n"
+  "      <menuitem action=\"EditRedo\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"EditCopy\"/>\n"
+  "      <menuitem action=\"EditCut\"/>\n"
+  "      <menuitem action=\"EditPaste\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"EditFind\"/>\n"
+  "    </menu>\n"
+  "    <menu action=\"SourceMenu\">\n"
+  "      <menuitem action=\"SourceGotoLine\"/>\n"
+  "      <menuitem action=\"SourceCenterCursor\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"SourceGotoDeclaration\"/>\n"
+  "      <menuitem action=\"SourceGotoMethod\"/>\n"
+  "      <menuitem action=\"SourceRename\"/>\n"
+  "    </menu>\n"
+  "    <menu action=\"ProjectMenu\">\n"
+  "      <menuitem action=\"ProjectCompileAndRun\"/>\n"
+  "      <menuitem action=\"ProjectCompile\"/>\n"
+  "      <separator/>\n"
+  "      <menuitem action=\"ProjectRunCommand\"/>\n"
+  "      <menuitem action=\"ProjectKillLastRunning\"/>\n"
+  "      <menuitem action=\"ProjectForceKillLastRunning\"/>\n"
+  "    </menu>\n"
+  "    <menu action=\"WindowMenu\">\n"
+  "      <menuitem action=\"WindowCloseTab\"/>\n"
+  "      <menuitem action=\"WindowSplitWindow\"/>\n"
+  "    </menu>\n"
+  "    <menu action=\"PluginMenu\">\n"
+  "    </menu>\n"
+  "    <menu action=\"HelpMenu\">\n"
+  "      <menuitem action=\"HelpAbout\"/>\n"
+  "    </menu>\n"
+  "  </menubar>\n"
+  "</ui>\n";
 }
 
 Gtk::Widget& Menu::get_widget() {
@@ -22,7 +78,7 @@ Gtk::Widget& Menu::get_widget() {
 
 void Menu::build() {
   try {
-    ui_manager->add_ui_from_string(ui);
+    ui_manager->add_ui_from_string(ui_xml);
   }
   catch (const Glib::Error &ex) {
     std::cerr << "building menu failed" << ex.what();
diff --git a/src/menu.h b/src/menu.h
index 9dcc6eb..257854e 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -13,7 +13,7 @@ public:
   
   Gtk::Box box;
   std::unordered_map<std::string, std::string> key_map;
-  std::string ui;
+  std::string ui_xml;
   Glib::RefPtr<Gtk::UIManager> ui_manager;
   Glib::RefPtr<Gtk::ActionGroup> action_group;
 };
diff --git a/src/window.cc b/src/window.cc
index 3164382..13bfa5a 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -24,8 +24,6 @@ namespace sigc {
 }
 
 void Window::generate_keybindings() {
-  boost::filesystem::path path(Singleton::config_dir() + "menu.xml");
-  menu.ui = juci::filesystem::read(path);
   for (auto &i : Singleton::Config::window()->keybindings) {
     auto key = i.second.get_value<std::string>();
     menu.key_map[i.first] = key;