MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into aleksei_kanash_dev

Browse Source
preferencesAboutTextFull
Aleksei Kanash 12 years ago
parent 925efac633 ffc4f1a0bd
commit 0fce6a42c6
41 changed files with 1098 additions and 416 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      JournalDesModifications.pdf
  2. BIN
      ReleaseNotes.pdf
  3. 2
      Sankore_3.1.pro
  4. 19
      resources/i18n/sankore_ar.ts
  5. 19
      resources/i18n/sankore_bg.ts
  6. 19
      resources/i18n/sankore_ca.ts
  7. 19
      resources/i18n/sankore_cs.ts
  8. 19
      resources/i18n/sankore_da.ts
  9. 19
      resources/i18n/sankore_de.ts
  10. 19
      resources/i18n/sankore_el.ts
  11. 19
      resources/i18n/sankore_en.ts
  12. 19
      resources/i18n/sankore_en_UK.ts
  13. 19
      resources/i18n/sankore_es.ts
  14. 432
      resources/i18n/sankore_fr.ts
  15. 432
      resources/i18n/sankore_fr_CH.ts
  16. 19
      resources/i18n/sankore_it.ts
  17. 19
      resources/i18n/sankore_iw.ts
  18. 19
      resources/i18n/sankore_ja.ts
  19. 19
      resources/i18n/sankore_ko.ts
  20. 19
      resources/i18n/sankore_mg.ts
  21. 19
      resources/i18n/sankore_nb.ts
  22. 19
      resources/i18n/sankore_nl.ts
  23. 19
      resources/i18n/sankore_pl.ts
  24. 19
      resources/i18n/sankore_pt.ts
  25. 19
      resources/i18n/sankore_rm.ts
  26. 19
      resources/i18n/sankore_ro.ts
  27. 19
      resources/i18n/sankore_ru.ts
  28. 19
      resources/i18n/sankore_sk.ts
  29. 19
      resources/i18n/sankore_sv.ts
  30. 19
      resources/i18n/sankore_tr.ts
  31. 19
      resources/i18n/sankore_zh.ts
  32. 5
      src/adaptors/UBImportDocument.cpp
  33. 5
      src/board/UBBoardView.cpp
  34. 4
      src/core/UBApplication.cpp
  35. 5
      src/core/UBPersistenceManager.cpp
  36. 2
      src/core/UBPersistenceManager.h
  37. 2
      src/core/main.cpp
  38. 12
      src/domain/UBGraphicsScene.cpp
  39. 3
      src/domain/UBGraphicsWidgetItem.cpp
  40. 8
      src/gui/UBFeaturesWidget.cpp
  41. 8
      src/gui/UBFeaturesWidget.h

BIN
JournalDesModifications.pdf
View File

Binary file not shown.

BIN
ReleaseNotes.pdf
View File

Binary file not shown.

2
Sankore_3.1.pro
Unescape View File

@ -11,7 +11,7 @@ CONFIG += debug_and_release \
VERSION_MAJ = 2 VERSION_MAJ = 2
VERSION_MIN = 00 VERSION_MIN = 00
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
VERSION_PATCH = 07 VERSION_PATCH = 08
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", "")

19
resources/i18n/sankore_ar.ts
Unescape View File

@ -1511,6 +1511,21 @@
<translation type="unfinished">سلة المهملات</translation> <translation type="unfinished">سلة المهملات</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">إلغاء </translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2096,6 +2111,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>تخزين مؤقت</translation> <translation>تخزين مؤقت</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_bg.ts
Unescape View File

@ -1503,6 +1503,21 @@
<translation type="unfinished">Кошче</translation> <translation type="unfinished">Кошче</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Отмени</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2094,6 +2109,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Кеш</translation> <translation>Кеш</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_ca.ts
Unescape View File

@ -1504,6 +1504,21 @@
<translation type="unfinished">Paperera</translation> <translation type="unfinished">Paperera</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancel·la</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2090,6 +2105,10 @@ Voleu ignorar aquests errors per a aquest amfitrió?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Memòria cau</translation> <translation>Memòria cau</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_cs.ts
Unescape View File

@ -1506,6 +1506,21 @@
<translation type="unfinished">Koš</translation> <translation type="unfinished">Koš</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Zrušit</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2097,6 +2112,10 @@ Chcete ignorovat tyto chyby na tomto serveru?</translation>
<source>Magnifier</source> <source>Magnifier</source>
<translation>Lupa</translation> <translation>Lupa</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_da.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Papirkurv</translation> <translation type="unfinished">Papirkurv</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annuller</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_de.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Papierkorb</translation> <translation type="unfinished">Papierkorb</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Abbrechen</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2101,6 +2116,10 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Zwischenspeicher</translation> <translation>Zwischenspeicher</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_el.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Κάδος ανακύκλωσης</translation> <translation type="unfinished">Κάδος ανακύκλωσης</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Άκυρο</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Προβολέας</translation> <translation>Προβολέας</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_en.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_en_UK.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_es.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Papelera</translation> <translation type="unfinished">Papelera</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Caché</translation> <translation>Caché</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

