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
9a7c2f84
Commit
9a7c2f84
authored
Jul 19, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first draft of handling example files
parent
2860788b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
68 additions
and
8 deletions
+68
-8
UBFeaturesController.cpp
src/board/UBFeaturesController.cpp
+7
-1
UBFeaturesController.h
src/board/UBFeaturesController.h
+4
-3
UBLibraryController.cpp
src/board/UBLibraryController.cpp
+10
-1
UBSettings.cpp
src/core/UBSettings.cpp
+44
-2
UBSettings.h
src/core/UBSettings.h
+3
-1
No files found.
src/board/UBFeaturesController.cpp
View file @
9a7c2f84
...
...
@@ -71,11 +71,15 @@ void UBFeaturesController::initDirectoryTree()
mUserAnimationDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
userAnimationDirectory
()
);
mLibPicturesDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationImageLibraryDirectory
()
);
qDebug
()
<<
mLibPicturesDirectoryPath
;
mLibInteractiveDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationInteractivesDirectory
()
);
mLibApplicationsDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationApplicationsLibraryDirectory
()
);
mLibShapesDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationShapeLibraryDirectory
()
);
mLibSearchDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
userSearchDirectory
()
);
trashDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
userTrashDirPath
()
);
mLibAudiosDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationAudiosLibraryDirectory
());
mLibVideosDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationVideosLibraryDirectory
());
mLibAnimationsDirectoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
settings
()
->
applicationAnimationsLibraryDirectory
());
featuresList
=
new
QList
<
UBFeature
>
();
...
...
@@ -135,7 +139,9 @@ void UBFeaturesController::initDirectoryTree()
fileSystemScan
(
trashDirectoryPath
,
trashPath
);
fileSystemScan
(
mLibSearchDirectoryPath
,
rootPath
+
"/"
+
"Web search"
);
fileSystemScan
(
mLibAudiosDirectoryPath
,
audiosPath
);
fileSystemScan
(
mLibVideosDirectoryPath
,
moviesPath
);
fileSystemScan
(
mLibAnimationsDirectoryPath
,
flashPath
);
}
void
UBFeaturesController
::
fileSystemScan
(
const
QUrl
&
currentPath
,
const
QString
&
currVirtualPath
)
...
...
src/board/UBFeaturesController.h
View file @
9a7c2f84
...
...
@@ -112,13 +112,14 @@ private:
QUrl
mUserAnimationDirectoryPath
;
QString
libraryPath
;
QUrl
mLibAudioDirectoryPath
;
QUrl
mLibVideoDirectoryPath
;
QUrl
mLibPicturesDirectoryPath
;
QUrl
mLibAudiosDirectoryPath
;
QUrl
mLibVideosDirectoryPath
;
QUrl
mLibInteractiveDirectoryPath
;
QUrl
mLibAnimationDirectoryPath
;
QUrl
mLibAnimation
s
DirectoryPath
;
QUrl
mLibApplicationsDirectoryPath
;
QUrl
mLibShapesDirectoryPath
;
QUrl
trashDirectoryPath
;
QUrl
mLibSearchDirectoryPath
;
...
...
src/board/UBLibraryController.cpp
View file @
9a7c2f84
...
...
@@ -268,7 +268,6 @@ QList<UBLibElement*> UBLibraryController::rootCategoriesList()
element
->
setMoveable
(
false
);
categories
<<
element
;
// Note : FEATURE IN DEVELOPMENT, DO NOT ERASE (or you will get problems) !!!!
mSearchCategoryPath
=
QUrl
::
fromLocalFile
(
UBSettings
::
userSearchDirectory
());
element
=
new
UBLibElement
(
eUBLibElementType_Folder
,
mSearchCategoryPath
,
tr
(
"Web Search"
,
"Web search category element"
));
element
->
setThumbnail
(
QImage
(
":images/libpalette/WebSearchCategory.svg"
));
...
...
@@ -357,8 +356,18 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS
else
if
(
pPath
==
mInteractiveCategoryPath
.
toLocalFile
()){
content
<<
listElementsInPath
(
UBSettings
::
settings
()
->
applicationInteractivesDirectory
());
}
else
if
(
pPath
==
mAudioStandardDirectoryPath
.
toLocalFile
()){
content
<<
listElementsInPath
(
UBSettings
::
settings
()
->
applicationAudiosLibraryDirectory
());
}
else
if
(
pPath
==
mVideoStandardDirectoryPath
.
toLocalFile
()){
content
<<
listElementsInPath
(
UBSettings
::
settings
()
->
applicationVideosLibraryDirectory
());
}
else
if
(
pPath
==
mAnimationUserDirectoryPath
.
toLocalFile
()){
content
<<
listElementsInPath
(
UBSettings
::
settings
()
->
applicationAnimationsLibraryDirectory
());
}
return
content
;
}
QList
<
UBLibElement
*>
UBLibraryController
::
listElementsInPath
(
const
QString
&
pPath
)
...
...
src/core/UBSettings.cpp
View file @
9a7c2f84
...
...
@@ -946,9 +946,9 @@ QString UBSettings::userSearchDirectory()
QString
UBSettings
::
applicationImageLibraryDirectory
()
{
QString
defaultRelativePath
=
QString
(
"./library/
image
"
);
QString
defaultRelativePath
=
QString
(
"./library/
pictures
"
);
QString
configPath
=
value
(
"Library/ImageDirectory"
,
QVariant
(
defaultRelativePath
)).
toString
();
QString
configPath
=
value
(
"Library/ImageDirectory"
,
QVariant
(
defaultRelativePath
)).
toString
();
if
(
configPath
.
startsWith
(
"."
))
{
return
UBPlatformUtils
::
applicationResourcesDirectory
()
+
configPath
.
right
(
configPath
.
size
()
-
1
);
...
...
@@ -1016,6 +1016,48 @@ QString UBSettings::applicationApplicationsLibraryDirectory()
}
QString
UBSettings
::
applicationAudiosLibraryDirectory
()
{
QString
defaultRelativePath
=
QString
(
"./library/audios"
);
QString
configPath
=
value
(
"Library/AudiosDirectory"
,
QVariant
(
defaultRelativePath
)).
toString
();
if
(
configPath
.
startsWith
(
"."
))
{
return
UBPlatformUtils
::
applicationResourcesDirectory
()
+
configPath
.
right
(
configPath
.
size
()
-
1
);
}
else
{
return
configPath
;
}
}
QString
UBSettings
::
applicationVideosLibraryDirectory
()
{
QString
defaultRelativePath
=
QString
(
"./library/videos"
);
QString
configPath
=
value
(
"Library/VideosDirectory"
,
QVariant
(
defaultRelativePath
)).
toString
();
if
(
configPath
.
startsWith
(
"."
))
{
return
UBPlatformUtils
::
applicationResourcesDirectory
()
+
configPath
.
right
(
configPath
.
size
()
-
1
);
}
else
{
return
configPath
;
}
}
QString
UBSettings
::
applicationAnimationsLibraryDirectory
()
{
QString
defaultRelativePath
=
QString
(
"./library/animations"
);
QString
configPath
=
value
(
"Library/AnimationsDirectory"
,
QVariant
(
defaultRelativePath
)).
toString
();
if
(
configPath
.
startsWith
(
"."
))
{
return
UBPlatformUtils
::
applicationResourcesDirectory
()
+
configPath
.
right
(
configPath
.
size
()
-
1
);
}
else
{
return
configPath
;
}
}
QString
UBSettings
::
userInteractiveFavoritesDirectory
()
{
static
QString
dirPath
=
""
;
...
...
src/core/UBSettings.h
View file @
9a7c2f84
...
...
@@ -121,7 +121,9 @@ class UBSettings : public QObject
QString
applicationInteractivesDirectory
();
QString
applicationCustomizationDirectory
();
QString
applicationCustomFontDirectory
();
QString
applicationAudiosLibraryDirectory
();
QString
applicationVideosLibraryDirectory
();
QString
applicationAnimationsLibraryDirectory
();
QNetworkProxy
*
httpProxy
();
...
...
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