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
900be938
Commit
900be938
authored
May 21, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue 645
parent
759fe210
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
Sankore_3.1.pro
Sankore_3.1.pro
+1
-1
UBLibraryController.cpp
src/board/UBLibraryController.cpp
+1
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+0
-1
No files found.
Sankore_3.1.pro
View file @
900be938
...
@@ -13,7 +13,7 @@ linux-g++-64 {
...
@@ -13,7 +13,7 @@ linux-g++-64 {
VERSION_MAJ
=
1
VERSION_MAJ
=
1
VERSION_MIN
=
40
VERSION_MIN
=
40
VERSION_TYPE
=
b
#
a
=
alpha
,
b
=
beta
,
r
=
release
,
other
=>
error
VERSION_TYPE
=
b
#
a
=
alpha
,
b
=
beta
,
r
=
release
,
other
=>
error
VERSION_PATCH
=
0
6
VERSION_PATCH
=
0
7
VERSION
=
"$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION
=
"$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION
=
$$
replace
(
VERSION
,
"\\.r"
,
""
)
VERSION
=
$$
replace
(
VERSION
,
"\\.r"
,
""
)
...
...
src/board/UBLibraryController.cpp
View file @
900be938
...
@@ -291,7 +291,6 @@ QImage UBLibraryController::createThumbnail(UBLibElement* pElement)
...
@@ -291,7 +291,6 @@ QImage UBLibraryController::createThumbnail(UBLibElement* pElement)
{
{
QString
thumbnailPath
=
UBFileSystemUtils
::
thumbnailPath
(
pElement
->
path
().
toLocalFile
());
QString
thumbnailPath
=
UBFileSystemUtils
::
thumbnailPath
(
pElement
->
path
().
toLocalFile
());
QString
mimetype
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
pElement
->
path
().
toLocalFile
());
QString
mimetype
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
pElement
->
path
().
toLocalFile
());
UBApplication
::
showMessage
(
tr
(
"Creating image thumbnail for %1."
).
arg
(
pElement
->
name
()));
if
(
mimetype
.
contains
(
"audio"
))
if
(
mimetype
.
contains
(
"audio"
))
thumbnailPath
=
":images/libpalette/soundIcon.svg"
;
thumbnailPath
=
":images/libpalette/soundIcon.svg"
;
...
@@ -309,6 +308,7 @@ QImage UBLibraryController::createThumbnail(UBLibElement* pElement)
...
@@ -309,6 +308,7 @@ QImage UBLibraryController::createThumbnail(UBLibElement* pElement)
pix
.
save
(
thumbnailPath
);
pix
.
save
(
thumbnailPath
);
UBThumbnailPixmap
pixmap
(
pix
);
UBThumbnailPixmap
pixmap
(
pix
);
UBPlatformUtils
::
hideFile
(
thumbnailPath
);
UBPlatformUtils
::
hideFile
(
thumbnailPath
);
UBApplication
::
showMessage
(
tr
(
"Creating image thumbnail for %1."
).
arg
(
pElement
->
name
()));
}
}
else
{
else
{
thumbnailPath
=
":images/libpalette/notFound.png"
;
thumbnailPath
=
":images/libpalette/notFound.png"
;
...
...
src/domain/UBGraphicsScene.cpp
View file @
900be938
...
@@ -1605,7 +1605,6 @@ void UBGraphicsScene::addTriangle(QPointF center)
...
@@ -1605,7 +1605,6 @@ void UBGraphicsScene::addTriangle(QPointF center)
UBGraphicsTriangle
*
triangle
=
new
UBGraphicsTriangle
();
// mem : owned and destroyed by the scene
UBGraphicsTriangle
*
triangle
=
new
UBGraphicsTriangle
();
// mem : owned and destroyed by the scene
mTools
<<
triangle
;
mTools
<<
triangle
;
// triangle->setZValue(toolLayerStart + toolOffsetProtractor);
UBGraphicsItem
::
assignZValue
(
triangle
,
toolLayerStart
+
toolOffsetTriangle
);
UBGraphicsItem
::
assignZValue
(
triangle
,
toolLayerStart
+
toolOffsetTriangle
);
triangle
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
triangle
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
...
...
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