smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Consolidate ActionChanged callbacks, add tooltips

Browse source
This commit is contained in:
Robin Gareus 2017-02-18 16:14:41 +01:00
parent 2d50871034
commit 92e203a19e
3 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -41,6 +41,7 @@
#include "luawindow.h" #include "luawindow.h"
#include "mixer_ui.h" #include "mixer_ui.h"
#include "keyboard.h" #include "keyboard.h"
#include "keyeditor.h"
#include "splash.h" #include "splash.h"
#include "rc_option_editor.h" #include "rc_option_editor.h"
#include "route_params_ui.h" #include "route_params_ui.h"
@ -419,7 +420,7 @@ ARDOUR_UI::bind_lua_action_script (GdkEventButton*ev, int i)
} }
void void
ARDOUR_UI::update_action_script_btn (int i, const std::string&) ARDOUR_UI::update_action_script_btn (int i, const std::string& n)
{ {
if (LuaInstance::instance()->lua_action_has_icon (i)) { if (LuaInstance::instance()->lua_action_has_icon (i)) {
uintptr_t ii = i; uintptr_t ii = i;
@ -427,4 +428,18 @@ ARDOUR_UI::update_action_script_btn (int i, const std::string&)
} else { } else {
action_script_call_btn[i].set_icon (0, 0); action_script_call_btn[i].set_icon (0, 0);
} }
std::string const a = string_compose (X_("script-action-%1"), i + 1);
Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
assert (act);
if (n.empty ()) {
act->set_label (string_compose (_("Unset #%1"), i + 1));
act->set_tooltip (_("No action bound\nRight-click to assign"));
act->set_sensitive (false);
} else {
act->set_label (n);
act->set_tooltip (string_compose (_("%1\n\nClick to run\nRight-click to re-assign\nShift+right-click to unassign"), n));
act->set_sensitive (true);
}
KeyEditor::UpdateBindings ();
} }

21
gtk2_ardour/editor.cc
View file

@ -112,7 +112,6 @@
#include "gui_object.h" #include "gui_object.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "keyboard.h" #include "keyboard.h"
#include "keyeditor.h"
#include "luainstance.h" #include "luainstance.h"
#include "marker.h" #include "marker.h"
#include "midi_region_view.h" #include "midi_region_view.h"
@ -869,8 +868,6 @@ Editor::Editor ()
setup_fade_images (); setup_fade_images ();
LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &Editor::set_script_action_name));
instant_save (); instant_save ();
} }
@ -5876,24 +5873,6 @@ Editor::trigger_script (int i)
LuaInstance::instance()-> call_action (i); LuaInstance::instance()-> call_action (i);
} }
void
Editor::set_script_action_name (int i, const std::string& n)
{
string const a = string_compose (X_("script-action-%1"), i + 1);
Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
assert (act);
if (n.empty ()) {
act->set_label (string_compose (_("Unset #%1"), i + 1));
act->set_tooltip (_("no action bound"));
act->set_sensitive (false);
} else {
act->set_label (n);
act->set_tooltip (n);
act->set_sensitive (true);
}
KeyEditor::UpdateBindings ();
}
void void
Editor::show_editor_list (bool yn) Editor::show_editor_list (bool yn)
{ {

2
gtk2_ardour/editor.h
View file

@ -1640,8 +1640,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void initialize_canvas (); void initialize_canvas ();
void set_script_action_name (int i, const std::string&);
/* display control */ /* display control */
bool _show_measures; bool _show_measures;