smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

fix for #5224

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13741 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-27 18:49:35 +00:00
parent fe1796fd6f
commit db36cb793a
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_ed.cc
View file

@ -714,7 +714,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent)
} }
void void
ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&) ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& a)
{ {
if (!big_clock_resize_in_progress) { if (!big_clock_resize_in_progress) {
Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0)); Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));

5
gtk2_ardour/search_path_option.cc
View file

@ -18,6 +18,8 @@
#include "pbd/strsplit.h" #include "pbd/strsplit.h"
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/shortpath.h"
#include "search_path_option.h" #include "search_path_option.h"
#include "i18n.h" #include "i18n.h"
@ -25,6 +27,7 @@ using namespace std;
using namespace Gtk; using namespace Gtk;
SearchPathOption::SearchPathOption (const string& pathname, const string& label, SearchPathOption::SearchPathOption (const string& pathname, const string& label,
const string& default_path,
sigc::slot<std::string> get, sigc::slot<bool, std::string> set) sigc::slot<std::string> get, sigc::slot<bool, std::string> set)
: Option (pathname, label) : Option (pathname, label)
, _get (get) , _get (get)
@ -45,7 +48,7 @@ SearchPathOption::SearchPathOption (const string& pathname, const string& label,
vbox.pack_end (*hbox); vbox.pack_end (*hbox);
session_label.set_use_markup (true); session_label.set_use_markup (true);
session_label.set_markup (string_compose ("<i>%1</i>", _("the session folder"))); session_label.set_markup (string_compose ("<i>%1 (%2)</i>", _("the session folder"), short_path (default_path, 32)));
session_label.set_alignment (0.0, 0.5); session_label.set_alignment (0.0, 0.5);
session_label.show (); session_label.show ();

1
gtk2_ardour/search_path_option.h
View file

@ -33,6 +33,7 @@ class SearchPathOption : public Option
{ {
public: public:
SearchPathOption (const std::string& pathname, const std::string& label, SearchPathOption (const std::string& pathname, const std::string& label,
const std::string& default_path,
sigc::slot<std::string>, sigc::slot<bool, std::string>); sigc::slot<std::string>, sigc::slot<bool, std::string>);
~SearchPathOption (); ~SearchPathOption ();

2
gtk2_ardour/session_option_editor.cc
View file

@ -200,11 +200,13 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
add_option (_("Media"), new OptionEditorHeading (_("File locations"))); add_option (_("Media"), new OptionEditorHeading (_("File locations")));
SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"), SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
_session->path(),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path), sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path)); sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path));
add_option (_("Media"), spo); add_option (_("Media"), spo);
spo = new SearchPathOption ("midi-search-path", _("Search for MIDI files in:"), spo = new SearchPathOption ("midi-search-path", _("Search for MIDI files in:"),
_session->path(),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_search_path), sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_search_path),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_search_path)); sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_search_path));