FCL/sf/app/recents: comparison logsui/logsapp/src/logsbaseview.cpp

equal deleted inserted replaced

-:41c0a814d878
+:6c9acdc6adc0
 #include <hblabel.h>
 #include <hblistview.h>
 #include <QGraphicsLinearLayout>
 #include <hbpushbutton.h>
 #include <hbactivitymanager.h>
+#include <hbmodeliterator.h>
+#include <hbscrollbar.h>
 Q_DECLARE_METATYPE(LogsCall*)
 Q_DECLARE_METATYPE(LogsMessage*)
 Q_DECLARE_METATYPE(LogsContact*)
 Q_DECLARE_METATYPE(LogsDetailsModel*)
 mInitialized(false),
 mCall(0),
 mMessage(0),
 mContact(0),
 mDetailsModel(0),
-mCallTypeMapper(0)
+mCallTypeMapper(0),
+mOptionsMenu(0)
 {
 LOGS_QDEBUG( "logs [UI] -> LogsBaseView::LogsBaseView()" );
 setNavigationAction(new HbAction(Hb::BackNaviAction, this));
 connect(navigationAction(), SIGNAL(triggered()), this,
 delete mCall;
 delete mMessage;
 delete mContact;
 delete mDetailsModel;
 delete mCallTypeMapper;
+delete mOptionsMenu;
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::~LogsBaseView()" );
 }
 // -----------------------------------------------------------------------------
 {
 Q_ASSERT_X( !mInitialized, "logs [UI] ", "view is already initialized!!" );
 mInitialized = true;
 initFilterMenu();
 addActionNamesToMap();
-connect(menu(), SIGNAL(aboutToShow()), this,
-SLOT(closeEmptyMenu()), Qt::QueuedConnection);
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 LOGS_QDEBUG( "logs [UI]     Call to topmost item in list" );
 QModelIndex topIndex = model()->index(0,0);
 listView()->scrollTo( topIndex );
 listView()->setCurrentIndex( topIndex, QItemSelectionModel::Select );
 initiateCallback(topIndex);
 }
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::callKeyPressed()" );
 }
 // -----------------------------------------------------------------------------
 //
 }
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::showFilterMenu()" );
 }
 // -----------------------------------------------------------------------------
-// LogsBaseView::closeEmptyMenu()
-// -----------------------------------------------------------------------------
-//
-void LogsBaseView::closeEmptyMenu()
-{
-bool visibleActionsExist = false;
-foreach (QAction* action, menu()->actions()) {
-if  (action->isVisible()) {
-visibleActionsExist = true ;
-}
-}
-if (!visibleActionsExist) {
-menu()->close();
-}
-}
-// -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
 void LogsBaseView::openDialpad()
 {
 LOGS_QDEBUG( "logs [UI] -> LogsBaseView::openDialpad()" );
 updateCallButton();
 setDialpadPosition();
 mDialpad->openDialpad();
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::openDialpad()" );
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
 void LogsBaseView::openContactsApp()
 {
 LOGS_QDEBUG( "logs [UI] -> LogsBaseView::openContactsApp()" );
+XQServiceRequest snd("com.nokia.services.phonebookappservices.Launch","launch()");
-// Need to do request in async manner, otherwise new phonebook ui process
-// will be started due bug(?) in highway.
-XQServiceRequest snd("com.nokia.services.phonebookappservices.Launch","launch()", false);
 XQRequestInfo info;
 info.setForeground(true);
 snd.setInfo(info);
 int retValue;
 snd.send(retValue);
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::openContactsApp()" );
 }
 // -----------------------------------------------------------------------------
 //
 popup->setHeadingWidget(
 new HbLabel(hbTrId("txt_dial_title_add_to_contacts"), popup));
 popup->setAttribute(Qt::WA_DeleteOnClose);
 popup->setTimeout( HbPopup::NoTimeout );
 popup->addAction(
-new HbAction(hbTrId("txt_dial_button_cancel"), popup));
+new HbAction(hbTrId("txt_common_button_cancel"), popup));
 HbWidget* buttonWidget = new HbWidget(popup);
 QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Vertical);
 HbPushButton* addButton = new HbPushButton(buttonWidget);
 addButton->setStretched(true);
-addButton->setText(hbTrId("txt_dial_list_save_as_a_new_contact"));
+addButton->setText(hbTrId("txt_dial_button_save_as_a_new_contact"));
 HbIcon plusIcon("qtg_mono_plus");
 addButton->setIcon(plusIcon);
 connect(addButton, SIGNAL(clicked()), popup, SLOT(close()));
 connect(addButton, SIGNAL(clicked()), mContact, SLOT(addNew()));
 HbPushButton* updateButton = new HbPushButton(buttonWidget);
 updateButton->setStretched(true);
