File 4_1_BRANCH.diff of Package kdeedu4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_1_BRANCH.diff of Package kdeedu4 (Revision 4b6091bf036e807868975441f2316974)

Currently displaying revision 4b6091bf036e807868975441f2316974 , Show latest

package: kdeedu-4.1.0.tar.bz2
kdemod: kdeedu
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 842206
+svn di between //tags/KDE/4.1.0/kdeedu and //branches/KDE/4.1/kdeedu
--- blinken/src/blinken.desktop	
+++ blinken/src/blinken.desktop	
@@ -29,6 +29,7 @@
 Comment[gl]=Un programa para mellorar a memoria
 Comment[gu]=યાદશક્તિ વધારવાની રમત
 Comment[hi]=याददाश्त बढ़ाने का एक खेल
+Comment[hr]=Igra vježbanja memorije
 Comment[hu]=Memóriatesztelő játék
 Comment[it]=Un gioco per esercitare la memoria
 Comment[ja]=記憶力増強ゲーム
@@ -46,6 +47,7 @@
 Comment[pt]=Um jogo antigo para melhorar a memória
 Comment[pt_BR]=Um jogo para melhorar a memória
 Comment[ro]=Un joc de îmbunătățire a memoriei
+Comment[ru]=Игра для развития памяти
 Comment[sl]=Igra za izboljšanje spomina
 Comment[sv]=Ett spel för att förbättra minnet
 Comment[tr]=Bir fiş ve dilbilgisi öğrenme uygulaması
--- libkdeedu/kdeeduui/kdeeduglossary.cpp	
+++ libkdeedu/kdeeduui/kdeeduglossary.cpp	
@@ -433,7 +433,6 @@
         }
 
     }
-    main->sortChildren( 0, Qt::AscendingOrder );
     return main;
 }
 
@@ -447,6 +446,7 @@
     d->m_glossaries.append( gi );
 
     d->m_glosstree->addTopLevelItem( d->createItem( gi ) );
+    d->m_glosstree->sortItems( 0, Qt::AscendingOrder );
 }
 
 QTreeWidgetItem* GlossaryDialog::Private::findTreeWithLetter( const QChar& l, QTreeWidgetItem* item ) const
--- libkdeedu/libscience/elementparser.cpp	
+++ libkdeedu/libscience/elementparser.cpp	
@@ -347,7 +347,7 @@
     }
     else if (d->inCountry){
         if ( ch == "ancient" ) {
-            value = -1;
+            value = 0;
             type = ChemicalDataObject::date; 
         } else {
             value = ch;
--- libkdeedu/libscience/data/elements.xml	
+++ libkdeedu/libscience/data/elements.xml	
@@ -2619,7 +2619,7 @@
     <scalar dataType="xsd:string" dictRef="bo:nameOrigin" xml:lang="en">Temporary symbol and name. Can also be referred to as eka-astatine.</scalar>
     <array title="color" dictRef="bo:elementColor" size="3" dataType="xsd:float">0.99 0.00 0.07</array>
     <scalar dataType="xsd:string" dictRef="bo:periodTableBlock">p</scalar>
-    <scalar dataType="xsd:date" dictRef="bo:discoveryDate">0</scalar>
+    <scalar dataType="xsd:date" dictRef="bo:discoveryDate">-1</scalar>
     <scalar dataType="xsd:int" dictRef="bo:period">7</scalar>
     <scalar dataType="xsd:string" dictRef="bo:family">Halogene</scalar>
   </atom>
--- kturtle/src/kturtle.desktop	
+++ kturtle/src/kturtle.desktop	
@@ -27,6 +27,7 @@
 GenericName[gl]=Ambiente de Programación Educativo
 GenericName[gu]=શૈક્ષણિક પ્રોગ્રામિંગ વાતાવરણ
 GenericName[hi]=शैक्षणिक प्रोग्रामिंग माहौल
+GenericName[hr]=Programsko okruženje za obrazovanje
 GenericName[hu]=Programozástanító
 GenericName[it]=Ambiente educativo di programmazione
 GenericName[ja]=子供のためのプログラミング環境
@@ -43,6 +44,7 @@
 GenericName[pt]=Ambiente de Programação em Logo
 GenericName[pt_BR]=Ambiente de Programação Educacional
 GenericName[ro]=Mediu de programare educațional
+GenericName[ru]=Среда обучения программированию
 GenericName[sl]=Okolje za učenje programiranja
 GenericName[sv]=Programmeringsmiljö för utbildning
 GenericName[tr]=Eğitimsel Programlama Ortamı
--- parley/plasmoid/plasma_parley.desktop	
+++ parley/plasmoid/plasma_parley.desktop	
@@ -18,17 +18,20 @@
 Comment[ga]=Cártaí Stóir Focal
 Comment[gl]=Cartolinas de Vocabulario
 Comment[gu]=શબ્દયાદી માહિતી
+Comment[hr]=Kartice vokabulara
 Comment[it]=Carte di vocabolari
 Comment[ja]=語彙カード
 Comment[km]=កាតវាក្យស័ព្ទ
 Comment[lv]=Vārdnīcas kārtis
 Comment[ml]=വാക്പട്ടിക കാര്‍ടുകള്‍
+Comment[nb]=Glosekort
 Comment[nds]=Vokavel-Koorten
 Comment[nl]=Woordenschatkaarten
 Comment[nn]=Ordkort
 Comment[pl]=Karty do nauki słownictwa
 Comment[pt]=Cartões de Vocabulário
 Comment[pt_BR]=Cartões de Vocabulário
+Comment[ru]=Словарные карточки
 Comment[sv]=Ordförrådskort
 Comment[tr]=Sözcük Hazinesi Kartları
 Comment[uk]=Словникові картки
--- parley/plasmoid/engine/plasma-dataengine-parley.desktop	
+++ parley/plasmoid/engine/plasma-dataengine-parley.desktop	
@@ -10,17 +10,20 @@
 Name[ga]=Inneall Sonraí Parley
 Name[gl]=Motor de datos de Parley
 Name[gu]=પારેલે માહિતી એન્જિન
+Name[hr]=Parley pogono podataka
 Name[it]=Sorgente di dati di Parley
 Name[ja]=Parley データエンジン
 Name[km]=ម៉ាស៊ីនទិន្នន័យចរចា
 Name[lv]=Parley datu dzinējs
 Name[ml]=പാര്‍ലി ഡാറ്റ എന്‍ജിന്‍
+Name[nb]=Parley datamotor
 Name[nds]=Parley-Datenkarn
 Name[nl]=Parley-gegevensengine
 Name[nn]=Parley datamotor
 Name[pl]=Silnik danych Parley
 Name[pt]=Motor de Dados do Parley
 Name[pt_BR]=Motor de Dados do Parley
+Name[ru]=Файл Parley
 Name[sv]=Parleys datagränssnitt
 Name[tr]=Parley Veri Motoru
 Name[uk]=Рушій даних Parley
@@ -38,11 +41,13 @@
 Comment[ga]=Sonraí Stóir Focal le haghaidh Plasmoids
 Comment[gl]=Datos de vocabulario para Plasmoides
 Comment[gu]=પ્લાઝમોઇડ માટે શબ્દયાદી માહિતી
+Comment[hr]=Podaci vokabulara za Plasmoids
 Comment[it]=Dati di vocabolari per plasmoidi
 Comment[ja]=プラズモイド用の語彙データ
 Comment[km]=ទិន្នន័យវាក្យស័ព្ទសម្រាប់ Plasmoids
 Comment[lv]=Vārdnīcas dati plazmoīdiem
 Comment[ml]=പ്ലാസ്മോയിഡ്സിനായുള്ള വാക്പട്ടിക ഡാറ്റ
+Comment[nb]=Ordlistedata for Plasmoider
 Comment[nds]=Vokavel-Daten för Plasmoiden
 Comment[nl]=Woordenschatgegevens voor plasmoids
 Comment[nn]=Orddata for plasmoidar
@@ -50,6 +55,7 @@
 Comment[pt]=Dados de vocabulário dos Plasmóides
 Comment[pt_BR]=Vocabulário de dados para Plasmóides
 Comment[ro]=Vocabular pentru plasmoizi
+Comment[ru]=Словарные данные для плазмоидов
 Comment[sv]=Ordförrådsdata för plasmoider
 Comment[tr]=Plasma programcıkları için Sözcük Hazinesi verileri
 Comment[uk]=Словникові дані для Плазмоїдів
--- klettres/src/klettres.desktop	
+++ klettres/src/klettres.desktop	
@@ -20,6 +20,7 @@
 Comment[gl]=Un programa para aprender o alfabeto con KDE
 Comment[gu]=KDE કાર્યક્રમ જે અક્ષરો શીખવાડે છે
 Comment[hi]=वर्णमाला सीखने के लिए एक केडीई प्रोग्राम
+Comment[hr]=KDE program za učenje abecede
 Comment[hu]=KDE-alapú oktatóprogram az ábécé gyakorlásához
 Comment[it]=Un programma KDE per imparare l'alfabeto
 Comment[ja]=アルファベットを学習するための KDE プログラム
@@ -36,6 +37,7 @@
 Comment[pt]=Um programa do KDE para aprender o alfabeto
 Comment[pt_BR]=um programa do KDE para aprender o alfabeto
 Comment[ro]=un program KDE pentru însușirea alfabetului
+Comment[ru]=Программа для изучения алфавита
 Comment[sl]=Program za učenje abecede
 Comment[sv]=Ett KDE program för att lära sig alfabetet
 Comment[tr]=Alfabeyi öğrenmenize yarayan bir KDE uygulaması
@@ -73,6 +75,7 @@
 GenericName[ga]=Foghlaim an Aibítir
 GenericName[gl]=Aprender o alfabeto
 GenericName[gu]=અક્ષરો શીખો
+GenericName[hr]=Učite abecedu
 GenericName[hu]=Ábécétanító
 GenericName[it]=Impara l'alfabeto
 GenericName[ja]=アルファベットの学習
@@ -90,6 +93,7 @@
 GenericName[pt]=Aprender o Alfabeto
 GenericName[pt_BR]=Aprender o alfabeto
 GenericName[ro]=Învață alfabetul
+GenericName[ru]=Изучение алфавита
 GenericName[sl]=Učenje abecede
 GenericName[sv]=Inlärning av alfabetet
 GenericName[tr]=Alfabeyi Öğren
--- kwordquiz/src/multipleview.cpp	
+++ kwordquiz/src/multipleview.cpp	
@@ -35,6 +35,11 @@
   connect(opt3, SIGNAL(clicked()), this, SLOT(slotOpt3Clicked()));
 }
 
+MultipleView::~MultipleView()
+{
+  delete m_score;
+}
+
 void MultipleView::setQuiz(KWQQuiz *quiz)
 {
   m_quiz = quiz;
--- kwordquiz/src/kwordquiz.desktop	
+++ kwordquiz/src/kwordquiz.desktop	
@@ -85,6 +85,7 @@
 GenericName[ga]=Oiliúnóir Luaschártaí
 GenericName[gl]=Entrenador de Vocabulario
 GenericName[gu]=ફ્લેશ કાર્ડ શિખવનાર
+GenericName[hr]=Vježbanje fleš kartica
 GenericName[hu]=Tanulókártyák
 GenericName[it]=Apprendimento con carte mnemoniche
 GenericName[ja]=フラッシュカード
@@ -99,6 +100,7 @@
 GenericName[pl]=Trening słownictwa
 GenericName[pt]=Treinador de Cartões
 GenericName[pt_BR]=Treinador de Cartões
+GenericName[ru]=Тренировка словарного запаса
 GenericName[sl]=Učenje s spominskimi kartami
 GenericName[sv]=Snabbkortsträning
 GenericName[tr]=Fiş Çalıştırıcı
--- kwordquiz/src/multipleview.h	
+++ kwordquiz/src/multipleview.h	
@@ -34,7 +34,7 @@
 Q_OBJECT
 public:
     MultipleView(QWidget *parent, KActionCollection *actionCollection);
-
+    ~MultipleView();
     void setQuiz(KWQQuiz *quiz);
     void init();
 
--- kgeography/src/script.cpp	
+++ kgeography/src/script.cpp	
@@ -89,4 +89,5 @@
 		delete f;
 	}
 	output->close();
+        delete output;
 }
