improve layout and display of CD range info in location display

git-svn-id: svn://localhost/ardour2/branches/3.0@10989 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-12-12 15:13:10 +00:00
parent 4a0c798242
commit be371bedb9
2 changed files with 19 additions and 10 deletions

View File

@@ -56,8 +56,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
, hide_check_button (_("Hide"))
, lock_check_button (_("Lock"))
, glue_check_button (_("Glue"))
, scms_check_button (_("SCMS"))
, preemph_check_button (_("Pre-Emphasis"))
, _clock_group (0)
{
i_am_the_modifier = 0;
@@ -81,12 +79,11 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
composer_label.set_name ("LocationEditNumberLabel");
composer_entry.set_name ("LocationEditNameEntry");
isrc_label.set_text ("ISRC: ");
isrc_label.set_size_request (30, -1);
performer_label.set_text ("Performer: ");
performer_label.set_size_request (60, -1);
composer_label.set_text ("Composer: ");
composer_label.set_size_request (60, -1);
isrc_label.set_text (X_("ISRC:"));
performer_label.set_text (_("Performer:"));
composer_label.set_text (_("Composer:"));
scms_label.set_text (X_("SCMS"));
preemph_label.set_text (_("Pre-Emphasis"));
isrc_entry.set_size_request (112, -1);
isrc_entry.set_max_length(12);
@@ -100,14 +97,24 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
name_label.set_alignment (0, 0.5);
Gtk::HBox* front_spacing = manage (new HBox);
front_spacing->set_size_request (20, -1);
Gtk::HBox* mid_spacing = manage (new HBox);
mid_spacing->set_size_request (20, -1);
cd_track_details_hbox.set_spacing (4);
cd_track_details_hbox.pack_start (*front_spacing, false, false);
cd_track_details_hbox.pack_start (isrc_label, false, false);
cd_track_details_hbox.pack_start (isrc_entry, false, false);
cd_track_details_hbox.pack_start (scms_check_button, false, false);
cd_track_details_hbox.pack_start (preemph_check_button, false, false);
cd_track_details_hbox.pack_start (performer_label, false, false);
cd_track_details_hbox.pack_start (performer_entry, true, true);
cd_track_details_hbox.pack_start (composer_label, false, false);
cd_track_details_hbox.pack_start (composer_entry, true, true);
cd_track_details_hbox.pack_start (*mid_spacing, false, false);
cd_track_details_hbox.pack_start (scms_label, false, false);
cd_track_details_hbox.pack_start (scms_check_button, false, false);
cd_track_details_hbox.pack_start (preemph_label, false, false);
cd_track_details_hbox.pack_start (preemph_check_button, false, false);
isrc_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::isrc_entry_changed));
performer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::performer_entry_changed));

View File

@@ -104,7 +104,9 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::Label composer_label;
Gtk::Entry composer_entry;
Gtk::CheckButton scms_check_button;
Gtk::Label scms_label;
Gtk::CheckButton preemph_check_button;
Gtk::Label preemph_label;
ClockGroup* _clock_group;
guint32 i_am_the_modifier;