fix to enable saving/loading of legend again

git-svn-id: http://svn.osgeo.org/qgis/trunk@5038 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 16, 2006 · af95217 · af95217
1 parent f641c58
commit af95217
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -1118,8 +1118,8 @@ void QgisApp::createOverview()
 void QgisApp::createLegend()
 {
   //legend
-  //mMapLegend = new QgsLegend(this,NULL, "theMapLegend");
-  mMapLegend = new QgsLegend(this, this, "theMapLegend");
+  mMapLegend = new QgsLegend(this,NULL, "theMapLegend");
+  mMapLegend->setObjectName("theMapLegend");
   mMapLegend->setMapCanvas(mMapCanvas);
   QWhatsThis::add(mMapLegend, tr("Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties."));
   QVBoxLayout *myLegendLayout = new QVBoxLayout;

diff --git a/src/gui/qgsproject.cpp b/src/gui/qgsproject.cpp
@@ -38,7 +38,8 @@ using namespace std;
 #include <QWidget>
 #include <QObject>
 #include <QTextStream>
-
+#include <QToolBox>
+#include <QSplitter>
 
 
 static const char *const ident_ = "$Id$";
@@ -771,15 +772,16 @@ static QgsMapCanvas * _findMapCanvas(QString const &canonicalMapCanvasName)
 static QgsLegend * _findLegend()
 {
   QString canonicalLegendName = "theMapLegend";
-  QgsLegend* theLegend = NULL;
+  QgsLegend* theLegend = 0;
 
   QWidgetList wlist = QApplication::topLevelWidgets();
   foreach (QWidget *widget, QApplication::topLevelWidgets()) 
   {
-    //theLegend = dynamic_cast <QgsLegend *>(widget->child(canonicalLegendName.toLocal8Bit().data(), 0, true)); 
-    theLegend = widget->findChild<QgsLegend*>("theMapLegend");
+    theLegend = dynamic_cast <QgsLegend *>(widget->child(canonicalLegendName.toLocal8Bit().data(), 0, true)); 
     if(theLegend)
-      break;
+      {
+	break;
+      }
   }
 
   return theLegend;