Fix for ticket #4414 (svg indicators for arrows are not shown)

marco · mach0 · commit d2503d5da336 · 2011-11-13T11:37:57.000+01:00
diff --git a/src/app/composer/qgscomposerarrowwidget.cpp b/src/app/composer/qgscomposerarrowwidget.cpp
@@ -184,13 +184,13 @@ void QgsComposerArrowWidget::on_mSvgMarkerRadioButton_toggled( bool toggled )
   }
 }
 
-void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QString & text )
+void QgsComposerArrowWidget::on_mStartMarkerLineEdit_textChanged( const QString & text )
 {
   if ( mArrow )
   {
     mArrow->beginCommand( tr( "Arrow start marker" ) );
     QFileInfo fi( text );
-    if ( fi.exists() )
+    if ( fi.exists() && fi.isFile() )
     {
       mArrow->setStartMarker( text );
     }
@@ -203,13 +203,13 @@ void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QStr
   }
 }
 
-void QgsComposerArrowWidget::on_mEndMarkerLineEdit_editingFinished( const QString & text )
+void QgsComposerArrowWidget::on_mEndMarkerLineEdit_textChanged( const QString & text )
 {
   if ( mArrow )
   {
-    mArrow->beginCommand( tr( "Arrow start marker" ) );
+    mArrow->beginCommand( tr( "Arrow end marker" ) );
     QFileInfo fi( text );
-    if ( fi.exists() )
+    if ( fi.exists() && fi.isFile() )
     {
       mArrow->setEndMarker( text );
     }
diff --git a/src/app/composer/qgscomposerarrowwidget.h b/src/app/composer/qgscomposerarrowwidget.h
@@ -46,8 +46,8 @@ class QgsComposerArrowWidget: public QWidget, private Ui::QgsComposerArrowWidget
     void on_mDefaultMarkerRadioButton_toggled( bool toggled );
     void on_mNoMarkerRadioButton_toggled( bool toggled );
     void on_mSvgMarkerRadioButton_toggled( bool toggled );
-    void on_mStartMarkerLineEdit_editingFinished( const QString & text );
-    void on_mEndMarkerLineEdit_editingFinished( const QString & text );
+    void on_mStartMarkerLineEdit_textChanged( const QString & text );
+    void on_mEndMarkerLineEdit_textChanged( const QString & text );
     void on_mStartMarkerToolButton_clicked();
     void on_mEndMarkerToolButton_clicked();
 

Original file line number	Diff line number	Diff line change
`@@ -184,13 +184,13 @@ void QgsComposerArrowWidget::on_mSvgMarkerRadioButton_toggled( bool toggled )`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`-void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QString & text )`
	`187`	`+void QgsComposerArrowWidget::on_mStartMarkerLineEdit_textChanged( const QString & text )`
`188`	`188`	`{`
`189`	`189`	`if ( mArrow )`
`190`	`190`	`{`
`191`	`191`	`mArrow->beginCommand( tr( "Arrow start marker" ) );`
`192`	`192`	`QFileInfo fi( text );`
`193`		`- if ( fi.exists() )`
	`193`	`+ if ( fi.exists() && fi.isFile() )`
`194`	`194`	`{`
`195`	`195`	`mArrow->setStartMarker( text );`
`196`	`196`	`}`
`@@ -203,13 +203,13 @@ void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QStr`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`206`		`-void QgsComposerArrowWidget::on_mEndMarkerLineEdit_editingFinished( const QString & text )`
	`206`	`+void QgsComposerArrowWidget::on_mEndMarkerLineEdit_textChanged( const QString & text )`
`207`	`207`	`{`
`208`	`208`	`if ( mArrow )`
`209`	`209`	`{`
`210`		`- mArrow->beginCommand( tr( "Arrow start marker" ) );`
	`210`	`+ mArrow->beginCommand( tr( "Arrow end marker" ) );`
`211`	`211`	`QFileInfo fi( text );`
`212`		`- if ( fi.exists() )`
	`212`	`+ if ( fi.exists() && fi.isFile() )`
`213`	`213`	`{`
`214`	`214`	`mArrow->setEndMarker( text );`
`215`	`215`	`}`