Set -b switch to only two columns, correct options text.

This commit is contained in:
Len Ovens
2017-04-22 08:07:35 -07:00
parent dd1bf47394
commit b81d6a6160
2 changed files with 8 additions and 8 deletions

View File

@@ -695,28 +695,28 @@ ARDOUR_UI::post_engine ()
vector<string> tooltips;
vector<string> keys;
vector<Glib::RefPtr<Gtk::Action> > actions;
string ver_in = revision;
string ver = ver_in.substr(0, ver_in.find("-"));
cout << "\n<h2>Menu actions</h2>" << endl;
cout << "<!-- created by running ardour -b -->" << endl;
cout << "<p>\n Every single menu item in Ardour's GUI is accessible by control" << endl;
cout << " surfaces or scripts.\n</p>\n" << endl;
cout << "<p>\n The list below shows all available values of <em>action-name</em> as of" << endl;
cout << "Ardour " << revision << ". You can get the current list at any" << endl;
cout << " Ardour " << ver << ". You can get the current list at any" << endl;
cout << " time by running Ardour with the -b flag.\n</p>\n" << endl;
cout << "<table class=\"dl\">\n <thead>" << endl;
cout << " <tr><th>Action Name</th><th>Menu Name</th><th>Key Binding</th></tr>" << endl;
cout << " <tr><th>Action Name</th><th>Menu Name</th></tr>" << endl;
cout << " </thead>\n <tbody>" << endl;
Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
vector<string>::iterator k;
vector<string>::iterator p;
vector<string>::iterator l;
for (p = paths.begin(), k = keys.begin(), l = labels.begin(); p != paths.end(); ++k, ++p, ++l) {
for (p = paths.begin(), l = labels.begin(); p != paths.end(); ++p, ++l) {
cout << " <tr><th><kbd class=\"osc\">" << (*p).substr (9, string::npos);
cout << "</kbd></th><td>" << *l << "</td>";
cout << "<td>" << *k << "</td></tr>" << endl;
cout << "</kbd></th><td>" << *l << "</td></tr>" << endl;
}
cout << " </tbody>\n </table class=\"dl\">" << endl;

View File

@@ -67,7 +67,7 @@ print_help (const char *execname)
<< "\n\n"
<< _("Options:\n")
<< _(" -a, --no-announcements Do not contact website for announcements\n")
<< _(" -b, --bindings Print all possible keyboard binding names\n")
<< _(" -b, --actions Print all possible menu action names\n")
<< _(" -B, --bypass-plugins Bypass all plugins in an existing session\n")
<< _(" -c, --name <name> Use a specific backend client name, default is ardour\n")
#ifndef NDEBUG
@@ -116,7 +116,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "version", 0, 0, 'v' },
{ "help", 0, 0, 'h' },
{ "no-announcements", 0, 0, 'a' },
{ "bindings", 0, 0, 'b' },
{ "actions", 0, 0, 'b' },
{ "bypass-plugins", 0, 0, 'B' },
{ "disable-plugins", 0, 0, 'd' },
{ "debug", 1, 0, 'D' },