--- kgeography/data/world.kgm	
+++ kgeography/data/world.kgm	
@@ -1205,8 +1205,8 @@
 		<capital>Tegucigalpa</capital>
 		<flag>honduras.png</flag>
 		<color>
-			<red>0</red>
-			<green>0</green>
+			<red>255</red>
+			<green>255</green>
 			<blue>204</blue>
 		</color>
 	</division>
--- marble/Messages.sh	
+++ marble/Messages.sh	
@@ -4,6 +4,7 @@
   for field in name description heading text ; do
     grep -inH "<$field>.*<\/$field>" $fname \
     | sed 's/\"/\\\"/g' \
+    | sed 's/<!\[CDATA\[$.*$\]\]>/\1/' \
     | sed "s/\$[^:]*\$:\$[^:]*\$:.*<$field>$.*$<\/$field>.*/\
            \/\/i18n: file \1 line \2\n\
            i18n(\"\3\");\
--- marble/ChangeLog	
+++ marble/ChangeLog	
@@ -1,3 +1,9 @@
+2008-08-01  Patrick Spendrin    <ps_ml@gmx.de>
+
+    * src/lib/CMakeLists.txt
+
+    install MarbleAbstractFloatItem.h and MarbleAbstractLayer.h
+
 2008-07-20  Inge Wallin  <inge@lysator.liu.se>
 
 	Introduce a read-only facade for internal Marble data.
--- marble/src/marble_part.desktop	
+++ marble/src/marble_part.desktop	
@@ -26,6 +26,7 @@
 Name[pl]=Moduł Marble
 Name[pt]=Componente do Marble
 Name[pt_BR]=Componente do Marble
+Name[ru]=Компонент Marble
 Name[sl]=Komponenta Marble
 Name[sv]=Marble-delprogram
 Name[uk]=Компонент Marble
--- marble/src/lib/MarbleWidget.cpp	
+++ marble/src/lib/MarbleWidget.cpp	
@@ -355,6 +355,11 @@
     return QPixmap::grabWidget( this );
 }
 
+bool MarbleWidget::showOverviewMap() const
+{
+    return d->m_map->showOverviewMap();
+}
+
 bool MarbleWidget::showScaleBar() const
 {
     return d->m_map->showScaleBar();
@@ -658,55 +663,47 @@
 
 void MarbleWidget::moveLeft()
 {
-#if 1
-    int polarity = 0;
+    d->m_map->moveLeft();
 
-    if ( northPoleY() != 0 )
-        polarity = northPoleY() / abs(northPoleY());
+    // We only have to repaint the background every time if the earth
+    // doesn't cover the whole image.
+    setAttribute( Qt::WA_NoSystemBackground,  d->m_map->mapCoversViewport() );
 
-    if ( polarity < 0 )
-        rotateBy( +moveStep(), 0 );
-    else
-        rotateBy( -moveStep(), 0 );
-#else
-    d->m_map->moveLeft();
-#endif
+    repaint();
 }
 
 void MarbleWidget::moveRight()
 {
-#if 1
-    int polarity = 0;
+    d->m_map->moveRight();
 
-    if ( northPoleY() != 0 )
-        polarity = northPoleY() / abs(northPoleY());
+    // We only have to repaint the background every time if the earth
+    // doesn't cover the whole image.
+    setAttribute( Qt::WA_NoSystemBackground,  d->m_map->mapCoversViewport() );
 
-    if ( polarity < 0 )
-        rotateBy( -moveStep(), 0 );
-    else
-        rotateBy( +moveStep(), 0 );
-#else
-    d->m_map->moveRight();
-#endif
+    repaint();
 }
 
 
 void MarbleWidget::moveUp()
 {
-#if 1
-    rotateBy( 0, -moveStep() );
-#else
     d->m_map->moveUp();
-#endif
+
+    // We only have to repaint the background every time if the earth
+    // doesn't cover the whole image.
+    setAttribute( Qt::WA_NoSystemBackground,  d->m_map->mapCoversViewport() );
+
+    repaint();
 }
 
 void MarbleWidget::moveDown()
 {
-#if 1
-    rotateBy( 0, +moveStep() );
-#else
     d->m_map->moveDown();
-#endif
+
+    // We only have to repaint the background every time if the earth
+    // doesn't cover the whole image.
+    setAttribute( Qt::WA_NoSystemBackground,  d->m_map->mapCoversViewport() );
+
+    repaint();
 }
 
 void MarbleWidget::leaveEvent (QEvent*)
@@ -806,6 +803,9 @@
 
 void MarbleWidget::paintEvent(QPaintEvent *evt)
 {
+    QTime t;
+    t.start();
+
     // FIXME: Better way to get the GeoPainter
     bool  doClip = true;
     if ( d->m_map->projection() == Spherical )
@@ -817,7 +817,16 @@
 			map()->viewParams()->mapQuality(), doClip );
 
     QRect  dirtyRect = evt->rect();
-    d->m_map->paint( painter, dirtyRect );
+
+    // Draws the map like MarbleMap::paint does, but adds our customPaint in between
+    d->m_map->d->paintGround( painter, dirtyRect );
+    d->m_map->customPaint( &painter );
+    customPaint(&painter);
+    d->m_map->d->paintOverlay( painter, dirtyRect );
+
+    double fps = 1000.0 / (double)( t.elapsed() );
+    d->m_map->d->paintFps(painter, dirtyRect, fps);
+    emit d->m_map->framesPerSecond( fps );
 }
 
 void MarbleWidget::customPaint(GeoPainter *painter)
@@ -871,6 +880,13 @@
     repaint();
 }
 
