diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 8e1747d596..97a1b205ca 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -59,10 +59,10 @@ AddVideoDialog::AddVideoDialog (Session* s)
: ArdourDialog (_("Set Video Track"))
, seek_slider (0,1000,1)
, preview_path ("")
- , pi_tcin ("-", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)
- , pi_tcout ("-", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)
- , pi_aspect ("-", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)
- , pi_fps ("-", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)
+ , pi_tcin ("-", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false)
+ , pi_tcout ("-", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false)
+ , pi_aspect ("-", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false)
+ , pi_fps ("-", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false)
, chooser (FILE_CHOOSER_ACTION_OPEN)
, xjadeo_checkbox (_("Open Video Monitor Window"))
, set_session_fps_checkbox (_("Adjust Session Framerate to Match Video Framerate"))
@@ -138,7 +138,7 @@ AddVideoDialog::AddVideoDialog (Session* s)
Gtk::Label* l;
VBox* options_box = manage (new VBox);
- l = manage (new Label (_("Options"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Options"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b28cb02155..fcc5e01868 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2530,7 +2530,7 @@ require some unused files to continue to exist."));
Gtk::HBox ddhbox; // the hbox we eventually pack into the dialog's vbox
Gtk::Image* dimage = manage (new Gtk::Image(Stock::DIALOG_INFO, Gtk::ICON_SIZE_DIALOG));
- dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP);
+ dimage->set_alignment(ALIGN_START, ALIGN_TOP);
const string dead_directory = _session->session_directory().dead_path();
diff --git a/gtk2_ardour/ardour_ui_session.cc b/gtk2_ardour/ardour_ui_session.cc
index 67f3502c17..014729ad19 100644
--- a/gtk2_ardour/ardour_ui_session.cc
+++ b/gtk2_ardour/ardour_ui_session.cc
@@ -1281,7 +1281,7 @@ ARDOUR_UI::ask_about_saving_session (const vector& actions)
prompt_label.set_text (prompt);
prompt_label.set_name (X_("PrompterLabel"));
- prompt_label.set_alignment(ALIGN_LEFT, ALIGN_TOP);
+ prompt_label.set_alignment(ALIGN_START, ALIGN_TOP);
dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP);
dhbox.set_homogeneous (false);
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index eacd83316c..8f0b208c80 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -222,7 +222,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
}
name_label.set_text (_name);
- name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+ name_label.set_alignment (Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
name_label.set_name (X_("TrackParameterName"));
name_label.set_ellipsize (Pango::ELLIPSIZE_END);
name_label.set_size_request (floor (50.0 * UIConfiguration::instance().get_ui_scale()), -1);
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index f4220b9a6e..d75123165c 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -63,7 +63,7 @@ void
EditorRegions::init ()
{
add_name_column ();
- setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region"));
+ setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
add_tag_column ();
int cb_width = 24;
diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc
index bce3705f7f..8072179173 100644
--- a/gtk2_ardour/editor_sources.cc
+++ b/gtk2_ardour/editor_sources.cc
@@ -84,17 +84,17 @@ EditorSources::init ()
add_name_column ();
- setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region"));
- setup_col (append_col (_columns.captd_for, date_width), 17, ALIGN_LEFT, _("Captured For"), _("Original Track this was recorded on"));
+ setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
+ setup_col (append_col (_columns.captd_for, date_width), 17, ALIGN_START, _("Captured For"), _("Original Track this was recorded on"));
setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_RIGHT, _("# Xruns"), _("Number of dropouts that occurred during recording"));
add_tag_column ();
- setup_col (append_col (_columns.take_id, date_width), 18, ALIGN_LEFT, _("Take ID"), _("Take ID"));
+ setup_col (append_col (_columns.take_id, date_width), 18, ALIGN_START, _("Take ID"), _("Take ID"));
setup_col (append_col (_columns.natural_pos, bbt_width), 20, ALIGN_RIGHT, _("Orig Pos"), _("Original Position of the file on timeline, when it was recorded"));
TreeViewColumn* tvc = append_col (_columns.path, bbt_width);
- setup_col (tvc, 13, ALIGN_LEFT, _("Path"), _("Path (folder) of the file location"));
+ setup_col (tvc, 13, ALIGN_START, _("Path"), _("Path (folder) of the file location"));
tvc->set_expand (true);
/* make Name and Path columns manually resizable */
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 1c23871a55..8f58be4ca3 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -52,7 +52,7 @@ using namespace PBD;
PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) :
ExportChannelSelector (session, manager),
- channels_label (_("Channels:"), Gtk::ALIGN_LEFT),
+ channels_label (_("Channels:"), Gtk::ALIGN_START),
split_checkbox (_("Split to mono files")),
max_channels (MAX_EXPORT_CHANNELS),
channel_view (max_channels)
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 254afcde67..3a78f14a23 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -58,7 +58,7 @@ ExportDialog::ExportDialog (PublicEditor & editor, std::string title, ARDOUR::Ex
: ArdourDialog (title)
, type (type)
, editor (editor)
- , warn_label ("", Gtk::ALIGN_LEFT)
+ , warn_label ("", Gtk::ALIGN_START)
, list_files_label (_("Some already existing files will be overwritten."), Gtk::ALIGN_RIGHT)
, list_files_button (_("List files"))
, previous_progress (0)
@@ -327,7 +327,7 @@ ExportDialog::show_conflicting_files ()
{
ArdourDialog dialog (_("Files that will be overwritten"), true);
- Gtk::Label label ("", Gtk::ALIGN_LEFT);
+ Gtk::Label label ("", Gtk::ALIGN_START);
label.set_use_markup (true);
label.set_markup (list_files_string);
diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc
index 6e558e1739..2a9561f1ac 100644
--- a/gtk2_ardour/export_file_notebook.cc
+++ b/gtk2_ardour/export_file_notebook.cc
@@ -218,8 +218,8 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
filename_state (filename_state),
profile_manager (profile_manager),
- format_label (_("Format"), Gtk::ALIGN_LEFT),
- filename_label (_("Location"), Gtk::ALIGN_LEFT),
+ format_label (_("Format"), Gtk::ALIGN_START),
+ filename_label (_("Location"), Gtk::ALIGN_START),
soundcloud_upload_button (_("Upload to Soundcloud")),
analysis_button (_("Analyze Exported Audio")),
reimport_button (_("Re-Import Exported Audio")),
diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index 484f8754dd..abde94e1b8 100644
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -34,14 +34,14 @@
using namespace ARDOUR;
ExportFilenameSelector::ExportFilenameSelector ()
- : include_label ("", Gtk::ALIGN_LEFT)
- , label_label (_("Label:"), Gtk::ALIGN_LEFT)
+ : include_label ("", Gtk::ALIGN_START)
+ , label_label (_("Label:"), Gtk::ALIGN_START)
, timespan_checkbox (_("Timespan Name"))
, revision_checkbox (_("Revision:"))
- , path_label (_("Folder:"), Gtk::ALIGN_LEFT)
+ , path_label (_("Folder:"), Gtk::ALIGN_START)
, browse_button (_("Browse"))
, open_button (_("Open Folder"))
- , example_filename_label ("", Gtk::ALIGN_LEFT)
+ , example_filename_label ("", Gtk::ALIGN_START)
, _require_timespan (false)
{
include_label.set_markup (_("Build filename(s) from these components:"));
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 6b4549628c..dd7cbb1399 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -47,8 +47,8 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog)
, applying_changes_from_engine (0)
- , name_label (_("Label: "), Gtk::ALIGN_LEFT)
- , name_generated_part ("", Gtk::ALIGN_LEFT)
+ , name_label (_("Label: "), Gtk::ALIGN_START)
+ , name_generated_part ("", Gtk::ALIGN_START)
, normalize_checkbox (_("Normalize:"))
, normalize_peak_rb (_("Peak"))
@@ -57,9 +57,9 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog)
, normalize_lufs_adjustment (-23.0, -90.00, 0.00, 0.1, 1.0)
, normalize_dbtp_adjustment ( -1.0, -90.00, 0.00, 0.1, 0.2)
- , normalize_dbfs_label (_("dBFS"), Gtk::ALIGN_LEFT)
- , normalize_lufs_label (_("LUFS"), Gtk::ALIGN_LEFT)
- , normalize_dbtp_label (_("dBTP"), Gtk::ALIGN_LEFT)
+ , normalize_dbfs_label (_("dBFS"), Gtk::ALIGN_START)
+ , normalize_lufs_label (_("LUFS"), Gtk::ALIGN_START)
+ , normalize_dbtp_label (_("dBTP"), Gtk::ALIGN_START)
, silence_table (2, 4)
, trim_start_checkbox (_("Trim silence at start"))
@@ -70,32 +70,32 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog)
, silence_end_checkbox (_("Add silence at end:"))
, silence_end_clock ("silence_end", true, "", true, false, true)
- , command_label (_("Command to run post-export\n(%f=file path, %d=directory, %b=basename, see tooltip for more):"), Gtk::ALIGN_LEFT)
+ , command_label (_("Command to run post-export\n(%f=file path, %d=directory, %b=basename, see tooltip for more):"), Gtk::ALIGN_START)
, format_table (3, 4)
- , compatibility_label (_("Compatibility"), Gtk::ALIGN_LEFT)
- , quality_label (_("Quality"), Gtk::ALIGN_LEFT)
- , format_label (_("File format"), Gtk::ALIGN_LEFT)
- , sample_rate_label (_("Sample rate"), Gtk::ALIGN_LEFT)
+ , compatibility_label (_("Compatibility"), Gtk::ALIGN_START)
+ , quality_label (_("Quality"), Gtk::ALIGN_START)
+ , format_label (_("File format"), Gtk::ALIGN_START)
+ , sample_rate_label (_("Sample rate"), Gtk::ALIGN_START)
, src_quality_label (_("Sample rate conversion quality:"), Gtk::ALIGN_RIGHT)
/* Watermarking */
- , watermark_heading (_("Preview / Watermark"), Gtk::ALIGN_LEFT)
+ , watermark_heading (_("Preview / Watermark"), Gtk::ALIGN_START)
- , demo_noise_mode_label (_("Mode:"), Gtk::ALIGN_LEFT)
- , demo_noise_level_label (_("Noise Level:"), Gtk::ALIGN_LEFT)
- , demo_noise_dbfs_unit (_("dBFS"), Gtk::ALIGN_LEFT)
+ , demo_noise_mode_label (_("Mode:"), Gtk::ALIGN_START)
+ , demo_noise_level_label (_("Noise Level:"), Gtk::ALIGN_START)
+ , demo_noise_dbfs_unit (_("dBFS"), Gtk::ALIGN_START)
, demo_noise_dbfs_adjustment (-20.0, -90.00, -6.00, 1, 5)
, demo_noise_dbfs_spinbutton (demo_noise_dbfs_adjustment, 1, 0)
/* Changing encoding options from here on */
- , encoding_options_label ("", Gtk::ALIGN_LEFT)
+ , encoding_options_label ("", Gtk::ALIGN_START)
/* Changing encoding options from here on */
- , sample_format_label (_("Sample Format"), Gtk::ALIGN_LEFT)
- , dither_label (_("Dithering"), Gtk::ALIGN_LEFT)
+ , sample_format_label (_("Sample Format"), Gtk::ALIGN_START)
+ , dither_label (_("Dithering"), Gtk::ALIGN_START)
, with_cue (_("Create CUE file for disk-at-once CD/DVD creation"))
, with_toc (_("Create TOC file for disk-at-once CD/DVD creation"))
diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index 02af612310..f5d2b0e429 100644
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -29,7 +29,7 @@
#include "pbd/i18n.h"
ExportPresetSelector::ExportPresetSelector () :
- label (_("Preset"), Gtk::ALIGN_LEFT),
+ label (_("Preset"), Gtk::ALIGN_START),
save_button (Gtk::Stock::SAVE),
remove_button (Gtk::Stock::REMOVE),
new_button (Gtk::Stock::NEW)
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index cc1a92de2e..d362078009 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -48,7 +48,7 @@ using std::string;
ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager, bool multi)
: manager (manager)
, _realtime_available (false)
- , time_format_label (_("Show Times as:"), Gtk::ALIGN_LEFT)
+ , time_format_label (_("Show Times as:"), Gtk::ALIGN_START)
, realtime_checkbutton (_("Realtime Export"))
{
set_session (session);
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 30cac4b4fa..694ba33053 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -65,9 +65,9 @@ ExportVideoDialog::ExportVideoDialog ()
, _normalize (false)
, _previous_progress (0)
, _transcoder (0)
- , outfn_path_label (_("File:"), Gtk::ALIGN_LEFT)
+ , outfn_path_label (_("File:"), Gtk::ALIGN_START)
, outfn_browse_button (_("Browse"))
- , invid_path_label (_("Video:"), Gtk::ALIGN_LEFT)
+ , invid_path_label (_("Video:"), Gtk::ALIGN_START)
, invid_browse_button (_("Browse"))
, transcode_button (_("Export"))
, abort_button (_("Abort"))
@@ -88,7 +88,7 @@ ExportVideoDialog::ExportVideoDialog ()
/* check if ffmpeg can be found */
_transcoder = new TranscodeFfmpeg (X_(""));
if (!_transcoder->ffexec_ok ()) {
- l = manage (new Label (_("ffmpeg installation was not found. Video Export is not possible. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("ffmpeg installation was not found. Video Export is not possible. See the Log window for more information."), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_line_wrap ();
vbox->pack_start (*l, false, false, 8);
get_vbox ()->pack_start (*vbox, false, false);
@@ -122,9 +122,9 @@ ExportVideoDialog::ExportVideoDialog ()
input_box->pack_start (*path_hbox, false, false, 2);
path_hbox = manage (new HBox);
- l = manage (new Label (_("Audio:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ l = manage (new Label (_("Audio:"), ALIGN_START, ALIGN_CENTER, false));
path_hbox->pack_start (*l, false, false, 3);
- l = manage (new Label (_("Master Bus"), ALIGN_LEFT, ALIGN_CENTER, false));
+ l = manage (new Label (_("Master Bus"), ALIGN_START, ALIGN_CENTER, false));
path_hbox->pack_start (*l, false, false, 2);
input_box->pack_start (*path_hbox, false, false, 2);
@@ -139,7 +139,7 @@ ExportVideoDialog::ExportVideoDialog ()
t->set_border_width (2);
t->set_spacings (4);
int ty = 0;
- l = manage (new Label (_("Range:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ l = manage (new Label (_("Range:"), ALIGN_START, ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty + 1);
t->attach (insnd_combo, 1, 2, ty, ty + 1);
ty++;
diff --git a/gtk2_ardour/loudness_dialog.cc b/gtk2_ardour/loudness_dialog.cc
index dc5258037a..0a12c726df 100644
--- a/gtk2_ardour/loudness_dialog.cc
+++ b/gtk2_ardour/loudness_dialog.cc
@@ -171,7 +171,7 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
Table* t = manage (new Table (11, 8, false));
t->set_spacings (4);
- l = manage (new Label (_("Preset:"), ALIGN_LEFT));
+ l = manage (new Label (_("Preset:"), ALIGN_START));
t->attach (*l, 0, 1, ROW, SHRINK | FILL);
t->attach (_preset_dropdown, 1, 3, ROW);
@@ -179,10 +179,10 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
t->attach (_remove_preset, 4, 5, ROW, SHRINK | FILL);
/* horiz space */
- l = manage (new Label (" ", ALIGN_LEFT));
+ l = manage (new Label (" ", ALIGN_START));
t->attach (*l, 5, 6, ROW, SHRINK, SHRINK, 6, 0);
- l = manage (new Label (" ", ALIGN_LEFT));
+ l = manage (new Label (" ", ALIGN_START));
t->attach (*l, 6, 7, ROW);
t->attach (_show_report_button, 7, 8, ROW, SHRINK | FILL);
@@ -207,12 +207,12 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
++row; // spacer
- l = manage (new Label (_("Gain to normalize:"), ALIGN_LEFT));
+ l = manage (new Label (_("Gain to normalize:"), ALIGN_START));
t->attach (*l, 0, 2, ROW); ++row;
- l = manage (new Label (_("Previous output gain:"), ALIGN_LEFT));
+ l = manage (new Label (_("Previous output gain:"), ALIGN_START));
t->attach (*l, 0, 2, ROW); ++row;
- l = manage (new Label (_("Total gain:"), ALIGN_LEFT));
+ l = manage (new Label (_("Total gain:"), ALIGN_START));
t->attach (*l, 0, 2, ROW);
row = 2;
@@ -284,12 +284,12 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
t->set_spacings (4);
l = manage (new Label ());
l->set_markup (_("Loudness Analysis\n"));
- l->set_alignment (ALIGN_LEFT, ALIGN_TOP);
+ l->set_alignment (ALIGN_START, ALIGN_TOP);
t->attach (*l, 0, 1, 0, 1, EXPAND | FILL, FILL, 8, 2);
l = manage (new Label ());
l->set_line_wrap ();
- l->set_alignment (ALIGN_LEFT, ALIGN_TOP);
+ l->set_alignment (ALIGN_START, ALIGN_TOP);
l->set_markup (_(
"This allows the user to analyze and conform the loudness of the signal at the master-bus "
"output of the complete session, as it would be exported. "
@@ -298,7 +298,7 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
l = manage (new Label ());
l->set_line_wrap ();
- l->set_alignment (ALIGN_LEFT, ALIGN_TOP);
+ l->set_alignment (ALIGN_START, ALIGN_TOP);
l->set_markup (_(
"By default, a faster-than-realtime export is used to assess the loudness of the "
"session. If any outboard gear is used, a realtime export is available, to "
@@ -814,7 +814,7 @@ LoudnessDialog::test_conformity ()
for (size_t i = 1; i < n_pset; ++i) {
CLoudnessPreset const& preset = _lp[i];
- Label* l = manage (new Label (preset.label + ":", ALIGN_LEFT));
+ Label* l = manage (new Label (preset.label + ":", ALIGN_START));
t->attach (*l, col, col + 1, row, row + 1, EXPAND | FILL, SHRINK, 2, 0);
if (lufs_i > preset.LUFS_range[0]
diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc
index 648578259f..a6c54185f7 100644
--- a/gtk2_ardour/luadialog.cc
+++ b/gtk2_ardour/luadialog.cc
@@ -621,7 +621,7 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
if (i.value ()["align"].isString ()) {
std::string align = i.value ()["align"].cast ();
if (align == "left") {
- xalign = Gtk::ALIGN_LEFT;
+ xalign = Gtk::ALIGN_START;
} else if (align == "right") {
xalign = Gtk::ALIGN_RIGHT;
}
@@ -632,7 +632,7 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
if (i.value ()["align"].isString ()) {
std::string align = i.value ()["align"].cast ();
if (align == "left") {
- xalign = Gtk::ALIGN_LEFT;
+ xalign = Gtk::ALIGN_START;
} else if (align == "right") {
xalign = Gtk::ALIGN_RIGHT;
}
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index f451bbfcce..dd1b4ff0a0 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -933,7 +933,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uin
Gtk::Label* l = manage (new Label (
p->pannable()->describe_parameter(PanWidthAutomation),
- Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
spinner_box.pack_start (*l, false, false);
spinner_box.pack_start (width_spinner, false, false);
left_side.pack_start (spinner_box, false, false);
diff --git a/gtk2_ardour/plugin_manager_ui.cc b/gtk2_ardour/plugin_manager_ui.cc
index 2b77654a10..b434fb7c51 100644
--- a/gtk2_ardour/plugin_manager_ui.cc
+++ b/gtk2_ardour/plugin_manager_ui.cc
@@ -108,12 +108,12 @@ PluginManagerUI::PluginManagerUI ()
const char* tooltip;
} ci[] = {
/* clang-format off */
- {ALIGN_LEFT, false, _("Status"), _("Plugin Scan Result") },
+ {ALIGN_START, false, _("Status"), _("Plugin Scan Result") },
{ALIGN_CENTER, false, S_("Ignore|Ign"), _("Ignore this plugin (and others that are loaded in the same file)") },
{ALIGN_CENTER, false, S_("Favorite|Fav"), _("Add this plugin to the favorite list") },
{ALIGN_CENTER, false, _("Hide"), _("Hide this plugin in the plugin-selector") },
{ALIGN_CENTER, false, _("Type"), _("Plugin standard") },
- {ALIGN_LEFT, true, _("File/ID"), _("The plugin file (VST) or unique ID (AU, LV2)") },
+ {ALIGN_START, true, _("File/ID"), _("The plugin file (VST) or unique ID (AU, LV2)") },
{ALIGN_CENTER, true, _("Name"), _("Name of the plugin") },
{ALIGN_CENTER, true, _("Creator"), _("The plugin's vendor") },
{ALIGN_CENTER, true, _("Tags"), _("Meta data: category and tags") },
@@ -605,7 +605,7 @@ PluginManagerUI::refill ()
pc_max.ndscn = std::max (pc_max.ndscn, i->second.ndscn);
}
- Label* head_type = new Label (_("Type"), ALIGN_LEFT, ALIGN_CENTER);
+ Label* head_type = new Label (_("Type"), ALIGN_START, ALIGN_CENTER);
Label* head_count = new Label (_("Total"), ALIGN_RIGHT, ALIGN_CENTER);
_tbl_nfo.attach (*head_type, 0, 1, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
_tbl_nfo.attach (*head_count, 1, 2, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
@@ -623,7 +623,7 @@ PluginManagerUI::refill ()
}
++row;
for (std::map::const_iterator i = plugin_count.begin (); i != plugin_count.end (); ++i, ++row) {
- Label* lbl_type = new Label (plugin_type (i->first), ALIGN_LEFT, ALIGN_CENTER);
+ Label* lbl_type = new Label (plugin_type (i->first), ALIGN_START, ALIGN_CENTER);
Label* lbl_count = new Label (string_compose ("%1", i->second.total), ALIGN_RIGHT, ALIGN_CENTER);
_tbl_nfo.attach (*lbl_type, 0, 1, row, row + 1, EXPAND | FILL, SHRINK, 2, 2);
_tbl_nfo.attach (*lbl_count, 1, 2, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index eff9fde961..b76a5bbe9b 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -169,10 +169,10 @@ PluginSelector::PluginSelector (PluginManager& mgr)
_search_ignore_checkbox->set_name ("pluginlist filter button");
Gtk::Label* search_help_label1 = manage (new Label(
- _("All search terms must be matched."), Gtk::ALIGN_LEFT));
+ _("All search terms must be matched."), Gtk::ALIGN_START));
Gtk::Label* search_help_label2 = manage (new Label(
- _("Ex: \"ess dyn\" will find \"dynamic de-esser\" but not \"de-esser\"."), Gtk::ALIGN_LEFT));
+ _("Ex: \"ess dyn\" will find \"dynamic de-esser\" but not \"de-esser\"."), Gtk::ALIGN_START));
search_table->attach (search_entry, 0, 3, 0, 1, FILL|EXPAND, FILL);
search_table->attach (search_clear_button, 3, 4, 0, 1, FILL, FILL);
@@ -270,13 +270,13 @@ PluginSelector::PluginSelector (PluginManager& mgr)
tag_reset_button->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::tag_reset_button_clicked));
Gtk::Label* tagging_help_label1 = manage (new Label(
- _("Enter space-separated, one-word Tags for the selected plugin."), Gtk::ALIGN_LEFT));
+ _("Enter space-separated, one-word Tags for the selected plugin."), Gtk::ALIGN_START));
Gtk::Label* tagging_help_label2 = manage (new Label(
- _("You can include dashes, colons or underscores in a Tag."), Gtk::ALIGN_LEFT));
+ _("You can include dashes, colons or underscores in a Tag."), Gtk::ALIGN_START));
Gtk::Label* tagging_help_label3 = manage (new Label(
- _("Ex: \"dynamic de-esser vocal\" applies 3 Tags."), Gtk::ALIGN_LEFT));
+ _("Ex: \"dynamic de-esser vocal\" applies 3 Tags."), Gtk::ALIGN_START));
int p = 0;
tagging_table->attach (*tag_entry, 0, 1, p, p+1, FILL|EXPAND, FILL);
diff --git a/gtk2_ardour/region_list_base.cc b/gtk2_ardour/region_list_base.cc
index 076a5db342..6d8399eebf 100644
--- a/gtk2_ardour/region_list_base.cc
+++ b/gtk2_ardour/region_list_base.cc
@@ -133,7 +133,7 @@ RegionListBase::setup_col (TreeViewColumn* col, int sort_idx, Gtk::AlignmentEnum
/* ...and this sets the alignment for the data cells */
CellRendererText* renderer = dynamic_cast (col->get_first_cell_renderer ());
if (renderer) {
- renderer->property_xalign () = (al == ALIGN_RIGHT ? 1.0 : (al == ALIGN_LEFT ? 0.0 : 0.5));
+ renderer->property_xalign () = (al == ALIGN_RIGHT ? 1.0 : (al == ALIGN_START ? 0.0 : 0.5));
}
}
@@ -149,7 +149,7 @@ void
RegionListBase::add_name_column ()
{
TreeViewColumn* tvc = append_col (_columns.name, 120);
- setup_col (tvc, 0, ALIGN_LEFT, _("Name"), ("Region name"));
+ setup_col (tvc, 0, ALIGN_START, _("Name"), ("Region name"));
/* Region Name: make editable */
CellRendererText* region_name_cell = dynamic_cast (tvc->get_first_cell_renderer ());
@@ -166,7 +166,7 @@ void
RegionListBase::add_tag_column ()
{
TreeViewColumn* tvc = append_col (_columns.tags, "2099-10-10 10:10:30");
- setup_col (tvc, 2, ALIGN_LEFT, _("Tags"), _("Tags"));
+ setup_col (tvc, 2, ALIGN_START, _("Tags"), _("Tags"));
/* Tags cell: make editable */
CellRendererText* region_tags_cell = dynamic_cast (tvc->get_first_cell_renderer ());
diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 107e0d4318..b6d3c10ec9 100644
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -69,7 +69,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
HBox* hbox = manage (new HBox);
hbox->set_spacing (6);
- l = manage (new Label (_("Name:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
+ l = manage (new Label (_("Name:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false ));
hbox->pack_start (*l, false, true);
hbox->pack_start (_name, true, true);
@@ -80,7 +80,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
top_vbox->pack_start (*hbox, false, true);
top_vbox->pack_start (_active);
- l = manage (new Label (_("Color"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Color"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
hbox = manage (new HBox);
hbox->set_spacing (12);
hbox->pack_start (*l, false, false);
@@ -98,7 +98,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
VBox* options_box = manage (new VBox);
options_box->set_spacing (6);
- l = manage (new Label (_("Sharing"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
+ l = manage (new Label (_("Sharing"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
options_box->pack_start (*l, false, true);
@@ -142,13 +142,13 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
Table* table = manage (new Table (11, 4, false));
table->set_row_spacings (6);
- l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label ("", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_padding (8, 0);
table->attach (*l, 0, 1, 0, 8, Gtk::FILL, Gtk::FILL, 0, 0);
table->attach (_gain, 1, 3, 1, 2, Gtk::FILL, Gtk::FILL, 0, 0);
- l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label ("", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_padding (0, 0);
table->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL, 0, 0);
table->attach (_relative, 2, 3, 2, 3, Gtk::FILL, Gtk::FILL, 0, 0);
diff --git a/gtk2_ardour/script_selector.cc b/gtk2_ardour/script_selector.cc
index 97dd4d91d9..18d06e9081 100644
--- a/gtk2_ardour/script_selector.cc
+++ b/gtk2_ardour/script_selector.cc
@@ -222,7 +222,7 @@ ScriptParameterDialog::ScriptParameterDialog (std::string title,
++ty;
if (_lsp.size () > 0) {
- l = manage (new Label (_("Instance Parameters"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Instance Parameters"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
t->attach (*l, 0, 2, ty, ty+1);
++ty;
@@ -236,7 +236,7 @@ ScriptParameterDialog::ScriptParameterDialog (std::string title,
c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ScriptParameterDialog::active_changed), i, c, e));
t->attach (*c, 0, 1, ty, ty+1);
} else {
- Label* l = manage (new Label (_lsp[i]->title, Gtk::ALIGN_LEFT));
+ Label* l = manage (new Label (_lsp[i]->title, Gtk::ALIGN_START));
t->attach (*l, 0, 1, ty, ty+1);
}
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 52bce9eac5..8f6cf2aa1f 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -52,10 +52,10 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, timepos_t const & pos
, bpm_spinner (bpm_adjustment)
, end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, end_bpm_spinner (end_bpm_adjustment)
- , _end_bpm_label (_("End Beats per Minute:"), ALIGN_LEFT, ALIGN_CENTER)
+ , _end_bpm_label (_("End Beats per Minute:"), ALIGN_START, ALIGN_CENTER)
, when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse:"), ALIGN_LEFT, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse:"), ALIGN_START, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Temporal::BBT_Time when (_map->bbt_at (pos));
@@ -72,10 +72,10 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, TempoPoint& point, co
, bpm_spinner (bpm_adjustment)
, end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, end_bpm_spinner (end_bpm_adjustment)
- , _end_bpm_label (_("End Beats per Minute:"), ALIGN_LEFT, ALIGN_CENTER)
+ , _end_bpm_label (_("End Beats per Minute:"), ALIGN_START, ALIGN_CENTER)
, when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse:"), ALIGN_LEFT, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse:"), ALIGN_START, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Temporal::BBT_Time when (map->bbt_at (point.time()));
@@ -190,7 +190,7 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d
++row;
}
- Label* bpm_label = manage (new Label(_("Start Beats per Minute:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* bpm_label = manage (new Label(_("Start Beats per Minute:"), ALIGN_START, ALIGN_CENTER));
table->attach (*bpm_label, 0, 1, row, row + 1);
table->attach (bpm_spinner, 1, 5, row, row + 1);
++row;
@@ -199,7 +199,7 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d
table->attach (end_bpm_spinner, 1, 5, row, row + 1);
++row;
- Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_START, ALIGN_CENTER));
table->attach (*tempo_type_label, 0, 1, row, row + 1);
table->attach (tempo_type, 1, 5, row, row + 1);
@@ -227,13 +227,13 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d
table->attach (when_beat_label, 3, 4, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
table->attach (when_beat_entry, 4, 5, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
- Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_START, ALIGN_CENTER));
table->attach (*when_label, 0, 1, row, row+1);
++row;
++row;
- Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_START, ALIGN_CENTER));
table->attach (*lock_style_label, 0, 1, row, row + 1);
table->attach (lock_style, 1, 5, row, row + 1);
@@ -579,7 +579,7 @@ MeterDialog::init (const Temporal::BBT_Time& when, double bpb, double divisor, b
when_bar_entry.set_alignment (1.0);
if (!initial) {
- Label* when_label = manage (new Label(_("Time Signature begins at bar:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* when_label = manage (new Label(_("Time Signature begins at bar:"), ALIGN_START, ALIGN_CENTER));
table->attach (*when_label, 0, 1, 2, 3, FILL | EXPAND, FILL | EXPAND);
table->attach (when_bar_entry, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);
diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index 1b4a108e46..6f25ad2c6b 100644
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -100,7 +100,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, timecnt_t const & oldlen, tim
upper_button_box.set_spacing (6);
- l = manage (new Label (_("Options"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
+ l = manage (new Label (_("Options"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
upper_button_box.pack_start (*l, false, false);
@@ -109,21 +109,21 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, timecnt_t const & oldlen, tim
Table* table = manage (new Table (4, 3, false));
table->set_row_spacings (6);
table->set_col_spacing (1, 6);
- l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false )); //Common gnome way for padding
+ l = manage (new Label ("", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false )); //Common gnome way for padding
l->set_padding (8, 0);
table->attach (*l, 0, 1, 0, 4, Gtk::FILL, Gtk::FILL, 0, 0);
- l = manage (new Label (_("Octaves:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Octaves:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_octave_spinner, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
pitch_octave_spinner.set_activates_default ();
- l = manage (new Label (_("Semitones:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Semitones:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table->attach (*l, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_semitone_spinner, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
pitch_semitone_spinner.set_activates_default ();
- l = manage (new Label (_("Cents:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Cents:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
pitch_cent_spinner.set_digits (1);
table->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_cent_spinner, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
@@ -202,7 +202,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, timecnt_t const & oldlen, tim
VBox* progress_box = manage (new VBox);
progress_box->set_spacing (6);
- l = manage (new Label (_("Progress"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Progress"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
progress_box->pack_start (*l, false, false);
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 38656a84d6..5370506d6a 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -59,7 +59,7 @@ using namespace VideoUtils;
TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
: ArdourDialog (_("Transcode/Import Video File "))
, infn (infile)
- , path_label (_("Output File:"), Gtk::ALIGN_LEFT)
+ , path_label (_("Output File:"), Gtk::ALIGN_START)
, browse_button (_("Browse"))
, transcode_button (_("OK"))
, abort_button (_("Abort"))
@@ -108,19 +108,19 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
path_entry.set_width_chars (38);
path_entry.set_text (dstfn);
- l = manage (new Label (_("File Information"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("File Information"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
bool ffok = false;
if (!transcoder->ffexec_ok ()) {
- l = manage (new Label (_("ffmpeg installation was not found. Video Import is not possible. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("ffmpeg installation was not found. Video Import is not possible. See the Log window for more information."), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_line_wrap ();
options_box->pack_start (*l, false, true, 4);
aspect_checkbox.set_sensitive (false);
bitrate_checkbox.set_sensitive (false);
} else if (!transcoder->probe_ok ()) {
- l = manage (new Label (string_compose (_("File-info can not be read. Most likely '%1' is not a valid video-file or an unsupported video codec or format."), infn), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (string_compose (_("File-info can not be read. Most likely '%1' is not a valid video-file or an unsupported video codec or format."), infn), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
options_box->pack_start (*l, false, true, 4);
aspect_checkbox.set_sensitive (false);
bitrate_checkbox.set_sensitive (false);
@@ -137,23 +137,23 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
Table* t = manage (new Table (4, 2));
t->set_spacings (4);
options_box->pack_start (*t, true, true, 4);
- l = manage (new Label (_("FPS:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("FPS:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, 0, 1);
- l = manage (new Label (_("Duration:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Duration:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 2, 3, 0, 1);
- l = manage (new Label (_("Codec:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Codec:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, 1, 2);
- l = manage (new Label (_("Geometry:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Geometry:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 2, 3, 1, 2);
std::ostringstream osstream;
osstream << transcoder->get_fps ();
- l = manage (new Label (osstream.str (), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (osstream.str (), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 1, 2, 0, 1);
osstream.str ("");
osstream << w << "x" << h;
- l = manage (new Label (osstream.str (), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (osstream.str (), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 3, 4, 1, 2);
osstream.str ("");
@@ -170,16 +170,16 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
osstream << setfill ('0') << setw (2);
osstream << (transcoder->get_duration () % (int)floor (transcoder->get_fps ()));
}
- l = manage (new Label (osstream.str (), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (osstream.str (), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 3, 4, 0, 1);
osstream.str ("");
osstream << transcoder->get_codec ();
- l = manage (new Label (osstream.str (), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (osstream.str (), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 1, 2, 1, 2);
}
- l = manage (new Label (_("Import Settings"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Import Settings"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@@ -224,7 +224,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
t->set_spacings (4);
options_box->pack_start (*t, true, true, 4);
- l = manage (new Label (_("Scale Video: Width = "), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Scale Video: Width = "), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, 0, 1);
t->attach (scale_combo, 1, 2, 0, 1);
t->attach (aspect_checkbox, 2, 3, 0, 1);
@@ -267,12 +267,12 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
scale_combo.set_active (0);
height_spinner.set_value (h);
- l = manage (new Label (_("Bitrate (KBit/s):"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Bitrate (KBit/s):"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, 1, 2);
t->attach (bitrate_checkbox, 2, 3, 1, 2);
t->attach (bitrate_spinner, 3, 4, 1, 2);
- l = manage (new Label (_("Extract Audio:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Extract Audio:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, 2, 3);
t->attach (audio_combo, 1, 4, 2, 3);
t->attach (ltc_detect, 1, 4, 3, 4);
diff --git a/gtk2_ardour/transpose_dialog.cc b/gtk2_ardour/transpose_dialog.cc
index 6ab29872e7..3aa2952d7f 100644
--- a/gtk2_ardour/transpose_dialog.cc
+++ b/gtk2_ardour/transpose_dialog.cc
@@ -38,12 +38,12 @@ TransposeDialog::TransposeDialog ()
t->set_col_spacings (6);
int r = 0;
- Label* l = manage (new Label (_("Octaves:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ Label* l = manage (new Label (_("Octaves:"), ALIGN_START, ALIGN_CENTER, false));
t->attach (*l, 0, 1, r, r + 1, FILL, EXPAND, 0, 0);
t->attach (_octaves_spinner, 1, 2, r, r + 1, FILL, EXPAND & FILL, 0, 0);
++r;
- l = manage (new Label (_("Semitones:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ l = manage (new Label (_("Semitones:"), ALIGN_START, ALIGN_CENTER, false));
t->attach (*l, 0, 1, r, r + 1, FILL, EXPAND, 0, 0);
t->attach (_semitones_spinner, 1, 2, r, r + 1, FILL, EXPAND & FILL, 0, 0);
++r;
diff --git a/gtk2_ardour/trigger_clip_picker.cc b/gtk2_ardour/trigger_clip_picker.cc
index 37861eed48..90100ef3b1 100644
--- a/gtk2_ardour/trigger_clip_picker.cc
+++ b/gtk2_ardour/trigger_clip_picker.cc
@@ -133,8 +133,8 @@ TriggerClipPicker::TriggerClipPicker ()
ArdourWidgets::set_tooltip (_show_plugin_btn, _("Show the GUI for the Auditioner Synth"));
ArdourWidgets::set_tooltip (_clip_dir_menu, _("Click to select a clip folder and edit your available clip folders"));
- format_text.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
- channels_value.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+ format_text.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ channels_value.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
_midi_prop_table.attach (format_text, 0, 1, 0, 1, EXPAND | FILL, SHRINK);
_midi_prop_table.attach (channels_value, 0, 1, 1, 2, EXPAND | FILL, SHRINK);
_midi_prop_table.attach (_auditioner_combo, 0, 3, 2, 3, EXPAND | FILL, SHRINK);
diff --git a/gtk2_ardour/trigger_region_list.cc b/gtk2_ardour/trigger_region_list.cc
index e0b1a53545..63d29b156b 100644
--- a/gtk2_ardour/trigger_region_list.cc
+++ b/gtk2_ardour/trigger_region_list.cc
@@ -25,6 +25,6 @@ using namespace Gtk;
TriggerRegionList::TriggerRegionList ()
{
add_name_column ();
- setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region"));
+ setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
add_tag_column ();
}
diff --git a/gtk2_ardour/trigger_source_list.cc b/gtk2_ardour/trigger_source_list.cc
index 586e53507c..7728c37ee7 100644
--- a/gtk2_ardour/trigger_source_list.cc
+++ b/gtk2_ardour/trigger_source_list.cc
@@ -28,10 +28,10 @@ using namespace Gtk;
TriggerSourceList::TriggerSourceList ()
{
add_name_column ();
- setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region"));
+ setup_col (append_col (_columns.channels, "Chans "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
add_tag_column ();
setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_RIGHT, _("# Xruns"), _("Number of dropouts that occurred during recording"));
- setup_col (append_col (_columns.take_id, "2021-01-19 02:34:03"), 18, ALIGN_LEFT, _("Take ID"), _("Take ID"));
+ setup_col (append_col (_columns.take_id, "2021-01-19 02:34:03"), 18, ALIGN_START, _("Take ID"), _("Take ID"));
_display.get_column (0)->set_resizable (true);
}
diff --git a/gtk2_ardour/varispeed_dialog.cc b/gtk2_ardour/varispeed_dialog.cc
index d991c20cd8..e1f692afb6 100644
--- a/gtk2_ardour/varispeed_dialog.cc
+++ b/gtk2_ardour/varispeed_dialog.cc
@@ -39,12 +39,12 @@ VarispeedDialog::VarispeedDialog ()
t->set_col_spacings (6);
int r = 0;
- Label* l = manage (new Label (_("Semitones:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ Label* l = manage (new Label (_("Semitones:"), ALIGN_START, ALIGN_CENTER, false));
t->attach (*l, 0, 1, r, r + 1, FILL, EXPAND, 0, 0);
t->attach (_semitones_spinner, 1, 2, r, r + 1, FILL, EXPAND & FILL, 0, 0);
++r;
- l = manage (new Label (_("Cents:"), ALIGN_LEFT, ALIGN_CENTER, false));
+ l = manage (new Label (_("Cents:"), ALIGN_START, ALIGN_CENTER, false));
t->attach (*l, 0, 1, r, r + 1, FILL, EXPAND, 0, 0);
t->attach (_cents_spinner, 1, 2, r, r + 1, FILL, EXPAND & FILL, 0, 0);
++r;
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 6349fb8f10..13e8324547 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -59,9 +59,9 @@ using namespace VideoUtils;
VideoServerDialog::VideoServerDialog (Session* s)
: ArdourDialog (_("Launch Video Server"))
- , path_label (_("Server Executable:"), Gtk::ALIGN_LEFT)
+ , path_label (_("Server Executable:"), Gtk::ALIGN_START)
, path_browse_button (_("Browse"))
- , docroot_label (_("Server Docroot:"), Gtk::ALIGN_LEFT)
+ , docroot_label (_("Server Docroot:"), Gtk::ALIGN_START)
, docroot_browse_button (_("Browse"))
, listenport_adjustment (1554, 1025, 65536, 1, 10, 0)
, listenport_spinner (listenport_adjustment)
@@ -137,7 +137,7 @@ VideoServerDialog::VideoServerDialog (Session* s)
docroot_hbox->pack_start (docroot_entry, true, true, 3);
docroot_hbox->pack_start (docroot_browse_button, false, false, 3);
- l = manage (new Label (_("Options"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l = manage (new Label (_("Options"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@@ -162,7 +162,7 @@ VideoServerDialog::VideoServerDialog (Session* s)
l = manage (new Label (string_compose(
_("%1 relies on an external video server for the videotimeline.\nThe server configured in Edit -> Preferences -> Video is not reachable.\nDo you want %1 to launch 'harvid' on this machine?"), PROGRAM_NAME)
- , Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ , Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_max_width_chars(80);
l->set_line_wrap();
vbox->pack_start (*l, true, true, 4);