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

List:       kde-commits
Subject:    KDE/kdeedu/marble
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2008-02-12 14:41:00
Message-ID: 1202827260.394276.29065.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 774117 by ingwa:

Only show tile creation dialog in the Widget, not the Map.


 M  +8 -0      ChangeLog  
 M  +2 -1      TODO  
 M  +4 -26     src/lib/MarbleMap.cpp  
 M  +0 -21     src/lib/MarbleMap.h  


--- trunk/KDE/kdeedu/marble/ChangeLog #774116:774117
@@ -1,3 +1,11 @@
+2008-02-12  Inge Wallin  <inge@lysator.liu.se>
+
+	Only show tile creation dialog in the Widget, not the Map
+	* src/lib/marbleMap.h (creatingTilesstart): removed
+	* src/lib/MarbleMap.cpp (construct): Initialize width, height here
+	(construct): Remove connect() for signal creatingTilesStart 
+	(creatingTilesStart): removed
+
 2008-02-11  Torsten Rahn  <rahn@kde.org>
 
     * data/CMakeLists.txt:
--- trunk/KDE/kdeedu/marble/TODO #774116:774117
@@ -213,7 +213,8 @@
     - Resize                                                            done
     - setProjection                                                     done
     - other uses of d->viewParams                                       done
-    - create tiles dialog                                               --
+    - create tiles dialog                                               done
+    - class doc for MarbleMap                                           --
  * Refactor KML to use QXmlStreamReader                                 ----
  * Make MarbleModel a real model and MarbleWidget a real view           ----
  * Make it possible to paint on whatever QPainter Marble is given       ----
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #774116:774117
@@ -39,7 +39,6 @@
 #include "FileViewModel.h"
 #include "GeoDataPoint.h"
 #include "GpxFileViewItem.h"
-#include "TileCreatorDialog.h"
 #include "HttpDownloadManager.h"
 #include "FileStoragePolicy.h"
 #include "gps/GpsLayer.h"
@@ -99,11 +98,6 @@
 //    QDBusConnection::sessionBus().registerObject("/marble", this, \
QDBusConnection::QDBusConnection::ExportAllSlots);  //d->m_model = new MarbleModel( \
this );  
-    // Due to usage in setActiveRegion these need to get 
-    // initialized before construct() gets called
-    d->m_width  = 0;
-    d->m_height = 0;
-
     d->m_model = new MarbleModel( this );
     construct();
 }
@@ -114,17 +108,16 @@
 {
 //    QDBusConnection::sessionBus().registerObject("/marble", this, \
QDBusConnection::QDBusConnection::ExportAllSlots);  
-    // Due to usage in setActiveRegion these need to get 
-    // initialized before construct() gets called
-    d->m_width  = 0;
-    d->m_height = 0;
-
     d->m_model = model;
     construct();
 }
 
 MarbleMap::~MarbleMap()
 {
+    // Some basic initializations.
+    d->m_width  = 0;
+    d->m_height = 0;
+
     setDownloadManager(NULL);
 
     // FIXME: Only delete if we created it ourselves 
@@ -140,11 +133,6 @@
     // Some point that tackat defined. :-)
     setHome( -9.4, 54.8, 1050 );
 
-    connect( d->m_model, SIGNAL( creatingTilesStart( TileCreator*, const
-QString&, const QString& ) ),
-             this,       SLOT( creatingTilesStart( TileCreator*, const
-QString&, const QString& ) ) );
-
     connect( d->m_model, SIGNAL( themeChanged( QString ) ),
                          SIGNAL( themeChanged( QString ) ) );
     connect( d->m_model, SIGNAL( modelChanged() ),
@@ -1221,17 +1209,7 @@
     }
 }
 
-// This slot will called when the Globe starts to create the tiles.
 
-void MarbleMap::creatingTilesStart( TileCreator *creator, const QString &name, const \
                QString &description )
-{
-    TileCreatorDialog dlg( creator, 0 );
-
-    dlg.setSummary( name, description );
-    dlg.exec();
-}
-
-
 void MarbleMap::updateChangedMap()
 {
     // Update texture map during the repaint that follows:
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #774116:774117
@@ -778,27 +778,6 @@
     void setQuickDirty( bool enabled );
 
     /**
-     * @brief A slot that is called when the model starts to create new tiles.
-     * @param creator the tile creator object.
-     * @param name  the name of the created theme.
-     * @param description  a descriptive text that can be shown in a dialog.
-     * @see    creatingTilesProgress
-     *
-     * This function is connected to the models signal with the same
-     * name.  When the model needs to create a cache of tiles in
-     * several different resolutions, it will emit creatingTilesStart
-     * once with a name of the theme and a descriptive text.  The
-     * map can then pop up a dialog to explain why there is a
-     * delay.  The model will then call creatingTilesProgress several
-     * times until the parameter reaches 100 (100%), after which the
-     * creation process is finished.  After this there will be no more
-     * calls to creatingTilesProgress, and the poup dialog can then be
-     * closed.
-     */
-    void creatingTilesStart( TileCreator *creator, const QString& name, 
-			     const QString& description );
-
-    /**
      * @brief Update the map because the model changed.
      */
     void updateChangedMap();


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