allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

use thorsten's new record button icons; fix history rebuild error caused by using an unregistered object type

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1106 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2006-11-11 15:41:33 +00:00
parent 55b143d013
commit 600f625dfe
5 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gtk2_ardour/icons/record_normal_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 489 B

BIN
gtk2_ardour/icons/record_tape_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 613 B

4
gtk2_ardour/region_gain_line.cc
View File

@@ -62,7 +62,7 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
model_representation (cp, mr);
trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
XMLNode &before = get_state();
XMLNode &before = alist.get_state();
if (!rv.audio_region()->envelope_active()) {
XMLNode &region_before = rv.audio_region()->get_state();
@@ -73,7 +73,7 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
alist.erase (mr.start, mr.end);
trackview.editor.current_session()->add_command (new MementoCommand<AudioRegionGainLine>(*this, &before, &get_state()));
trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
trackview.editor.current_session()->commit_reversible_command ();
trackview.editor.current_session()->set_dirty ();
}

26
gtk2_ardour/route_time_axis.cc
View File

@@ -129,6 +129,20 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
if (is_track()) {
/* use icon */
rec_enable_button->remove ();
switch (track()->mode()) {
case ARDOUR::Normal:
rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
break;
case ARDOUR::Destructive:
rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
break;
}
rec_enable_button->show_all ();
rec_enable_button->set_name ("TrackRecordEnableButton");
rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
@@ -518,6 +532,18 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
}
track->set_mode (mode);
rec_enable_button->remove ();
switch (mode) {
case ARDOUR::Normal:
rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
break;
case ARDOUR::Destructive:
rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
break;
}
rec_enable_button->show_all ();
}
void

1
gtk2_ardour/route_ui.cc
View File

@@ -91,7 +91,6 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
rec_enable_button = manage (new BindableToggleButton (t->rec_enable_control(), r_name ));
rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
update_rec_display ();