From 5fc3fdb057a38c4c237a09c390871899dcfde24a Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 22 Dec 2014 15:11:27 +0100 Subject: KDE 4.10.5 for Slackware 14.0 (02jul2013) --- kde/patch/kdeedu/marble130_qt480_colorfix.diff | 65 -------------------------- 1 file changed, 65 deletions(-) delete mode 100644 kde/patch/kdeedu/marble130_qt480_colorfix.diff (limited to 'kde/patch/kdeedu/marble130_qt480_colorfix.diff') diff --git a/kde/patch/kdeedu/marble130_qt480_colorfix.diff b/kde/patch/kdeedu/marble130_qt480_colorfix.diff deleted file mode 100644 index 5e88fc4..0000000 --- a/kde/patch/kdeedu/marble130_qt480_colorfix.diff +++ /dev/null @@ -1,65 +0,0 @@ -commit 79c39f45468bace95169d1ba959884ce27087d1e -Author: Torsten Rahn -Date: Wed Feb 8 17:18:15 2012 +0100 - - Fixes for Marble with Qt 4.8: - - - Provide proper colors for Marble's Atlas, Temperature, - Precipitation and Venus/Mars Topography maps. - ( due to introduction of QImage::fill( QColor ) overload ) - - - Show proper icons for MarbleLegendBrowser - ( due to new interpretation of the "current directory" in - QTextBrowser ) - -diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp -index 4a25095..ffa0a23 100644 ---- a/src/lib/MarbleLegendBrowser.cpp -+++ b/src/lib/MarbleLegendBrowser.cpp -@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend() - t.start(); - - // Read the html string. -- QString finalHtml; -+ QString legendPath; - - // Check for a theme specific legend.html first - if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 ) - { - GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme(); - -- QString customLegendPath = MarbleDirs::path( "maps/" + -+ legendPath = MarbleDirs::path( "maps/" + - currentMapTheme->head()->target() + '/' + - currentMapTheme->head()->theme() + "/legend.html" ); -- if ( !customLegendPath.isEmpty() ) -- finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) ); -- else -- finalHtml.clear(); - } -- -- if ( finalHtml.isEmpty() ) { -- finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) ); -+ if ( legendPath.isEmpty() ) { -+ legendPath = MarbleDirs::path( "legend.html" ); - } - -+ QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) ); -+ finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' ); -+ - // Generate some parts of the html from the MapTheme tag. - const QString sectionsHtml = generateSectionsHtml(); - -diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp -index 4a4f8f3..d0deead 100644 ---- a/src/lib/TextureColorizer.cpp -+++ b/src/lib/TextureColorizer.cpp -@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport - m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 ); - - // update coast image -- m_coastImage.fill( Qt::transparent ); -+ m_coastImage.fill( QColor( 0, 0, 255, 0) ); - - bool doClip = false; //assume false - switch( viewport->projection() ) { -- cgit v1.2.3