diff -r 5ebec3429918 -r 42505cd701c6 ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp --- a/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp Thu Jul 08 15:37:35 2010 +0300 +++ b/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp Fri Jul 23 10:05:37 2010 +0300 @@ -321,6 +321,15 @@ } } +void HgWidgetTestView::changeTitleAndDescrVisibility(HgMediawall::TitleAndDescrVisibility visibility) +{ + HgMediawall* mediawall = qobject_cast(mWidget); + if (mediawall && mediawall->titleAndDescriptionVisibility() != visibility) + { + mediawall->setTitleAndDescriptionVisibility(visibility); + } +} + void HgWidgetTestView::activated() { mAnimationGroup->setDirection(QAbstractAnimation::Backward); @@ -668,12 +677,8 @@ connect(view, SIGNAL(lowResImageUseChanged(bool)), SLOT(changeLowResImageUse(bool))); connect(view, SIGNAL(widgetHeightChanged(int)), SLOT(changeWidgetHeight(int))); connect(view, SIGNAL(widgetWidthChanged(int)), SLOT(changeWidgetWidth(int))); - connect(view, SIGNAL(titlePositionChanged(HgMediawall::LabelPosition)), - SLOT(changeTitlePosition(HgMediawall::LabelPosition))); connect(view, SIGNAL(titleFontChanged(HbFontSpec)), SLOT(changeTitleFont(HbFontSpec))); - connect(view, SIGNAL(descriptionPositionChanged(HgMediawall::LabelPosition)), - SLOT(changeDescriptionPosition(HgMediawall::LabelPosition))); connect(view, SIGNAL(descriptionFontChanged(HbFontSpec)), SLOT(changeDescriptionFont(HbFontSpec))); connect(view, SIGNAL(reflectionsEnabledChanged(bool)), @@ -682,6 +687,8 @@ SLOT(changeEffect3dEnabled(bool))); connect(view, SIGNAL(itemSizePolicyChanged(HgWidget::ItemSizePolicy)), SLOT(changeItemSizePolicy(HgWidget::ItemSizePolicy))); + connect(view, SIGNAL(titleAndDescrVisibilityChanged(HgMediawall::TitleAndDescrVisibility)), + SLOT(changeTitleAndDescrVisibility(HgMediawall::TitleAndDescrVisibility))); mOptionsView = view; primaryWindow->addView(mOptionsView); @@ -764,6 +771,11 @@ if (value.isValid()) { changeItemSizePolicy(static_cast(value.toInt())); } + + value = settings.value(SETT_TITLE_DESCR_VISIBILITY); + if (value.isValid()) { + changeTitleAndDescrVisibility(static_cast(value.toInt())); + } } void HgWidgetTestView::setupWidgetSize() @@ -948,20 +960,22 @@ if (orientation == Qt::Horizontal && mWidgetType == HgWidgetCoverflow) { setItemVisible(Hb::AllItems, false); } - else if (orientation == Qt::Horizontal && mWidgetType == HgWidgetGrid && mainWindow()->currentView() == this ) { + else if (orientation == Qt::Horizontal + && mWidgetType == HgWidgetGrid + && mainWindow()->currentView() == this ) { setItemVisible(Hb::AllItems, false); - } + } else if (orientation == Qt::Horizontal && mWidgetType == HgWidgetTBone) { initWidget(HgWidgetCoverflow); setItemVisible(Hb::AllItems, false); - } + } else if (orientation == Qt::Vertical && mWidgetType == HgWidgetCoverflow) { initWidget(HgWidgetTBone); setItemVisible(Hb::AllItems, true); } else if (orientation == Qt::Vertical && mWidgetType == HgWidgetGrid) { setItemVisible(Hb::AllItems, true); - } + } } void HgWidgetTestView::resizeEvent(QGraphicsSceneResizeEvent *event) {