Optionally show embedded layers/groups in selection dialog

qgis · Oct 16, 2012 · 4f29c07 · 4f29c07
1 parent 166d5c8
commit 4f29c07
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
@@ -23,7 +23,8 @@
 #include <QMessageBox>
 #include <QSettings>
 
-QgsProjectLayerGroupDialog::QgsProjectLayerGroupDialog( QWidget * parent, const QString& projectFile, Qt::WindowFlags f ): QDialog( parent, f )
+QgsProjectLayerGroupDialog::QgsProjectLayerGroupDialog( QWidget * parent, const QString& projectFile, Qt::WindowFlags f ): QDialog( parent, f ),
+    mShowEmbeddedContent( false )
 {
   setupUi( this );
 
@@ -36,6 +37,7 @@ QgsProjectLayerGroupDialog::QgsProjectLayerGroupDialog( QWidget * parent, const
     mProjectFileLabel->hide();
     mProjectFileLineEdit->hide();
     mBrowseFileToolButton->hide();
+    mShowEmbeddedContent = true;
     changeProjectFile();
   }
 
@@ -50,52 +52,52 @@ QgsProjectLayerGroupDialog::~QgsProjectLayerGroupDialog()
 
 QStringList QgsProjectLayerGroupDialog::selectedGroups() const
 {
-    QStringList groups;
-    QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
-    QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
-    for ( ; itemIt != items.end(); ++itemIt )
+  QStringList groups;
+  QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
+  QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
+  for ( ; itemIt != items.end(); ++itemIt )
+  {
+    if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "group" )
     {
-      if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "group" )
-      {
-        groups.push_back( ( *itemIt )->text( 0 ) );
-      }
+      groups.push_back(( *itemIt )->text( 0 ) );
     }
-    return groups;
+  }
+  return groups;
 }
 
 QStringList QgsProjectLayerGroupDialog::selectedLayerIds() const
 {
-    QStringList layerIds;
-    QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
-    QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
-    for ( ; itemIt != items.end(); ++itemIt )
+  QStringList layerIds;
+  QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
+  QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
+  for ( ; itemIt != items.end(); ++itemIt )
+  {
+    if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "layer" )
     {
-      if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "layer" )
-      {
-          layerIds.push_back( ( *itemIt )->data( 0, Qt::UserRole + 1 ).toString() );
-      }
+      layerIds.push_back(( *itemIt )->data( 0, Qt::UserRole + 1 ).toString() );
     }
-    return layerIds;
+  }
+  return layerIds;
 }
 
 QStringList QgsProjectLayerGroupDialog::selectedLayerNames() const
 {
-    QStringList layerNames;
-    QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
-    QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
-    for ( ; itemIt != items.end(); ++itemIt )
+  QStringList layerNames;
+  QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
+  QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
+  for ( ; itemIt != items.end(); ++itemIt )
+  {
+    if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "layer" )
     {
-      if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "layer" )
-      {
-          layerNames.push_back( ( *itemIt )->text( 0 ) );
-      }
+      layerNames.push_back(( *itemIt )->text( 0 ) );
     }
-    return layerNames;
+  }
+  return layerNames;
 }
 
 QString QgsProjectLayerGroupDialog::selectedProjectFile() const
 {
-    return mProjectFileLineEdit->text();
+  return mProjectFileLineEdit->text();
 }
 
 void QgsProjectLayerGroupDialog::on_mBrowseFileToolButton_clicked()
@@ -186,7 +188,7 @@ void QgsProjectLayerGroupDialog::addLegendGroupToTreeWidget( const QDomElement&
   QDomNodeList groupChildren = groupElem.childNodes();
   QDomElement currentChildElem;
 
-  if ( groupElem.attribute( "embedded" ) == "1" )
+  if ( !mShowEmbeddedContent && groupElem.attribute( "embedded" ) == "1" )
   {
     return;
   }
@@ -220,7 +222,7 @@ void QgsProjectLayerGroupDialog::addLegendGroupToTreeWidget( const QDomElement&
 
 void QgsProjectLayerGroupDialog::addLegendLayerToTreeWidget( const QDomElement& layerElem, QTreeWidgetItem* parent )
 {
-  if ( layerElem.attribute( "embedded" ) == "1" )
+  if ( !mShowEmbeddedContent && layerElem.attribute( "embedded" ) == "1" )
   {
     return;
   }

diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h
@@ -46,6 +46,7 @@ class QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProjectLayerGro
     void addLegendLayerToTreeWidget( const QDomElement& layerElem, QTreeWidgetItem* parent = 0 );
     void unselectChildren( QTreeWidgetItem* item );
     QString mProjectPath;
+    bool mShowEmbeddedContent;
 };
 
 #endif //QGSPROJECTLAYERGROUPDIALOG_H