--- a/tsdevicedialog/tsdevicedialogplugin/src/tstasksgriditem.cpp Tue Jun 29 10:20:30 2010 +0300
+++ b/tsdevicedialog/tsdevicedialogplugin/src/tstasksgriditem.cpp Fri Jul 09 14:19:08 2010 +0300
@@ -54,7 +54,7 @@
applicationLabelFrame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
applicationLabelFrame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
- mActiveLabel = new HbTextItem(hbTrId("txt_tsw_label_active"), this);
+ mActiveLabel = new HbTextItem(hbTrId("txt_ts_label_active"), this);
mActiveLabelFrame = new HbFrameItem(this);
mActiveLabelFrame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
mActiveLabelFrame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
@@ -88,14 +88,21 @@
{
mScreenshotLabel->setIcon(modelIndex().data(Qt::DecorationRole).value<HbIcon>());
mApplicationNameLabel->setText(modelIndex().data(Qt::DisplayRole).toString());
- QVariant status(modelIndex().data(TsDataRoles::Closable));
- const bool isClosable(status.isValid() && status.toBool());
+
+ QVariant closableData(modelIndex().data(TsDataRoles::Closable));
+ const bool isClosable(closableData.isValid() && closableData.toBool());
if (isClosable) {
mDeleteButton->show();
+ } else {
+ mDeleteButton->hide();
+ }
+
+ QVariant activeData(modelIndex().data(TsDataRoles::Active));
+ const bool isActive(activeData.isValid() && activeData.toBool());
+ if (isActive) {
mActiveLabel->show();
mActiveLabelFrame->show();
} else {
- mDeleteButton->hide();
mActiveLabel->hide();
mActiveLabelFrame->hide();
}