diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 9dab0121..ed75f550 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -75,6 +75,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool , mIsDragInProgress(false) , mMultipleSelectionIsEnabled(false) , isControl(pIsControl) +, mRubberBandInPlayMode(false) //enables rubberband with play tool { init (); @@ -1020,38 +1021,41 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) return; } - if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) { + if (currentTool != UBStylusTool::Play || mRubberBandInPlayMode) { - QRect bandRect(mMouseDownPos, event->pos()); + if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) { - bandRect = bandRect.normalized(); + QRect bandRect(mMouseDownPos, event->pos()); - mUBRubberBand->setGeometry(bandRect); + bandRect = bandRect.normalized(); - QList rubberItems = items(bandRect); - foreach (QGraphicsItem *item, mJustSelectedItems) { - if (!rubberItems.contains(item)) { - item->setSelected(false); - mJustSelectedItems.remove(item); - } - } - - if (currentTool == UBStylusTool::Selector) - foreach (QGraphicsItem *item, items(bandRect)) { + mUBRubberBand->setGeometry(bandRect); - if (item->type() == UBGraphicsW3CWidgetItem::Type - || item->type() == UBGraphicsPixmapItem::Type - || item->type() == UBGraphicsMediaItem::Type - || item->type() == UBGraphicsSvgItem::Type - || item->type() == UBGraphicsTextItem::Type - || item->type() == UBGraphicsStrokesGroup::Type - || item->type() == UBGraphicsGroupContainerItem::Type) { - - if (!mJustSelectedItems.contains(item)) { - item->setSelected(true); - mJustSelectedItems.insert(item); + QList rubberItems = items(bandRect); + foreach (QGraphicsItem *item, mJustSelectedItems) { + if (!rubberItems.contains(item)) { + item->setSelected(false); + mJustSelectedItems.remove(item); } } + + if (currentTool == UBStylusTool::Selector) + foreach (QGraphicsItem *item, items(bandRect)) { + + if (item->type() == UBGraphicsW3CWidgetItem::Type + || item->type() == UBGraphicsPixmapItem::Type + || item->type() == UBGraphicsMediaItem::Type + || item->type() == UBGraphicsSvgItem::Type + || item->type() == UBGraphicsTextItem::Type + || item->type() == UBGraphicsStrokesGroup::Type + || item->type() == UBGraphicsGroupContainerItem::Type) { + + if (!mJustSelectedItems.contains(item)) { + item->setSelected(true); + mJustSelectedItems.insert(item); + } + } + } } } diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h index 0794d76c..5c486a30 100644 --- a/src/board/UBBoardView.h +++ b/src/board/UBBoardView.h @@ -154,6 +154,7 @@ class UBBoardView : public QGraphicsView bool mIsDragInProgress; bool mMultipleSelectionIsEnabled; bool isControl; + bool mRubberBandInPlayMode; static bool hasSelectedParents(QGraphicsItem * item); diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 57019aac..6c777e73 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -36,7 +36,6 @@ const QString UBFeaturesController::webSearchPath = rootPath + "/Web search"; void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet &pFavoriteSet) { - Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists()); QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile()); @@ -73,16 +72,16 @@ void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & } } -void UBFeaturesComputingThread::scanAll(QList > pScanningData, const QSet &pFavoriteSet) +void UBFeaturesComputingThread::scanAll(QList > pScanningData, const QSet &pFavoriteSet) { for (int i = 0; i < pScanningData.count(); i++) { if (abort) { return; } - QPair curPair = pScanningData.at(i); + QPair curPair = pScanningData.at(i); - emit scanCategory(UBFeaturesController::categoryNameForVirtualPath(curPair.second)); - scanFS(curPair.first, curPair.second, pFavoriteSet); + emit scanCategory(curPair.second.getDisplayName()); + scanFS(curPair.first, curPair.second.getFullVirtualPath(), pFavoriteSet); } } @@ -109,11 +108,11 @@ int UBFeaturesComputingThread::featuresCount(const QUrl &pPath) return noItems; } -int UBFeaturesComputingThread::featuresCountAll(QList > pScanningData) +int UBFeaturesComputingThread::featuresCountAll(QList > pScanningData) { int noItems = 0; for (int i = 0; i < pScanningData.count(); i++) { - QPair curPair = pScanningData.at(i); + QPair curPair = pScanningData.at(i); noItems += featuresCount(curPair.first); } @@ -127,7 +126,7 @@ QThread(parent) abort = false; } -void UBFeaturesComputingThread::compute(const QList > &pScanningData, QSet *pFavoritesSet) +void UBFeaturesComputingThread::compute(const QList > &pScanningData, QSet *pFavoritesSet) { QMutexLocker curLocker(&mMutex); @@ -148,7 +147,7 @@ void UBFeaturesComputingThread::run() qDebug() << "Custom thread started execution"; mMutex.lock(); - QList > searchData = mScanningData; + QList > searchData = mScanningData; QSet favoriteSet = mFavoriteSet; mMutex.unlock(); @@ -339,24 +338,24 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) : void UBFeaturesController::startThread() { - QList > computingData; + QList > computingData; - computingData << QPair(mLibAudiosDirectoryPath, audiosPath) - << QPair(mLibVideosDirectoryPath, moviesPath) - << QPair(mLibAnimationsDirectoryPath, flashPath) - << QPair(mLibPicturesDirectoryPath, picturesPath) + computingData << QPair(mLibAudiosDirectoryPath, audiosElement) + << QPair(mLibVideosDirectoryPath, moviesElement) + << QPair(mLibAnimationsDirectoryPath, flashElement) + << QPair(mLibPicturesDirectoryPath, picturesElement) - << QPair(mUserInteractiveDirectoryPath, appPath) - << QPair(mUserAudioDirectoryPath, audiosPath) - << QPair(mUserPicturesDirectoryPath, picturesPath) - << QPair(mUserVideoDirectoryPath, moviesPath) - << QPair(mUserAnimationDirectoryPath, flashPath) + << QPair(mUserInteractiveDirectoryPath, applicationsElement) + << QPair(mUserAudioDirectoryPath, audiosElement) + << QPair(mUserPicturesDirectoryPath, picturesElement) + << QPair(mUserVideoDirectoryPath, moviesElement) + << QPair(mUserAnimationDirectoryPath, flashElement) - << QPair(mLibApplicationsDirectoryPath, appPath) - << QPair(mLibShapesDirectoryPath, shapesPath) - << QPair(mLibInteractiveDirectoryPath, interactPath) - << QPair(trashDirectoryPath, trashPath) - << QPair(mLibSearchDirectoryPath, rootPath + "/" + "Web search"); + << QPair(mLibApplicationsDirectoryPath, applicationsElement) + << QPair(mLibShapesDirectoryPath, shapesElement) + << QPair(mLibInteractiveDirectoryPath, interactElement) + << QPair(trashDirectoryPath, trashElement) + << QPair(mLibSearchDirectoryPath, webSearchElement); mCThread.compute(computingData, favoriteSet); } diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h index 92c31224..b48f3d62 100644 --- a/src/board/UBFeaturesController.h +++ b/src/board/UBFeaturesController.h @@ -33,7 +33,7 @@ class UBFeaturesComputingThread : public QThread public: explicit UBFeaturesComputingThread(QObject *parent = 0); virtual ~UBFeaturesComputingThread(); - void compute(const QList > &pScanningData, QSet *pFavoritesSet); + void compute(const QList > &pScanningData, QSet *pFavoritesSet); protected: void run(); @@ -51,16 +51,16 @@ public slots: private: void scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet &pFavoriteSet); - void scanAll(QList > pScanningData, const QSet &pFavoriteSet); + void scanAll(QList > pScanningData, const QSet &pFavoriteSet); int featuresCount(const QUrl &pPath); - int featuresCountAll(QList > pScanningData); + int featuresCountAll(QList > pScanningData); private: QMutex mMutex; QWaitCondition mWaitCondition; QUrl mScanningPath; QString mScanningVirtualPath; - QList > mScanningData; + QList > mScanningData; QSet mFavoriteSet; bool restart; bool abort; diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index 78823404..ee052027 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -676,7 +676,7 @@ UBFeaturesProgressInfo::UBFeaturesProgressInfo(QWidget *parent) : void UBFeaturesProgressInfo::setCommmonInfoText(const QString &str) { - mProgressBar->setFormat(str + tr(" load") + "(%p%)"); + mProgressBar->setFormat(tr("Loading ") + str + " (%p%)"); } void UBFeaturesProgressInfo::setDetailedInfoText(const QString &str) diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp index 55246e99..6300c65b 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.cpp +++ b/src/gui/UBTeacherGuideWidgetsTools.cpp @@ -189,9 +189,9 @@ QString UBTGAdaptableText::text() void UBTGAdaptableText::onTextChanged() { - qDebug() << ">> onTextChanged CALLED!"; + //qDebug() << ">> onTextChanged CALLED!"; qreal documentSize = document()->size().height(); - qDebug() << ">> documentSize: " << documentSize << ", height: " << height(); + //qDebug() << ">> documentSize: " << documentSize << ", height: " << height(); if(height() == documentSize + mBottomMargin){ return; } diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index ee69e3d3..9ad0861e 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -733,6 +733,7 @@ bool UBWebController::isEduMedia(const QUrl& pUrl) void UBWebController::loadUrl(const QUrl& url) { + bool webBrowserAlreadyInstanciated = dynamic_cast(mStackedWidget->widget(WebBrowser)) != NULL; UBApplication::applicationController->showInternet(); if (UBSettings::settings()->webUseExternalBrowser->get().toBool()) { @@ -740,8 +741,6 @@ void UBWebController::loadUrl(const QUrl& url) } else { - bool webBrowserAlreadyInstanciated = mStackedWidget->widget(WebBrowser) != NULL; - if (!webBrowserAlreadyInstanciated) { (*mCurrentWebBrowser)->loadUrl(url); } diff --git a/src/web/browser/WBBrowserWindow.cpp b/src/web/browser/WBBrowserWindow.cpp index 83d41992..cb89dd09 100644 --- a/src/web/browser/WBBrowserWindow.cpp +++ b/src/web/browser/WBBrowserWindow.cpp @@ -270,28 +270,6 @@ void WBBrowserWindow::setupToolBarForTutorial() if (tb && tb->menu()) tb->setMenu(NULL); } -// mTabWidget->addWebAction(mUniboardMainWindow->actionWebReload, QWebPage::Reload); -// mTabWidget->addWebAction(mUniboardMainWindow->actionStopLoading, QWebPage::Stop); - -// mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mTabWidget->lineEditStack()); - -// mSearchToolBar = new WBToolbarSearch(mWebToolBar); - -// mSearchAction = mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mSearchToolBar); - -// connect(mSearchToolBar, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&))); - -// mChaseWidget = new WBChaseWidget(this); -// mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mChaseWidget); - -// mWebToolBar->insertSeparator(mUniboardMainWindow->actionWebBigger); - -// connect(mUniboardMainWindow->actionHome, SIGNAL(triggered()), this , SLOT(slotHome())); - -// connect(mUniboardMainWindow->actionBookmarks, SIGNAL(triggered()), this , SLOT(bookmarks())); -// connect(mUniboardMainWindow->actionAddBookmark, SIGNAL(triggered()), this , SLOT(addBookmark())); -// connect(mUniboardMainWindow->actionWebBigger, SIGNAL(triggered()), this , SLOT(slotViewZoomIn())); -// connect(mUniboardMainWindow->actionWebSmaller, SIGNAL(triggered()), this , SLOT(slotViewZoomOut())); mWebToolBar->show(); } @@ -662,4 +640,4 @@ void WBBrowserWindow::openActionUrl(QAction *action) history->goToItem(history->backItems(-1*offset).first()); else if (offset > 0) history->goToItem(history->forwardItems(history->count() - offset + 1).back()); - } \ No newline at end of file + }