equal
deleted
inserted
replaced
95 mItemId = 0; |
95 mItemId = 0; |
96 if (event->type() == HsMenuEvent::eventType()) { |
96 if (event->type() == HsMenuEvent::eventType()) { |
97 HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); |
97 HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); |
98 QVariantMap data = menuEvent->data(); |
98 QVariantMap data = menuEvent->data(); |
99 |
99 |
100 mItemId = data.value(itemIdKey()).toInt(); |
100 mItemId = data.value(Hs::itemIdKey).toInt(); |
101 } |
101 } |
102 mCollectionNameDialog = new HsCollectionNameDialog(mItemId); |
102 mCollectionNameDialog = new HsCollectionNameDialog(mItemId); |
103 mCollectionNameDialog->open(this, SLOT(dialogFinished(HbAction*))); |
103 mCollectionNameDialog->open(this, SLOT(dialogFinished(HbAction*))); |
104 |
104 |
105 HSMENUTEST_FUNC_EXIT("HsCollectionNameState::onEntry"); |
105 HSMENUTEST_FUNC_EXIT("HsCollectionNameState::onEntry"); |
118 } |
118 } |
119 } else { |
119 } else { |
120 HsMenuService::createCollection(newName); |
120 HsMenuService::createCollection(newName); |
121 } |
121 } |
122 } |
122 } |
123 mCollectionNameDialog = NULL; //set to NULL since this will be deleted atfer close |
123 //set to NULL since this will be deleted atfer close |
|
124 mCollectionNameDialog = NULL; |
124 emit exit(); |
125 emit exit(); |
125 } |
126 } |
126 |
127 |
127 // --------------------------------------------------------------------------- |
128 // --------------------------------------------------------------------------- |
128 // --------------------------------------------------------------------------- |
129 // --------------------------------------------------------------------------- |
129 // |
130 // |
130 void HsCollectionNameState::cleanUp() |
131 void HsCollectionNameState::cleanUp() |
131 { |
132 { |
132 if (mCollectionNameDialog) { |
133 if (mCollectionNameDialog) { |
133 disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), this, SLOT(dialogFinished(HbAction*))); |
134 disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), |
|
135 this, SLOT(dialogFinished(HbAction*))); |
134 mCollectionNameDialog->close(); |
136 mCollectionNameDialog->close(); |
135 mCollectionNameDialog = NULL; |
137 mCollectionNameDialog = NULL; |
136 } |
138 } |
137 } |
139 } |