432
resources/i18n/sankore_fr.ts
View File

File diff suppressed because it is too large Load Diff

432
resources/i18n/sankore_fr_CH.ts
View File

File diff suppressed because it is too large Load Diff

19
resources/i18n/sankore_it.ts
Unescape View File

@ -1504,6 +1504,21 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento &apos;%1&apos; selezion
<translation type="unfinished">Cestino</translation> <translation type="unfinished">Cestino</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annulla</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2098,6 +2113,10 @@ risorsa multimediale ...</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_iw.ts
Unescape View File

@ -1499,6 +1499,21 @@
</message> </message>
<message> <message>
<source>Trash</source> <source>Trash</source>
<translation type="unfinished">סל</translation>
</message>
</context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">בטל</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -2088,6 +2103,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>מטמון</translation> <translation>מטמון</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_ja.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished">ゴミ箱</translation> <translation type="unfinished">ゴミ箱</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">キャンセル</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2092,6 +2107,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>キャッシュ</translation> <translation>キャッシュ</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_ko.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished">휴지통</translation> <translation type="unfinished">휴지통</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">취소</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>캐시</translation> <translation>캐시</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_mg.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Daba</translation> <translation type="unfinished">Daba</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Ajanony</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Tena tsy te hiraharaha an&apos;ireo tsy mety ho an&apos;ilay milina ve ianao?</t
<source>Cache</source> <source>Cache</source>
<translation>Tahiry</translation> <translation>Tahiry</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_nb.ts
Unescape View File

@ -1505,6 +1505,21 @@
<translation type="unfinished">Søppel</translation> <translation type="unfinished">Søppel</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Avbryt</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Skjul</translation> <translation>Skjul</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_nl.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Prullenbak</translation> <translation type="unfinished">Prullenbak</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annuleren</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_pl.ts
Unescape View File

@ -1509,6 +1509,21 @@
<translation type="unfinished">Kosz</translation> <translation type="unfinished">Kosz</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Anuluj</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2100,6 +2115,10 @@ Czy chcesz ignorować te błędy dla tego hosta?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Pamięć podręczna</translation> <translation>Pamięć podręczna</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_pt.ts
Unescape View File

@ -1505,6 +1505,21 @@
<translation type="unfinished">Lixo</translation> <translation type="unfinished">Lixo</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2092,6 +2107,10 @@ Quer ignorar estes erros, deste servidor?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_rm.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_ro.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Coş de gunoi</translation> <translation type="unfinished">Coş de gunoi</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Anulare</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Doriţi să ignoraţi aceste erori pentru acest host?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_ru.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Корзина</translation> <translation type="unfinished">Корзина</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Отмена</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Кэш</translation> <translation>Кэш</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_sk.ts
Unescape View File

@ -1506,6 +1506,21 @@
<translation type="unfinished">Kôš</translation> <translation type="unfinished">Kôš</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Zrušiť</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2097,6 +2112,10 @@ Chcete ignorovať tieto chyby na tomto serveri?</translation>
<source>Magnifier</source> <source>Magnifier</source>
<translation>Lupa</translation> <translation>Lupa</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_sv.ts
Unescape View File

@ -1502,6 +1502,21 @@
<translation type="unfinished">Papperskorg</translation> <translation type="unfinished">Papperskorg</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Avsluta</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Vill du ignorera felen för den här värden?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_tr.ts
Unescape View File

@ -1501,6 +1501,21 @@
<translation type="unfinished">Çöp</translation> <translation type="unfinished">Çöp</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">İptal</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Bu host için yukarıdaki hatalar yok sayılsın mı?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Gizli Yer</translation> <translation>Gizli Yer</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

19
resources/i18n/sankore_zh.ts
Unescape View File

@ -1500,6 +1500,21 @@
<translation type="unfinished">回收站</translation> <translation type="unfinished">回收站</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">取消</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>高级缓存</translation> <translation>高级缓存</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

5
src/adaptors/UBImportDocument.cpp
Unescape View File

