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
f797f884
Commit
f797f884
authored
Dec 28, 2011
by
Ivan Ilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hotfix linux-g++-64 build
parent
fbbcb0a9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
6 deletions
+39
-6
Sankore_3.1.pro
Sankore_3.1.pro
+5
-2
UBBoardController.h
src/board/UBBoardController.h
+1
-0
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+24
-0
UBBoardPaletteManager.h
src/board/UBBoardPaletteManager.h
+1
-0
UBLibraryController.cpp
src/board/UBLibraryController.cpp
+8
-4
No files found.
Sankore_3.1.pro
View file @
f797f884
...
...
@@ -4,8 +4,11 @@ TEMPLATE = app
THIRD_PARTY_PATH
=../
Sankore
-
ThirdParty
CONFIG
+=
debug_and_release
\
no_include_pwd
\
link_prl
no_include_pwd
linux
-
g
++-
64
{
CONFIG
+=
link_prl
}
VERSION_MAJ
=
1
VERSION_MIN
=
40
...
...
src/board/UBBoardController.h
View file @
f797f884
...
...
@@ -140,6 +140,7 @@ class UBBoardController : public QObject
void
setBoxing
(
QRect
displayRect
);
void
setToolbarTexts
();
static
QUrl
expandWidgetToTempDir
(
const
QByteArray
&
pZipedData
,
const
QString
&
pExtension
=
QString
(
"wgt"
));
// static QRect freeRectInGlobalPos() const {return ;}
void
setPageSize
(
QSize
newSize
);
UBBoardPaletteManager
*
paletteManager
()
{
...
...
src/board/UBBoardPaletteManager.cpp
View file @
f797f884
...
...
@@ -1027,3 +1027,27 @@ void UBBoardPaletteManager::stopDownloads()
mRightPalette
->
removeTab
(
mpDownloadWidget
->
name
());
}
}
QRect
UBBoardPaletteManager
::
GetFreeRectGlobalCoords
()
const
{
QPoint
topLeft
,
bottomRight
;
if
(
mLeftPalette
)
{
int
x
=
mLeftPalette
->
getTabPaletteRect
().
topRight
().
x
();
int
y
=
0
;
if
(
x
||
y
)
{
topLeft
.
setX
(
x
);
topLeft
.
setY
(
y
);
topLeft
=
mContainer
->
mapToGlobal
(
topLeft
);
}
}
if
(
mRightPalette
)
{
int
x
=
mRightPalette
->
getTabPaletteRect
().
topLeft
().
x
();
int
y
=
mRightPalette
->
height
();
if
(
x
||
y
)
{
bottomRight
.
setX
(
x
);
bottomRight
.
setY
(
y
);
bottomRight
=
mContainer
->
mapToGlobal
(
bottomRight
);
}
}
return
QRect
(
topLeft
,
bottomRight
);
}
src/board/UBBoardPaletteManager.h
View file @
f797f884
...
...
@@ -65,6 +65,7 @@ class UBBoardPaletteManager : public QObject
void
changeMode
(
eUBDockPaletteWidgetMode
newMode
,
bool
isInit
=
false
);
void
startDownloads
();
void
stopDownloads
();
QRect
GetFreeRectGlobalCoords
()
const
;
signals
:
void
connectToDocController
();
...
...
src/board/UBLibraryController.cpp
View file @
f797f884
...
...
@@ -695,16 +695,20 @@ void UBLibraryController::addVideosToCurrentPage(const QList<QUrl>& videos)
void
UBLibraryController
::
addAudiosToCurrentPage
(
const
QList
<
QUrl
>&
sounds
)
{
QPointF
topLeftPos
=
visibleSceneRect
().
topLeft
();
QPointF
centerPos
=
visibleSceneRect
().
center
();
QPointF
pos
=
topLeftPos
;
QPointF
pos
=
centerPos
;
//move it a little higher for convenience
centerPos
.
setX
(
pos
.
x
()
-
200
);
centerPos
.
setY
(
pos
.
y
()
-
100
);
foreach
(
const
QUrl
url
,
sounds
)
{
mLastItemOffsetIndex
++
;
mLastItemOffsetIndex
=
qMin
(
mLastItemOffsetIndex
,
5
);
pos
=
QPointF
(
topLeft
Pos
.
x
()
+
50
*
mLastItemOffsetIndex
,
topLeft
Pos
.
y
()
+
50
*
mLastItemOffsetIndex
);
pos
=
QPointF
(
center
Pos
.
x
()
+
50
*
mLastItemOffsetIndex
,
center
Pos
.
y
()
+
50
*
mLastItemOffsetIndex
);
UBApplication
::
boardController
->
addAudio
(
url
,
false
,
pos
);
}
}
...
...
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