-updateButton->setText(hbTrId("txt_dial_list_update_existing_contact"));
+updateButton->setText(hbTrId("txt_dial_button_update_existing_contact"));
 updateButton->setIcon(plusIcon);
 connect(updateButton, SIGNAL(clicked()), popup, SLOT(close()));
 connect(updateButton, SIGNAL(clicked()),
 mContact, SLOT(updateExisting()));
 // -----------------------------------------------------------------------------
 // Loads appropriate section from *.docml to resize list widget
 // -----------------------------------------------------------------------------
 //
-void LogsBaseView::updateListSize()
+void LogsBaseView::updateListSize( HbListView& list )
 {
 LOGS_QDEBUG( "logs [UI] -> LogsBaseView::updateListSize()" );
 QString newSection( logsViewDefaultSection );
 Qt::Orientation orientation = mViewManager.mainWindow().orientation();
 }
 } else {
 newSection = QString( logsViewDefaultSection );
 }
-if (newSection != mLayoutSectionName) {
+bool sectionChanged( mLayoutSectionName != newSection );
 mLayoutSectionName = newSection;
 LOGS_QDEBUG_2( "logs [UI]  loading new section: ", newSection );
 mRepository.loadSection( viewId(), newSection );
+if ( sectionChanged ){
+ensureListPositioning( list );
 }
 LOGS_QDEBUG( "logs [UI] <- LogsBaseView::updateListSize()" );
 }
 bool LogsBaseView::isDialpadInput() const
 {
 return ( mDialpad->isOpen() && !mDialpad->editor().text().isEmpty() );
 }
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void LogsBaseView::ensureListPositioning( HbListView& list )
+{
+LOGS_QDEBUG( "logs [UI] -> LogsBaseView::ensureListPositioning()" );
+HbWidget* content =
+qobject_cast<HbWidget*>( mRepository.findWidget( logsContentId ) );
+QList<HbAbstractViewItem *> visibleItems = list.visibleItems();
+if ( content && visibleItems.count() > 0 ){
+LOGS_QDEBUG_2( "logs [UI]   contentsRect:", content->contentsRect() );
+QRectF rect = content->contentsRect();
+rect.adjust( 0, list.pos().y(), 0, -list.pos().y() );
+LOGS_QDEBUG_2( "logs [UI]   listRect:", rect );
+list.setGeometry(rect);
+HbScrollArea::ScrollBarPolicy prevPolicy = list.verticalScrollBarPolicy();
+list.setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
+list.setVerticalScrollBarPolicy(prevPolicy);
+qreal itemHeight = visibleItems.at(0)->size().height();
+HbModelIterator* modelIt = list.modelIterator();
+if ( modelIt && itemHeight > 0 ) {
+int maxVisibleItems = rect.height() / itemHeight;
+LOGS_QDEBUG_2( "logs [UI]   max visible items:", maxVisibleItems );
+if ( modelIt->indexCount() <= maxVisibleItems ){
+// All items can fit the rect reserved for the list, force them to fit
+list.ensureVisible(QPointF(0,0));
+} else if ( visibleItems.count() < maxVisibleItems ) {
+// All items cannot fit the rect reserved, force to reserve whole
+// area so that current index is tried to be centered
+list.scrollTo(list.currentIndex(), HbAbstractItemView::PositionAtCenter);
+}
+}
+}
+LOGS_QDEBUG( "logs [UI] <- LogsBaseView::ensureListPositioning()" );
+}
+// -----------------------------------------------------------------------------
+// LogsBaseView::scrollToTopItem
+// -----------------------------------------------------------------------------
+//
+void LogsBaseView::scrollToTopItem( HbListView* list )
+{
+LOGS_QDEBUG( "logs [UI] -> LogsBaseView::scrollToTopItem()" );
+if ( list && list->verticalScrollBar() ){
+list->verticalScrollBar()->setValue(0.0);
+}
+LOGS_QDEBUG( "logs [UI] <- LogsBaseView::scrollToTopItem()" );
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void LogsBaseView::updateMenuVisibility()
+{
+bool visibleActionsExist = false;
+HbMenu* optionsMenu = mOptionsMenu ? mOptionsMenu : menu();
+foreach (QAction* action, optionsMenu->actions()) {
+if  (action->isVisible()) {
+visibleActionsExist = true;
+}
+}
+setMenuVisible(visibleActionsExist);
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void LogsBaseView::setMenuVisible(bool visible)
+{
+if (!visible && !mOptionsMenu) {
+mOptionsMenu = takeMenu();
+} else if (visible && mOptionsMenu) {
+setMenu(mOptionsMenu);
+mOptionsMenu = 0;
+}
+}

changeset 8	6c9acdc6adc0
parent 6	41c0a814d878
child 9	68f3171a5819