+void MarbleWidget::setShowOverviewMap( bool visible )
+{
+    d->m_map->setShowOverviewMap( visible );
+
+    repaint();
+}
+
 void MarbleWidget::setShowScaleBar( bool visible )
 {
     d->m_map->setShowScaleBar( visible );
--- marble/src/lib/Projections/MercatorProjection.cpp	
+++ marble/src/lib/Projections/MercatorProjection.cpp	
@@ -17,6 +17,18 @@
 #include "ViewportParams.h"
 
 #ifdef Q_CC_MSVC
+#include <float.h>
+static double msvc_asinh(double x)
+{
+  if ( _isnan ( x ) ) {
+    errno = EDOM;
+    return x;
+  }
+
+  return ( log( x + sqrt ( x * x + 1.0 ) ) );
+}
+#define asinh msvc_asinh
+
 static double msvc_atanh(double x)
 {
   return ( 0.5 * log( ( 1.0 + x ) / ( 1.0 - x ) ) );
--- marble/src/lib/MarbleWidget.h	
+++ marble/src/lib/MarbleWidget.h	
@@ -124,6 +124,7 @@
     Q_PROPERTY(double longitude  READ centerLongitude WRITE setCenterLongitude)
     Q_PROPERTY(double latitude   READ centerLatitude  WRITE setCenterLatitude)
 
+    Q_PROPERTY(bool showOverviewMap READ showOverviewMap    WRITE setShowOverviewMap)
     Q_PROPERTY(bool showScaleBar READ showScaleBar    WRITE setShowScaleBar)
     Q_PROPERTY(bool showCompass  READ showCompass     WRITE setShowCompass)
     Q_PROPERTY(bool showGrid     READ showGrid        WRITE setShowGrid)
@@ -350,6 +351,12 @@
     QPixmap mapScreenShot();
 
     /**
+     * @brief  Return whether the overview map is visible.
+     * @return The overview map visibility.
+     */
+    bool  showOverviewMap() const;
+
+    /**
      * @brief  Return whether the scale bar is visible.
      * @return The scale bar visibility.
      */
@@ -654,6 +661,12 @@
     void setPropertyValue( const QString& name, bool value );
 
     /**
+     * @brief  Set whether the overview map overlay is visible
+     * @param  visible  visibility of the overview map
+     */
+    void setShowOverviewMap( bool visible );
+
+    /**
      * @brief  Set whether the scale bar overlay is visible
      * @param  visible  visibility of the scale bar
      */
--- marble/src/lib/AbstractScanlineTextureMapper.h	
+++ marble/src/lib/AbstractScanlineTextureMapper.h	
@@ -18,15 +18,14 @@
 
 #include <cmath>
 #include <math.h>
-#ifdef _MSC_VER
-#include <msvc/math.h>
-#endif
 
 #include "TileLoader.h"
 #include "TextureTile.h"
 #include "GeoSceneTexture.h"
 
 #ifdef Q_CC_MSVC
+#include <math.h>
+#include <float.h>
 static double msvc_asinh(double x)
 {
   if ( _isnan ( x ) ) {
--- marble/src/lib/MapThemeManager.cpp	
+++ marble/src/lib/MapThemeManager.cpp	
@@ -232,7 +232,7 @@
     QString description = mapTheme->head()->description();
 
     QStandardItem *item = new QStandardItem( name );
-    item->setData( name, Qt::DisplayRole );
+    item->setData( tr( name.toUtf8() ), Qt::DisplayRole );
     item->setData( mapThemeIcon, Qt::DecorationRole );
     item->setData( QString( "<span style=\" max-width: 150 px;\"> " 
                    + tr( description.toUtf8() ) + " </span>"), Qt::ToolTipRole);
@@ -241,7 +241,7 @@
     itemList << new QStandardItem( mapTheme->head()->target() + '/' 
                                    + mapTheme->head()->theme() + '/'
                                    + mapTheme->head()->theme() + ".dgml" );
-    itemList << new QStandardItem( description );
+    itemList << new QStandardItem( tr( description.toUtf8() ) );
 
     delete mapTheme;

Property changes on: marble/src/lib/KmlFileViewItem.cpp
___________________________________________________________________
Added: svn:mergeinfo

--- marble/src/lib/MarbleMap.cpp	
+++ marble/src/lib/MarbleMap.cpp	
@@ -363,6 +363,11 @@
     return value;
 }
 
+bool MarbleMap::showOverviewMap() const
+{
+    return propertyValue( "overviewmap" );
+}
+
 bool MarbleMap::showScaleBar() const
 {
     return propertyValue( "scalebar" );
@@ -812,78 +817,15 @@
 // Used to be paintEvent()
 void MarbleMap::paint(GeoPainter &painter, QRect &dirtyRect) 
 {
-    if ( !d->m_viewParams.mapTheme() ) {
-        qDebug() << "No theme yet!";
-        return;
-    }
-        
     QTime t;
     t.start();
 
-    bool  doClip = false;
-    if ( d->m_viewParams.projection() == Spherical )
-        doClip = ( d->m_viewParams.radius() > d->m_viewParams.canvasImage()->width() / 2
-                   || d->m_viewParams.radius() > d->m_viewParams.canvasImage()->height() / 2 );
-
-    d->m_model->paintGlobe( &painter,
-                            width(), height(), &d->m_viewParams,
-                            needsUpdate()
-                            || d->m_viewParams.canvasImage()->isNull(),
-                            dirtyRect );
-    // FIXME: this is ugly, add method updatePlanetAxis() to ViewParams
-    d->m_viewParams.setPlanetAxisUpdated( d->m_viewParams.planetAxis() );
-    // FIXME: this is ugly, add method updateRadius() to ViewParams
-    d->m_viewParams.setRadiusUpdated( d->m_viewParams.radius() );
-    d->m_justModified                   = false;
-
-    // FIXME: This is really slow. That's why we defer this to
-    //        PrintQuality. Either cache on a pixmap - or maybe
-    //        better: Add to GlobeScanlineTextureMapper.
-
-    if ( d->m_viewParams.mapQuality() == Marble::Print )
-        d->drawFog(painter);
-
+    d->paintGround(painter, dirtyRect);
     customPaint( &painter );
-
-//    int transparency = ( d->m_viewParams.mapQuality() == Marble::Low ) ? 255 : 192;
-
-    // 2. Paint the crosshair.
-    d->m_crosshair.paint( &painter,
-                          d->m_viewParams.canvasImage()->width(),
-                          d->m_viewParams.canvasImage()->height() );
-
-    // 3. Paint measure points if there are any.
-
-    bool antialiased = false;
-
-    if (   d->m_viewParams.mapQuality() == Marble::High
-        || d->m_viewParams.mapQuality() == Marble::Print ) {
-            antialiased = true;
-    }
-
-    d->m_measureTool->paint( &painter, d->m_viewParams.viewport(), antialiased );
-
-    // Set the Bounding Box
-    d->setBoundingBox();
+    d->paintOverlay(painter, dirtyRect);
 
     double fps = 1000.0 / (double)( t.elapsed() );
-
-    if ( d->m_showFrameRate == true ) {
-        QString fpsString = QString( "Speed: %1 fps" ).arg( fps, 5, 'f', 1, QChar(' ') );
-
-        QPoint fpsLabelPos( 10, 20 );
-
-        painter.setFont( QFont( "Sans Serif", 10 ) );
-
-        painter.setPen( Qt::black );
-        painter.setBrush( Qt::black );
-        painter.drawText( fpsLabelPos, fpsString );
-
-        painter.setPen( Qt::white );
-        painter.setBrush( Qt::white );
-        painter.drawText( fpsLabelPos.x() - 1, fpsLabelPos.y() - 1, fpsString );
-    }
-
+    d->paintFps(painter, dirtyRect, fps);
     emit framesPerSecond( fps );
 }
 
@@ -929,6 +871,11 @@
     d->m_viewParams.setPropertyValue( name, value );
 }
 
+void MarbleMap::setShowOverviewMap( bool visible )
+{
+    setPropertyValue( "overviewmap", visible );
+}
+
 void MarbleMap::setShowScaleBar( bool visible )
 {
     setPropertyValue( "scalebar", visible );
@@ -980,6 +927,8 @@
 void MarbleMap::setShowRelief( bool visible )
 {
     setPropertyValue( "relief", visible );
+    // Update texture map during the repaint that follows:
+    setNeedsUpdate();
 }
 
 void MarbleMap::setShowElevationModel( bool visible )
@@ -992,6 +941,8 @@
 void MarbleMap::setShowIceLayer( bool visible )
 {
     setPropertyValue( "ice", visible );
+    // Update texture map during the repaint that follows:
+    setNeedsUpdate();
 }
 
 void MarbleMap::setShowBorders( bool visible )
@@ -1007,6 +958,8 @@
 void MarbleMap::setShowLakes( bool visible )
 {
     setPropertyValue( "lakes", visible );
+    // Update texture map during the repaint that follows:
+    setNeedsUpdate();
 }
 
 void MarbleMap::setShowFrameRate( bool visible )
@@ -1226,4 +1179,80 @@
     return d->m_model->floatItems();
 }
 
+void MarbleMapPrivate::paintGround( GeoPainter &painter, QRect &dirtyRect)
+{
+    if ( !m_viewParams.mapTheme() ) {
+        qDebug() << "No theme yet!";
+        return;
+    }
+
+    bool  doClip = false;
+    if ( m_viewParams.projection() == Spherical )
+        doClip = ( m_viewParams.radius() > m_viewParams.canvasImage()->width() / 2
+                   || m_viewParams.radius() > m_viewParams.canvasImage()->height() / 2 );
+
+    m_model->paintGlobe( &painter,
+                            m_parent->width(), m_parent->height(), &m_viewParams,
+                            m_parent->needsUpdate()
+                            || m_viewParams.canvasImage()->isNull(),
+                            dirtyRect );
+    // FIXME: this is ugly, add method updatePlanetAxis() to ViewParams
+    m_viewParams.setPlanetAxisUpdated( m_viewParams.planetAxis() );
+    // FIXME: this is ugly, add method updateRadius() to ViewParams
+    m_viewParams.setRadiusUpdated( m_viewParams.radius() );
+    m_justModified                   = false;
+
+    // FIXME: This is really slow. That's why we defer this to
+    //        PrintQuality. Either cache on a pixmap - or maybe
+    //        better: Add to GlobeScanlineTextureMapper.
+
+    if ( m_viewParams.mapQuality() == Marble::Print )
+        drawFog(painter);
+}
+
+void MarbleMapPrivate::paintOverlay( GeoPainter &painter, QRect &dirtyRect)
+{
+//    int transparency = ( d->m_viewParams.mapQuality() == Marble::Low ) ? 255 : 192;
+
+    // 2. Paint the crosshair.
+    m_crosshair.paint( &painter,
+                          m_viewParams.canvasImage()->width(),
+                          m_viewParams.canvasImage()->height() );
+
+    // 3. Paint measure points if there are any.
+
+    bool antialiased = false;
+
+    if (   m_viewParams.mapQuality() == Marble::High
+        || m_viewParams.mapQuality() == Marble::Print ) {
+            antialiased = true;
+    }
+
+    m_measureTool->paint( &painter, m_viewParams.viewport(), antialiased );
+
+    // Set the Bounding Box
+    setBoundingBox();
+}
+
+void MarbleMapPrivate::paintFps( GeoPainter &painter, QRect &dirtyRect, double fps)
+{
+    Q_UNUSED(dirtyRect);
+
+    if ( m_showFrameRate == true ) {
+        QString fpsString = QString( "Speed: %1 fps" ).arg( fps, 5, 'f', 1, QChar(' ') );
+
+        QPoint fpsLabelPos( 10, 20 );
+
+        painter.setFont( QFont( "Sans Serif", 10 ) );
+
+        painter.setPen( Qt::black );
+        painter.setBrush( Qt::black );
+        painter.drawText( fpsLabelPos, fpsString );
+
+        painter.setPen( Qt::white );
+        painter.setBrush( Qt::white );
+        painter.drawText( fpsLabelPos.x() - 1, fpsLabelPos.y() - 1, fpsString );
+    }
+}
+
 #include "MarbleMap.moc"
--- marble/src/lib/TextureColorizer.cpp	
+++ marble/src/lib/TextureColorizer.cpp	
@@ -28,6 +28,20 @@
 #include "ViewportParams.h"
 #include "AbstractProjection.h"
 
+#ifdef Q_CC_MSVC
+#include <float.h>
+static double msvc_asinh(double x)
+{
+  if ( _isnan ( x ) ) {
+    errno = EDOM;
+    return x;
+  }
+
+  return ( log( x + sqrt ( x * x + 1.0 ) ) );
+}
+#define asinh msvc_asinh
+#endif
+
 uint TextureColorizer::texturepalette[16][512];
 
 TextureColorizer::TextureColorizer( const QString& seafile, 
@@ -291,12 +305,14 @@
             texturepalette[i][j] = 0;
         }
     }
-    QImage   *gradientImage = new QImage( 256, 10, QImage::Format_RGB32 );
-    QPainter  gradientPainter( gradientImage );
+    QImage   gradientImage ( 256, 10, QImage::Format_RGB32 );
+    QPainter  gradientPainter;
+    gradientPainter.begin( &gradientImage );
     gradientPainter.setPen( Qt::NoPen );
 
     QImage    shadingImage ( 256, 10, QImage::Format_RGB32 );
-    QPainter  shadingPainter( &shadingImage );
+    QPainter  shadingPainter;
+    shadingPainter.begin( &shadingImage );
     shadingPainter.setPen( Qt::NoPen );
 
     int offset = 0;
@@ -331,7 +347,7 @@
 
             for ( int i = 0; i < 256; ++i ) {
 
-                    QRgb  shadeColor = gradientImage->pixel( i, 1 );
+                    QRgb  shadeColor = gradientImage.pixel( i, 1 );
                     QLinearGradient  shadeGradient( 0, 0, 256, 0 );
                     shadeGradient.setColorAt(0.15, QColor(Qt::white));
                     shadeGradient.setColorAt(0.496, shadeColor);
@@ -347,6 +363,9 @@
         }
         offset += 256;
     }
+    shadingPainter.end();  // Need to explicitely tell painter lifetime to avoid crash
+    gradientPainter.end(); // on some systems. 
+
     m_seafile = seafile;
     m_landfile = landfile;
 }
