- /* the string here needs to be the longest one to display */
- const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button
-
- // TRANSLATORS: this is not a mis-spelling of "thirty", we're including a vertical
- // descender to make sure the height gets computed properly.
- Gtkmm2ext::set_size_request_to_display_given_text (note_types, _("thirtq-second (32)"), 7+FUDGE, 15);
-
- set_popdown_strings (note_types, strings);
-
- if (note_type==1.0f)
- note_types.set_active_text (_("whole (1)"));
- else if (note_type==2.0f)
- note_types.set_active_text (_("second (2)"));
- else if (note_type==3.0f)
- note_types.set_active_text (_("third (3)"));
- else if (note_type==4.0f)
- note_types.set_active_text (_("quarter (4)"));
- else if (note_type==8.0f)
- note_types.set_active_text (_("eighth (8)"));
- else if (note_type==16.0f)
- note_types.set_active_text (_("sixteenth (16)"));
- else if (note_type==32.0f)
- note_types.set_active_text (_("thirty-second (32)"));
- else
- note_types.set_active_text (_("quarter (4)"));
-
- hspacer1.set_border_width (5);
- hspacer1.pack_start (note_types, false, false);
- vspacer1.set_border_width (5);
- vspacer1.pack_start (hspacer1, false, false);
-
- hspacer2.set_border_width (5);
- hspacer2.pack_start (bpb_entry, false, false);
- vspacer2.set_border_width (5);
- vspacer2.pack_start (hspacer2, false, false);
-
- note_frame.add (vspacer1);
- bpb_frame.add (vspacer2);
+ if (x == note_types.end()) {
+ note_type.set_active_text (strings[3]); // "quarter"
+ }
+
+ Label* note_label = manage (new Label (_("Note value:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_LEFT, ALIGN_CENTER));
+ Table* table = manage (new Table (3, 2));
+ table->set_spacings (6);
+
+ table->attach (*bpb_label, 0, 1, 0, 1, FILL|EXPAND, FILL|EXPAND);
+ table->attach (bpb_entry, 1, 2, 0, 1, FILL|EXPAND, FILL|EXPAND);
+ table->attach (*note_label, 0, 1, 1, 2, FILL|EXPAND, FILL|EXPAND);
+ table->attach (note_type, 1, 2, 1, 2, FILL|EXPAND, SHRINK);