ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use non-deprecated Gtkmm alignment enums

Browse Source
This commit is contained in:
Tim Mayberry 2015-02-27 22:13:59 +10:00
parent e68ded449f
commit 799158c508
21 changed files with 118 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk2_ardour/add_route_dialog.cc
View File

@ -118,47 +118,47 @@ AddRouteDialog::AddRouteDialog ()
table2->set_row_spacings (6);
table2->set_col_spacing (1, 6);
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true);
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);
table2->attach (*l, 0, 1, 0, 3, Gtk::FILL, Gtk::FILL, 0, 0);
int n = 0;
l = manage (new Label (_("Name:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Name:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (name_template_entry, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
/* Route configuration */
configuration_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
configuration_label.set_alignment (Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
table2->attach (configuration_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (channel_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
mode_label.set_alignment (Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
instrument_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
instrument_label.set_alignment (Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
table2->attach (instrument_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (instrument_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
/* Group choice */
l = manage (new Label (_("Group:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Group:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (route_group_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
/* New route will be inserted at.. */
l = manage (new Label (_("Insert:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Insert:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (insert_at_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
@ -168,7 +168,7 @@ AddRouteDialog::AddRouteDialog ()
if (Profile->get_mixbus ()) {
strict_io_combo.set_active (1);
} else {
l = manage (new Label (_("Output Ports:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Output Ports:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (strict_io_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);

18
gtk2_ardour/add_video_dialog.cc
View File

@ -55,10 +55,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"))
@ -133,7 +133,7 @@ AddVideoDialog::AddVideoDialog (Session* s)
Gtk::Label* l;
VBox* options_box = manage (new VBox);
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@ -150,16 +150,16 @@ AddVideoDialog::AddVideoDialog (Session* s)
l = manage (new Label (_("<b>Video Information</b>"), Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
table->attach (*l, 0, 2, 0, 1, FILL, FILL);
l = manage (new Label (_("Start:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Start:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
table->attach (*l, 0, 1, 1, 2, FILL, FILL);
table->attach (pi_tcin, 1, 2, 1, 2, FILL, FILL);
l = manage (new Label (_("End:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("End:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
table->attach (*l, 0, 1, 2, 3, FILL, FILL);
table->attach (pi_tcout, 1, 2, 2, 3, FILL, FILL);
l = manage (new Label (_("Frame rate:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Frame rate:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
table->attach (*l, 0, 1, 3, 4, FILL, FILL);
table->attach (pi_fps, 1, 2, 3, 4, FILL, FILL);
l = manage (new Label (_("Aspect Ratio:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Aspect Ratio:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
table->attach (*l, 0, 1, 4, 5, FILL, FILL);
table->attach (pi_aspect, 1, 2, 4, 5, FILL, FILL);

10
gtk2_ardour/ardour_ui.cc
View File

@ -1379,9 +1379,9 @@ ARDOUR_UI::ask_about_saving_session (const vector<string>& 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_START);
dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP);
dimage->set_alignment(ALIGN_CENTER, ALIGN_START);
dhbox.set_homogeneous (false);
dhbox.pack_start (*dimage, false, false, 5);
dhbox.pack_start (prompt_label, true, false, 5);
@ -3847,7 +3847,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_START);
const string dead_directory = _session->session_directory().dead_path();
@ -4951,7 +4951,7 @@ the computer was shutdown.\n\
%1 can recover any captured audio for\n\
you, or it can ignore it. Please decide\n\
what you would like to do.\n"), PROGRAM_NAME));
image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
image->set_alignment(ALIGN_CENTER, ALIGN_START);
hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);
@ -4982,7 +4982,7 @@ This session was created with a sample rate of %1 Hz, but\n\
%2 is currently running at %3 Hz. If you load this session,\n\
audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual));
image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
image->set_alignment(ALIGN_CENTER, ALIGN_START);
hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);

2
gtk2_ardour/automation_time_axis.cc
View File

@ -198,7 +198,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);

2
gtk2_ardour/export_channel_selector.cc
View File

@ -43,7 +43,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 (20),
channel_view (max_channels)

6
gtk2_ardour/export_dialog.cc
View File

@ -45,8 +45,8 @@ ExportDialog::ExportDialog (PublicEditor & editor, std::string title, ARDOUR::Ex
, type (type)
, editor (editor)
, warn_label ("", Gtk::ALIGN_LEFT)
, list_files_label (_("<span color=\"#ffa755\">Some already existing files will be overwritten.</span>"), Gtk::ALIGN_RIGHT)
, warn_label ("", Gtk::ALIGN_START)
, list_files_label (_("<span color=\"#ffa755\">Some already existing files will be overwritten.</span>"), Gtk::ALIGN_END)
, list_files_button (_("List files"))
{ }
@ -297,7 +297,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);

4
gtk2_ardour/export_file_notebook.cc
View File

@ -202,8 +202,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")),
tab_number (number)

8
gtk2_ardour/export_filename_selector.cc
View File

@ -28,18 +28,18 @@
using namespace ARDOUR;
ExportFilenameSelector::ExportFilenameSelector () :
include_label ("", Gtk::ALIGN_LEFT),
include_label ("", Gtk::ALIGN_START),
label_label (_("Label:"), Gtk::ALIGN_LEFT),
label_label (_("Label:"), Gtk::ALIGN_START),
session_checkbox (_("Session Name")),
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:"));

28
gtk2_ardour/export_format_dialog.cc
View File

@ -36,8 +36,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")),
@ -46,9 +46,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")),
@ -59,21 +59,21 @@ 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),
src_quality_label (_("Sample rate conversion quality:"), Gtk::ALIGN_RIGHT),
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_END),
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")),

2
gtk2_ardour/export_preset_selector.cc
View File

@ -25,7 +25,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)

2
gtk2_ardour/export_timespan_selector.cc
View File

@ -42,7 +42,7 @@ using std::string;
ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager, bool multi)
: manager (manager)
, _realtime_available (true)
, 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);

32
gtk2_ardour/export_video_dialog.cc
View File

@ -73,9 +73,9 @@ ExportVideoDialog::ExportVideoDialog ()
, _transcoder(0)
, _video_source_aspect_ratio(-1)
, _suspend_signals(false)
, 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"))
@ -112,7 +112,9 @@ 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);
@ -123,7 +125,7 @@ ExportVideoDialog::ExportVideoDialog ()
}
delete _transcoder; _transcoder = 0;
l = manage (new Label (_("<b>Output:</b> (file extension defines format)"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Output:</b> (file extension defines format)"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
vbox->pack_start (*l, false, false, 4);
@ -133,7 +135,7 @@ ExportVideoDialog::ExportVideoDialog ()
path_hbox->pack_start (outfn_browse_button, false, false, 3);
vbox->pack_start (*path_hbox, false, false, 2);
l = manage (new Label (_("<b>Input Video:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Input Video:</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
vbox->pack_start (*l, false, false, 4);
@ -144,16 +146,16 @@ ExportVideoDialog::ExportVideoDialog ()
vbox->pack_start (*path_hbox, false, false, 2);
path_hbox = manage (new HBox);
l = manage (new Label (_("Audio:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Audio:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
path_hbox->pack_start (*l, false, false, 3);
l = manage (new Label (_("Master Bus"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Master Bus"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
path_hbox->pack_start (*l, false, false, 2);
vbox->pack_start (*path_hbox, false, false, 2);
insnd_combo.append (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
outfn_path_entry.set_width_chars(38);
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@ -161,25 +163,25 @@ ExportVideoDialog::ExportVideoDialog ()
t->set_spacings (4);
int ty = 0;
options_box->pack_start (*t, true, true, 4);
l = manage (new Label (_("Range:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Range:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty+1);
t->attach (insnd_combo, 1, 4, ty, ty+1); ty++;
l = manage (new Label (_("Preset:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Preset:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty+1);
t->attach (preset_combo, 1, 4, ty, ty+1); ty++;
l = manage (new Label (_("Video Codec:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Video Codec:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty+1);
t->attach (video_codec_combo, 1, 2, ty, ty+1);
l = manage (new Label (_("Video KBit/s:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Video KBit/s:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 2, 3, ty, ty+1);
t->attach (video_bitrate_combo, 3, 4, ty, ty+1); ty++;
l = manage (new Label (_("Audio Codec:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Audio Codec:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty+1);
t->attach (audio_codec_combo, 1, 2, ty, ty+1);
l = manage (new Label (_("Audio KBit/s:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Audio KBit/s:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 2, 3, ty, ty+1);
t->attach (audio_bitrate_combo, 3, 4, ty, ty+1); ty++;
l = manage (new Label (_("Audio Samplerate:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("Audio Samplerate:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
t->attach (*l, 0, 1, ty, ty+1);
t->attach (audio_samplerate_combo, 1, 2, ty, ty+1);
t->attach (normalize_checkbox, 2, 4, ty, ty+1); ty++;

4
gtk2_ardour/export_video_infobox.cc
View File

@ -43,14 +43,14 @@ ExportVideoInfobox::ExportVideoInfobox (Session* s)
Gtk::Label* l;
VBox* vbox = manage (new VBox);
l = manage (new Label (_("<b>Video Export Info</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Video Export Info</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
vbox->pack_start (*l, false, true);
l = manage (new Label (
string_compose(
_("%1 does not include commercial licenses for encoding audio/video. Visit mpegla.com for information about licensing various audio/video codecs.\n\nVideo encoding is a non-trivial task with many details.\n\nPlease see the manual at %2/video-timeline/operations/#export.\n\nOpen Manual in Browser? "),
PROGRAM_NAME, Config->get_reference_manual_url()
), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_size_request(700,-1);
l->set_line_wrap();
vbox->pack_start (*l, false, true,4);

2
gtk2_ardour/panner2d.cc
View File

@ -922,7 +922,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uin
Gtk::Label* l = manage (new Label (
p->panner()->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);

10
gtk2_ardour/route_group_dialog.cc
View File

@ -67,7 +67,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);
@ -78,7 +78,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);
@ -96,7 +96,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
VBox* options_box = manage (new VBox);
options_box->set_spacing (6);
l = manage (new Label (_("<b>Sharing</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
l = manage (new Label (_("<b>Sharing</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
options_box->pack_start (*l, false, true);
@ -140,13 +140,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);

2
gtk2_ardour/script_selector.cc
View File

@ -169,7 +169,7 @@ ScriptParameterDialog::ScriptParameterDialog (std::string title,
++ty;
if (_lsp.size () > 0) {
l = manage (new Label (_("<b>Instance Parameters</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Instance Parameters</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
t->attach (*l, 0, 2, ty, ty+1);
++ty;

28
gtk2_ardour/tempo_dialog.cc
View File

@ -40,9 +40,9 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
, _section (0)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER)
, pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER)
, when_bar_label (_("bar:"), ALIGN_START, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_START, ALIGN_CENTER)
, pulse_selector_label (_("Pulse note"), ALIGN_START, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Tempo tempo (map.tempo_at_frame (frame));
@ -57,9 +57,9 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&)
, _section (&section)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER)
, pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER)
, when_bar_label (_("bar:"), ALIGN_START, ALIGN_CENTER)
, when_beat_label (_("beat:"), ALIGN_START, ALIGN_CENTER)
, pulse_selector_label (_("Pulse note"), ALIGN_START, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Timecode::BBT_Time when (map.bbt_at_frame (section.frame()));
@ -158,7 +158,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
table->set_homogeneous (false);
int row;
Label* bpm_label = manage (new Label(_("Beats per minute:"), ALIGN_LEFT, ALIGN_CENTER));
Label* bpm_label = manage (new Label(_("Beats per minute:"), ALIGN_START, ALIGN_CENTER));
table->attach (*bpm_label, 0, 1, 0, 1);
table->attach (bpm_spinner, 1, 5, 0, 1);
@ -192,13 +192,13 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
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);
@ -206,7 +206,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
}
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);
@ -495,9 +495,9 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
lock_style.set_active_text (strings[0]); // "music"
}
Label* note_label = manage (new Label (_("Note value:"), ALIGN_LEFT, ALIGN_CENTER));
Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_LEFT, ALIGN_CENTER));
Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_LEFT, ALIGN_CENTER));
Label* note_label = manage (new Label (_("Note value:"), ALIGN_START, ALIGN_CENTER));
Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_START, ALIGN_CENTER));
Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_START, ALIGN_CENTER));
Table* table = manage (new Table (3, 3));
table->set_spacings (6);
@ -511,7 +511,7 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
when_bar_entry.set_alignment (1.0);
if (movable) {
Label* when_label = manage (new Label(_("Meter begins at bar:"), ALIGN_LEFT, ALIGN_CENTER));
Label* when_label = manage (new Label(_("Meter 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);

12
gtk2_ardour/time_fx_dialog.cc
View File

@ -98,7 +98,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, framecnt_t oldlen, framecnt_t
upper_button_box.set_spacing (6);
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
upper_button_box.pack_start (*l, false, false);
@ -107,21 +107,21 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, framecnt_t oldlen, framecnt_t
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);
@ -200,7 +200,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, framecnt_t oldlen, framecnt_t
VBox* progress_box = manage (new VBox);
progress_box->set_spacing (6);
l = manage (new Label (_("<b>Progress</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Progress</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
progress_box->pack_start (*l, false, false);

32
gtk2_ardour/transcode_video_dialog.cc
View File

@ -55,7 +55,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"))
@ -104,20 +104,20 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
std::string dstfn = video_dest_file(dstdir, infile);
path_entry.set_text (dstfn);
l = manage (new Label (_("<b>File Information</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>File Information</b>"), 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);
@ -134,23 +134,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("");
@ -167,16 +167,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 (_("<b>Import Settings</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Import Settings</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@ -221,7 +221,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);
@ -242,12 +242,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);

4
gtk2_ardour/transpose_dialog.cc
View File

@ -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;

8
gtk2_ardour/video_server_dialog.cc
View File

@ -50,9 +50,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)
@ -115,7 +115,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 (_("<b>Options</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, false));
l->set_use_markup ();
options_box->pack_start (*l, false, true, 4);
@ -140,7 +140,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);