FCL/sf/app/photos: comparison ui/views/gridview/src/glxgridview.cpp

equal deleted inserted replaced

-:72396548277c
+:aa2fa096cbfb
 #include <xqserviceutil.h>
 #include <hbcheckbox.h>
 #include <hblabel.h>
 #include <QString>
 #include <hbframeitem.h>
-#include <QCoreApplication>
 //User Includes
 #include "glxviewids.h"
 #include "glxgridview.h"
 #include "glxmodelparm.h"
 #include "glxcommandhandlers.hrh"
 #include "glxicondefs.h"
 #include "glxlocalisationstrings.h"
-#include "glxlog.h"
-#include "glxtracer.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "glxgridviewTraces.h"
 #endif
 GlxGridView::GlxGridView(HbMainWindow *window)
 : GlxView ( GLX_GRIDVIEW_ID ),
 mWindow(window),
 mModel ( NULL),
 mWidget(NULL),
 mSelectionModel(NULL),
 mModelWrapper(NULL),
 mUiOnButton(NULL),
 mCameraButton(NULL),
 mUiOnButton->hide();
 }
 loadGridView();
 	connect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationchanged(Qt::Orientation)),Qt::UniqueConnection);
 if(mCountItem == NULL) {
 mCountItem = new HbLabel(this);
 HbFrameItem *frame = new HbFrameItem(this); //graphics for mCountItem
 frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
 frame->graphicsItem()->setOpacity(1);
 mCountItem->setBackgroundItem(frame->graphicsItem(),-1);
-}
+mCountItem->hide();
-QCoreApplication::instance()->installEventFilter(this);
+}
 OstTraceFunctionExit0( GLXGRIDVIEW_ACTIVATE_EXIT );
 }
 void GlxGridView::deActivate()
 {
 OstTraceFunctionEntry0( GLXGRIDVIEW_DEACTIVATE_ENTRY );
 mScrolling = FALSE;
 if (mUiOnButton){
 mUiOnButton->hide();
 }
 if(mIconItem) {
 mIconItem->hide();
 mIconItem->resetTransform();
 mIconItem->setOpacity(0);
 mIconItem->setZValue(mIconItem->zValue()-20);
 mZeroItemLabel->hide();
 }
 if(mCameraButton) {
 mCameraButton->hide();
 }
-QCoreApplication::instance()->removeEventFilter(this);
 disconnect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationchanged(Qt::Orientation)));
 OstTraceFunctionExit0( GLXGRIDVIEW_DEACTIVATE_EXIT );
 }
 void GlxGridView::initializeView(QAbstractItemModel *model)
 if (mWidget && variantimage.isValid() &&  variantimage.canConvert<QImage> () )
 {
 mWidget->setDefaultImage(variantimage.value<QImage>());
 }
 mModelWrapper->setModel(mModel);
 mWidget->setModel(mModelWrapper);
 if(!mSelectionModel)
 {
 mSelectionModel = new QItemSelectionModel(mModelWrapper, this);
 connect(mSelectionModel, SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(visibleIndexChanged(const QModelIndex &, const QModelIndex &)));
 mWidget->setSelectionModel(mSelectionModel);
 mModel->setData(mModel->index(0,0),current.row(),GlxVisualWindowIndex);
 }
 }
 }
 void GlxGridView::addToolBar( HbToolBar *toolBar )
 {
 OstTraceFunctionEntry0( GLXGRIDVIEW_ADDTOOLBAR_ENTRY );
 setToolBar(toolBar);
 hideorshowitems(mWindow->orientation());
 OstTraceFunctionExit0( GLXGRIDVIEW_ADDTOOLBAR_EXIT );
 }
 void GlxGridView::enableMarking()
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_ENABLEMARKING, "GlxGridView::enableMarking" );
 mWidget->setSelectionMode(HgWidget::MultiSelection);
 if (mMainLabel == NULL) {
 mMainLabel = new HbLabel("Select Photos", this);
 HbFrameItem *frame1 = new HbFrameItem(this);    //graphics for mMainLabel
 frame1->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame1->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
 frame1->graphicsItem()->setOpacity(1);
 mMainLabel->setBackgroundItem(frame1->graphicsItem(),-1);
 }
 if (mMarkCheckBox == NULL) {
 mMarkCheckBox = new HbCheckBox(GLX_OPTION_MARK_ALL, this);
 HbFrameItem *frame2 = new HbFrameItem(this);    //graphics for mMarkCheckBox
 frame2->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame2->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
 frame2->graphicsItem()->setOpacity(1);
 mMarkCheckBox->setBackgroundItem(frame2->graphicsItem(),-1);
 }
 if (mCountLabel == NULL) {
 mCountLabel = new HbLabel(this);
 HbFrameItem *frame3 = new HbFrameItem(this);    //graphics for mCountLabel
 frame3->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame3->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
 frame3->graphicsItem()->setOpacity(1);
 mCountLabel->setBackgroundItem(frame3->graphicsItem(),-1);
 connect( mWidget->selectionModel() , SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection& ) ), this, SLOT( showMarkedItemCount() ) );
 connect(mMarkCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( stateChanged(int)));
 }
 void GlxGridView::disableMarking()
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_DISABLEMARKING, "GlxGridView::disableMarking" );
 mWidget->setSelectionMode(HgWidget::NoSelection);
 disconnect( mWidget->selectionModel() , SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection& ) ), this, SLOT( showMarkedItemCount() ) );
 disconnect(mMarkCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( stateChanged(int)));
 if(mCameraButton) {
 mCameraButton->hide();
 }
 if(isItemVisible(Hb::TitleBarItem)) {
 QString text;
-if (getSubState() == ALL_ITEM_S) {
+if(XQServiceUtil::isService())
+{
+showAlbumTitle(GLX_FETCHER_TITLE);
+}
+else if (getSubState() == ALL_ITEM_S) {
 					if (mAlbumName) {
 	mAlbumName->hide();
 					}
 mCountItem->setGeometry(QRectF(0,0,screenSize.width(),deviceSize.height()/24));
 text = QString("%1 Items").arg( count );
 mCountItem->hide();
 }
 if (mAlbumName) {
 mAlbumName->hide();
 }
 showNoImageString();
 if (getSubState() == ALBUM_ITEM_S) {
 QVariant variant = mModel->data(mModel->index(0,0),GlxViewTitle);
 if (variant.toString() != NULL) {
 showAlbumTitle(variant.toString());
 }
+				}
+else if(XQServiceUtil::isService()){
+showAlbumTitle(GLX_FETCHER_TITLE);
 }
 }
 }
 }
 }
 int count = mModel->rowCount();
 QSize deviceSize = HbDeviceProfile::current().logicalSize();
 QSize screenSize = ( mWindow->orientation() == Qt::Vertical ) ? QSize( deviceSize.width(), deviceSize.height() )
 : QSize( deviceSize.height(), deviceSize.width() )  ;
 if(mAlbumName == NULL) {
 mAlbumName = new HbLabel(this);
 HbFrameItem *frame = new HbFrameItem(this); //graphics for mAlbumName
 frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans");
 frame->graphicsItem()->setOpacity(1);
 mAlbumName->setBackgroundItem(frame->graphicsItem(),-1);
 }
