projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #1637 (needs merging to 2.0.1 branch); remove debug printf
[ardour.git]
/
gtk2_ardour
/
visual_time_axis.cc
diff --git
a/gtk2_ardour/visual_time_axis.cc
b/gtk2_ardour/visual_time_axis.cc
index 582c18c86f3334bd5b1097794f74e555ab8f13eb..b68597114488e8e95a2992d22476b0f15186e1a6 100644
(file)
--- a/
gtk2_ardour/visual_time_axis.cc
+++ b/
gtk2_ardour/visual_time_axis.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdlib>
*/
#include <cstdlib>
@@
-55,6
+54,7
@@
#include "i18n.h"
using namespace ARDOUR;
#include "i18n.h"
using namespace ARDOUR;
+using namespace PBD;
using namespace sigc;
using namespace Gtk;
using namespace sigc;
using namespace Gtk;
@@
-198,7
+198,12
@@
VisualTimeAxis::visual_click()
void
VisualTimeAxis::hide_click()
{
void
VisualTimeAxis::hide_click()
{
+ // LAME fix for hide_button display refresh
+ hide_button.set_sensitive(false);
+
editor.hide_track_in_display (*this);
editor.hide_track_in_display (*this);
+
+ hide_button.set_sensitive(true);
}
}
@@
-254,7
+259,7
@@
VisualTimeAxis::set_time_axis_color(Gdk::Color c)
}
void
}
void
-VisualTimeAxis::set_selected_regionviews (
Audio
RegionSelection& regions)
+VisualTimeAxis::set_selected_regionviews (RegionSelection& regions)
{
// Not handled by purely visual TimeAxis
}
{
// Not handled by purely visual TimeAxis
}
@@
-274,12
+279,12
@@
VisualTimeAxis::remove_this_time_axis(void* src)
std::string prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
std::string prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
- choices.push_back (_("Yes, remove it."));
choices.push_back (_("No, do nothing."));
choices.push_back (_("No, do nothing."));
+ choices.push_back (_("Yes, remove it."));
Gtkmm2ext::Choice prompter (prompt, choices);
Gtkmm2ext::Choice prompter (prompt, choices);
- if (prompter.run () ==
0
) {
+ if (prompter.run () ==
1
) {
/*
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
/*
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
@@
-322,6
+327,8
@@
VisualTimeAxis::start_time_axis_rename()
ArdourPrompter name_prompter;
name_prompter.set_prompt (_("new name: ")) ;
ArdourPrompter name_prompter;
name_prompter.set_prompt (_("new name: ")) ;
+ name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+ name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
name_prompter.show_all() ;
switch (name_prompter.run ()) {
name_prompter.show_all() ;
switch (name_prompter.run ()) {
@@
-367,17
+374,17
@@
VisualTimeAxis::name_entry_changed()
return;
}
return;
}
+ strip_whitespace_edges(x);
+
if (x.length() == 0) {
name_entry.set_text (time_axis_name);
return;
}
if (x.length() == 0) {
name_entry.set_text (time_axis_name);
return;
}
- strip_whitespace_edges(x);
-
if (!editor.get_named_time_axis(x)) {
set_time_axis_name(x, this);
} else {
if (!editor.get_named_time_axis(x)) {
set_time_axis_name(x, this);
} else {
- ARDOUR_UI::instance()->popup_error (_("
a
track already exists with that name"));
+ ARDOUR_UI::instance()->popup_error (_("
A
track already exists with that name"));
name_entry.set_text(time_axis_name);
}
}
name_entry.set_text(time_axis_name);
}
}
@@
-417,7
+424,7
@@
VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
// Super class methods not handled by VisualTimeAxis
void
// Super class methods not handled by VisualTimeAxis
void
-VisualTimeAxis::show_timestretch (
jack_nframes_t start, jack_
nframes_t end)
+VisualTimeAxis::show_timestretch (
nframes_t start,
nframes_t end)
{
// Not handled by purely visual TimeAxis
}
{
// Not handled by purely visual TimeAxis
}