FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hblabel.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 #include "hbcolorscheme.h"
 #include "hbwidget_p.h"
 #include "hbstyleoptionlabel_p.h"
 #include "hbwidgetbase.h"
 #include "hblabel.h"
+#include "hbstyle_p.h"
 /*!
 @alpha
 @hbcore
 HbLabelPrivate ();
 ~HbLabelPrivate ();
 void clearAll();
-void setText(const QString &text, HbStyle::Primitive primitiveId);
+void setText(const QString &text, HbStylePrivate::Primitive primitiveId);
 void setIcon(const HbIcon &icon);
 void updatePrimitives ();
 void createPrimitives ();
 // text section
 QString mText;
 Qt::TextElideMode mElideMode;
 Hb::TextWrapping mTextWrapping;
 QColor mColor;
+int mMaxLines;
 // icon section
 HbIcon mIcon;
 Qt::AspectRatioMode mAspectRatioMode;
 // primitive handling
 QGraphicsItem *mPrimitiveItem;
-HbStyle::Primitive mActivePrimitive;
+HbStylePrivate::Primitive mActivePrimitive;
 };
 HbLabelPrivate::HbLabelPrivate() :
 HbWidgetPrivate(),
 mAlignment(Qt::AlignLeft | Qt::AlignVCenter),
 mText(QString()),
 mElideMode(Qt::ElideRight),
 mTextWrapping(Hb::TextNoWrap),
+mMaxLines(0),
 mAspectRatioMode(Qt::KeepAspectRatio),
 mPrimitiveItem(0),
-mActivePrimitive(HbStyle::P_None)
+mActivePrimitive(HbStylePrivate::P_None)
 {
 }
 void HbLabelPrivate::clearAll()
 {
 if (mPrimitiveItem) {
 delete mPrimitiveItem;
 mPrimitiveItem = 0;
-mActivePrimitive = HbStyle::P_None;
+mActivePrimitive = HbStylePrivate::P_None;
 }
 mText.clear();
 mIcon.clear();
 }
-void HbLabelPrivate::setText(const QString &text, HbStyle::Primitive primitiveId)
+void HbLabelPrivate::setText(const QString &text, HbStylePrivate::Primitive primitiveId)
 {
 Q_Q(HbLabel);
 if (text.isNull()) {
 clearAll();
 if (icon.isNull()) {
 clearAll();
 return;
 }
-if (mActivePrimitive != HbStyle::P_Label_icon) {
+if (mActivePrimitive != HbStylePrivate::P_Label_icon) {
 clearAll();
 }
 if (mIcon != icon) {
 mIcon = icon;
-if (mActivePrimitive != HbStyle::P_Label_icon) {
+if (mActivePrimitive != HbStylePrivate::P_Label_icon) {
-mActivePrimitive = HbStyle::P_Label_icon;
+mActivePrimitive = HbStylePrivate::P_Label_icon;
 createPrimitives();
 q->repolish(); // reconecting new primitive to HbAnchorLayout so it is really needed!
 }
 q->updatePrimitives();
 }
 {
 Q_Q(HbLabel);
 Q_ASSERT(mPrimitiveItem==0);
-if (mActivePrimitive != HbStyle::P_None) {
+if (mActivePrimitive != HbStylePrivate::P_None) {
-mPrimitiveItem = q->style()->createPrimitive(mActivePrimitive, q);
+mPrimitiveItem = HbStylePrivate::createPrimitive(mActivePrimitive, q);
 }
 }
 void HbLabelPrivate::updatePrimitives()
 {
 Q_Q(HbLabel);
-if (mActivePrimitive != HbStyle::P_None) {
+if (mActivePrimitive != HbStylePrivate::P_None) {
-Q_ASSERT(mActivePrimitive == HbStyle::P_Label_icon
+Q_ASSERT(mActivePrimitive == HbStylePrivate::P_Label_icon
-|| mActivePrimitive == HbStyle::P_Label_richtext
+|| mActivePrimitive == HbStylePrivate::P_Label_richtext
-|| mActivePrimitive == HbStyle::P_Label_text);
+|| mActivePrimitive == HbStylePrivate::P_Label_text);
 HbStyleOptionLabel option;
 q->initStyleOption(&option);
-q->style()->updatePrimitive(mPrimitiveItem, mActivePrimitive, &option);
+HbStylePrivate::updatePrimitive(mPrimitiveItem, mActivePrimitive, &option);
 }
 }
 /*!
 Constructs the label with a given \a parent.
 \sa setIcon()
 */
 void HbLabel::setPlainText(const QString &text)
 {
 Q_D(HbLabel);
-d->setText(text, HbStyle::P_Label_text);
+d->setText(text, HbStylePrivate::P_Label_text);
 }
 /*!
 Sets the label contents to html text containing \a text. Any previous content is cleared.
 Does nothing if the string representation is the same as the current contents of the label.
 \sa setIcon()
 */
 void HbLabel::setHtml(const QString &text)
 {
 Q_D(HbLabel);
-d->setText(text, HbStyle::P_Label_richtext);
+d->setText(text, HbStylePrivate::P_Label_richtext);
 }
 /*!
 Sets the \a alignment of the label.
 \param alignment - the new alignment.
 void HbLabel::setAlignment(Qt::Alignment alignment)
 {
 Q_D(HbLabel);
 if (d->mAlignment != alignment) {
 d->mAlignment = alignment;
-if (d->mActivePrimitive!=HbStyle::P_None) {
+if (d->mActivePrimitive!=HbStylePrivate::P_None) {
 updatePrimitives();
 }
 }
 }
 \sa clear()
 */
 bool HbLabel::isEmpty() const
 {
 Q_D(const HbLabel);
-return d->mActivePrimitive == HbStyle::P_None;
+return d->mActivePrimitive == HbStylePrivate::P_None;
 }
 /*!
 \deprecated HbLabel::primitive(HbStyle::Primitive)
 is deprecated.
 Returns a pointer to the QGraphicsItem primitive used by this label.
 \param primitive - the type of graphics primitive required.
-HbLabel supports HbStyle::P_Label_text and HbStyle::P_Label_icon.
+HbLabel supports HbStylePrivate::P_Label_text and HbStylePrivate::P_Label_icon.
 \return the QGraphicsItem used by the label. It is 0 if type \a primitive not currently in use.
 It is also 0 if the text or icon object is empty.
 \reimp
 \sa isEmpty()
 */
 QGraphicsItem * HbLabel::primitive(HbStyle::Primitive primitive) const
 {
 Q_D(const HbLabel);
-if (primitive == d->mActivePrimitive) {
+if ((HbStylePrivate::Primitive)primitive == d->mActivePrimitive) {
 return d->mPrimitiveItem;
 }
 return HbWidget::primitive(primitive);
 }
 if (!d->mText.isNull()) {
 option->text = d->mText;
 option->elideMode = d->mElideMode;
 option->textWrapMode = d->mTextWrapping;
 option->color = d->mColor;
+option->maximumLines = d->mMaxLines;
 }
 if (!d->mIcon.isNull()) {
 option->icon = d->mIcon;
 option->aspectRatioMode = d->mAspectRatioMode;
 Plain text accessor. Returns empty string if not set.
 */
 QString HbLabel::plainText() const
 {
 Q_D(const HbLabel);
-if (d->mActivePrimitive == HbStyle::P_Label_text) {
+if (d->mActivePrimitive == HbStylePrivate::P_Label_text) {
 return d->mText;
 }
 return QString();
 }
 Rich text text accessor. Returns empty string if not set.
 */
 QString HbLabel::html() const
 {
 Q_D(const HbLabel);
-if (d->mActivePrimitive == HbStyle::P_Label_richtext) {
+if (d->mActivePrimitive == HbStylePrivate::P_Label_richtext) {
 return d->mText;
 }
 return QString();
 }
 {
 Q_D(const HbLabel);
 return d->mColor;
 }
+/*!
+If plain text is used (\sa setPlainText) this will set maximum number of lines
+to be visible in label.
+Zero or negative value disables the feature.
+\sa maximumLines()
+*/
+void HbLabel::setMaximumLines(int maxLines)
+{
+Q_D(HbLabel);
+maxLines = qMax(maxLines, 0);
+if (d->mMaxLines != maxLines) {
+d->mMaxLines = maxLines;
+if (d->mActivePrimitive == HbStylePrivate::P_Label_text) {
+updatePrimitives();
+}
+}
+}
+/*!
+Returns maximum number of lines which can be visible in label when
+plain text is used (\sa setPlainText).
+Zero value means that there is no limitation.
+\sa setMaximumLines(int)
+*/
+int HbLabel::maximumLines() const
+{
+return d_func()->mMaxLines;
+}
 #include "moc_hblabel.cpp"

changeset 21	4633027730f5
parent 7	923ff622b8b9
child 28	b7da29130b0e