@ -171,8 +171,11 @@ UBDocumentProxy* UBImportDocument::importFile(const QFile& pFile, const QString&
return NULL; return NULL;
} }
bool addTitlePage = false;
if(UBSettings::settings()->teacherGuidePageZeroActivated->get().toBool() && !QFile(documentRootFolder+"/page000.svg").exists())
addTitlePage=true;
UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder, pGroup); UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder, pGroup, "", false, addTitlePage);
UBApplication::showMessage(tr("Import successful.")); UBApplication::showMessage(tr("Import successful."));
return newDocument; return newDocument;
} }

5
src/board/UBBoardView.cpp
Unescape View File

@ -308,7 +308,6 @@ UBBoardView::event (QEvent * e)
if (gestureEvent) if (gestureEvent)
{ {
QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture)); QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture));
if (swipe) if (swipe)
{ {
if (swipe->horizontalDirection () == QSwipeGesture::Left) if (swipe->horizontalDirection () == QSwipeGesture::Left)
@ -363,9 +362,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
QPointF scenePos = viewportTransform ().inverted ().map (tabletPos); QPointF scenePos = viewportTransform ().inverted ().map (tabletPos);
qreal pressure = 1.0; qreal pressure = 1.0;
if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) && mPenPressureSensitive) || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
&& mPenPressureSensitive)
|| (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
pressure = event->pressure (); pressure = event->pressure ();

4
src/core/UBApplication.cpp
Unescape View File

@ -130,6 +130,8 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
|| args.contains("log"); || args.contains("log");
setupTranslators(args);
UBResources::resources(); UBResources::resources();
if (!undoStack) if (!undoStack)
@ -139,8 +141,6 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
UBSettings *settings = UBSettings::settings(); UBSettings *settings = UBSettings::settings();
setupTranslators(args);
connect(settings->appToolBarPositionedAtTop, SIGNAL(changed(QVariant)), this, SLOT(toolBarPositionChanged(QVariant))); connect(settings->appToolBarPositionedAtTop, SIGNAL(changed(QVariant)), this, SLOT(toolBarPositionChanged(QVariant)));
connect(settings->appToolBarDisplayText, SIGNAL(changed(QVariant)), this, SLOT(toolBarDisplayTextChanged(QVariant))); connect(settings->appToolBarDisplayText, SIGNAL(changed(QVariant)), this, SLOT(toolBarDisplayTextChanged(QVariant)));
updateProtoActionsState(); updateProtoActionsState();

5
src/core/UBPersistenceManager.cpp
Unescape View File

@ -265,7 +265,7 @@ UBDocumentProxy* UBPersistenceManager::createDocument(const QString& pGroupName,
return doc; return doc;
} }
UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName, const QString& pName, bool withEmptyPage) UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName, const QString& pName, bool withEmptyPage, bool addTitlePage)
{ {
checkIfDocumentRepositoryExists(); checkIfDocumentRepositoryExists();
@ -280,7 +280,8 @@ UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDoc
{ {
doc->setMetaData(UBSettings::documentName, pName); doc->setMetaData(UBSettings::documentName, pName);
} }
if (withEmptyPage) createDocumentSceneAt(doc, 0); if(withEmptyPage) createDocumentSceneAt(doc, 0);
if(addTitlePage) persistDocumentScene(doc, mSceneCache.createScene(doc, 0, false), 0);
QMap<QString, QVariant> metadatas = UBMetadataDcSubsetAdaptor::load(pDocumentDirectory); QMap<QString, QVariant> metadatas = UBMetadataDcSubsetAdaptor::load(pDocumentDirectory);

2
src/core/UBPersistenceManager.h
Unescape View File

@ -47,7 +47,7 @@ class UBPersistenceManager : public QObject
static void destroy(); static void destroy();
virtual UBDocumentProxy* createDocument(const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = true); virtual UBDocumentProxy* createDocument(const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = true);
virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = false); virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = false, bool addTitlePage = false);
virtual UBDocumentProxy* persistDocumentMetadata(UBDocumentProxy* pDocumentProxy); virtual UBDocumentProxy* persistDocumentMetadata(UBDocumentProxy* pDocumentProxy);

2
src/core/main.cpp
Unescape View File

@ -129,7 +129,7 @@ int main(int argc, char *argv[])
QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app, SLOT(handleOpenMessage(const QString&))); QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app, SLOT(handleOpenMessage(const QString&)));
qDebug() << fileToOpen; qDebug() << "file name argument" << fileToOpen;
int result = app.exec(fileToOpen); int result = app.exec(fileToOpen);
app.cleanup(); app.cleanup();

12
src/domain/UBGraphicsScene.cpp
Unescape View File

