MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into shiba-dev

Browse Source
preferencesAboutTextFull
shibakaneki 12 years ago
parent d12a2a80e1 19d31ccc55
commit ef77c53e70
8 changed files with 62 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 54
      src/board/UBBoardView.cpp
  2. 1
      src/board/UBBoardView.h
  3. 47
      src/board/UBFeaturesController.cpp
  4. 8
      src/board/UBFeaturesController.h
  5. 2
      src/gui/UBFeaturesWidget.cpp
  6. 4
      src/gui/UBTeacherGuideWidgetsTools.cpp
  7. 3
      src/web/UBWebController.cpp
  8. 24
      src/web/browser/WBBrowserWindow.cpp

54
src/board/UBBoardView.cpp
Unescape View File

@ -75,6 +75,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool
, mIsDragInProgress(false) , mIsDragInProgress(false)
, mMultipleSelectionIsEnabled(false) , mMultipleSelectionIsEnabled(false)
, isControl(pIsControl) , isControl(pIsControl)
, mRubberBandInPlayMode(false) //enables rubberband with play tool
{ {
init (); init ();
@ -1020,38 +1021,41 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
return; 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<QGraphicsItem *> rubberItems = items(bandRect); mUBRubberBand->setGeometry(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 QList<QGraphicsItem *> rubberItems = items(bandRect);
|| item->type() == UBGraphicsPixmapItem::Type foreach (QGraphicsItem *item, mJustSelectedItems) {
|| item->type() == UBGraphicsMediaItem::Type if (!rubberItems.contains(item)) {
|| item->type() == UBGraphicsSvgItem::Type item->setSelected(false);
|| item->type() == UBGraphicsTextItem::Type mJustSelectedItems.remove(item);
|| item->type() == UBGraphicsStrokesGroup::Type
|| item->type() == UBGraphicsGroupContainerItem::Type) {
if (!mJustSelectedItems.contains(item)) {
item->setSelected(true);
mJustSelectedItems.insert(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);
}
}
}
} }
} }

1
src/board/UBBoardView.h
Unescape View File

@ -154,6 +154,7 @@ class UBBoardView : public QGraphicsView
bool mIsDragInProgress; bool mIsDragInProgress;
bool mMultipleSelectionIsEnabled; bool mMultipleSelectionIsEnabled;
bool isControl; bool isControl;
bool mRubberBandInPlayMode;
static bool hasSelectedParents(QGraphicsItem * item); static bool hasSelectedParents(QGraphicsItem * item);

47
src/board/UBFeaturesController.cpp
Unescape View File

