added change signal to clipboard

blazek · blazek · commit 0a3313d317a7 · 2013-09-05T09:22:06.000+02:00
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -171,6 +171,7 @@ SET (QGIS_APP_MOC_HDRS
   qgsattributetabledialog.h
   qgsbookmarks.h
   qgsbrowserdockwidget.h
+  qgsclipboard.h
   qgsconfigureshortcutsdialog.h
   qgscustomization.h
   qgscustomprojectiondialog.h
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -573,6 +573,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   mLogDock->hide();
 
   mInternalClipboard = new QgsClipboard; // create clipboard
+  connect( mInternalClipboard, SIGNAL( changed() ), this, SLOT( clipboardChanged() ) );
   mQgisInterface = new QgisAppInterface( this ); // create the interfce
 
 #ifdef Q_WS_MAC
@@ -5483,7 +5484,6 @@ void QgisApp::editCut( QgsMapLayer * layerContainingSelection )
   selectionVectorLayer->beginEditCommand( tr( "Features cut" ) );
   selectionVectorLayer->deleteSelectedFeatures();
   selectionVectorLayer->endEditCommand();
-  activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
 void QgisApp::editCopy( QgsMapLayer * layerContainingSelection )
@@ -5499,9 +5499,12 @@ void QgisApp::editCopy( QgsMapLayer * layerContainingSelection )
 
   // Test for feature support in this layer
   clipboard()->replaceWithCopyOf( selectionVectorLayer );
-  activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
+void QgisApp::clipboardChanged()
+{
+  activateDeactivateLayerRelatedActions( activeLayer() );
+}
 
 void QgisApp::editPaste( QgsMapLayer *destinationLayer )
 {
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1129,6 +1129,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void osmImportDialog();
     void osmExportDialog();
 
+    void clipboardChanged();
+
   signals:
     /** emitted when a key is pressed and we want non widget sublasses to be able
       to pick up on this (e.g. maplayer) */
diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp
@@ -18,6 +18,7 @@
 #include <fstream>
 
 #include <QApplication>
+#include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QClipboard>
@@ -33,7 +34,8 @@
 #include "qgsvectorlayer.h"
 
 QgsClipboard::QgsClipboard()
-    : mFeatureClipboard()
+    : QObject()
+    , mFeatureClipboard()
     , mFeatureFields()
 {
 }
@@ -55,6 +57,7 @@ void QgsClipboard::replaceWithCopyOf( QgsVectorLayer *src )
   QgsDebugMsg( "replaced QGis clipboard." );
 
   setSystemClipboard();
+  emit changed();
 }
 
 void QgsClipboard::replaceWithCopyOf( QgsFeatureStore & featureStore )
@@ -64,6 +67,7 @@ void QgsClipboard::replaceWithCopyOf( QgsFeatureStore & featureStore )
   mFeatureClipboard = featureStore.features();
   mCRS = featureStore.crs();
   setSystemClipboard();
+  emit changed();
 }
 
 void QgsClipboard::setSystemClipboard()
@@ -149,13 +153,15 @@ void QgsClipboard::clear()
   mFeatureClipboard.clear();
 
   QgsDebugMsg( "cleared clipboard." );
+  emit changed();
 }
 
 void QgsClipboard::insert( QgsFeature& feature )
 {
   mFeatureClipboard.push_back( feature );
 
   QgsDebugMsg( "inserted " + feature.geometry()->exportToWkt() );
+  emit changed();
 }
 
 bool QgsClipboard::empty()
diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h
@@ -20,6 +20,7 @@
 
 #include <QList>
 #include <QMap>
+#include <QObject>
 
 #include "qgsfield.h"
 #include "qgsfeature.h"
@@ -49,8 +50,9 @@ class QgsVectorLayer;
  */
 #define QGSCLIPBOARD_STYLE_MIME "application/qgis.style"
 
-class QgsClipboard
+class QgsClipboard : public QObject
 {
+    Q_OBJECT
   public:
     /**
     * Constructor for the clipboard.
@@ -139,6 +141,10 @@ class QgsClipboard
      */
     const QgsFields &fields() { return mFeatureFields; }
 
+  signals:
+    /** Emited when content changed */
+    void changed();
+
   private:
     /*
      * Set system clipboard from previously set features.

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include <fstream>`
`19`	`19`
`20`	`20`	`#include <QApplication>`
	`21`	`+#include <QObject>`
`21`	`22`	`#include <QString>`
`22`	`23`	`#include <QStringList>`
`23`	`24`	`#include <QClipboard>`
`@@ -33,7 +34,8 @@`
`33`	`34`	`#include "qgsvectorlayer.h"`
`34`	`35`
`35`	`36`	`QgsClipboard::QgsClipboard()`
`36`		`- : mFeatureClipboard()`
	`37`	`+ : QObject()`
	`38`	`+ , mFeatureClipboard()`
`37`	`39`	`, mFeatureFields()`
`38`	`40`	`{`
`39`	`41`	`}`
`@@ -55,6 +57,7 @@ void QgsClipboard::replaceWithCopyOf( QgsVectorLayer *src )`
`55`	`57`	`QgsDebugMsg( "replaced QGis clipboard." );`
`56`	`58`
`57`	`59`	`setSystemClipboard();`
	`60`	`+ emit changed();`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`void QgsClipboard::replaceWithCopyOf( QgsFeatureStore & featureStore )`
`@@ -64,6 +67,7 @@ void QgsClipboard::replaceWithCopyOf( QgsFeatureStore & featureStore )`
`64`	`67`	`mFeatureClipboard = featureStore.features();`
`65`	`68`	`mCRS = featureStore.crs();`
`66`	`69`	`setSystemClipboard();`
	`70`	`+ emit changed();`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`void QgsClipboard::setSystemClipboard()`
`@@ -149,13 +153,15 @@ void QgsClipboard::clear()`
`149`	`153`	`mFeatureClipboard.clear();`
`150`	`154`
`151`	`155`	`QgsDebugMsg( "cleared clipboard." );`
	`156`	`+ emit changed();`
`152`	`157`	`}`
`153`	`158`
`154`	`159`	`void QgsClipboard::insert( QgsFeature& feature )`
`155`	`160`	`{`
`156`	`161`	`mFeatureClipboard.push_back( feature );`
`157`	`162`
`158`	`163`	`QgsDebugMsg( "inserted " + feature.geometry()->exportToWkt() );`
	`164`	`+ emit changed();`
`159`	`165`	`}`
`160`	`166`
`161`	`167`	`bool QgsClipboard::empty()`