Move export progress text to progress bar from separate label
git-svn-id: svn://localhost/ardour2/branches/3.0@11379 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
6f23443c26
commit
80004a33aa
@ -122,7 +122,6 @@ ExportDialog::init ()
|
|||||||
|
|
||||||
/* Progress indicators */
|
/* Progress indicators */
|
||||||
|
|
||||||
progress_widget.pack_start (progress_label, false, false, 6);
|
|
||||||
progress_widget.pack_start (progress_bar, false, false, 6);
|
progress_widget.pack_start (progress_bar, false, false, 6);
|
||||||
|
|
||||||
/* Buttons */
|
/* Buttons */
|
||||||
@ -340,7 +339,7 @@ ExportDialog::progress_timeout ()
|
|||||||
status->timespan, status->total_timespans);
|
status->timespan, status->total_timespans);
|
||||||
progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
|
progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
|
||||||
}
|
}
|
||||||
progress_label.set_text (status_text);
|
progress_bar.set_text (status_text);
|
||||||
|
|
||||||
if (progress < previous_progress) {
|
if (progress < previous_progress) {
|
||||||
// Work around gtk bug
|
// Work around gtk bug
|
||||||
@ -448,4 +447,3 @@ StemExportDialog::init_components ()
|
|||||||
channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager));
|
channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager));
|
||||||
file_notebook.reset (new ExportFileNotebook ());
|
file_notebook.reset (new ExportFileNotebook ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,6 @@ class ExportDialog : public ArdourDialog {
|
|||||||
|
|
||||||
/* Progress bar */
|
/* Progress bar */
|
||||||
|
|
||||||
Gtk::Label progress_label;
|
|
||||||
Gtk::ProgressBar progress_bar;
|
Gtk::ProgressBar progress_bar;
|
||||||
sigc::connection progress_connection;
|
sigc::connection progress_connection;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user