projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make range ruler visible by default - costs a few mm, saves confusion among new users
[ardour.git]
/
gtk2_ardour
/
quantize_dialog.cc
diff --git
a/gtk2_ardour/quantize_dialog.cc
b/gtk2_ardour/quantize_dialog.cc
index 88d1f5496937c106236da7c69ed772c1894e0ce3..623a5d8033511bc60183afe5af6333c5e12fb23a 100644
(file)
--- a/
gtk2_ardour/quantize_dialog.cc
+++ b/
gtk2_ardour/quantize_dialog.cc
@@
-46,20
+46,11
@@
static const gchar *_grid_strings[] = {
0
};
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::grid_strings;
-std::vector<std::string> QuantizeDialog::type_strings;
QuantizeDialog::QuantizeDialog (PublicEditor& e)
: ArdourDialog (_("Quantize"), false, false)
, editor (e)
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"))
, strength_adjustment (100.0, 0.0, 100.0, 1.0, 10.0)
, strength_spinner (strength_adjustment)
, strength_label (_("Strength"))
@@
-74,7
+65,6
@@
QuantizeDialog::QuantizeDialog (PublicEditor& e)
{
if (grid_strings.empty()) {
grid_strings = I18N (_grid_strings);
{
if (grid_strings.empty()) {
grid_strings = I18N (_grid_strings);
- type_strings = I18N (_type_strings);
}
set_popdown_strings (start_grid_combo, grid_strings);
}
set_popdown_strings (start_grid_combo, grid_strings);
@@
-82,20
+72,12
@@
QuantizeDialog::QuantizeDialog (PublicEditor& e)
set_popdown_strings (end_grid_combo, grid_strings);
end_grid_combo.set_active_text (grid_strings.front());
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());
-
Table* table = manage (new Table (6, 2));
table->set_spacings (12);
table->set_border_width (12);
int r = 0;
Table* table = manage (new Table (6, 2));
table->set_spacings (12);
table->set_border_width (12);
int r = 0;
- type_label.set_alignment (0, 0.5);
- table->attach (type_label, 0, 1, r, r + 1);
- table->attach (type_combo, 1, 2, r, r + 1);
- ++r;
-
table->attach (snap_start_button, 0, 1, r, r + 1);
table->attach (start_grid_combo, 1, 2, r, r + 1);
++r;
table->attach (snap_start_button, 0, 1, r, r + 1);
table->attach (start_grid_combo, 1, 2, r, r + 1);
++r;
@@
-124,7
+106,7
@@
QuantizeDialog::QuantizeDialog (PublicEditor& e)
show_all ();
add_button (Stock::CANCEL, RESPONSE_CANCEL);
show_all ();
add_button (Stock::CANCEL, RESPONSE_CANCEL);
- add_button (
Stock::OK
, RESPONSE_OK);
+ add_button (
_("Quantize")
, RESPONSE_OK);
}
QuantizeDialog::~QuantizeDialog()
}
QuantizeDialog::~QuantizeDialog()
@@
-175,7
+157,7
@@
QuantizeDialog::grid_size_to_musical_time (const string& txt) const
} else if (txt == _("Beats")) {
return 1.0;
}
} else if (txt == _("Beats")) {
return 1.0;
}
-
+
return 1.0;
}
return 1.0;
}