From 7b3579bd4d506ab8ea8a8eaf02cceaf4f1e8d9e2 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 5 Jan 2017 14:31:27 -0600 Subject: [PATCH] Un-bunch the bunched-up Keybindings editor widgets. --- gtk2_ardour/keyeditor.cc | 11 +++++++---- gtk2_ardour/keyeditor.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index aea8185f3b..2ee265a396 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -79,7 +79,6 @@ KeyEditor::KeyEditor () , unbind_box (BUTTONBOX_END) , filter_entry (_("Search..."), true) , filter_string("") - , print_button (_("Print")) , sort_column(0) , sort_type(Gtk::SORT_ASCENDING) { @@ -94,19 +93,22 @@ KeyEditor::KeyEditor () filter_entry.signal_search_string_updated ().connect (sigc::mem_fun (*this, &KeyEditor::search_string_updated)); vpacker.pack_start (filter_entry, false, false); - Label* hint = manage (new Label (_("To remove a shortcut select an action then press this: "))); + Label* hint = manage (new Label (_("To remove a shortcut, select an action then press this: "))); hint->show (); - unbind_box.set_spacing (6); unbind_box.pack_start (*hint, false, true); unbind_box.pack_start (unbind_button, false, false); unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind)); + vpacker.set_spacing (4); vpacker.pack_start (unbind_box, false, false); unbind_box.show (); unbind_button.show (); reset_button.add (reset_label); - reset_label.set_markup (string_compose ("%1", _("Reset Bindings to Defaults"))); + reset_label.set_markup (string_compose (" %1 ", _("Reset Bindings to Defaults"))); + + print_button.add (print_label); + print_label.set_markup (string_compose (" %1 ", _("Print Bindings (to your web browser)"))); print_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::print)); @@ -117,6 +119,7 @@ KeyEditor::KeyEditor () reset_label.show (); print_button.show (); reset_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::reset)); + vpacker.pack_start (*(manage (new HSeparator())), true, true, 5); vpacker.pack_start (reset_box, false, false); add (vpacker); diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h index 3e4c5d068c..aedd41d4f2 100644 --- a/gtk2_ardour/keyeditor.h +++ b/gtk2_ardour/keyeditor.h @@ -112,6 +112,7 @@ class KeyEditor : public ArdourWindow Gtkmm2ext::SearchBar filter_entry; std::string filter_string; Gtk::Button print_button; + Gtk::Label print_label; typedef std::vector Tabs;