[Marble-commits] KDE/kdeedu/marble/src/plugins/render/routing

[Dennis Nienhüser]

SVN commit 1194347 by nienhueser:

Remove the placeholder icons from the initial view. Add a message that indicates marble waits for the first data to arrive.

 M  +7 -0      RoutingPlugin.cpp  
 M  +0 -6      RoutingPlugin.ui  


--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.cpp #1194346:1194347
@@ -170,6 +170,13 @@
                     m_parent, SLOT( updateDestinationInformation( qint32, qreal ) ) );
     }
 
+    if ( enabled ) {
+        bool const smallScreen = MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen;
+        int fontSize = smallScreen ? -1 : 1;
+        QString const text = QObject::tr( "Determining current location, please wait..." );
+        m_widget.instructionLabel->setText( richText( "%1", fontSize ).arg( text ) );
+    }
+
     PositionTracking *tracking = m_marbleWidget->model()->positionTracking();
     if ( enabled && !tracking->positionProviderPlugin() ) {
         RouteRequest* request = m_marbleWidget->model()->routingManager()->routeRequest();
--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.ui #1194346:1194347
@@ -74,9 +74,6 @@
      <property name="text">
       <string/>
      </property>
-     <property name="pixmap">
-      <pixmap resource="../../../lib/libmarble.qrc">:/data/bitmaps/turn-right.png</pixmap>
-     </property>
     </widget>
    </item>
    <item row="0" column="2">
@@ -118,9 +115,6 @@
      <property name="text">
       <string/>
      </property>
-     <property name="pixmap">
-      <pixmap resource="../../../lib/libmarble.qrc">:/data/bitmaps/turn-right.png</pixmap>
-     </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>