From 80004a33aa286208161ae18ce6ca917e8f4442c9 Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Sat, 28 Jan 2012 18:39:56 +0000 Subject: [PATCH] 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 --- gtk2_ardour/export_dialog.cc | 4 +--- gtk2_ardour/export_dialog.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 845a4a3680..c5e20c01ae 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -122,7 +122,6 @@ ExportDialog::init () /* Progress indicators */ - progress_widget.pack_start (progress_label, false, false, 6); progress_widget.pack_start (progress_bar, false, false, 6); /* Buttons */ @@ -340,7 +339,7 @@ ExportDialog::progress_timeout () status->timespan, status->total_timespans); 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) { // Work around gtk bug @@ -448,4 +447,3 @@ StemExportDialog::init_components () channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager)); file_notebook.reset (new ExportFileNotebook ()); } - diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 412d030f96..a720ec0b9c 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -127,7 +127,6 @@ class ExportDialog : public ArdourDialog { /* Progress bar */ - Gtk::Label progress_label; Gtk::ProgressBar progress_bar; sigc::connection progress_connection;