@ -36,7 +36,6 @@ const QString UBFeaturesController::webSearchPath = rootPath + "/Web search";
void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet) void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet)
{ {
Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists()); Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists());
QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile()); QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
@ -73,16 +72,16 @@ void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString &
} }
} }
void UBFeaturesComputingThread::scanAll(QList<QPair<QUrl, QString> > pScanningData, const QSet<QUrl> &pFavoriteSet) void UBFeaturesComputingThread::scanAll(QList<QPair<QUrl, UBFeature> > pScanningData, const QSet<QUrl> &pFavoriteSet)
{ {
for (int i = 0; i < pScanningData.count(); i++) { for (int i = 0; i < pScanningData.count(); i++) {
if (abort) { if (abort) {
return; return;
} }
QPair<QUrl, QString> curPair = pScanningData.at(i); QPair<QUrl, UBFeature> curPair = pScanningData.at(i);
emit scanCategory(UBFeaturesController::categoryNameForVirtualPath(curPair.second)); emit scanCategory(curPair.second.getDisplayName());
scanFS(curPair.first, curPair.second, pFavoriteSet); scanFS(curPair.first, curPair.second.getFullVirtualPath(), pFavoriteSet);
} }
} }
@ -109,11 +108,11 @@ int UBFeaturesComputingThread::featuresCount(const QUrl &pPath)
return noItems; return noItems;
} }
int UBFeaturesComputingThread::featuresCountAll(QList<QPair<QUrl, QString> > pScanningData) int UBFeaturesComputingThread::featuresCountAll(QList<QPair<QUrl, UBFeature> > pScanningData)
{ {
int noItems = 0; int noItems = 0;
for (int i = 0; i < pScanningData.count(); i++) { for (int i = 0; i < pScanningData.count(); i++) {
QPair<QUrl, QString> curPair = pScanningData.at(i); QPair<QUrl, UBFeature> curPair = pScanningData.at(i);
noItems += featuresCount(curPair.first); noItems += featuresCount(curPair.first);
} }
@ -127,7 +126,7 @@ QThread(parent)
abort = false; abort = false;
} }
void UBFeaturesComputingThread::compute(const QList<QPair<QUrl, QString> > &pScanningData, QSet<QUrl> *pFavoritesSet) void UBFeaturesComputingThread::compute(const QList<QPair<QUrl, UBFeature> > &pScanningData, QSet<QUrl> *pFavoritesSet)
{ {
QMutexLocker curLocker(&mMutex); QMutexLocker curLocker(&mMutex);
@ -148,7 +147,7 @@ void UBFeaturesComputingThread::run()
qDebug() << "Custom thread started execution"; qDebug() << "Custom thread started execution";
mMutex.lock(); mMutex.lock();
QList<QPair<QUrl, QString> > searchData = mScanningData; QList<QPair<QUrl, UBFeature> > searchData = mScanningData;
QSet<QUrl> favoriteSet = mFavoriteSet; QSet<QUrl> favoriteSet = mFavoriteSet;
mMutex.unlock(); mMutex.unlock();
@ -339,24 +338,24 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
void UBFeaturesController::startThread() void UBFeaturesController::startThread()
{ {
QList<QPair<QUrl, QString> > computingData; QList<QPair<QUrl, UBFeature> > computingData;
computingData << QPair<QUrl, QString>(mLibAudiosDirectoryPath, audiosPath) computingData << QPair<QUrl, UBFeature>(mLibAudiosDirectoryPath, audiosElement)
<< QPair<QUrl, QString>(mLibVideosDirectoryPath, moviesPath) << QPair<QUrl, UBFeature>(mLibVideosDirectoryPath, moviesElement)
<< QPair<QUrl, QString>(mLibAnimationsDirectoryPath, flashPath) << QPair<QUrl, UBFeature>(mLibAnimationsDirectoryPath, flashElement)
<< QPair<QUrl, QString>(mLibPicturesDirectoryPath, picturesPath) << QPair<QUrl, UBFeature>(mLibPicturesDirectoryPath, picturesElement)
<< QPair<QUrl, QString>(mUserInteractiveDirectoryPath, appPath) << QPair<QUrl, UBFeature>(mUserInteractiveDirectoryPath, applicationsElement)
<< QPair<QUrl, QString>(mUserAudioDirectoryPath, audiosPath) << QPair<QUrl, UBFeature>(mUserAudioDirectoryPath, audiosElement)
<< QPair<QUrl, QString>(mUserPicturesDirectoryPath, picturesPath) << QPair<QUrl, UBFeature>(mUserPicturesDirectoryPath, picturesElement)
<< QPair<QUrl, QString>(mUserVideoDirectoryPath, moviesPath) << QPair<QUrl, UBFeature>(mUserVideoDirectoryPath, moviesElement)
<< QPair<QUrl, QString>(mUserAnimationDirectoryPath, flashPath) << QPair<QUrl, UBFeature>(mUserAnimationDirectoryPath, flashElement)
<< QPair<QUrl, QString>(mLibApplicationsDirectoryPath, appPath) << QPair<QUrl, UBFeature>(mLibApplicationsDirectoryPath, applicationsElement)
<< QPair<QUrl, QString>(mLibShapesDirectoryPath, shapesPath) << QPair<QUrl, UBFeature>(mLibShapesDirectoryPath, shapesElement)
<< QPair<QUrl, QString>(mLibInteractiveDirectoryPath, interactPath) << QPair<QUrl, UBFeature>(mLibInteractiveDirectoryPath, interactElement)
<< QPair<QUrl, QString>(trashDirectoryPath, trashPath) << QPair<QUrl, UBFeature>(trashDirectoryPath, trashElement)
<< QPair<QUrl, QString>(mLibSearchDirectoryPath, rootPath + "/" + "Web search"); << QPair<QUrl, UBFeature>(mLibSearchDirectoryPath, webSearchElement);
mCThread.compute(computingData, favoriteSet); mCThread.compute(computingData, favoriteSet);
} }

8
src/board/UBFeaturesController.h
Unescape View File

@ -33,7 +33,7 @@ class UBFeaturesComputingThread : public QThread
public: public:
explicit UBFeaturesComputingThread(QObject *parent = 0); explicit UBFeaturesComputingThread(QObject *parent = 0);
virtual ~UBFeaturesComputingThread(); virtual ~UBFeaturesComputingThread();
void compute(const QList<QPair<QUrl, QString> > &pScanningData, QSet<QUrl> *pFavoritesSet); void compute(const QList<QPair<QUrl, UBFeature> > &pScanningData, QSet<QUrl> *pFavoritesSet);
protected: protected:
void run(); void run();
@ -51,16 +51,16 @@ public slots:
private: private:
void scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet); void scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet);
void scanAll(QList<QPair<QUrl, QString> > pScanningData, const QSet<QUrl> &pFavoriteSet); void scanAll(QList<QPair<QUrl, UBFeature> > pScanningData, const QSet<QUrl> &pFavoriteSet);
int featuresCount(const QUrl &pPath); int featuresCount(const QUrl &pPath);
int featuresCountAll(QList<QPair<QUrl, QString> > pScanningData); int featuresCountAll(QList<QPair<QUrl, UBFeature> > pScanningData);
private: private:
QMutex mMutex; QMutex mMutex;
QWaitCondition mWaitCondition; QWaitCondition mWaitCondition;
QUrl mScanningPath; QUrl mScanningPath;
QString mScanningVirtualPath; QString mScanningVirtualPath;
QList<QPair<QUrl, QString> > mScanningData; QList<QPair<QUrl, UBFeature> > mScanningData;
QSet<QUrl> mFavoriteSet; QSet<QUrl> mFavoriteSet;
bool restart; bool restart;
bool abort; bool abort;

