Compare commits
36 Commits
master
...
gtk-disabl
Author | SHA1 | Date |
---|---|---|
Tim Mayberry | 9251ac4a11 | |
Tim Mayberry | 42187b3440 | |
Tim Mayberry | c1f56662bc | |
Tim Mayberry | 3ce7c19220 | |
Tim Mayberry | f85854a679 | |
Tim Mayberry | 86eeb62eae | |
Tim Mayberry | 59303133ce | |
Tim Mayberry | 6cf00e6095 | |
Tim Mayberry | 8f5713d78d | |
Tim Mayberry | 8a98f12898 | |
Tim Mayberry | dc916c8ba1 | |
Tim Mayberry | dd238b6c00 | |
Tim Mayberry | 78b67da9fd | |
Tim Mayberry | 99a81e2a27 | |
Tim Mayberry | cf161c2da2 | |
Tim Mayberry | 24bc99a9d8 | |
Tim Mayberry | 79e7d9d7a8 | |
Tim Mayberry | fa6777f7ce | |
Tim Mayberry | b8cc0ef948 | |
Tim Mayberry | 799158c508 | |
Tim Mayberry | e68ded449f | |
Tim Mayberry | 7e1be05445 | |
Tim Mayberry | f141d8904e | |
Tim Mayberry | 5adb7aa58d | |
Tim Mayberry | de2c1b10b6 | |
Tim Mayberry | fd502d3175 | |
Tim Mayberry | bdd672354a | |
Tim Mayberry | e91c9ab636 | |
Tim Mayberry | 1ed8bdf941 | |
Tim Mayberry | f89123a40a | |
Tim Mayberry | d632629b06 | |
Tim Mayberry | 12ab4b9816 | |
Tim Mayberry | 9a56cbc905 | |
Tim Mayberry | a2e9554a37 | |
Tim Mayberry | 1ea076f765 | |
Tim Mayberry | f2303c0b2f |
|
@ -645,7 +645,9 @@ About::About ()
|
|||
if (btn) {
|
||||
btn->signal_clicked().connect(sigc::mem_fun(static_cast<Gtk::Window*>(this), &Gtk::Window::hide));
|
||||
}
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
set_url_hook (sigc::ptr_fun(&About::launch_homepage));
|
||||
#endif
|
||||
}
|
||||
|
||||
About::~About ()
|
||||
|
|
|
@ -74,22 +74,22 @@ AddRouteDialog::AddRouteDialog ()
|
|||
|
||||
refill_track_modes ();
|
||||
|
||||
track_bus_combo.append_text (_("Audio Tracks"));
|
||||
track_bus_combo.append_text (_("MIDI Tracks"));
|
||||
track_bus_combo.append_text (_("Audio+MIDI Tracks"));
|
||||
track_bus_combo.append_text (_("Audio Busses"));
|
||||
track_bus_combo.append_text (_("MIDI Busses"));
|
||||
track_bus_combo.append_text (_("VCA Masters"));
|
||||
track_bus_combo.append (_("Audio Tracks"));
|
||||
track_bus_combo.append (_("MIDI Tracks"));
|
||||
track_bus_combo.append (_("Audio+MIDI Tracks"));
|
||||
track_bus_combo.append (_("Audio Busses"));
|
||||
track_bus_combo.append (_("MIDI Busses"));
|
||||
track_bus_combo.append (_("VCA Masters"));
|
||||
track_bus_combo.set_active (0);
|
||||
|
||||
insert_at_combo.append_text (_("First"));
|
||||
insert_at_combo.append_text (_("Before Selection"));
|
||||
insert_at_combo.append_text (_("After Selection"));
|
||||
insert_at_combo.append_text (_("Last"));
|
||||
insert_at_combo.append (_("First"));
|
||||
insert_at_combo.append (_("Before Selection"));
|
||||
insert_at_combo.append (_("After Selection"));
|
||||
insert_at_combo.append (_("Last"));
|
||||
insert_at_combo.set_active (3);
|
||||
|
||||
strict_io_combo.append_text (_("Flexible-I/O"));
|
||||
strict_io_combo.append_text (_("Strict-I/O"));
|
||||
strict_io_combo.append (_("Flexible-I/O"));
|
||||
strict_io_combo.append (_("Strict-I/O"));
|
||||
strict_io_combo.set_active (Config->get_strict_io () ? 1 : 0);
|
||||
|
||||
VBox* vbox = manage (new VBox);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -543,7 +543,7 @@ AddRouteDialog::refill_channel_setups ()
|
|||
void
|
||||
AddRouteDialog::add_route_group (RouteGroup* g)
|
||||
{
|
||||
route_group_combo.insert_text (3, g->name ());
|
||||
route_group_combo.insert (3, g->name ());
|
||||
}
|
||||
|
||||
RouteGroup*
|
||||
|
@ -565,11 +565,11 @@ void
|
|||
AddRouteDialog::refill_route_groups ()
|
||||
{
|
||||
route_group_combo.clear ();
|
||||
route_group_combo.append_text (_("New Group..."));
|
||||
route_group_combo.append (_("New Group..."));
|
||||
|
||||
route_group_combo.append_text ("separator");
|
||||
route_group_combo.append ("separator");
|
||||
|
||||
route_group_combo.append_text (_("No Group"));
|
||||
route_group_combo.append (_("No Group"));
|
||||
|
||||
if (_session) {
|
||||
_session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group));
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -182,7 +182,7 @@ ArdourButton::set_text (const std::string& str)
|
|||
return;
|
||||
}
|
||||
_text = str;
|
||||
if (!is_realized()) {
|
||||
if (!get_realized()) {
|
||||
return;
|
||||
}
|
||||
ensure_layout ();
|
||||
|
@ -201,7 +201,7 @@ ArdourButton::set_sizing_text (const std::string& str)
|
|||
return;
|
||||
}
|
||||
_sizing_text = str;
|
||||
if (!is_realized()) {
|
||||
if (!get_realized()) {
|
||||
return;
|
||||
}
|
||||
ensure_layout ();
|
||||
|
@ -967,7 +967,7 @@ ArdourButton::on_style_changed (const RefPtr<Gtk::Style>&)
|
|||
CairoWidget::set_dirty ();
|
||||
_char_pixel_width = 0;
|
||||
_char_pixel_height = 0;
|
||||
if (is_realized()) {
|
||||
if (get_realized()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
@ -979,7 +979,7 @@ ArdourButton::on_name_changed ()
|
|||
_char_pixel_height = 0;
|
||||
_diameter = 0;
|
||||
_update_colors = true;
|
||||
if (is_realized()) {
|
||||
if (get_realized()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
@ -1017,7 +1017,7 @@ void
|
|||
ArdourButton::set_image (const RefPtr<Gdk::Pixbuf>& img)
|
||||
{
|
||||
_pixbuf = img;
|
||||
if (is_realized()) {
|
||||
if (get_realized()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
@ -1113,7 +1113,7 @@ ArdourButton::set_tweaks (Tweaks t)
|
|||
{
|
||||
if (_tweaks != t) {
|
||||
_tweaks = t;
|
||||
if (is_realized()) {
|
||||
if (get_realized()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
@ -1142,7 +1142,7 @@ ArdourButton::set_layout_ellipsize_width (int w)
|
|||
if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
|
||||
_layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
|
||||
}
|
||||
if (is_realized ()) {
|
||||
if (get_realized ()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
@ -1161,7 +1161,7 @@ ArdourButton::set_text_ellipsize (Pango::EllipsizeMode e)
|
|||
if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
|
||||
_layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
|
||||
}
|
||||
if (is_realized ()) {
|
||||
if (get_realized ()) {
|
||||
queue_resize ();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,7 +96,7 @@ ArdourDialog::on_show ()
|
|||
|
||||
Splash* spl = Splash::instance();
|
||||
|
||||
if (spl && spl->is_visible()) {
|
||||
if (spl && spl->get_visible()) {
|
||||
spl->pop_back_for (*this);
|
||||
_splash_pushed = true;
|
||||
}
|
||||
|
|
|
@ -1175,7 +1175,7 @@ ARDOUR_UI::starting ()
|
|||
|
||||
BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
|
||||
|
||||
if (splash && splash->is_visible()) {
|
||||
if (splash && splash->get_visible()) {
|
||||
// in 1 second, hide the splash screen
|
||||
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -1820,7 +1820,7 @@ ARDOUR_UI::open_recent_session ()
|
|||
|
||||
can_return = false;
|
||||
}
|
||||
if (splash && splash->is_visible()) {
|
||||
if (splash && splash->get_visible()) {
|
||||
// in 1 second, hide the splash screen
|
||||
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
|
||||
}
|
||||
|
@ -3436,7 +3436,7 @@ ARDOUR_UI::close_session()
|
|||
if (get_session_parameters (true, false)) {
|
||||
exit (1);
|
||||
}
|
||||
if (splash && splash->is_visible()) {
|
||||
if (splash && splash->get_visible()) {
|
||||
// in 1 second, hide the splash screen
|
||||
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
|
||||
}
|
||||
|
@ -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();
|
||||
|
||||
|
@ -4108,7 +4108,7 @@ ARDOUR_UI::add_route ()
|
|||
return;
|
||||
}
|
||||
|
||||
if (add_route_dialog->is_visible()) {
|
||||
if (add_route_dialog->get_visible()) {
|
||||
/* we're already doing this */
|
||||
return;
|
||||
}
|
||||
|
@ -4434,7 +4434,7 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
|
|||
add_video_dialog->set_transient_for (*float_window);
|
||||
}
|
||||
|
||||
if (add_video_dialog->is_visible()) {
|
||||
if (add_video_dialog->get_visible()) {
|
||||
/* we're already doing this */
|
||||
return;
|
||||
}
|
||||
|
@ -4806,7 +4806,7 @@ ARDOUR_UI::cancel_plugin_timeout ()
|
|||
void
|
||||
ARDOUR_UI::plugin_scan_timeout (int timeout)
|
||||
{
|
||||
if (!scan_dlg || !scan_dlg->is_mapped() || !scan_pbar) {
|
||||
if (!scan_dlg || !scan_dlg->get_mapped() || !scan_pbar) {
|
||||
return;
|
||||
}
|
||||
if (timeout > 0) {
|
||||
|
@ -4824,13 +4824,13 @@ ARDOUR_UI::plugin_scan_timeout (int timeout)
|
|||
void
|
||||
ARDOUR_UI::plugin_scan_dialog (std::string type, std::string plugin, bool can_cancel)
|
||||
{
|
||||
if (type == X_("closeme") && !(scan_dlg && scan_dlg->is_mapped())) {
|
||||
if (type == X_("closeme") && !(scan_dlg && scan_dlg->get_mapped())) {
|
||||
return;
|
||||
}
|
||||
|
||||
const bool cancelled = PluginManager::instance().cancelled();
|
||||
if (type != X_("closeme") && (!UIConfiguration::instance().get_show_plugin_scan_window()) && !_initial_verbose_plugin_scan) {
|
||||
if (cancelled && scan_dlg->is_mapped()) {
|
||||
if (cancelled && scan_dlg->get_mapped()) {
|
||||
scan_dlg->hide();
|
||||
gui_idle_handler();
|
||||
return;
|
||||
|
@ -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);
|
||||
|
@ -5512,7 +5512,7 @@ ARDOUR_UI::setup_toplevel_window (Gtk::Window& window, const string& name, void*
|
|||
window.set_title (title.get_string());
|
||||
window.set_wmclass (string_compose (X_("%1_%1"), downcase (PROGRAM_NAME), downcase (name)), PROGRAM_NAME);
|
||||
|
||||
window.set_flags (CAN_FOCUS);
|
||||
window.set_can_focus (true);
|
||||
window.add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
|
||||
|
||||
/* This is a hack to ensure that GTK-accelerators continue to
|
||||
|
@ -5789,7 +5789,7 @@ ARDOUR_UI::reset_focus (Gtk::Widget* w)
|
|||
|
||||
Gtk::Widget* top = w->get_toplevel();
|
||||
|
||||
if (!top || !top->is_toplevel()) {
|
||||
if (!top || !top->get_is_toplevel()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -5797,7 +5797,7 @@ ARDOUR_UI::reset_focus (Gtk::Widget* w)
|
|||
|
||||
while (w) {
|
||||
|
||||
if (w->is_toplevel()) {
|
||||
if (w->get_is_toplevel()) {
|
||||
/* Setting the focus widget to a Gtk::Window causes all
|
||||
* subsequent calls to ::has_focus() on the nominal
|
||||
* focus widget in that window to return
|
||||
|
|
|
@ -408,7 +408,6 @@ private:
|
|||
Gtk::Notebook _tabs;
|
||||
PublicEditor* editor;
|
||||
Mixer_UI* mixer;
|
||||
Gtk::Tooltips _tooltips;
|
||||
NSM_Client* nsm;
|
||||
bool _was_dirty;
|
||||
bool _mixer_on_top;
|
||||
|
|
|
@ -233,7 +233,7 @@ ARDOUR_UI::set_session (Session *s)
|
|||
ArdourMeter::ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_group_peak_display));
|
||||
|
||||
editor_meter_peak_display.set_name ("meterbridge peakindicator");
|
||||
editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
|
||||
editor_meter_peak_display.set_can_focus (false);
|
||||
editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1);
|
||||
editor_meter_peak_display.set_corner_radius (3.0);
|
||||
|
||||
|
@ -357,7 +357,7 @@ ARDOUR_UI::toggle_editor_and_mixer ()
|
|||
if (!mwin) {
|
||||
/* mixer's own window doesn't exist */
|
||||
mixer->make_visible ();
|
||||
} else if (!mwin->is_mapped ()) {
|
||||
} else if (!mwin->get_mapped ()) {
|
||||
/* mixer's own window exists but isn't mapped */
|
||||
mixer->make_visible ();
|
||||
} else {
|
||||
|
@ -381,7 +381,7 @@ ARDOUR_UI::toggle_editor_and_mixer ()
|
|||
if (!ewin) {
|
||||
/* mixer's own window doesn't exist */
|
||||
editor->make_visible ();
|
||||
} else if (!ewin->is_mapped ()) {
|
||||
} else if (!ewin->get_mapped ()) {
|
||||
/* editor's own window exists but isn't mapped */
|
||||
editor->make_visible ();
|
||||
} else {
|
||||
|
|
|
@ -102,7 +102,7 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
|
|||
, xscale (1.0)
|
||||
, yscale (1.0)
|
||||
{
|
||||
set_flags (CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
|
||||
_layout = Pango::Layout::create (get_pango_context());
|
||||
_layout->set_attributes (normal_attributes);
|
||||
|
@ -141,7 +141,7 @@ AudioClock::set_widget_name (const string& str)
|
|||
set_name (str + " clock");
|
||||
}
|
||||
|
||||
if (is_realized()) {
|
||||
if (get_realized()) {
|
||||
set_colors ();
|
||||
}
|
||||
}
|
||||
|
@ -464,7 +464,7 @@ AudioClock::set_clock_dimensions (Gtk::Requisition& req)
|
|||
|
||||
tmp = Pango::Layout::create (get_pango_context());
|
||||
|
||||
if (!is_realized()) {
|
||||
if (!get_realized()) {
|
||||
font = get_font_for_style (get_name());
|
||||
} else {
|
||||
font = style->get_font();
|
||||
|
@ -512,7 +512,7 @@ AudioClock::on_size_request (Gtk::Requisition* req)
|
|||
|
||||
tmp = Pango::Layout::create (get_pango_context());
|
||||
|
||||
if (!is_realized()) {
|
||||
if (!get_realized()) {
|
||||
font = get_font_for_style (get_name());
|
||||
} else {
|
||||
font = style->get_font();
|
||||
|
@ -960,7 +960,7 @@ AudioClock::session_configuration_changed (std::string p)
|
|||
void
|
||||
AudioClock::set (framepos_t when, bool force, framecnt_t offset)
|
||||
{
|
||||
if ((!force && !is_visible()) || _session == 0) {
|
||||
if ((!force && !get_visible()) || _session == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -171,8 +171,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
|
|||
auto_dropdown.set_name ("route button");
|
||||
hide_button.set_name ("route button");
|
||||
|
||||
auto_dropdown.unset_flags (Gtk::CAN_FOCUS);
|
||||
hide_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
auto_dropdown.set_can_focus (false);
|
||||
hide_button.set_can_focus (false);
|
||||
|
||||
controls_table.set_no_show_all();
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -481,7 +481,7 @@ AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m)
|
|||
hide_button.show();
|
||||
|
||||
} else if (h >= preset_height (HeightSmall)) {
|
||||
controls_table.hide_all ();
|
||||
controls_table.hide();
|
||||
auto_dropdown.hide();
|
||||
name_label.hide();
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ BigClockWindow::BigClockWindow (AudioClock& c)
|
|||
add (clock);
|
||||
clock.show_all ();
|
||||
|
||||
clock.size_request (default_size);
|
||||
default_size = clock.size_request ();
|
||||
|
||||
clock.signal_size_allocate().connect (sigc::mem_fun (*this, &BigClockWindow::clock_size_reallocated));
|
||||
}
|
||||
|
|
|
@ -203,8 +203,8 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
|
|||
a = new Gtk::Alignment (0, 0.5, 0, 1);
|
||||
a->add (_input_or_output);
|
||||
t->attach (*Gtk::manage (a), 1, 2, 1, 2);
|
||||
_input_or_output.append_text (_("Destination"));
|
||||
_input_or_output.append_text (_("Source"));
|
||||
_input_or_output.append (_("Destination"));
|
||||
_input_or_output.append (_("Source"));
|
||||
|
||||
if (bundle->ports_are_inputs()) {
|
||||
_input_or_output.set_active_text (_("Source"));
|
||||
|
|
|
@ -149,10 +149,14 @@ ColorThemeManager::ColorThemeManager ()
|
|||
pack_start (notebook, true, true);
|
||||
pack_start (reset_button, false, false);
|
||||
|
||||
color_dialog.get_colorsel()->set_has_opacity_control (true);
|
||||
color_dialog.get_colorsel()->set_has_palette (true);
|
||||
color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
|
||||
color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
|
||||
color_dialog.get_color_selection()->set_has_opacity_control (true);
|
||||
color_dialog.get_color_selection()->set_has_palette (true);
|
||||
|
||||
Gtk::Button* ok_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_OK));
|
||||
ok_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), true));
|
||||
|
||||
Gtk::Button* cancel_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_CANCEL));
|
||||
cancel_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), false));
|
||||
|
||||
color_theme_dropdown.signal_changed().connect (sigc::mem_fun (*this, &ColorThemeManager::on_color_theme_changed));
|
||||
|
||||
|
@ -192,7 +196,9 @@ ColorThemeManager::setup_modifiers ()
|
|||
mod_scale = manage (new HScale (0.0, 1.0, 0.01));
|
||||
mod_scale->set_draw_value (false);
|
||||
mod_scale->set_value (m->second.a());
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
mod_scale->set_update_policy (Gtk::UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
mod_scale->signal_value_changed().connect (sigc::bind (sigc::mem_fun (*this, &ColorThemeManager::modifier_edited), mod_scale, m->first));
|
||||
|
||||
mod_label = manage (new Label (m->first));
|
||||
|
@ -384,10 +390,10 @@ ColorThemeManager::edit_palette_color (std::string name)
|
|||
color_to_rgba (c, r, g, b, a);
|
||||
|
||||
gdkcolor.set_rgb_p (r, g, b);
|
||||
color_dialog.get_colorsel()->set_previous_color (gdkcolor);
|
||||
color_dialog.get_colorsel()->set_current_color (gdkcolor);
|
||||
color_dialog.get_colorsel()->set_previous_alpha ((guint16) (a * 65535));
|
||||
color_dialog.get_colorsel()->set_current_alpha ((guint16) (a * 65535));
|
||||
color_dialog.get_color_selection()->set_previous_color (gdkcolor);
|
||||
color_dialog.get_color_selection()->set_current_color (gdkcolor);
|
||||
color_dialog.get_color_selection()->set_previous_alpha ((guint16) (a * 65535));
|
||||
color_dialog.get_color_selection()->set_current_alpha ((guint16) (a * 65535));
|
||||
|
||||
color_dialog_connection.disconnect ();
|
||||
color_dialog_connection = color_dialog.signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ColorThemeManager::palette_color_response), name));
|
||||
|
@ -408,8 +414,8 @@ ColorThemeManager::palette_color_response (int result, std::string name)
|
|||
switch (result) {
|
||||
case RESPONSE_ACCEPT:
|
||||
case RESPONSE_OK:
|
||||
gdkcolor = color_dialog.get_colorsel()->get_current_color();
|
||||
a = color_dialog.get_colorsel()->get_current_alpha() / 65535.0;
|
||||
gdkcolor = color_dialog.get_color_selection()->get_current_color();
|
||||
a = color_dialog.get_color_selection()->get_current_alpha() / 65535.0;
|
||||
r = gdkcolor.get_red_p();
|
||||
g = gdkcolor.get_green_p();
|
||||
b = gdkcolor.get_blue_p();
|
||||
|
|
|
@ -50,10 +50,10 @@ DuplicateRouteDialog::DuplicateRouteDialog ()
|
|||
playlist_button_box.pack_start (share_playlists_button, false, false);
|
||||
playlist_button_box.show_all ();
|
||||
|
||||
insert_at_combo.append_text (_("First"));
|
||||
insert_at_combo.append_text (_("Before Selection"));
|
||||
insert_at_combo.append_text (_("After Selection"));
|
||||
insert_at_combo.append_text (_("Last"));
|
||||
insert_at_combo.append (_("First"));
|
||||
insert_at_combo.append (_("Before Selection"));
|
||||
insert_at_combo.append (_("After Selection"));
|
||||
insert_at_combo.append (_("Last"));
|
||||
insert_at_combo.set_active (3);
|
||||
|
||||
Gtk::Label* l = manage (new Label (_("Insert duplicates at: ")));
|
||||
|
|
|
@ -1165,7 +1165,7 @@ Editor::generic_event_handler (GdkEvent* ev)
|
|||
case GDK_MOTION_NOTIFY:
|
||||
case GDK_KEY_PRESS:
|
||||
case GDK_KEY_RELEASE:
|
||||
if (contents().is_mapped()) {
|
||||
if (contents().get_mapped()) {
|
||||
gettimeofday (&last_event_time, 0);
|
||||
}
|
||||
break;
|
||||
|
@ -1929,7 +1929,7 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::sha
|
|||
const framepos_t position = get_preferred_edit_position (EDIT_IGNORE_NONE, true);
|
||||
|
||||
edit_items.push_back (*_popup_region_menu_item);
|
||||
if (Config->get_layer_model() == Manual && track->playlist()->count_regions_at (position) > 1 && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
|
||||
if (Config->get_layer_model() == Manual && track->playlist()->count_regions_at (position) > 1 && (layering_order_editor == 0 || !layering_order_editor->get_visible ())) {
|
||||
edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region-context-menu")->create_menu_item ()));
|
||||
}
|
||||
edit_items.push_back (SeparatorElem());
|
||||
|
@ -5652,7 +5652,7 @@ Editor::super_rapid_screen_update ()
|
|||
/* METERING / MIXER STRIPS */
|
||||
|
||||
/* update track meters, if required */
|
||||
if (contents().is_mapped() && meters_running) {
|
||||
if (contents().get_mapped() && meters_running) {
|
||||
RouteTimeAxisView* rtv;
|
||||
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
|
||||
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
|
||||
|
@ -5864,7 +5864,7 @@ Editor::change_region_layering_order (bool from_context_menu)
|
|||
void
|
||||
Editor::update_region_layering_order_editor ()
|
||||
{
|
||||
if (layering_order_editor && layering_order_editor->is_visible ()) {
|
||||
if (layering_order_editor && layering_order_editor->get_visible ()) {
|
||||
change_region_layering_order (true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ Editor::start_updating_meters ()
|
|||
{
|
||||
RouteTimeAxisView* rtv;
|
||||
|
||||
if (contents().is_mapped() && _session) {
|
||||
if (contents().get_mapped() && _session) {
|
||||
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
|
||||
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
|
||||
rtv->reset_meter ();
|
||||
|
@ -57,7 +57,7 @@ Editor::stop_updating_meters ()
|
|||
|
||||
meters_running = false;
|
||||
|
||||
if (contents().is_mapped() && _session) {
|
||||
if (contents().get_mapped() && _session) {
|
||||
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
|
||||
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
|
||||
rtv->hide_meter ();
|
||||
|
|
|
@ -238,7 +238,7 @@ Editor::initialize_canvas ()
|
|||
_track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
|
||||
_track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas), false);
|
||||
_track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas), false);
|
||||
_track_canvas->set_flags (CAN_FOCUS);
|
||||
_track_canvas->set_can_focus (true);
|
||||
|
||||
/* set up drag-n-drop */
|
||||
|
||||
|
@ -308,16 +308,15 @@ Editor::track_canvas_viewport_size_allocated ()
|
|||
void
|
||||
Editor::reset_controls_layout_width ()
|
||||
{
|
||||
GtkRequisition req = { 0, 0 };
|
||||
GtkRequisition req = edit_controls_vbox.size_request ();
|
||||
gint w;
|
||||
|
||||
edit_controls_vbox.size_request (req);
|
||||
w = req.width;
|
||||
|
||||
if (_group_tabs->is_visible()) {
|
||||
_group_tabs->size_request (req);
|
||||
w += req.width;
|
||||
}
|
||||
if (_group_tabs->get_visible ()) {
|
||||
req = _group_tabs->size_request ();
|
||||
w += req.width;
|
||||
}
|
||||
|
||||
/* the controls layout has no horizontal scrolling, its visible
|
||||
width is always equal to the total width of its contents.
|
||||
|
|
|
@ -5410,7 +5410,7 @@ Editor::quantize_regions (const RegionSelection& rs)
|
|||
quantize_dialog = new QuantizeDialog (*this);
|
||||
}
|
||||
|
||||
if (quantize_dialog->is_mapped()) {
|
||||
if (quantize_dialog->get_mapped()) {
|
||||
/* in progress already */
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -128,10 +128,14 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
|
|||
|
||||
_display.set_headers_visible (true);
|
||||
|
||||
color_dialog.get_colorsel()->set_has_opacity_control (false);
|
||||
color_dialog.get_colorsel()->set_has_palette (true);
|
||||
color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
|
||||
color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
|
||||
color_dialog.get_color_selection()->set_has_opacity_control (false);
|
||||
color_dialog.get_color_selection()->set_has_palette (true);
|
||||
|
||||
Gtk::Button* ok_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_OK));
|
||||
ok_button->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), true));
|
||||
|
||||
Gtk::Button* cancel_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_CANCEL));
|
||||
cancel_button->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), false));
|
||||
|
||||
/* name is directly editable */
|
||||
|
||||
|
@ -264,14 +268,14 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
|
|||
switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
|
||||
case 0:
|
||||
c = (*iter)[_columns.gdkcolor];
|
||||
color_dialog.get_colorsel()->set_previous_color (c);
|
||||
color_dialog.get_colorsel()->set_current_color (c);
|
||||
color_dialog.get_color_selection()->set_previous_color (c);
|
||||
color_dialog.get_color_selection()->set_current_color (c);
|
||||
|
||||
switch (color_dialog.run()) {
|
||||
case RESPONSE_CANCEL:
|
||||
break;
|
||||
case RESPONSE_ACCEPT:
|
||||
c = color_dialog.get_colorsel()->get_current_color();
|
||||
c = color_dialog.get_color_selection()->get_current_color();
|
||||
GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
|
||||
break;
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ EditorSummary::EditorSummary (Editor* e)
|
|||
_background_dirty (true)
|
||||
{
|
||||
add_events (Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
|
||||
set_flags (get_flags() | Gtk::CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
|
||||
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &EditorSummary::parameter_changed));
|
||||
}
|
||||
|
|
|
@ -244,9 +244,9 @@ EngineControl::EngineControl ()
|
|||
|
||||
/* pack it all up */
|
||||
|
||||
notebook.pages().push_back (TabElem (basic_vbox, _("Audio")));
|
||||
notebook.pages().push_back (TabElem (lm_vbox, _("Latency")));
|
||||
notebook.pages().push_back (TabElem (midi_vbox, _("MIDI")));
|
||||
notebook.append_page (basic_vbox, _("Audio"));
|
||||
notebook.append_page (lm_vbox, _("Latency"));
|
||||
notebook.append_page (midi_vbox, _("MIDI"));
|
||||
notebook.set_border_width (12);
|
||||
|
||||
notebook.set_show_tabs (false);
|
||||
|
@ -589,7 +589,7 @@ EngineControl::build_full_control_notebook ()
|
|||
row++;
|
||||
|
||||
input_channels.set_name ("InputChannels");
|
||||
input_channels.set_flags (Gtk::CAN_FOCUS);
|
||||
input_channels.set_can_focus (true);
|
||||
input_channels.set_digits (0);
|
||||
input_channels.set_wrap (false);
|
||||
output_channels.set_editable (true);
|
||||
|
@ -602,7 +602,7 @@ EngineControl::build_full_control_notebook ()
|
|||
}
|
||||
|
||||
output_channels.set_name ("OutputChannels");
|
||||
output_channels.set_flags (Gtk::CAN_FOCUS);
|
||||
output_channels.set_can_focus (true);
|
||||
output_channels.set_digits (0);
|
||||
output_channels.set_wrap (false);
|
||||
output_channels.set_editable (true);
|
||||
|
@ -615,7 +615,7 @@ EngineControl::build_full_control_notebook ()
|
|||
}
|
||||
|
||||
input_latency.set_name ("InputLatency");
|
||||
input_latency.set_flags (Gtk::CAN_FOCUS);
|
||||
input_latency.set_can_focus (true);
|
||||
input_latency.set_digits (0);
|
||||
input_latency.set_wrap (false);
|
||||
input_latency.set_editable (true);
|
||||
|
@ -628,7 +628,7 @@ EngineControl::build_full_control_notebook ()
|
|||
++row;
|
||||
|
||||
output_latency.set_name ("OutputLatency");
|
||||
output_latency.set_flags (Gtk::CAN_FOCUS);
|
||||
output_latency.set_can_focus (true);
|
||||
output_latency.set_digits (0);
|
||||
output_latency.set_wrap (false);
|
||||
output_latency.set_editable (true);
|
||||
|
@ -961,7 +961,7 @@ EngineControl::refresh_midi_display (std::string focus)
|
|||
|
||||
m = manage (new ArdourButton ((*p)->name, ArdourButton::led_default_elements));
|
||||
m->set_name ("midi device");
|
||||
m->set_can_focus (Gtk::CAN_FOCUS);
|
||||
m->set_can_focus (true);
|
||||
m->add_events (Gdk::BUTTON_RELEASE_MASK);
|
||||
m->set_active (enabled);
|
||||
m->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_device_enabled_toggled), m, *p));
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"))
|
||||
{ }
|
||||
|
||||
|
@ -144,7 +144,7 @@ ExportDialog::init ()
|
|||
/* Done! */
|
||||
|
||||
show_all_children ();
|
||||
progress_widget.hide_all();
|
||||
progress_widget.hide ();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -197,7 +197,7 @@ ExportDialog::close_dialog ()
|
|||
status->abort();
|
||||
}
|
||||
|
||||
hide_all ();
|
||||
hide ();
|
||||
set_modal (false);
|
||||
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -354,7 +354,7 @@ ExportDialog::show_progress ()
|
|||
export_button->set_sensitive (false);
|
||||
|
||||
progress_bar.set_fraction (0.0);
|
||||
warning_widget.hide_all();
|
||||
warning_widget.hide ();
|
||||
progress_widget.show ();
|
||||
progress_widget.show_all_children ();
|
||||
progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100);
|
||||
|
|
|
@ -42,7 +42,9 @@ ExportFileNotebook::ExportFileNotebook () :
|
|||
|
||||
new_file_hbox.pack_start (new_file_button, true, true);
|
||||
append_page (new_file_dummy, new_file_hbox);
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
set_tab_label_packing (new_file_dummy, true, true, Gtk::PACK_START);
|
||||
#endif
|
||||
new_file_hbox.show_all_children ();
|
||||
|
||||
page_change_connection = signal_switch_page().connect (sigc::mem_fun (*this, &ExportFileNotebook::handle_page_change));
|
||||
|
@ -202,8 +204,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)
|
||||
|
|
|
@ -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:"));
|
||||
|
|
|
@ -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")),
|
||||
|
@ -1081,7 +1081,7 @@ ExportFormatDialog::fill_sample_format_lists (boost::shared_ptr<ARDOUR::HasSampl
|
|||
void
|
||||
ExportFormatDialog::end_dialog ()
|
||||
{
|
||||
hide_all ();
|
||||
hide ();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -25,7 +25,8 @@
|
|||
#include "pbd/i18n.h"
|
||||
|
||||
ExportPresetSelector::ExportPresetSelector () :
|
||||
label (_("Preset"), Gtk::ALIGN_LEFT),
|
||||
label (_("Preset"), Gtk::ALIGN_START),
|
||||
entry(true),
|
||||
save_button (Gtk::Stock::SAVE),
|
||||
remove_button (Gtk::Stock::REMOVE),
|
||||
new_button (Gtk::Stock::NEW)
|
||||
|
@ -33,7 +34,7 @@ ExportPresetSelector::ExportPresetSelector () :
|
|||
list = Gtk::ListStore::create (cols);
|
||||
list->set_sort_column (cols.label, Gtk::SORT_ASCENDING);
|
||||
entry.set_model (list);
|
||||
entry.set_text_column (cols.label);
|
||||
entry.set_entry_text_column (cols.label);
|
||||
|
||||
pack_start (label, false, false, 0);
|
||||
pack_start (entry, true, true, 6);
|
||||
|
|
|
@ -66,7 +66,7 @@ class ExportPresetSelector : public Gtk::HBox
|
|||
PresetPtr previous;
|
||||
|
||||
Gtk::Label label;
|
||||
Gtk::ComboBoxEntry entry;
|
||||
Gtk::ComboBox entry;
|
||||
|
||||
Gtk::Button save_button;
|
||||
Gtk::Button remove_button;
|
||||
|
|
|
@ -835,7 +835,7 @@ ExportReport::init (const AnalysisResults & ar, bool with_file)
|
|||
l->show();
|
||||
tab->show();
|
||||
img->hide();
|
||||
pages.pages ().push_back (Notebook_Helpers::TabElem (*vb, *tab));
|
||||
pages.append_page (*vb, *tab);
|
||||
pages.signal_switch_page().connect (sigc::mem_fun (*this, &ExportReport::on_switch_page));
|
||||
|
||||
if (png_surface) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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_text (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
|
||||
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++;
|
||||
|
@ -201,65 +203,65 @@ ExportVideoDialog::ExportVideoDialog ()
|
|||
t->attach (debug_checkbox, 0, 4, ty, ty+1); ty++;
|
||||
#endif
|
||||
|
||||
preset_combo.append_text("none");
|
||||
preset_combo.append_text("dvd-mp2");
|
||||
preset_combo.append_text("dvd-NTSC");
|
||||
preset_combo.append_text("dvd-PAL");
|
||||
preset_combo.append_text("flv");
|
||||
preset_combo.append_text("mpeg4");
|
||||
preset_combo.append_text("mp4/h264/aac");
|
||||
preset_combo.append_text("ogg");
|
||||
preset_combo.append_text("webm");
|
||||
preset_combo.append_text("you-tube");
|
||||
preset_combo.append("none");
|
||||
preset_combo.append("dvd-mp2");
|
||||
preset_combo.append("dvd-NTSC");
|
||||
preset_combo.append("dvd-PAL");
|
||||
preset_combo.append("flv");
|
||||
preset_combo.append("mpeg4");
|
||||
preset_combo.append("mp4/h264/aac");
|
||||
preset_combo.append("ogg");
|
||||
preset_combo.append("webm");
|
||||
preset_combo.append("you-tube");
|
||||
|
||||
audio_codec_combo.append_text(_("(default for format)"));
|
||||
audio_codec_combo.append_text("ac3");
|
||||
audio_codec_combo.append_text("aac");
|
||||
audio_codec_combo.append_text("libmp3lame");
|
||||
audio_codec_combo.append_text("libvorbis");
|
||||
audio_codec_combo.append_text("mp2");
|
||||
audio_codec_combo.append_text("pcm_s16le");
|
||||
audio_codec_combo.append(_("(default for format)"));
|
||||
audio_codec_combo.append("ac3");
|
||||
audio_codec_combo.append("aac");
|
||||
audio_codec_combo.append("libmp3lame");
|
||||
audio_codec_combo.append("libvorbis");
|
||||
audio_codec_combo.append("mp2");
|
||||
audio_codec_combo.append("pcm_s16le");
|
||||
|
||||
video_codec_combo.append_text(_("(default for format)"));
|
||||
video_codec_combo.append_text("flv");
|
||||
video_codec_combo.append_text("libtheora");
|
||||
video_codec_combo.append_text("mjpeg");
|
||||
video_codec_combo.append_text("mpeg2video");
|
||||
video_codec_combo.append_text("mpeg4");
|
||||
video_codec_combo.append_text("h264");
|
||||
video_codec_combo.append_text("vpx (webm)");
|
||||
video_codec_combo.append_text("copy");
|
||||
video_codec_combo.append(_("(default for format)"));
|
||||
video_codec_combo.append("flv");
|
||||
video_codec_combo.append("libtheora");
|
||||
video_codec_combo.append("mjpeg");
|
||||
video_codec_combo.append("mpeg2video");
|
||||
video_codec_combo.append("mpeg4");
|
||||
video_codec_combo.append("h264");
|
||||
video_codec_combo.append("vpx (webm)");
|
||||
video_codec_combo.append("copy");
|
||||
|
||||
audio_bitrate_combo.append_text(_("(default)"));
|
||||
audio_bitrate_combo.append_text("64k");
|
||||
audio_bitrate_combo.append_text("128k");
|
||||
audio_bitrate_combo.append_text("192k");
|
||||
audio_bitrate_combo.append_text("256k");
|
||||
audio_bitrate_combo.append_text("320k");
|
||||
audio_bitrate_combo.append(_("(default)"));
|
||||
audio_bitrate_combo.append("64k");
|
||||
audio_bitrate_combo.append("128k");
|
||||
audio_bitrate_combo.append("192k");
|
||||
audio_bitrate_combo.append("256k");
|
||||
audio_bitrate_combo.append("320k");
|
||||
|
||||
audio_samplerate_combo.append_text("22050");
|
||||
audio_samplerate_combo.append_text("44100");
|
||||
audio_samplerate_combo.append_text("48000");
|
||||
audio_samplerate_combo.append("22050");
|
||||
audio_samplerate_combo.append("44100");
|
||||
audio_samplerate_combo.append("48000");
|
||||
|
||||
video_bitrate_combo.append_text(_("(default)"));
|
||||
video_bitrate_combo.append_text(_("(retain)"));
|
||||
video_bitrate_combo.append_text("200k");
|
||||
video_bitrate_combo.append_text("800k");
|
||||
video_bitrate_combo.append_text("2000k");
|
||||
video_bitrate_combo.append_text("5000k");
|
||||
video_bitrate_combo.append_text("8000k");
|
||||
video_bitrate_combo.append(_("(default)"));
|
||||
video_bitrate_combo.append(_("(retain)"));
|
||||
video_bitrate_combo.append("200k");
|
||||
video_bitrate_combo.append("800k");
|
||||
video_bitrate_combo.append("2000k");
|
||||
video_bitrate_combo.append("5000k");
|
||||
video_bitrate_combo.append("8000k");
|
||||
|
||||
fps_combo.append_text("23.976");
|
||||
fps_combo.append_text("24");
|
||||
fps_combo.append_text("24.976");
|
||||
fps_combo.append_text("25");
|
||||
fps_combo.append_text("29.97");
|
||||
fps_combo.append_text("30");
|
||||
fps_combo.append_text("59.94");
|
||||
fps_combo.append_text("60");
|
||||
fps_combo.append("23.976");
|
||||
fps_combo.append("24");
|
||||
fps_combo.append("24.976");
|
||||
fps_combo.append("25");
|
||||
fps_combo.append("29.97");
|
||||
fps_combo.append("30");
|
||||
fps_combo.append("59.94");
|
||||
fps_combo.append("60");
|
||||
|
||||
aspect_combo.append_text("4:3");
|
||||
aspect_combo.append_text("16:9");
|
||||
aspect_combo.append("4:3");
|
||||
aspect_combo.append("16:9");
|
||||
|
||||
vbox->pack_start (*options_box, false, true, 4);
|
||||
get_vbox()->set_spacing (4);
|
||||
|
@ -332,12 +334,12 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
|
|||
// TODO remember setting for export-range.. somehow, (let explicit range override)
|
||||
frameoffset_t av_offset = ARDOUR_UI::instance()->video_timeline->get_offset();
|
||||
if (av_offset < 0 ) {
|
||||
insnd_combo.append_text (_("from 00:00:00:00 to the video's end"));
|
||||
insnd_combo.append (_("from 00:00:00:00 to the video's end"));
|
||||
} else {
|
||||
insnd_combo.append_text (_("from the video's start to the video's end"));
|
||||
insnd_combo.append (_("from the video's start to the video's end"));
|
||||
}
|
||||
if (!export_range.empty()) {
|
||||
insnd_combo.append_text (_("Selected range")); // TODO show export_range.start() -> export_range.end_frame()
|
||||
insnd_combo.append (_("Selected range")); // TODO show export_range.start() -> export_range.end_frame()
|
||||
}
|
||||
if (range) {
|
||||
insnd_combo.set_active(2);
|
||||
|
@ -1222,7 +1224,7 @@ ExportVideoDialog::preset_combo_changed ()
|
|||
video_bitrate_combo.set_sensitive(false);
|
||||
audio_samplerate_combo.set_sensitive(false);
|
||||
}
|
||||
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
Gtk::Table *t = (Gtk::Table*) preset_combo.get_parent();
|
||||
Gtk::Table_Helpers::TableList c = t->children();
|
||||
Gtk::Table_Helpers::TableList::iterator it;
|
||||
|
@ -1241,6 +1243,7 @@ ExportVideoDialog::preset_combo_changed ()
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
video_codec_combo_changed();
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -143,7 +143,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
|
|||
peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK)));
|
||||
peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display));
|
||||
peak_display.signal_state_changed().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default_state), &peak_display));
|
||||
peak_display.unset_flags (Gtk::CAN_FOCUS);
|
||||
peak_display.set_can_focus (false);
|
||||
peak_display.set_editable (false);
|
||||
|
||||
gain_automation_style_button.set_name ("mixer strip button");
|
||||
|
@ -152,8 +152,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
|
|||
set_tooltip (gain_automation_state_button, _("Fader automation mode"));
|
||||
set_tooltip (gain_automation_style_button, _("Fader automation type"));
|
||||
|
||||
gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
gain_automation_style_button.set_can_focus (false);
|
||||
gain_automation_state_button.set_can_focus (false);
|
||||
|
||||
gain_automation_state_button.set_size_request(15, 15);
|
||||
gain_automation_style_button.set_size_request(15, 15);
|
||||
|
@ -980,8 +980,8 @@ GainMeter::GainMeter (Session* s, int fader_length)
|
|||
set_tooltip (gain_automation_state_button, _("Fader automation mode"));
|
||||
set_tooltip (gain_automation_style_button, _("Fader automation type"));
|
||||
|
||||
gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
gain_automation_style_button.set_can_focus (false);
|
||||
gain_automation_state_button.set_can_focus (false);
|
||||
|
||||
gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
|
||||
gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
|
||||
|
@ -1072,15 +1072,13 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
|
|||
int
|
||||
GainMeter::get_gm_width ()
|
||||
{
|
||||
Gtk::Requisition sz;
|
||||
Gtk::Requisition sz = meter_metric_area.size_request ();
|
||||
int min_w = 0;
|
||||
sz.width = 0;
|
||||
meter_metric_area.size_request (sz);
|
||||
min_w += sz.width;
|
||||
level_meter->size_request (sz);
|
||||
sz = level_meter->size_request ();
|
||||
min_w += sz.width;
|
||||
|
||||
fader_alignment.size_request (sz);
|
||||
sz = fader_alignment.size_request ();
|
||||
if (_width == Wide)
|
||||
return max(sz.width * 2, min_w * 2) + 6;
|
||||
else
|
||||
|
|
|
@ -504,18 +504,18 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis)
|
|||
prefheight = 30 * i;
|
||||
}
|
||||
|
||||
if (box->children().empty()) {
|
||||
if (box->get_children().empty()) {
|
||||
hpacker.remove (*frame);
|
||||
}
|
||||
|
||||
if (button_table->children().empty()) {
|
||||
if (button_table->get_children().empty()) {
|
||||
hpacker.remove (*bt_frame);
|
||||
delete button_table;
|
||||
} else {
|
||||
button_table->show_all ();
|
||||
}
|
||||
|
||||
if (!output_table->children().empty()) {
|
||||
if (!output_table->get_children().empty()) {
|
||||
frame = manage (new Frame);
|
||||
frame->set_name ("BaseFrame");
|
||||
frame->set_label(_("Meters"));
|
||||
|
|
|
@ -87,9 +87,9 @@ InsertRemoveTimeDialog::InsertRemoveTimeDialog (PublicEditor& e, bool remove)
|
|||
Label* intersected_label = manage (new Label (_("Intersected regions should:")));
|
||||
intersected_label->set_alignment (1, 0.5);
|
||||
table->attach (*intersected_label, 0, 1, 2, 3, FILL | EXPAND);
|
||||
_intersected_combo.append_text (_("stay in position"));
|
||||
_intersected_combo.append_text (_("move"));
|
||||
_intersected_combo.append_text (_("be split"));
|
||||
_intersected_combo.append (_("stay in position"));
|
||||
_intersected_combo.append (_("move"));
|
||||
_intersected_combo.append (_("be split"));
|
||||
_intersected_combo.set_active (0);
|
||||
table->attach (_intersected_combo, 1, 2, 2, 3);
|
||||
}
|
||||
|
|
|
@ -1081,7 +1081,7 @@ LocationUI::refresh_location_list ()
|
|||
using namespace Box_Helpers;
|
||||
|
||||
// this is just too expensive to do when window is not shown
|
||||
if (!is_mapped()) {
|
||||
if (!get_mapped()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1201,5 +1201,5 @@ void
|
|||
LocationUIWindow::session_going_away ()
|
||||
{
|
||||
ArdourWindow::session_going_away ();
|
||||
hide_all();
|
||||
hide ();
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ LuaScriptManager::LuaScriptManager ()
|
|||
vbox->pack_end (*edit_box, false, false);
|
||||
vbox->show_all ();
|
||||
|
||||
pages.pages ().push_back (Notebook_Helpers::TabElem (*vbox, "Action Scripts"));
|
||||
pages.append_page (*vbox, "Action Scripts");
|
||||
|
||||
/* action hooks page */
|
||||
|
||||
|
@ -96,8 +96,7 @@ LuaScriptManager::LuaScriptManager ()
|
|||
vbox->pack_end (*edit_box, false, false);
|
||||
vbox->show_all ();
|
||||
|
||||
pages.pages ().push_back (Notebook_Helpers::TabElem (*vbox, "Action Hooks"));
|
||||
|
||||
pages.append_page (*vbox, "Action Hooks");
|
||||
|
||||
add (pages);
|
||||
pages.show();
|
||||
|
@ -113,7 +112,7 @@ void
|
|||
LuaScriptManager::session_going_away ()
|
||||
{
|
||||
ArdourWindow::session_going_away ();
|
||||
hide_all();
|
||||
hide();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -159,7 +159,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
|
|||
peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
|
||||
set_tooltip (peak_display, _("Reset Peak"));
|
||||
max_peak = minus_infinity();
|
||||
peak_display.unset_flags (Gtk::CAN_FOCUS);
|
||||
peak_display.set_can_focus (false);
|
||||
peak_display.set_size_request(PX_SCALE(12, 12), PX_SCALE(8, 8));
|
||||
peak_display.set_corner_radius(2); // ardour-button scales this
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
|
|||
const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
|
||||
|
||||
/* switch left/right edge patterns depending on horizontal scroll-position */
|
||||
if (scroller.get_hscrollbar_visible() && hsc) {
|
||||
if (scroller.get_hscrollbar()->get_visible() && hsc) {
|
||||
if (!scroll_connection.connected()) {
|
||||
scroll_connection = scroller.get_hscrollbar()->get_adjustment()->signal_value_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
|
||||
scroller.get_hscrollbar()->get_adjustment()->signal_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
|
||||
|
@ -543,7 +543,7 @@ Meterbridge::get_state (void)
|
|||
char buf[32];
|
||||
XMLNode* node = new XMLNode ("Meterbridge");
|
||||
|
||||
if (is_realized() && _visible) {
|
||||
if (get_realized() && _visible) {
|
||||
get_window_pos_and_size ();
|
||||
}
|
||||
|
||||
|
@ -580,7 +580,7 @@ Meterbridge::stop_updating ()
|
|||
void
|
||||
Meterbridge::fast_update_strips ()
|
||||
{
|
||||
if (!is_mapped () || !_session) {
|
||||
if (!get_mapped () || !_session) {
|
||||
return;
|
||||
}
|
||||
for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
|
||||
|
|
|
@ -141,7 +141,7 @@ MidiTracer::ports_changed ()
|
|||
}
|
||||
|
||||
for (ARDOUR::PortManager::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) {
|
||||
_port_combo.append_text ((*i)->name());
|
||||
_port_combo.append ((*i)->name());
|
||||
}
|
||||
|
||||
if (c.empty()) {
|
||||
|
|
|
@ -378,7 +378,7 @@ MixerStrip::init ()
|
|||
Gdk::KEY_PRESS_MASK|
|
||||
Gdk::KEY_RELEASE_MASK);
|
||||
|
||||
set_flags (get_flags() | Gtk::CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
|
||||
AudioEngine::instance()->PortConnectedOrDisconnected.connect (
|
||||
*this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context ()
|
||||
|
@ -544,7 +544,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
|
|||
set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section"));
|
||||
mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
|
||||
monitor_section_button->show();
|
||||
monitor_section_button->unset_flags (Gtk::CAN_FOCUS);
|
||||
monitor_section_button->set_can_focus (false);
|
||||
}
|
||||
parameter_changed ("use-monitor-bus");
|
||||
} else {
|
||||
|
@ -673,7 +673,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
|
|||
if (has_audio_outputs ()) {
|
||||
panners.show_all ();
|
||||
} else {
|
||||
panners.hide_all ();
|
||||
panners.hide ();
|
||||
}
|
||||
|
||||
update_diskstream_display ();
|
||||
|
@ -1124,7 +1124,7 @@ void
|
|||
MixerStrip::update_diskstream_display ()
|
||||
{
|
||||
if (is_track() && input_selector) {
|
||||
input_selector->hide_all ();
|
||||
input_selector->hide ();
|
||||
}
|
||||
|
||||
route_color_changed ();
|
||||
|
@ -1483,7 +1483,7 @@ MixerStrip::update_input_display ()
|
|||
if (has_audio_outputs ()) {
|
||||
panners.show_all ();
|
||||
} else {
|
||||
panners.hide_all ();
|
||||
panners.hide ();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1498,7 +1498,7 @@ MixerStrip::update_output_display ()
|
|||
if (has_audio_outputs ()) {
|
||||
panners.show_all ();
|
||||
} else {
|
||||
panners.hide_all ();
|
||||
panners.hide ();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2196,7 +2196,7 @@ MixerStrip::revert_to_default_display ()
|
|||
if (has_audio_outputs ()) {
|
||||
panners.show_all ();
|
||||
} else {
|
||||
panners.hide_all ();
|
||||
panners.hide ();
|
||||
}
|
||||
|
||||
reset_strip_style ();
|
||||
|
|
|
@ -121,7 +121,7 @@ Mixer_UI::Mixer_UI ()
|
|||
scroller.set_can_default (true);
|
||||
// set_default (scroller);
|
||||
|
||||
scroller_base.set_flags (Gtk::CAN_FOCUS);
|
||||
scroller_base.set_can_focus (true);
|
||||
scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
|
||||
scroller_base.set_name ("MixerWindow");
|
||||
scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
|
||||
|
@ -1115,7 +1115,7 @@ Mixer_UI::stop_updating ()
|
|||
void
|
||||
Mixer_UI::fast_update_strips ()
|
||||
{
|
||||
if (_content.is_mapped () && _session) {
|
||||
if (_content.get_mapped () && _session) {
|
||||
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
|
||||
(*i)->fast_update ();
|
||||
}
|
||||
|
|
|
@ -466,7 +466,7 @@ MonitorSection::MonitorSection (Session* s)
|
|||
|
||||
signal_enter_notify_event().connect (sigc::mem_fun (*this, &MonitorSection::enter_handler));
|
||||
signal_leave_notify_event().connect (sigc::mem_fun (*this, &MonitorSection::leave_handler));
|
||||
set_flags (CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
|
||||
_tearoff = new TearOff (*this);
|
||||
|
||||
|
@ -536,7 +536,7 @@ MonitorSection::leave_handler (GdkEventCrossing* ev)
|
|||
|
||||
Widget* top = get_toplevel();
|
||||
|
||||
if (top->is_toplevel() && top != &_tearoff->tearoff_window()) {
|
||||
if (top->get_is_toplevel() && top != &_tearoff->tearoff_window()) {
|
||||
Window* win = dynamic_cast<Window*> (top);
|
||||
gtk_window_set_focus (win->gobj(), 0);
|
||||
}
|
||||
|
@ -555,7 +555,7 @@ MonitorSection::update_processor_box ()
|
|||
toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
|
||||
}
|
||||
|
||||
if (insert_box->is_visible() == show_processor_box) {
|
||||
if (insert_box->get_visible() == show_processor_box) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -663,10 +663,10 @@ MonitorSection::ChannelButtonSet::ChannelButtonSet ()
|
|||
solo.set_name (X_("solo button"));
|
||||
invert.set_name (X_("invert button"));
|
||||
|
||||
cut.unset_flags (Gtk::CAN_FOCUS);
|
||||
dim.unset_flags (Gtk::CAN_FOCUS);
|
||||
solo.unset_flags (Gtk::CAN_FOCUS);
|
||||
invert.unset_flags (Gtk::CAN_FOCUS);
|
||||
cut.set_can_focus (false);
|
||||
dim.set_can_focus (false);
|
||||
solo.set_can_focus (false);
|
||||
invert.set_can_focus (false);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -35,7 +35,7 @@ NoteSelectDialog::NoteSelectDialog()
|
|||
, _pianomm(Glib::wrap((GtkWidget*)_piano))
|
||||
, _note_number(60)
|
||||
{
|
||||
_pianomm->set_flags(Gtk::CAN_FOCUS);
|
||||
_pianomm->set_can_focus (true);
|
||||
_pianomm->show();
|
||||
g_signal_connect(G_OBJECT(_piano), "note-on", G_CALLBACK(_note_on_event_handler), this);
|
||||
piano_keyboard_set_monophonic(_piano, TRUE);
|
||||
|
|
|
@ -299,9 +299,9 @@ BoolComboOption::BoolComboOption (
|
|||
_combo = manage (new ComboBoxText);
|
||||
|
||||
/* option 0 is the false option */
|
||||
_combo->append_text (f);
|
||||
_combo->append (f);
|
||||
/* and option 1 is the true */
|
||||
_combo->append_text (t);
|
||||
_combo->append (t);
|
||||
|
||||
_combo->signal_changed().connect (sigc::mem_fun (*this, &BoolComboOption::changed));
|
||||
}
|
||||
|
|
|
@ -320,11 +320,11 @@ public:
|
|||
*/
|
||||
void add (T e, std::string const & o) {
|
||||
_options.push_back (e);
|
||||
_combo->append_text (o);
|
||||
_combo->append (o);
|
||||
}
|
||||
|
||||
void clear () {
|
||||
_combo->clear_items();
|
||||
_combo->remove_all ();
|
||||
_options.clear ();
|
||||
}
|
||||
|
||||
|
@ -464,14 +464,14 @@ public:
|
|||
* @param strings a vector of allowed strings
|
||||
*/
|
||||
void set_popdown_strings (const std::vector<std::string>& strings) {
|
||||
_combo->clear_items ();
|
||||
_combo->remove_all ();
|
||||
for (std::vector<std::string>::const_iterator i = strings.begin(); i != strings.end(); ++i) {
|
||||
_combo->append_text (*i);
|
||||
_combo->append (*i);
|
||||
}
|
||||
}
|
||||
|
||||
void clear () {
|
||||
_combo->clear_items();
|
||||
_combo->remove_all ();
|
||||
}
|
||||
|
||||
void changed () {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -36,7 +36,7 @@ PannerInterface::PannerInterface (boost::shared_ptr<Panner> p)
|
|||
, _send_mode (false)
|
||||
, _editor (0)
|
||||
{
|
||||
set_flags (Gtk::CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
|
||||
add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|
|
||||
Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|
|
||||
|
|
|
@ -75,8 +75,8 @@ PannerUI::PannerUI (Session* s)
|
|||
//set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
|
||||
//set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2);
|
||||
|
||||
pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
pan_automation_style_button.set_can_focus (false);
|
||||
pan_automation_state_button.set_can_focus (false);
|
||||
|
||||
pan_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
|
||||
pan_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_state_button_event), false);
|
||||
|
|
|
@ -171,7 +171,7 @@ PatchChangeDialog::fill_bank_combo ()
|
|||
for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
|
||||
string n = (*i)->name ();
|
||||
boost::replace_all (n, "_", " ");
|
||||
_bank_combo.append_text (n);
|
||||
_bank_combo.append (n);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -260,7 +260,7 @@ PatchChangeDialog::fill_patch_combo ()
|
|||
for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
|
||||
string n = (*j)->name ();
|
||||
boost::replace_all (n, "_", " ");
|
||||
_patch_combo.append_text (n);
|
||||
_patch_combo.append (n);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -193,7 +193,7 @@ PluginEqGui::stop_updating()
|
|||
void
|
||||
PluginEqGui::start_updating()
|
||||
{
|
||||
if (!_update_connection.connected() && is_visible()) {
|
||||
if (!_update_connection.connected() && get_visible()) {
|
||||
_update_connection = Glib::signal_timeout().connect( sigc::mem_fun(this, &PluginEqGui::timeout_callback), 250);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -436,10 +436,8 @@ PluginPinWidget::plugin_reconfigured ()
|
|||
void
|
||||
PluginPinWidget::refill_sidechain_table ()
|
||||
{
|
||||
Table_Helpers::TableList& kids = _sidechain_tbl->children ();
|
||||
for (Table_Helpers::TableList::iterator i = kids.begin (); i != kids.end ();) {
|
||||
i = kids.erase (i);
|
||||
}
|
||||
container_clear (*_sidechain_tbl);
|
||||
|
||||
_sidechain_tbl->resize (1, 1);
|
||||
for (list<Control*>::iterator i = _controls.begin (); i != _controls.end (); ++i) {
|
||||
delete *i;
|
||||
|
@ -1562,7 +1560,7 @@ PluginPinWidget::connect_sidechain ()
|
|||
_sidechain_selector = new IOSelectorWindow (_session, _pi->sidechain_input ());
|
||||
}
|
||||
|
||||
if (_sidechain_selector->is_visible ()) {
|
||||
if (_sidechain_selector->get_visible ()) {
|
||||
_sidechain_selector->get_toplevel ()->get_window ()->raise ();
|
||||
} else {
|
||||
_sidechain_selector->present ();
|
||||
|
|
|
@ -658,7 +658,7 @@ ProcessorEntry::add_control_state (XMLNode* node) const
|
|||
if (_plugin_display) {
|
||||
XMLNode* c = new XMLNode (X_("Object"));
|
||||
c->add_property (X_("id"), X_("InlineDisplay"));
|
||||
c->add_property (X_("visible"), _plugin_display->is_visible ());
|
||||
c->add_property (X_("visible"), _plugin_display->get_visible ());
|
||||
node->add_child_nocopy (*c);
|
||||
}
|
||||
}
|
||||
|
@ -708,7 +708,7 @@ ProcessorEntry::build_controls_menu ()
|
|||
if (_plugin_display) {
|
||||
items.push_back (CheckMenuElem (_("Inline Display")));
|
||||
Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
|
||||
c->set_active (_plugin_display->is_visible ());
|
||||
c->set_active (_plugin_display->get_visible ());
|
||||
c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_inline_display_visibility));
|
||||
items.push_back (SeparatorElem ());
|
||||
}
|
||||
|
@ -738,7 +738,7 @@ ProcessorEntry::build_controls_menu ()
|
|||
void
|
||||
ProcessorEntry::toggle_inline_display_visibility ()
|
||||
{
|
||||
if (_plugin_display->is_visible ()) {
|
||||
if (_plugin_display->get_visible ()) {
|
||||
_plugin_display->hide();
|
||||
} else {
|
||||
_plugin_display->show();
|
||||
|
@ -1631,7 +1631,7 @@ ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height)
|
|||
Gtk::ScrolledWindow* sw = dynamic_cast<Gtk::ScrolledWindow*> (pr);
|
||||
if (sw) {
|
||||
const Gtk::VScrollbar* vsb = sw->get_vscrollbar();
|
||||
sc = vsb && vsb->is_visible();
|
||||
sc = vsb && vsb->get_visible();
|
||||
}
|
||||
|
||||
if (shm != _cur_height) {
|
||||
|
@ -1832,7 +1832,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
|
|||
processor_scroller.add (processor_display);
|
||||
pack_start (processor_scroller, true, true);
|
||||
|
||||
processor_display.set_flags (CAN_FOCUS);
|
||||
processor_display.set_can_focus (true);
|
||||
processor_display.set_name ("ProcessorList");
|
||||
processor_display.set_data ("processorbox", this);
|
||||
processor_display.set_size_request (48, -1);
|
||||
|
@ -2253,7 +2253,7 @@ ProcessorBox::leave_notify (GdkEventCrossing* ev)
|
|||
|
||||
Widget* top = get_toplevel();
|
||||
|
||||
if (top->is_toplevel()) {
|
||||
if (top->get_is_toplevel()) {
|
||||
Window* win = dynamic_cast<Window*> (top);
|
||||
gtk_window_set_focus (win->gobj(), 0);
|
||||
}
|
||||
|
|
|
@ -1041,7 +1041,9 @@ public:
|
|||
const std::string empty = X_(""); // despite gtk-doc saying so, NULL does not work as reference
|
||||
|
||||
_dpi_slider.set_name("FontScaleSlider");
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
_dpi_slider.set_update_policy (UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
_dpi_slider.set_draw_value(false);
|
||||
_dpi_slider.add_mark(50, Gtk::POS_TOP, empty);
|
||||
_dpi_slider.add_mark(60, Gtk::POS_TOP, empty);
|
||||
|
@ -1167,7 +1169,9 @@ public:
|
|||
Label* l = manage (new Label (_("Waveform Clip Level (dBFS):")));
|
||||
l->set_name ("OptionsLabel");
|
||||
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
_clip_level_slider.set_update_policy (UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
HBox* h = manage (new HBox);
|
||||
h->set_spacing (4);
|
||||
h->pack_start (*l, false, false);
|
||||
|
@ -1239,7 +1243,9 @@ public:
|
|||
l = manage (new Label (_("Playback (seconds of buffering):")));
|
||||
l->set_name ("OptionsLabel");
|
||||
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
_playback_slider.set_update_policy (UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
h = manage (new HBox);
|
||||
h->set_spacing (4);
|
||||
h->pack_start (*l, false, false);
|
||||
|
@ -1252,7 +1258,9 @@ public:
|
|||
l = manage (new Label (_("Recording (seconds of buffering):")));
|
||||
l->set_name ("OptionsLabel");
|
||||
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
_capture_slider.set_update_policy (UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
h = manage (new HBox);
|
||||
h->set_spacing (4);
|
||||
h->pack_start (*l, false, false);
|
||||
|
|
|
@ -80,7 +80,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
|
|||
|
||||
set_tooltip (audition_button, _("audition this region"));
|
||||
|
||||
audition_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
audition_button.set_can_focus (false);
|
||||
|
||||
audition_button.set_events (audition_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
|
||||
|
||||
|
@ -168,7 +168,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
|
|||
set_title (string_compose (_("Region '%1'"), _region->name()));
|
||||
|
||||
for (uint32_t i = 0; i < _region->n_channels(); ++i) {
|
||||
_sources.append_text (_region->source(i)->name());
|
||||
_sources.append (_region->source(i)->name());
|
||||
}
|
||||
|
||||
_sources.set_headers_visible (false);
|
||||
|
|
|
@ -549,7 +549,7 @@ void
|
|||
RegionView::hide_region_editor()
|
||||
{
|
||||
if (editor) {
|
||||
editor->hide_all ();
|
||||
editor->hide ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -100,10 +100,10 @@ RouteParams_UI::RouteParams_UI ()
|
|||
|
||||
list_vpacker.pack_start (route_select_frame, true, true);
|
||||
|
||||
notebook.pages().push_back (TabElem (input_frame, _("Inputs")));
|
||||
notebook.pages().push_back (TabElem (output_frame, _("Outputs")));
|
||||
notebook.pages().push_back (TabElem (redir_hpane, _("Plugins, Inserts & Sends")));
|
||||
notebook.pages().push_back (TabElem (latency_frame, _("Latency")));
|
||||
notebook.append_page (input_frame, _("Inputs"));
|
||||
notebook.append_page (output_frame, _("Outputs"));
|
||||
notebook.append_page (redir_hpane, _("Plugins, Inserts & Sends"));
|
||||
notebook.append_page (latency_frame, _("Latency"));
|
||||
|
||||
notebook.set_name ("InspectorNotebook");
|
||||
|
||||
|
|
|
@ -325,8 +325,8 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
|
|||
update_monitoring_display ();
|
||||
}
|
||||
|
||||
mute_button->unset_flags (Gtk::CAN_FOCUS);
|
||||
solo_button->unset_flags (Gtk::CAN_FOCUS);
|
||||
mute_button->set_can_focus (false);
|
||||
solo_button->set_can_focus (false);
|
||||
|
||||
mute_button->show();
|
||||
|
||||
|
@ -509,7 +509,7 @@ RouteUI::edit_output_configuration ()
|
|||
output_selector = new IOSelectorWindow (_session, output);
|
||||
}
|
||||
|
||||
if (output_selector->is_visible()) {
|
||||
if (output_selector->get_visible()) {
|
||||
output_selector->get_toplevel()->get_window()->raise();
|
||||
} else {
|
||||
output_selector->present ();
|
||||
|
@ -525,7 +525,7 @@ RouteUI::edit_input_configuration ()
|
|||
input_selector = new IOSelectorWindow (_session, _route->input());
|
||||
}
|
||||
|
||||
if (input_selector->is_visible()) {
|
||||
if (input_selector->get_visible()) {
|
||||
input_selector->get_toplevel()->get_window()->raise();
|
||||
} else {
|
||||
input_selector->present ();
|
||||
|
@ -551,8 +551,8 @@ RouteUI::solo_press(GdkEventButton* ev)
|
|||
|
||||
if (Keyboard::is_context_menu_event (ev)) {
|
||||
|
||||
if (! (solo_isolated_led && solo_isolated_led->is_visible()) ||
|
||||
! (solo_safe_led && solo_safe_led->is_visible())) {
|
||||
if (! (solo_isolated_led && solo_isolated_led->get_visible()) ||
|
||||
! (solo_safe_led && solo_safe_led->get_visible())) {
|
||||
|
||||
if (solo_menu == 0) {
|
||||
build_solo_menu ();
|
||||
|
@ -1667,7 +1667,7 @@ RouteUI::toggle_comment_editor ()
|
|||
// return;
|
||||
// }
|
||||
|
||||
if (comment_window && comment_window->is_visible ()) {
|
||||
if (comment_window && comment_window->get_visible ()) {
|
||||
comment_window->hide ();
|
||||
} else {
|
||||
open_comment_editor ();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -121,7 +121,7 @@ SendUI::update ()
|
|||
void
|
||||
SendUI::fast_update ()
|
||||
{
|
||||
if (!is_mapped()) {
|
||||
if (!get_mapped()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,12 +42,12 @@ SessionArchiveDialog::SessionArchiveDialog ()
|
|||
HBox* hbox;
|
||||
Label* label;
|
||||
|
||||
format_selector.append_text (".tar.xz");
|
||||
format_selector.append (".tar.xz");
|
||||
format_selector.set_active_text (".tar.xz");
|
||||
|
||||
encode_selector.append_text (_("None"));
|
||||
encode_selector.append_text (_("FLAC 16bit"));
|
||||
encode_selector.append_text (_("FLAC 24bit"));
|
||||
encode_selector.append (_("None"));
|
||||
encode_selector.append (_("FLAC 16bit"));
|
||||
encode_selector.append (_("FLAC 24bit"));
|
||||
encode_selector.set_active_text ("FLAC 16bit"); // TODO remember
|
||||
|
||||
hbox = manage (new HBox);
|
||||
|
|
|
@ -425,7 +425,7 @@ SessionDialog::setup_initial_choice_box ()
|
|||
/* --disable plugins UI */
|
||||
|
||||
_disable_plugins.set_label (_("Safe Mode: Disable all Plugins"));
|
||||
_disable_plugins.set_flags (Gtk::CAN_FOCUS);
|
||||
_disable_plugins.set_can_focus (true);
|
||||
_disable_plugins.set_relief (Gtk::RELIEF_NORMAL);
|
||||
_disable_plugins.set_mode (true);
|
||||
_disable_plugins.set_active (ARDOUR::Session::get_disable_all_loaded_plugins());
|
||||
|
@ -911,14 +911,14 @@ SessionDialog::setup_more_options_box ()
|
|||
input_label.set_markup (_("<b>Inputs</b>"));
|
||||
output_label.set_markup (_("<b>Outputs</b>"));
|
||||
|
||||
_master_bus_channel_count.set_flags(Gtk::CAN_FOCUS);
|
||||
_master_bus_channel_count.set_can_focus (true);
|
||||
_master_bus_channel_count.set_update_policy(Gtk::UPDATE_ALWAYS);
|
||||
_master_bus_channel_count.set_numeric(true);
|
||||
_master_bus_channel_count.set_digits(0);
|
||||
_master_bus_channel_count.set_wrap(false);
|
||||
|
||||
_create_master_bus.set_label (_("Create master bus"));
|
||||
_create_master_bus.set_flags(Gtk::CAN_FOCUS);
|
||||
_create_master_bus.set_can_focus (true);
|
||||
_create_master_bus.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_create_master_bus.set_mode(true);
|
||||
_create_master_bus.set_active(true);
|
||||
|
@ -928,20 +928,20 @@ SessionDialog::setup_more_options_box ()
|
|||
advanced_table.set_col_spacings(0);
|
||||
|
||||
_connect_inputs.set_label (_("Automatically connect to physical inputs"));
|
||||
_connect_inputs.set_flags(Gtk::CAN_FOCUS);
|
||||
_connect_inputs.set_can_focus (true);
|
||||
_connect_inputs.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_connect_inputs.set_mode(true);
|
||||
_connect_inputs.set_active(Config->get_input_auto_connect() != ManualConnect);
|
||||
_connect_inputs.set_border_width(0);
|
||||
|
||||
_limit_input_ports.set_label (_("Use only"));
|
||||
_limit_input_ports.set_flags(Gtk::CAN_FOCUS);
|
||||
_limit_input_ports.set_can_focus (true);
|
||||
_limit_input_ports.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_limit_input_ports.set_mode(true);
|
||||
_limit_input_ports.set_sensitive(true);
|
||||
_limit_input_ports.set_border_width(0);
|
||||
|
||||
_input_limit_count.set_flags(Gtk::CAN_FOCUS);
|
||||
_input_limit_count.set_can_focus (true);
|
||||
_input_limit_count.set_update_policy(Gtk::UPDATE_ALWAYS);
|
||||
_input_limit_count.set_numeric(true);
|
||||
_input_limit_count.set_digits(0);
|
||||
|
@ -988,18 +988,18 @@ SessionDialog::setup_more_options_box ()
|
|||
input_frame.set_label_widget(input_label);
|
||||
|
||||
_connect_outputs.set_label (_("Automatically connect outputs"));
|
||||
_connect_outputs.set_flags(Gtk::CAN_FOCUS);
|
||||
_connect_outputs.set_can_focus (true);
|
||||
_connect_outputs.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_connect_outputs.set_mode(true);
|
||||
_connect_outputs.set_active(Config->get_output_auto_connect() != ManualConnect);
|
||||
_connect_outputs.set_border_width(0);
|
||||
_limit_output_ports.set_label (_("Use only"));
|
||||
_limit_output_ports.set_flags(Gtk::CAN_FOCUS);
|
||||
_limit_output_ports.set_can_focus (true);
|
||||
_limit_output_ports.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_limit_output_ports.set_mode(true);
|
||||
_limit_output_ports.set_sensitive(true);
|
||||
_limit_output_ports.set_border_width(0);
|
||||
_output_limit_count.set_flags(Gtk::CAN_FOCUS);
|
||||
_output_limit_count.set_can_focus (true);
|
||||
_output_limit_count.set_update_policy(Gtk::UPDATE_ALWAYS);
|
||||
_output_limit_count.set_numeric(false);
|
||||
_output_limit_count.set_digits(0);
|
||||
|
@ -1010,7 +1010,7 @@ SessionDialog::setup_more_options_box ()
|
|||
output_port_limit_hbox.pack_start(chan_count_label_4, Gtk::PACK_SHRINK, 6);
|
||||
|
||||
_connect_outputs_to_master.set_label (_("... to master bus"));
|
||||
_connect_outputs_to_master.set_flags(Gtk::CAN_FOCUS);
|
||||
_connect_outputs_to_master.set_can_focus (true);
|
||||
_connect_outputs_to_master.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_connect_outputs_to_master.set_mode(true);
|
||||
_connect_outputs_to_master.set_active(Config->get_output_auto_connect() == AutoConnectMaster);
|
||||
|
@ -1020,7 +1020,7 @@ SessionDialog::setup_more_options_box ()
|
|||
_connect_outputs_to_physical.set_group (connect_outputs_group);
|
||||
|
||||
_connect_outputs_to_physical.set_label (_("... to physical outputs"));
|
||||
_connect_outputs_to_physical.set_flags(Gtk::CAN_FOCUS);
|
||||
_connect_outputs_to_physical.set_can_focus (true);
|
||||
_connect_outputs_to_physical.set_relief(Gtk::RELIEF_NORMAL);
|
||||
_connect_outputs_to_physical.set_mode(true);
|
||||
_connect_outputs_to_physical.set_active(Config->get_output_auto_connect() == AutoConnectPhysical);
|
||||
|
|
|
@ -273,7 +273,7 @@ SessionImportDialog::show_info(const TreeModel::Path& path, TreeViewColumn*)
|
|||
void
|
||||
SessionImportDialog::end_dialog ()
|
||||
{
|
||||
hide_all();
|
||||
hide ();
|
||||
|
||||
set_modal (false);
|
||||
ok_button->set_sensitive(true);
|
||||
|
|
|
@ -605,7 +605,7 @@ template <typename DataSet>
|
|||
void
|
||||
SessionMetadataDialog<DataSet>::end_dialog ()
|
||||
{
|
||||
hide_all();
|
||||
hide ();
|
||||
}
|
||||
|
||||
template <typename DataSet>
|
||||
|
@ -806,8 +806,10 @@ SessionMetadataEditor::SessionMetadataEditor () :
|
|||
|
||||
SessionMetadataEditor::~SessionMetadataEditor ()
|
||||
{
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
// Remove pages from notebook to get rid of gsignal runtime warnings
|
||||
notebook.pages().clear();
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -837,8 +839,10 @@ SessionMetadataImporter::SessionMetadataImporter () :
|
|||
|
||||
SessionMetadataImporter::~SessionMetadataImporter ()
|
||||
{
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
// Remove pages from notebook to get rid of gsignal runtime warnings
|
||||
notebook.pages().clear();
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -672,19 +672,19 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
|
|||
label->set_text (_("Sort:"));
|
||||
passbox->pack_start (*label, false, false);
|
||||
passbox->pack_start (freesound_sort, false, false);
|
||||
freesound_sort.clear_items();
|
||||
freesound_sort.remove_all ();
|
||||
|
||||
// Order of the following must correspond with enum sortMethod
|
||||
// in sfdb_freesound_mootcher.h
|
||||
freesound_sort.append_text(_("None"));
|
||||
freesound_sort.append_text(_("Longest"));
|
||||
freesound_sort.append_text(_("Shortest"));
|
||||
freesound_sort.append_text(_("Newest"));
|
||||
freesound_sort.append_text(_("Oldest"));
|
||||
freesound_sort.append_text(_("Most downloaded"));
|
||||
freesound_sort.append_text(_("Least downloaded"));
|
||||
freesound_sort.append_text(_("Highest rated"));
|
||||
freesound_sort.append_text(_("Lowest rated"));
|
||||
freesound_sort.append(_("None"));
|
||||
freesound_sort.append(_("Longest"));
|
||||
freesound_sort.append(_("Shortest"));
|
||||
freesound_sort.append(_("Newest"));
|
||||
freesound_sort.append(_("Oldest"));
|
||||
freesound_sort.append(_("Most downloaded"));
|
||||
freesound_sort.append(_("Least downloaded"));
|
||||
freesound_sort.append(_("Highest rated"));
|
||||
freesound_sort.append(_("Lowest rated"));
|
||||
freesound_sort.set_active(0);
|
||||
|
||||
passbox->pack_start (freesound_search_btn, false, false);
|
||||
|
@ -878,7 +878,7 @@ SoundFileBrowser::stop_metering ()
|
|||
void
|
||||
SoundFileBrowser::meter ()
|
||||
{
|
||||
if (is_mapped () && _session && gm) {
|
||||
if (get_mapped () && _session && gm) {
|
||||
gm->update_meters ();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ ShuttleControl::ShuttleControl ()
|
|||
shuttle_context_menu = 0;
|
||||
_hovering = false;
|
||||
|
||||
set_flags (CAN_FOCUS);
|
||||
set_can_focus (true);
|
||||
add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
|
||||
set_size_request (85, 20);
|
||||
set_name (X_("ShuttleControl"));
|
||||
|
|
|
@ -206,7 +206,7 @@ Splash::idle_after_expose ()
|
|||
void
|
||||
Splash::display ()
|
||||
{
|
||||
bool was_mapped = is_mapped ();
|
||||
bool was_mapped = get_mapped ();
|
||||
|
||||
if (!was_mapped) {
|
||||
expose_done = false;
|
||||
|
|
|
@ -441,7 +441,7 @@ StepEntry::StepEntry (StepEditor& seditor)
|
|||
_piano = (PianoKeyboard*) piano_keyboard_new ();
|
||||
piano = wrap ((GtkWidget*) _piano);
|
||||
|
||||
piano->set_flags (Gtk::CAN_FOCUS);
|
||||
piano->set_can_focus (true);
|
||||
|
||||
g_signal_connect(G_OBJECT(_piano), "note-off", G_CALLBACK(_note_off_event_handler), this);
|
||||
g_signal_connect(G_OBJECT(_piano), "rest", G_CALLBACK(_rest_event_handler), this);
|
||||
|
|
|
@ -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 (§ion)
|
||||
, 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);
|
||||
|
|
|
@ -112,8 +112,10 @@ ThemeManager::ThemeManager()
|
|||
|
||||
show_all ();
|
||||
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
waveform_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
|
||||
timeline_item_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
|
||||
#endif
|
||||
|
||||
set_ui_to_state();
|
||||
|
||||
|
|
|
@ -150,8 +150,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||
{
|
||||
std::auto_ptr<Gtk::Entry> an_entry (new Gtkmm2ext::FocusEntry);
|
||||
an_entry->set_name (X_("TrackNameEditor"));
|
||||
Gtk::Requisition req;
|
||||
an_entry->size_request (req);
|
||||
Gtk::Requisition req = an_entry->size_request ();
|
||||
|
||||
name_label.set_size_request (-1, req.height);
|
||||
name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
|
||||
|
@ -188,7 +187,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||
Gdk::ENTER_NOTIFY_MASK|
|
||||
Gdk::LEAVE_NOTIFY_MASK|
|
||||
Gdk::SCROLL_MASK);
|
||||
controls_ebox.set_flags (CAN_FOCUS);
|
||||
controls_ebox.set_can_focus (true);
|
||||
|
||||
/* note that this handler connects *before* the default handler */
|
||||
controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,25 +167,25 @@ 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);
|
||||
|
||||
if (ffok) {
|
||||
video_combo.append_text(_("Reference from Current Location (Previously Transcoded Files Only)"));
|
||||
video_combo.append_text(_("Import/Transcode Video to Session"));
|
||||
video_combo.append(_("Reference from Current Location (Previously Transcoded Files Only)"));
|
||||
video_combo.append(_("Import/Transcode Video to Session"));
|
||||
video_combo.set_active(1);
|
||||
if (as.size() > 0) {
|
||||
video_combo.append_text(_("Do Not Import Video (Audio Import Only)"));
|
||||
video_combo.append(_("Do Not Import Video (Audio Import Only)"));
|
||||
audio_combo.set_sensitive(true);
|
||||
} else {
|
||||
audio_combo.set_sensitive(false);
|
||||
|
@ -195,7 +195,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
|
|||
path_entry.set_sensitive (true);
|
||||
browse_button.set_sensitive (true);
|
||||
} else if (as.size() > 0) {
|
||||
video_combo.append_text(_("Do Not Import Video (Audio Import Only)"));
|
||||
video_combo.append(_("Do Not Import Video (Audio Import Only)"));
|
||||
video_combo.set_active(0);
|
||||
path_entry.set_text ("");
|
||||
|
||||
|
@ -205,7 +205,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
|
|||
path_entry.set_sensitive (false);
|
||||
browse_button.set_sensitive (false);
|
||||
} else {
|
||||
video_combo.append_text(_("Do Not Import Video"));
|
||||
video_combo.append(_("Do Not Import Video"));
|
||||
video_combo.set_active(0);
|
||||
path_entry.set_text ("");
|
||||
video_combo.set_sensitive(false);
|
||||
|
@ -221,43 +221,43 @@ 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);
|
||||
t->attach (height_spinner, 3, 4, 0, 1);
|
||||
|
||||
scale_combo.append_text(_("Original Width"));
|
||||
if (w > 1920) { scale_combo.append_text("1920 (hd1080)"); }
|
||||
if (w > 1408) { scale_combo.append_text("1408 (16cif)"); }
|
||||
if (w > 1280) { scale_combo.append_text("1280 (sxga, hd720)"); }
|
||||
if (w > 1024) { scale_combo.append_text("1024 (xga)"); }
|
||||
if (w > 852) { scale_combo.append_text(" 852 (hd480)"); }
|
||||
if (w > 768) { scale_combo.append_text(" 768 (PAL)"); }
|
||||
if (w > 720) { scale_combo.append_text(" 720 (PAL)"); }
|
||||
if (w > 640) { scale_combo.append_text(" 640 (vga, ega)"); }
|
||||
if (w > 352) { scale_combo.append_text(" 352 (cif)"); }
|
||||
if (w > 320) { scale_combo.append_text(" 320 (cga, qvga)"); }
|
||||
if (w > 176) { scale_combo.append_text(" 176 (qcif)"); }
|
||||
scale_combo.append(_("Original Width"));
|
||||
if (w > 1920) { scale_combo.append("1920 (hd1080)"); }
|
||||
if (w > 1408) { scale_combo.append("1408 (16cif)"); }
|
||||
if (w > 1280) { scale_combo.append("1280 (sxga, hd720)"); }
|
||||
if (w > 1024) { scale_combo.append("1024 (xga)"); }
|
||||
if (w > 852) { scale_combo.append(" 852 (hd480)"); }
|
||||
if (w > 768) { scale_combo.append(" 768 (PAL)"); }
|
||||
if (w > 720) { scale_combo.append(" 720 (PAL)"); }
|
||||
if (w > 640) { scale_combo.append(" 640 (vga, ega)"); }
|
||||
if (w > 352) { scale_combo.append(" 352 (cif)"); }
|
||||
if (w > 320) { scale_combo.append(" 320 (cga, qvga)"); }
|
||||
if (w > 176) { scale_combo.append(" 176 (qcif)"); }
|
||||
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);
|
||||
if (as.size() == 0) {
|
||||
audio_combo.append_text(_("No Audio Track Present"));
|
||||
audio_combo.append(_("No Audio Track Present"));
|
||||
audio_combo.set_sensitive(false);
|
||||
} else {
|
||||
audio_combo.append_text(_("Do Not Extract Audio"));
|
||||
audio_combo.append(_("Do Not Extract Audio"));
|
||||
for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
|
||||
audio_combo.append_text((*it).name);
|
||||
audio_combo.append((*it).name);
|
||||
}
|
||||
}
|
||||
audio_combo.set_active(0);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -459,13 +459,13 @@ VCAMasterStrip::start_color_edit ()
|
|||
{
|
||||
Gtk::ColorSelectionDialog* color_dialog = new Gtk::ColorSelectionDialog;
|
||||
|
||||
color_dialog->get_colorsel()->set_has_opacity_control (false);
|
||||
color_dialog->get_colorsel()->set_has_palette (true);
|
||||
color_dialog->get_color_selection()->set_has_opacity_control (false);
|
||||
color_dialog->get_color_selection()->set_has_palette (true);
|
||||
|
||||
Gdk::Color c = gdk_color_from_rgba (_vca->presentation_info().color ());
|
||||
|
||||
color_dialog->get_colorsel()->set_previous_color (c);
|
||||
color_dialog->get_colorsel()->set_current_color (c);
|
||||
color_dialog->get_color_selection()->set_previous_color (c);
|
||||
color_dialog->get_color_selection()->set_current_color (c);
|
||||
|
||||
color_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &VCAMasterStrip::finish_color_edit), color_dialog));
|
||||
color_dialog->present ();
|
||||
|
@ -476,7 +476,7 @@ VCAMasterStrip::finish_color_edit (int response, Gtk::ColorSelectionDialog* dial
|
|||
{
|
||||
switch (response) {
|
||||
case RESPONSE_OK:
|
||||
_vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_colorsel()->get_current_color()));
|
||||
_vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_color_selection()->get_current_color()));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -48,13 +48,13 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
|
|||
solo_button.set_name ("solo button");
|
||||
set_tooltip (solo_button, _("Solo slaves"));
|
||||
solo_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCATimeAxisView::solo_release), false);
|
||||
mute_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
mute_button.set_can_focus (false);
|
||||
|
||||
mute_button.set_name ("mute button");
|
||||
mute_button.set_text (_("M"));
|
||||
set_tooltip (mute_button, _("Mute slaves"));
|
||||
mute_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCATimeAxisView::mute_release), false);
|
||||
solo_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
solo_button.set_can_focus (false);
|
||||
|
||||
drop_button.set_name ("mute button");
|
||||
drop_button.set_text (_("D"));
|
||||
|
|
|
@ -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)
|
||||
|
@ -80,9 +80,9 @@ VideoServerDialog::VideoServerDialog (Session* s)
|
|||
|
||||
#ifndef __APPLE__
|
||||
/* Note: on OSX icsd is not able to bind to IPv4 localhost */
|
||||
listenaddr_combo.append_text("127.0.0.1");
|
||||
listenaddr_combo.append("127.0.0.1");
|
||||
#endif
|
||||
listenaddr_combo.append_text("0.0.0.0");
|
||||
listenaddr_combo.append("0.0.0.0");
|
||||
listenaddr_combo.set_active(0);
|
||||
|
||||
std::string harvid_exe;
|
||||
|
@ -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);
|
||||
|
|
|
@ -91,11 +91,9 @@ Widget::compute_bounding_box () const
|
|||
{
|
||||
std::cerr << "cbbox for widget\n";
|
||||
|
||||
GtkRequisition req = { 0, 0 };
|
||||
GtkRequisition req = _widget.size_request ();
|
||||
Gtk::Allocation alloc;
|
||||
|
||||
_widget.size_request (req);
|
||||
|
||||
std::cerr << "widget wants " << req.width << " x " << req.height << "\n";
|
||||
|
||||
_bounding_box = Rect (0, 0, req.width, req.height);
|
||||
|
|
|
@ -373,7 +373,7 @@ KeyboardKey::make_key (const string& str, KeyboardKey& k)
|
|||
guint keyval;
|
||||
keyval = gdk_keyval_from_name (actual.c_str());
|
||||
|
||||
if (keyval == GDK_VoidSymbol || keyval == 0) {
|
||||
if (keyval == GDK_KEY_VoidSymbol || keyval == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -213,7 +213,7 @@ CairoEditableText::CairoEditableText (boost::shared_ptr<CairoFontDescription> fo
|
|||
|
||||
add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK |
|
||||
Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK);
|
||||
set_flags (Gtk::CAN_FOCUS);
|
||||
set_can_focus ();
|
||||
|
||||
set_can_default (true);
|
||||
}
|
||||
|
|
|
@ -764,12 +764,22 @@ UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
|
|||
ColorSelectionDialog color_dialog (prompt);
|
||||
|
||||
color_dialog.set_modal (true);
|
||||
color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), false));
|
||||
color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), true));
|
||||
color_dialog.signal_delete_event().connect (mem_fun (*this, &UI::color_selection_deleted));
|
||||
|
||||
Gtk::Button* ok_button = dynamic_cast<Gtk::Button*>(
|
||||
color_dialog.get_widget_for_response(RESPONSE_OK));
|
||||
ok_button->signal_clicked().connect(
|
||||
bind(mem_fun(*this, &UI::color_selection_done), true));
|
||||
|
||||
Gtk::Button* cancel_button = dynamic_cast<Gtk::Button*>(
|
||||
color_dialog.get_widget_for_response(RESPONSE_CANCEL));
|
||||
cancel_button->signal_clicked().connect(
|
||||
bind(mem_fun(*this, &UI::color_selection_done), false));
|
||||
|
||||
color_dialog.signal_delete_event().connect(
|
||||
mem_fun(*this, &UI::color_selection_deleted));
|
||||
|
||||
if (initial) {
|
||||
color_dialog.get_colorsel()->set_current_color (*initial);
|
||||
color_dialog.get_color_selection()->set_current_color (*initial);
|
||||
}
|
||||
|
||||
color_dialog.show_all ();
|
||||
|
@ -778,10 +788,10 @@ UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
|
|||
|
||||
Main::run();
|
||||
|
||||
color_dialog.hide_all ();
|
||||
color_dialog.hide ();
|
||||
|
||||
if (color_picked) {
|
||||
Gdk::Color f_rgba = color_dialog.get_colorsel()->get_current_color ();
|
||||
Gdk::Color f_rgba = color_dialog.get_color_selection()->get_current_color ();
|
||||
color.set_red(f_rgba.get_red());
|
||||
color.set_green(f_rgba.get_green());
|
||||
color.set_blue(f_rgba.get_blue());
|
||||
|
|
|
@ -306,7 +306,7 @@ keyval_keypad_nonkeypad_equivalent (guint keyval)
|
|||
break;
|
||||
}
|
||||
|
||||
return GDK_VoidSymbol;
|
||||
return GDK_KEY_VoidSymbol;
|
||||
}
|
||||
|
||||
static const gchar*
|
||||
|
@ -830,7 +830,7 @@ cocoa_menu_item_update_accelerator (NSMenuItem *cocoa_item,
|
|||
guint actual_key = key->accel_key;
|
||||
|
||||
if (keyval_is_keypad (actual_key)) {
|
||||
if ((actual_key = keyval_keypad_nonkeypad_equivalent (actual_key)) == GDK_VoidSymbol) {
|
||||
if ((actual_key = keyval_keypad_nonkeypad_equivalent (actual_key)) == GDK_KEY_VoidSymbol) {
|
||||
/* GDK_KP_Separator */
|
||||
[cocoa_item setKeyEquivalent:@""];
|
||||
return;
|
||||
|
|
|
@ -25,7 +25,7 @@ class LIBGTKMM2EXT_API KeyboardKey
|
|||
{
|
||||
public:
|
||||
KeyboardKey () {
|
||||
_val = GDK_VoidSymbol;
|
||||
_val = GDK_KEY_VoidSymbol;
|
||||
}
|
||||
|
||||
KeyboardKey (uint32_t state, uint32_t keycode);
|
||||
|
|
|
@ -35,9 +35,6 @@
|
|||
|
||||
#include <gtkmm/widget.h>
|
||||
#include <gtkmm/style.h>
|
||||
#ifndef GTK_NEW_TOOLTIP_API
|
||||
#include <gtkmm/tooltips.h>
|
||||
#endif
|
||||
#include <gtkmm/textbuffer.h>
|
||||
#include <gtkmm/main.h>
|
||||
#include <gdkmm/color.h>
|
||||
|
@ -183,9 +180,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI<UIRequest>
|
|||
|
||||
bool _active;
|
||||
Gtk::Main *theMain;
|
||||
#ifndef GTK_NEW_TOOLTIP_API
|
||||
Gtk::Tooltips *tips;
|
||||
#endif
|
||||
|
||||
TextViewer *errors;
|
||||
Glib::RefPtr<Gtk::TextBuffer::Tag> error_ptag;
|
||||
Glib::RefPtr<Gtk::TextBuffer::Tag> error_mtag;
|
||||
|
|
|
@ -258,11 +258,11 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
|
|||
)
|
||||
);
|
||||
|
||||
if (event->keyval == GDK_Shift_R) {
|
||||
keyval = GDK_Shift_L;
|
||||
if (event->keyval == GDK_KEY_Shift_R) {
|
||||
keyval = GDK_KEY_Shift_L;
|
||||
|
||||
} else if (event->keyval == GDK_Control_R) {
|
||||
keyval = GDK_Control_L;
|
||||
} else if (event->keyval == GDK_KEY_Control_R) {
|
||||
keyval = GDK_KEY_Control_L;
|
||||
|
||||
} else {
|
||||
keyval = event->keyval;
|
||||
|
@ -342,7 +342,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
|
|||
*/
|
||||
|
||||
switch (event->keyval) {
|
||||
case GDK_w:
|
||||
case GDK_KEY_w:
|
||||
close_current_dialog ();
|
||||
ret = true;
|
||||
break;
|
||||
|
|
|
@ -93,9 +93,7 @@ Pane::on_size_request (GtkRequisition* req)
|
|||
}
|
||||
|
||||
for (Children::iterator child = children.begin(); child != children.end(); ++child) {
|
||||
GtkRequisition r;
|
||||
|
||||
child->w->size_request (r);
|
||||
GtkRequisition r = child->w->size_request ();
|
||||
|
||||
if (horizontal) {
|
||||
largest.height = max (largest.height, r.height);
|
||||
|
@ -230,7 +228,7 @@ Pane::reallocate (Gtk::Allocation const & alloc)
|
|||
/* skip initial hidden children */
|
||||
|
||||
while (child != children.end()) {
|
||||
if (child->w->is_visible()) {
|
||||
if (child->w->get_visible()) {
|
||||
break;
|
||||
}
|
||||
++child;
|
||||
|
@ -245,7 +243,7 @@ Pane::reallocate (Gtk::Allocation const & alloc)
|
|||
/* Move on to next *visible* child */
|
||||
|
||||
while (++next != children.end()) {
|
||||
if (next->w->is_visible()) {
|
||||
if (next->w->get_visible()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -261,9 +259,6 @@ Pane::reallocate (Gtk::Allocation const & alloc)
|
|||
fract = (*div)->fract;
|
||||
}
|
||||
|
||||
Gtk::Requisition cr;
|
||||
child->w->size_request (cr);
|
||||
|
||||
if (horizontal) {
|
||||
child_alloc.set_width ((gint) floor (remaining * fract));
|
||||
child_alloc.set_height (alloc.get_height());
|
||||
|
@ -333,12 +328,12 @@ Pane::on_expose_event (GdkEventExpose* ev)
|
|||
|
||||
for (child = children.begin(), div = dividers.begin(); child != children.end(); ++child) {
|
||||
|
||||
if (child->w->is_visible()) {
|
||||
if (child->w->get_visible()) {
|
||||
propagate_expose (*(child->w), ev);
|
||||
}
|
||||
|
||||
if (div != dividers.end()) {
|
||||
if ((*div)->is_visible()) {
|
||||
if ((*div)->get_visible()) {
|
||||
propagate_expose (**div, ev);
|
||||
}
|
||||
++div;
|
||||
|
|
|
@ -50,7 +50,7 @@ PathsDialog::PathsDialog (Gtk::Window& parent, std::string title, std::string cu
|
|||
|
||||
std::vector <std::string> a = PBD::parse_path(current_paths);
|
||||
for(vector<std::string>::const_iterator i = a.begin(); i != a.end(); ++i) {
|
||||
paths_list_view.append_text(*i);
|
||||
paths_list_view.append(*i);
|
||||
}
|
||||
|
||||
paths_list_view.get_selection()->signal_changed().connect (mem_fun (*this, &PathsDialog::selection_changed));
|
||||
|
@ -127,7 +127,7 @@ PathsDialog::add_path() {
|
|||
}
|
||||
}
|
||||
if (!dup) {
|
||||
paths_list_view.prepend_text(dir);
|
||||
paths_list_view.prepend(dir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -159,6 +159,6 @@ PathsDialog::set_default() {
|
|||
paths_list_view.clear_items();
|
||||
std::vector <std::string> a = PBD::parse_path(_default_paths);
|
||||
for(vector<std::string>::const_iterator i = a.begin(); i != a.end(); ++i) {
|
||||
paths_list_view.append_text(*i);
|
||||
paths_list_view.append(*i);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -146,7 +146,7 @@ PersistentTooltip::show ()
|
|||
|
||||
set_tip (_tip);
|
||||
|
||||
if (!_window->is_visible ()) {
|
||||
if (!_window->get_visible ()) {
|
||||
int rx, ry;
|
||||
int sw = gdk_screen_width ();
|
||||
|
||||
|
|
|
@ -369,7 +369,7 @@ PixFader::on_size_allocate (Gtk::Allocation& alloc)
|
|||
_span = alloc.get_width ();
|
||||
}
|
||||
|
||||
if (is_realized() && ((old_girth != _girth) || (old_span != _span))) {
|
||||
if (get_realized() && ((old_girth != _girth) || (old_span != _span))) {
|
||||
/* recreate patterns in case we've changed size */
|
||||
create_patterns ();
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ PopUp::touch ()
|
|||
{
|
||||
ENSURE_GUI_THREAD (mem_fun (*this, &PopUp::touch));
|
||||
|
||||
if (is_visible ()) {
|
||||
if (get_visible ()) {
|
||||
remove ();
|
||||
} else {
|
||||
set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10);
|
||||
|
|
|
@ -63,7 +63,7 @@ Selector::~Selector ()
|
|||
|
||||
{
|
||||
/* ensure that any row data set with set_row_data_full() is deleted */
|
||||
hide_all ();
|
||||
hide ();
|
||||
lstore.clear ();
|
||||
}
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ Tabbable::window_visible () const
|
|||
return false;
|
||||
}
|
||||
|
||||
return _window->is_visible();
|
||||
return _window->get_visible();
|
||||
}
|
||||
|
||||
Window*
|
||||
|
|
|
@ -311,7 +311,7 @@ TearOff::set_state (const XMLNode& node)
|
|||
sscanf (prop->value().c_str(), "%d", &own_window_ypos);
|
||||
}
|
||||
|
||||
if (own_window.is_realized()) {
|
||||
if (own_window.get_realized()) {
|
||||
own_window.set_default_size (own_window_width, own_window_height);
|
||||
own_window.move (own_window_xpos, own_window_ypos);
|
||||
}
|
||||
|
|
|
@ -436,7 +436,7 @@ Gtkmm2ext::set_popdown_strings (Gtk::ComboBoxText& cr, const vector<string>& str
|
|||
cr.clear ();
|
||||
|
||||
for (i = strings.begin(); i != strings.end(); ++i) {
|
||||
cr.append_text (*i);
|
||||
cr.append (*i);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -517,43 +517,43 @@ Gtkmm2ext::detach_menu (Gtk::Menu& menu)
|
|||
bool
|
||||
Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval)
|
||||
{
|
||||
int fakekey = GDK_VoidSymbol;
|
||||
int fakekey = GDK_KEY_VoidSymbol;
|
||||
|
||||
switch (keyval) {
|
||||
case GDK_Tab:
|
||||
case GDK_ISO_Left_Tab:
|
||||
fakekey = GDK_nabla;
|
||||
case GDK_KEY_Tab:
|
||||
case GDK_KEY_ISO_Left_Tab:
|
||||
fakekey = GDK_KEY_nabla;
|
||||
break;
|
||||
|
||||
case GDK_Up:
|
||||
fakekey = GDK_uparrow;
|
||||
case GDK_KEY_Up:
|
||||
fakekey = GDK_KEY_uparrow;
|
||||
break;
|
||||
|
||||
case GDK_Down:
|
||||
fakekey = GDK_downarrow;
|
||||
case GDK_KEY_Down:
|
||||
fakekey = GDK_KEY_downarrow;
|
||||
break;
|
||||
|
||||
case GDK_Right:
|
||||
fakekey = GDK_rightarrow;
|
||||
case GDK_KEY_Right:
|
||||
fakekey = GDK_KEY_rightarrow;
|
||||
break;
|
||||
|
||||
case GDK_Left:
|
||||
fakekey = GDK_leftarrow;
|
||||
case GDK_KEY_Left:
|
||||
fakekey = GDK_KEY_leftarrow;
|
||||
break;
|
||||
|
||||
case GDK_Return:
|
||||
fakekey = GDK_3270_Enter;
|
||||
case GDK_KEY_Return:
|
||||
fakekey = GDK_KEY_3270_Enter;
|
||||
break;
|
||||
|
||||
case GDK_KP_Enter:
|
||||
fakekey = GDK_F35;
|
||||
case GDK_KEY_KP_Enter:
|
||||
fakekey = GDK_KEY_F35;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (fakekey != GDK_VoidSymbol) {
|
||||
if (fakekey != GDK_KEY_VoidSymbol) {
|
||||
keyval = fakekey;
|
||||
return true;
|
||||
}
|
||||
|
@ -565,31 +565,31 @@ uint32_t
|
|||
Gtkmm2ext::possibly_translate_legal_accelerator_to_real_key (uint32_t keyval)
|
||||
{
|
||||
switch (keyval) {
|
||||
case GDK_nabla:
|
||||
return GDK_Tab;
|
||||
case GDK_KEY_nabla:
|
||||
return GDK_KEY_Tab;
|
||||
break;
|
||||
|
||||
case GDK_uparrow:
|
||||
return GDK_Up;
|
||||
case GDK_KEY_uparrow:
|
||||
return GDK_KEY_Up;
|
||||
break;
|
||||
|
||||
case GDK_downarrow:
|
||||
return GDK_Down;
|
||||
case GDK_KEY_downarrow:
|
||||
return GDK_KEY_Down;
|
||||
break;
|
||||
|
||||
case GDK_rightarrow:
|
||||
return GDK_Right;
|
||||
case GDK_KEY_rightarrow:
|
||||
return GDK_KEY_Right;
|
||||
break;
|
||||
|
||||
case GDK_leftarrow:
|
||||
return GDK_Left;
|
||||
case GDK_KEY_leftarrow:
|
||||
return GDK_KEY_Left;
|
||||
break;
|
||||
|
||||
case GDK_3270_Enter:
|
||||
return GDK_Return;
|
||||
case GDK_KEY_3270_Enter:
|
||||
return GDK_KEY_Return;
|
||||
|
||||
case GDK_F35:
|
||||
return GDK_KP_Enter;
|
||||
case GDK_KEY_F35:
|
||||
return GDK_KEY_KP_Enter;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -60,28 +60,25 @@ bool
|
|||
VisibilityTracker::fully_visible () const
|
||||
{
|
||||
if (_use_window_manager_visibility) {
|
||||
return _window.is_mapped() && (_visibility == GDK_VISIBILITY_UNOBSCURED);
|
||||
} else {
|
||||
return _window.is_mapped();
|
||||
return _window.get_mapped() && (_visibility == GDK_VISIBILITY_UNOBSCURED);
|
||||
}
|
||||
return _window.get_mapped();
|
||||
}
|
||||
|
||||
bool
|
||||
VisibilityTracker::not_visible () const
|
||||
{
|
||||
if (_use_window_manager_visibility) {
|
||||
return !_window.is_mapped() || (_visibility == GDK_VISIBILITY_FULLY_OBSCURED);
|
||||
} else {
|
||||
return !_window.is_mapped();
|
||||
return !_window.get_mapped() || (_visibility == GDK_VISIBILITY_FULLY_OBSCURED);
|
||||
}
|
||||
return !_window.get_mapped();
|
||||
}
|
||||
|
||||
bool
|
||||
VisibilityTracker::partially_visible () const
|
||||
{
|
||||
if (_use_window_manager_visibility) {
|
||||
return _window.is_mapped() && ((_visibility == GDK_VISIBILITY_PARTIAL) || (_visibility == GDK_VISIBILITY_UNOBSCURED));
|
||||
} else {
|
||||
return _window.is_mapped();
|
||||
return _window.get_mapped() && ((_visibility == GDK_VISIBILITY_PARTIAL) || (_visibility == GDK_VISIBILITY_UNOBSCURED));
|
||||
}
|
||||
return _window.get_mapped();
|
||||
}
|
||||
|
|
|
@ -153,13 +153,13 @@ WindowProxy::toggle()
|
|||
/* we'd like to just call this and nothing else */
|
||||
_window->present ();
|
||||
} else {
|
||||
if (_window->is_mapped()) {
|
||||
if (_window->get_mapped()) {
|
||||
save_pos_and_size();
|
||||
}
|
||||
|
||||
vistracker->cycle_visibility ();
|
||||
|
||||
if (_window->is_mapped()) {
|
||||
if (_window->get_mapped()) {
|
||||
if (_width != -1 && _height != -1) {
|
||||
_window->set_default_size (_width, _height);
|
||||
}
|
||||
|
|
|
@ -148,7 +148,9 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
|
|||
backlight_button.signal_clicked().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::toggle_backlight));
|
||||
|
||||
touch_sensitivity_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::touch_sensitive_change));
|
||||
#ifndef GTKMM_DISABLE_DEPRECATED
|
||||
touch_sensitivity_scale.set_update_policy (Gtk::UPDATE_DISCONTINUOUS);
|
||||
#endif
|
||||
|
||||
l = manage (new Gtk::Label (_("Button click")));
|
||||
l->set_alignment (1.0, 0.5);
|
||||
|
|
6
wscript
6
wscript
|
@ -778,7 +778,8 @@ def options(opt):
|
|||
'--qm-dsp-include', type='string', action='store',
|
||||
dest='qm_dsp_include', default='/usr/include/qm-dsp',
|
||||
help='directory where the header files of qm-dsp can be found')
|
||||
|
||||
opt.add_option('--gtk-disable-deprecated', action='store_true', default=False, dest='gtk_disable_deprecated',
|
||||
help='Enable GTK/MM_DISABLE_DEPRECATED')
|
||||
for i in children:
|
||||
opt.recurse(i)
|
||||
|
||||
|
@ -1005,6 +1006,9 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
|
|||
if have_rf64_riff_support:
|
||||
conf.env.append_value('CXXFLAGS', "-DHAVE_RF64_RIFF")
|
||||
conf.env.append_value('CFLAGS', "-DHAVE_RF64_RIFF")
|
||||
|
||||
if Options.options.gtk_disable_deprecated:
|
||||
conf.env.append_value('CXXFLAGS', '-DGTKMM_DISABLE_DEPRECATED')
|
||||
|
||||
if Options.options.dist_target == 'mingw':
|
||||
Options.options.fpu_optimization = True
|
||||
|
|
Loading…
Reference in New Issue