[Marble-commits] KDE/kdeedu/marble

[Dennis Nienhüser]

SVN commit 1124594 by nienhueser:

Remove unused routing icons. Add icon for removing routing via points (modified oxygen icon).

 D             data/bitmaps/routing_destination.png  
 D             data/bitmaps/routing_select.png  
 D             data/bitmaps/routing_start.png  
 D             data/bitmaps/routing_via.png  
 M  +2 -2      src/lib/libmarble.qrc  
 M  +4 -4      src/lib/routing/RoutingInputWidget.cpp  
 M  +4 -6      src/lib/routing/RoutingLayer.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/libmarble.qrc #1124593:1124594
@@ -1,8 +1,8 @@
 <RCC>
   <qresource>
-    <file>../../data/bitmaps/routing_select.png</file>
+    <file>../../data/bitmaps/routing_remove.png</file>
     <file>../../data/bitmaps/routing_pick.png</file>
-    <file>../../data/bitmaps/routing_via.png</file>
+    <file>../../data/bitmaps/routing_step.png</file>
     <file>../../data/bitmaps/progress.mng</file>
     <file>../../data/bitmaps/cursor_bc.xpm</file>
     <file>../../data/bitmaps/cursor_bl.xpm</file>
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingInputWidget.cpp #1124593:1124594
@@ -84,11 +84,10 @@
     m_lineEdit = new QLineEdit( parent );
 
     m_removeButton = new QPushButton( parent );
-    /** @todo: Use an icon instead */
-    m_removeButton->setText( "X" );
-    m_removeButton->setToolTip( "Remove this input field" );
+    m_removeButton->setIcon( QIcon( ":/data/bitmaps/routing_remove.png" ) );
+    m_removeButton->setToolTip( "Remove this position" );
     m_removeButton->setFlat( true );
-    m_removeButton->setMaximumWidth( 12 );
+    m_removeButton->setMaximumWidth( 22 );
 
     m_pickButton = new QPushButton( parent );
     m_pickButton->setIcon( QIcon( m_route->pixmap( m_index ) ) );
@@ -196,6 +195,7 @@
     d->m_route->setPosition( d->m_index, position );
     d->m_progressTimer.stop();
     d->m_stateButton->setVisible( true );
+    d->m_stateButton->setIcon( QIcon( d->m_route->pixmap( d->m_index ) ) );
     emit targetValidityChanged( true );
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.cpp #1124593:1124594
@@ -67,8 +67,6 @@
 
     QPixmap m_targetPixmap;
 
-    QPixmap m_viaPixmap;
-
     QRect m_dirtyRect;
 
     QPoint m_dropStopOver;
@@ -148,10 +146,10 @@
 };
 
 RoutingLayerPrivate::RoutingLayerPrivate( RoutingLayer *parent, MarbleWidget *widget ) :
-        q( parent ), m_proxyModel( 0 ), m_movingIndex( -1 ), m_marbleWidget( widget ), m_targetPixmap( ":/data/bitmaps/routing_pick.png" ),
-        m_viaPixmap( ":/data/bitmaps/routing_via.png" ), m_dragStopOverRightIndex( -1 ), m_pointSelection( false ),
-        m_routingModel( 0 ), m_placemarkModel( 0 ), m_selectionModel( 0 ), m_routeDirty( false ), m_pixmapSize( 22, 22 ),
-        m_routeSkeleton( 0 ), m_activeMenuIndex( -1 )
+        q( parent ), m_proxyModel( 0 ), m_movingIndex( -1 ), m_marbleWidget( widget ),
+        m_targetPixmap( ":/data/bitmaps/routing_pick.png" ), m_dragStopOverRightIndex( -1 ),
+        m_pointSelection( false ), m_routingModel( 0 ), m_placemarkModel( 0 ), m_selectionModel( 0 ),
+        m_routeDirty( false ), m_pixmapSize( 22, 22 ), m_routeSkeleton( 0 ), m_activeMenuIndex( -1 )
 {
     m_contextMenu = new MarbleWidgetPopupMenu( m_marbleWidget, m_marbleWidget->model() );
     m_removeViaPointAction = new QAction( QObject::tr( "&Remove this destination" ), q );