Use a smaller icon for legend file group so that we can use smaller v…

…ert. spacing in legend git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4694 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 15, 2006 · 06619c2 · 06619c2
1 parent d688632
commit 06619c2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/images/themes/default/mActionFileSmall.png b/images/themes/default/mActionFileSmall.png
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -2751,6 +2751,13 @@ bool QgisApp::addProject(QString projectFile)
     if ( QgsProject::instance()->read( projectFile ) )
     {
       setTitleBarText_( *this );
+      int  myRedInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorRedPart",255);
+      int  myGreenInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorGreenPart",255);
+      int  myBlueInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorBluePart",255);
+      QColor myColor = QColor(myRedInt,myGreenInt,myBlueInt);
+      mMapCanvas->setCanvasColor(myColor); //this is fill colour before rendering starts
+      mMapCanvas->setBackgroundColor(myColor); // this is for the widget itself
+      qDebug("Canvas bacground color restored...");
 
       emit projectRead(); // let plug-ins know that we've read in a new
       // project so that they can check any project
@@ -3012,12 +3019,6 @@ void QgisApp::openProject(int pathIndex)
 #else
     addProject(mRecentProjectPaths.at(pathIndex));
 #endif
-    int  myRedInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorRedPart",255);
-    int  myGreenInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorGreenPart",255);
-    int  myBlueInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorBluePart",255);
-    QColor myColor = QColor(myRedInt,myGreenInt,myBlueInt);
-    mMapCanvas->setCanvasColor(myColor); //this is fill colour before rendering starts
-    mMapCanvas->setBackgroundColor(myColor); // this is for the widget itself
   }
   //set the projections enabled icon in the status bar
   int myProjectionEnabledFlag =
@@ -3045,6 +3046,9 @@ void QgisApp::openProject(const QString & fileName)
         std::cerr << "unable to load project " << fileName.toLocal8Bit().data() << "\n";
 #endif
       }
+      else
+      {
+      }
     }
     catch ( QgsIOException & io_exception )
     {

diff --git a/src/legend/qgslegendlayerfile.cpp b/src/legend/qgslegendlayerfile.cpp
@@ -86,7 +86,7 @@ QgsLegendItem::DRAG_ACTION QgsLegendLayerFile::accept(const QgsLegendItem* li) c
 
 QPixmap QgsLegendLayerFile::getOriginalPixmap() const
 {
-    QPixmap myPixmap(QgsApplication::themePath()+"mActionFileNew.png");
+    QPixmap myPixmap(QgsApplication::themePath()+"mActionFileSmall.png");
     return myPixmap;
 }