diff options
author | Carl Hetherington <carl@carlh.net> | 2010-04-14 22:16:46 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-04-14 22:16:46 +0000 |
commit | 3d3e889dd61d8e513f78257ac770eabc8afe050c (patch) | |
tree | 4ab6ac91926136c05d1d80518d1e56cc771b671b /libs/ardour/import.cc | |
parent | 8783fc35f27b8583755d53d70efbf6cece27ca29 (diff) |
Separate interthread progress window out into its own class and HIG-ify it a bit. Make the import progress bar report on the whole import rather than individual files.
git-svn-id: svn://localhost/ardour2/branches/3.0@6894 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
-rw-r--r-- | libs/ardour/import.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 64eadbb973..0f57ea0144 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -250,16 +250,13 @@ compose_status_message (const string& path, uint total_files) { if (file_samplerate != session_samplerate) { - return string_compose (_("<b>Resampling</b> from %1kHz to %2kHz.\n<i>%3</i>\n(%4 of %5)"), - file_samplerate/1000.0f, - session_samplerate/1000.0f, + return string_compose (_("Resampling %1 from %2kHz to %3kHz"), Glib::path_get_basename (path), - current_file, total_files); + file_samplerate/1000.0f, + session_samplerate/1000.0f); } - - return string_compose (_("<b>Copying</b>\n<i>%1</i>\n(%2 of %3)"), - Glib::path_get_basename (path), - current_file, total_files); + + return string_compose (_("Copying %1"), Glib::path_get_basename (path)); } static void @@ -517,6 +514,7 @@ Session::import_audiofiles (ImportStatus& status) } ++status.current; + status.progress = 0; } if (!status.cancel) { |