Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
Isa Kindov 14 years ago
commit 2c95bae0df
  1. 2
      Sankore_3.1.pro
  2. 21
      resources/forms/preferences.ui
  3. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/config.xml
  4. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/icon.png
  5. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/index.html
  6. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js
  7. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery144.js
  8. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/template2.js
  9. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/master.css
  10. 0
      resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/of_puppets.css
  11. 0
      resources/library/sankoreInteractivities/ord-words.wgt/config.xml
  12. 0
      resources/library/sankoreInteractivities/ord-words.wgt/icon.png
  13. 0
      resources/library/sankoreInteractivities/ord-words.wgt/index.html
  14. 0
      resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js
  15. 0
      resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery144.js
  16. 0
      resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/template2.js
  17. 0
      resources/library/sankoreInteractivities/ord-words.wgt/template/styles/master.css
  18. 0
      resources/library/sankoreInteractivities/ord-words.wgt/template/styles/of_puppets.css
  19. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/config.xml
  20. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/icon.png
  21. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/index.html
  22. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/app.js
  23. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/ext.js
  24. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/jquery144.js
  25. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/wcontainer.js
  26. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/styles/app.css
  27. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/styles/master.css
  28. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-activated.png
  29. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-hover.png
  30. 0
      resources/library/sankoreInteractivities/spl-phrase.wgt/styles/wcontainer.css
  31. 0
      resources/library/sankoreInteractivities/spl-text.wgt/config.xml
  32. 0
      resources/library/sankoreInteractivities/spl-text.wgt/icon.png
  33. 0
      resources/library/sankoreInteractivities/spl-text.wgt/index.html
  34. 0
      resources/library/sankoreInteractivities/spl-text.wgt/scripts/app2.js
  35. 0
      resources/library/sankoreInteractivities/spl-text.wgt/scripts/ext.js
  36. 0
      resources/library/sankoreInteractivities/spl-text.wgt/scripts/jquery144.js
  37. 0
      resources/library/sankoreInteractivities/spl-text.wgt/scripts/wcontainer.js
  38. 0
      resources/library/sankoreInteractivities/spl-text.wgt/styles/app.css
  39. 0
      resources/library/sankoreInteractivities/spl-text.wgt/styles/master.css
  40. 0
      resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-activated.png
  41. 0
      resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-hover.png
  42. 0
      resources/library/sankoreInteractivities/spl-text.wgt/styles/wcontainer.css
  43. 0
      resources/library/sankoreInteractivities/spl-word.wgt/config.xml
  44. 0
      resources/library/sankoreInteractivities/spl-word.wgt/icon.png
  45. 0
      resources/library/sankoreInteractivities/spl-word.wgt/index.html
  46. 0
      resources/library/sankoreInteractivities/spl-word.wgt/scripts/ext.js
  47. 0
      resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery-ui-1.8.9.custom.min.js
  48. 0
      resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery144.js
  49. 0
      resources/library/sankoreInteractivities/spl-word.wgt/scripts/spl-word.js
  50. 0
      resources/library/sankoreInteractivities/spl-word.wgt/scripts/wcontainer.js
  51. 0
      resources/library/sankoreInteractivities/spl-word.wgt/styles/master.css
  52. 0
      resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-activated.png
  53. 0
      resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-hover.png
  54. 0
      resources/library/sankoreInteractivities/spl-word.wgt/styles/spl-word.css
  55. 0
      resources/library/sankoreInteractivities/spl-word.wgt/styles/wcontainer.css
  56. 3
      src/board/UBLibraryController.cpp
  57. 16
      src/core/UBSettings.cpp
  58. 1
      src/core/UBSettings.h

@ -7,7 +7,7 @@ CONFIG += debug_and_release \
no_include_pwd no_include_pwd
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 06 VERSION_MIN = 07
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
VERSION_PATCH = 00 VERSION_PATCH = 00

@ -564,7 +564,7 @@
<item> <item>
<widget class="QTabWidget" name="openSslWidget"> <widget class="QTabWidget" name="openSslWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="openSSlTab"> <widget class="QWidget" name="openSSlTab">
<attribute name="title"> <attribute name="title">
@ -846,7 +846,24 @@ p, li { white-space: pre-wrap; }
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;Sankoré 3.1 version , Copyright (C) year name of author Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY; for details type `show w'.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;Sankoré 3.1 version , Copyright (C) 2010 Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#35382a;&quot;&gt; &lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#35382a;&quot;&gt;This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#35382a;&quot;&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#35382a;&quot;&gt;You should have received a copy of the GNU General Public License along with this program. If not, see &amp;lt;http://www.gnu.org/licenses/&amp;gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_2">
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#3c3c3c;&quot;&gt;GIPENA&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#3c3c3c;&quot;&gt;Délégation Interministérielle à l'Education Numérique en Afrique&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#3c3c3c;&quot;&gt;20 Avenue Ségur Paris 75007&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#3c3c3c;&quot;&gt;Téléphone : 01 43 17 68 08&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#3c3c3c;&quot;&gt;email: &lt;/span&gt;&lt;a href=&quot;mailto:contact@sankore.org&quot;&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;contact@sankore.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

@ -292,6 +292,9 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS
content << listElementsInPath(path.toLocalFile()); content << listElementsInPath(path.toLocalFile());
content << listElementsInPath(UBSettings::settings()->uniboardDefaultUserImageLibraryDirectory()); content << listElementsInPath(UBSettings::settings()->uniboardDefaultUserImageLibraryDirectory());
} }
else if (pPath == mInteractiveCategoryPath.toLocalFile()){
content << listElementsInPath(UBSettings::settings()->sankoreDistributedInteractiveDirectory());
}
return content; return content;
} }

@ -1109,6 +1109,22 @@ QString UBSettings::uniboardInteractiveUserDirectory()
} }
QString UBSettings::sankoreDistributedInteractiveDirectory()
{
QString defaultRelativePath = QString("./library/sankoreInteractivities");
QString configPath = value("Library/DefaultUserImageDirectory", QVariant(defaultRelativePath)).toString();
if (configPath.startsWith("."))
{
return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1);
}
else
{
return configPath;
}
}
QString UBSettings::uniboardInteractiveLibraryDirectory() QString UBSettings::uniboardInteractiveLibraryDirectory()
{ {
QString defaultRelativePath = QString("./library/interactive"); QString defaultRelativePath = QString("./library/interactive");

@ -109,6 +109,7 @@ class UBSettings : public QObject
QString uniboardInteractiveUserDirectory(); QString uniboardInteractiveUserDirectory();
QString uniboardInteractiveLibraryDirectory(); QString uniboardInteractiveLibraryDirectory();
QString uniboardInteractiveFavoritesDirectory(); QString uniboardInteractiveFavoritesDirectory();
QString sankoreDistributedInteractiveDirectory();
QString podcastRecordingDirectory(); QString podcastRecordingDirectory();

Loading…
Cancel
Save