#include <gtkmm/stock.h>
#include <gtkmm/table.h>
-#include "ardour/midi_model.h"
-#include "edit_note_dialog.h"
+
+#include "gtkmm2ext/utils.h"
+
#include "canvas-note-event.h"
+#include "edit_note_dialog.h"
#include "midi_region_view.h"
+#include "i18n.h"
+
using namespace Gtk;
+using namespace Gtkmm2ext;
/**
* EditNoteDialog constructor.
: ArdourDialog (_("Note"))
, _region_view (rv)
, _event (ev)
- , _time_clock (X_("notetime"), true, X_("NoteTimeClock"), true, false)
- , _length_clock (X_("notelength"), true, X_("NoteLengthClock"), true, false, true)
+ , _time_clock (X_("notetime"), true, "", true, false)
+ , _length_clock (X_("notelength"), true, "", true, false, true)
{
Table* table = manage (new Table (4, 2));
table->set_spacings (6);
int r = 0;
- Label* l = manage (new Label (_("Channel")));
- l->set_alignment (0, 0.5);
+ Label* l = manage (left_aligned_label (_("Channel")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_channel, 1, 2, r, r + 1);
++r;
_channel.set_increments (1, 2);
_channel.set_value (ev->note()->channel () + 1);
- l = manage (new Label (_("Pitch")));
- l->set_alignment (0, 0.5);
+ l = manage (left_aligned_label (_("Pitch")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_pitch, 1, 2, r, r + 1);
++r;
_pitch.set_increments (1, 10);
_pitch.set_value (ev->note()->note ());
- l = manage (new Label (_("Velocity")));
- l->set_alignment (0, 0.5);
+ l = manage (left_aligned_label (_("Velocity")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_velocity, 1, 2, r, r + 1);
++r;
_velocity.set_increments (1, 10);
_velocity.set_value (ev->note()->velocity ());
- l = manage (new Label (_("Time")));
- l->set_alignment (0, 0.5);
+ l = manage (left_aligned_label (_("Time")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_time_clock, 1, 2, r, r + 1);
++r;
- _time_clock.set_session (_region_view->get_trackview().session ());
+ _time_clock.set_session (_region_view->get_time_axis_view().session ());
_time_clock.set_mode (AudioClock::BBT);
- _time_clock.set (_region_view->time_converter().to (ev->note()->time ()), true);
+ _time_clock.set (_region_view->source_relative_time_converter().to (ev->note()->time ()), true);
- l = manage (new Label (_("Length")));
- l->set_alignment (0, 0.5);
+ l = manage (left_aligned_label (_("Length")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_length_clock, 1, 2, r, r + 1);
++r;
- _length_clock.set_session (_region_view->get_trackview().session ());
+ _length_clock.set_session (_region_view->get_time_axis_view().session ());
_length_clock.set_mode (AudioClock::BBT);
- _length_clock.set (_region_view->time_converter().to (ev->note()->length ()), true);
+ _length_clock.set (_region_view->region_relative_time_converter().to (ev->note()->length ()), true);
get_vbox()->pack_start (*table);
return r;
}
- _region_view->start_diff_command (_("edit note"));
-
+ /* These calls mean that if a value is entered using the keyboard
+ it will be returned by the get_value_as_int()s below.
+ */
+ _channel.update ();
+ _pitch.update ();
+ _velocity.update ();
+
+ _region_view->start_note_diff_command (_("edit note"));
+
bool had_change = false;
if (_channel.get_value_as_int() - 1 != _event->note()->channel()) {
had_change = true;
}
- double const t = _region_view->time_converter().from (_time_clock.current_time ());
-
+ double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
+
if (t != _event->note()->time()) {
_region_view->change_note_time (_event, t);
had_change = true;
}
- double const d = _region_view->time_converter().from (_length_clock.current_duration ());
+ double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
if (d != _event->note()->length()) {
_region_view->change_note_length (_event, d);
_region_view->apply_diff ();
- _event->set_selected (_event->selected()); // change color
-
+ _event->set_selected (_event->selected()); // change color
+
return r;
}