- - - - - - - - - - - - - - - - - - - - - +

+ + + + + + + + + + + + + + + + + + + + + +

- -

- - - - - - - - - - - - - - - - - - - - +

+ + + + + + + + + + + + + + + + + + + + +

- -

- - - - - - - - - - - - - - - - - - - - - - -

- -

- - - - - - - - - - - - - - - - - - - - - -

- - +

+ + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -68,11 +68,11 @@ void HsAddModeProxyModel::initilizeCwrtWidgetCache() { QStringList entryTypeNames; - entryTypeNames.append(applicationTypeName()); + entryTypeNames.append(Hs::applicationTypeName); mQuery.setEntryTypeNames(entryTypeNames); - mQuery.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE); - mQuery.setAttribute(widgetUriAttributeName(), - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); + mQuery.setAttribute(Hs::swTypeKey, Hs::HS_CWRT_APP_TYPE); + mQuery.setAttribute(Hs::widgetUriAttributeName, + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); QList< QSharedPointer > entries = CaService::instance()->getEntries(mQuery); foreach (QSharedPointer entry, entries) { @@ -83,18 +83,35 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } int count(0); HsContentService::instance()->widgets( - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); mCwrtWidgetCache.insert(entry->id(), count > 0); } } +/* + Reimplementated from QSortFilterProxyModel to forward signals from CaItemModel. + \param sourceModel source model. + */ +void HsAddModeProxyModel::setSourceModel(QAbstractItemModel *sourceModel) +{ + QSortFilterProxyModel::setSourceModel(sourceModel); + connect(sourceModel, + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), + this, + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint))); + connect(sourceModel, + SIGNAL(countChange()), + this, + SIGNAL(countChange())); +} + /*! Return entryid for given Cwrt with mini view widget. \param uri of a widget. @@ -107,11 +124,11 @@ CaQuery query; QStringList entryTypeNames; query.setEntryTypeNames(entryTypeNames); - query.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE); - query.setAttribute(widgetUriAttributeName(), - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); + query.setAttribute(Hs::swTypeKey, Hs::HS_CWRT_APP_TYPE); + query.setAttribute(Hs::widgetUriAttributeName, + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); foreach (QString key, preferences.keys()) { - query.setAttribute(widgetParam()+key, + query.setAttribute(Hs::widgetParam+key, preferences.value(key).toString()); } QList< QSharedPointer > entries = @@ -131,7 +148,7 @@ */ void HsAddModeProxyModel::updateCacheOnAddWidget(const QString &uri, const QVariantHash &preferences){ - if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (uri == Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { int entryId = findCwrtWidgetEntryId(preferences); if (!mCwrtWidgetCache.value(entryId) ) { mCwrtWidgetCache.insert(entryId,true); @@ -149,7 +166,7 @@ void HsAddModeProxyModel::updateCacheOnRemoveWidget(const QString &uri, const QVariantHash &preferences) { - if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (uri == Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { int entryId = findCwrtWidgetEntryId(preferences); if (mCwrtWidgetCache.value(entryId)) { mCwrtWidgetCache.insert(entryId,false); @@ -186,3 +203,4 @@ HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(&entry)); } } + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -66,11 +66,11 @@ QState *parent) : HsBaseViewState(mainWindow, menuMode, parent), mAddModeProxyModel(0), - mSortAttribute(AscendingNameHsSortAttribute) + mSortAttribute(Hs::AscendingNameHsSortAttribute) { initialize(menuViewBuilder, HsAllAppsContext); construct(); - mAddModeProxyModel = new HsAddModeProxyModel(this); + mAddModeProxyModel = new HsAddModeProxyModel(this); mAddModeProxyModel->setSourceModel(mModel); } @@ -137,10 +137,10 @@ } int currentSortingPosition(-1); switch (mSortAttribute) { - case AscendingNameHsSortAttribute: + case Hs::AscendingNameHsSortAttribute: currentSortingPosition = 0; break; - case DescendingNameHsSortAttribute: + case Hs::DescendingNameHsSortAttribute: currentSortingPosition = 1; break; default: @@ -168,22 +168,38 @@ void HsAllAppsState::normalModeEntered() { HsBaseViewState::normalModeEntered(); - if (mMenuView->model() != mModel) { - mMenuView->setModel(mModel); - } connect(mMenuView.data(), SIGNAL(activated(QModelIndex)), static_cast(this), SLOT(launchItem(QModelIndex))); } /*! - Slot invoked when add mode entered. + Sets model for this view in depends on menuMode. + \param menuMode menu mode */ -void HsAllAppsState::addModeEntered() +void HsAllAppsState::setModel(Hs::HsMenuMode menuMode) { - HsBaseViewState::addModeEntered(); - if (mMenuView->model() != mAddModeProxyModel) { - mMenuView->setModel(mAddModeProxyModel); + if (menuMode == Hs::AddHsMenuMode) { + if (mMenuView->model() != mAddModeProxyModel) { + mMenuView->setModel(mAddModeProxyModel); + } + } else { + if (mMenuView->model() != mModel) { + mMenuView->setModel(mModel); + } + } +} + + +/*! + Scrolls view to first item at top + */ +void HsAllAppsState::scrollToBeginning() +{ + QAbstractItemModel* model = mMenuView->model(); + if (model != NULL ) { + mMenuView->listView()->scrollTo( + model->index(0,0), HbAbstractItemView::PositionAtTop); } } @@ -201,78 +217,6 @@ } /*! - Slot connected to List widget in add mode. - \param index Model index of the activated item. - */ -void HsAllAppsState::addActivated(const QModelIndex &index) -{ - mMenuView->disconnect(this); - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addActivated"); - addToHomeScreen(index); - HSMENUTEST_FUNC_EXIT("HsAllAppsState::addActivated"); -} - - -/*! - Handles context menu actions - */ -void HsAllAppsState::contextMenuAction(HbAction *action) -{ - HsContextAction command = - static_cast(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - addToHomeScreen(mContextModelIndex); - break; - case AddToCollectionContextAction: - // Addding a specific application to - // an existing collection via item specific menu. - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( - mSortAttribute, itemId)); - break; - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent(itemId)); - break; - case AppSettingContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppSettingsViewEvent(itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - case OpenContextAction: - launchItem(mContextModelIndex); - break; - default: - break; - } - mMenuView->hideSearchPanel(); -} - -/*! - Slot connected to List widget in add mode. - Called when item long pressed. - \param item View item. - \param coords Press point coordinates. - */ -void HsAllAppsState::addLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - Q_UNUSED(coords); - mMenuView->disconnect(this); - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed"); - addToHomeScreen(item->modelIndex()); - HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed"); - -} - -/*! Slot called when application is adding to collection. */ void HsAllAppsState::addToCollection() @@ -300,58 +244,43 @@ #endif //COVERAGE_MEASUREMENT /*! - Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen. - \retval void - */ -void HsAllAppsState::addToHomeScreen(const QModelIndex &index) -{ - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addToHomeScreen"); - QSharedPointer entry = mModel->entry(index); - - machine()-> postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); - - HSMENUTEST_FUNC_EXIT("HsAllAppsState::addToHomeScreen"); -} - -/*! Method seting context menu options. */ void HsAllAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) { HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenAppContextAction); HbAction *addToHomeScreenAction = mContextMenu->addAction( hbTrId("txt_applib_menu_add_to_home_screen")); - addToHomeScreenAction->setData(AddToHomeScreenContextAction); + addToHomeScreenAction->setData(Hs::AddToHomeScreenContextAction); HbAction *addToCollectionAction = mContextMenu->addAction( hbTrId("txt_applib_menu_add_to_collection")); - addToCollectionAction->setData(AddToCollectionContextAction); + + addToCollectionAction->setData( + Hs::AddToCollectionFromApplicationsViewContextAction); HbAction *uninstallAction = mContextMenu->addAction( hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); HbAction *appSettingsAction(NULL); HbAction *appDetailsAction(NULL); // check conditions and hide irrelevant menu items QSharedPointer entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + if (!(entry->attribute(Hs::appSettingsPlugin).isEmpty())) { appSettingsAction = mContextMenu->addAction( hbTrId("txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); + appSettingsAction->setData(Hs::AppSettingContextAction); } - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction( hbTrId("txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } if (!(flags & RemovableEntryFlag)) { @@ -368,7 +297,7 @@ void HsAllAppsState::ascendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::ascendingMenuAction"); - mSortAttribute = AscendingNameHsSortAttribute; + mSortAttribute = Hs::AscendingNameHsSortAttribute; mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::ascendingMenuAction"); } @@ -379,7 +308,7 @@ void HsAllAppsState::descendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::descendingMenuAction"); - mSortAttribute = DescendingNameHsSortAttribute; + mSortAttribute = Hs::DescendingNameHsSortAttribute; mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::descendingMenuAction"); diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -109,21 +109,21 @@ HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenCollectionContextAction); // create context menu HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_home_screen")); - addShortcutAction->setData(AddToHomeScreenContextAction); + addShortcutAction->setData(Hs::AddToHomeScreenContextAction); HbAction *renameAction = NULL; HbAction *deleteAction = NULL; if ((flags & RemovableEntryFlag)) { renameAction = mContextMenu->addAction( hbTrId("txt_common_menu_rename_item")); - renameAction->setData(RenameContextAction); + renameAction->setData(Hs::RenameCollectionContextAction); deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - deleteAction->setData(DeleteContextAction); + deleteAction->setData(Hs::DeleteCollectionContextAction); } } @@ -169,73 +169,6 @@ } /*! - Slot connected to List widget in add mode. - \param index Model index of the activated item. - */ -void HsAllCollectionsState::addActivated(const QModelIndex &index) -{ - mMenuView->disconnect(this); - const int itemId = index.data(CaItemModel::IdRole).toInt(); - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); -} - -/*! - Slot connected to List widget in add mode. - Called when item long pressed. - \param item View item. - \param coords Press point coordinates. - */ -void HsAllCollectionsState::addLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - Q_UNUSED(coords); - mMenuView->disconnect(this); - const int itemId = item->modelIndex().data(CaItemModel::IdRole).toInt(); - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent(itemId, - mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); -} - -/*! - Handles context menu actions. - \param action to be handled. - */ -void HsAllCollectionsState::contextMenuAction(HbAction *action) -{ - HsContextAction command = - static_cast(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, - mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); - break; - case RenameContextAction: - machine()->postEvent( - HsMenuEventFactory::createRenameCollectionEvent(itemId)); - break; - case DeleteContextAction: - machine()->postEvent( - HsMenuEventFactory::createDeleteCollectionEvent(itemId)); - break; - case OpenContextAction: - openCollection(mContextModelIndex); - break; - default: - break; - } - - mMenuView->hideSearchPanel(); -} - -/*! Slot connected to constructMenu. */ void HsAllCollectionsState::createNewCollection() diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -123,11 +123,11 @@ setInitialState(initialState); mHistoryTransaction = new HsMenuModeTransition( - mMenuMode, NormalHsMenuMode, mAllAppsState); + mMenuMode, Hs::NormalHsMenuMode, mAllAppsState); initialState->addTransition(mHistoryTransaction); initialState->addTransition(new HsMenuModeTransition( - mMenuMode, AddHsMenuMode, mAllAppsState)); + mMenuMode, Hs::AddHsMenuMode, mAllAppsState)); mCollectionState = new HsCollectionState(mMenuViewBuilder, mMenuMode, @@ -197,22 +197,23 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::onEntry"); QState::onEntry(event); - if (static_cast(event)->operation() != - HsMenuEvent::OpenCollectionFromAppLibrary) - { - // we are back from HS, scroll those views to top - mAllAppsState->scrollToBeginning(); - mAllCollectionsState->scrollToBeginning(); - } - if (event->type() == HsMenuEvent::eventType()) { HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); mMenuMode.setHsMenuMode( - static_cast(data.value(menuModeType()).toInt()), - data.value(HOMESCREENDATA)); + static_cast(data.value(Hs::menuModeType).toInt()), + data.value(Hs::homescreenData)); } else { - mMenuMode.setHsMenuMode(NormalHsMenuMode); + mMenuMode.setHsMenuMode(Hs::NormalHsMenuMode); + } + + if (event->type() != HsMenuEvent::eventType() || + static_cast(event)->operation() != + HsMenuEvent::OpenCollectionFromAppLibrary) { + // we are back from HS, scroll those views to top + mAllAppsState->setModel(mMenuMode.getHsMenuMode()); + mAllAppsState->scrollToBeginning(); + mAllCollectionsState->scrollToBeginning(); } HSMENUTEST_FUNC_EXIT("HsAppLibraryState::onEntry"); @@ -251,8 +252,7 @@ mMenuViewBuilder.operatorAction())); operatorAction->setText(hbTrId(operatorHandler->text().toLatin1())); - //TODO: no locstring for ovi store currently - mMenuViewBuilder.oviStoreAction()->setText("Ovi Store"); + mMenuViewBuilder.oviStoreAction()->setText(hbTrId("txt_applib_grid_ovi_store")); if (operatorHandler->operatorStoreFirst()) { extension->addAction(operatorAction); extension->addAction(mMenuViewBuilder.oviStoreAction()); @@ -314,14 +314,14 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::oviStoreAction"); CaEntry oviEntry; - oviEntry.setEntryTypeName(applicationTypeName()); - oviEntry.setAttribute( applicationUidEntryKey(), - QString::number(oviLauncherApplicationUid)); + oviEntry.setEntryTypeName(Hs::applicationTypeName); + oviEntry.setAttribute( Hs::applicationUidEntryKey, + QString::number(Hs::oviLauncherApplicationUid)); int result = CaService::instance()->executeCommand(oviEntry); if (result) { - oviEntry.setEntryTypeName(urlTypeName()); - oviEntry.setAttribute(urlEntryKey(), + oviEntry.setEntryTypeName(Hs::urlTypeName); + oviEntry.setAttribute(Hs::urlEntryKey, QString("https://store.ovi.com/applications/")); result = CaService::instance()->executeCommand(oviEntry); } @@ -335,7 +335,7 @@ */ void HsAppLibraryState::allAppsStateEntered() { - if (mMenuMode.getHsMenuMode() == NormalHsMenuMode) { + if (mMenuMode.getHsMenuMode() == Hs::NormalHsMenuMode) { mHistoryTransaction->setTargetState(mAllAppsState); } } @@ -345,7 +345,7 @@ */ void HsAppLibraryState::allCollectionsStateEntered() { - if (mMenuMode.getHsMenuMode() == NormalHsMenuMode) { + if (mMenuMode.getHsMenuMode() == Hs::NormalHsMenuMode) { mHistoryTransaction->setTargetState(mAllCollectionsState); } } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -34,10 +34,10 @@ bool HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(const CaEntry *entry) { bool result = false; - if (entry->entryTypeName() == applicationTypeName() && - entry->attribute(swTypeKey()) == HS_CWRT_APP_TYPE && - entry->attribute(widgetUriAttributeName()) == - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (entry->entryTypeName() == Hs::applicationTypeName && + entry->attribute(Hs::swTypeKey) == Hs::HS_CWRT_APP_TYPE && + entry->attribute(Hs::widgetUriAttributeName) == + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { QVariantHash preferences; QMap attributes = entry->attributes(); QMapIterator i(attributes); @@ -45,12 +45,12 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } int count(0); - HsContentService::instance()->widgets(HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); + HsContentService::instance()->widgets(Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); result = count > 0; } return result; diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -34,6 +34,7 @@ #include "hsmenumodetransition.h" #include "hsmenuentryremovedhandler.h" #include "hsmainwindow.h" +#include "hsmenumodewrapper.h" /*! @@ -180,10 +181,6 @@ { setMenuOptions(); connect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); } @@ -194,8 +191,8 @@ HsBaseViewState::~HsBaseViewState() { delete mModel; - mViewOptions = mMenuView->view()->takeMenu(); - delete mViewOptions; + mViewOptions = mMenuView->view()->takeMenu(); + delete mViewOptions; } /*! @@ -208,10 +205,10 @@ QSharedPointer entry = mModel->entry(index); if (!entry.isNull() && !(entry->flags() & UninstallEntryFlag)) { - if (entry->entryTypeName() == widgetTypeName()) { + if (entry->entryTypeName() == Hs::widgetTypeName) { machine()->postEvent(HsMenuEventFactory::createPreviewHSWidgetEvent(entry->id(), - entry->entryTypeName(), entry->attribute(widgetUriAttributeName()), - entry->attribute(widgetLibraryAttributeName()))); + entry->entryTypeName(), entry->attribute(Hs::widgetUriAttributeName), + entry->attribute(Hs::widgetLibraryAttributeName))); HsMenuService::touch(entry->id()); } else { @@ -284,6 +281,20 @@ } /*! + Triggers event so that a state adding to Home Screen is reached + \param entryId of an item to be added to homescreen. + \retval void + */ +void HsBaseViewState::addToHomeScreen(const int entryId) +{ + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::addToHomeScreen"); + machine()->postEvent( + HsMenuEventFactory::createAddToHomeScreenEvent( + entryId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); + HSMENUTEST_FUNC_EXIT("HsBaseViewState::addToHomeScreen"); +} + +/*! Check software updates. \retval 0 if operation is successful. */ @@ -305,6 +316,97 @@ mContextMenu->close(); } } + +/*! + Handles context menu actions + \param action action taken in context menu + */ +void HsBaseViewState::contextMenuAction(HbAction *action) +{ + Hs::HsContextAction command = + static_cast(action->data().toInt()); + + const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + + switch (command) { + case Hs::AddToHomeScreenContextAction: + addToHomeScreen(itemId); + break; + case Hs::AddToCollectionFromApplicationsViewContextAction: + // Addding a specific application to + // an existing collection via item specific menu. + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( + Hs::NoHsSortAttribute, itemId)); + break; + case Hs::AddToCollectionFromCollectionViewContextAction: + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( + -1, itemId)); + break; + case Hs::UninstallContextAction: + machine()->postEvent( + HsMenuEventFactory::createUninstallApplicationEvent( + itemId)); + break; + case Hs::AppSettingContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppSettingsViewEvent(itemId)); + break; + case Hs::AppDetailsContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppDetailsViewEvent(itemId)); + break; + case Hs::OpenAppContextAction: + launchItem(mContextModelIndex); + break; + case Hs::RenameCollectionContextAction: + machine()->postEvent( + HsMenuEventFactory::createRenameCollectionEvent(itemId)); + break; + case Hs::DeleteCollectionContextAction: + machine()->postEvent( + HsMenuEventFactory::createDeleteCollectionEvent(itemId)); + break; + case Hs::OpenCollectionContextAction: + openCollection(mContextModelIndex); + break; + default: + break; + } + + HsMenuService::touch(itemId); +} + +/*! + Slot connected to List widget in add mode. + \param index Model index of the activated item. + */ +void HsBaseViewState::addActivated(const QModelIndex &index) +{ + HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addActivated"); + mMenuView->disconnect(this); + const int itemId = index.data(CaItemModel::IdRole).toInt(); + addToHomeScreen(itemId); + HsMenuService::touch(itemId); + HSMENUTEST_FUNC_EXIT("HsAllAppsState::addActivated"); +} + +/*! + Slot connected to List widget in add mode. + Called when item long pressed. + \param item View item. + \param coords Press point coordinates. + */ +void HsBaseViewState::addLongPressed(HbAbstractViewItem *item, + const QPointF &coords) +{ + Q_UNUSED(coords); + HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed"); + addActivated(item->modelIndex()); + HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed"); +} + /*! Scrolls view to first item at top */ @@ -338,7 +440,8 @@ connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited())); initialState->addTransition(new HsMenuModeTransition( - *mMenuMode, NormalHsMenuMode, normalModeState)); + *mMenuMode, Hs::NormalHsMenuMode, normalModeState)); initialState->addTransition(new HsMenuModeTransition( - *mMenuMode, AddHsMenuMode, addModeState)); + *mMenuMode, Hs::AddHsMenuMode, addModeState)); } + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -87,7 +87,7 @@ HsMainWindow &mainWindow, QState *parent) : HsBaseViewState(mainWindow, menuMode, parent), - mSortAttribute(LatestOnTopHsSortAttribute), + mSortAttribute(Hs::LatestOnTopHsSortAttribute), mCollectionId(-1) { initialize(menuViewBuilder, HsCollectionContext); @@ -131,8 +131,8 @@ if (event->type() == HsMenuEvent::eventType()) { HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mCollectionId = data.value(itemIdKey()).toInt(); - mCollectionType = data.value(entryTypeNameKey()).toString(); + mCollectionId = data.value(Hs::itemIdKey).toInt(); + mCollectionType = data.value(Hs::entryTypeNameKey).toString(); } HSMENUTEST_FUNC_EXIT("HsCollectionState::onEntry"); @@ -201,19 +201,20 @@ this, SLOT(deleteAction())); } - if (mCollectionType == collectionDownloadedTypeName()) { + if (mCollectionType == Hs::collectionDownloadedTypeName && + mModel->rowCount() > 0) { HbMenu *sortMenu = mViewOptions->addMenu( hbTrId("txt_applib_opt_sort_by")); //Grouped options are exclusive by default. QActionGroup *sortGroup = new QActionGroup(this); sortGroup->addAction( sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), + hbTrId("txt_applib_opt_sub_latest_on_top"), this, SLOT(latestOnTopMenuAction()))); sortGroup->addAction( sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), + hbTrId("txt_applib_opt_sub_oldest_on_top"), this, SLOT(oldestOnTopMenuAction()))); foreach(QAction *action, sortMenu->actions()) { @@ -237,7 +238,7 @@ delete mModel; mModel = NULL; - this->mSortAttribute = NoHsSortAttribute; + this->mSortAttribute = Hs::NoHsSortAttribute; HsBaseViewState::stateExited(); @@ -257,10 +258,6 @@ static_cast(this), SLOT(launchItem(QModelIndex))); connect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), static_cast(this), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); @@ -284,10 +281,6 @@ static_cast(this), SLOT(launchItem(QModelIndex))); disconnect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - disconnect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), static_cast(this), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); @@ -303,49 +296,19 @@ /*! Handles context menu actions + \param action action taken in context menu */ void HsCollectionState::contextMenuAction(HbAction *action) { - HsContextAction command = - static_cast(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - addElementToHomeScreen(mContextModelIndex); - break; - case AddToCollectionContextAction: - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCollectionViewEvent( - mCollectionId, itemId)); - break; - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent( - itemId)); - break; - case RemoveFromCollectionContextAction: - machine()->postEvent( - HsMenuEventFactory::createRemoveAppFromCollectionEvent( - itemId, mCollectionId)); - break; - case AppSettingContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppSettingsViewEvent(itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - case OpenContextAction: - launchItem(mContextModelIndex); - break; - default: - break; + HsBaseViewState::contextMenuAction(action); + Hs::HsContextAction command = + static_cast(action->data().toInt()); + if (command == Hs::RemoveFromCollectionContextAction ) { + const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + machine()->postEvent( + HsMenuEventFactory::createRemoveAppFromCollectionEvent( + itemId, mCollectionId)); } - - mMenuView->hideSearchPanel(); } /*! @@ -363,7 +326,7 @@ if (flags & RemovableEntryFlag){ mMenuView->reset(HsButtonContext); connect(mMenuView->contentButton(), - SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool)), + SIGNAL(clicked()), this, SLOT(addAppsAction()), Qt::UniqueConnection); } else { mMenuView->reset(HsEmptyLabelContext); @@ -399,19 +362,12 @@ \param addApps if true create event for add enties to collection. Parametr use by toggled from HbPushButton */ -void HsCollectionState::addAppsAction(bool addApps) +void HsCollectionState::addAppsAction() { // Add applications - if (addApps) { - - if (mMenuView->contentButton()) { - mMenuView->contentButton()->setChecked(false); - } - - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCollectionViewEvent( - mCollectionId)); - } + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( + mCollectionId)); } /*! @@ -419,9 +375,7 @@ */ void HsCollectionState::addCollectionShortcutToHomeScreenAction() { - machine()->postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - mCollectionId, mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); + addToHomeScreen(mCollectionId); } /*! @@ -456,35 +410,19 @@ } /*! - Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen. - \retval void - */ -void HsCollectionState::addElementToHomeScreen(const QModelIndex &index) -{ - QSharedPointer entry = mModel->entry(index); - - QMap attributes = entry->attributes(); - - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); -} - -/*! Method setting context menu options. */ void HsCollectionState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) { HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenAppContextAction); HbAction *addToHomeScreenAction = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_home_screen")); - addToHomeScreenAction->setData(AddToHomeScreenContextAction); + addToHomeScreenAction->setData(Hs::AddToHomeScreenContextAction); HbAction *addToCollection = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_collection")); - addToCollection->setData(AddToCollectionContextAction); + addToCollection->setData(Hs::AddToCollectionFromCollectionViewContextAction); HbAction *removeAction(NULL); HbAction *uninstallAction(NULL); HbAction *appSettingsAction(NULL); @@ -498,26 +436,26 @@ if (rootFlags & RemovableEntryFlag) { removeAction = mContextMenu->addAction( hbTrId("txt_applib_menu_remove_from_collection")); - removeAction->setData(RemoveFromCollectionContextAction); + removeAction->setData(Hs::RemoveFromCollectionContextAction); } if ((flags & RemovableEntryFlag)) { uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); } QSharedPointer entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + if (!(entry->attribute(Hs::appSettingsPlugin).isEmpty())) { appSettingsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); + appSettingsAction->setData(Hs::AppSettingContextAction); } - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } addToHomeScreenAction->setVisible( @@ -530,7 +468,7 @@ */ void HsCollectionState::latestOnTopMenuAction() { - mSortAttribute = LatestOnTopHsSortAttribute; + mSortAttribute = Hs::LatestOnTopHsSortAttribute; mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); } @@ -541,7 +479,7 @@ */ void HsCollectionState::oldestOnTopMenuAction() { - mSortAttribute = OldestOnTopHsSortAttribute; + mSortAttribute = Hs::OldestOnTopHsSortAttribute; mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -51,7 +51,8 @@ HsInstalledAppsState::HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder, HsMainWindow &mainWindow, QState *parent): - HsBaseViewState(mainWindow, parent) + HsBaseViewState(mainWindow, parent), + mSortAttribute(Hs::OldestOnTopHsSortAttribute) { initialize(menuViewBuilder, HsInstalledAppsContext); construct(); @@ -86,7 +87,33 @@ this, SLOT(openTaskSwitcher())); mViewOptions->addAction(hbTrId("txt_applib_opt_installation_log"), this, SLOT(openInstallationLog())); - + if (mModel->rowCount() > 0) { + HbMenu *sortMenu = mViewOptions->addMenu( + hbTrId("txt_applib_opt_sort_by")); + //Grouped options are exclusive by default. + QActionGroup *sortGroup = new QActionGroup(this); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), + this, + SLOT(latestOnTopMenuAction()))); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), + this, + SLOT(oldestOnTopMenuAction()))); + foreach(QAction *action, sortMenu->actions()) { + action->setCheckable(true); + } + static const int defaultSortingPosition = 0; + if(mSortAttribute == Hs::LatestOnTopHsSortAttribute) + { + sortGroup->actions().at(defaultSortingPosition + 1)->setChecked(true); + } + else { + sortGroup->actions().at(defaultSortingPosition)->setChecked(true); + } + } mMenuView->view()->setMenu(mViewOptions); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::setMenuOptions"); } @@ -101,15 +128,15 @@ HbAction *uninstallAction = mContextMenu->addAction( hbTrId("txt_common_menu_delete")); HbAction *appDetailsAction(NULL); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); QSharedPointer entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } } @@ -137,7 +164,7 @@ if (!mModel) { mModel - = HsMenuService::getInstalledModel(AscendingNameHsSortAttribute); + = HsMenuService::getInstalledModel(mSortAttribute); } if (mModel->rowCount() == 0) { @@ -196,6 +223,7 @@ mMenuView->reset(HsItemViewContext); mMenuView->setModel(mModel); } + setMenuOptions(); mMenuView->activate(); } @@ -209,28 +237,25 @@ } /*! - Handles context menu actions. - \param action to handle. + A Slot called when an action for sorting (latest + on top) is invoked for Installed. */ -void HsInstalledAppsState::contextMenuAction(HbAction *action) +void HsInstalledAppsState::latestOnTopMenuAction() { - HsContextAction command = - static_cast(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + // as we geting already reversed list from query + // we set it to OldestOnTopHsSortAttribute + mSortAttribute = Hs::OldestOnTopHsSortAttribute; + mModel->setSort(mSortAttribute); +} - switch (command) { - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent( - itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - default: - break; - } - mMenuView->hideSearchPanel(); +/*! + A Slot called when an action for sorting (oldest + on top) is invoked for Installed. + */ +void HsInstalledAppsState::oldestOnTopMenuAction() +{ + // as we geting already reversed list from query + // we set it to LatestOnTopHsSortAttribute + mSortAttribute = Hs::LatestOnTopHsSortAttribute; + mModel->setSort(mSortAttribute); } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodetransition.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodetransition.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodetransition.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -32,7 +32,7 @@ \param target target state. */ HsMenuModeTransition::HsMenuModeTransition( - HsMenuModeWrapper &menuMode, HsMenuMode expectedMenuMode, QState *target): + HsMenuModeWrapper &menuMode, Hs::HsMenuMode expectedMenuMode, QState *target): mMenuMode(menuMode), mExpectedMenuMode(expectedMenuMode) { setTargetState(target); diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodewrapper.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodewrapper.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodewrapper.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -32,14 +32,14 @@ Constructor. */ -HsMenuModeWrapper::HsMenuModeWrapper(): mMode(NormalHsMenuMode) +HsMenuModeWrapper::HsMenuModeWrapper(): mMode(Hs::NormalHsMenuMode) { } /*! \return homescreen mode (add mode on / add mode off) set on the object */ -HsMenuMode HsMenuModeWrapper::getHsMenuMode() const +Hs::HsMenuMode HsMenuModeWrapper::getHsMenuMode() const { return mMode; } @@ -55,7 +55,7 @@ /*! \return sets in the object homescreen mode (add mode on / add mode off) */ -void HsMenuModeWrapper::setHsMenuMode(HsMenuMode menuMode, QVariant token) +void HsMenuModeWrapper::setHsMenuMode(Hs::HsMenuMode menuMode, QVariant token) { mMode = menuMode; mToken = token; diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -51,7 +51,23 @@ */ /*! + \fn void activated(const QModelIndex &index); + \param index of activated item. + Emitted on tap event on the list view. +*/ +/*! + \fn void longPressed(HbAbstractViewItem *item, const QPointF &coords); + \param item List element that was long-pressed. + \param coords Coordinates of the long-press. + Emitted on long-press event on the list view + */ +/*! + \fn void listViewChange(); + Emitted on model count change for current model + \see void setModel(QAbstractItemModel *model) +*/ +/*! Retrieves UI objects for a requested context and sets up signals' connections. \param builder Menu View builder. @@ -82,6 +98,8 @@ connect(mHsSearchView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SIGNAL(longPressed(HbAbstractViewItem *, QPointF))); + connect(mHsSearchView.data(), SIGNAL(searchComplete(QModelIndex)), + this, SLOT(handleSearchComplete(QModelIndex))); } /*! @@ -110,7 +128,7 @@ SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); disconnect(mListView->model(), SIGNAL(countChange()), this, - SIGNAL(listViewChange())); + SIGNAL(listViewChange())); } mListView->setItemPixmapCacheEnabled(true); // TODO: remove when enabled from default @@ -131,11 +149,15 @@ } /*! - Returns model for list item view. + Returns model for list item view or null if list view is not available. */ QAbstractItemModel *HsMenuView::model() const { - return mListView->model(); + if (mListView != NULL) { + return mListView->model(); + } else { + return NULL; + } } /*! @@ -253,9 +275,11 @@ */ void HsMenuView::activate() { - mMainWindow.setCurrentView(mView); - connect(mBuilder.searchAction(), SIGNAL(triggered()), - this, SLOT(showSearchPanel()), Qt::UniqueConnection); + if (!mHsSearchView->isActive()) { + mMainWindow.setCurrentView(mView); + connect(mBuilder.searchAction(), SIGNAL(triggered()), + this, SLOT(showSearchPanel()), Qt::UniqueConnection); + } } /*! @@ -322,3 +346,19 @@ mViewLabel = mBuilder.currentViewLabel(); mAddContentButton = mBuilder.currentAddContentButton(); } + + +/*! + Slot. + \param firstMatching Index of first item of search result. + If menu view is about to show it scrolls the list to \a firstMatching. + Makes view represented by the object main view of the application. + */ +void HsMenuView::handleSearchComplete(const QModelIndex& firstMatching) +{ + if (mListView != NULL) { + mListView->scrollTo(firstMatching, HbAbstractItemView::PositionAtTop); + } + + activate(); +} diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -147,9 +147,9 @@ crManager, OperatorStoreApplication, XQSettingsManager::TypeString); if (!variant.isNull()) { CaEntry *operatorEntry = new CaEntry; - operatorEntry->setEntryTypeName(applicationTypeName()); + operatorEntry->setEntryTypeName(Hs::applicationTypeName); operatorEntry->setAttribute( - applicationUidEntryKey(), variant.toString()); + Hs::applicationUidEntryKey, variant.toString()); return operatorEntry; } @@ -168,8 +168,8 @@ crManager, OperatorStoreURL, XQSettingsManager::TypeString); if (!variant.isNull()) { CaEntry *operatorEntry = new CaEntry; - operatorEntry->setEntryTypeName(urlTypeName()); - operatorEntry->setAttribute(urlEntryKey(), variant.toString()); + operatorEntry->setEntryTypeName(Hs::urlTypeName); + operatorEntry->setAttribute(Hs::urlEntryKey, variant.toString()); return operatorEntry; } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -16,9 +16,7 @@ */ #include -#include #include - #include #include #include @@ -33,6 +31,27 @@ #include "hssearchview.h" /*! + * \fn void activated(const QModelIndex &index) + * This signal is emitted when item is tapped. + * \param index of an item that was tapped. + */ + + /*! + * \fn void longPressed(HbAbstractViewItem *item, const QPointF &coords) + * This singal is emitted when view is long pressed. + * \param item View item that was long pressed. + * \param coords View coordinates of the long press. + */ + + /*! + * \fn void searchComplete(const QModelIndex &firstMatching) + * This signal is emitted when search action has been finished + * and search view is about to quit. + * \param firstMatching of first item in search filtered view. + */ + + +/*! Set up proxy model for search. \param builder Retrieves UI widgets. \param stateContext Identifies the state where search starts from. @@ -46,8 +65,9 @@ mVkbHost(NULL), mSearchViewBuilder(), mEmptyResultText(true) { mProxyModel->setFilterRole(CaItemModel::TextRole); - mProxyModel->setFilterKeyColumn(1); + mProxyModel->setFilterKeyColumn(0); mProxyModel->setSortRole(CaItemModel::TextRole); + mProxyModel->setDynamicSortFilter(true); } /*! @@ -128,6 +148,8 @@ mMainWindow.setCurrentView(mSearchView); + openVkb(); + mSearchListView->scrollTo( mProxyModel->mapFromSource(mSearchViewInitialIndex), HbAbstractItemView::PositionAtTop); @@ -157,10 +179,14 @@ */ void HsSearchView::connectSearchItemViewsSignals() { + connect(mSearchListView, SIGNAL(pressed(QModelIndex)), + this, SLOT(hideVkb()), Qt::UniqueConnection); connect(mSearchListView, SIGNAL(activated(QModelIndex)), - this, SLOT(activatedProxySlot(QModelIndex))); + this, SLOT(activatedProxySlot(QModelIndex)), Qt::UniqueConnection); connect(mSearchListView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF))); + this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)), + Qt::UniqueConnection); + } /*! @@ -170,6 +196,8 @@ */ void HsSearchView::disconnectSearchItemViewsSignals() { + disconnect(mSearchListView, SIGNAL(pressed(QModelIndex)), + this, SLOT(hideVkb())); disconnect(mSearchListView, SIGNAL(activated(QModelIndex)), this, SLOT(activatedProxySlot(QModelIndex))); disconnect(mSearchListView, @@ -195,6 +223,8 @@ */ void HsSearchView::connectSearchPanelSignals() { + connect(mProxyModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + this, SLOT(setNoResultsVisibility()), Qt::UniqueConnection); connect(mProxyModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(setNoResultsVisibility())); connect(mProxyModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), @@ -202,7 +232,7 @@ connect(mSearchPanel, SIGNAL(exitClicked()), this, SLOT(hideSearchPanel())); connect(mSearchPanel, SIGNAL(criteriaChanged(QString)), - this, SLOT(findItem(QString))); + this, SLOT(findItem(QString)), Qt::UniqueConnection); } /*! @@ -225,18 +255,17 @@ mIndexToScrollAfterSearchDone = firstVisibleItemIndex(mSearchListView); - setOriginatingContext(); - - mMainWindow.setCurrentView(mBuilder.currentView()); - - mListView->scrollTo(mProxyModel->mapToSource( - mIndexToScrollAfterSearchDone), - HbAbstractItemView::PositionAtTop); + // emiting searchComplete must be done + // after this->isActive() returns false + mSearchListView = NULL; + mSearchPanel = NULL; + + emit searchComplete(mProxyModel->mapToSource( + mIndexToScrollAfterSearchDone)); HbVkbHost::detachHost(mSearchView); mVkbHost.reset(NULL); - mSearchListView = NULL; - mSearchPanel = NULL; + mProxyModel->setSourceModel(NULL); HSMENUTEST_FUNC_EXIT("HsSearchView::searchFinished"); } @@ -254,7 +283,7 @@ QRegExp("(^|\\b)" + criteriaStr, Qt::CaseInsensitive)); mSearchListView->scrollTo( - mProxyModel->index(0,0), HbAbstractItemView::PositionAtTop); + mProxyModel->index(0, 0), HbAbstractItemView::PositionAtTop); HSMENUTEST_FUNC_EXIT("HsSearchView::findItem"); } @@ -340,10 +369,43 @@ } /*! - \retval true when search view is already invoked, \a false otherwise. + \retval true when search view is actually responsible for view management, + \a false otherwise. */ bool HsSearchView::isActive() const { return mSearchListView != NULL; } +/*! + Slot to close virtual keyboard. + */ +void HsSearchView::hideVkb() +{ + sendEvent(QEvent::CloseSoftwareInputPanel); +} + +/*! + Makes Vkb open provided there is an editor visible in the graphics scene. + */ +void HsSearchView::openVkb() +{ + sendEvent(QEvent::RequestSoftwareInputPanel); +} + +/*! + Sends QEvent. + \param eventType Identifies event to be sent. + */ +void HsSearchView::sendEvent(const QEvent::Type eventType) +{ + QInputContext *const ic = qApp->inputContext(); + if (ic != NULL) { + QScopedPointer event( + new QEvent(eventType)); + + ic->filterEvent(event.data()); + } + +} + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -337,7 +337,7 @@ animation->setEndValue(pageLayerXPos(targetPageIndex)); animation->setDuration(duration); - if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) { + if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistance)) { animation->setEasingCurve(HSCONFIGURATION_GET(bounceAnimationEasingCurve)); } else { @@ -526,7 +526,7 @@ */ QVariant homescreenData(mPageHotSpot); machine()->postEvent( - HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode, homescreenData)); + HsMenuEventFactory::createOpenAppLibraryEvent(Hs::AddHsMenuMode, homescreenData)); mPageHotSpot = QPointF(); } @@ -536,7 +536,7 @@ void HsIdleState::onAddContentFromOptionsMenuActionTriggered() { machine()->postEvent( - HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode)); + HsMenuEventFactory::createOpenAppLibraryEvent(Hs::AddHsMenuMode)); } /*! @@ -657,17 +657,17 @@ if (HSCONFIGURATION_GET(isSnapEnabled)) { mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->visual()->sceneBoundingRect()); + bool isTrashbinOpen = HsGui::instance()->idleWidget()->trashBin()->isUnderMouse(); + if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) { - if (mSnapResult.hasHorizontalSnap) { + if (mSnapResult.hasHorizontalSnap && !isTrashbinOpen) { showVerticalLine(); - } - else { + } else { hideVerticalLine(); } - if (mSnapResult.hasVerticalSnap) { + if (mSnapResult.hasVerticalSnap && !isTrashbinOpen) { showHorizontalLine(); - } - else { + } else { hideHorizontalLine(); } } @@ -954,9 +954,9 @@ if (HSCONFIGURATION_GET(isSnapEnabled)) { QVariantHash snapConfiguration; - snapConfiguration[SNAPENABLED] = QString::number(HSCONFIGURATION_GET(isSnapEnabled)); - snapConfiguration[SNAPFORCE] = QString::number(HSCONFIGURATION_GET(snapForce)); - snapConfiguration[SNAPGAP] = QString::number(HSCONFIGURATION_GET(snapGap)); + snapConfiguration[Hs::snapEnabled] = QString::number(HSCONFIGURATION_GET(isSnapEnabled)); + snapConfiguration[Hs::snapForce] = QString::number(HSCONFIGURATION_GET(snapForce)); + snapConfiguration[Hs::snapGap] = QString::number(HSCONFIGURATION_GET(snapGap)); HsWidgetPositioningOnWidgetMove::instance()->setConfiguration(snapConfiguration); updatePagePresentationToWidgetSnap(); @@ -1126,9 +1126,9 @@ int pageIndex = HsScene::instance()->activePageIndex(); - if (mDeltaX < -HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) { + if (mDeltaX < -HSCONFIGURATION_GET(pageChangePanDistance)) { pageIndex = qMin(pageIndex + 1, pages.count() - 1); - } else if (HSCONFIGURATION_GET(pageChangePanDistanceInPixels) < mDeltaX) { + } else if (HSCONFIGURATION_GET(pageChangePanDistance) < mDeltaX) { pageIndex = qMax(pageIndex - 1, 0); } @@ -1212,10 +1212,13 @@ bool isLastPage(scene->activePage() == scene->pages().last()); int nextPageIndex(pageToRemoveIndex); - nextPageIndex++; + if (isLastPage) { nextPageIndex--; + } else { + nextPageIndex++; } + HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation(); if (animation->isRunning()) { animation->stop(); diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/docml.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/docml.pri Thu Sep 02 20:17:27 2010 +0300 @@ -0,0 +1,26 @@ +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# Initial Contributors: +# Nokia Corporation - initial contribution. +# Contributors: +# Description: + +symbian { +docmlFiles+= \ + resource/hsappchecklist.docml \ + resource/hsarrangedialog.docml \ + resource/hscollectionslistdialog.docml \ + resource/hsdetailsdialog.docml \ + resource/hsinstallationlogdialog.docml \ + resource/hsuninstalldialog.docml \ + resource/hswidgetpreviewdialog.docml + + qrcFile = hsmenuworkerstateplugin.qrc + } +else { + qrcFile = hsmenuworkerstateplugin_non_symbian.qrc +} diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Thu Sep 02 20:17:27 2010 +0300 @@ -21,7 +21,7 @@ PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins include(../../common.pri) - +include(docml.pri) LIBS += -lhsdomainmodel \ -lhsmenuserviceprovider \ -lhsutils \ @@ -30,22 +30,26 @@ DEPENDPATH += ./inc \ ./src + + INCLUDEPATH += ./inc \ ../../serviceproviders/hsmenuserviceprovider/inc \ ../../hsutils/inc \ ../../hsdomainmodel/inc -symbian: { +symbian { TARGET.UID3 = 0x20022F99 -nft: { - LIBS += -lhal + nft: { + LIBS += -lhal + } + for(docmlFile, docmlFiles): DOCML+=$$docmlFile } -} + +RESOURCES += $$qrcFile include(hsmenuworkerstateplugin.pri) -RESOURCES = hsmenuworkerstateplugin.qrc diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Thu Sep 02 20:17:27 2010 +0300 @@ -1,11 +1,11 @@ - resource/hsappchecklist.docml - resource/hswidgetpreviewdialog.docml - resource/hsarrangedialog.docml - resource/hsdetailsdialog.docml - resource/hsuninstalldialog.docml - resource/hsinstallationlogdialog.docml - resource/hscollectionslistdialog.docml + resource/hsappchecklist.docml.bin + resource/hswidgetpreviewdialog.docml.bin + resource/hsarrangedialog.docml.bin + resource/hsdetailsdialog.docml.bin + resource/hsuninstalldialog.docml.bin + resource/hsinstallationlogdialog.docml.bin + resource/hscollectionslistdialog.docml.bin diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin_non_symbian.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin_non_symbian.qrc Thu Sep 02 20:17:27 2010 +0300 @@ -0,0 +1,11 @@ + + + resource/hsappchecklist.docml + resource/hswidgetpreviewdialog.docml + resource/hsarrangedialog.docml + resource/hsdetailsdialog.docml + resource/hsuninstalldialog.docml + resource/hsinstallationlogdialog.docml + resource/hscollectionslistdialog.docml + + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Thu Sep 02 20:17:27 2010 +0300 @@ -129,7 +129,7 @@ CollectionActionType mActionType; - HsSortAttribute mApplicationsSortAttribute; + Hs::HsSortAttribute mApplicationsSortAttribute; HsAppsCheckList *mAppsCheckList; diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Thu Sep 02 20:17:27 2010 +0300 @@ -83,7 +83,7 @@ QAction *mConfirmAction; - HsMenuMode mMenuMode; + Hs::HsMenuMode mMenuMode; QVariant mToken; diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h Thu Sep 02 20:17:27 2010 +0300 @@ -45,9 +45,9 @@ void cleanUp(); - void setSortOrder(HsSortAttribute sortAttribute); + void setSortOrder(Hs::HsSortAttribute sortAttribute); - void showAppsCheckboxList(HsSortAttribute sortAttribute); + void showAppsCheckboxList(Hs::HsSortAttribute sortAttribute); signals: @@ -75,7 +75,7 @@ HsMenuItemModel *mModel; // delete with dialog - HsSortAttribute mSortAttribute; + Hs::HsSortAttribute mSortAttribute; }; diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Thu Sep 02 20:17:27 2010 +0300 @@ -39,8 +39,7 @@ public: enum UninstallDialogType { - UninstallDialogDefinition01 = 1, - UninstallDialogDefinition02, + UninstallDialogDefinition02 = 1, UninstallDialogDefinition03, UninstallDialogDefinition04 }; @@ -71,9 +70,8 @@ QStringList &applicationsNames, QString &confirmationMessage); - void createUninstallMessage(); + void createSimpleUninstallMessage(bool isJava=false); void createUninstallJavaMessage(); - void createSimpleUninstallJavaMessage(); private: diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml Thu Sep 02 20:17:27 2010 +0300 @@ -25,7 +25,7 @@ - + @@ -62,58 +62,6 @@ -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

