ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove stay-on-top behavior from import dialog, and set its WM class

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13721 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-23 20:34:43 +00:00
parent 8380c06e32
commit 74c9c806d2
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_audio_import.cc
View File

@ -80,7 +80,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
}
if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, 0, true, mode_hint);
sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, 0, true, mode_hint);
} else {
sfbrowser->set_mode (mode_hint);
}
@ -124,7 +124,7 @@ Editor::external_audio_dialog ()
}
if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
} else {
sfbrowser->reset (audio_track_cnt, midi_track_cnt);
}

4
gtk2_ardour/rc_option_editor.cc
View File

@ -105,7 +105,7 @@ private:
void click_browse_clicked ()
{
SoundFileChooser sfdb (*_parent, _("Choose Click"));
SoundFileChooser sfdb (_("Choose Click"));
if (sfdb.run () == RESPONSE_OK) {
click_chosen (sfdb.get_filename());
@ -125,7 +125,7 @@ private:
void click_emphasis_browse_clicked ()
{
SoundFileChooser sfdb (*_parent, _("Choose Click Emphasis"));
SoundFileChooser sfdb (_("Choose Click Emphasis"));
sfdb.show_all ();
sfdb.present ();

14
gtk2_ardour/sfdb_ui.cc
View File

@ -414,8 +414,8 @@ SoundFileBox::save_tags (const vector<string>& tags)
Library->save_changes ();
}
SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s, bool persistent)
: ArdourWindow (parent, title)
SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persistent)
: ArdourWindow (title)
, found_list (ListStore::create(found_list_columns))
, freesound_list (ListStore::create(freesound_list_columns))
, chooser (FILE_CHOOSER_ACTION_OPEN)
@ -613,6 +613,8 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
Gtkmm2ext::UI::instance()->set_tip (cancel_button, _("Press to close this window without importing any files"));
vpacker.pack_end (*button_box, false, false);
set_wmclass (X_("import"), PROGRAM_NAME);
}
SoundFileBrowser::~SoundFileBrowser ()
@ -1460,8 +1462,8 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
return ret;
}
SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::Session* s)
: SoundFileBrowser (parent, title, s, false)
SoundFileChooser::SoundFileChooser (string title, ARDOUR::Session* s)
: SoundFileBrowser (title, s, false)
{
chooser.set_select_multiple (false);
found_list_view.get_selection()->set_mode (SELECTION_SINGLE);
@ -1497,12 +1499,12 @@ SoundFileChooser::get_filename ()
return paths.front();
}
SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s,
SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s,
uint32_t selected_audio_tracks,
uint32_t selected_midi_tracks,
bool persistent,
Editing::ImportMode mode_hint)
: SoundFileBrowser (parent, title, s, persistent)
: SoundFileBrowser (title, s, persistent)
, copy_files_btn ( _("Copy files to session"))
, selected_audio_track_cnt (selected_audio_tracks)
, selected_midi_track_cnt (selected_midi_tracks)

6
gtk2_ardour/sfdb_ui.h
View File

@ -152,7 +152,7 @@ class SoundFileBrowser : public ArdourWindow
Gtk::Button freesound_stop_btn;
public:
SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent);
SoundFileBrowser (std::string title, ARDOUR::Session* _s, bool persistent);
virtual ~SoundFileBrowser ();
int run ();
@ -248,7 +248,7 @@ class SoundFileBrowser : public ArdourWindow
class SoundFileChooser : public SoundFileBrowser
{
public:
SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0);
SoundFileChooser (std::string title, ARDOUR::Session* _s = 0);
virtual ~SoundFileChooser () {};
std::string get_filename ();
@ -261,7 +261,7 @@ class SoundFileOmega : public SoundFileBrowser
{
public:
SoundFileOmega (Gtk::Window& parent, std::string title, ARDOUR::Session* _s,
SoundFileOmega (std::string title, ARDOUR::Session* _s,
uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
bool persistent,
Editing::ImportMode mode_hint = Editing::ImportAsTrack);