-if(count && isItemVisible(Hb::TitleBarItem)) {
+	//If fetcher service set only title text
-mAlbumName->setGeometry(QRectF(0,0,screenSize.width()/2,deviceSize.height()/24));
+	if((XQServiceUtil::isService() ) && isItemVisible(Hb::TitleBarItem)) {
-QString text = QString(aTitle);
-mAlbumName->setPlainText( text );
-mAlbumName->show();
-mCountItem->setGeometry(QRectF(screenSize.width()/2,0,screenSize.width()/2,deviceSize.height()/24));
-text = QString("(%1)").arg(count);
-mCountItem->setPlainText( text );
-mCountItem->setAlignment(Qt::AlignRight);
-mCountItem->show();
-}
-else if((!count) && isItemVisible(Hb::TitleBarItem)) {
 mAlbumName->setGeometry(QRectF(0,0,screenSize.width(),deviceSize.height()/24));
 QString text = QString(aTitle);
 mAlbumName->setPlainText( text );
 mAlbumName->show();
 }
+	else{ //handle album tiltle and count display logic here
+	    if( count && isItemVisible(Hb::TitleBarItem)) {
+	        mAlbumName->setGeometry(QRectF(0,0,screenSize.width()/2,deviceSize.height()/24));
+	        QString text = QString(aTitle);
+	        mAlbumName->setPlainText( text );
+	        mAlbumName->show();
+	        mCountItem->setGeometry(QRectF(screenSize.width()/2,0,screenSize.width()/2,deviceSize.height()/24));
+	        text = QString("(%1)").arg(count);
+	        mCountItem->setPlainText( text );
+	        mCountItem->setAlignment(Qt::AlignRight);
+	        mCountItem->show();
+	    }
+	    else if((!count) && isItemVisible(Hb::TitleBarItem)) {
+	        mAlbumName->setGeometry(QRectF(0,0,screenSize.width(),deviceSize.height()/24));
+	        QString text = QString(aTitle);
+	        mAlbumName->setPlainText( text );
+	        mAlbumName->show();
+	    }
+	}
 }
 void GlxGridView::showNoImageString()
 {
 qreal chromeHeight = 0.0;
 qreal midHeight = screenSize.height()/2;
 if (isItemVisible(Hb::TitleBarItem)) {
 style()->parameter("hb-param-widget-chrome-height", chromeHeight);
 midHeight -= chromeHeight;
 }
 if (mZeroItemLabel == NULL) {
-mZeroItemLabel = new HbLabel("(No Images)\n To capture images Open", this);
+QString displayText(GLX_GRID_NO_IMAGE);
+if(!XQServiceUtil::isService())
+{
+displayText.append(GLX_GRID_OPEN_CAMERA);
+}
+mZeroItemLabel = new HbLabel(displayText, this);
 }
 mZeroItemLabel->setGeometry(QRectF(0, midHeight - deviceSize.height()/16, screenSize.width(), 3*deviceSize.height()/32));
 mZeroItemLabel->setAlignment(Qt::AlignHCenter);
 mZeroItemLabel->show();
 if (mCameraButton == NULL) {
 mCameraButton = new HbPushButton(this);
 mCameraButton->setIcon(HbIcon(GLXICON_CAMERA));
+mCameraButton->hide();
 connect(mCameraButton, SIGNAL(clicked(bool)), this, SLOT(cameraButtonClicked(bool)));
 }
-mCameraButton->setGeometry(QRectF(screenSize.width()/2 - 3*deviceSize.height()/64, midHeight + deviceSize.height()/32, deviceSize.height()/32, deviceSize.height()/32));
+if(!XQServiceUtil::isService())
-mCameraButton->show();
+{
+mCameraButton->setGeometry(QRectF(screenSize.width()/2 - 3*deviceSize.height()/64, midHeight + deviceSize.height()/32, deviceSize.height()/32, deviceSize.height()/32));
+mCameraButton->show();
+}
 }
 void GlxGridView::populated()
 {
 showItemCount();
-}
-bool GlxGridView::eventFilter(QObject *obj, QEvent *event)
-{
-TRACER("GlxGridView::eventFilter() ");
-GLX_LOG_INFO1("GlxGridView::eventFilter() %d event type", event->type());
-if ( event->type() ==  QEvent::ApplicationActivate ) {
-emit actionTriggered( EGlxCmdAppForeground );
-}
-if ( event->type() ==  QEvent::ApplicationDeactivate ) {
-emit actionTriggered( EGlxCmdAppBackground );
-}
-return HbView::eventFilter(obj,event);
 }
 void GlxGridView::handleUserAction(qint32 commandId)
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_HANDLEUSERACTION, "GlxGridView::handleUserAction" );
 mWidget->selectAll();
 break;
 case EGlxCmdUnMarkAll :
 mWidget->clearSelection();
 break;
 default :
 break;
 }
 }
 QItemSelectionModel * GlxGridView::getSelectionModel()
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_GETSELECTIONMODEL, "GlxGridView::getSelectionModel" );
 return mWidget;
 }
 if ( transitionEffect == GRID_TO_FULLSCREEN )
 {
 QVariant variant = mModel->data( mModel->index(0,0), GlxFocusIndexRole );
 if ( variant.isValid() &&  variant.canConvert<int> () )
 {
 selIndex = variant.value<int>();
 }
 else
 {
 return mWidget;
 }
 QVariant variantimage = mModel->data(mModel->index(selIndex,0),Qt::DecorationRole);
 if ( variantimage.isValid() &&  variantimage.canConvert<HbIcon> () )
 HbIcon tmp = HbIcon( QIcon(tempPixmap)) ;
 mIconItem->setIcon(tmp);
 mIconItem->setPos(itemRect.topLeft());
 mIconItem->setZValue(mIconItem->zValue() + 20);
 mIconItem->show();
 return mIconItem;
 }
 else
 {
 return mWidget;
 }
 if ( transitionEffect == GRID_TO_ALBUMLIST  || transitionEffect == ALBUMLIST_TO_GRID ){
 return mWidget;
 }
 OstTraceFunctionExit0( GLXGRIDVIEW_GETANIMATIONITEM_EXIT );
 return NULL;
 }
 void GlxGridView::loadGridView()
 {
 OstTraceFunctionEntry0( GLXGRIDVIEW_LOADGRIDVIEW_ENTRY );
 mWindow->viewport()->grabGesture(Qt::PanGesture);
 mWindow->viewport()->grabGesture(Qt::TapGesture);
 mWindow->viewport()->grabGesture(Qt::TapAndHoldGesture);
 mWidget = new HgGrid(orient);
 mWidget->setLongPressEnabled(true);
 mWidget->setScrollBarPolicy(HgWidget::ScrollBarAutoHide);
 setWidget( mWidget );
 addViewConnection();
 hideorshowitems(orient);
 }
 OstTraceFunctionExit0( GLXGRIDVIEW_LOADGRIDVIEW_EXIT );
 }
 {
 hideorshowitems(orient);
 }
 void GlxGridView::hideorshowitems(Qt::Orientation orient)
 {
-if (mWidget && mWidget->selectionMode() == HgWidget::NoSelection) {
+if ( mWidget && mWidget->selectionMode() == HgWidget::NoSelection ) {
-if(orient == Qt::Horizontal)
+if( orient == Qt::Horizontal ) {
-{
 			setItemVisible(Hb::AllItems, FALSE) ;
 	setViewFlags(viewFlags() | HbView::ViewTitleBarHidden | HbView::ViewStatusBarHidden);
+//To:Do remove it later, currently it is solving the problem of status bar is not
+//visible when tap on the screen first time
+	setItemVisible(Hb::AllItems, FALSE) ;
+	setViewFlags(viewFlags() | HbView::ViewTitleBarHidden | HbView::ViewStatusBarHidden);
 	showItemCount();
-if (mUiOnButton)
+if (mUiOnButton) {
-{
 mUiOnButton->show();
 }
 }
-else
+else {
-{
 showHbItems();
 }
 }
+else if (mWidget && mWidget->selectionMode() == HgWidget::MultiSelection) {
-if (mWidget && mWidget->selectionMode() == HgWidget::MultiSelection) {
 setItemVisible(Hb::TitleBarItem, FALSE) ;
 if (mUiOnButton) {
 mUiOnButton->hide();
 }
 if (mCountItem) {
 void GlxGridView::scrolltofocus()
 {
 if(mModelWrapper && mWidget)
 {
 QVariant variant = mModelWrapper->data( mModelWrapper->index(0,0), GlxFocusIndexRole );
 if ( variant.isValid() &&  variant.canConvert<int> () )
 {
 mWidget->scrollTo( mModelWrapper->index( variant.value<int>(),0) );
 mModel->setData(mModel->index(0,0),variant.value<int>(),GlxVisualWindowIndex);
 }
 }
 }
 QVariant  GlxGridView::itemChange (GraphicsItemChange change, const QVariant &value)
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_ITEMCHANGE, "GlxGridView::itemChange" );
 static bool isEmit = true;
 if ( isEmit && change == QGraphicsItem::ItemVisibleHasChanged && value.toBool()  ) {
 emit actionTriggered( EGlxCmdSetupItem );
 isEmit = false;
 }
 void GlxGridView::itemSelected(const QModelIndex &  index)
 {
 OstTrace1( TRACE_NORMAL, GLXGRIDVIEW_ITEMSELECTED, "GlxGridView::itemSelected;index=%d", index.row() );
-if ( mWidget->selectionMode() == HgWidget::MultiSelection )
+if ( mWidget->selectionMode() == HgWidget::MultiSelection ) {
-{
 return ;
 }
 if(XQServiceUtil::isService()){
 emit gridItemSelected(index);
 return;
 }
 OstTraceEventStart0( EVENT_DUP1_GLXGRIDVIEW_ITEMSELECTED_START, "Fullscreen Launch Time" );
-if ( mModel )
+if ( mModel ) {
-{
 mModel->setData( index, index.row(), GlxFocusIndexRole );
 }
-setItemVisible(Hb::AllItems, FALSE);
+emit actionTriggered( EGlxCmdFullScreenOpen );
-emit actionTriggered( EGlxCmdFullScreenOpen );
 OstTraceEventStop( EVENT_DUP1_GLXGRIDVIEW_ITEMSELECTED_STOP, "Fullscreen Launch Time", EVENT_DUP1_GLXGRIDVIEW_ITEMSELECTED_START );
 }
 void GlxGridView::scrollingStarted()
 {
 }
 QModelIndex index = visibleIndex.at(0);
 if (  index.row() < 0 || index.row() >= mModel->rowCount() )
 {
 return;
 }
 if(mModel)
 {
 mModel->setData( index, index.row(), GlxVisualWindowIndex);
 mModel->setData( index, index.row(), GlxFocusIndexRole );
 }
 }
 void GlxGridView::indicateLongPress(const QModelIndex& index, QPointF coords)
 {
 OstTrace0( TRACE_NORMAL, GLXGRIDVIEW_INDICATELONGPRESS, "GlxGridView::indicateLongPress" );
 if ( mWidget->selectionMode() == HgWidget::MultiSelection )
 {
 return;
 }
 if ( mModel )
 {
 mModel->setData( index, index.row(), GlxFocusIndexRole );
 }
 emit itemSpecificMenuTriggered(viewId(),coords);
 }
 void GlxGridView::uiButtonClicked(bool /*checked*/)
 {

changeset 44	aa2fa096cbfb
parent 43	72396548277c
child 45	863223ea6961