2
src/gui/UBFeaturesWidget.cpp
Unescape View File

@ -676,7 +676,7 @@ UBFeaturesProgressInfo::UBFeaturesProgressInfo(QWidget *parent) :
void UBFeaturesProgressInfo::setCommmonInfoText(const QString &str) void UBFeaturesProgressInfo::setCommmonInfoText(const QString &str)
{ {
mProgressBar->setFormat(str + tr(" load") + "(%p%)"); mProgressBar->setFormat(tr("Loading ") + str + " (%p%)");
} }
void UBFeaturesProgressInfo::setDetailedInfoText(const QString &str) void UBFeaturesProgressInfo::setDetailedInfoText(const QString &str)

4
src/gui/UBTeacherGuideWidgetsTools.cpp
Unescape View File

@ -189,9 +189,9 @@ QString UBTGAdaptableText::text()
void UBTGAdaptableText::onTextChanged() void UBTGAdaptableText::onTextChanged()
{ {
qDebug() << ">> onTextChanged CALLED!"; //qDebug() << ">> onTextChanged CALLED!";
qreal documentSize = document()->size().height(); qreal documentSize = document()->size().height();
qDebug() << ">> documentSize: " << documentSize << ", height: " << height(); //qDebug() << ">> documentSize: " << documentSize << ", height: " << height();
if(height() == documentSize + mBottomMargin){ if(height() == documentSize + mBottomMargin){
return; return;
} }

3
src/web/UBWebController.cpp
Unescape View File

@ -733,6 +733,7 @@ bool UBWebController::isEduMedia(const QUrl& pUrl)
void UBWebController::loadUrl(const QUrl& url) void UBWebController::loadUrl(const QUrl& url)
{ {
bool webBrowserAlreadyInstanciated = dynamic_cast<WBBrowserWindow*>(mStackedWidget->widget(WebBrowser)) != NULL;
UBApplication::applicationController->showInternet(); UBApplication::applicationController->showInternet();
if (UBSettings::settings()->webUseExternalBrowser->get().toBool()) if (UBSettings::settings()->webUseExternalBrowser->get().toBool())
{ {
@ -740,8 +741,6 @@ void UBWebController::loadUrl(const QUrl& url)
} }
else else
{ {
bool webBrowserAlreadyInstanciated = mStackedWidget->widget(WebBrowser) != NULL;
if (!webBrowserAlreadyInstanciated) { if (!webBrowserAlreadyInstanciated) {
(*mCurrentWebBrowser)->loadUrl(url); (*mCurrentWebBrowser)->loadUrl(url);
} }

24
src/web/browser/WBBrowserWindow.cpp
Unescape View File

@ -270,28 +270,6 @@ void WBBrowserWindow::setupToolBarForTutorial()
if (tb && tb->menu()) if (tb && tb->menu())
tb->setMenu(NULL); 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(); mWebToolBar->show();
} }
@ -662,4 +640,4 @@ void WBBrowserWindow::openActionUrl(QAction *action)
history->goToItem(history->backItems(-1*offset).first()); history->goToItem(history->backItems(-1*offset).first());
else if (offset > 0) else if (offset > 0)
history->goToItem(history->forwardItems(history->count() - offset + 1).back()); history->goToItem(history->forwardItems(history->count() - offset + 1).back());
} }

Write Preview
Loading…
Cancel
Save