diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip index 7a10025ea06..9426c8e71b6 100644 --- a/python/gui/qgisinterface.sip +++ b/python/gui/qgisinterface.sip @@ -359,12 +359,16 @@ class QgisInterface : QObject virtual QAction *actionAddPgLayer() = 0; virtual QAction *actionAddWmsLayer() = 0; virtual QAction *actionLayerSeparator1() = 0 /Deprecated/; + /** @note added in 1.9 */ + virtual QAction *actionCopyLayerStyle() = 0; + /** @note added in 1.9 */ + virtual QAction *actionPasteLayerStyle() = 0; virtual QAction *actionOpenTable() = 0; virtual QAction *actionToggleEditing() = 0; virtual QAction *actionLayerSaveAs() = 0; virtual QAction *actionLayerSelectionSaveAs() = 0; virtual QAction *actionRemoveLayer() = 0; - /** @note added in 2.0 */ + /** @note added in 1.9 */ virtual QAction *actionDuplicateLayer() = 0; virtual QAction *actionLayerProperties() = 0; virtual QAction *actionLayerSeparator2() = 0 /Deprecated/; diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 40984a4b6cc..61b026b6247 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -280,17 +280,21 @@ class QgisApp : public QMainWindow, private Ui::MainWindow QAction *actionAddOgrLayer() { return mActionAddOgrLayer; } QAction *actionAddRasterLayer() { return mActionAddRasterLayer; } QAction *actionAddPgLayer() { return mActionAddPgLayer; } - QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; }; + QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; } QAction *actionAddWmsLayer() { return mActionAddWmsLayer; } QAction *actionAddWcsLayer() { return mActionAddWcsLayer; } QAction *actionAddWfsLayer() { return mActionAddWfsLayer; } + /** @note added in 1.9 */ + QAction *actionCopyLayerStyle() { return mActionCopyStyle; } + /** @note added in 1.9 */ + QAction *actionPasteLayerStyle() { return mActionPasteStyle; } QAction *actionOpenTable() { return mActionOpenTable; } QAction *actionToggleEditing() { return mActionToggleEditing; } QAction *actionSaveEdits() { return mActionSaveEdits; } QAction *actionLayerSaveAs() { return mActionLayerSaveAs; } QAction *actionLayerSelectionSaveAs() { return mActionLayerSelectionSaveAs; } QAction *actionRemoveLayer() { return mActionRemoveLayer; } - /** @note added in 2.0 */ + /** @note added in 1.9 */ QAction *actionDuplicateLayer() { return mActionDuplicateLayer; } QAction *actionSetLayerCRS() { return mActionSetLayerCRS; } QAction *actionSetProjectCRSFromLayer() { return mActionSetProjectCRSFromLayer; } @@ -437,13 +441,13 @@ class QgisApp : public QMainWindow, private Ui::MainWindow (defaults to the active layer on the legend) */ void editPaste( QgsMapLayer * destinationLayer = 0 ); - + //! copies style of the active layer to the clipboard /** \param sourceLayer The layer where the style will be taken from (defaults to the active layer on the legend) */ void copyStyle( QgsMapLayer * sourceLayer = 0 ); - //! copies style on the clipboard to the active layer + //! pastes style on the clipboard to the active layer /** \param destinatioLayer The layer that the clipboard will be pasted to (defaults to the active layer on the legend) diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp index 54418b11d38..2b4f6af822c 100644 --- a/src/app/qgisappinterface.cpp +++ b/src/app/qgisappinterface.cpp @@ -460,6 +460,8 @@ QAction *QgisAppInterface::actionAddRasterLayer() { return qgis->actionAddRaster QAction *QgisAppInterface::actionAddPgLayer() { return qgis->actionAddPgLayer(); } QAction *QgisAppInterface::actionAddWmsLayer() { return qgis->actionAddWmsLayer(); } QAction *QgisAppInterface::actionLayerSeparator1() { return 0; } +QAction *QgisAppInterface::actionCopyLayerStyle() { return qgis->actionCopyLayerStyle(); } +QAction *QgisAppInterface::actionPasteLayerStyle() { return qgis->actionPasteLayerStyle(); } QAction *QgisAppInterface::actionOpenTable() { return qgis->actionOpenTable(); } QAction *QgisAppInterface::actionToggleEditing() { return qgis->actionToggleEditing(); } QAction *QgisAppInterface::actionLayerSaveAs() { return qgis->actionLayerSaveAs(); } diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h index 407f178ddd3..0ac8c7b76d1 100644 --- a/src/app/qgisappinterface.h +++ b/src/app/qgisappinterface.h @@ -308,12 +308,16 @@ class QgisAppInterface : public QgisInterface virtual QAction *actionAddPgLayer(); virtual QAction *actionAddWmsLayer(); virtual QAction *actionLayerSeparator1(); + /** @note added in 1.9 */ + virtual QAction *actionCopyLayerStyle(); + /** @note added in 1.9 */ + virtual QAction *actionPasteLayerStyle(); virtual QAction *actionOpenTable(); virtual QAction *actionToggleEditing(); virtual QAction *actionLayerSaveAs(); virtual QAction *actionLayerSelectionSaveAs(); virtual QAction *actionRemoveLayer(); - /** @note added in 2.0 */ + /** @note added in 1.9 */ virtual QAction *actionDuplicateLayer(); virtual QAction *actionLayerProperties(); virtual QAction *actionLayerSeparator2(); diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 298e5ddb249..a613a47ccf0 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -461,12 +461,16 @@ class GUI_EXPORT QgisInterface : public QObject Q_DECL_DEPRECATED #endif virtual QAction *actionLayerSeparator1() = 0; + /** @note added in 1.9 */ + virtual QAction *actionCopyLayerStyle() = 0; + /** @note added in 1.9 */ + virtual QAction *actionPasteLayerStyle() = 0; virtual QAction *actionOpenTable() = 0; virtual QAction *actionToggleEditing() = 0; virtual QAction *actionLayerSaveAs() = 0; virtual QAction *actionLayerSelectionSaveAs() = 0; virtual QAction *actionRemoveLayer() = 0; - /** @note added in 2.0 */ + /** @note added in 1.9 */ virtual QAction *actionDuplicateLayer() = 0; virtual QAction *actionLayerProperties() = 0; #ifndef Q_MOC_RUN