diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/actions.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.bindings | 8 | ||||
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/sfdb_ui.h | 1 |
5 files changed, 17 insertions, 8 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 885a23ffc7..88d0187592 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -89,6 +89,7 @@ RefPtr<Action> ActionManager::register_action (RefPtr<ActionGroup> group, const char * name, const char * label, slot<void> sl, guint key, Gdk::ModifierType mods) { RefPtr<Action> act = register_action (group, name, label, sl); + cerr << "Reset A accel for " << name << endl; AccelMap::add_entry (act->get_accel_path(), key, mods); return act; @@ -121,6 +122,7 @@ RefPtr<Action> ActionManager::register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group& rgroup, const char * name, const char * label, slot<void> sl, guint key, Gdk::ModifierType mods) { RefPtr<Action> act = register_radio_action (group, rgroup, name, label, sl); + cerr << "Reset B accel for " << name << endl; AccelMap::add_entry (act->get_accel_path(), key, mods); return act; @@ -141,6 +143,7 @@ RefPtr<Action> ActionManager::register_toggle_action (RefPtr<ActionGroup> group, const char * name, const char * label, slot<void> sl, guint key, Gdk::ModifierType mods) { RefPtr<Action> act = register_toggle_action (group,name, label, sl); + cerr << "Reset C accel for " << name << endl; AccelMap::add_entry (act->get_accel_path(), key, mods); return act; diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings index 244e21436c..5a0eb469b7 100644 --- a/gtk2_ardour/ardour.bindings +++ b/gtk2_ardour/ardour.bindings @@ -37,10 +37,10 @@ (gtk_accel_path "<Actions>/Common/goto-editor" "<alt>e") (gtk_accel_path "<Actions>/Common/goto-mixer" "<alt>m") -(gtk-accel_path "<Actions>/Common/ToggleSoundFileBrowser" "<alt>f") -(gtk-accel_path "<Actions>/Common/ToggleLocations" "<alt>l") -(gtk-accel_path "<Actions>/Common/ToggleBigClock" "<alt>b") -(gtk-accel_path "<Actions>/Common/ToggleColorManager" "<alt>c") +(gtk_accel_path "<Actions>/Common/ToggleSoundFileBrowser" "<alt>f") +(gtk_accel_path "<Actions>/Common/ToggleLocations" "<alt>l") +(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<alt>b") +(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<alt>c") (gtk_accel_path "<Actions>/Editor/editor-copy" "<control>c") (gtk_accel_path "<Actions>/Common/Quit" "<control>q") diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 147e6ff0d1..9375a90544 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -67,7 +67,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event), base_rect, this)); - hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm"))))); + hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); height_button.set_name ("TrackSizeButton"); auto_button.set_name ("TrackVisualButton"); diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index ab12356989..150b071661 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -74,6 +74,7 @@ SoundFileBox::SoundFileBox () main_box.pack_start(format, false, false); main_box.pack_start(channels, false, false); main_box.pack_start(samplerate, false, false); + main_box.pack_start(timecode, false, false); main_box.pack_start(field_view, true, true); main_box.pack_start(top_box, false, false); main_box.pack_start(bottom_box, false, false); @@ -129,21 +130,25 @@ SoundFileBox::setup_labels (string filename) path = filename; string error_msg; + if(!AudioFileSource::get_soundfile_info (filename, sf_info, error_msg)) { return false; } length.set_alignment (0.0f, 0.0f); - length.set_text (string_compose("Length: %1", PBD::length2string(sf_info.length, sf_info.samplerate))); + length.set_text (string_compose(_("Length: %1"), PBD::length2string(sf_info.length, sf_info.samplerate))); format.set_alignment (0.0f, 0.0f); format.set_text (sf_info.format_name); channels.set_alignment (0.0f, 0.0f); - channels.set_text (string_compose("Channels: %1", sf_info.channels)); + channels.set_text (string_compose(_("Channels: %1"), sf_info.channels)); samplerate.set_alignment (0.0f, 0.0f); - samplerate.set_text (string_compose("Samplerate: %1", sf_info.samplerate)); + samplerate.set_text (string_compose(_("Samplerate: %1"), sf_info.samplerate)); + + timecode.set_alignment (0.0f, 0.0f); + timecode.set_text (string_compose (_("Timecode: %1"), PBD::length2string(sf_info.timecode, sf_info.samplerate))); setup_fields (); diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 8ef57d7b9f..d7c2c14014 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -77,6 +77,7 @@ class SoundFileBox : public Gtk::VBox Gtk::Label format; Gtk::Label channels; Gtk::Label samplerate; + Gtk::Label timecode; Gtk::TreeView field_view; Glib::RefPtr<Gtk::ListStore> fields; |