Enable html inspection of web views in debug mode

qgis · Nov 23, 2011 · dde7032 · dde7032
1 parent d219534
commit dde7032
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/doc/qgisdoc.css → resources/css/qgisdoc.css b/doc/qgisdoc.css → resources/css/qgisdoc.css
@@ -11,11 +11,11 @@ body{
   font-weight: bold;
   color: #800000;
 } 
-span.header{
+h1,  span.header{
   font-family: trebuchet,arial,helvetica,sans;
   font-size: 18pt;
 }
-span.subheader{
+h2, span.subheader{
   font-family: trebuchet,arial,helvetica,sans;
   font-size: 14pt;
   font-weight: normal;
@@ -27,14 +27,7 @@ dt{
 ul.small{
   font-size: 9pt;
 }
-h2{
-  font-size: 14pt;
-  font-family: trebuchet,arial,helvetica,sans;
-  font-weight: normal;
-}
 a.link.bar{
   font-size: 9pt;
   font-style: italic;
-}
-  }
 }
diff --git a/resources/html/qgsrasterlayer.html b/resources/html/qgsrasterlayer.html
@@ -5,6 +5,7 @@
     <!-- custom blueprint see http://ianli.com/blueprinter/?cw=20&gw=5&cc=24 -->
     <link rel="stylesheet" href="../css/screen.css" type="text/css" media="screen, projection" />
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" /> 
+    <link rel="stylesheet" href="../css/qgisdoc.css" type="text/css" /> 
     <script language="javascript" type="text/javascript" src="../js/jquery.js"></script>
     <script language="javascript" type="text/javascript" src="../js/jquery.flot.js"></script>
     <script language="javascript" type="text/javascript" src="../js/jquery.flot.navigate.js"></script>

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -32,6 +32,7 @@
 #include <QPlastiqueStyle>
 #include <QTranslator>
 #include <QImageReader>
+#include <QWebSettings>
 
 #include "qgscustomization.h"
 #include "qgspluginregistry.h"
@@ -740,6 +741,12 @@ int main( int argc, char *argv[] )
   }
 
 
+#ifdef QGISDEBUG
+  //enable debugging in QWebViews when in debug mode
+  QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+#endif
+
+
   /////////////////////////////////////////////////////////////////////
   // Continue on to interactive gui...
   /////////////////////////////////////////////////////////////////////

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1852,6 +1852,7 @@ void QgsRasterLayerProperties::metadataPageLoaded( bool theOkFlag )
   //populate the metadata tab's text browser widget with raster metadata info
   wvMetadata->page()->mainFrame()->addToJavaScriptWindowObject( "mRasterLayer", mRasterLayer );
   wvMetadata->page()->mainFrame()->evaluateJavaScript( QString("setMetadata()"));
+  setWindowModality ( Qt::NonModal );
 }
 
 void QgsRasterLayerProperties::histogramPageLoaded( bool theOkFlag )