anchor the crossfade start and endpoints, and add Help shortcuts to the manual and online reference
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6791 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e3d616f6c0
commit
b47f6e5896
|
@ -580,6 +580,8 @@
|
||||||
<menu name='Help' action='Help'>
|
<menu name='Help' action='Help'>
|
||||||
<menuitem action='About'/>
|
<menuitem action='About'/>
|
||||||
<menuitem action='Chat'/>
|
<menuitem action='Chat'/>
|
||||||
|
<menuitem action='Manual'/>
|
||||||
|
<menuitem action='Reference'/>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
||||||
</menubar>
|
</menubar>
|
||||||
|
|
|
@ -2817,6 +2817,18 @@ ARDOUR_UI::launch_chat ()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ARDOUR_UI::launch_manual ()
|
||||||
|
{
|
||||||
|
NagScreen::open_uri("http://en.flossmanuals.net/Ardour/Introduction");
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ARDOUR_UI::launch_reference ()
|
||||||
|
{
|
||||||
|
NagScreen::open_uri("http://vm-nice.stackingdwarves.net:8888/ardour-en/8-ARDOUR/24-ARDOUR.html");
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ARDOUR_UI::hide_about ()
|
ARDOUR_UI::hide_about ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -115,6 +115,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
|
||||||
void hide_splash ();
|
void hide_splash ();
|
||||||
|
|
||||||
void launch_chat ();
|
void launch_chat ();
|
||||||
|
void launch_manual ();
|
||||||
|
void launch_reference ();
|
||||||
|
|
||||||
void show_about ();
|
void show_about ();
|
||||||
void hide_about ();
|
void hide_about ();
|
||||||
|
|
||||||
|
|
|
@ -221,7 +221,11 @@ ARDOUR_UI::install_actions ()
|
||||||
act = ActionManager::register_toggle_action (common_actions, X_("ToggleBigClock"), _("Big Clock"), mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window));
|
act = ActionManager::register_toggle_action (common_actions, X_("ToggleBigClock"), _("Big Clock"), mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window));
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_about));
|
ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_about));
|
||||||
|
|
||||||
ActionManager::register_action (common_actions, X_("Chat"), _("Chat"), mem_fun(*this, &ARDOUR_UI::launch_chat));
|
ActionManager::register_action (common_actions, X_("Chat"), _("Chat"), mem_fun(*this, &ARDOUR_UI::launch_chat));
|
||||||
|
ActionManager::register_action (common_actions, X_("Manual"), _("Manual"), mem_fun(*this, &ARDOUR_UI::launch_manual));
|
||||||
|
ActionManager::register_action (common_actions, X_("Reference"), _("Reference"), mem_fun(*this, &ARDOUR_UI::launch_reference));
|
||||||
|
|
||||||
ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
|
ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
|
||||||
ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
|
ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
|
||||||
|
|
||||||
|
|
|
@ -412,15 +412,16 @@ CrossfadeEditor::point_event (GdkEvent* event, Point* point)
|
||||||
if (point_grabbed) {
|
if (point_grabbed) {
|
||||||
double new_x, new_y;
|
double new_x, new_y;
|
||||||
|
|
||||||
/* can't drag first or last points horizontally */
|
/* can't drag first or last points horizontally or vetically*/
|
||||||
|
|
||||||
if (point == fade[current].points.front() || point == fade[current].points.back()) {
|
if (point == fade[current].points.front() || point == fade[current].points.back()) {
|
||||||
new_x = point->x;
|
new_x = point->x;
|
||||||
|
new_y = point->y;
|
||||||
} else {
|
} else {
|
||||||
new_x = (event->motion.x - canvas_border)/effective_width();
|
new_x = (event->motion.x - canvas_border)/effective_width();
|
||||||
|
new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height());
|
||||||
}
|
}
|
||||||
|
|
||||||
new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height());
|
|
||||||
point->move_to (x_coordinate (new_x), y_coordinate (new_y),
|
point->move_to (x_coordinate (new_x), y_coordinate (new_y),
|
||||||
new_x, new_y);
|
new_x, new_y);
|
||||||
redraw ();
|
redraw ();
|
||||||
|
|
|
@ -798,6 +798,9 @@ Crossfade::set_state (const XMLNode& node)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_fade_in.front()->value=0.0;
|
||||||
|
_fade_in.back()->value=1.0;
|
||||||
|
|
||||||
_fade_in.thaw ();
|
_fade_in.thaw ();
|
||||||
|
|
||||||
/* fade out */
|
/* fade out */
|
||||||
|
@ -823,6 +826,9 @@ Crossfade::set_state (const XMLNode& node)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_fade_out.front()->value=1.0;
|
||||||
|
_fade_out.back()->value=0.0;
|
||||||
|
|
||||||
_fade_out.thaw ();
|
_fade_out.thaw ();
|
||||||
|
|
||||||
StateChanged (what_changed); /* EMIT SIGNAL */
|
StateChanged (what_changed); /* EMIT SIGNAL */
|
||||||
|
|
Loading…
Reference in New Issue