Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:timlinux/Quantum-GIS
  • Loading branch information
timlinux committed Nov 24, 2011
2 parents 52eb8fd + dde7032 commit c02ccc9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
11 changes: 2 additions & 9 deletions doc/qgisdoc.css → resources/css/qgisdoc.css
Expand Up @@ -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;
Expand All @@ -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;
}
}
}
1 change: 1 addition & 0 deletions resources/html/qgsrasterlayer.html
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions src/app/main.cpp
Expand Up @@ -32,6 +32,7 @@
#include <QPlastiqueStyle>
#include <QTranslator>
#include <QImageReader>
#include <QWebSettings>

#include "qgscustomization.h"
#include "qgspluginregistry.h"
Expand Down Expand Up @@ -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...
/////////////////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsrasterlayerproperties.cpp
Expand Up @@ -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 )
Expand Down

0 comments on commit c02ccc9

Please sign in to comment.