nothing much.. a few more image from pixmaps
git-svn-id: svn://localhost/trunk/ardour2@75 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
32fc1cf901
commit
7b8d7f464f
|
@ -145,8 +145,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
|
|||
ignore_speed_adjustment = false;
|
||||
comment_window = 0;
|
||||
|
||||
width_button.add (*(manage (new Gtk::Image (lr_xpm))));
|
||||
hide_button.add (*(manage (new Gtk::Image (small_x_xpm))));
|
||||
width_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(lr_xpm)))));
|
||||
hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm)))));
|
||||
|
||||
|
||||
input_label.set_text (_("INPUT"));
|
||||
|
@ -176,7 +176,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
|
|||
ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
|
||||
ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type"));
|
||||
|
||||
hide_button.set_events (hide_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
|
||||
hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
|
||||
|
||||
width_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
hide_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
|
@ -248,7 +248,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
|
|||
|
||||
at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
|
||||
|
||||
speed_adjustment.value_changed.connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed));
|
||||
speed_adjustment.signal_value_changed().connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed));
|
||||
|
||||
speed_frame.set_name ("BaseFrame");
|
||||
speed_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
|
@ -1154,9 +1154,9 @@ MixerStrip::comment_changed (void *src)
|
|||
if (src != this) {
|
||||
ignore_comment_edit = true;
|
||||
comment_area.freeze ();
|
||||
comment_area.delete_text (0, -1);
|
||||
comment_area.set_point (0);
|
||||
comment_area.insert (_route.comment());
|
||||
//comment_area.get_buffer()->delete_text (0, -1);
|
||||
//comment_area.set_point (0);
|
||||
comment_area.get_buffer()->set_text (_route.comment());
|
||||
comment_area.thaw ();
|
||||
ignore_comment_edit = false;
|
||||
}
|
||||
|
@ -1168,7 +1168,7 @@ MixerStrip::comment_edited ()
|
|||
ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::comment_edited));
|
||||
|
||||
if (!ignore_comment_edit) {
|
||||
string str = comment_area.get_chars(0,-1);
|
||||
string str = comment_area.get_buffer()->get_text();
|
||||
_route.set_comment (str, this);
|
||||
ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
|
||||
str.empty() ? _("click to add/edit comments") : str);
|
||||
|
@ -1256,13 +1256,13 @@ MixerStrip::route_gui_changed (string what_changed, void* ignored)
|
|||
void
|
||||
MixerStrip::show_route_color ()
|
||||
{
|
||||
Gtk::Style *style;
|
||||
Glib::RefPtr<Gtk::Style> style;
|
||||
|
||||
name_button.ensure_style ();
|
||||
style = name_button.get_style()->copy();
|
||||
style->set_bg (Gtk::STATE_NORMAL, color());
|
||||
name_button.set_style (*style);
|
||||
style->unref();
|
||||
name_button.set_style (style);
|
||||
style->unrefernce();
|
||||
|
||||
route_active_changed ();
|
||||
}
|
||||
|
|
|
@ -833,9 +833,6 @@ OptionEditor::setup_sync_options ()
|
|||
slave_type_label->set_name("OptionsLabel");
|
||||
positional_sync_strings = internationalize (psync_strings);
|
||||
|
||||
slave_type_combo.set_use_arrows_always (true);
|
||||
slave_type_combo.set_value_in_list (true, false);
|
||||
slave_type_combo.set_editable (false);
|
||||
slave_type_combo.set_name ("OptionsEntry");
|
||||
slave_type_combo.signal_unmap_event().connect (mem_fun(*this, &OptionEditor::slave_type_chosen));
|
||||
|
||||
|
@ -1662,7 +1659,7 @@ OptionEditor::setup_misc_options()
|
|||
connect_box->pack_start (*useless_box, false, false);
|
||||
connect_box->pack_start (auto_connect_output_master_button, false, false);
|
||||
connect_box->pack_start (auto_connect_output_physical_button, false, false);
|
||||
connect_box->pack_start (auto_connect_output_manual_button, false);
|
||||
connect_box->pack_start (auto_connect_output_manual_button, false, false);
|
||||
|
||||
misc_packer.pack_start (*connect_box, false, false);
|
||||
|
||||
|
|
|
@ -85,8 +85,8 @@ static const gchar * revdblarrow_xpm[] = {
|
|||
PannerUI::PannerUI (IO& io, Session& s)
|
||||
: _io (io),
|
||||
_session (s),
|
||||
panning_up_arrow (GTK_ARROW_UP, Gtk::SHADOW_OUT),
|
||||
panning_down_arrow (GTK_ARROW_DOWN, Gtk::SHADOW_OUT),
|
||||
panning_up_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT),
|
||||
panning_down_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT),
|
||||
panning_link_button (_("link"))
|
||||
|
||||
{
|
||||
|
@ -114,7 +114,7 @@ PannerUI::PannerUI (IO& io, Session& s)
|
|||
we need a pixmap in the button just to get started.
|
||||
*/
|
||||
|
||||
panning_link_direction_button.add (*(manage (new Image (forwdblarrow_xpm))));
|
||||
panning_link_direction_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(forwdblarrow_xpm)))));
|
||||
|
||||
panning_link_direction_button.signal_clicked().connect
|
||||
(mem_fun(*this, &PannerUI::panning_link_direction_clicked));
|
||||
|
@ -199,10 +199,10 @@ PannerUI::update_pan_linkage ()
|
|||
|
||||
switch (_io.panner().link_direction()) {
|
||||
case Panner::SameDirection:
|
||||
static_cast<Pixmap*> (panning_link_direction_button.get_child())->set (forwdblarrow_xpm);
|
||||
static_cast<Gdk::Pixmap*> (panning_link_direction_button.get_child())->set (forwdblarrow_xpm);
|
||||
break;
|
||||
default:
|
||||
static_cast<Pixmap*> (panning_link_direction_button.get_child())->set (revdblarrow_xpm);
|
||||
static_cast<Gdk::Pixmap*> (panning_link_direction_button.get_child())->set (revdblarrow_xpm);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -473,8 +473,8 @@ PluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, MIDI::Contr
|
|||
|
||||
if (defaults && defaults->count > 0) {
|
||||
|
||||
control_ui->combo = new Gtk::Combo;
|
||||
control_ui->combo->set_value_in_list(true, false);
|
||||
control_ui->combo = new Gtk::ComboBoxText;
|
||||
//control_ui->combo->set_value_in_list(true, false);
|
||||
set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
|
||||
control_ui->combo->signal_unmap_event().connect( mem_fun(*this, &PluginUI::control_combo_changed), control_ui);
|
||||
plugin.ParameterChanged.connect (bind (mem_fun(*this, &PluginUI::parameter_changed), control_ui));
|
||||
|
@ -869,9 +869,7 @@ PlugUIBase::PlugUIBase (PluginInsert& pi)
|
|||
save_button(_("save")),
|
||||
bypass_button (_("bypass"))
|
||||
{
|
||||
combo.set_value_in_list(true,true);
|
||||
combo.set_use_arrows(true);
|
||||
combo.set_use_arrows_always(true);
|
||||
//combo.set_use_arrows_always(true);
|
||||
set_popdown_strings (combo, plugin.get_presets());
|
||||
combo.set_active_text ("");
|
||||
combo.signal_unmap_event().connect(mem_fun(*this, &PlugUIBase::setting_selected));
|
||||
|
|
Loading…
Reference in New Issue
Block a user