FCL/sf/app/phone: comparison phoneplugins/infowidgetplugin/infowidget/src/infowidgetlayoutmanager.cpp

equal deleted inserted replaced

-:bc5a64e5bc3c
+:377c906a8701
 */
 InfoWidgetLayoutManager::InfoWidgetLayoutManager(QObject *parent)
 : QObject(parent),
 m_documentLoader(NULL),
 m_displayRole(InfoDisplay),
-m_layoutRows(0),
 m_cachedLayoutRowHeight(0.0)
 {
 DPRINT;
-// Fill supported layout item roles for info display
+m_documentLoader.reset(new InfoWidgetDocumentLoader);
-QList<LayoutItemRole> displayWidgetRoles = widgetRoles(InfoDisplay);
-// Try to load all widgets in list by widget role
-bool loadResult = loadWidgets(InfoDisplay,
-displayWidgetRoles,
-m_infoDisplayWidgets);
-// Fill supported layout item roles for settings display
-displayWidgetRoles = widgetRoles(SettingsDialog);
-// Try to load all widgets in list by widget role
-loadResult = loadWidgets(SettingsDialog,
-displayWidgetRoles,
-m_settingsDialogWidgets);
 }
 /*!
 Destructor.
 */
 InfoWidgetLayoutManager::~InfoWidgetLayoutManager()
 {
 DPRINT;
-if (m_documentLoader) {
-delete m_documentLoader;
-}
 }
 /*!
 Destroy all widgets.
 Deletes parent widgets of each display
 */
 QList<InfoWidgetLayoutManager::LayoutItemRole> InfoWidgetLayoutManager::currentWidgetRoles()
 {
 DPRINT;
 return m_widgets.keys();
-}
-/*!
-Returns count of layout rows.
-*/
-int InfoWidgetLayoutManager::layoutRows() const
-{
-DPRINT;
-return m_layoutRows;
-}
-/*!
-Set count of layout rows.
-*/
-void InfoWidgetLayoutManager::setLayoutRows(int rows)
-{
-DPRINT;
-m_layoutRows = rows;
 }
 /*!
 Read row height from style.
 */
 if (m_cachedLayoutRowHeight == 0.0) {
 bool ok = hbInstance->style()->parameter("hb-param-graphic-size-primary-small",
 m_cachedLayoutRowHeight);
 DPRINT << ": row height from style: " << m_cachedLayoutRowHeight;
 if (!ok) {
-DWARNING << ": Error, paremeters reading failed!!";
+DWARNING << ": Error, paremeters reading failed!";
 }
 }
 return m_cachedLayoutRowHeight;
 }
 Check if text fits to given rect width.
 */
 bool InfoWidgetLayoutManager::textFitsToRect(QString text,
 QFont font, QRectF rect) const
 {
+DPRINT;
 bool fits(true);
 if (!rect.isEmpty()) {
 QFontMetricsF metrics(font);
 qreal width = metrics.boundingRect(text).width();
 if (width > rect.width() ) {
 {
 DPRINT;
 QList<HbMarqueeItem *> items;
 QList<LayoutItemRole> marqueeItemRoles;
 marqueeItemRoles.append(RoleSpnMarqueeItem);
 marqueeItemRoles.append(RoleMcnMarqueeItem);
 marqueeItemRoles.append(RoleSatMarqueeItem);
 foreach (LayoutItemRole role, marqueeItemRoles) {
 QGraphicsWidget *widget = getWidget(role);
 if (widget) {
 HbMarqueeItem *item =
 qobject_cast<HbMarqueeItem*>(widget);
 /*!
 Get widget with given item role.
 */
 QGraphicsWidget* InfoWidgetLayoutManager::getWidget(LayoutItemRole itemRole)
 {
-QGraphicsWidget *widget = m_widgets.value(itemRole);
+return m_widgets.value(itemRole);
-return widget;
 }
 /*!
 Get object with given item role.
 */
 QObject* InfoWidgetLayoutManager::getObject(LayoutItemRole itemRole)
 {
-QObject *object = m_objects.value(itemRole);
+return m_objects.value(itemRole);
-return object;
 }
 /*!
 Remove widget with given item role.
 */
 delete widget;
 } else {
 widget->deleteLater();
 }
 }
 m_widgets.remove(itemRole);
 m_infoDisplayWidgets.remove(itemRole);
 m_settingsDialogWidgets.remove(itemRole);
 }
 /*!
 Returns info display layout.
 */
-QGraphicsLayout* InfoWidgetLayoutManager::layoutInfoDisplay()
+QGraphicsWidget* InfoWidgetLayoutManager::layoutInfoDisplay()
 {
 DPRINT;
 m_displayRole = InfoDisplay;
+loadWidgets(InfoWidgetLayoutManager::InfoDisplay);
 m_widgets = m_infoDisplayWidgets;
-QGraphicsLayout *activeLayout(NULL);
+QGraphicsWidget *infoDisplay = getWidget(RoleContent);
-QGraphicsWidget *content = getWidget(RoleContent);
+Q_ASSERT(infoDisplay);
-if (content) {
+return infoDisplay;
-DPRINT << ": content found, getting layout";
-activeLayout = content->layout();
-}
-return activeLayout;
 }
 /*!
 Returns settings dialog layout.
 */
-QGraphicsLayout* InfoWidgetLayoutManager::layoutSettingsDialog()
+QGraphicsWidget* InfoWidgetLayoutManager::layoutSettingsDialog()
 {
 DPRINT;
 m_displayRole = SettingsDialog;
+loadWidgets(InfoWidgetLayoutManager::SettingsDialog);
 m_widgets = m_settingsDialogWidgets;
-QGraphicsLayout *activeLayout(NULL);
+QGraphicsWidget *dialog = getWidget(RoleSettingsDialog);
-QGraphicsWidget *dialog = getWidget(RoleSettingsDialog);
+Q_ASSERT(dialog);
-if (dialog) {
-activeLayout = dialog->layout();
+HbAction *okAction = qobject_cast<HbAction *>(
+getObject(RoleOkAction));
-HbAction *okAction = qobject_cast<HbAction *>(
+HbAction *cancelAction = qobject_cast<HbAction *>(
-getObject(RoleOkAction));
+getObject(RoleCancelAction));
-if (okAction) {
+if (okAction && cancelAction) {
 dialog->addAction(okAction);
-}
+dialog->addAction(cancelAction);
+}
-HbAction *cancelAction = qobject_cast<HbAction *>(
+return dialog;
-getObject(RoleCancelAction));
-if (cancelAction) {
-dialog->addAction(cancelAction);
-}
-}
-return activeLayout;
 }
 /*!
 Load widgets from document for given display role.
 */
 DPRINT;
 bool loadResult(true);
 // Cleanup previously loaded content in case of any data
 widgetMap.clear();
-if (!m_documentLoader) {
-m_documentLoader = new InfoWidgetDocumentLoader;
-}
-Q_ASSERT(m_documentLoader);
 bool loaded = true;
 if (displayRole != SettingsDialog) {
 m_documentLoader->load(INFOWIDGET_DOCML_FILE, &loaded);
 } else {
 }
 Q_ASSERT_X(loaded,
 "InfoWidgetLayoutManager",
 "Invalid docml file");
 foreach (LayoutItemRole role, displayWidgets) {
 QGraphicsWidget *widget =
 loadWidget(*m_documentLoader, displayRole, role);
 if (widget) {
 return loadResult;
 }
 /*!
-Restores widgets from layout document.
+Loads or restores widgets from layout document.
-Called when layout items have been deleted
+Called when layout items haven't been loaded yet, or
-and items should be shown again.
+have been deleted and items should be shown again.
 */
-bool InfoWidgetLayoutManager::reloadWidgets(const DisplayRole displayRole)
+bool InfoWidgetLayoutManager::loadWidgets(const DisplayRole displayRole)
 {
 QList<LayoutItemRole> displayWidgetRoles = widgetRoles(displayRole);
 bool loadResult(false);
 switch (displayRole) {
 case InfoDisplay:
 loadResult = loadWidgets(displayRole,
 displayWidgetRoles,
 m_infoDisplayWidgets);
 case RoleUndefined: // Fall through
 default:
 break;
 }
-QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(
+QGraphicsWidget *widget = loader.findWidget(widgetName);
-loader.findWidget(widgetName));
 return widget;
 }
 /*!
 Loads object by given object role id.
 case RoleUndefined: // Fall through
 default:
 break;
 }
-QObject *object = qobject_cast<QObject *>(loader.findObject(objectName));
+QObject *object = loader.findObject(objectName);
 if (!object) {
 DWARNING << ": ERROR, object not found!";
 }
 return object;
 DisplayRole displayRole) const
 {
 QList<LayoutItemRole> widgetRoles;
 switch (displayRole) {
 case InfoDisplay:
-// Fill supported layout item roles for info display
 widgetRoles.append(RoleContent);
 widgetRoles.append(RoleSpnIcon);
 widgetRoles.append(RoleSpnMarqueeItem);
 widgetRoles.append(RoleMcnIcon);
 widgetRoles.append(RoleMcnMarqueeItem);
 widgetRoles.append(RoleSatTextIcon);
 widgetRoles.append(RoleSatMarqueeItem);
 break;
 case SettingsDialog:
-// Fill supported layout item roles for settings display
 widgetRoles.append(RoleSettingsDialog);
 widgetRoles.append(RoleSettingsContainer);
 widgetRoles.append(RoleSpnCheckBox);
 widgetRoles.append(RoleMcnCheckBox);
 widgetRoles.append(RoleSatTextCheckBox);

changeset 50	377c906a8701
parent 46	bc5a64e5bc3c