13
0

Add dialogue to ask user about ambiguous source files. Fixes #3603.

git-svn-id: svn://localhost/ardour2/branches/3.0@8265 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-14 02:45:41 +00:00
parent 1238f09478
commit eb5870781a
5 changed files with 117 additions and 0 deletions

View File

@ -0,0 +1,63 @@
/*
Copyright (C) 2010 Paul Davis
Author: Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm/label.h>
#include "ambiguous_file_dialog.h"
using namespace std;
using namespace ARDOUR;
using namespace Gtk;
AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<string>& paths)
: ArdourDialog (_("Ambiguous File"), true, false)
{
get_vbox()->set_spacing (6);
Label* l = manage (new Label);
l->set_markup (string_compose (_("Ardour has found the file <i>%1</i> in the following places:\n\n"), file));
get_vbox()->pack_start (*l);
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
_radio_buttons.push_back (manage (new RadioButton (_group, *i)));
get_vbox()->pack_start (*_radio_buttons.back ());
}
get_vbox()->pack_start (*manage (new Label (_("\n\nPlease select the path that you want to get the file from."))));
add_button (_("Done"), RESPONSE_OK);
show_all ();
}
int
AmbiguousFileDialog::get_which () const
{
int i = 0;
vector<RadioButton*>::const_iterator j = _radio_buttons.begin ();
while (j != _radio_buttons.end() && !(*j)->get_active ()) {
++i;
++j;
}
if (j == _radio_buttons.end()) {
return 0;
}
return i;
}

View File

@ -0,0 +1,35 @@
/*
Copyright (C) 2010 Paul Davis
Author: Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm/radiobutton.h>
#include "ardour_dialog.h"
class AmbiguousFileDialog : public ArdourDialog
{
public:
AmbiguousFileDialog (const std::string &, const std::vector<std::string> &);
int get_which () const;
private:
Gtk::RadioButtonGroup _group;
std::vector<Gtk::RadioButton*> _radio_buttons;
};

View File

@ -107,6 +107,7 @@ typedef uint64_t microseconds_t;
#include "location_ui.h"
#include "missing_file_dialog.h"
#include "missing_plugin_dialog.h"
#include "ambiguous_file_dialog.h"
#include "i18n.h"
@ -274,6 +275,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
ARDOUR::Session::MissingFile.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::missing_file, this, _1, _2, _3));
/* and ambiguous files */
ARDOUR::FileSource::AmbiguousFileName.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::ambiguous_file, this, _1, _2, _3));
/* lets get this party started */
try {
@ -3733,3 +3738,15 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
return result;
}
int
ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits)
{
AmbiguousFileDialog dialog (file, hits);
dialog.show ();
dialog.present ();
dialog.run ();
return dialog.get_which ();
}

View File

@ -714,6 +714,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
std::list<WindowProxyBase*> _window_proxies;
int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
int ambiguous_file (std::string file, std::string path, std::vector<std::string> hits);
};
#endif /* __ardour_gui_h__ */

View File

@ -28,6 +28,7 @@ gtk2_ardour_sources = [
'actions.cc',
'add_midi_cc_track_dialog.cc',
'add_route_dialog.cc',
'ambiguous_file_dialog.cc',
'analysis_window.cc',
'ardour_dialog.cc',
'ardour_ui.cc',