@@ -129,7 +77,7 @@ - + @@ -184,7 +132,7 @@ - + @@ -238,7 +186,7 @@ - + @@ -278,9 +226,8 @@

- - - - + + + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Thu Sep 02 20:17:27 2010 +0300 @@ -21,10 +21,10 @@ - - - - + + + + diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -174,7 +174,7 @@ QState(parent), mCollectionName(), mCollectionId(0), mAppList(), mShowConfirmation(0), mInitialState(0), mSelectCollectionState(0), mNewCollectionState(0), mAppsCheckListState(0), mActionType( - NoActionType), mApplicationsSortAttribute(NoHsSortAttribute), + NoActionType), mApplicationsSortAttribute(Hs::NoHsSortAttribute), mAppsCheckList(0), mEditorDialog(0), mListDialog(0), mModel(0) { construct(); @@ -284,6 +284,7 @@ //Adds applications to colection. if ((mCollectionId > 0) && mAppList.count()) { HsMenuService::addApplicationsToCollection(mAppList, mCollectionId); + HsMenuService::touch(mAppList); if (mShowConfirmation) { showMessageAppsAdded(mCollectionId); } @@ -319,25 +320,25 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mApplicationsSortAttribute = static_cast(data.value( - appSortOrderKey()).toInt()); + mApplicationsSortAttribute = static_cast(data.value( + Hs::appSortOrderKey).toInt()); - const int itemId = data.value(itemIdKey()).toInt(); - mCollectionId = data.value(collectionIdKey()).toInt(); + const int itemId = data.value(Hs::itemIdKey).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); if (itemId) { //add selected app item from allAppView or collectionView mAppList.append(itemId); mInitialState->addTransition(mSelectCollectionState); mShowConfirmation = true; - } else if (mApplicationsSortAttribute != NoHsSortAttribute) { + } else if (mApplicationsSortAttribute != Hs::NoHsSortAttribute) { //add apps from allAppView options menu mActionType = ViaAllViewOptionMenuType; mInitialState->addTransition(mAppsCheckListState); mShowConfirmation = true; } else if (mCollectionId) { //add apps from collectionView options menu - mApplicationsSortAttribute = AscendingNameHsSortAttribute; + mApplicationsSortAttribute = Hs::AscendingNameHsSortAttribute; mInitialState->addTransition(mAppsCheckListState); } HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::onEntry"); @@ -480,12 +481,13 @@ void HsAddAppsToCollectionState::collectionSelected( const QModelIndex &modelIndex) { - int selectedCollection = mModel->data( - modelIndex, CaItemModel::IdRole).toInt(); - mListDialog->close(); - - qDebug("emit collectionSelected(%d)", selectedCollection); - emit transitToSaveState(selectedCollection); + if (mListDialog) { + int selectedCollection = mModel->data( + modelIndex, CaItemModel::IdRole).toInt(); + mListDialog->close(); + qDebug("emit collectionSelected(%d)", selectedCollection); + emit transitToSaveState(selectedCollection); + } } /*! diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -57,7 +57,7 @@ HsAddToHomeScreenState::HsAddToHomeScreenState(QState *parent) : QState(parent), mCorruptedMessage(NULL), mConfirmAction(NULL), - mMenuMode(NormalHsMenuMode) + mMenuMode(Hs::NormalHsMenuMode) { setObjectName("/AddToHomeScreenState"); @@ -94,23 +94,22 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mEntryId = data.value(itemIdKey()).toInt(); + mEntryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer entry = CaService::instance()->getEntry(mEntryId); const QString entryTypeName = entry->entryTypeName(); - mMenuMode = static_cast(data.value(menuModeType()).toInt()); - mToken = data.value(HOMESCREENDATA); + mMenuMode = static_cast(data.value(Hs::menuModeType).toInt()); + mToken = data.value(Hs::homescreenData); bool success = false; - if (entryTypeName == widgetTypeName()) { - const QString uri = entry->attribute(widgetUriAttributeName()); - success = addWidget(*HsContentService::instance(), uri); - HsMenuService::touch(mEntryId); + if (entryTypeName == Hs::widgetTypeName) { + const QString uri = entry->attribute(Hs::widgetUriAttributeName); + success = addWidget(*HsContentService::instance(), uri); } else { success = addApplication(*HsContentService::instance(), *entry); } - if (success && (mMenuMode == NormalHsMenuMode)) { + if (success && (mMenuMode == Hs::NormalHsMenuMode)) { HbNotificationDialog *notificationDialog = new HbNotificationDialog(); notificationDialog->setAttribute(Qt::WA_DeleteOnClose); notificationDialog->setSequentialShow(false); @@ -136,14 +135,14 @@ { HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::addWidget"); QVariantHash params; - params[URI] = uri; - params[HOMESCREENDATA] = mToken; + params[Hs::uri] = uri; + params[Hs::homescreenData] = mToken; bool success = contentService.createWidget(params); if (!success) { showMessageWidgetCorrupted(); } else { emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } @@ -185,10 +184,10 @@ (HbAction* finishedAction) { if (static_cast(finishedAction) == mConfirmAction) { - HsMenuService::executeAction(mEntryId, removeActionIdentifier()); + HsMenuService::executeAction(mEntryId, Hs::removeActionIdentifier); } emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } @@ -223,11 +222,11 @@ { HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::addShortcut"); QVariantHash params; - params[URI] = SHORTCUT_WIDGET_URI; + params[Hs::uri] = SHORTCUT_WIDGET_URI; QVariantHash preferences; preferences[SHORTCUT_ID] = QString::number(mEntryId); - params[PREFERENCES] = preferences; - params[HOMESCREENDATA] = mToken; + params[Hs::preferences] = preferences; + params[Hs::homescreenData] = mToken; const bool result = contentService.createWidget(params); logActionResult("Adding shortcut", mEntryId, result); HSMENUTEST_FUNC_EXIT("HsAddToHomeScreenState::addShortcut"); @@ -245,10 +244,10 @@ CaEntry& entry) { bool success = false; - if (entry.attributes().contains(widgetUriAttributeName())) { + if (entry.attributes().contains(Hs::widgetUriAttributeName)) { QVariantHash params; - const QString uri = entry.attribute(widgetUriAttributeName()); - params[URI] = uri; + const QString uri = entry.attribute(Hs::widgetUriAttributeName); + params[Hs::uri] = uri; QVariantHash preferences; QMap attributes = entry.attributes(); @@ -257,12 +256,12 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } - params[PREFERENCES] = preferences; - params[HOMESCREENDATA] = mToken; + params[Hs::preferences] = preferences; + params[Hs::homescreenData] = mToken; success = contentService.createWidget(params); if (!success) { @@ -272,7 +271,7 @@ success = addShortcut(contentService); } emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -82,7 +82,7 @@ */ HsAppsCheckList::HsAppsCheckList() : mAppsSelectDialog(0), mActionConfirm(0), mListView(0), mModel(0), - mSortAttribute(AscendingNameHsSortAttribute) + mSortAttribute(Hs::AscendingNameHsSortAttribute) { } @@ -105,14 +105,14 @@ mAppsSelectDialog->close(); } - mSortAttribute = AscendingNameHsSortAttribute; + mSortAttribute = Hs::AscendingNameHsSortAttribute; } /*! Sets sort order for applications. \param sortAttribute sort order. */ -void HsAppsCheckList::setSortOrder(HsSortAttribute sortOrder) +void HsAppsCheckList::setSortOrder(Hs::HsSortAttribute sortOrder) { mSortAttribute = sortOrder; } @@ -121,7 +121,7 @@ Shows check box list with all application. \param sortAttribute order to sort applications. */ -void HsAppsCheckList::showAppsCheckboxList(HsSortAttribute sortOrder) +void HsAppsCheckList::showAppsCheckboxList(Hs::HsSortAttribute sortOrder) { HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::showAppsCheckboxList"); if (!mModel) { @@ -227,7 +227,7 @@ } QList list = itemsMap.values(); - if (mSortAttribute == DescendingNameHsSortAttribute) { + if (mSortAttribute == Hs::DescendingNameHsSortAttribute) { QList reversedList; int count = list.count(); for (int i = 0; i < count; i++) { diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -141,7 +141,7 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mTopItemId = data.value(itemIdKey()).toInt(); + mTopItemId = data.value(Hs::itemIdKey).toInt(); HbDocumentLoader loader; bool loadStatusOk = false; @@ -160,10 +160,10 @@ if (mEntriesList && mDialog) { switch (menuEvent->operation()) { case HsMenuEvent::ArrangeCollection: - mCollectionId = data.value(collectionIdKey()).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); mItemModel = HsMenuService::getCollectionModel( mCollectionId, - NoHsSortAttribute); + Hs::NoHsSortAttribute); break; case HsMenuEvent::ArrangeAllCollections: mCollectionId = HsMenuService::allCollectionsId(); diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -136,9 +136,8 @@ unsigned int numToAppend(1); while (mOtherCollectionsNames.contains(newName)) { - newName = - name - + QString("(%1)").arg(numToAppend, 2, 10, QLatin1Char('0')); + newName = hbTrId("txt_applib_dialog_entry_collectionl1").arg( + numToAppend); numToAppend++; } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -97,7 +97,7 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); } mCollectionNameDialog = new HsCollectionNameDialog(mItemId); mCollectionNameDialog->open(this, SLOT(dialogFinished(HbAction*))); @@ -120,7 +120,8 @@ HsMenuService::createCollection(newName); } } - mCollectionNameDialog = NULL; //set to NULL since this will be deleted atfer close + //set to NULL since this will be deleted atfer close + mCollectionNameDialog = NULL; emit exit(); } @@ -130,7 +131,8 @@ void HsCollectionNameState::cleanUp() { if (mCollectionNameDialog) { - disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), this, SLOT(dialogFinished(HbAction*))); + disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), + this, SLOT(dialogFinished(HbAction*))); mCollectionNameDialog->close(); mCollectionNameDialog = NULL; } diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -78,8 +78,8 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); - mCollectionId = data.value(collectionIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); QString message; message.append( diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -79,7 +79,7 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); QString message; if (HsShortcutService::instance()->isItemShortcutWidget(mItemId)) { diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -105,13 +105,13 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mEntryId = data.value(itemIdKey()).toInt(); - mToken = data.value(HOMESCREENDATA); + mEntryId = data.value(Hs::itemIdKey).toInt(); + mToken = data.value(Hs::homescreenData); QSharedPointer entry = CaService::instance()->getEntry(mEntryId); - mUri = entry->attribute(widgetUriAttributeName()); + mUri = entry->attribute(Hs::widgetUriAttributeName); mPreviewDialog = buildPreviewDialog(*entry); mAddToHomescreenAction = mPreviewDialog->actions().value(0); @@ -159,8 +159,8 @@ if (finishedAction == mAddToHomescreenAction) { QVariantHash widgetData; - widgetData[URI] = mUri; - widgetData[HOMESCREENDATA] = mToken; + widgetData[Hs::uri] = mUri; + widgetData[Hs::homescreenData] = mToken; bool success = HsContentService::instance()->createWidget(widgetData); @@ -207,7 +207,7 @@ mCorruptedMessage = NULL; if (static_cast(finishedAction) == mConfirmRemovalAction) { - HsMenuService::executeAction(mEntryId, removeActionIdentifier()); + HsMenuService::executeAction(mEntryId, Hs::removeActionIdentifier); } emit exit(); diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -89,15 +89,15 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); QSharedPointer entry = CaService::instance()->getEntry(mItemId); - QString appType = entry->attribute(swTypeKey()); - if (!appType.compare(javaSwType())) { + QString appType = entry->attribute(Hs::swTypeKey); + if (!appType.compare(Hs::javaSwType)) { // java createUninstallJavaMessage(); } else { // other - createUninstallMessage(); + createSimpleUninstallMessage(); } HSMENUTEST_FUNC_EXIT("HsUninstallItemState::onEntry"); @@ -111,7 +111,7 @@ void HsUninstallItemState::uninstallMessageFinished(HbAction* finishedAction) { if (static_cast(finishedAction) == mConfirmAction) { - HsMenuService::executeAction(mItemId, removeActionIdentifier()); + HsMenuService::executeAction(mItemId, Hs::removeActionIdentifier); } mConfirmAction = NULL; mUninstallMessage = NULL; @@ -138,7 +138,7 @@ QSharedPointer service = CaService::instance(); QSharedPointer entry = service->getEntry(mItemId); const int componentId = - entry->attribute(componentIdAttributeName()).toInt(); + entry->attribute(Hs::componentIdAttributeName).toInt(); QSharedPointer softwareRegistry = CaSoftwareRegistry::create(); @@ -150,7 +150,7 @@ if (retval) { CaQuery query; foreach (QString uid, appUids) { - query.setAttribute(applicationUidEntryKey(), uid); + query.setAttribute(Hs::applicationUidEntryKey, uid); QList< QSharedPointer > entries = service->getEntries(query); if (entries.length() > 0) { @@ -191,11 +191,11 @@ Method create uninstall confirmation message. \retval void */ -void HsUninstallItemState::createUninstallMessage() +void HsUninstallItemState::createSimpleUninstallMessage(bool isJava) { CaQuery parentsQuery; parentsQuery.setChildId(mItemId); - parentsQuery.setEntryTypeNames(QStringList(collectionTypeName())); + parentsQuery.setEntryTypeNames(QStringList(Hs::collectionTypeName)); QList parentsIds = CaService::instance()->getEntryIds( parentsQuery); QString message; @@ -211,6 +211,11 @@ // create and show message box mUninstallMessage = HsMenuDialogFactory().create(message); + if( isJava ){ + QSharedPointer entry = CaService::instance()->getEntry(mItemId); + HbIcon icon = entry->makeIcon(); + mUninstallMessage->setIcon(icon); + } mConfirmAction = mUninstallMessage->actions().value(0); QScopedPointer entryObserver( @@ -221,34 +226,6 @@ } /*! - Method create uninstall confirmation message. - Used for java applications without deletion confirmation - and with midlet name equal to app name - \retval void - */ -void HsUninstallItemState::createSimpleUninstallJavaMessage() -{ - QString message; - message.append( - HbParameterLengthLimiter("txt_applib_dialog_1_will_be_removed_from_phone_c").arg( - HsMenuService::getName(mItemId))); - - // create and show message box - mUninstallMessage = HsMenuDialogFactory().create(message); - - QSharedPointer entry = CaService::instance()->getEntry(mItemId); - HbIcon icon = entry->makeIcon(); - mUninstallMessage->setIcon(icon); - mConfirmAction = mUninstallMessage->actions().value(0); - - QScopedPointer entryObserver( - new HsMenuEntryRemovedHandler(mItemId, this, SIGNAL(exit()))); - entryObserver.take()->setParent(mUninstallMessage); - - mUninstallMessage->open(this, SLOT(uninstallMessageFinished(HbAction*))); -} - -/*! Method create uninstall confirmation dialog for java. \retval void */ @@ -269,7 +246,7 @@ QString section; if (applicationsNames.isEmpty() && detailsMessage.isEmpty()) { - createSimpleUninstallJavaMessage(); + createSimpleUninstallMessage(true); } else { if ( (!applicationsNames.isEmpty()) && (!detailsMessage.isEmpty())) { @@ -307,10 +284,25 @@ HbIcon icon = entry2->makeIcon(); iconLabel->setIcon(icon); + CaQuery parentsQuery; + parentsQuery.setChildId(mItemId); + parentsQuery.setEntryTypeNames(QStringList(Hs::collectionTypeName)); + QList parentsIds = CaService::instance()->getEntryIds( + parentsQuery); + HbLabel* textLabel = qobject_cast( loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_LABEL)); - textLabel->setPlainText(textLabel->plainText().arg(componentName)); + if (HsShortcutService::instance()->isItemShortcutWidget(mItemId) || + (parentsIds.count() > 0)) { + textLabel->setPlainText(HbParameterLengthLimiter( + "txt_applib_info_delete_1_all_its_shortcuts_and").arg( + componentName)); + } else { + textLabel->setPlainText(HbParameterLengthLimiter( + "txt_applib_info_delete_1_and_associated_data").arg( + componentName)); + } HbLabel* detailsUninstalLabel; if ((mDialogType == UninstallDialogDefinition02) || diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -78,16 +78,16 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - const int entryId = data.value(itemIdKey()).toInt(); + const int entryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer entry = CaService::instance()->getEntry(entryId); const int componentId = entry->attribute( - componentIdAttributeName()).toInt(); + Hs::componentIdAttributeName).toInt(); QSharedPointer scr = CaSoftwareRegistry::create(); CaSoftwareRegistry::DetailMap detailMap = scr->entryDetails(componentId); - QString appType = entry->attribute(swTypeKey()); + QString appType = entry->attribute(Hs::swTypeKey); //TODO: Should we display something In that case? @@ -102,7 +102,7 @@ Q_ASSERT_X(loadStatusOk, HS_DETAILS_DIALOG_LAYOUT, "Error while loading docml file."); - if (!appType.compare(javaSwType())) { + if (!appType.compare(Hs::javaSwType)) { QString section = QString(HS_VIEWAPPDETAILS_JAVA_DIALOG_SECTION_NAME); loader.load(HS_DETAILS_DIALOG_LAYOUT, section, &loadStatusOk); @@ -129,7 +129,7 @@ setFieldPresentation(CaSoftwareRegistry::componentTypeKey(), detailMap, loader); - if (!appType.compare(javaSwType())) { + if (!appType.compare(Hs::javaSwType)) { setFieldPresentation(CaSoftwareRegistry::componentDescriptionKey(), detailMap, loader); setFieldPresentation(CaSoftwareRegistry::componentProtectionDomainKey(), diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -101,12 +101,12 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - const int entryId = data.value(itemIdKey()).toInt(); + const int entryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer entry = CaService::instance()->getEntry(entryId); QString pluginPath; pluginPath = pluginPath.append("/resource/qt/plugins/appsettings/") - .append(entry->attribute(appSettingsPlugin())).append(".qtplugin"); + .append(entry->attribute(Hs::appSettingsPlugin)).append(".qtplugin"); QPluginLoader loader(pluginPath); mView = qobject_cast(loader.instance()); @@ -121,7 +121,7 @@ QObject::connect(this, SIGNAL(initialize(QString)), mView, SLOT(initialize(QString))); mView->setParent(this); - emit initialize(entry->attribute(applicationUidEntryKey())); + emit initialize(entry->attribute(Hs::applicationUidEntryKey)); // Add View to main window HbMainWindow *hbMainWindow = mainWindow(); // add confirm action diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin_win.pri --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin_win.pri Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin_win.pri Thu Sep 02 20:17:27 2010 +0300 @@ -17,11 +17,11 @@ HEADERS += ./inc/hsanalogclockwidget.h \ ./inc/hsclockwidget.h \ ./inc/hsclockwidgetplugin.h \ - ./inc/hsdigitalclockwidget.h + ./inc/hsdigitalclockwidget.h \ + ./inc/hsclockwidgettimer.h SOURCES += ./src/hsanalogclockwidget.cpp \ ./src/hsclockwidget.cpp \ ./src/hsclockwidgetplugin.cpp \ - ./src/hsdigitalclockwidget.cpp - - + ./src/hsdigitalclockwidget.cpp \ + ./src/hsclockwidgettimer.cpp diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Thu Sep 02 20:17:27 2010 +0300 @@ -55,8 +55,7 @@ private: HbWidget *mWidget; - QGraphicsLinearLayout *mLayout; - QTimer *mTimer; + QGraphicsLinearLayout *mLayout; QString mClockType; QString mTimeType; #ifdef Q_OS_SYMBIAN diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidgettimer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidgettimer.h Thu Sep 02 20:17:27 2010 +0300 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSCLOCKWIDGETTIMER_H +#define HSCLOCKWIDGETTIMER_H + +#include + +#include + +HOMESCREEN_TEST_CLASS(TestClockWidget) + +class QTimer; + +class HsClockWidgetTimer : public QObject +{ + Q_OBJECT + +public: + ~HsClockWidgetTimer(); + + static HsClockWidgetTimer *instance(); + +signals: + void tick(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + +private: + HsClockWidgetTimer(QObject *parent = 0); + Q_DISABLE_COPY(HsClockWidgetTimer) + +private slots: + void onTick(); + +private: + QTimer *mTimer; + static HsClockWidgetTimer *mInstance; + + HOMESCREEN_TEST_FRIEND_CLASS(TestClockWidget) +}; + +#endif // HSCLOCKWIDGETTIMER_H diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg Thu Sep 02 20:17:27 2010 +0300 @@ -1,161 +1,160 @@ -