Move embed action to layer menu

mhugent · mhugent · commit dc6d8c8c1c5f · 2011-06-03T16:39:48.000+02:00
diff --git a/src/app/qgsembedlayerdialog.cpp b/src/app/qgsembedlayerdialog.cpp
@@ -1,8 +1,10 @@
 #include "qgsembedlayerdialog.h"
+#include "qgsproject.h"
 #include "qgisapp.h"
 #include <QDomDocument>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QMessageBox>
 #include <QSettings>
 
 QgsEmbedLayerDialog::QgsEmbedLayerDialog( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
@@ -72,6 +74,13 @@ void QgsEmbedLayerDialog::changeProjectFile()
     return;
   }
 
+  //check we are not embedding from/to the same project
+  if( mProjectFileLineEdit->text() == QgsProject::instance()->fileName() )
+  {
+    QMessageBox::critical( 0, tr("Recursive embeding not possible"), tr("It is not possible to embed layers / groups from the current project") );
+    return;
+  }
+
   mTreeWidget->clear();
 
   //parse project file and fill tree
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -132,6 +132,7 @@
      <addaction name="mActionNewSpatialiteLayer"/>
     </widget>
     <addaction name="menuNew"/>
+    <addaction name="mActionEmbedLayers"/>
     <addaction name="mActionAddOgrLayer"/>
     <addaction name="mActionAddRasterLayer"/>
     <addaction name="mActionAddPgLayer"/>
@@ -234,7 +235,6 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="mActionEmbedLayers"/>
    <addaction name="mActionAddOgrLayer"/>
    <addaction name="mActionAddRasterLayer"/>
    <addaction name="mActionAddPgLayer"/>
@@ -1483,7 +1483,10 @@
   </action>
   <action name="mActionEmbedLayers">
    <property name="text">
-    <string>Embed Layers</string>
+    <string>Embed layers and groups...</string>
+   </property>
+   <property name="toolTip">
+    <string>Embed layers and groups from other project files</string>
    </property>
   </action>
  </widget>
