новые иконки в 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/domain/UBGraphicsScene.h

442 lines
14 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
13 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
13 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
13 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
13 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
13 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
13 years ago
#ifndef UBGRAPHICSSCENE_H_
#define UBGRAPHICSSCENE_H_
#include <QtGui>
#include "frameworks/UBCoreGraphicsScene.h"
#include "core/UB.h"
#include "UBItem.h"
#include "tools/UBGraphicsCurtainItem.h"
class UBGraphicsPixmapItem;
class UBGraphicsProxyWidget;
class UBGraphicsSvgItem;
class UBGraphicsPolygonItem;
class UBGraphicsMediaItem;
class UBGraphicsVideoItem;
class UBGraphicsAudioItem;
class UBGraphicsWidgetItem;
class UBGraphicsW3CWidgetItem;
class UBGraphicsAppleWidgetItem;
class UBToolWidget;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
class UBGraphicsPDFItem;
class UBGraphicsTextItem;
class UBGraphicsRuler;
class UBGraphicsProtractor;
class UBGraphicsCompass;
class UBDocumentProxy;
class UBGraphicsCurtainItem;
class UBGraphicsStroke;
class UBMagnifierParams;
class UBMagnifier;
class UBGraphicsCache;
class UBGraphicsGroupContainerItem;
class UBSelectionFrame;
class UBBoardView;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
const double PI = 4.0 * atan(1.0);
class UBZLayerController : public QObject
{
Q_OBJECT
public:
struct ItemLayerTypeData {
ItemLayerTypeData() : bottomLimit(0), topLimit(0), curValue(0), incStep(1) {;}
ItemLayerTypeData(qreal bot, qreal top, qreal increment = 1) : bottomLimit(bot), topLimit(top), curValue(bot), incStep(increment) {;}
qreal bottomLimit; //bottom bound of the layer
qreal topLimit;//top bound of the layer
qreal curValue;//current value of variable
qreal incStep;//incremental step
};
enum moveDestination {
up
, down
, top
, bottom
};
typedef QMap<itemLayerType::Enum, ItemLayerTypeData> ScopeMap;
UBZLayerController(QGraphicsScene *scene);
qreal getBottomLimit(itemLayerType::Enum key) const {return scopeMap.value(key).bottomLimit;}
qreal getTopLimit(itemLayerType::Enum key) const {return scopeMap.value(key).topLimit;}
bool validLayerType(itemLayerType::Enum key) const {return scopeMap.contains(key);}
static qreal errorNum() {return errorNumber;}
qreal generateZLevel(itemLayerType::Enum key);
qreal generateZLevel(QGraphicsItem *item);
qreal changeZLevelTo(QGraphicsItem *item, moveDestination dest);
itemLayerType::Enum typeForData(QGraphicsItem *item) const;
void setLayerType(QGraphicsItem *pItem, itemLayerType::Enum pNewType);
void shiftStoredZValue(QGraphicsItem *item, qreal zValue);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
private:
ScopeMap scopeMap;
static qreal errorNumber;
QGraphicsScene *mScene;
};
class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
{
Q_OBJECT
public:
12 years ago
enum clearCase {
clearItemsAndAnnotations = 0
, clearAnnotations
, clearItems
, clearBackground
};
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
// tmp stub for divide addings scene objects from undo mechanism implementation
void enableUndoRedoStack(){mUndoRedoStackEnabled = true;}
void setURStackEnable(bool enable){mUndoRedoStackEnabled = enable;}
bool isURStackIsEnabled(){return mUndoRedoStackEnabled;}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
UBGraphicsScene(UBDocumentProxy *parent, bool enableUndoRedoStack = 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
13 years ago
virtual ~UBGraphicsScene();
virtual UBItem* deepCopy() const;
virtual void copyItemParameters(UBItem *copy) const {Q_UNUSED(copy);}
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
UBGraphicsScene* sceneDeepCopy() const;
12 years ago
void clearContent(clearCase pCase = clearItemsAndAnnotations);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
bool inputDevicePress(const QPointF& scenePos, const qreal& pressure = 1.0);
bool inputDeviceMove(const QPointF& scenePos, const qreal& pressure = 1.0);
bool inputDeviceRelease();
void leaveEvent (QEvent* event);
void addItem(QGraphicsItem* item);
void removeItem(QGraphicsItem* item);
void addItems(const QSet<QGraphicsItem*>& item);
void removeItems(const QSet<QGraphicsItem*>& item);
UBGraphicsWidgetItem* addWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
UBGraphicsAppleWidgetItem* addAppleWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(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
13 years ago
void addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, const QPointF& pPos = QPointF(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
13 years ago
UBGraphicsMediaItem* addMedia(const QUrl& pMediaFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
UBGraphicsMediaItem* addVideo(const QUrl& pVideoFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
UBGraphicsMediaItem* addAudio(const QUrl& pAudioFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
UBGraphicsSvgItem* addSvg(const QUrl& pSvgFileUrl, const QPointF& pPos = QPointF(0, 0), const QByteArray pData = QByteArray());
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
UBGraphicsTextItem* addText(const QString& pString, const QPointF& pTopLeft = QPointF(0, 0));
UBGraphicsTextItem* addTextWithFont(const QString& pString, const QPointF& pTopLeft = QPointF(0, 0)
, int pointSize = -1, const QString& fontFamily = "", bool bold = false, bool italic = false);
UBGraphicsTextItem* addTextHtml(const QString &pString = QString(), const QPointF& pTopLeft = QPointF(0, 0));
UBGraphicsW3CWidgetItem* addOEmbed(const QUrl& pContentUrl, const QPointF& pPos = QPointF(0, 0));
UBGraphicsGroupContainerItem *createGroup(QList<QGraphicsItem*> items);
void addGroup(UBGraphicsGroupContainerItem *groupItem);
QGraphicsItem* setAsBackgroundObject(QGraphicsItem* item, bool pAdaptTransformation = false, bool expand = false);
QGraphicsItem* backgroundObject() const
{
return mBackgroundObject;
}
bool isBackgroundObject(const QGraphicsItem* item) const
{
return item == mBackgroundObject;
}
QGraphicsItem* scaleToFitDocumentSize(QGraphicsItem* item, bool center = false, int margin = 0, bool expand = false);
QRectF normalizedSceneRect(qreal ratio = -1.0);
QGraphicsItem *itemForUuid(QUuid uuid);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
void moveTo(const QPointF& pPoint);
void drawLineTo(const QPointF& pEndPoint, const qreal& pWidth, bool bLineStyle);
void eraseLineTo(const QPointF& pEndPoint, const qreal& pWidth);
void drawArcTo(const QPointF& pCenterPoint, qreal pSpanAngle);
bool isEmpty() const;
void setDocument(UBDocumentProxy* pDocument);
UBDocumentProxy* document() const
{
return mDocument;
}
bool isDarkBackground() const
{
return mDarkBackground;
}
bool isLightBackground() const
{
return !mDarkBackground;
}
bool isCrossedBackground() const
{
return mCrossedBackground;
}
bool hasBackground()
{
return (mBackgroundObject != 0);
}
void addRuler(QPointF center);
void addProtractor(QPointF center);
void addCompass(QPointF center);
void addTriangle(QPointF center);
void addMagnifier(UBMagnifierParams params);
void addMask(const QPointF &center = QPointF());
void addCache();
QList<QGraphicsItem*> getFastAccessItems()
{
return mFastAccessItems;
}
class SceneViewState
{
public:
SceneViewState()
{
zoomFactor = 1;
horizontalPosition = 0;
verticalPostition = 0;
}
SceneViewState(qreal pZoomFactor, int pHorizontalPosition, int pVerticalPostition)
{
zoomFactor = pZoomFactor;
horizontalPosition = pHorizontalPosition;
verticalPostition = pVerticalPostition;
}
qreal zoomFactor;
int horizontalPosition;
int verticalPostition;
};
SceneViewState viewState() const
{
return mViewState;
}
void setViewState(const SceneViewState& pViewState)
{
mViewState = pViewState;
}
virtual void setRenderingQuality(UBItem::RenderingQuality pRenderingQuality);
QList<QUrl> relativeDependencies() const;
QSize nominalSize();
void setNominalSize(const QSize& pSize);
void setNominalSize(int pWidth, int pHeight);
qreal changeZLevelTo(QGraphicsItem *item, UBZLayerController::moveDestination dest, bool addUndo=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
13 years ago
enum RenderingContext
{
Screen = 0, NonScreen, PdfExport, Podcast
};
void setRenderingContext(RenderingContext pRenderingContext)
{
mRenderingContext = pRenderingContext;
}
RenderingContext renderingContext() const
{
return mRenderingContext;
}
QSet<QGraphicsItem*> tools(){ return mTools;}
void registerTool(QGraphicsItem* item)
{
mTools << item;
}
const QPointF& previousPoint()
{
return mPreviousPoint;
}
void setSelectedZLevel(QGraphicsItem *item);
void setOwnZlevel(QGraphicsItem *item);
static QUuid getPersonalUuid(QGraphicsItem *item);
UBGraphicsPolygonItem* polygonToPolygonItem(const QPolygonF pPolygon);
void clearSelectionFrame();
UBBoardView *controlView();
void notifyZChanged(QGraphicsItem *item, qreal zValue);
void deselectAllItemsExcept(QGraphicsItem* graphicsItem);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
public slots:
void updateSelectionFrame();
void updateSelectionFrameWrapper(int);
12 years ago
void initStroke();
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
void hideEraser();
void setBackground(bool pIsDark, bool pIsCrossed);
void setBackgroundZoomFactor(qreal zoom);
void setDrawingMode(bool bModeDesktop);
void deselectAllItems();
UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap,
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
QGraphicsItem* replaceFor,
const QPointF& pPos = QPointF(0,0),
qreal scaleFactor = 1.0,
bool pUseAnimation = false,
bool useProxyForDocumentPath = 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
13 years ago
void textUndoCommandAdded(UBGraphicsTextItem *textItem);
void setToolCursor(int tool);
void selectionChangedProcessing();
void moveMagnifier();
void moveMagnifier(QPoint newPos, bool forceGrab = 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
13 years ago
void closeMagnifier();
void zoomInMagnifier();
void zoomOutMagnifier();
void changeMagnifierMode(int mode);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
void resizedMagnifier(qreal newPercent);
protected:
UBGraphicsPolygonItem* lineToPolygonItem(const QLineF& pLine, const qreal& pWidth);
UBGraphicsPolygonItem* lineToPolygonItem(const QLineF &pLine, const qreal &pStartWidth, const qreal &pEndWidth);
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
UBGraphicsPolygonItem* arcToPolygonItem(const QLineF& pStartRadius, qreal pSpanAngle, qreal pWidth);
void initPolygonItem(UBGraphicsPolygonItem*);
void drawEraser(const QPointF& pEndPoint, bool isFirstDraw = false);
void drawPointer(const QPointF& pEndPoint, bool isFirstDraw = false);
void DisposeMagnifierQWidgets();
virtual void keyReleaseEvent(QKeyEvent * keyEvent);
void recolorAllItems();
virtual void drawItems (QPainter * painter, int numItems,
QGraphicsItem * items[], const QStyleOptionGraphicsItem options[], QWidget * widget = 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
13 years ago
QGraphicsItem* rootItem(QGraphicsItem* item) const;
virtual void 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
13 years ago
private:
void setDocumentUpdated();
void createEraiser();
void createPointer();
bool hasTextItemWithFocus(UBGraphicsGroupContainerItem* 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
13 years ago
QGraphicsEllipseItem* mEraser;
QGraphicsEllipseItem* mPointer;
QSet<QGraphicsItem*> mAddedItems;
QSet<QGraphicsItem*> mRemovedItems;
UBDocumentProxy* mDocument;
bool mDarkBackground;
bool mCrossedBackground;
bool mIsDesktopMode;
qreal mZoomFactor;
QGraphicsItem* mBackgroundObject;
QPointF mPreviousPoint;
qreal mPreviousWidth;
QList<UBGraphicsPolygonItem*> mPreviousPolygonItems;
SceneViewState mViewState;
bool mInputDeviceIsPressed;
QSet<QGraphicsItem*> mTools;
UBGraphicsPolygonItem *mArcPolygonItem;
QSize mNominalSize;
RenderingContext mRenderingContext;
UBGraphicsStroke* mCurrentStroke;
int mItemCount;
QList<QGraphicsItem*> mFastAccessItems; // a local copy as QGraphicsScene::items() is very slow in Qt 4.6
bool mHasCache;
// tmp stub for divide addings scene objects from undo mechanism implementation
bool mUndoRedoStackEnabled;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
UBMagnifier *magniferControlViewWidget;
UBMagnifier *magniferDisplayViewWidget;
UBZLayerController *mZLayerController;
UBGraphicsPolygonItem* mpLastPolygon;
bool mDrawWithCompass;
UBGraphicsPolygonItem *mCurrentPolygon;
UBSelectionFrame *mSelectionFrame;
Merge remote-tracking branch 'origin/Sankore-1.40' Conflicts: .gitignore Sankore_3.1.pro buildDebianPackage lgpl.txt release.linux.sh release.macx.sh release.win7.vc9.bat resources/etc/SankoreEditor/editor_en/index.html resources/etc/SankoreEditor/editor_fr/index.html resources/forms/preferences.ui resources/i18n/sankore_ar.ts resources/i18n/sankore_da.ts resources/i18n/sankore_de.ts resources/i18n/sankore_en.ts resources/i18n/sankore_en_UK.ts resources/i18n/sankore_es.ts resources/i18n/sankore_fr.ts resources/i18n/sankore_fr_CH.ts resources/i18n/sankore_it.ts resources/i18n/sankore_iw.ts resources/i18n/sankore_ja.ts resources/i18n/sankore_ko.ts resources/i18n/sankore_nb.ts resources/i18n/sankore_nl.ts resources/i18n/sankore_pl.ts resources/i18n/sankore_pt.ts resources/i18n/sankore_rm.ts resources/i18n/sankore_ro.ts resources/i18n/sankore_ru.ts resources/i18n/sankore_sk.ts resources/i18n/sankore_sv.ts resources/i18n/sankore_zh.ts resources/library/applications/Cellule.wgt/js/textes_descriptifs.js src/adaptors/UBExportCFF.h src/adaptors/UBSvgSubsetAdaptor.cpp src/board/UBBoardController.cpp src/board/UBBoardView.cpp src/core/UBDisplayManager.cpp src/core/UBSettings.cpp src/customWidgets/UBActionableWidget.cpp src/customWidgets/UBActionableWidget.h src/customWidgets/UBMediaWidget.cpp src/customWidgets/UBMediaWidget.h src/customWidgets/customWidgets.pri src/domain/UBGraphicsAudioItem.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsScene.cpp src/domain/UBGraphicsScene.h src/domain/UBGraphicsVideoItem.cpp src/domain/UBW3CWidget.cpp src/frameworks/UBPlatformUtils_mac.mm src/gui/UBDockPalette.cpp src/gui/UBNavigatorPalette.cpp src/interfaces/IDataStorage.h
13 years ago
};
#endif /* UBGRAPHICSSCENE_H_ */