--- marble/src/lib/MarbleThemeSelectView.cpp	
+++ marble/src/lib/MarbleThemeSelectView.cpp	
@@ -33,11 +33,6 @@
                    SLOT( selectedMapTheme( QModelIndex ) ) );
 }
 
-#if 0
-MarbleThemeSelectView::setModel( QAbstractItemModel * model )
-{
-}
-#endif
 
 void MarbleThemeSelectView::resizeEvent(QResizeEvent* event)
 {
--- marble/src/lib/MarbleMap_p.h	
+++ marble/src/lib/MarbleMap_p.h	
@@ -39,6 +39,10 @@
     void  setBoundingBox();
     void  doResize();
 
+    void  paintGround( GeoPainter &painter, QRect &dirtyRect);
+    void  paintOverlay( GeoPainter &painter, QRect &dirtyRect);
+    void  paintFps( GeoPainter &painter, QRect &dirtyRect, double fps);
+
     MarbleMap       *m_parent;
 
     // The model we are showing.
--- marble/src/lib/PluginManager.cpp	
+++ marble/src/lib/PluginManager.cpp	
@@ -43,6 +43,7 @@
 
 PluginManager::~PluginManager()
 {
+    delete d;
 }
 
 QList<MarbleAbstractFloatItem *> PluginManager::floatItems() const

Property changes on: marble/src/lib/KmlFileViewItem.h
___________________________________________________________________
Added: svn:mergeinfo

--- marble/src/lib/MarbleControlBox.cpp	
+++ marble/src/lib/MarbleControlBox.cpp	
@@ -522,6 +522,7 @@
             d->uiWidget.zoomSlider->setMinimum( d->m_widget->map()->minimumZoom() );
             d->uiWidget.zoomSlider->setMaximum( d->m_widget->map()->maximumZoom() );
 
+            updateButtons( d->uiWidget.zoomSlider->value() );
             // Break out of the loop
             break;
         }
--- marble/src/lib/MarbleModel.cpp	
+++ marble/src/lib/MarbleModel.cpp	
@@ -141,8 +141,6 @@
     d->m_texmapper = 0;
     d->m_veccomposer = new VectorComposer();
 
-    d->m_placeMarkLayout   = 0;
-
     d->m_gridmap      = new GridMap();
     d->m_texcolorizer = new TextureColorizer( MarbleDirs::path( "seacolors.leg" ),
                                               MarbleDirs::path( "landcolors.leg" ) );
@@ -155,6 +153,13 @@
     d->m_placemarkmodel = new MarblePlacemarkModel( d->m_placemarkmanager, this );
     d->m_placemarkselectionmodel = new QItemSelectionModel( d->m_placemarkmodel );
 
+    d->m_placeMarkLayout = new PlaceMarkLayout( this );
+    connect( d->m_placemarkselectionmodel, SIGNAL( selectionChanged( QItemSelection,
+                                                                        QItemSelection) ),
+                d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
+    connect( d->m_placemarkmodel, SIGNAL( modelReset() ),
+                d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
+
     d->m_placemarkmanager->loadStandardPlaceMarks();
 
     d->m_gpxFileModel = new GpxFileModel( this );
@@ -351,15 +356,6 @@
         }
     }
 
