equal
deleted
inserted
replaced
68 } |
68 } |
69 |
69 |
70 void GlxViewManager::setupItems( ) |
70 void GlxViewManager::setupItems( ) |
71 { |
71 { |
72 mMenuManager = new GlxMenuManager(mMainWindow); |
72 mMenuManager = new GlxMenuManager(mMainWindow); |
73 addBackSoftKeyAction(); |
73 addBackSoftKeyAction(); |
74 |
74 addConnection(); |
75 addConnection(); |
|
76 |
|
77 mMenuManager->addMenu( mView->viewId(), mView->menu() ); |
75 mMenuManager->addMenu( mView->viewId(), mView->menu() ); |
78 mMenuManager->setModel( mModel ); |
76 mMenuManager->setModel( mModel ); |
79 } |
77 } |
80 |
78 |
81 void GlxViewManager::launchApplication(qint32 id, QAbstractItemModel *model) |
79 void GlxViewManager::launchApplication(qint32 id, QAbstractItemModel *model) |
157 |
155 |
158 //create and registered the effect |
156 //create and registered the effect |
159 if ( mEffectEngine == NULL ) { |
157 if ( mEffectEngine == NULL ) { |
160 mEffectEngine = new GlxEffectEngine(); |
158 mEffectEngine = new GlxEffectEngine(); |
161 mEffectEngine->registerTransitionEffect(); |
159 mEffectEngine->registerTransitionEffect(); |
162 connect( mEffectEngine, SIGNAL( effectFinished() ), this, SLOT( effectFinished() ) ); |
160 connect( mEffectEngine, SIGNAL( effectFinished() ), this, SLOT( effectFinished() ), Qt::QueuedConnection ); |
163 } |
161 } |
164 |
162 |
165 QList< QGraphicsItem * > itemList; |
163 QList< QGraphicsItem * > itemList; |
166 QGraphicsItem *item = NULL; |
164 QGraphicsItem *item = NULL; |
167 itemList.clear(); |
165 itemList.clear(); |
585 connect(mMenuManager, SIGNAL( commandTriggered(qint32 ) ), this, SLOT( handleMenuAction(qint32 ) )); |
583 connect(mMenuManager, SIGNAL( commandTriggered(qint32 ) ), this, SLOT( handleMenuAction(qint32 ) )); |
586 if ( mBackAction ) |
584 if ( mBackAction ) |
587 connect(mBackAction, SIGNAL( triggered() ), this, SLOT( handleAction() )); |
585 connect(mBackAction, SIGNAL( triggered() ), this, SLOT( handleAction() )); |
588 |
586 |
589 if ( mEffectEngine ) { |
587 if ( mEffectEngine ) { |
590 connect( mEffectEngine, SIGNAL( effectFinished() ), this, SLOT( effectFinished() ) ); |
588 connect( mEffectEngine, SIGNAL( effectFinished() ), this, SLOT( effectFinished() ), Qt::QueuedConnection ); |
591 } |
589 } |
592 } |
590 } |
593 |
591 |
594 void GlxViewManager::removeConnection() |
592 void GlxViewManager::removeConnection() |
595 { |
593 { |