новые иконки в OpenBoard
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenBoard/src/board/UBBoardView.cpp

1848 lines
60 KiB

Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
/*
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
9 years ago
*
11 years ago
* Copyright (C) 2013 Open Education Foundation
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
*
11 years ago
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
* l'Education Numérique en Afrique (GIP ENA)
*
11 years ago
* This file is part of OpenBoard.
*
* OpenBoard is free software: you can redistribute it and/or modify
12 years ago
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3 of the License,
* with a specific linking exception for the OpenSSL project's
* "OpenSSL" library (or with modified versions of it that use the
* same license as the "OpenSSL" library).
*
11 years ago
* OpenBoard is distributed in the hope that it will be useful,
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11 years ago
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 years ago
* GNU General Public License for more details.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
*
12 years ago
* You should have received a copy of the GNU General Public License
11 years ago
* along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
*/
12 years ago
11 years ago
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "UBBoardView.h"
#include <QtGui>
#include <QtXml>
#include <QListView>
#include "UBDrawingController.h"
#include "frameworks/UBGeometryUtils.h"
#include "frameworks/UBPlatformUtils.h"
#include "core/UBSettings.h"
#include "core/UBMimeData.h"
#include "core/UBApplication.h"
#include "core/UBSetting.h"
#include "core/UBPersistenceManager.h"
#include "core/UB.h"
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "network/UBHttpGet.h"
#include "gui/UBStylusPalette.h"
#include "gui/UBRubberBand.h"
#include "gui/UBToolWidget.h"
#include "gui/UBResources.h"
#include "gui/UBMainWindow.h"
#include "gui/UBThumbnailWidget.h"
#include "board/UBBoardController.h"
#include "board/UBBoardPaletteManager.h"
#ifdef Q_OS_OSX
#include "core/UBApplicationController.h"
#include "desktop/UBDesktopAnnotationController.h"
#endif
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "domain/UBGraphicsTextItem.h"
#include "domain/UBGraphicsPixmapItem.h"
#include "domain/UBGraphicsWidgetItem.h"
#include "domain/UBGraphicsPDFItem.h"
#include "domain/UBGraphicsPolygonItem.h"
#include "domain/UBGraphicsLineItem.h"
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "domain/UBItem.h"
#include "domain/UBGraphicsMediaItem.h"
#include "domain/UBGraphicsSvgItem.h"
#include "domain/UBGraphicsGroupContainerItem.h"
#include "domain/UBGraphicsStrokesGroup.h"
#include "domain/UBGraphicsItemDelegate.h"
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "document/UBDocumentProxy.h"
#include "tools/UBGraphicsRuler.h"
#include "tools/UBGraphicsAxes.h"
#include "tools/UBGraphicsCurtainItem.h"
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
#include "tools/UBGraphicsCompass.h"
#include "tools/UBGraphicsCache.h"
#include "tools/UBGraphicsTriangle.h"
#include "tools/UBGraphicsProtractor.h"
#include "core/memcheck.h"
UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool isControl, bool isDesktop)
: QGraphicsView (pParent)
, mController (pController)
, mIsCreatingTextZone (false)
, mIsCreatingSceneGrabZone (false)
, mOkOnWidget(false)
, suspendedMousePressEvent(NULL)
, mLongPressInterval(1000)
, mIsDragInProgress(false)
, mMultipleSelectionIsEnabled(false)
, _movingItem(nullptr)
, bIsControl(isControl)
, bIsDesktop(isDesktop)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
init ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mFilterZIndex = false;
/*
mFilterZIndex = true;
mStartLayer = UBItemLayerType::FixedBackground;
mEndLayer = UBItemLayerType::Control;
*/
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mLongPressTimer.setInterval(mLongPressInterval);
mLongPressTimer.setSingleShot(true);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
UBBoardView::UBBoardView (UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent, bool isControl, bool isDesktop)
: QGraphicsView (pParent)
, mController (pController)
, suspendedMousePressEvent(NULL)
, mLongPressInterval(1000)
, mIsDragInProgress(false)
, mMultipleSelectionIsEnabled(false)
, _movingItem(nullptr)
, bIsControl(isControl)
, bIsDesktop(isDesktop)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
init ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mStartLayer = pStartLayer;
mEndLayer = pEndLayer;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mFilterZIndex = true;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mLongPressTimer.setInterval(mLongPressInterval);
mLongPressTimer.setSingleShot(true);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
UBBoardView::~UBBoardView ()
{
if (suspendedMousePressEvent){
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::init ()
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
connect (UBSettings::settings ()->boardPenPressureSensitive, SIGNAL (changed (QVariant)),
this, SLOT (settingChanged (QVariant)));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
connect (UBSettings::settings ()->boardMarkerPressureSensitive, SIGNAL (changed (QVariant)),
this, SLOT (settingChanged (QVariant)));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
connect (UBSettings::settings ()->boardUseHighResTabletEvent, SIGNAL (changed (QVariant)),
this, SLOT (settingChanged (QVariant)));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
setOptimizationFlags (QGraphicsView::IndirectPainting | QGraphicsView::DontSavePainterState); // enable UBBoardView::drawItems filter
setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
setWindowFlags (Qt::FramelessWindowHint);
setFrameStyle (QFrame::NoFrame);
setRenderHints (QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
setVerticalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
setAcceptDrops (true);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mTabletStylusIsPressed = false;
mMouseButtonIsPressed = false;
mPendingStylusReleaseEvent = false;
setCacheMode (QGraphicsView::CacheBackground);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mUsingTabletEraser = false;
mIsCreatingTextZone = false;
mRubberBand = 0;
mUBRubberBand = 0;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mVirtualKeyboardActive = false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
settingChanged (QVariant ());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
unsetCursor();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
setMovingItem(NULL);
mWidgetMoved = false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
UBGraphicsScene* UBBoardView::scene ()
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
return qobject_cast<UBGraphicsScene*> (QGraphicsView::scene ());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::keyPressEvent (QKeyEvent *event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
// send to the scene anyway
QApplication::sendEvent (scene (), event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (!event->isAccepted ())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
switch (event->key ())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
case Qt::Key_Up:
case Qt::Key_PageUp:
case Qt::Key_Left:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->previousScene ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Down:
case Qt::Key_PageDown:
case Qt::Key_Right:
case Qt::Key_Space:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->nextScene ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Home:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->firstScene ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_End:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->lastScene ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Insert:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->addScene ();
break;
}
case Qt::Key_Control:
case Qt::Key_Shift:
{
setMultiselection(true);
}break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (event->modifiers () & Qt::ControlModifier) // keep only ctrl/cmd keys
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
switch (event->key ())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
case Qt::Key_Plus:
case Qt::Key_I:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->zoomIn ();
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Minus:
case Qt::Key_O:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->zoomOut ();
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_0:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->zoomRestore ();
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Left:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->handScroll (-100, 0);
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Right:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->handScroll (100, 0);
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Up:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->handScroll (0, -100);
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case Qt::Key_Down:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->handScroll (0, 100);
event->accept ();
break;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
default:
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
// NOOP
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
}
// if ctrl of shift was pressed combined with other keys - we need to disable multiple selection.
if (event->isAccepted())
setMultiselection(false);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::keyReleaseEvent(QKeyEvent *event)
{
if (Qt::Key_Shift == event->key() ||Qt::Key_Control == event->key())
setMultiselection(false);
QGraphicsView::keyReleaseEvent(event);
}
bool UBBoardView::event (QEvent * e)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (e->type () == QEvent::Gesture)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGestureEvent *gestureEvent = dynamic_cast<QGestureEvent *> (e);
if (gestureEvent)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture));
if (swipe)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (swipe->horizontalDirection () == QSwipeGesture::Left)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
mController->previousScene ();
gestureEvent->setAccepted (swipe, true);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (swipe->horizontalDirection () == QSwipeGesture::Right)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
mController->nextScene ();
gestureEvent->setAccepted (swipe, true);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
}
}
return QGraphicsView::event (e);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::tabletEvent (QTabletEvent * event)
{
if (!mUseHighResTabletEvent) {
event->setAccepted (false);
return;
}
UBDrawingController *dc = UBDrawingController::drawingController ();
QPointF tabletPos = event->pos();
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)dc->stylusTool ();
if (event->type () == QEvent::TabletPress || event->type () == QEvent::TabletEnterProximity) {
if (event->pointerType () == QTabletEvent::Eraser) {
dc->setStylusTool (UBStylusTool::Eraser);
mUsingTabletEraser = true;
}
else {
if (mUsingTabletEraser && currentTool == UBStylusTool::Eraser)
dc->setStylusTool (dc->latestDrawingTool ());
mUsingTabletEraser = false;
}
}
QPointF scenePos = viewportTransform ().inverted ().map (tabletPos);
qreal pressure = 1.0;
if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) && mPenPressureSensitive) ||
(currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
pressure = event->pressure ();
else{
//Explanation: rerouting to mouse event
event->setAccepted (false);
return;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bool acceptEvent = true;
#ifdef Q_OS_OSX
//Work around #1388. After selecting annotation tool in desktop mode, annotation view appears on top when
//using Mac OS X. In this case tablet event should send mouse event so as to let user interact with
//stylus palette.
Q_ASSERT(UBApplication::applicationController->uninotesController());
if (UBApplication::applicationController->uninotesController()->drawingView() == this) {
if (UBApplication::applicationController->uninotesController()->desktopPalettePath().contains(event->pos())) {
acceptEvent = false;
}
}
#endif
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
switch (event->type ()) {
case QEvent::TabletPress: {
mTabletStylusIsPressed = true;
scene()->inputDevicePress (scenePos, pressure);
break;
}
case QEvent::TabletMove: {
if (mTabletStylusIsPressed)
scene ()->inputDeviceMove (scenePos, pressure);
acceptEvent = false; // rerouted to mouse move
break;
}
case QEvent::TabletRelease: {
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)dc->stylusTool ();
scene ()->setToolCursor (currentTool);
setToolCursor (currentTool);
scene ()->inputDeviceRelease ();
mPendingStylusReleaseEvent = false;
mTabletStylusIsPressed = false;
mMouseButtonIsPressed = false;
break;
}
default: {
//NOOP - avoid compiler warning
}
}
// ignore mouse press and mouse move tablet event so that it is rerouted to mouse events,
// documented in QTabletEvent Class Reference:
/* The event handler QWidget::tabletEvent() receives all three types of tablet events.
Qt will first send a tabletEvent then, if it is not accepted, it will send a mouse event. */
//
// This is a workaround to the fact that tablet event are not delivered to child widget (like palettes)
//
event->setAccepted (acceptEvent);
}
bool UBBoardView::itemIsLocked(QGraphicsItem *item)
{
if (!item)
return false;
return item->data(UBGraphicsItemData::ItemLocked).toBool();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
bool UBBoardView::itemHaveParentWithType(QGraphicsItem *item, int type)
{
if (!item)
return false;
if (type == item->type())
return true;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return itemHaveParentWithType(item->parentItem(), type);
}
bool UBBoardView::isUBItem(QGraphicsItem *item)
{
if ((UBGraphicsItemType::UserTypesCount > item->type()) && (item->type() > QGraphicsItem::UserType))
return true;
return false;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bool UBBoardView::isCppTool(QGraphicsItem *item)
{
return (item->type() == UBGraphicsItemType::CompassItemType
|| item->type() == UBGraphicsItemType::RulerItemType
|| item->type() == UBGraphicsItemType::AxesItemType
|| item->type() == UBGraphicsItemType::ProtractorItemType
|| item->type() == UBGraphicsItemType::TriangleItemType
|| item->type() == UBGraphicsItemType::CurtainItemType);
}
void UBBoardView::handleItemsSelection(QGraphicsItem *item)
{
// we need to select new pressed itemOnBoard and deselect all other items.
// the trouble is in:
// some items can has parents (groupped items or strokes, or strokes in groups).
// some items is already selected and we don't need to reselect them
//
// item selection managed by QGraphicsView::mousePressEvent(). It should be called later.
if (item)
{
// item has group as first parent - it is any item or UBGraphicsStrokesGroup.
if (getMovingItem())
{
if (getMovingItem()->parentItem())
{
if(item->parentItem() && UBGraphicsGroupContainerItem::Type == getMovingItem()->parentItem()->type())
return;
}
}
// delegate buttons shouldn't selected
if (DelegateButton::Type == item->type())
return;
// click on svg items (images on Frame) shouldn't change selection.
if (QGraphicsSvgItem::Type == item->type())
return;
// Delegate frame shouldn't selected
if (UBGraphicsDelegateFrame::Type == item->type())
return;
// if we need to uwe multiple selection - we shouldn't deselect other items.
if (!isMultipleSelectionEnabled())
{
// here we need to determine what item is pressed. We should work
// only with UB items.
if ((UBGraphicsItemType::UserTypesCount > item->type()) && (item->type() > QGraphicsItem::UserType))
{
scene()->deselectAllItemsExcept(item);
scene()->updateSelectionFrame();
}
}
}
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
{
/*
Some items should receive mouse press events averytime,
some items should receive that events when they are selected,
some items shouldn't receive mouse press events at mouse press, but should receive them at mouse release (suspended mouse press event)
Here we determines cases when items should to get mouse press event at pressing on mouse.
*/
if (!item)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
// for now background objects is not interactable, but it can be deprecated for some items in the future.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (item == scene()->backgroundObject())
return false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
// some behavior depends on current tool.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
switch(item->type())
{
case UBGraphicsProtractor::Type:
case UBGraphicsRuler::Type:
case UBGraphicsAxes::Type:
case UBGraphicsTriangle::Type:
case UBGraphicsCompass::Type:
case UBGraphicsCache::Type:
return true;
case UBGraphicsDelegateFrame::Type:
if (currentTool == UBStylusTool::Play)
return false;
return true;
case UBGraphicsPixmapItem::Type:
case UBGraphicsSvgItem::Type:
if (currentTool == UBStylusTool::Play)
return true;
if (item->isSelected())
return true;
else
return false;
case DelegateButton::Type:
return true;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsMediaItem::Type:
case UBGraphicsVideoItem::Type:
case UBGraphicsAudioItem::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
case UBGraphicsTextItem::Type:
if (currentTool == UBStylusTool::Play)
return true;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if ((currentTool == UBStylusTool::Selector) && item->isSelected())
return true;
if ((currentTool == UBStylusTool::Selector) && item->parentItem() && item->parentItem()->isSelected())
return true;
if (currentTool != UBStylusTool::Selector)
return false;
break;
case UBGraphicsItemType::StrokeItemType:
if (currentTool == UBStylusTool::Play || currentTool == UBStylusTool::Selector)
return true;
break;
// Groups shouldn't reacts on any presses and moves for Play tool.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsGroupContainerItem::Type:
if(currentTool == UBStylusTool::Play)
{
setMovingItem(NULL);
return true;
}
return false;
break;
case QGraphicsWebView::Type:
return true;
case QGraphicsProxyWidget::Type:
return false;
case UBGraphicsWidgetItem::Type:
if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
if (currentTool == UBStylusTool::Selector && item->isSelected())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
if (currentTool == UBStylusTool::Play)
return true;
return false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
break;
}
return !isUBItem(item); // standard behavior of QGraphicsScene for not UB items. UB items should be managed upper.
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
{
if (!item)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
if (item == scene()->backgroundObject())
return false;
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
switch(item->type())
{
case QGraphicsWebView::Type:
return false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsPixmapItem::Type:
case UBGraphicsSvgItem::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsTextItem::Type:
case UBGraphicsWidgetItem::Type:
if (currentTool == UBStylusTool::Selector && !item->isSelected() && item->parentItem())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
if (currentTool == UBStylusTool::Selector && item->isSelected())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
break;
case DelegateButton::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsMediaItem::Type:
case UBGraphicsVideoItem::Type:
case UBGraphicsAudioItem::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return true;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
{
if (!item)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
if (item == scene()->backgroundObject())
return false;
if (!(mMouseButtonIsPressed || mTabletStylusIsPressed))
return false;
if (getMovingItem())
{
if (getMovingItem()->data(UBGraphicsItemData::ItemLocked).toBool())
return false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (getMovingItem()->parentItem())
{
if (UBGraphicsGroupContainerItem::Type == getMovingItem()->parentItem()->type() && !getMovingItem()->isSelected() && getMovingItem()->parentItem()->isSelected())
return false;
}
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
switch(item->type())
{
case UBGraphicsCurtainItem::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsGroupContainerItem::Type:
return true;
case UBGraphicsWidgetItem::Type:
if(currentTool == UBStylusTool::Selector && item->isSelected())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
if(currentTool == UBStylusTool::Play)
return false;
case UBGraphicsSvgItem::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsPixmapItem::Type:
if (currentTool == UBStylusTool::Play || !item->isSelected())
return true;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (item->isSelected())
return false;
case UBGraphicsMediaItem::Type:
case UBGraphicsVideoItem::Type:
case UBGraphicsAudioItem::Type:
return true;
case UBGraphicsStrokesGroup::Type:
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBGraphicsTextItem::Type:
if (currentTool == UBStylusTool::Play)
return true;
else
return !item->isSelected();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return false;
}
QGraphicsItem* UBBoardView::determineItemToPress(QGraphicsItem *item)
{
if(item)
{
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
// if item is on group and group is not selected - group should take press.
if (UBStylusTool::Selector == currentTool
&& item->parentItem()
&& UBGraphicsGroupContainerItem::Type == item->parentItem()->type()
&& !item->parentItem()->isSelected())
return item->parentItem();
// items like polygons placed in two groups nested, so we need to recursive call.
if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type())
return determineItemToPress(item->parentItem());
}
return item;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
// determine item to interacts: item self or it's container.
QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item)
{
if(item)
{
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
//W3C widgets should take mouse move events from play tool.
if ((UBStylusTool::Play == currentTool) && (UBGraphicsWidgetItem::Type == item->type()))
return item;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
// if item is in group
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if(item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type())
{
// play tool should move groups by any element
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (UBStylusTool::Play == currentTool && item->parentItem()->isSelected())
return item->parentItem();
// groups should should be moved instead of strokes groups
if (UBGraphicsStrokesGroup::Type == item->type())
return item->parentItem();
// selected groups should be moved by moving any element
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (item->parentItem()->isSelected())
return item;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (item->isSelected())
return NULL;
return item->parentItem();
}
// items like polygons placed in two groups nested, so we need to recursive call.
if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type())
return determineItemToMove(item->parentItem());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
return item;
}
void UBBoardView::handleItemMousePress(QMouseEvent *event)
{
mLastPressedMousePos = mapToScene(event->pos());
// Determining item who will take mouse press event
//all other items will be deselected and if all item will be deselected, then
// wrong item can catch mouse press. because selected items placed on the top
setMovingItem(determineItemToPress(getMovingItem()));
handleItemsSelection(getMovingItem());
if (isMultipleSelectionEnabled())
return;
if (itemShouldReceiveMousePressEvent(getMovingItem())){
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
QGraphicsView::mousePressEvent (event);
QGraphicsItem* item = determineItemToPress(scene()->itemAt(this->mapToScene(event->localPos().toPoint()), transform()));
//use QGraphicsView::transform() to use not deprecated QGraphicsScene::itemAt() method
if (item && (item->type() == QGraphicsProxyWidget::Type) && item->parentObject() && item->parentObject()->type() != QGraphicsProxyWidget::Type)
{
//Clean up children
QList<QGraphicsItem*> children = item->childItems();
for( QList<QGraphicsItem*>::iterator it = children.begin(); it != children.end(); ++it )
if ((*it)->pos().x() < 0 || (*it)->pos().y() < 0)
(*it)->setPos(0,item->boundingRect().size().height());
}
}
else
{
if (getMovingItem())
{
UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(getMovingItem());
if (graphicsItem)
graphicsItem->Delegate()->startUndoStep();
getMovingItem()->clearFocus();
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (suspendedMousePressEvent)
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
}
if (itemShouldReceiveSuspendedMousePressEvent(getMovingItem()))
{
suspendedMousePressEvent = new QMouseEvent(event->type(), event->pos(), event->button(), event->buttons(), event->modifiers());
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
void UBBoardView::handleItemMouseMove(QMouseEvent *event)
{
// determine item to move (maybee we need to move group of item or his parent.
setMovingItem(determineItemToMove(getMovingItem()));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
// items should be moved not every mouse move.
if (getMovingItem() && itemShouldBeMoved(getMovingItem()) && (mMouseButtonIsPressed || mTabletStylusIsPressed))
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QPointF scenePos = mapToScene(event->pos());
QPointF newPos = getMovingItem()->pos() + scenePos - mLastPressedMousePos;
getMovingItem()->setPos(newPos);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mLastPressedMousePos = scenePos;
mWidgetMoved = true;
event->accept();
}
else
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QPointF posBeforeMove;
QPointF posAfterMove;
if (getMovingItem())
{
posBeforeMove = getMovingItem()->pos();
QGraphicsView::mouseMoveEvent (event);
posAfterMove = getMovingItem()->pos();
}
else
{
if (!mMouseButtonIsPressed)
{
QGraphicsView::mouseMoveEvent(event);
}
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mWidgetMoved = ((posAfterMove-posBeforeMove).manhattanLength() != 0);
// a cludge for terminate moving of w3c widgets.
// in some cases w3c widgets catches mouse move and doesn't sends that events to web page,
// at simple - in google map widget - mouse move events doesn't comes to web page from rectangle of wearch bar on bottom right corner of widget.
if (getMovingItem())
{
if (mWidgetMoved && UBGraphicsW3CWidgetItem::Type == getMovingItem()->type())
getMovingItem()->setPos(posBeforeMove);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
void UBBoardView::rubberItems()
{
if (mUBRubberBand)
mRubberedItems = items(mUBRubberBand->geometry());
foreach(QGraphicsItem *item, mRubberedItems)
{
if (item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type())
mRubberedItems.removeOne(item);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::moveRubberedItems(QPointF movingVector)
{
QRectF invalidateRect = scene()->itemsBoundingRect();
foreach (QGraphicsItem *item, mRubberedItems)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (item->type() == UBGraphicsW3CWidgetItem::Type
|| item->type() == UBGraphicsPixmapItem::Type
|| item->type() == UBGraphicsMediaItem::Type
|| item->type() == UBGraphicsVideoItem::Type
|| item->type() == UBGraphicsAudioItem::Type
|| item->type() == UBGraphicsSvgItem::Type
|| item->type() == UBGraphicsTextItem::Type
|| item->type() == UBGraphicsStrokesGroup::Type
|| item->type() == UBGraphicsGroupContainerItem::Type)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
item->setPos(item->pos()+movingVector);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
scene()->invalidate(invalidateRect);
}
void UBBoardView::setMultiselection(bool enable)
{
mMultipleSelectionIsEnabled = enable;
}
// work around for handling tablet events on MAC OS with Qt 4.8.0 and above
#if defined(Q_OS_OSX)
bool UBBoardView::directTabletEvent(QEvent *event)
{
QTabletEvent *tEvent = static_cast<QTabletEvent *>(event);
tEvent = new QTabletEvent(tEvent->type()
, mapFromGlobal(tEvent->pos())
, tEvent->globalPos()
, tEvent->device()
, tEvent->pointerType()
, tEvent->pressure()
, tEvent->xTilt()
, tEvent->yTilt()
, tEvent->tangentialPressure()
, tEvent->rotation()
, tEvent->z()
, tEvent->modifiers()
, tEvent->uniqueId());
if (geometry().contains(tEvent->pos()))
{
if (NULL == widgetForTabletEvent(this->parentWidget(), tEvent->pos()))
{
tabletEvent(tEvent);
return true;
}
}
return false;
}
QWidget *UBBoardView::widgetForTabletEvent(QWidget *w, const QPoint &pos)
{
Q_ASSERT(w);
// it should work that, but it doesn't. So we check if it is control view.
//UBBoardView *board = qobject_cast<UBBoardView *>(w);
UBBoardView *board = UBApplication::boardController->controlView();
QWidget *childAtPos = NULL;
QList<QObject *> childs = w->children();
foreach(QObject *child, childs)
{
QWidget *childWidget = qobject_cast<QWidget *>(child);
if (childWidget)
{
if (childWidget->isVisible() && childWidget->geometry().contains(pos))
{
QWidget *lastChild = widgetForTabletEvent(childWidget, pos);
if (board && board->viewport() == lastChild)
continue;
if (NULL != lastChild)
childAtPos = lastChild;
else
childAtPos = childWidget;
break;
}
else
childAtPos = NULL;
}
}
return childAtPos;
}
#endif
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
void UBBoardView::longPressEvent()
{
UBDrawingController *drawingController = UBDrawingController::drawingController();
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (UBStylusTool::Selector == currentTool)
{
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
drawingController->setStylusTool(UBStylusTool::Play);
}
else
if (currentTool == UBStylusTool::Play)
{
drawingController->setStylusTool(UBStylusTool::Selector);
}
else
if (UBStylusTool::Eraser == currentTool)
{
UBApplication::boardController->paletteManager()->toggleErasePalette(true);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::mousePressEvent (QMouseEvent *event)
{
if (!bIsControl && !bIsDesktop) {
event->ignore();
return;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mIsDragInProgress = false;
if (isAbsurdPoint (event->pos ())) {
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
event->accept ();
return;
}
mMouseDownPos = event->pos ();
setMovingItem(scene()->itemAt(this->mapToScene(event->localPos().toPoint()), QTransform()));
if (event->button () == Qt::LeftButton && isInteractive())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
int currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (!mTabletStylusIsPressed)
mMouseButtonIsPressed = true;
switch (currentTool) {
case UBStylusTool::ZoomIn :
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->zoomIn (mapToScene (event->pos ()));
event->accept();
break;
case UBStylusTool::ZoomOut :
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->zoomOut (mapToScene (event->pos ()));
event->accept();
break;
case UBStylusTool::Hand :
viewport()->setCursor(QCursor (Qt::ClosedHandCursor));
mPreviousPoint = event->localPos();
event->accept();
break;
case UBStylusTool::Selector :
case UBStylusTool::Play :
if (bIsDesktop) {
event->ignore();
return;
}
if (scene()->backgroundObject() == getMovingItem())
setMovingItem(NULL);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
if (!getMovingItem() && !mController->cacheIsVisible())
mLongPressTimer.start();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
handleItemMousePress(event);
event->accept();
break;
case UBStylusTool::Text : {
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
int frameWidth = UBSettings::settings ()->objectFrameWidth;
QRectF fuzzyRect (0, 0, frameWidth * 4, frameWidth * 4);
fuzzyRect.moveCenter (mapToScene (mMouseDownPos));
UBGraphicsTextItem* foundTextItem = 0;
QListIterator<QGraphicsItem *> it (scene ()->items (fuzzyRect));
while (it.hasNext () && !foundTextItem)
foundTextItem = qgraphicsitem_cast<UBGraphicsTextItem*>(it.next ());
if (foundTextItem)
{
mIsCreatingTextZone = false;
QGraphicsView::mousePressEvent (event);
}
else
{
scene()->deselectAllItems();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (!mRubberBand)
mRubberBand = new UBRubberBand (QRubberBand::Rectangle, this);
mRubberBand->setGeometry (QRect (mMouseDownPos, QSize ()));
mRubberBand->show();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mIsCreatingTextZone = true;
event->accept ();
}
} break;
case UBStylusTool::Capture :
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
scene ()->deselectAllItems ();
if (!mRubberBand)
mRubberBand = new UBRubberBand (QRubberBand::Rectangle, this);
mRubberBand->setGeometry (QRect (mMouseDownPos, QSize ()));
mRubberBand->show ();
mIsCreatingSceneGrabZone = true;
event->accept ();
break;
default:
if(UBDrawingController::drawingController()->mActiveRuler==NULL) {
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
viewport()->setCursor (QCursor (Qt::BlankCursor));
11 years ago
}
if (scene () && !mTabletStylusIsPressed) {
if (currentTool == UBStylusTool::Eraser) {
connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
mLongPressTimer.start();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
11 years ago
scene()->inputDevicePress(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
11 years ago
event->accept ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
}
11 years ago
void UBBoardView::mouseMoveEvent (QMouseEvent *event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
// static QTime lastCallTime;
// if (!lastCallTime.isNull()) {
// qDebug() << "time interval is " << lastCallTime.msecsTo(QTime::currentTime());
// }
// QTime mouseMoveTime = QTime::currentTime();
if(!mIsDragInProgress && ((mapToScene(event->pos()) - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance())) {
return;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mIsDragInProgress = true;
mWidgetMoved = true;
mLongPressTimer.stop();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (isAbsurdPoint (event->pos ())) {
event->accept ();
return;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if ((UBDrawingController::drawingController()->isDrawingTool()) && !mMouseButtonIsPressed)
QGraphicsView::mouseMoveEvent(event);
int currentTool = static_cast<int>(UBDrawingController::drawingController()->stylusTool());
switch (currentTool) {
case UBStylusTool::Hand : {
if (!mMouseButtonIsPressed && !mTabletStylusIsPressed) {
break;
}
QPointF eventPosition = event->localPos();
qreal dx = eventPosition.x () - mPreviousPoint.x ();
qreal dy = eventPosition.y () - mPreviousPoint.y ();
mController->handScroll (dx, dy);
mPreviousPoint = eventPosition;
event->accept ();
} break;
case UBStylusTool::Selector :
case UBStylusTool::Play : {
if (bIsDesktop) {
event->ignore();
return;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bool rubberMove = (currentTool != (UBStylusTool::Play))
&& (mMouseButtonIsPressed || mTabletStylusIsPressed)
&& !getMovingItem();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (rubberMove) {
QRect bandRect(mMouseDownPos, event->pos());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bandRect = bandRect.normalized();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (!mUBRubberBand) {
mUBRubberBand = new UBRubberBand(QRubberBand::Rectangle, this);
}
mUBRubberBand->setGeometry(bandRect);
mUBRubberBand->show();
// QTime startTime = QTime::currentTime();
// QTime testTime = QTime::currentTime();
QList<QGraphicsItem *> rubberItems = items(bandRect);
// qDebug() << "==================";
// qDebug() << "| ====rubber items" << testTime.msecsTo(QTime::currentTime());
// testTime = QTime::currentTime();
foreach (QGraphicsItem *item, mJustSelectedItems) {
if (!rubberItems.contains(item)) {
item->setSelected(false);
mJustSelectedItems.remove(item);
}
}
// qDebug() << "| ===foreach length" << testTime.msecsTo(QTime::currentTime());
// testTime = QTime::currentTime();
int counter = 0;
if (currentTool == UBStylusTool::Selector) {
foreach (QGraphicsItem *item, items(bandRect)) {
if(item->type() == UBGraphicsItemType::PolygonItemType && item->parentItem())
item = item->parentItem();
if (item->type() == UBGraphicsW3CWidgetItem::Type
|| item->type() == UBGraphicsPixmapItem::Type
|| item->type() == UBGraphicsVideoItem::Type
|| item->type() == UBGraphicsAudioItem::Type
|| item->type() == UBGraphicsSvgItem::Type
|| item->type() == UBGraphicsTextItem::Type
|| item->type() == UBGraphicsStrokesGroup::Type
|| item->type() == UBGraphicsGroupContainerItem::Type
|| item->type() == UBGraphicsLineItem::Type) {
if (!mJustSelectedItems.contains(item)) {
counter++;
item->setSelected(true);
mJustSelectedItems.insert(item);
}
}
}
}
// qDebug() << "| ==selected items count" << counter << endl
// << "| ==selection time" << testTime.msecsTo(QTime::currentTime()) << endl
// << "| =elapsed time " << startTime.msecsTo(QTime::currentTime()) << endl
// << "==================";
// QCoreApplication::removePostedEvents(scene(), 0);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
handleItemMouseMove(event);
} break;
case UBStylusTool::Text :
case UBStylusTool::Capture : {
if (mRubberBand && (mIsCreatingTextZone || mIsCreatingSceneGrabZone)) {
mRubberBand->setGeometry(QRect(mMouseDownPos, event->pos()).normalized());
event->accept();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
else
QGraphicsView::mouseMoveEvent (event);
} break;
default:
if (!mTabletStylusIsPressed && scene()) {
scene()->inputDeviceMove(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())) , mMouseButtonIsPressed);
}
event->accept ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
// qDebug() << "mouse move time" << mouseMoveTime.msecsTo(QTime::currentTime());
// lastCallTime = QTime::currentTime();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::movingItemDestroyed(QObject*)
{
setMovingItem(nullptr);
}
void UBBoardView::mouseReleaseEvent (QMouseEvent *event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
setToolCursor (currentTool);
// first/ propagate device release to the scene
if (scene())
scene()->inputDeviceRelease();
if (currentTool == UBStylusTool::Selector)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (bIsDesktop) {
event->ignore();
return;
}
UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(getMovingItem());
if (graphicsItem)
graphicsItem->Delegate()->commitUndoStep();
bool bReleaseIsNeed = true;
if (getMovingItem() != determineItemToPress(scene()->itemAt(this->mapToScene(event->localPos().toPoint()), QTransform())))
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
setMovingItem(nullptr);
bReleaseIsNeed = false;
}
if (mWidgetMoved)
{
mWidgetMoved = false;
setMovingItem(nullptr);
}
else
{
if (getMovingItem())
{
if (!isCppTool(getMovingItem()) || UBGraphicsCurtainItem::Type == getMovingItem()->type())
{
if (suspendedMousePressEvent)
{
QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop
setMovingItem(NULL);
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
bReleaseIsNeed = true;
}
else
{
if (isUBItem(getMovingItem()) &&
DelegateButton::Type != getMovingItem()->type() &&
UBGraphicsDelegateFrame::Type != getMovingItem()->type() &&
UBGraphicsCache::Type != getMovingItem()->type() &&
QGraphicsWebView::Type != getMovingItem()->type() && // for W3C widgets as Tools.
!(!isMultipleSelectionEnabled() && getMovingItem()->parentItem() && UBGraphicsWidgetItem::Type == getMovingItem()->type() && UBGraphicsGroupContainerItem::Type == getMovingItem()->parentItem()->type()))
{
bReleaseIsNeed = false;
if (getMovingItem()->isSelected() && isMultipleSelectionEnabled())
getMovingItem()->setSelected(false);
else
if (getMovingItem()->parentItem() && getMovingItem()->parentItem()->isSelected() && isMultipleSelectionEnabled())
getMovingItem()->parentItem()->setSelected(false);
else
{
if (getMovingItem()->isSelected())
bReleaseIsNeed = true;
UBGraphicsTextItem* textItem = dynamic_cast<UBGraphicsTextItem*>(getMovingItem());
UBGraphicsMediaItem* movieItem = dynamic_cast<UBGraphicsMediaItem*>(getMovingItem());
if(textItem)
textItem->setSelected(true);
else if(movieItem)
movieItem->setSelected(true);
else
getMovingItem()->setSelected(true);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
}
else
bReleaseIsNeed = true;
}
else
bReleaseIsNeed = true;
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (bReleaseIsNeed)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGraphicsView::mouseReleaseEvent (event);
}
}
else if (currentTool == UBStylusTool::Text)
{
bool bReleaseIsNeed = true;
if (getMovingItem() != determineItemToPress(scene()->itemAt(this->mapToScene(event->localPos().toPoint()), QTransform())))
{
setMovingItem(NULL);
bReleaseIsNeed = false;
}
UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(getMovingItem());
if (graphicsItem)
graphicsItem->Delegate()->commitUndoStep();
if (mWidgetMoved)
{
mWidgetMoved = false;
setMovingItem(NULL);
if (scene () && mRubberBand && mIsCreatingTextZone) {
QRect rubberRect = mRubberBand->geometry ();
UBGraphicsTextItem* textItem = scene()->addTextHtml ("", mapToScene (rubberRect.topLeft ()));
event->accept ();
UBDrawingController::drawingController ()->setStylusTool (UBStylusTool::Selector);
textItem->setTextInteractionFlags(Qt::TextEditorInteraction);
textItem->setSelected (true);
textItem->setTextWidth(0);
textItem->setFocus();
}
}
else if (getMovingItem() && (!isCppTool(getMovingItem()) || UBGraphicsCurtainItem::Type == getMovingItem()->type()))
{
if (suspendedMousePressEvent)
{
QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop
setMovingItem(NULL);
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
bReleaseIsNeed = true;
}
else{
if (isUBItem(getMovingItem()) &&
DelegateButton::Type != getMovingItem()->type() &&
QGraphicsSvgItem::Type != getMovingItem()->type() &&
UBGraphicsDelegateFrame::Type != getMovingItem()->type() &&
UBGraphicsCache::Type != getMovingItem()->type() &&
QGraphicsWebView::Type != getMovingItem()->type() && // for W3C widgets as Tools.
!(!isMultipleSelectionEnabled() && getMovingItem()->parentItem() && UBGraphicsWidgetItem::Type == getMovingItem()->type() && UBGraphicsGroupContainerItem::Type == getMovingItem()->parentItem()->type()))
{
bReleaseIsNeed = false;
if (getMovingItem()->isSelected() && isMultipleSelectionEnabled())
getMovingItem()->setSelected(false);
else
if (getMovingItem()->parentItem() && getMovingItem()->parentItem()->isSelected() && isMultipleSelectionEnabled())
getMovingItem()->parentItem()->setSelected(false);
else
{
if (getMovingItem()->isSelected())
bReleaseIsNeed = true;
getMovingItem()->setSelected(true);
}
}
}
}
else
bReleaseIsNeed = true;
if (bReleaseIsNeed)
{
QGraphicsView::mouseReleaseEvent (event);
}
}
else if (currentTool == UBStylusTool::Play) {
if (bIsDesktop) {
event->ignore();
return;
}
if (mWidgetMoved)
{
if (getMovingItem())
{
getMovingItem()->setSelected(false);
setMovingItem(NULL);
}
mWidgetMoved = false;
}
else {
if (suspendedMousePressEvent) {
QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop
setMovingItem(NULL);
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
}
}
QGraphicsView::mouseReleaseEvent (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
else if (currentTool == UBStylusTool::Capture)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (scene () && mRubberBand && mIsCreatingSceneGrabZone && mRubberBand->geometry ().width () > 16)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QRect rect = mRubberBand->geometry ();
QPointF sceneTopLeft = mapToScene (rect.topLeft ());
QPointF sceneBottomRight = mapToScene (rect.bottomRight ());
QRectF sceneRect (sceneTopLeft, sceneBottomRight);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mController->grabScene (sceneRect);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
event->accept ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
else
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGraphicsView::mouseReleaseEvent (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
mIsCreatingSceneGrabZone = false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
else
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (mPendingStylusReleaseEvent || mMouseButtonIsPressed)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
event->accept ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
if (mUBRubberBand) {
mUBRubberBand->hide();
delete mUBRubberBand;
mUBRubberBand = NULL;
}
if (mRubberBand) {
mRubberBand->hide();
delete mRubberBand;
mRubberBand = NULL;
}
mMouseButtonIsPressed = false;
mPendingStylusReleaseEvent = false;
mTabletStylusIsPressed = false;
setMovingItem(NULL);
mLongPressTimer.stop();
emit mouseReleased();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::forcedTabletRelease ()
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (mMouseButtonIsPressed || mTabletStylusIsPressed || mPendingStylusReleaseEvent)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
qWarning () << "dirty mouse/tablet state:";
qWarning () << "mMouseButtonIsPressed =" << mMouseButtonIsPressed;
qWarning () << "mTabletStylusIsPressed = " << mTabletStylusIsPressed;
qWarning () << "mPendingStylusReleaseEvent" << mPendingStylusReleaseEvent;
qWarning () << "forcing device release";
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
scene ()->inputDeviceRelease ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mMouseButtonIsPressed = false;
mTabletStylusIsPressed = false;
mPendingStylusReleaseEvent = false;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
void UBBoardView::mouseDoubleClickEvent (QMouseEvent *event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
// We don't want a double click, we want two clicks
mousePressEvent (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::wheelEvent (QWheelEvent *wheelEvent)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QList<QGraphicsItem *> selItemsList = scene()->selectedItems();
// if NO have selected items, than no need process mouse wheel. just exist
if( selItemsList.count() > 0 )
{
// only one selected item possible, so we will work with first item only
QGraphicsItem * selItem = selItemsList[0];
// get items list under mouse cursor
QPointF scenePos = mapToScene(wheelEvent->pos());
QList<QGraphicsItem *> itemsList = scene()->items(scenePos);
bool isSelectedAndMouseHower = itemsList.contains(selItem);
if(isSelectedAndMouseHower)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGraphicsView::wheelEvent(wheelEvent);
wheelEvent->accept();
}
}
}
void UBBoardView::leaveEvent (QEvent * event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (scene ())
scene ()->leaveEvent (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mJustSelectedItems.clear();
QGraphicsView::leaveEvent (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::drawItems (QPainter *painter, int numItems, QGraphicsItem* items[], const QStyleOptionGraphicsItem options[])
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (!mFilterZIndex)
QGraphicsView::drawItems (painter, numItems, items, options);
else
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
int count = 0;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
QGraphicsItem** itemsFiltered = new QGraphicsItem*[numItems];
QStyleOptionGraphicsItem *optionsFiltered = new QStyleOptionGraphicsItem[numItems];
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
for (int i = 0; i < numItems; i++)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (shouldDisplayItem (items[i]))
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
itemsFiltered[count] = items[i];
optionsFiltered[count] = options[i];
count++;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
QGraphicsView::drawItems (painter, count, itemsFiltered, optionsFiltered);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
delete[] optionsFiltered;
delete[] itemsFiltered;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
void UBBoardView::dragMoveEvent(QDragMoveEvent *event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGraphicsView::dragMoveEvent(event);
event->acceptProposedAction();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::dropEvent (QDropEvent *event)
{
QGraphicsItem *onItem = itemAt(event->pos().x(),event->pos().y());
if (onItem && onItem->type() == UBGraphicsWidgetItem::Type) {
QGraphicsView::dropEvent(event);
}
else {
if (!event->source()
|| qobject_cast<UBThumbnailWidget *>(event->source())
|| qobject_cast<QWebView*>(event->source())
|| qobject_cast<QListView *>(event->source())) {
mController->processMimeData (event->mimeData (), mapToScene (event->pos ()));
event->acceptProposedAction();
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
//prevent features in UBFeaturesWidget deletion from the model when event is processing inside
//Qt base classes
if (event->dropAction() == Qt::MoveAction) {
event->setDropAction(Qt::CopyAction);
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::resizeEvent (QResizeEvent * event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
const qreal maxWidth = width () * 10;
const qreal maxHeight = height () * 10;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
setSceneRect (-(maxWidth / 2), -(maxHeight / 2), maxWidth, maxHeight);
centerOn (0, 0);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
emit resized (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::drawBackground (QPainter *painter, const QRectF &rect)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
if (testAttribute (Qt::WA_TranslucentBackground))
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QGraphicsView::drawBackground (painter, rect);
return;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
bool darkBackground = scene () && scene ()->isDarkBackground ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (darkBackground)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
painter->fillRect (rect, QBrush (QColor (Qt::black)));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
else
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
painter->fillRect (rect, QBrush (QColor (Qt::white)));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (transform ().m11 () > 0.5)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QColor bgCrossColor;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (darkBackground)
bgCrossColor = QColor(UBSettings::settings()->boardCrossColorDarkBackground->get().toString());
else
bgCrossColor = QColor(UBSettings::settings()->boardCrossColorLightBackground->get().toString());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (transform ().m11 () < 0.7)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
int alpha = 255 * transform ().m11 () / 2;
bgCrossColor.setAlpha (alpha); // fade the crossing on small zooms
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
qreal gridSize = scene()->backgroundGridSize();
bool intermediateLines = scene()->intermediateLines();
painter->setPen (bgCrossColor);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (scene () && scene ()->pageBackground() == UBPageBackground::crossed)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
qreal firstY = ((int) (rect.y () / gridSize)) * gridSize;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
for (qreal yPos = firstY; yPos < rect.y () + rect.height (); yPos += gridSize)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
painter->drawLine (rect.x (), yPos, rect.x () + rect.width (), yPos);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
qreal firstX = ((int) (rect.x () / gridSize)) * gridSize;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
for (qreal xPos = firstX; xPos < rect.x () + rect.width (); xPos += gridSize)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
painter->drawLine (xPos, rect.y (), xPos, rect.y () + rect.height ());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (intermediateLines) {
QColor intermediateColor = bgCrossColor;
intermediateColor.setAlphaF(0.5 * bgCrossColor.alphaF());
painter->setPen(intermediateColor);
for (qreal yPos = firstY - gridSize/2; yPos < rect.y () + rect.height (); yPos += gridSize)
{
painter->drawLine (rect.x (), yPos, rect.x () + rect.width (), yPos);
}
for (qreal xPos = firstX - gridSize/2; xPos < rect.x () + rect.width (); xPos += gridSize)
{
painter->drawLine (xPos, rect.y (), xPos, rect.y () + rect.height ());
}
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (scene() && scene()->pageBackground() == UBPageBackground::ruled)
{
qreal firstY = ((int) (rect.y () / gridSize)) * gridSize;
for (qreal yPos = firstY; yPos < rect.y () + rect.height (); yPos += gridSize)
{
painter->drawLine (rect.x (), yPos, rect.x () + rect.width (), yPos);
}
if (intermediateLines) {
QColor intermediateColor = bgCrossColor;
intermediateColor.setAlphaF(0.5 * bgCrossColor.alphaF());
painter->setPen(intermediateColor);
for (qreal yPos = firstY - gridSize/2; yPos < rect.y () + rect.height (); yPos += gridSize)
{
painter->drawLine (rect.x (), yPos, rect.x () + rect.width (), yPos);
}
}
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
if (!mFilterZIndex && scene ())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QSize pageNominalSize = scene ()->nominalSize ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (pageNominalSize.isValid ())
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
qreal penWidth = 8.0 / transform ().m11 ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
QRectF pageRect (pageNominalSize.width () / -2, pageNominalSize.height () / -2
, pageNominalSize.width (), pageNominalSize.height ());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
pageRect.adjust (-penWidth / 2, -penWidth / 2, penWidth / 2, penWidth / 2);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
QColor docSizeColor;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
if (darkBackground)
docSizeColor = UBSettings::documentSizeMarkColorDarkBackground;
else
docSizeColor = UBSettings::documentSizeMarkColorLightBackground;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
QPen pen (docSizeColor);
pen.setWidth (penWidth);
painter->setPen (pen);
painter->drawRect (pageRect);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
}
void UBBoardView::settingChanged (QVariant newValue)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
Q_UNUSED (newValue);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
mPenPressureSensitive = UBSettings::settings ()->boardPenPressureSensitive->get ().toBool ();
mMarkerPressureSensitive = UBSettings::settings ()->boardMarkerPressureSensitive->get ().toBool ();
mUseHighResTabletEvent = UBSettings::settings ()->boardUseHighResTabletEvent->get ().toBool ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::virtualKeyboardActivated(bool b)
{
UBPlatformUtils::setWindowNonActivableFlag(this, b);
mVirtualKeyboardActive = b;
setInteractive(!b);
}
// Apple remote desktop sends funny events when the transmission is bad
bool UBBoardView::isAbsurdPoint(QPoint point)
{
QDesktopWidget *desktop = qApp->desktop ();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
bool isValidPoint = false;
for (int i = 0; i < desktop->numScreens (); i++)
{
QRect screenRect = desktop->screenGeometry (i);
isValidPoint = isValidPoint || screenRect.contains (mapToGlobal(point));
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
return !isValidPoint;
}
void UBBoardView::focusOutEvent (QFocusEvent * event)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
Q_UNUSED (event);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
void UBBoardView::setToolCursor (int tool)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
QWidget *controlViewport = viewport ();
switch (tool)
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
{
case UBStylusTool::Pen:
controlViewport->setCursor (UBResources::resources ()->penCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Eraser:
controlViewport->setCursor (UBResources::resources ()->eraserCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Marker:
controlViewport->setCursor (UBResources::resources ()->markerCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Pointer:
controlViewport->setCursor (UBResources::resources ()->pointerCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Hand:
controlViewport->setCursor (UBResources::resources ()->handCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::ZoomIn:
controlViewport->setCursor (UBResources::resources ()->zoomInCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::ZoomOut:
controlViewport->setCursor (UBResources::resources ()->zoomOutCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Selector:
controlViewport->setCursor (UBResources::resources ()->arrowCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Play:
controlViewport->setCursor (UBResources::resources ()->playCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Line:
controlViewport->setCursor (UBResources::resources ()->penCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Text:
controlViewport->setCursor (UBResources::resources ()->textCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
case UBStylusTool::Capture:
controlViewport->setCursor (UBResources::resources ()->penCursor);
break;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
default:
Q_ASSERT (false);
//failsafe
controlViewport->setCursor (UBResources::resources ()->penCursor);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
12 years ago
}
}
bool UBBoardView::hasSelectedParents(QGraphicsItem * item)
{
if (item->isSelected())
return true;
if (item->parentItem()==NULL)
return false;
return hasSelectedParents(item->parentItem());
}