equal
deleted
inserted
replaced
23 #include <QTextCursor> |
23 #include <QTextCursor> |
24 #include <HbMenu> |
24 #include <HbMenu> |
25 |
25 |
26 // USER INCLUDES |
26 // USER INCLUDES |
27 #include "unitexteditor.h" |
27 #include "unitexteditor.h" |
28 #include "debugtraces.h" |
|
29 |
28 |
30 // LOCAL CONSTANTS |
29 // LOCAL CONSTANTS |
31 const QString ADDRESS_SEPARATOR("; "); |
30 const QString ADDRESS_SEPARATOR("; "); |
|
31 const QString ADDRESS_OPEN(" ("); |
|
32 const QString ADDRESS_CLOSE(")"); |
32 |
33 |
33 //---------------------------------------------------------------------------- |
34 //---------------------------------------------------------------------------- |
34 // UniViewerAddressWidget::UniViewerAddressWidget |
35 // UniViewerAddressWidget::UniViewerAddressWidget |
35 // @see header file |
36 // @see header file |
36 //---------------------------------------------------------------------------- |
37 //---------------------------------------------------------------------------- |
41 HbStyle::setItemName(mAddress, "addressField"); |
42 HbStyle::setItemName(mAddress, "addressField"); |
42 |
43 |
43 connect(mAddress, SIGNAL(aboutToShowContextMenu(HbMenu *,QPointF)), this, |
44 connect(mAddress, SIGNAL(aboutToShowContextMenu(HbMenu *,QPointF)), this, |
44 SLOT(handleAboutToShowContextMenu(HbMenu *,QPointF))); |
45 SLOT(handleAboutToShowContextMenu(HbMenu *,QPointF))); |
45 |
46 |
|
47 // TODO: Wrapping fix breaking normal scenarios. |
|
48 // this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); |
46 } |
49 } |
47 |
50 |
48 //---------------------------------------------------------------------------- |
51 //---------------------------------------------------------------------------- |
49 // UniViewerAddressWidget::~UniViewerAddressWidget |
52 // UniViewerAddressWidget::~UniViewerAddressWidget |
50 // @see header file |
53 // @see header file |
76 { |
79 { |
77 address1.append(alias); |
80 address1.append(alias); |
78 QString alias1 = QString(); |
81 QString alias1 = QString(); |
79 if (UniViewerFeederPrivate::GetNameFromContacts(address, alias1) > 1) |
82 if (UniViewerFeederPrivate::GetNameFromContacts(address, alias1) > 1) |
80 { |
83 { |
81 address1.append(" ("); |
84 address1.append(ADDRESS_OPEN); |
82 address1.append(address); |
85 address1.append(address); |
83 address1.append(")"); |
86 address1.append(ADDRESS_CLOSE); |
84 } |
87 } |
85 } |
88 } |
86 else |
89 else |
87 { |
90 { |
88 address1.append(address); |
91 address1.append(address); |
124 address.append(addressList[i]->alias()); |
127 address.append(addressList[i]->alias()); |
125 QString alias = QString(); |
128 QString alias = QString(); |
126 if (UniViewerFeederPrivate::GetNameFromContacts(addressList[i]->address(), |
129 if (UniViewerFeederPrivate::GetNameFromContacts(addressList[i]->address(), |
127 alias) > 1) |
130 alias) > 1) |
128 { |
131 { |
129 address.append(" ("); |
132 address.append(ADDRESS_OPEN); |
130 address.append(addressList[i]->address()); |
133 address.append(addressList[i]->address()); |
131 address.append(")"); |
134 address.append(ADDRESS_CLOSE); |
132 } |
135 } |
133 } |
136 } |
134 else |
137 else |
135 { |
138 { |
136 address.append(addressList[i]->address()); |
139 address.append(addressList[i]->address()); |