[composer] Some tweaks to label display name, add display name for legends

nyalldawson · nyalldawson · commit 3480ef2e47f3 · 2014-07-31T19:31:57.000+10:00
diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
@@ -412,9 +412,14 @@ QString QgsComposerLabel::displayName() const
     return id();
   }
 
+  if ( mHtmlState )
+  {
+    return tr( "<HTML label>" );
+  }
+
   //if no id, default to portion of label text
   QString text = displayText();
-  if ( text.isEmpty() || mHtmlState )
+  if ( text.isEmpty() )
   {
     return tr( "<label>" );
   }
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -21,6 +21,7 @@
 #include "qgscomposerlegenditem.h"
 #include "qgscomposermap.h"
 #include "qgscomposition.h"
+#include "qgscomposermodel.h"
 #include "qgslegendrenderer.h"
 #include "qgslogger.h"
 #include <QDomDocument>
@@ -101,7 +102,16 @@ void QgsComposerLegend::adjustBoxSize()
   }
 }
 
-void QgsComposerLegend::setTitle( const QString& t ) { mSettings.setTitle( t ); }
+void QgsComposerLegend::setTitle( const QString& t )
+{
+  mSettings.setTitle( t );
+
+  if ( mComposition && id().isEmpty() )
+  {
+    //notify the model that the display name has changed
+    mComposition->itemsModel()->updateItemDisplayName( this );
+  }
+}
 QString QgsComposerLegend::title() const { return mSettings.title(); }
 
 Qt::AlignmentFlag QgsComposerLegend::titleAlignment() const { return mSettings.titleAlignment(); }
@@ -335,6 +345,29 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   return true;
 }
 
+QString QgsComposerLegend::displayName() const
+{
+  if ( !id().isEmpty() )
+  {
+    return id();
+  }
+
+  //if no id, default to portion of title text
+  QString text = mSettings.title();
+  if ( text.isEmpty() )
+  {
+    return tr( "<legend>" );
+  }
+  if ( text.length() > 25 )
+  {
+    return QString( tr( "%1..." ) ).arg( text.left( 25 ) );
+  }
+  else
+  {
+    return text;
+  }
+}
+
 void QgsComposerLegend::setComposerMap( const QgsComposerMap* map )
 {
   mComposerMap = map;
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -139,6 +139,9 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
        */
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
 
+    //Overriden to show legend title
+    virtual QString displayName() const;
+
   public slots:
     /**Data changed*/
     void synchronizeWithModel();

Original file line number	Diff line number	Diff line change
`@@ -412,9 +412,14 @@ QString QgsComposerLabel::displayName() const`
`412`	`412`	`return id();`
`413`	`413`	`}`
`414`	`414`
	`415`	`+ if ( mHtmlState )`
	`416`	`+ {`
	`417`	`+ return tr( "<HTML label>" );`
	`418`	`+ }`
	`419`	`+`
`415`	`420`	`//if no id, default to portion of label text`
`416`	`421`	`QString text = displayText();`
`417`		`- if ( text.isEmpty() \|\| mHtmlState )`
	`422`	`+ if ( text.isEmpty() )`
`418`	`423`	`{`
`419`	`424`	`return tr( "<label>" );`
`420`	`425`	`}`