diff src/mainwindow.h @ 583:e40e3ebe9f2e fswatcher

Merge from default branch

--- a/src/mainwindow.h	Tue Feb 14 17:53:29 2012 +0000
+++ b/src/mainwindow.h	Mon Mar 12 14:58:40 2012 +0000
@@ -5,8 +5,8 @@
 
     Based on hgExplorer by Jari Korhonen
     Copyright (c) 2010 Jari Korhonen
-    Copyright (c) 2011 Chris Cannam
-    Copyright (c) 2011 Queen Mary, University of London
+    Copyright (c) 2012 Chris Cannam
+    Copyright (c) 2012 Queen Mary, University of London
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -46,6 +46,7 @@
 
 protected:
     void closeEvent(QCloseEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
 public slots:
     void open(QString local);
@@ -53,6 +54,7 @@
     void commandStarting(HgAction);
     void commandCompleted(HgAction action, QString stdOut);
     void commandFailed(HgAction action, QString stdErr, QString stdOut);
+    void commandCancelled(HgAction action);
     void enableDisableActions();
 
 private slots: