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
f0bf15a3
Commit
f0bf15a3
authored
Dec 22, 2011
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed some warning
parent
ff6fbd52
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
3 additions
and
49 deletions
+3
-49
UBCFFSubsetAdaptor.cpp
src/adaptors/UBCFFSubsetAdaptor.cpp
+1
-4
UBMetadataDcSubsetAdaptor.cpp
src/adaptors/UBMetadataDcSubsetAdaptor.cpp
+0
-2
UBDocumentPublisher.cpp
src/adaptors/publishing/UBDocumentPublisher.cpp
+0
-3
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+1
-1
UBSettings.cpp
src/core/UBSettings.cpp
+0
-16
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+0
-13
UBDocumentNavigator.cpp
src/gui/UBDocumentNavigator.cpp
+0
-7
UBLibraryWidget.cpp
src/gui/UBLibraryWidget.cpp
+1
-1
UBMagnifer.cpp
src/gui/UBMagnifer.cpp
+0
-1
UBToolWidget.cpp
src/gui/UBToolWidget.cpp
+0
-1
No files found.
src/adaptors/UBCFFSubsetAdaptor.cpp
View file @
f0bf15a3
...
...
@@ -729,10 +729,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
QTransform
transform
;
QString
textTransform
=
element
.
attribute
(
aTransform
);
bool
hastransform
=
false
;
if
(
!
textTransform
.
isNull
())
{
transform
=
transformFromString
(
textTransform
);
hastransform
=
true
;
}
repositionSvgItem
(
flashItem
,
width
,
height
,
x
,
y
,
true
,
transform
);
hashSceneItem
(
element
,
flashItem
);
...
...
@@ -923,13 +921,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbElement(QDomElement &element
}
bool
locked
=
false
;
bool
isBackground
=
false
;
bool
isEditableItem
=
false
;
bool
isEditable
=
false
;
//Text items to convert to UBGraphicsTextItem only
QString
IDRef
=
element
.
attribute
(
aRef
);
if
(
!
IDRef
.
isNull
())
{
isBackground
=
element
.
hasAttribute
(
aBackground
)
?
strToBool
(
element
.
attribute
(
aBackground
))
:
false
;
element
.
hasAttribute
(
aBackground
)
?
strToBool
(
element
.
attribute
(
aBackground
))
:
false
;
locked
=
element
.
hasAttribute
(
aBackground
)
?
strToBool
(
element
.
attribute
(
aBackground
))
:
false
;
isEditableItem
=
element
.
hasAttribute
(
aEditable
);
if
(
isEditableItem
)
...
...
src/adaptors/UBMetadataDcSubsetAdaptor.cpp
View file @
f0bf15a3
...
...
@@ -90,8 +90,6 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy)
xmlWriter
.
writeStartElement
(
"Description"
);
xmlWriter
.
writeAttribute
(
"about"
,
proxy
->
metaData
(
UBSettings
::
documentIdentifer
).
toString
());
QDate
today
=
QDate
::
currentDate
();
xmlWriter
.
writeTextElement
(
nsDc
,
"title"
,
proxy
->
metaData
(
UBSettings
::
documentName
).
toString
());
xmlWriter
.
writeTextElement
(
nsDc
,
"type"
,
proxy
->
metaData
(
UBSettings
::
documentGroupName
).
toString
());
xmlWriter
.
writeTextElement
(
nsDc
,
"date"
,
QDate
::
currentDate
().
toString
(
"yyyy-MM-dd"
));
...
...
src/adaptors/publishing/UBDocumentPublisher.cpp
View file @
f0bf15a3
...
...
@@ -240,8 +240,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
{
UBGraphicsScene
*
scene
=
UBSvgSubsetAdaptor
::
loadScene
(
mPublishingDocument
,
pageIndex
);
bool
sceneHasWidget
=
false
;
QList
<
UBGraphicsW3CWidgetItem
*>
widgets
;
foreach
(
QGraphicsItem
*
item
,
scene
->
items
()){
...
...
@@ -249,7 +247,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
if
(
widgetItem
){
generateWidgetPropertyScript
(
widgetItem
,
pageIndex
+
1
);
sceneHasWidget
=
true
;
widgets
<<
widgetItem
;
}
}
...
...
src/board/UBBoardPaletteManager.cpp
View file @
f0bf15a3
...
...
@@ -81,8 +81,8 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
,
mpLibWidget
(
NULL
)
,
mpCachePropWidget
(
NULL
)
,
mpTeacherBarWidget
(
NULL
)
,
mpDesktopLibWidget
(
NULL
)
,
mpDownloadWidget
(
NULL
)
,
mpDesktopLibWidget
(
NULL
)
,
mDownloadInProgress
(
false
)
{
setupPalettes
();
...
...
src/core/UBSettings.cpp
View file @
f0bf15a3
...
...
@@ -854,8 +854,6 @@ QString UBSettings::uniboardUserVideoDirectory()
QString
valideUserVideoDirectory
=
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
MoviesLocation
);
bool
hasCreatedDir
=
false
;
// first look into the application settings
if
(
sAppSettings
&&
getAppSettings
()
->
contains
(
"App/UserVideoDirectory"
))
{
...
...
@@ -889,7 +887,6 @@ QString UBSettings::uniboardUserVideoDirectory()
if
(
!
dir
.
exists
())
{
dir
.
mkpath
(
userVideoDirectory
);
hasCreatedDir
=
true
;
}
if
(
dir
.
exists
())
...
...
@@ -898,7 +895,6 @@ QString UBSettings::uniboardUserVideoDirectory()
}
else
{
hasCreatedDir
=
false
;
qWarning
()
<<
"Failed to interpret App/UserVideoDirectory config : "
+
getAppSettings
()
->
value
(
"App/UserVideoDirectory"
).
toString
()
+
", defaulting to "
+
valideUserVideoDirectory
;
...
...
@@ -929,8 +925,6 @@ QString UBSettings::podcastRecordingDirectory()
QString
validePodcastRecordingDirectory
=
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DesktopLocation
);
bool
hasCreatedDir
=
false
;
// first look into the application settings
if
(
sAppSettings
&&
getAppSettings
()
->
contains
(
"Podcast/RecordingDirectory"
))
{
...
...
@@ -964,7 +958,6 @@ QString UBSettings::podcastRecordingDirectory()
if
(
!
dir
.
exists
())
{
dir
.
mkpath
(
userPodcastRecordingDirectory
);
hasCreatedDir
=
true
;
}
if
(
dir
.
exists
())
...
...
@@ -973,7 +966,6 @@ QString UBSettings::podcastRecordingDirectory()
}
else
{
hasCreatedDir
=
false
;
qWarning
()
<<
"Failed to interpret Podcast/RecordingDirectory config : "
+
getAppSettings
()
->
value
(
"Podcast/RecordingDirectory"
).
toString
()
+
", defaulting to user Desktop"
;
...
...
@@ -1099,8 +1091,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
{
QString
valideUserInteractiveDirectory
=
uniboardDataDirectory
()
+
"/interactive content"
;
bool
hasCreatedDir
=
false
;
// first look into the application settings
if
(
sAppSettings
&&
getAppSettings
()
->
contains
(
"App/UserInteractiveContentDirectory"
))
{
...
...
@@ -1129,7 +1119,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
if
(
!
dir
.
exists
())
{
dir
.
mkpath
(
userWidgetDirectory
);
hasCreatedDir
=
true
;
}
if
(
dir
.
exists
())
...
...
@@ -1138,7 +1127,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
}
else
{
hasCreatedDir
=
false
;
qWarning
()
<<
"Failed to interpret App/UserInteractiveContentDirectory config : "
+
getAppSettings
()
->
value
(
"App/UserInteractiveContentDirectory"
).
toString
()
+
", defaulting to "
+
valideUserInteractiveDirectory
;
...
...
@@ -1194,8 +1182,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
{
QString
valideUserInteractiveDirectory
=
uniboardDataDirectory
()
+
"/interactive favorites"
;
bool
hasCreatedDir
=
false
;
// first look into the application settings
if
(
sAppSettings
&&
getAppSettings
()
->
contains
(
"App/UserInteractiveFavoritesDirectory"
))
{
...
...
@@ -1224,7 +1210,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
if
(
!
dir
.
exists
())
{
dir
.
mkpath
(
userWidgetDirectory
);
hasCreatedDir
=
true
;
}
if
(
dir
.
exists
())
...
...
@@ -1233,7 +1218,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
}
else
{
hasCreatedDir
=
false
;
qWarning
()
<<
"Failed to interpret App/UserInteractiveFavoritesDirectory config : "
+
getAppSettings
()
->
value
(
"App/UserInteractiveFavoritesDirectory"
).
toString
()
+
", defaulting to "
+
valideUserInteractiveDirectory
;
...
...
src/domain/UBGraphicsScene.cpp
View file @
f0bf15a3
...
...
@@ -1586,8 +1586,6 @@ void UBGraphicsScene::addMagnifier(UBMagnifierParams params)
QGraphicsView
*
cView
=
(
QGraphicsView
*
)
UBApplication
::
boardController
->
controlView
();
QGraphicsView
*
dView
=
(
QGraphicsView
*
)
UBApplication
::
boardController
->
displayView
();
QPoint
ccZeroPoint
=
cContainer
->
mapToGlobal
(
QPoint
(
0
,
0
));
QPoint
cvZeroPoint
=
cView
->
mapToGlobal
(
QPoint
(
0
,
0
));
QPoint
dvZeroPoint
=
dView
->
mapToGlobal
(
QPoint
(
0
,
0
));
int
cvW
=
cView
->
width
();
...
...
@@ -1635,8 +1633,6 @@ void UBGraphicsScene::moveMagnifier(QPoint newPos)
QGraphicsView
*
cView
=
(
QGraphicsView
*
)
UBApplication
::
boardController
->
controlView
();
QGraphicsView
*
dView
=
(
QGraphicsView
*
)
UBApplication
::
boardController
->
displayView
();
QPoint
ccZeroPoint
=
cContainer
->
mapToGlobal
(
QPoint
(
0
,
0
));
QPoint
cvZeroPoint
=
cView
->
mapToGlobal
(
QPoint
(
0
,
0
));
QPoint
dvZeroPoint
=
dView
->
mapToGlobal
(
QPoint
(
0
,
0
));
int
cvW
=
cView
->
width
();
...
...
@@ -1711,16 +1707,7 @@ void UBGraphicsScene::addCache()
{
UBGraphicsCache
*
cache
=
new
UBGraphicsCache
();
mTools
<<
cache
;
QGraphicsView
*
view
;
if
(
UBApplication
::
applicationController
->
displayManager
()
->
hasDisplay
())
{
view
=
(
QGraphicsView
*
)(
UBApplication
::
boardController
->
displayView
());
}
else
{
view
=
(
QGraphicsView
*
)(
UBApplication
::
boardController
->
controlView
());
}
addItem
(
cache
);
cache
->
setVisible
(
true
);
cache
->
setSelected
(
true
);
...
...
src/gui/UBDocumentNavigator.cpp
View file @
f0bf15a3
...
...
@@ -105,7 +105,6 @@ void UBDocumentNavigator::generateThumbnails()
// Get the thumbnails
QList
<
QPixmap
>
thumbs
=
UBThumbnailAdaptor
::
load
(
mCrntDoc
);
QGraphicsPixmapItem
*
selection
=
NULL
;
for
(
int
i
=
0
;
i
<
thumbs
.
count
();
i
++
)
{
...
...
@@ -115,7 +114,6 @@ void UBDocumentNavigator::generateThumbnails()
// Get the selected item
if
(
UBApplication
::
boardController
->
activeSceneIndex
()
==
i
)
{
selection
=
pixmapItem
;
mCrntItem
=
dynamic_cast
<
UBSceneThumbnailNavigPixmap
*>
(
pixmapItem
);
mCrntItem
->
setSelected
(
true
);
}
...
...
@@ -289,11 +287,6 @@ void UBDocumentNavigator::refreshScene()
mLabels
.
at
(
i
)
->
setPos
(
pos
);
}
}
QScrollBar
*
vertScrollBar
=
verticalScrollBar
();
int
scrollBarThickness
=
0
;
if
(
vertScrollBar
&&
vertScrollBar
->
isVisible
())
scrollBarThickness
=
vertScrollBar
->
width
();
}
/**
...
...
src/gui/UBLibraryWidget.cpp
View file @
f0bf15a3
...
...
@@ -39,9 +39,9 @@
*/
UBLibraryWidget
::
UBLibraryWidget
(
QWidget
*
parent
,
const
char
*
name
)
:
UBThumbnailWidget
(
parent
)
,
chainedElements
(
NULL
)
,
mLibraryController
(
NULL
)
,
mpCrntDir
(
NULL
)
,
mpCrntElem
(
NULL
)
,
mLibraryController
(
NULL
)
,
mpTmpElem
(
NULL
)
{
setObjectName
(
name
);
...
...
src/gui/UBMagnifer.cpp
View file @
f0bf15a3
...
...
@@ -204,7 +204,6 @@ void UBMagnifier::mouseMoveEvent ( QMouseEvent * event )
{
if
(
mShouldMoveWidget
&&
(
event
->
buttons
()
&
Qt
::
LeftButton
))
{
QPoint
offset
=
event
->
pos
()
-
mMousePressPos
;
move
(
pos
()
-
mMousePressPos
+
event
->
pos
());
event
->
accept
();
...
...
src/gui/UBToolWidget.cpp
View file @
f0bf15a3
...
...
@@ -183,7 +183,6 @@ void UBToolWidget::mouseMoveEvent ( QMouseEvent * event )
{
if
(
mShouldMoveWidget
&&
(
event
->
buttons
()
&
Qt
::
LeftButton
))
{
QPoint
offset
=
event
->
pos
()
-
mMousePressPos
;
move
(
pos
()
-
mMousePressPos
+
event
->
pos
());
event
->
accept
();
}
...
...
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