- update wms metadata (fixes #4626)

- german translation fixes - fix warnings
qgis · Dec 9, 2011 · 315bd85 · 315bd85
1 parent cd7984e
commit 315bd85
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 128 deletions.
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
@@ -27574,7 +27574,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/core/raster/qgsrasterlayer.cpp" line="1761"/>
         <source>Pyramid overviews:</source>
-        <translation>Pyramiden Überblicke:</translation>
+        <translation>Pyramidenübersichten:</translation>
     </message>
     <message>
         <location filename="../src/core/raster/qgsrasterlayer.cpp" line="1773"/>
@@ -34298,7 +34298,7 @@ URL %1 versucht</translation>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2685"/>
         <source>Fees</source>
-        <translation>Kosten</translation>
+        <translation>Gebühren</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2693"/>

diff --git a/python/plugins/GdalTools/__init__.py b/python/plugins/GdalTools/__init__.py
@@ -2,7 +2,7 @@
 /***************************************************************************
 Name                 : GdalTools
 Description          : Integrate gdal tools into qgis
-Date                 : 17/Sep/09 
+Date                 : 17/Sep/09
 copyright            : (C) 2009 by Lorenzo Masini and Giuseppe Sucameli (Faunalia)
 email                : lorenxo86@gmail.com - brush.tyler@gmail.com
  ***************************************************************************/
@@ -17,18 +17,18 @@
  ***************************************************************************/
  This script initializes the plugin, making it known to QGIS.
 """
-def name(): 
-  return "GdalTools" 
+def name():
+  return "GdalTools"
 def description():
   return "Integrate gdal tools into qgis"
-def version(): 
-  return "Version 1.2.29" 
+def version():
+  return "Version 1.2.29"
 def qgisMinimumVersion():
   return "1.0"
 def icon():
   return "icons/raster-info.png"
-def classFactory(iface): 
+def classFactory(iface):
   # load GdalTools class from file GdalTools
-  from GdalTools import GdalTools 
+  from GdalTools import GdalTools
   return GdalTools(iface)
 
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -84,7 +84,9 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
         @param painter painter
         @param extent map extent
         @param size size in scene coordinates
-        @param dpi scene dpi*/
+        @param dpi scene dpi
+	@param forceWidthScale force wysiwyg line widths / marker sizes
+	*/
     void draw( QPainter *painter, const QgsRectangle& extent, const QSizeF& size, double dpi, double* forceWidthScale = 0 );
 
     /** \brief Reimplementation of QCanvasItem::paint - draw on canvas */

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -142,7 +142,7 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
-      @param elem items parent element, e.g. <Composer> or <ComposerItemClipboard>
+      @param elem items parent element, e.g. \verbatim <Composer> \endverbatim or \verbatim <ComposerItemClipboard> \endverbatim
       @param doc xml document
       @param addUndoCommands insert AddItem commands if true (e.g. for copy/paste)
       @param pos item position. Optional, take position from xml if 0*/

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -534,7 +534,7 @@ QString QgsApplication::reportStyleSheet()
   QColor myColor2 = myColor1;
   myColor2 = myColor2.lighter( 110 ); //10% lighter
   QString myStyle;
-  myStyle = ".glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
+  myStyle = "p.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
             "stop: 0 " + myColor1.name()  + ","
             "stop: 0.1 " + myColor2.name() + ","
             "stop: 0.5 " + myColor1.name()  + ","
@@ -546,6 +546,15 @@ QString QgsApplication::reportStyleSheet()
             "padding-bottom: 8px;"
             "border: 1px solid #6c6c6c;"
             "}"
+            "th.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
+            "stop: 0 " + myColor1.name()  + ","
+            "stop: 0.1 " + myColor2.name() + ","
+            "stop: 0.5 " + myColor1.name()  + ","
+            "stop: 0.9 " + myColor2.name() + ","
+            "stop: 1 " + myColor1.name() + ");"
+            "color: white;"
+            "border: 1px solid #6c6c6c;"
+            "}"
             ".overview{ font: 1.82em; font-weight: bold;}"
             "body{  background: white;"
             "  color: black;"

diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -62,8 +62,10 @@ void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& for
   printf( "\n" );
   printf( "Content-Length: %d\n", ba->size() );
   printf( "\n" );
+#ifdef QGISDEBUG
   int result = fwrite( ba->data(), ba->size(), 1, FCGI_stdout );
   QgsDebugMsg( QString( "Sent %1 bytes" ).arg( result ) );
+#endif
 }
 
 QString QgsHttpRequestHandler::formatToMimeType( const QString& format ) const