[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Torsten Rahn <tackat () kde ! org>
Date:       2009-04-01 10:10:39
Message-ID: 1238580639.520913.5832.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 947734 by rahn:


- Some further fixes by Helmut Mülner:

- GeoSceneMapTheme.cpp: translation does not work with UTF-8 characters e.g. German \
                umlauts
- KmlRoleTagHandler.cpp: empty role elements are set to one blank, because later it \
is assumed that they have a length of at least 1




 M  +3 -1      handlers/kml/KmlRoleTagHandler.cpp  
 M  +1 -1      scene/GeoSceneMapTheme.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlRoleTagHandler.cpp \
#947733:947734 @@ -44,7 +44,9 @@
     
     if( parentItem.nodeAs<GeoDataPlacemark>() ) {
         QString role = parser.readElementText().trimmed();
-        
+        if ( role.isEmpty() ) {
+            role = " ";
+        }        
         parentItem.nodeAs<GeoDataPlacemark>()->setRole( role.at( 0 ) );
 #ifdef DEBUG_TAGS
 //         qDebug() << "Parsed <" << kmlTag_role << "> containing: " << content
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneMapTheme.cpp #947733:947734
@@ -219,7 +219,7 @@
         mapthememodel->setData( mapthememodel->index( row, 0,
         QModelIndex() ), mapThemeIcon, Qt::DecorationRole );
         mapthememodel->setData( mapthememodel->index( row, 0,
-        QModelIndex() ), QString( "<span style=\" max-width: 150 px;\"> " + tr( \
maptheme->description().toUtf8() ) + " </span>"), Qt::ToolTipRole); +        \
QModelIndex() ), QString( "<span style=\" max-width: 150 px;\"> " + tr( \
                maptheme->description().toLatin1() ) + " </span>"), Qt::ToolTipRole);
         mapthememodel->setData( mapthememodel->index( row, 1, QModelIndex() ),
         currentmaptheme );
     }


[prev in list] [next in list] [prev in thread] [next in thread]