X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fquantize_dialog.cc;h=98514326d5e9b6ef7c7a7ea081ef4a8a930876ac;hb=f23f379b37a5f4e68972a5f6c07a814c10503fdb;hp=f8a6d3a516861680775722303837fc17eb74d189;hpb=d46998dae789491e54749e4ff9823948185f81be;p=ardour.git

diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc
index f8a6d3a516..98514326d5 100644
--- a/gtk2_ardour/quantize_dialog.cc
+++ b/gtk2_ardour/quantize_dialog.cc
@@ -18,8 +18,10 @@
 */
 
 #include <gtkmm/stock.h>
+#include <gtkmm/table.h>
 #include "gtkmm2ext/utils.h"
 
+#include "pbd/convert.h"
 #include "quantize_dialog.h"
 #include "public_editor.h"
 
@@ -39,31 +41,23 @@ static const gchar *_grid_strings[] = {
 	N_("Beats/8"),
 	N_("Beats/4"),
 	N_("Beats/3"),
+	N_("Beats/2"),
 	N_("Beats"),
 	0
 };
 
-static const gchar *_type_strings[] = {
-	N_("Grid"),
-	N_("Legato"),
-	N_("Groove"),
-	0
-};
-
 std::vector<std::string> QuantizeDialog::grid_strings;
-std::vector<std::string> QuantizeDialog::type_strings;
 
 QuantizeDialog::QuantizeDialog (PublicEditor& e)
 	: ArdourDialog (_("Quantize"), false, false)
 	, editor (e)
-	, type_label (_("Quantize Type"))
 	, strength_adjustment (100.0, 0.0, 100.0, 1.0, 10.0)
 	, strength_spinner (strength_adjustment)
 	, strength_label (_("Strength"))
 	, swing_adjustment (100.0, -130.0, 130.0, 1.0, 10.0)
 	, swing_spinner (swing_adjustment)
 	, swing_button (_("Swing"))
-	, threshold_adjustment (0.0, -1920.0, 1920.0, 1.0, 10.0) // XXX MAGIC TICK NUMBER FIX ME
+	, threshold_adjustment (0.0, -Timecode::BBT_Time::ticks_per_beat, Timecode::BBT_Time::ticks_per_beat, 1.0, 10.0)
 	, threshold_spinner (threshold_adjustment)
 	, threshold_label (_("Threshold (ticks)"))
 	, snap_start_button (_("Snap note start"))
@@ -71,7 +65,6 @@ QuantizeDialog::QuantizeDialog (PublicEditor& e)
 {
 	if (grid_strings.empty()) {
 		grid_strings =  I18N (_grid_strings);
-		type_strings =  I18N (_type_strings);
 	}
 
 	set_popdown_strings (start_grid_combo, grid_strings);
@@ -79,78 +72,41 @@ QuantizeDialog::QuantizeDialog (PublicEditor& e)
 	set_popdown_strings (end_grid_combo, grid_strings);
 	end_grid_combo.set_active_text (grid_strings.front());
 
-	set_popdown_strings (type_combo, type_strings);
-	type_combo.set_active_text (type_strings.front());
-
-	get_vbox()->set_border_width (12);
-
-	HBox* hbox;
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (type_label);
-	hbox->pack_start (type_combo);
-	hbox->show ();
-	type_label.show ();
-	type_combo.show ();
-	get_vbox()->pack_start (*hbox);
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (snap_start_button);
-	hbox->pack_start (start_grid_combo);
-	hbox->show ();
-	snap_start_button.show ();
-	start_grid_combo.show ();
-	get_vbox()->pack_start (*hbox);
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (snap_end_button);
-	hbox->pack_start (end_grid_combo);
-	hbox->show ();
-	snap_end_button.show ();
-	end_grid_combo.show ();
-	get_vbox()->pack_start (*hbox);
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (threshold_label);
-	hbox->pack_start (threshold_spinner);
-	hbox->show ();
-	threshold_label.show ();
-	threshold_spinner.show ();
-	get_vbox()->pack_start (*hbox);
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (strength_label);
-	hbox->pack_start (strength_spinner);
-	hbox->show ();
-	strength_label.show ();
-	strength_spinner.show ();
-	get_vbox()->pack_start (*hbox);
-
-	hbox = manage (new HBox);
-	hbox->set_spacing (12);
-	hbox->set_border_width (6);
-	hbox->pack_start (swing_button);
-	hbox->pack_start (swing_spinner);
-	hbox->show ();
-	swing_button.show ();
-	swing_spinner.show ();
-	get_vbox()->pack_start (*hbox);
+	Table* table = manage (new Table (6, 2));
+	table->set_spacings (12);
+	table->set_border_width (12);
+
+	int r = 0;
+
+	table->attach (snap_start_button, 0, 1, r, r + 1);
+	table->attach (start_grid_combo, 1, 2, r, r + 1);
+	++r;
+
+	table->attach (snap_end_button, 0, 1, r, r + 1);
+	table->attach (end_grid_combo, 1, 2, r, r + 1);
+	++r;
+
+	threshold_label.set_alignment (0, 0.5);
+	table->attach (threshold_label, 0, 1, r, r + 1);
+	table->attach (threshold_spinner, 1, 2, r, r + 1);
+	++r;
+
+	strength_label.set_alignment (0, 0.5);
+	table->attach (strength_label, 0, 1, r, r + 1);
+	table->attach (strength_spinner, 1, 2, r, r + 1);
+	++r;
+
+	table->attach (swing_button, 0, 1, r, r + 1);
+	table->attach (swing_spinner, 1, 2, r, r + 1);
 
 	snap_start_button.set_active (true);
 	snap_end_button.set_active (false);
 
+	get_vbox()->pack_start (*table);
+	show_all ();
+
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
-	add_button (Stock::OK, RESPONSE_OK);
+	add_button (_("Quantize"), RESPONSE_OK);
 }
 
 QuantizeDialog::~QuantizeDialog()
@@ -172,7 +128,7 @@ QuantizeDialog::end_grid_size () const
 double
 QuantizeDialog::grid_size_to_musical_time (const string& txt) const
 {
-	if (txt == "main_grid") {
+	if (txt == "main grid") {
 		bool success;
 
 		Evoral::MusicalTime b = editor.get_grid_type_as_beats (success, 0);
@@ -196,6 +152,8 @@ QuantizeDialog::grid_size_to_musical_time (const string& txt) const
 		return 1.0/4.0;
 	} else if (txt == _("Beats/3")) {
 		return 1.0/3.0;
+	} else if (txt == _("Beats/2")) {
+		return 1.0/2.0;
 	} else if (txt == _("Beats")) {
 		return 1.0;
 	}