Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
8be4c32b
Commit
8be4c32b
authored
Apr 28, 2012
by
Ivan Ilyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FeatureWidget is in master now
parent
eaff36a9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
10 deletions
+9
-10
Sankore_3.1.pro
Sankore_3.1.pro
+1
-0
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+5
-2
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+1
-1
UBMagnifer.cpp
src/gui/UBMagnifer.cpp
+0
-6
UBThumbnailWidget.cpp
src/gui/UBThumbnailWidget.cpp
+2
-1
No files found.
Sankore_3.1.pro
View file @
8be4c32b
...
...
@@ -367,6 +367,7 @@ linux-g++-32 {
linux-g++-64 {
LIBS += -lcrypto
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
...
...
src/board/UBBoardPaletteManager.cpp
View file @
8be4c32b
...
...
@@ -158,8 +158,11 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
mRightPalette
->
registerWidget
(
mpFeaturesWidget
);
mRightPalette
->
addTab
(
mpFeaturesWidget
);
mRightPalette
->
registerWidget
(
mpLibWidget
);
mRightPalette
->
addTab
(
mpLibWidget
);
//Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget
// mRightPalette->registerWidget(mpLibWidget);
// mRightPalette->addTab(mpLibWidget);
// The cache widget will be visible only if a cache is put on the page
mRightPalette
->
registerWidget
(
mpCachePropWidget
);
...
...
src/domain/UBGraphicsScene.cpp
View file @
8be4c32b
...
...
@@ -256,6 +256,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
,
mDocument
(
parent
)
,
mDarkBackground
(
false
)
,
mCrossedBackground
(
false
)
,
mIsDesktopMode
(
false
)
,
mIsModified
(
true
)
,
mBackgroundObject
(
0
)
,
mPreviousWidth
(
0
)
...
...
@@ -269,7 +270,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
,
magniferControlViewWidget
(
0
)
,
magniferDisplayViewWidget
(
0
)
,
mZLayerController
(
new
UBZLayerController
(
this
))
,
mIsDesktopMode
(
false
)
,
mpLastPolygon
(
NULL
)
{
UBCoreGraphicsScene
::
setObjectName
(
"BoardScene"
);
...
...
src/gui/UBMagnifer.cpp
View file @
8be4c32b
...
...
@@ -314,9 +314,6 @@ void UBMagnifier::grabPoint()
QPointF
pfScLtF
(
UBApplication
::
boardController
->
controlView
()
->
mapToScene
(
QPoint
(
itemPos
.
x
(),
itemPos
.
y
())));
QRect
magnifierRect
=
rect
();
float
x
=
pfScLtF
.
x
()
-
zWidthHalf
;
float
y
=
pfScLtF
.
y
()
-
zHeightHalf
;
...
...
@@ -351,9 +348,6 @@ void UBMagnifier::grabPoint(const QPoint &pGrab)
QPointF
pfScLtF
(
UBApplication
::
boardController
->
controlView
()
->
mapToScene
(
QPoint
(
itemPos
.
x
(),
itemPos
.
y
())));
QRect
magnifierRect
=
rect
();
float
x
=
pfScLtF
.
x
()
-
zWidthHalf
;
float
y
=
pfScLtF
.
y
()
-
zHeightHalf
;
...
...
src/gui/UBThumbnailWidget.cpp
View file @
8be4c32b
...
...
@@ -32,8 +32,9 @@ UBThumbnailWidget::UBThumbnailWidget(QWidget* parent)
,
mSpacing
(
UBSettings
::
thumbnailSpacing
)
,
mLastSelectedThumbnail
(
0
)
,
mSelectionSpan
(
0
)
,
mLassoRectItem
(
0
)
,
mPrevLassoRect
(
QRect
())
,
mLassoRectItem
(
0
)
{
// By default, the drag is possible
bCanDrag
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment