--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Fri Jun 25 19:19:22 2010 +0300
@@ -136,6 +136,9 @@
case QEvent::GraphicsSceneMouseRelease:
handleMouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
return true;
+ case QEvent::UngrabMouse:
+ setBackgroundToNormal();
+ return true;
default:
break;
}
@@ -232,7 +235,7 @@
return;
}
- HbInstantFeedback::play(HsConfiguration::shortcutWidgetTapFeedbackType());
+ HbInstantFeedback::play(HSCONFIGURATION_GET(shortcutWidgetTapFeedbackEffect));
if (mCaEntryRole == ItemEntryRole) {
CaService::instance()->executeCommand(mCaEntryId);
@@ -261,7 +264,7 @@
}
// Text
- if ( HsConfiguration::shortcutLabelsVisible() && !mText ) {
+ if (HSCONFIGURATION_GET(isShortcutLabelVisible) && !mText ) {
mText = new HbTextItem(this);
HbStyle::setItemName(mText, QLatin1String("text"));
}
@@ -283,8 +286,12 @@
mCaEntryTypeName = caEntry.entryTypeName();
mIcon->setIcon(caEntry.makeIcon());
if (mText) {
- mText->setText(caEntry.text());
- }
+ if(caEntry.attribute(entryShortName()).length()) {
+ mText->setText(caEntry.attribute(entryShortName()));
+ } else {
+ mText->setText(caEntry.text());
+ }
+ }
}
/*!
@@ -345,3 +352,4 @@
}
+