diff -r f27aebe284bb -r c5af8598d22c logsui/logsapp/inc/logsrecentcallsview.h --- a/logsui/logsapp/inc/logsrecentcallsview.h Wed Aug 18 09:49:12 2010 +0300 +++ b/logsui/logsapp/inc/logsrecentcallsview.h Thu Sep 02 20:27:05 2010 +0300 @@ -20,6 +20,7 @@ #include "logsfilter.h" #include "logsbaseview.h" #include +#include class HbListView; class HbLabel; @@ -69,22 +70,24 @@ void changeFilter(HbAction* action); virtual void updateEmptyListWidgetsVisibility(); virtual void updateWidgetsSizeAndLayout(); + virtual void updateEmptyListLabelVisibility(); private slots: void clearList(); void clearListAnswer(int action); void toggleContactSearch(); - void updateView(LogsServices::LogsView view); - void leftFlick(); - void rightFlick(); + void updateView(XQService::LogsViewIndex view); + void moveForwardInLists(); + void moveBackwardInLists(); void dissappearByFadingComplete(); void dissappearByMovingComplete(); + void appearStarting(); void appearByMovingComplete(); bool markMissedCallsSeen(); private: // from LogsBaseView - + virtual void initView(); virtual QAbstractItemModel* model() const; virtual LogsAbstractModel* logsModel() const; @@ -97,16 +100,20 @@ void initListWidget(); void updateFilter(LogsFilter::FilterType type); void updateViewName(); - void updateContextMenuItems(LogsServices::LogsView view); - LogsFilter::FilterType getFilter(LogsServices::LogsView view); - void changeView(LogsServices::LogsView view); + void updateContextMenuItems(XQService::LogsViewIndex view); + LogsFilter::FilterType getFilter(XQService::LogsViewIndex view); + void changeView(XQService::LogsViewIndex view); void updateMenu(); void handleMissedCallsMarking(); //from HbWidget - void gestureEvent(QGestureEvent *event); + void gestureEvent(QGestureEvent *event); + bool eventFilter(QObject *obj, QEvent *event); int getListItemTextWidth(); + bool decideListMoveDirection( + QSwipeGesture::SwipeDirection direction); + bool moveToLeft(bool toLeft) const; private: @@ -116,12 +123,12 @@ LogsFilter* mFilter; //owned QMap mTitleMap; - QMap mConversionMap; + QMap mConversionMap; LogsModel* mModel; - LogsServices::LogsView mCurrentView; - LogsServices::LogsView mAppearingView; + XQService::LogsViewIndex mCurrentView; + XQService::LogsViewIndex mAppearingView; bool mMoveLeftInList; LogsEffectHandler* mEffectHandler; int mListViewX; @@ -129,10 +136,9 @@ LogsMatchesModel* mMatchesModel; bool mMarkingMissedAsSeen; LogsPageIndicator* mPageIndicator; - bool mFirstActivation; HbScrollArea::ScrollBarPolicy mListScrollBarPolicy; - + bool mEffectInDissappearedPhase; }; #endif // LOGSRECENTCALLSVIEW_H