-    if ( d->m_placeMarkLayout == 0) {
-        d->m_placeMarkLayout = new PlaceMarkLayout( this );
-        connect( d->m_placemarkselectionmodel, SIGNAL( selectionChanged( QItemSelection,
-                                                                         QItemSelection) ),
-                 d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
-        connect( d->m_placemarkmodel, SIGNAL( modelReset() ),
-                 d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
-    }
-
     d->m_placeMarkLayout->requestStyleReset();
     // FIXME: To be removed after MapTheme / KML refactoring
 
--- marble/src/lib/MarbleAbstractFloatItem.cpp	
+++ marble/src/lib/MarbleAbstractFloatItem.cpp	
@@ -177,7 +177,7 @@
 QPainterPath MarbleAbstractFloatItem::backgroundShape() const
 {
     QPainterPath path;
-    path.addRect( QRectF( QPointF( 0.0, 0.0 ), d->m_renderedRect.size() ) );
+    path.addRect( QRectF( 0.0, 0.0, d->m_renderedRect.size().width() - 1, d->m_renderedRect.size().height() - 1 ) );
     return path;
 }
 
@@ -358,10 +358,17 @@
     
         // Reinitialize cachePixmap if the float item changes its size 
         // or other important common properties 
-        if ( d->s_pixmapCacheEnabled && d->m_newItemProperties ) {
+        if ( ( d->s_pixmapCacheEnabled && d->m_newItemProperties ) || d->m_cachePixmap.isNull() ) {
             // Add extra space for the border
-            QSize cachePixmapSize = d->m_size.toSize() + QSize( 1, 1 );
-            d->m_cachePixmap = QPixmap( cachePixmapSize );
+            QSize cachePixmapSize = d->m_size.toSize();
+
+
+            if ( d->m_size.isValid() && !d->m_size.isNull() ) {
+                d->m_cachePixmap = QPixmap( cachePixmapSize ).copy();
+            }
+            else {
+                qDebug() << "Warning: Invalid pixmap size suggested: " << d->m_size;
+            }
         }
         // unset the dirty flag once all checks are passed
         d->m_newItemProperties = false;
@@ -369,6 +376,7 @@
         if ( d->s_pixmapCacheEnabled ) {
             d->m_cachePixmap.fill( Qt::transparent );
             GeoPainter pixmapPainter( &( d->m_cachePixmap ), viewport, Normal );
+
             pixmapPainter.translate( 0.5, 0.5 );
             renderBackground( &pixmapPainter );
 
@@ -381,6 +389,8 @@
         }
         else {
             painter->translate( positivePosition( painter->viewport() ) );
+
+            painter->translate( 0.5, 0.5 );
             renderBackground( painter );
             painter->translate( d->s_padding, d->s_padding );
 
--- marble/src/lib/CMakeLists.txt	
+++ marble/src/lib/CMakeLists.txt	
@@ -19,8 +19,8 @@
 INCLUDE(geodata/CMakeLists.txt)
 
 if (QTONLY)
-  set(GENERIC_LIB_VERSION "0.5.0")
-  set(GENERIC_LIB_SOVERSION "5")
+  set(GENERIC_LIB_VERSION "0.6.0")
+  set(GENERIC_LIB_SOVERSION "6")
 endif (QTONLY)
 
 if (QTONLY)
@@ -253,6 +253,10 @@
     MarbleControlBox.h
     MarbleNavigator.h
     MarbleDataFacade.h
+    MarbleAbstractFloatItem.h
+    MarbleAbstractLayer.h
+    MarbleLayerInterface.h
+    AbstractLayer/AbstractLayerInterface.h
     MapThemeManager.h
 
     MarbleWidgetInputHandler.h
--- marble/src/lib/MarbleMap.h	
+++ marble/src/lib/MarbleMap.h	
@@ -296,6 +296,12 @@
     bool  propertyValue( const QString& name) const;
 
     /**
+     * @brief  Return whether the overview map is visible.
+     * @return The overview map visibility.
+     */
+    bool  showOverviewMap() const;
+
+    /**
      * @brief  Return whether the scale bar is visible.
      * @return The scale bar visibility.
      */
@@ -589,6 +595,12 @@
     void setPropertyValue( const QString& name, bool value );
 
     /**
+     * @brief  Set whether the overview map overlay is visible
+     * @param  visible  visibility of the overview map
+     */
+    void setShowOverviewMap( bool visible );
+
+    /**
      * @brief  Set whether the scale bar overlay is visible
      * @param  visible  visibility of the scale bar
      */
--- marble/src/lib/VectorComposer.cpp	
+++ marble/src/lib/VectorComposer.cpp	
@@ -130,7 +130,7 @@
     viewParams->propertyValue( "waterbodies", showWaterbodies );
     viewParams->propertyValue( "lakes", showLakes );
 
-    if ( showWaterbodies || showLakes ) {
+    if ( showWaterbodies && showLakes ) {
          // Lakes
          m_vectorMap -> setzBoundingBoxLimit( 0.95 );
          m_vectorMap -> setzPointLimit( 0.98 ); 
@@ -226,7 +226,7 @@
     viewParams->propertyValue( "waterbodies", showWaterbodies );
     viewParams->propertyValue( "lakes", showLakes );
 
-    if ( showWaterbodies || showLakes ) {
+    if ( showWaterbodies && showLakes ) {
          // Lakes
          m_vectorMap -> setzBoundingBoxLimit( 0.95 );
          m_vectorMap -> setzPointLimit( 0.98 ); 
@@ -283,7 +283,7 @@
     viewParams->propertyValue( "waterbodies", showWaterbodies );
     viewParams->propertyValue( "rivers", showRivers );
 
-    if ( showWaterbodies || showRivers ) {
+    if ( showWaterbodies && showRivers ) {
         // Rivers
          m_vectorMap -> setzBoundingBoxLimit( -1.0 );
          m_vectorMap -> setzPointLimit( -1.0 );
--- marble/src/lib/MarbleDataFacade.cpp	
+++ marble/src/lib/MarbleDataFacade.cpp	
@@ -35,6 +35,7 @@
 
 MarbleDataFacade::~MarbleDataFacade()
 {
+    delete d;
 }
 
 QDateTime MarbleDataFacade::dateTime() const

Property changes on: marble/src/lib/geodata/handlers/kml/KmlSchemaTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlOpenTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlSimpleFieldTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlAreaTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlIconStyleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlWidthTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlNameTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlColorTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/Kml_scaleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlDescriptionTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlFillTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlIconTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHotSpotTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCountrycodeTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPopTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPlacemarkTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCountryNameCodeTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlSchemaTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlRoleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlIconStyleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlDocumentTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlDescriptionTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlNameTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHrefTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/Kml_scaleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPointTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlStyleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlRoleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlLabelStyleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHotSpotTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlLineStyleTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPolyStyleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlFolderTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlDocumentTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlOutlineTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPointTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlElementDictionary.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlVisibilityTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHeadingTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlStyleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlOpenTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlAreaTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlFolderTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlLineStyleTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlOutlineTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlWidthTagHandler.h
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlElementDictionary.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlFillTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlVisibilityTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlIconTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlPopTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/src/lib/geodata/handlers/kml/KmlHeadingTagHandler.cpp
___________________________________________________________________
Added: svn:mergeinfo

--- marble/src/marble.desktop	
+++ marble/src/marble.desktop	
@@ -6,7 +6,6 @@
 Name[hi]=संगमरमर
 Name[km]=ថ្មម៉ាប
 Name[ml]=മാര്‍ബിള്‍
-Name[nb]=Marmor
 Name[ne]=मार्बल
 Name[pa]=ਮਾਰਬਲ
 Name[x-test]=xxMarblexx
@@ -27,6 +26,7 @@
 GenericName[gl]=Planetario
 GenericName[gu]=ડેસ્કટોપ પૃથ્વીનો ગોળો
 GenericName[hi]=डेस्कटॉप ग्लोब
+GenericName[hr]=Globus na radnoj površini
 GenericName[hu]=Asztali földgömb
 GenericName[it]=Globo per il desktop
 GenericName[ja]=デスクトップ地球儀
@@ -44,6 +44,7 @@
 GenericName[pt]=Globo
 GenericName[pt_BR]=Planetário do Ambiente de trabalho
 GenericName[ro]=Glob de birou
+GenericName[ru]=Настольный глобус
 GenericName[sl]=Namizni globus
 GenericName[sv]=Skrivbordsjordglob
 GenericName[tr]=Masaüstünde Dünya
--- marble/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp	
+++ marble/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp	
@@ -41,9 +41,11 @@
 
 QWidget *MarbleWidgetPlugin::createWidget(QWidget *parent)
 {
-    // Create the Model (Globe) and one view.
-    //MarbleModel *model = new MarbleModel( parent );
-    return new MarbleWidget( parent );
+    MarbleWidget* marbleWidget = new MarbleWidget( parent );
+    marbleWidget->setMapThemeId("earth/srtm/srtm.dgml");
+    marbleWidget->setDownloadUrl( "http://download.kde.org/apps/marble/" );
+
+    return marbleWidget;
 }
 
 QString MarbleWidgetPlugin::name() const
--- marble/src/plugins/marble/stars/MarbleStarsPlugin.cpp	
+++ marble/src/plugins/marble/stars/MarbleStarsPlugin.cpp	
@@ -151,7 +151,7 @@
                 continue;
             }
 
-            double  skyRadius      = 0.6 * sqrt( viewport->width() * viewport->width() + viewport->height() * viewport->height() );
+            double  skyRadius      = 0.6 * sqrt( (double)viewport->width() * viewport->width() + viewport->height() * viewport->height() );
             double  earthRadius    = viewport->radius();
             double  earthCenteredX = qpos.v[Q_X] * skyRadius;
             double  earthCenteredY = qpos.v[Q_Y] * skyRadius;
--- marble/src/plasmoid/plasma-applet-kworldclock.desktop	
+++ marble/src/plasmoid/plasma-applet-kworldclock.desktop	
@@ -10,17 +10,20 @@
 Name[ga]=Clog an Domhain
 Name[gl]=Reloxo mundial
 Name[gu]=વિશ્વ ઘડિયાળ
+Name[hr]=Svijetski sat
 Name[it]=Orologio del mondo
 Name[ja]=世界時計
 Name[km]=នាឡិកាពិភពលោក
 Name[lv]=Pasaules pulkstenis
 Name[ml]=ലോകഘടികാരം
+Name[nb]=Verdensud
 Name[nds]=Weltklock
 Name[nl]=Wereldklok
 Name[nn]=Verdsklokke
 Name[pl]=Zegar światowy
 Name[pt]=Relógio Mundial
 Name[pt_BR]=Relógio mundial
+Name[ru]=Мировые часы
 Name[sv]=Världsklocka
 Name[uk]=Світовий годинник
 Name[x-test]=xxWorld Clockxx
@@ -37,17 +40,20 @@
 Comment[ga]=Plasmoid a thaispeánann an t-am in áiteanna ar fud an domhain
 Comment[gl]=Plasmoide que lle mostra a hora en diferentes partes do mundo
 Comment[gu]=પ્લાઝમોઇડ જે તમને દુનિયાનાં જુદા જુદા ભાગોનો સમય બતાવશે
+Comment[hr]=Prikaz vremena u različitim dijelovima svijeta
 Comment[it]=Plasmoide che mostra il tempo in differenti parti del mondo
 Comment[ja]=世界各地の時刻を表示するプラズモイド
 Comment[km]=Plasmoid ដែលត្រូវបង្ហាញពេលវេលាដល់អ្នកជាផ្នែកៗផ្សេងគ្នានៃពិភពលោក
 Comment[lv]=Plazmoīts, kas rāda laiku dažādas pasaules vietās
 Comment[ml]=ലോകത്തിലെ വിവിധഭാഗങ്ങളിലെ സമയം കാണിക്കുവാനുള്ള പ്ലാസ്മോയിഡ്
+Comment[nb]=Plasmoide som viser tiden i forskjellige deler av verden
 Comment[nds]=Plasmoid, dat de Tiet in verscheden Rebeden vun de Eer wiest
 Comment[nl]=Plasmoid dat de tijd in verschillende delen van de wereld toont
 Comment[nn]=Plasmoide som viser deg klokka på ulike stader i verda
 Comment[pl]=Plazmoid pokazujący czas w różnych miejscach na świecie
 Comment[pt]=Um plasmóide que lhe mostra a hora em diferentes partes do mundo
 Comment[pt_BR]=Plasmóide para mostrar o tempo em diferentes partes do mundo
+Comment[ru]=Плазмоид, показывающий время в различных частях света
 Comment[sv]=Plasmoid som visar tiden i olika delar av världen
 Comment[tr]=Dünyanın değişik bölgelerindeki saati gösteren bir programcık
 Comment[uk]=Плазмоїд, який покаже вам час у різних частинах світу
Cannot display: file marked as a binary type.
svn:mime-type = application/pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/pdf
--- marble/marble.nsi	
+++ marble/marble.nsi	
@@ -19,14 +19,14 @@
  
 ;    3. This notice may not be removed or altered from any source distribution.
  
-!define setup "marble-setup-0.4.3.exe"
+!define setup "marble-setup-0.6.0.exe"
  
 ; change this to wherever the files to be packaged reside
-!define srcdir "."
+!define srcdir "C:\Programme\marble"
  
 !define company "KDE"
  
-!define prodname "Marble 0.4.3"
+!define prodname "Marble 0.6.0"
 !define exec "marble.exe"
  
 ; optional stuff
--- marble/INSTALL	
+++ marble/INSTALL	
@@ -55,6 +55,16 @@
 
   cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=/home/ingwa/apps ../marble
 
+If you have no write permission to the installation directory of cmake
+(because you have a system installed cmake) you need to add another
+parameter -DPACKAGE_ROOT_PREFIX=/home/ingwa/apps to the cmake command:
+
+  cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=/home/ingwa/apps \
+        -DPACKAGE_ROOT_PREFIX=/home/ingwa/apps ../marble
+
+To modify the position of the data directory at compile time, see the notes
+at 3.1 .
+
 
 1.3 Build marble
 
--- marble/data/maps/earth/citylights/citylights.dgml	
+++ marble/data/maps/earth/citylights/citylights.dgml	
@@ -12,7 +12,7 @@
             <visible> true </visible>
         
             
-            <description><![CDATA[This image of <i>Earth's city lights<i> was created with data from the Defense Meteorological Satellite Program (DMSP) Operational Linescan System (OLS).]]></description>
+	    <description><![CDATA[This image of <i>Earth's city lights</i> was created with data from the Defense Meteorological Satellite Program (DMSP) Operational Linescan System (OLS).]]></description>
     
             <zoom>
                 <minimum>  1000  </minimum>
@@ -149,6 +149,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/plain/plain.dgml	
+++ marble/data/maps/earth/plain/plain.dgml	
@@ -138,6 +138,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/precip-july/precip-july.dgml	
+++ marble/data/maps/earth/precip-july/precip-july.dgml	
@@ -168,6 +168,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/srtm/srtm.dgml	
+++ marble/data/maps/earth/srtm/srtm.dgml	
@@ -145,12 +145,12 @@
                     <available>true</available>
                 </property>
                 <property name="international-boundaries">
-                    <available>false</available>
-                    <value>false</value>
+                    <available>true</available>
+                    <value>true</value>
                 </property>
                 <property name="state-boundaries">
-                    <available>false</available>
-                    <value>false</value>
+                    <available>true</available>
+                    <value>true</value>
                 </property>
             </group>
             <group name="Water Bodies">
@@ -159,12 +159,12 @@
                     <value>true</value>
                 </property>
                 <property name="lakes">
-                    <available>false</available>
-                    <value>false</value>
+                    <available>true</available>
+                    <value>true</value>
                 </property>
                 <property name="rivers">
-                    <available>false</available>
-                    <value>false</value>
+                    <available>true</available>
+                    <value>true</value>
                 </property>
             </group>
             <group name="Surface">
@@ -182,6 +182,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
@@ -325,7 +329,7 @@
             </section>
 
             <section name="ice" checkable="true" connect="ice" spacing="12">
-                <heading>Ice &amp; Glaciers</heading>
+                <heading>Ice and Glaciers</heading>
             </section>
 
             <section name="relief" checkable="true" connect="relief" spacing="12">

Property changes on: marble/data/maps/earth/openstreetmap/openstreetmap-preview.png
___________________________________________________________________
Added: svn:mergeinfo

--- marble/data/maps/earth/openstreetmap/openstreetmap.dgml	
+++ marble/data/maps/earth/openstreetmap/openstreetmap.dgml	
@@ -37,6 +37,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>

Property changes on: marble/data/maps/earth/openstreetmap/openstreetmap.dgml
___________________________________________________________________
Added: svn:mergeinfo

Property changes on: marble/data/maps/earth/openstreetmap
___________________________________________________________________
Added: svn:mergeinfo

--- marble/data/maps/earth/temp-july/temp-july.dgml	
+++ marble/data/maps/earth/temp-july/temp-july.dgml	
@@ -168,6 +168,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/bluemarble/bluemarble.dgml	
+++ marble/data/maps/earth/bluemarble/bluemarble.dgml	
@@ -157,6 +157,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/precip-dec/precip-dec.dgml	
+++ marble/data/maps/earth/precip-dec/precip-dec.dgml	
@@ -168,6 +168,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- marble/data/maps/earth/temp-dec/temp-dec.dgml	
+++ marble/data/maps/earth/temp-dec/temp-dec.dgml	
@@ -168,6 +168,10 @@
                 <value>true</value>
                 <available>true</available>
             </property>
+            <property name="overviewmap">
+                <value>true</value>
+                <available>true</available>
+            </property>
             <property name="compass">
                 <value>true</value>
                 <available>true</available>
--- kmplot/kmplot/kmplot.desktop	
+++ kmplot/kmplot/kmplot.desktop	
@@ -119,7 +119,7 @@
 GenericName[pl]=Program rysujący funkcje matematyczne
 GenericName[pt]=Desenho de Funções Matemáticas
 GenericName[pt_BR]=Plotter de Função Matemáticas
-GenericName[ru]=Графопостроитель функций
+GenericName[ru]=Графопостроитель математических функций
 GenericName[sk]=Kreslenie matematických funkcií
 GenericName[sl]=Risanje matematičnih funkcij
 GenericName[sv]=Matematisk funktionsritare
--- kalgebra/src/kalgebra.desktop	
+++ kalgebra/src/kalgebra.desktop	
@@ -24,6 +24,7 @@
 GenericName[gl]=Calculadora gráfica
 GenericName[gu]=આલેખ કેલ્ક્યુલેટર
 GenericName[hi]=ग्राफ गणक
+GenericName[hr]=Grafički kalkulator
 GenericName[hu]=Függvényszámító
 GenericName[it]=Calcolatrice grafica
 GenericName[ja]=グラフ計算機
@@ -40,6 +41,7 @@
 GenericName[pl]=Kalkulator
 GenericName[pt]=Calculadora Gráfica
 GenericName[pt_BR]=Calculadora Gráfica
+GenericName[ru]=Графический калькулятор
 GenericName[sl]=Računalo z grafi
 GenericName[sv]=Grafräknare
 GenericName[tr]=Hesap Makinesi
@@ -64,6 +66,7 @@
 Comment[gl]=Resolve e debuxa expresións matemáticas
 Comment[gu]=ગાણિતિક સૂત્રો ઉકેલનાર અને આલેખનાર
 Comment[hi]=गणित एक्सप्रेशन सुलझाने वाला तथा प्लॉटर
+Comment[hr]=Rješavanje i iscrtavanje matematičkih izraza
 Comment[hu]=Matematikai egyenletek megoldása, görberajzolás
 Comment[it]=Risolutore e disegnatore di espressioni matematiche
 Comment[ja]=数式ソルバ＆プロッタ
@@ -79,6 +82,7 @@
 Comment[pl]=Rozwiązywanie równań i rysowanie wykresów
 Comment[pt]=Resolução e Desenho de Expressões Matemáticas
 Comment[pt_BR]=Solucionador e Plotador de Expressões Matemáticas
+Comment[ru]=Решение и построение графиков математических выражений
 Comment[sl]=Reševalnik matematičnih enačb in risalnik grafov
 Comment[sv]=Lösning och uppritning av matematiska uttryck
 Comment[tr]=Matematiksel İfade Çözücü ve Çizici
--- kalgebra/src/functionedit.cpp	
+++ kalgebra/src/functionedit.cpp	
@@ -140,7 +140,8 @@
 {
 	Analitza a;
 	QString funct = m_func->text();
-	
+	QStringList bvl;
+
 	if(m_func->text().isEmpty()) {
 		m_func->setCorrect(true);
 		m_ok->setEnabled(false);
@@ -155,19 +156,22 @@
 		a.setExpression(Expression(funct, 1));
 	
 	Expression res;
+	bool bvarCorrect=true;
 	if(a.isCorrect()) {
-		QStringList bvl = a.bvarList();
-		QString var = bvl.count()==0 ? "x" : bvl[0];
+		bvl = a.bvarList();
+		QString var = bvl.isEmpty() ? "x" : bvl[0];
 		
 		if(function::supportedBoundedVars().contains(var)) {
 			a.insertVariable(var, Cn(0.));
+		} else {
+			bvarCorrect=false;
 		}
 		
 		res=a.calculate();
 	} else
 		a.errors() << i18n("From parser:") << a.expression()->error();
 	
-	m_correct=a.isCorrect() && res.isValue();
+	m_correct= bvarCorrect && a.isCorrect() && res.isValue();
 	function f;
 	if(m_correct) {
 		f=function(m_name->text(), m_func->expression(), m_color->color());
@@ -185,6 +189,8 @@
 		QStringList errors=a.errors();
 		if(a.isCorrect() && !res.isValue())
 			errors.append(i18n("We can only draw Real results."));
+		else if(!bvarCorrect)
+			errors.append(i18nc("Error message", "Unknown bounded variable: %1", bvl.join(", ")));
 		errors += f.errors();
 		
 		m_funcsModel->clear();
--- kalgebra/plasmoid/kalgebraplasmoid.desktop	
+++ kalgebra/plasmoid/kalgebraplasmoid.desktop	
@@ -20,11 +20,13 @@
 Comment[ga]=Áireamhán
 Comment[gl]=Unha Calculadora
 Comment[gu]=કેલ્ક્યુલેટર
+Comment[hr]=Kalkulator
 Comment[it]=Una calcolatrice
 Comment[ja]=計算機
 Comment[km]=ម៉ាស៊ីនគិតលេខ
 Comment[lv]=Kalkulators
 Comment[ml]=ഗണനി
+Comment[nb]=En kalkulator
 Comment[nds]=En Rekenprogramm
 Comment[nl]=Een rekenmachine
 Comment[nn]=Ein kalkulator
@@ -32,6 +34,7 @@
 Comment[pt]=Uma Calculadora
 Comment[pt_BR]=Uma calculadora
 Comment[ro]=Un calculator
+Comment[ru]=Калькулятор
 Comment[sv]=Kalkylator
 Comment[tr]=Bir Hesap Makinesi
 Comment[uk]=Калькулятор
--- kiten/lib/DictionaryManager.cpp	
+++ kiten/lib/DictionaryManager.cpp	
@@ -99,13 +99,15 @@
 
 /* Delete everything in our hash */
 DictionaryManager::~DictionaryManager() {
-	QMutableHashIterator<QString, dictFile*> it(d->dictManagers);
-	while(it.hasNext()) {
-		it.next();
-		delete it.value();
-		it.remove();
-	}
-        delete d;
+	{
+		QMutableHashIterator<QString, dictFile*> it(d->dictManagers);
+		while(it.hasNext()) {
+			it.next();
+			delete it.value();
+			it.remove();
+		}
+	} // only delete d when the hashiterator has gone out of scope
+	delete d;
 }
 
 /* Remove a dictionary from the list, and delete the dictionary object
--- step/step/step.desktop	
+++ step/step/step.desktop	
@@ -24,17 +24,20 @@
 GenericName[ga]=Insamhlóir idirghníomhach fisiceach
 GenericName[gl]=Simulador físico interactivo
 GenericName[gu]=ઇન્ટરએક્ટિવ ભૌતિકવિજ્ઞાન સિમ્યુલેટર
+GenericName[hr]=Interaktivan simulator fizike
 GenericName[it]=Simulatore interattivo di fisica
 GenericName[ja]=対話式の物理シミュレータ
 GenericName[km]=កម្មវិធីត្រាប់តាមធម្មតាអន្តរកម្ម
 GenericName[lv]=Interaktīvs fizikas imitētājs
 GenericName[ml]=ഇന്ററാക്ടീവ് ഫിസിക്കല്‍ സിമുലേറ്റര്‍
+GenericName[nb]=Interaktiv fysikksimulator
 GenericName[nds]=Interaktiev Physik-Simuleren
 GenericName[nl]=Interactieve fysica-simulator
 GenericName[nn]=Interaktiv fysikksimulator
 GenericName[pl]=Interaktywny symulator fizyczny
 GenericName[pt]=Simulador de Física Interactiva
 GenericName[pt_BR]=Simulador físico interativo
+GenericName[ru]=Интерактивный физический симулятор
 GenericName[sv]=Interaktiv fysiksimulator
 GenericName[tr]=Etkileşimli fizik benzeştiricisi
 GenericName[uk]=Інтерактивний фізичний імітатор
@@ -52,17 +55,20 @@
 Comment[ga]=Insamhail turgnaimh fhisice
 Comment[gl]=Simula experimentos físicos
 Comment[gu]=ભૌતિકવિજ્ઞાનનાં પ્રયોગો કરો
+Comment[hr]=Simuliranje eksperimenata u fizici
 Comment[it]=Simula esperimenti fisici
 Comment[ja]=物理の実験をシミュレートします
 Comment[km]=ត្រាប់តាមការពិសោធន៍ធម្មតា
 Comment[lv]=Imitē fizikas eksperimentus
 Comment[ml]=ഫിസിക്സ് പരീക്ഷണങ്ങള്‍ സിമുലേറ്റ് ചെയ്യുക
+Comment[nb]=Simuler fysikk-eksperimenter
 Comment[nds]=Physik-Experimenten simuleren
 Comment[nl]=Fysica-experimenten simuleren
 Comment[nn]=Simuler fysiske eksperiment
 Comment[pl]=Symulowanie eksperymentów fizycznych
 Comment[pt]=Simular experiências de física
 Comment[pt_BR]=Simular experimentos físicos
+Comment[ru]=Симуляция физических экспериментов
 Comment[sv]=Simulera fysikexperiment
 Comment[tr]=Fizik deneylerini benzeştir
 Comment[uk]=Імітує фізичні досліди
--- kalzium/libavogadro-kalzium/src/periodictableview.h	
+++ kalzium/libavogadro-kalzium/src/periodictableview.h	
@@ -54,6 +54,8 @@
      * is then used by PeriodicTable to figure out which element was clicked on.
      */
     ElementItem(int elementNumber = 0);
+    
+    ~ElementItem();
 
     /**
      * @return the bounding rectangle of the element item.
--- kalzium/libavogadro-kalzium/src/periodictableview.cpp	
+++ kalzium/libavogadro-kalzium/src/periodictableview.cpp	
@@ -61,6 +61,11 @@
     setData(1, 8 + m_element);
   }
 
+  ElementItem::~ElementItem()
+  {
+     delete m_color;
+  }
+
   QRectF ElementItem::boundingRect() const
   {
     return QRectF(-m_width/2, -m_height/2, m_width, m_height);
--- kalzium/compoundviewer/kalziumgl_part.desktop	
+++ kalzium/compoundviewer/kalziumgl_part.desktop	
@@ -30,6 +30,7 @@
 Comment[gl]=Un programa para representar moléculas en 3D baseado en OpenGL
 Comment[gu]=OpenGL પર આધારિત અણુઓને 3D માં દર્શાવનાર
 Comment[hi]=अणुओं के लिए ओपन-जीएल आधारित त्रिआयामी प्रदर्शक
+Comment[hr]=3D iscrtavanje molekula zasnovano na OpenGL
 Comment[hu]=OpenGL-alapú 3d-s megjelenítő molekulákhoz
 Comment[it]=Visualizzatore 3D basato su OpenGL per molecole
 Comment[ja]=分子ビューアのための OpenGL ベースの 3D レンダラー
@@ -47,6 +48,7 @@
 Comment[pt]=Um motor de representação em OpenGL para moléculas
 Comment[pt_BR]=Um renderizador de moléculas em 3D baseado no OpenGL
 Comment[ro]=Un randor 3D de molecule, bazat pe OpenGL
+Comment[ru]=Построитель объёмных молекул, основанный на OpenGL
 Comment[sl]=3D izrisovalnik molekul, ki temelji na OpenGL
 Comment[sv]=OpenGL-baserad tredimensionell molekyluppritning
 Comment[tr]=Moleküller için OpenGL temelli 3D-hazırlayıcı
--- kalzium/src/kalzium.desktop	
+++ kalzium/src/kalzium.desktop	
@@ -47,7 +47,7 @@
 Comment[pt]=Tabela Periódica de Elementos do KDE
 Comment[pt_BR]=Tabela Periódica dos Elementos do KDE
 Comment[ro]=Tabelul periodic al elementelor
-Comment[ru]=Периодическая система Менделеева
+Comment[ru]=Периодическая система элементов
 Comment[sk]=KDE Periodická tabuľka prvkov
 Comment[sl]=Periodni sistem elementov
 Comment[sv]=Periodiska systemet för KDE
@@ -115,7 +115,7 @@
 GenericName[pt]=Tabela Periódica de Elementos
 GenericName[pt_BR]=Tabela Periódica dos Elementos
 GenericName[ro]=Tabel periodic al elementelor
-GenericName[ru]=Периодическая система Менделеева
+GenericName[ru]=Периодическая система элементов
 GenericName[sk]=Periodická tabuľka prvkov
 GenericName[sl]=Periodna tabela elementov
 GenericName[sv]=Periodiska systemet
--- kalzium/src/kalzium.kcfg	
+++ kalzium/src/kalzium.kcfg	
@@ -231,7 +231,7 @@
 			<whatsthis>Use eV or kJ/mol</whatsthis>
 			<default>0</default>
 		</entry>
-		<entry name="temperature" type="Int">
+		<entry name="temperatureUnit" type="Int">
 			<label>This value defines which temperature scale should be used within Kalzium</label>
 			<whatsthis>Select the scale for the temperature</whatsthis>
 			<default>0</default>
--- kalzium/src/settings_units.ui	
+++ kalzium/src/settings_units.ui	
@@ -47,7 +47,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="kcfg_temperature" >
+         <widget class="QComboBox" name="kcfg_temperatureUnit" >
           <item>
            <property name="text" >
             <string>Kelvin</string>
--- kalzium/src/tools/moleculeview.cpp	
+++ kalzium/src/tools/moleculeview.cpp	
@@ -223,6 +223,7 @@
 
 MoleculeDialog::~MoleculeDialog( )
 {
+    delete m_drawSettings;
 }
 
 void MoleculeDialog::slotUpdateStatistics()
--- kalzium/src/periodictableview.cpp	
+++ kalzium/src/periodictableview.cpp	
@@ -117,6 +117,7 @@
         m_painter->begin( svgGen );
         m_painter->drawAll();
         m_painter->end();
+        delete svgGen;
 }
 
 void PeriodicTableView::paintEvent( QPaintEvent * e )
--- kalzium/src/somwidget.ui	
+++ kalzium/src/somwidget.ui	
@@ -18,7 +18,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>178</width>
        <height>16</height>
@@ -31,16 +31,7 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
      <item>
@@ -58,7 +49,7 @@
        <property name="sizeType" >
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>20</width>
          <height>21</height>
@@ -97,7 +88,7 @@
        <property name="sizeType" >
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>16</width>
          <height>25</height>
@@ -106,7 +97,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QSpinBox" name="Number1" />
+      <widget class="QSpinBox" name="temp_spinbox" />
      </item>
      <item>
       <widget class="QLabel" name="lblUnit" >
@@ -125,7 +116,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>178</width>
        <height>16</height>
@@ -142,9 +133,7 @@
       </sizepolicy>
      </property>
      <property name="text" >
-      <string>Move the slider
-to find out about
-the state of matter</string>
+      <string/>
      </property>
      <property name="textFormat" >
       <enum>Qt::PlainText</enum>
--- kalzium/src/README_AVOGADRO	
+++ kalzium/src/README_AVOGADRO	
@@ -1,9 +1,9 @@
-For the Kalzium of KDE 4.0 we decided to add a local copy of libavogadro.
+For the Kalzium of KDE 4.0 and 4.1 we decided to add a local copy of libavogadro.
 The reason is that libavogadro is to much in flux to be used as a real library.
 The internal copy will be synced with the official library as often
 as possible without adding new features after the freeze.
 
-For KDE 4.1 we will remove the internal copy and depend on
+For KDE 4.2 we will remove the internal copy and depend on
 the real libavogadro as a dependency.
 
 libavogadro is a lib for rendering and also
--- kalzium/src/kalziumpainter.cpp	
+++ kalzium/src/kalziumpainter.cpp	
@@ -413,7 +413,7 @@
 
 qDebug() << date;
 
-		    if ( date == -1 ) //the element has not yet been recoqnized
+		    if ( date == -1 ) //the element has not yet been recognized
 			    return QBrush( Qt::blue );
 
 		    if ( m_time >= date )
--- kalzium/src/main.cpp	
+++ kalzium/src/main.cpp	
@@ -26,7 +26,7 @@
 
 #include <config-kalzium.h>
 
-#define APP_VERSION "2.0.80"
+#define APP_VERSION "2.1.00"
 
 static const char description[] =
     I18N_NOOP("A periodic table of the elements");
--- kalzium/src/somwidget_impl.h	
+++ kalzium/src/somwidget_impl.h	
@@ -37,6 +37,9 @@
 		 */
 		SOMWidgetIMPL( QWidget *parent = 0 );
 
+                /**
+                  * @return the currently set temperature
+                  */
 		int temperature() const;
 
 	public slots:
--- kalzium/src/timewidget.ui	
+++ kalzium/src/timewidget.ui	
@@ -18,12 +18,12 @@
    </property>
    <item row="2" column="0" >
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <item>
       <widget class="QSlider" name="time_slider" >
        <property name="minimum" >
@@ -57,7 +57,7 @@
        <property name="sizeType" >
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>16</width>
          <height>25</height>
@@ -67,12 +67,12 @@
      </item>
      <item>
       <widget class="QSpinBox" name="time_box" >
-       <property name="maximum" >
-        <number>1994</number>
-       </property>
        <property name="minimum" >
         <number>1667</number>
        </property>
+       <property name="maximum" >
+        <number>1994</number>
+       </property>
        <property name="value" >
         <number>1994</number>
        </property>
@@ -88,29 +88,29 @@
     </widget>
    </item>
    <item row="3" column="0" colspan="2" >
-    <spacer>
+    <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType" >
-      <enum>QSizePolicy::Fixed</enum>
+      <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
-       <width>178</width>
-       <height>16</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0" colspan="2" >
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <item>
       <widget class="QLabel" name="lbl1" >
        <property name="text" >
@@ -126,7 +126,7 @@
        <property name="sizeType" >
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>20</width>
          <height>21</height>
--- kalzium/src/exportdialog.cpp	
+++ kalzium/src/exportdialog.cpp	
@@ -72,7 +72,7 @@
 }
 
 ExportDialog::ExportDialog( QWidget * parent )
-    : KDialog( parent )
+    : KDialog( parent ),m_outputStream(0)
 {
     setButtons( Help | User1 | Cancel );
     ui.setupUi( mainWidget() );
@@ -95,6 +95,7 @@
 
 ExportDialog::~ExportDialog()
 {
+    delete m_outputStream;
 }
 
 void ExportDialog::populateElementList()
@@ -152,7 +153,8 @@
         KMessageBox::error( this, i18n( "Could not open file for writing." ) );
         return;
     }
-
+    
+    delete m_outputStream;
     m_outputStream = new QTextStream( &outputFile );
     if(format == "html")
        exportToHtml();
--- kalzium/src/somwidget_impl.cpp	
+++ kalzium/src/somwidget_impl.cpp	
@@ -20,8 +20,6 @@
 #include <QList>
 #include <QVariant>
 
-#include <kdebug.h>
-#include <knuminput.h>
 #include <klocale.h>
 
 #include <math.h>
@@ -41,9 +39,9 @@
 
 	m_htmlBegin = "";
 	m_htmlEnd = "";
-	m_prevUnit = Prefs::temperature();
+	m_prevUnit = Prefs::temperatureUnit();
 
-	connect( Number1, SIGNAL( valueChanged( int ) ),
+	connect( temp_spinbox, SIGNAL( valueChanged( int ) ),
 	         this, SLOT( sliderValueChanged( int ) ) );
 	connect( temp_slider, SIGNAL( valueChanged( int ) ),
 	         this, SLOT( sliderValueChanged( int ) ) );
@@ -58,59 +56,62 @@
 
 void SOMWidgetIMPL::reloadUnits()
 {
-	Number1->blockSignals( true );
+	temp_spinbox->blockSignals( true );
 	temp_slider->blockSignals( true );
-	lblUnit->setText( TempUnit::unitListSymbol( Prefs::temperature() ) );
-	QPair<double, double> range = TempUnit::rangeForUnit( Prefs::temperature() );
+	lblUnit->setText( TempUnit::unitListSymbol( Prefs::temperatureUnit() ) );
+	QPair<double, double> range = TempUnit::rangeForUnit( Prefs::temperatureUnit() );
 
-	int newvalue = TempUnit::convert( Number1->value(), m_prevUnit, Prefs::temperature() );
-	Number1->setRange( range.first, range.second );
-        Number1->setSingleStep(1);
-	Number1->setValue( newvalue );
+	int newvalue = TempUnit::convert( temperature(), m_prevUnit, Prefs::temperatureUnit() );
+	temp_spinbox->setRange( range.first, range.second );
+	temp_spinbox->setValue( newvalue );
+        temp_slider->setRange( range.first, range.second );
+        temp_slider->setValue( newvalue );
 	setNewTemp( newvalue );
-	m_prevUnit = Prefs::temperature();
-	Number1->blockSignals( false );
+	m_prevUnit = Prefs::temperatureUnit();
+	temp_spinbox->blockSignals( false );
 	temp_slider->blockSignals( false );
 }
 
 void SOMWidgetIMPL::sliderValueChanged( int temp )
 {
-	Number1->blockSignals( true );
+        //the signals need to be blocked as both will return to this slot. But no
+        //matter which UI elements (slider oder spinbox) was changed, the other
+        //has to be set to the same value
+	temp_spinbox->blockSignals( true );
 	temp_slider->blockSignals( true );
-	int newvalue = TempUnit::convert( (double)temp, (int)TempUnit::Kelvin, Prefs::temperature() );
-	Number1->setValue( newvalue );
-	temp_slider->setValue( newvalue );
-	setNewTemp( newvalue );
-	Number1->blockSignals( false );
+	temp_spinbox->setValue( temp );
+	temp_slider->setValue( temp );
+	setNewTemp( temp );
+	temp_spinbox->blockSignals( false );
 	temp_slider->blockSignals( false );
 }
 
 void SOMWidgetIMPL::setNewTemp( int newtemp )
 {
 	static const int threshold = 25;
+	
+        const QString unitSymbol = TempUnit::unitListSymbol( Prefs::temperatureUnit() );
 
-	double temp = TempUnit::convert( newtemp, Prefs::temperature(), (int)TempUnit::Kelvin );
+	double temp = TempUnit::convert( newtemp, Prefs::temperatureUnit(), (int)TempUnit::Kelvin );
 
 	QStringList listMeltingPoint;
 	QStringList listBoilingPoint;
 	QStringList listBoilingPointValue;
 	QStringList listMeltingPointValue;
 
-	const QString unitSymbol = TempUnit::unitListSymbol( Prefs::temperature() );
-
 	foreach (Element * element, m_list)
 	{
 		double melting = element->dataAsVariant( ChemicalDataObject::meltingpoint ).toDouble();
 		if ( ( melting > 0.0 ) && fabs( melting - temp ) <= threshold )
 		{
 			listMeltingPoint << element->dataAsString( ChemicalDataObject::name );
-			listMeltingPointValue << QString::number(TempUnit::convert(melting,(int)TempUnit::Kelvin,Prefs::temperature())); 
+			listMeltingPointValue << QString::number(TempUnit::convert(melting,(int)TempUnit::Kelvin,Prefs::temperatureUnit())); 
 		}
 		double boiling = element->dataAsVariant( ChemicalDataObject::boilingpoint ).toDouble();
 		if ( ( boiling > 0.0 ) && fabs( boiling - temp ) <= threshold )
 		{
 			listBoilingPoint << element->dataAsString( ChemicalDataObject::name );
-			listBoilingPointValue << QString::number(TempUnit::convert(boiling,(int)TempUnit::Kelvin,Prefs::temperature()));
+			listBoilingPointValue << QString::number(TempUnit::convert(boiling,(int)TempUnit::Kelvin,Prefs::temperatureUnit()));
 		}
 	}
 	QString htmlcode;
--- kalzium/src/kalziumutils.cpp	
+++ kalzium/src/kalziumutils.cpp	
@@ -99,8 +99,9 @@
                     result = i18n( "Unknown Value" );
                 else
                 {
-                    val = TempUnit::convert( val, (int)TempUnit::Kelvin, Prefs::temperature() );
-                    result = i18nc( "%1 is the temperature, %2 is the unit, like \"300 K\"", "%1 %2", val, TempUnit::unitListSymbol( Prefs::temperature() ) );
+                    val = TempUnit::convert( val, (int)TempUnit::Kelvin, Prefs::temperatureUnit() );
+                    result = i18nc( "%1 is the temperature, %2 is the unit, like \"300 K\"", 
+                            "%1 %2", val, TempUnit::unitListSymbol( Prefs::temperatureUnit() ) );
                 }
                 break;
             }
@@ -111,8 +112,9 @@
                     result = i18n( "Unknown Value" );
                 else
                 {
-                    val = TempUnit::convert( val, (int)TempUnit::Kelvin, Prefs::temperature() );
-                    result = i18nc( "%1 is the temperature, %2 is the unit, like \"300 K\"", "%1 %2", val, TempUnit::unitListSymbol( Prefs::temperature() ) );
+                    val = TempUnit::convert( val, (int)TempUnit::Kelvin, Prefs::temperatureUnit() );
+                    result = i18nc( "%1 is the temperature, %2 is the unit, like \"300 K\"", 
+                            "%1 %2", val, TempUnit::unitListSymbol( Prefs::temperatureUnit() ) );
                 }
                 break;
             }
@@ -170,7 +172,7 @@
                 if ( val > 1600 ) {
                     result = i18n( "This element was discovered in the year <numid>%1</numid>.", val );
                 }else if( val == -1 ){
-                    result = i18n( "The element has not yet been offically recoqnized by the IUPAC." );
+                    result = i18n( "The element has not yet been officially recognized by the IUPAC." );
                 } //this should now really be 0. If not there is a bug in the database 
 		else {
                     result = i18n( "This element was known to ancient cultures." );

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
   +

Places

File 4_1_BRANCH.diff of Package kdeedu4 (Revision 4b6091bf036e807868975441f2316974)

Places