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
5e1e41a1
Commit
5e1e41a1
authored
13 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:Sankore/Sankore-3.1
parents
b8928808
f1950719
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
8 deletions
+56
-8
release.linux.sh
release.linux.sh
+48
-3
run.sh
resources/linux/run.sh
+1
-3
UBGraphicsProtractor.cpp
src/tools/UBGraphicsProtractor.cpp
+4
-2
UBGraphicsProtractor.h
src/tools/UBGraphicsProtractor.h
+3
-0
No files found.
release.linux.sh
View file @
5e1e41a1
...
...
@@ -2,8 +2,23 @@
make clean
rm
-rf
build/linux/release/
rm
-rf
install
/usr/bin/qmake-qt4
QT_PATH
=
"/usr/local/Trolltech/Qt-4.7.0"
PLUGINS_PATH
=
"
$QT_PATH
/plugins"
QMAKE_PATH
=
"
$QT_PATH
/bin/qmake"
if
[
!
-e
"
$QMAKE_PATH
"
]
;
then
echo
"qmake command not found at
$QMAKE_PATH
"
exit
1
fi
if
[
!
-e
"
$PLUGINS_PATH
"
]
;
then
echo
"plugins path not found at
$PLUGINS_PATH
"
exit
1
fi
$QMAKE_PATH
-spec
linux-g++
make
-j
4 release-install
...
...
@@ -25,7 +40,36 @@ chmod +x build/linux/release/product/run.sh
cp
-R
resources/linux/qtlinux/
*
build/linux/release/product/
cp
-R
/usr/lib/qt4/plugins build/linux/release/product/
#copying plugins
cp
-R
$PLUGINS_PATH
build/linux/release/product/
#removing debug version
find build/linux/release/product/
-name
*
.debug
-exec
rm
{}
\;
#copying custom qt library
QT_LIBRARY_DEST_PATH
=
"build/linux/release/product/qtlib"
mkdir
$QT_LIBRARY_DEST_PATH
QT_LIBRARY_SOURCE_PATH
=
"
$QT_PATH
/lib"
copyQtLibrary
(){
if
[
!
-e
"
$QT_LIBRARY_SOURCE_PATH
/
$1
.so.4"
]
;
then
echo
"library not found:
$QT_LIBRARY_SOURCE_PATH
"
exit
1
;
fi
cp
"
$QT_LIBRARY_SOURCE_PATH
/
$1
.so.4"
"
$QT_LIBRARY_DEST_PATH
/"
cp
"
$QT_LIBRARY_SOURCE_PATH
/
$1
.so.4.7.0"
"
$QT_LIBRARY_DEST_PATH
/"
}
copyQtLibrary libQtWebKit
copyQtLibrary libphonon
copyQtLibrary libQtDBus
copyQtLibrary libQtScript
copyQtLibrary libQtSvg
copyQtLibrary libQtXmlPatterns
copyQtLibrary libQtNetwork
copyQtLibrary libQtXml
copyQtLibrary libQtGui
copyQtLibrary libQtCore
rm
-rf
install
/linux
mkdir
-p
install
/linux
...
...
@@ -35,4 +79,5 @@ cd build/linux/release
# "Removing .svn directories ..."
find
.
-name
.svn
-exec
rm
-rf
{}
\;
2> /dev/null
tar
cvzf ../../../install/linux/Sankore
\
3.1.tar.gz Sankore_3.1.
$VERSION
-C
.
tar
cvzf ../../../install/linux/Sankore
\
3.1.tar.gz Sankore_3.1.
$VERSION
-C
.
echo
"Build Finished"
;
alert
This diff is collapsed.
Click to expand it.
resources/linux/run.sh
View file @
5e1e41a1
#!/bin/sh
LD_LIBRARY_PATH
=
$PWD
/lib:
$LD_LIBRARY_PATH
export
LD_LIBRARY_PATH
./Sankore
\
3.1
env
LD_LIBRARY_PATH
=
$PWD
/qtlib:
$LD_LIBRARY_PATH
./Sankore
\
3.1
This diff is collapsed.
Click to expand it.
src/tools/UBGraphicsProtractor.cpp
View file @
5e1e41a1
...
...
@@ -12,6 +12,7 @@
#include "domain/UBGraphicsScene.h"
#include "board/UBBoardController.h"
#include "board/UBDrawingController.h"
#include "UBAbstractDrawRuler.h"
#include "core/memcheck.h"
...
...
@@ -30,7 +31,8 @@ UBGraphicsProtractor::UBGraphicsProtractor()
,
mResizeSvgItem
(
0
)
,
mMarkerSvgItem
(
0
)
{
sFillTransparency
=
127
;
sDrawTransparency
=
192
;
create
(
*
this
);
setCacheMode
(
QGraphicsItem
::
DeviceCoordinateCache
);
...
...
@@ -49,7 +51,7 @@ UBGraphicsProtractor::UBGraphicsProtractor()
mMarkerSvgItem
=
new
QGraphicsSvgItem
(
":/images/angleMarker.svg"
,
this
);
mMarkerSvgItem
->
setVisible
(
false
);
mMarkerSvgItem
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
mRotateSvgItem
=
new
QGraphicsSvgItem
(
":/images/rotateTool.svg"
,
this
);
mRotateSvgItem
->
setVisible
(
false
);
mRotateSvgItem
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Control
));
...
...
This diff is collapsed.
Click to expand it.
src/tools/UBGraphicsProtractor.h
View file @
5e1e41a1
...
...
@@ -92,6 +92,9 @@ class UBGraphicsProtractor : public UBAbstractDrawRuler, public QGraphicsEllipse
virtual
void
rotateAroundCenter
(
qreal
angle
);
virtual
QPointF
rotationCenter
()
const
;
int
sFillTransparency
;
int
sDrawTransparency
;
};
#endif
/* UBGRAPHICSPROTRACTOR_H_ */
This diff is collapsed.
Click to expand it.
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