Fixed 2 out of 3 Ubuntu menu problems.

10 years ago · eb587684af
3 changed files with 76 additions and 7 deletions
--- a/src/juci.cc
+++ b/src/juci.cc
@ -38,7 +38,6 @@ int app::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd) {
 }

 void app::on_activate() {
-  window = std::unique_ptr<Window>(new Window());
  add_window(*window);
  window->show();
  bool first_directory=true;
@ -71,6 +70,7 @@ void app::on_activate() {
 void app::on_startup() {
  Gtk::Application::on_startup();
  
+  Singleton::menu()->init();
  Singleton::menu()->build();

  auto object = Singleton::menu()->builder->get_object("juci-menu");
@ -88,6 +88,8 @@ void app::on_startup() {

 app::app() : Gtk::Application("no.sout.juci", Gio::APPLICATION_NON_UNIQUE | Gio::APPLICATION_HANDLES_COMMAND_LINE) {
  Glib::set_application_name("juCi++");
+  Singleton::menu()->application=static_cast<Gtk::Application*>(this); //For Ubuntu 14...
+  window = std::unique_ptr<Window>(new Window());
 }

 int main(int argc, char *argv[]) {
--- a/src/menu.cc
+++ b/src/menu.cc
@ -6,6 +6,33 @@
 using namespace std; //TODO: remove

 Menu::Menu() {
+}
+
+//TODO: if Ubuntu ever gets fixed, move to constructor, also cleanup the rest of the Ubuntu specific code
+void Menu::init() {
+  auto accels=Singleton::Config::menu()->keys;
+  for(auto &accel: accels) {
+#ifdef __linux //Ubuntu...
+    size_t pos=0;
+    std::string second=accel.second;
+    while((pos=second.find('<', pos))!=std::string::npos) {
+      second.replace(pos, 1, "&lt;");
+      pos+=4;
+    }
+    pos=0;
+    while((pos=second.find('>', pos))!=std::string::npos) {
+      second.replace(pos, 1, "&gt;");
+      pos+=4;
+    }
+    if(second.size()>0)
+      accel.second="<attribute name='accel'>"+second+"</attribute>";
+    else
+      accel.second="";
+#else
+      accel.second="";
+#endif
+  }
+  
  ui_xml =
  "<interface>"
  "  <menu id='juci-menu'>"
@ -13,18 +40,21 @@ Menu::Menu() {
  "      <item>"
  "        <attribute name='label' translatable='yes'>_About</attribute>"
  "        <attribute name='action'>app.about</attribute>"
+           +accels["about"]+ //For Ubuntu...
  "      </item>"
  "    </section>"
  "    <section>"
  "      <item>"
  "        <attribute name='label' translatable='yes'>_Preferences</attribute>"
  "        <attribute name='action'>app.preferences</attribute>"
+           +accels["preferences"]+ //For Ubuntu...
  "      </item>"  
  "    </section>"
  "    <section>"
  "      <item>"
  "        <attribute name='label' translatable='yes'>_Quit</attribute>"
  "        <attribute name='action'>app.quit</attribute>"
+           +accels["quit"]+ //For Ubuntu...
  "      </item>"  
  "    </section>"
  "  </menu>"
@ -36,16 +66,19 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_New _File</attribute>"
  "          <attribute name='action'>app.new_file</attribute>"
+             +accels["new_file"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_New _Directory</attribute>"
  "          <attribute name='action'>app.new_folder</attribute>"
+             +accels["new_folder"]+ //For Ubuntu...
  "        </item>"
  "        <submenu>"
  "          <attribute name='label' translatable='yes'>_New _Project</attribute>"
  "          <item>"
  "            <attribute name='label' translatable='no'>C++</attribute>"
  "            <attribute name='action'>app.new_project_cpp</attribute>"
+               +accels["new_project_cpp"]+ //For Ubuntu...
  "          </item>"
  "        </submenu>"
  "      </section>"
@ -53,20 +86,24 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Open _File</attribute>"
  "          <attribute name='action'>app.open_file</attribute>"
+             +accels["open_file"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Open _Folder</attribute>"
  "          <attribute name='action'>app.open_folder</attribute>"
+             +accels["open_folder"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Save</attribute>"
  "          <attribute name='action'>app.save</attribute>"
+             +accels["save"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Save _As</attribute>"
  "          <attribute name='action'>app.save_as</attribute>"
+             +accels["save_as"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "    </submenu>"
@ -77,30 +114,36 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Undo</attribute>"
  "          <attribute name='action'>app.edit_undo</attribute>"
+             +accels["edit_undo"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Redo</attribute>"
  "          <attribute name='action'>app.edit_redo</attribute>"
+             +accels["edit_redo"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Cut</attribute>"
  "          <attribute name='action'>app.edit_cut</attribute>"
+             +accels["edit_cut"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Copy</attribute>"
  "          <attribute name='action'>app.edit_copy</attribute>"
+             +accels["edit_copy"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Paste</attribute>"
  "          <attribute name='action'>app.edit_paste</attribute>"
+             +accels["edit_paste"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Find</attribute>"
  "          <attribute name='action'>app.edit_find</attribute>"
+             +accels["edit_find"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "    </submenu>"
@ -113,14 +156,17 @@ Menu::Menu() {
  "          <item>"
  "            <attribute name='label' translatable='yes'>_Spell _Check _Buffer</attribute>"
  "            <attribute name='action'>app.source_spellcheck</attribute>"
+               +accels["source_spellcheck"]+ //For Ubuntu...
  "          </item>"
  "          <item>"
  "            <attribute name='label' translatable='yes'>_Clear _Spelling _Errors</attribute>"
  "            <attribute name='action'>app.source_spellcheck_clear</attribute>"
+               +accels["source_spellcheck_clear"]+ //For Ubuntu...
  "          </item>"
  "          <item>"
  "            <attribute name='label' translatable='yes'>_Go _to _Next _Spelling _Error</attribute>"
  "            <attribute name='action'>app.source_spellcheck_next_error</attribute>"
+               +accels["source_spellcheck_next_error"]+ //For Ubuntu...
  "          </item>"
  "        </submenu>"
  "      </section>"
@ -130,10 +176,12 @@ Menu::Menu() {
  "          <item>"
  "            <attribute name='label' translatable='yes'>_Set _Current _Buffer _Tab</attribute>"
  "            <attribute name='action'>app.source_indentation_set_buffer_tab</attribute>"
+               +accels["source_indentation_set_buffer_tab"]+ //For Ubuntu...
  "          </item>"
  "          <item>"
  "            <attribute name='label' translatable='yes'>_Auto-Indent _Current _Buffer</attribute>"
  "            <attribute name='action'>app.source_indentation_auto_indent_buffer</attribute>"
+               +accels["source_indentation_auto_indent_buffer"]+ //For Ubuntu...
  "          </item>"
  "        </submenu>"
  "      </section>"
@ -141,40 +189,48 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Go _to _Line</attribute>"
  "          <attribute name='action'>app.source_goto_line</attribute>"
+             +accels["source_goto_line"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Center _Cursor</attribute>"
  "          <attribute name='action'>app.source_center_cursor</attribute>"
+             +accels["source_center_cursor"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Find _Documentation</attribute>"
  "          <attribute name='action'>app.source_find_documentation</attribute>"
+             +accels["source_find_documentation"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Go to Declaration</attribute>"
  "          <attribute name='action'>app.source_goto_declaration</attribute>"
+             +accels["source_goto_declaration"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Go to Method</attribute>"
  "          <attribute name='action'>app.source_goto_method</attribute>"
+             +accels["source_goto_method"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Rename</attribute>"
  "          <attribute name='action'>app.source_rename</attribute>"
+             +accels["source_rename"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Go to Next Diagnostic</attribute>"
  "          <attribute name='action'>app.source_goto_next_diagnostic</attribute>"
+             +accels["source_goto_next_diagnostic"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Apply Fix-Its</attribute>"
  "          <attribute name='action'>app.source_apply_fix_its</attribute>"
+             +accels["source_apply_fix_its"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "    </submenu>"
@ -185,24 +241,29 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Compile _and _Run</attribute>"
  "          <attribute name='action'>app.compile_and_run</attribute>"
+             +accels["compile_and_run"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Compile</attribute>"
  "          <attribute name='action'>app.compile</attribute>"
+             +accels["compile"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Run _Command</attribute>"
  "          <attribute name='action'>app.run_command</attribute>"
+             +accels["run_command"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Kill _Last _Process</attribute>"
  "          <attribute name='action'>app.kill_last_running</attribute>"
+             +accels["kill_last_running"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Force _Kill _Last _Process</attribute>"
  "          <attribute name='action'>app.force_kill_last_running</attribute>"
+             +accels["force_kill_last_running"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "    </submenu>"
@ -213,16 +274,19 @@ Menu::Menu() {
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Next _Tab</attribute>"
  "          <attribute name='action'>app.next_tab</attribute>"
+             +accels["next_tab"]+ //For Ubuntu...
  "        </item>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Previous _Tab</attribute>"
  "          <attribute name='action'>app.previous_tab</attribute>"
+             +accels["previous_tab"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "      <section>"
  "        <item>"
  "          <attribute name='label' translatable='yes'>_Close _Tab</attribute>"
  "          <attribute name='action'>app.close_tab</attribute>"
+             +accels["close_tab"]+ //For Ubuntu...
  "        </item>"
  "      </section>"
  "    </submenu>"
@ -231,17 +295,18 @@ Menu::Menu() {
 }

 void Menu::add_action(const std::string &name, std::function<void()> action) {
-  auto application = builder->get_application();
-  
  actions[name]=application->add_action(name, action);
 }

 void Menu::set_keys() {
-  auto application = builder->get_application();
-  
  for(auto &key: Singleton::Config::menu()->keys) {
-    if(key.second.size()>0 && actions.find(key.first)!=actions.end())
+    if(key.second.size()>0 && actions.find(key.first)!=actions.end()) {
+#if GTK_VERSION_GE(3, 12)
      application->set_accel_for_action("app."+key.first, key.second); 
+#else
+      application->add_accelerator(key.second, "app."+key.first); //For Ubuntu 14...
+#endif
+    }
  }
 }

--- a/src/menu.h
+++ b/src/menu.h
@ -13,6 +13,8 @@ public:
  };

  Menu();
+  void init(); //For Ubuntu 14...
+  Gtk::Application* application; //For Ubuntu 14...
  
  void add_action(const std::string &name, std::function<void()> action);
  std::unordered_map<std::string, Glib::RefPtr<Gio::SimpleAction> > actions;