@ -582,8 +582,8 @@ bool UBGraphicsScene::inputDeviceRelease()
addItem(pStrokes); addItem(pStrokes);
mDrawWithCompass = false; mDrawWithCompass = false;
}else if (mCurrentStroke) }
{ else if (mCurrentStroke){
UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup(); UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup();
// Remove the strokes that were just drawn here and replace them by a stroke item // Remove the strokes that were just drawn here and replace them by a stroke item
@ -629,8 +629,8 @@ bool UBGraphicsScene::inputDeviceRelease()
if (mCurrentStroke && mCurrentStroke->polygons().empty()){ if (mCurrentStroke && mCurrentStroke->polygons().empty()){
delete mCurrentStroke; delete mCurrentStroke;
}
mCurrentStroke = NULL; mCurrentStroke = NULL;
}
return accepted; return accepted;
} }
@ -2302,10 +2302,12 @@ void UBGraphicsScene::setToolCursor(int tool)
if (mCurrentStroke && mCurrentStroke->polygons().empty()){ if (mCurrentStroke && mCurrentStroke->polygons().empty()){
delete mCurrentStroke; delete mCurrentStroke;
}
mCurrentStroke = NULL; mCurrentStroke = NULL;
}
} }
void UBGraphicsScene::initStroke(){ void UBGraphicsScene::initStroke()
{
mCurrentStroke = new UBGraphicsStroke(); mCurrentStroke = new UBGraphicsStroke();
} }

3
src/domain/UBGraphicsWidgetItem.cpp
Unescape View File

@ -563,7 +563,8 @@ void UBGraphicsWidgetItem::injectInlineJavaScript()
void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
if (scene()->renderingContext() != UBGraphicsScene::Screen)
if (scene() && scene()->renderingContext() != UBGraphicsScene::Screen)
{ {
painter->drawPixmap(0, 0, snapshot()); painter->drawPixmap(0, 0, snapshot());
} }

8
src/gui/UBFeaturesWidget.cpp
Unescape View File

@ -12,10 +12,6 @@
const char *UBFeaturesWidget::objNamePathList = "PathList"; const char *UBFeaturesWidget::objNamePathList = "PathList";
const char *UBFeaturesWidget::objNameFeatureList = "FeatureList"; const char *UBFeaturesWidget::objNameFeatureList = "FeatureList";
const QString UBFeaturesNewFolderDialog::acceptText = tr("Accept");
const QString UBFeaturesNewFolderDialog::cancelText = tr("Cancel");
const QString UBFeaturesNewFolderDialog::labelText = tr("Enter a new folder name");
const QMargins FeatureListMargins(0, 0, 0, 30); const QMargins FeatureListMargins(0, 0, 0, 30);
const int FeatureListBorderOffset = 10; const int FeatureListBorderOffset = 10;
const char featureTypeSplitter = ':'; const char featureTypeSplitter = ':';
@ -198,7 +194,6 @@ void UBFeaturesWidget::lockIt(bool pLock)
mActionBar->setEnabled(!pLock); mActionBar->setEnabled(!pLock);
pathListView->setEnabled(!pLock); pathListView->setEnabled(!pLock);
centralWidget->setLockedExcludingAdditional(pLock); centralWidget->setLockedExcludingAdditional(pLock);
// pathListView->setLocked(true);
} }
void UBFeaturesWidget::addToFavorite( const UBFeaturesMimeData * mimeData ) void UBFeaturesWidget::addToFavorite( const UBFeaturesMimeData * mimeData )
@ -578,6 +573,9 @@ void UBFeaturesCentralWidget::scanFinished()
} }
UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(parent) UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(parent)
, acceptText(tr("Accept"))
, cancelText(tr("Cancel"))
, labelText(tr("Enter a new folder name"))
{ {
this->setStyleSheet("background:white;"); this->setStyleSheet("background:white;");

8
src/gui/UBFeaturesWidget.h
Unescape View File

@ -226,10 +226,6 @@ class UBFeaturesNewFolderDialog : public QWidget
Q_OBJECT Q_OBJECT
public: public:
static const QString acceptText;
static const QString cancelText;
static const QString labelText;
UBFeaturesNewFolderDialog(QWidget *parent = 0); UBFeaturesNewFolderDialog(QWidget *parent = 0);
void setRegexp(const QRegExp pRegExp); void setRegexp(const QRegExp pRegExp);
bool validString(const QString &pStr); bool validString(const QString &pStr);
@ -249,7 +245,9 @@ private:
QRegExpValidator *mValidator; QRegExpValidator *mValidator;
QStringList mFileNameList; QStringList mFileNameList;
QPushButton *acceptButton; QPushButton *acceptButton;
const QString acceptText;
const QString cancelText;
const QString labelText;
}; };
class UBFeaturesProgressInfo: public QWidget { class UBFeaturesProgressInfo: public QWidget {

Write Preview
Loading…
Cancel
Save