pot/merge.

[dcpomatic.git] / src / wx / job_view.cc

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 87582ec8c137ad74360378f36fa2414c77e29f55..83d3159b09dcd15b90d5c19a2cad1717e1e662d0 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -27,11 +28,12 @@ using std::string;
 using std::min;
 using boost::shared_ptr;
 
-JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
+/** @param top Put this view at the top of table, otherwise put it at the bottom */
+JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table, bool top)
        : _job (job)
        , _parent (parent)
 {
-       int n = 0;
+       int n = top ? 0 : (table->GetEffectiveRowsCount() * table->GetEffectiveColsCount());
 
        _gauge_message = new wxBoxSizer (wxVERTICAL);
        _gauge = new wxGauge (container, wxID_ANY, 100);
@@ -120,7 +122,9 @@ JobView::details_clicked (wxCommandEvent &)
 void
 JobView::cancel_clicked (wxCommandEvent &)
 {
-       _job->cancel ();
+       if (confirm_dialog (_parent, _("Are you sure you want to cancel this job?"))) {
+               _job->cancel ();
+       }
 }
 
 void