").appendTo($(obj));
+ audio.append(source);
}
}
else {
diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
index 9a64ac27..f0b20bf2 100644
--- a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
+++ b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
@@ -27,7 +27,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Fermer",
+ view: "Afficher",
edit: "Modifier",
example: "Il*était*une*fois*...",
wgt_name: "Ordonner des mots",
diff --git a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
index 8c784eab..60fdb879 100644
--- a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
+++ b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
@@ -27,14 +27,14 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Close",
+ view: "Display",
edit: "Edit",
example: "a*long*,*long*time*ago*...",
wgt_name: "Order words",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
index 6e3e8e8d..e67f008d 100644
--- a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
+++ b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
@@ -140,7 +141,7 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -150,7 +151,7 @@ body{
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -272,7 +273,7 @@ body{
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
index 184102b8..bc8ce88e 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
+++ b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
@@ -26,7 +26,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Fermer",
+ view: "Afficher",
edit: "Modifier",
example: "Cette phrase\nest un\nexemple",
wgt_name: "Ordonner des phrases",
diff --git a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
index d63220b3..09860964 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
+++ b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
@@ -28,13 +28,13 @@ function checkResponse()
var sankoreLang = {
edit: "Edit",
- view: "Close",
+ view: "Display",
example: "this is\nan example\nsentence",
wgt_name: "Order phrases",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
index 741bf47f..06f0d0e3 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
+++ b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
@@ -149,7 +150,7 @@ textarea{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -159,7 +160,7 @@ textarea{
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -281,7 +282,7 @@ textarea{
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Selectionner.wgt/config.xml b/resources/library/interactivities/Selectionner.wgt/config.xml
index 4d53df18..a7ce92c3 100644
--- a/resources/library/interactivities/Selectionner.wgt/config.xml
+++ b/resources/library/interactivities/Selectionner.wgt/config.xml
@@ -4,7 +4,7 @@
id="http://uniboard.mnemis.com/widgets/notes"
version="1.2"
width="950"
- height="400"
+ height="600"
ub:resizable="true">
Notes
diff --git a/resources/library/interactivities/Selectionner.wgt/css/basic.css b/resources/library/interactivities/Selectionner.wgt/css/basic.css
index 7f682d90..8444c1bc 100644
--- a/resources/library/interactivities/Selectionner.wgt/css/basic.css
+++ b/resources/library/interactivities/Selectionner.wgt/css/basic.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
@@ -314,7 +315,7 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -324,7 +325,7 @@ body{
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -446,7 +447,7 @@ body{
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Selectionner.wgt/js/script.js b/resources/library/interactivities/Selectionner.wgt/js/script.js
index 0e96f2eb..d2442c81 100644
--- a/resources/library/interactivities/Selectionner.wgt/js/script.js
+++ b/resources/library/interactivities/Selectionner.wgt/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Close",
+ display: "Display",
edit: "Edit",
short_desc: "Select animals from the following list:",
add: "Add new block",
@@ -11,9 +11,9 @@ var sankoreLang = {
tree: "tree",
wgt_name: "Select the desired",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
index 7cdd8d02..8788b5c3 100644
--- a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Fermer",
+ display: "Afficher",
edit: "Modifier",
short_desc: "Sélectionner les animaux dans la liste suivante :",
add: "Nouveau bloc",
diff --git a/resources/library/interactivities/Separe phrase.wgt/config.xml b/resources/library/interactivities/Separe phrase.wgt/config.xml
index e3550c0b..b6223768 100644
--- a/resources/library/interactivities/Separe phrase.wgt/config.xml
+++ b/resources/library/interactivities/Separe phrase.wgt/config.xml
@@ -5,7 +5,7 @@
id="http://www.example.net/widgets/helloworld"
version="1.0"
width="850"
- height="300"
+ height="350"
ub:resizable="true">
Split a phrase
diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
index e74b586e..910b19f5 100644
--- a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Fermer",
+ view: "Afficher",
edit: "Modifier",
example: "Ceci est une série de mots à séparer correctement",
wgt_name: "Séparer une phrase",
diff --git a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
index 4ed155a6..c8dc3527 100644
--- a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
@@ -1,12 +1,12 @@
var sankoreLang = {
- view: "Close",
+ view: "Display",
edit: "Edit",
example: "this is a bunch of words which should be split apart",
wgt_name: "Split a phrase",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Separe phrase.wgt/styles/app.css b/resources/library/interactivities/Separe phrase.wgt/styles/app.css
index ba022a7e..6583e4ed 100644
--- a/resources/library/interactivities/Separe phrase.wgt/styles/app.css
+++ b/resources/library/interactivities/Separe phrase.wgt/styles/app.css
@@ -109,7 +109,7 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -119,7 +119,7 @@
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -241,7 +241,7 @@
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Separe phrase.wgt/styles/master.css b/resources/library/interactivities/Separe phrase.wgt/styles/master.css
index f08ff509..d7266bc3 100644
--- a/resources/library/interactivities/Separe phrase.wgt/styles/master.css
+++ b/resources/library/interactivities/Separe phrase.wgt/styles/master.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
diff --git a/resources/library/interactivities/Separe texte.wgt/config.xml b/resources/library/interactivities/Separe texte.wgt/config.xml
index e66b26d5..3f3b11a7 100644
--- a/resources/library/interactivities/Separe texte.wgt/config.xml
+++ b/resources/library/interactivities/Separe texte.wgt/config.xml
@@ -5,7 +5,7 @@
id="http://www.example.net/widgets/helloworld"
version="1.0"
width="850"
- height="350"
+ height="400"
ub:resizable="true">
Split a text [alt]
diff --git a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
index 6fa223ee..aa530c77 100644
--- a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Fermer",
+ view: "Afficher",
edit: "Modifier",
example: "bonjour, ceci est la première phrase. salut, c'est la deuxième phrase. bonjour à nouveau, c'est la troisième phrase. bonjour, c'est la quatrième phrase. salut, désolé, je suis en retard, je suis la cinquième phrase.",
wgt_name: "Séparer un texte",
diff --git a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
index 7cc12b34..2a72ced0 100644
--- a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
@@ -1,12 +1,12 @@
var sankoreLang = {
- view: "Close",
+ view: "Display",
edit: "Edit",
example: "hello, this is the first sentence. hi, this is the second sentence. hello again, this is the third sentence. good morning, this is the fourth sentence. hi, sorry, i\'m late, i\'m the fifth sentence.",
wgt_name: "Split a text",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Separe texte.wgt/styles/app.css b/resources/library/interactivities/Separe texte.wgt/styles/app.css
index e96bbf70..288a4cc9 100644
--- a/resources/library/interactivities/Separe texte.wgt/styles/app.css
+++ b/resources/library/interactivities/Separe texte.wgt/styles/app.css
@@ -110,7 +110,7 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -120,7 +120,7 @@
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -242,7 +242,7 @@
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Separe texte.wgt/styles/master.css b/resources/library/interactivities/Separe texte.wgt/styles/master.css
index c1b4e81c..54a64157 100644
--- a/resources/library/interactivities/Separe texte.wgt/styles/master.css
+++ b/resources/library/interactivities/Separe texte.wgt/styles/master.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
diff --git a/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
index 1b8db4ef..7d0ac0f7 100644
--- a/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Fermer",
+ view: "Afficher",
edit: "Modifier",
example: "so*phis*ti*qué",
wgt_name: "Syllabe",
diff --git a/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js b/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
index 62742d3a..26d16a89 100644
--- a/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
@@ -1,12 +1,12 @@
var sankoreLang = {
- view: "Close",
+ view: "Display",
edit: "Edit",
example: "so*phis*ti*ca*ted",
wgt_name: "Split a word",
reload: "Reload",
- slate: "Wood",
- pad: "Pad",
- none: "None",
+ slate: "slate",
+ pad: "pad",
+ none: "none",
help: "Help",
help_content: "This is an example of help content ...",
theme: "Theme"
diff --git a/resources/library/interactivities/Syllabes.wgt/styles/master.css b/resources/library/interactivities/Syllabes.wgt/styles/master.css
index c9d9a0c1..2cad7c05 100644
--- a/resources/library/interactivities/Syllabes.wgt/styles/master.css
+++ b/resources/library/interactivities/Syllabes.wgt/styles/master.css
@@ -5,6 +5,7 @@ html, body{
padding: 0;
border-radius: 35px;
overflow: hidden;
+ font-family: sans-serif;
}
body{
diff --git a/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css b/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
index 417d0ef3..5ef9ca2f 100644
--- a/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
+++ b/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
@@ -111,7 +111,7 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
@@ -121,7 +121,7 @@
cursor: pointer;
margin: 10px 10px 0 0;
float: right;
- font-family: Arial,Helvetica,sans-serif;
+ font-family: sans-serif;
font-size: 24px;
line-height: 32px;
}
@@ -243,7 +243,7 @@
.inline{
display: inline-block;
- font-family: "helvetica neue";
+ font-family: sans-serif;
font-size: 14px;
color: #666;
}
diff --git a/resources/library/interactivities/Tables.wgt/config.xml b/resources/library/interactivities/Tables.wgt/config.xml
index e2f25d1b..53363997 100644
--- a/resources/library/interactivities/Tables.wgt/config.xml
+++ b/resources/library/interactivities/Tables.wgt/config.xml
@@ -3,9 +3,9 @@
xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://www.njin.fr/sankore/apps/tableur"
version="1.0"
- width="805"
- height="624"
- ub:resizable="true">
+ width="850"
+ height="750"
+ ub:resizable="false">
Tableur
njin
diff --git a/resources/library/interactivities/Tables.wgt/i18n/Messages.properties b/resources/library/interactivities/Tables.wgt/i18n/Messages.properties
index f1554a6b..dcd09b6a 100644
--- a/resources/library/interactivities/Tables.wgt/i18n/Messages.properties
+++ b/resources/library/interactivities/Tables.wgt/i18n/Messages.properties
@@ -1,7 +1,7 @@
fr.njin.i18n.document.title = Table
fr.njin.i18n.toolbar.edit = Edit
-fr.njin.i18n.toolbar.view = Close
+fr.njin.i18n.toolbar.view = Display
fr.njin.i18n.toolbar.reload = Reload
fr.njin.i18n.toolbar.help = Help
diff --git a/resources/library/interactivities/Train.wgt/config.xml b/resources/library/interactivities/Train.wgt/config.xml
index 818f4047..e529ce1c 100644
--- a/resources/library/interactivities/Train.wgt/config.xml
+++ b/resources/library/interactivities/Train.wgt/config.xml
@@ -4,7 +4,7 @@
id="http://www.njin.fr/sankore/apps/Le train"
version="1.0"
width="940"
- height="340"
+ height="580"
ub:resizable="false">
Le train
diff --git a/resources/library/interactivities/Train.wgt/i18n/Messages.properties b/resources/library/interactivities/Train.wgt/i18n/Messages.properties
index 865b413b..54cab973 100644
--- a/resources/library/interactivities/Train.wgt/i18n/Messages.properties
+++ b/resources/library/interactivities/Train.wgt/i18n/Messages.properties
@@ -1,7 +1,7 @@
fr.njin.i18n.document.title = Le train
fr.njin.i18n.toolbar.edit = Edit
-fr.njin.i18n.toolbar.view = Close
+fr.njin.i18n.toolbar.view = Display
fr.njin.i18n.toolbar.reload = Reload
fr.njin.i18n.toolbar.help = Help
diff --git a/resources/library/search/Image Planete.wgs/index.html b/resources/library/search/Image Planete.wgs/index.html
index 8e7214a5..375d9b94 100755
--- a/resources/library/search/Image Planete.wgs/index.html
+++ b/resources/library/search/Image Planete.wgs/index.html
@@ -69,7 +69,7 @@
var iHeight = $("Title " +
parent.find("input:hidden").eq(4).val() +
+ " thumbnailUrl " +
+ parent.find("input:hidden").eq(5).val() +
" Cadran opératoire
diff --git a/resources/nonDistributed/Cadran.wgt/css/main.css b/resources/nonDistributed/Cadran.wgt/css/main.css
index fb8fc908..2cebaf48 100644
--- a/resources/nonDistributed/Cadran.wgt/css/main.css
+++ b/resources/nonDistributed/Cadran.wgt/css/main.css
@@ -27,7 +27,8 @@
margin-top: -215px;
margin-left: -215px;
- -webkit-transition: all 0.25s ease-in-out;
+ /*OPEN SANKORE bug sur cette animation*/
+ /*-webkit-transition: all 0.25s ease-in-out;*/
}
.hide {
@@ -115,10 +116,6 @@
text-align: center;
}
-.result {
- -webkit-perspective: 600px;
-}
-
.result > div {
width: 60px;
font-size: 50px;
@@ -145,6 +142,29 @@
font-size: 24px;
}
+
+#result > div > div:first-child {
+ display: block;
+}
+
+#result > div > div:last-child {
+ display: none;
+}
+
+#result.flip > div > div:first-child {
+ display: none;
+}
+
+#result.flip > div > div:last-child {
+ display: block;
+}
+
+/*OPEN SANKORE bug sur cette animation*/
+/*
+.csstransforms3d .result {
+ -webkit-perspective: 600px;
+}
+
.csstransforms3d #result > div > div {
-webkit-transform-style: preserve-3d !important;
-webkit-transition: all .5s ease-in-out;
@@ -181,4 +201,5 @@
.no-csstransforms3d #result.flip > div > div:last-child {
display: block;
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties b/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties
index d7320d54..a6d4c263 100644
--- a/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties
+++ b/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties
@@ -1,7 +1,7 @@
fr.njin.i18n.document.title = Cadran opératoire
fr.njin.i18n.toolbar.edit = Edit
-fr.njin.i18n.toolbar.view = Close
+fr.njin.i18n.toolbar.view = Display
fr.njin.i18n.toolbar.reload = Reload
fr.njin.i18n.toolbar.help = Help
diff --git a/resources/nonDistributed/Memory.wgt/i18n/Messages.properties b/resources/nonDistributed/Memory.wgt/i18n/Messages.properties
index 48ade354..c610dea9 100644
--- a/resources/nonDistributed/Memory.wgt/i18n/Messages.properties
+++ b/resources/nonDistributed/Memory.wgt/i18n/Messages.properties
@@ -1,6 +1,6 @@
fr.njin.i18n.document.title = Memory
-fr.njin.i18n.toolbar.edit = Edit
+fr.njin.i18n.toolbar.edit = Display
fr.njin.i18n.toolbar.view = Close
fr.njin.i18n.toolbar.reload = Reload
fr.njin.i18n.toolbar.help = Help
diff --git a/resources/nonDistributed/Memory.wgt/js/help_fr-template.js b/resources/nonDistributed/Memory.wgt/js/help_fr-template.js
index 1f95a69d..1d15950e 100644
--- a/resources/nonDistributed/Memory.wgt/js/help_fr-template.js
+++ b/resources/nonDistributed/Memory.wgt/js/help_fr-template.js
@@ -1,27 +1,16 @@
Memory
-Jeu d’association de cartes.
+Calcul mental, jeu d’association de cartes
+L’App Memory a pour but de faire des paires tout en mémorisant l’emplacement des différentes cartes.
+Les cartes sont retournées face contre table de façon à ce que les images ne soient pas visibles. Le joueur découvre 2 cartes. Si elles sont identiques, elles restent découvertes. Si elles sont différentes, elles se retournent à nouveau.
+La partie est terminée quand toutes les paires ont été trouvées.
-L’interactivité Memory a pour but de faire des paires tout en mémorisant l’emplacement des différentes cartes.
-
-Les cartes sont retournées face contre table, de manière à ce que les images ne soient pas visibles. Le joueur découvre 2 cartes. Si elles sont identiques, elles restent découvertes. Si elles sont différentes, elles se retournent à nouveau. La partie est terminée quand toutes les paires ont été trouvées.
-
-Les cartes sont disposées de manière aléatoire dans le mode jeu.
-L’interactivité est capable d’identifier les écritures mathématiques équivalentes (signes autorisés : “+”, “*”, “-”, “/” et les parenthèses). Evitez toutefois la division par 0.
-
-Le bouton “Recharger” réinitialise le memory.
-
-
-Le bouton “Modifier” vous permet :
+Le bouton "éditer" vous permet de :
-de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut tablette),
-de choisir le nombre de cartes (4, 6 ou 8 cartes),
-de sélectionner le délai d’affichage des cartes retournées,
-d’éditer directement une carte (insérer une image ou modifier le texte).
-
-Les paires de cartes sont en colonne (même chiffre indiqué sous chaque carte).
-Les cartes possèdent par défaut un champ texte.
-Pour insérer du texte, cliquez sur la carte et saisissez le texte désiré.
-Pour utiliser des images, cochez la case “utiliser une image” et glissez-déposez sur la carte l’image depuis votre bibliothèque.
-Le bouton bleu permet de simuler l’activité.
-
-Le bouton “Afficher” vous permet d’utiliser l’activité.
+ modifier le thème de l'interactivité : tablette, ardoise ou aucun (par défaut tablette),
+ choisir le nombre de cartes (4, 6 ou 8 cartes),
+ sélectionner le délai d’affichage des cartes retournées,
+ éditer directement une carte.
+
+Les cartes possèdent par défaut un champ texte. Pour insérer du texte, cliquez sur cette dernière et saisissez le texte désiré. Pour ajouter une image depuis votre bibliothèque, cochez la case “utiliser une image” et utilisez le glisser-déposer. Il faut au préalable retourner la carte avec le bouton bleu.
+Les cartes sont disposées de manière aléatoire dans le mode jeu.
+L’App est capable d’identifier les écritures mathématiques équivalentes (signes autorisés : “+”, “*”, “-”, “/” et les parenthèses).
\ No newline at end of file
diff --git a/resources/nonDistributed/Morpion.wgt/js/help_fr-template.js b/resources/nonDistributed/Morpion.wgt/js/help_fr-template.js
deleted file mode 100644
index 214d3d76..00000000
--- a/resources/nonDistributed/Morpion.wgt/js/help_fr-template.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Morpion
-Version calcul mental.
-
-Les joueurs choisissent, répondent et font valider tour à tour une opération dans une case.
-Une fois la réponse saisie, le bouton “v” permet de vérifier la réponse. L’interactivité calcule l’opération et vérifie la réponse.
-
-Si la réponse est correcte, la case est marquée d’une croix (X) ou d’un cercle (O) selon le joueur.
-Si la réponse est fausse, l’autre joueur prend la main.
-Le nom du joueur figure à gauche : JOUEUR 1 (X), JOUEUR 2 (O) .
-Le premier joueur qui réussit à aligner trois de ses symboles (X ou O) gagne la partie.
-
-Le bouton “Recharger” permet de recommencer le jeu.
-
-
-Le bouton “Modifier” vous permet :
-
-de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut tablette),
-modifier les calculs que vous voulez utiliser pour votre activité.
-
-Insérez simplement le calcul dans chaque zone.Le résultat des opérations n’est pas à inscrire dans le mode Edition, il est calculé automatiquement par l‘interactivité.
-L’interactivité est capable d’identifier les écritures mathématiques (signes autorisés : “+”, “*”, “-”, “/” et les parenthèses).
diff --git a/resources/library/interactivities/Transformation.wgt/config.xml b/resources/nonDistributed/Transformation.wgt/config.xml
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/config.xml
rename to resources/nonDistributed/Transformation.wgt/config.xml
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/demo.html
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/demo.html
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/stylesheet.css
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css
rename to resources/nonDistributed/Transformation.wgt/css/fonts/Lobster/stylesheet.css
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/demo.html
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/demo.html
diff --git a/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/stylesheet.css
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css
rename to resources/nonDistributed/Transformation.wgt/css/fonts/SF-Toontime/stylesheet.css
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/bg.png b/resources/nonDistributed/Transformation.wgt/css/images/bg.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/box-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/box-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/box-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/box-bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/card-closed-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/card-closed-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/card-closed-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/card-closed-bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/drop-label-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/drop-label-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/drop-label-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/drop-label-bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/drop-label-ondrop-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/drop-label-ondrop-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/drop-label-ondrop-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/drop-label-ondrop-bg.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png b/resources/nonDistributed/Transformation.wgt/css/images/pad-bd.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png
rename to resources/nonDistributed/Transformation.wgt/css/images/pad-bd.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/parameters-bg.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/parameters-bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/pile-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/pile-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/pile-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/pile-bg.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/images/pile-with-card-bg.png b/resources/nonDistributed/Transformation.wgt/css/images/pile-with-card-bg.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/images/pile-with-card-bg.png
rename to resources/nonDistributed/Transformation.wgt/css/images/pile-with-card-bg.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png b/resources/nonDistributed/Transformation.wgt/css/images/slate-bd.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png
rename to resources/nonDistributed/Transformation.wgt/css/images/slate-bd.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-edit.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png
rename to resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-edit.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-help.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png
rename to resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-help.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-reload.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png
rename to resources/nonDistributed/Transformation.wgt/css/images/slate-toolbar-reload.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Transformation.wgt/css/images/toolbar-edit.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png
rename to resources/nonDistributed/Transformation.wgt/css/images/toolbar-edit.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Transformation.wgt/css/images/toolbar-help.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png
rename to resources/nonDistributed/Transformation.wgt/css/images/toolbar-help.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Transformation.wgt/css/images/toolbar-reload.png
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png
rename to resources/nonDistributed/Transformation.wgt/css/images/toolbar-reload.png
diff --git a/resources/library/interactivities/Transformation.wgt/css/main.css b/resources/nonDistributed/Transformation.wgt/css/main.css
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/css/main.css
rename to resources/nonDistributed/Transformation.wgt/css/main.css
diff --git a/resources/nonDistributed/Morpion.wgt/css/ubw-help.css b/resources/nonDistributed/Transformation.wgt/css/ubw-help.css
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/ubw-help.css
rename to resources/nonDistributed/Transformation.wgt/css/ubw-help.css
diff --git a/resources/nonDistributed/Morpion.wgt/css/ubw-main.css b/resources/nonDistributed/Transformation.wgt/css/ubw-main.css
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/css/ubw-main.css
rename to resources/nonDistributed/Transformation.wgt/css/ubw-main.css
diff --git a/resources/nonDistributed/Morpion.wgt/help.html b/resources/nonDistributed/Transformation.wgt/help.html
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/help.html
rename to resources/nonDistributed/Transformation.wgt/help.html
diff --git a/resources/library/interactivities/Transformation.wgt/i18n/Messages.properties b/resources/nonDistributed/Transformation.wgt/i18n/Messages.properties
similarity index 86%
rename from resources/library/interactivities/Transformation.wgt/i18n/Messages.properties
rename to resources/nonDistributed/Transformation.wgt/i18n/Messages.properties
index c3174740..a0805a72 100644
--- a/resources/library/interactivities/Transformation.wgt/i18n/Messages.properties
+++ b/resources/nonDistributed/Transformation.wgt/i18n/Messages.properties
@@ -1,7 +1,7 @@
fr.njin.i18n.document.title = Magic box
fr.njin.i18n.toolbar.edit = Edit
-fr.njin.i18n.toolbar.view = Close
+fr.njin.i18n.toolbar.view = Display
fr.njin.i18n.toolbar.reload = Reload
fr.njin.i18n.toolbar.help = Help
diff --git a/resources/library/interactivities/Transformation.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Transformation.wgt/i18n/Messages_fr.properties
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/i18n/Messages_fr.properties
rename to resources/nonDistributed/Transformation.wgt/i18n/Messages_fr.properties
diff --git a/resources/library/interactivities/Transformation.wgt/icon.png b/resources/nonDistributed/Transformation.wgt/icon.png
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/icon.png
rename to resources/nonDistributed/Transformation.wgt/icon.png
diff --git a/resources/library/interactivities/Transformation.wgt/index.html b/resources/nonDistributed/Transformation.wgt/index.html
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/index.html
rename to resources/nonDistributed/Transformation.wgt/index.html
diff --git a/resources/library/interactivities/Transformation.wgt/js/help-template.js b/resources/nonDistributed/Transformation.wgt/js/help-template.js
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/js/help-template.js
rename to resources/nonDistributed/Transformation.wgt/js/help-template.js
diff --git a/resources/library/interactivities/Transformation.wgt/js/help_fr-template.js b/resources/nonDistributed/Transformation.wgt/js/help_fr-template.js
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/js/help_fr-template.js
rename to resources/nonDistributed/Transformation.wgt/js/help_fr-template.js
diff --git a/resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Transformation.wgt/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js
rename to resources/nonDistributed/Transformation.wgt/js/lib/jquery-1.7.1.min.js
diff --git a/resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Transformation.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
rename to resources/nonDistributed/Transformation.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
diff --git a/resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js b/resources/nonDistributed/Transformation.wgt/js/lib/modernizr.js
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js
rename to resources/nonDistributed/Transformation.wgt/js/lib/modernizr.js
diff --git a/resources/nonDistributed/Morpion.wgt/js/lib/mustache.js b/resources/nonDistributed/Transformation.wgt/js/lib/mustache.js
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/js/lib/mustache.js
rename to resources/nonDistributed/Transformation.wgt/js/lib/mustache.js
diff --git a/resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Transformation.wgt/js/lib/ubw-main.js
similarity index 100%
rename from resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js
rename to resources/nonDistributed/Transformation.wgt/js/lib/ubw-main.js
diff --git a/resources/library/interactivities/Transformation.wgt/js/main.js b/resources/nonDistributed/Transformation.wgt/js/main.js
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/js/main.js
rename to resources/nonDistributed/Transformation.wgt/js/main.js
diff --git a/resources/library/interactivities/Transformation.wgt/js/templates.js b/resources/nonDistributed/Transformation.wgt/js/templates.js
similarity index 100%
rename from resources/library/interactivities/Transformation.wgt/js/templates.js
rename to resources/nonDistributed/Transformation.wgt/js/templates.js
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index d4c920af..8392dc68 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -853,7 +853,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
UBGraphicsAppleWidgetItem* appleWidgetItem = graphicsAppleWidgetFromSvg();
if (appleWidgetItem)
{
- appleWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true);
+ // appleWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true);
appleWidgetItem->setFlag(QGraphicsItem::ItemIsSelectable, true);
appleWidgetItem->resize(foreignObjectWidth, foreignObjectHeight);
@@ -877,7 +877,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
if (w3cWidgetItem)
{
- w3cWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true);
+ // w3cWidgetItem->setFlag(QGraphicsItem::ItemIsMovable, true);
w3cWidgetItem->setFlag(QGraphicsItem::ItemIsSelectable, true);
w3cWidgetItem->resize(foreignObjectWidth, foreignObjectHeight);
@@ -1000,27 +1000,24 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup()
{
UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem();
- QMultiMap strokesGroupsContainer;
- QList groupContainer;
- QString currentStrokeIdentifier;
-
- QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString());
+ QMultiMap strokesGroupsContainer;
+ QList groupContainer;
mXmlReader.readNext();
- while (!mXmlReader.atEnd())
+ while (!mXmlReader.atEnd())
{
if (mXmlReader.isEndElement()) {
mXmlReader.readNext();
break;
} else if (mXmlReader.isStartElement())
{
- if (mXmlReader.name() == tGroup)
+ if (mXmlReader.name() == tGroup)
{
qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId);
UBGraphicsGroupContainerItem *curGroup = readGroup();
- if (curGroup)
+ if (curGroup)
groupContainer.append(curGroup);
- }
+ }
else if (mXmlReader.name() == tElement)
{
QString id = mXmlReader.attributes().value(aId).toString();
@@ -1460,7 +1457,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)
QVector dataStorageItems;
if(elements.value("teacherGuide"))
- dataStorageItems = elements.value("teacherGuide")->save(pageIndex);
+ dataStorageItems = elements.value("teacherGuide")->save(pageIndex);
foreach(tIDataStorage* eachItem, dataStorageItems){
if(eachItem->type == eElementType_START){
mXmlWriter.writeStartElement(eachItem->name);
@@ -2294,7 +2291,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::videoItemToLinkedVideo(UBGraphicsMed
videoFileHref = UBFileSystemUtils::removeLocalFilePrefix(videoFileHref);
if(videoFileHref.startsWith(mDocumentPath))
videoFileHref = videoFileHref.replace(mDocumentPath + "/","");
-
+
mXmlWriter.writeAttribute(nsXLink, "href", videoFileHref);
mXmlWriter.writeEndElement();
}
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 56cd4ec1..496a1b0b 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -998,30 +998,30 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c
|| contentType.startsWith("application/widget")
|| contentType.startsWith("application/vnd.apple-widget");
- if (shouldLoadFileData)
- {
+ if (shouldLoadFileData)
+ {
QFile file(fileName);
file.open(QIODevice::ReadOnly);
downloadFinished(true, formedUrl, QUrl(), contentType, file.readAll(), pPos, pSize, isBackground, internalData);
file.close();
- }
- else
- {
- // media items should be copyed in separate thread
-
- sDownloadFileDesc desc;
- desc.modal = false;
- desc.srcUrl = sUrl;
- desc.originalSrcUrl = contentSourceUrl;
- desc.currentSize = 0;
- desc.name = QFileInfo(url.toString()).fileName();
- desc.totalSize = 0; // The total size will be retrieved during the download
- desc.pos = pPos;
- desc.size = pSize;
- desc.isBackground = isBackground;
-
- UBDownloadManager::downloadManager()->addFileToDownload(desc);
- }
+ }
+ else
+ {
+ // media items should be copyed in separate thread
+
+ sDownloadFileDesc desc;
+ desc.modal = false;
+ desc.srcUrl = sUrl;
+ desc.originalSrcUrl = contentSourceUrl;
+ desc.currentSize = 0;
+ desc.name = QFileInfo(url.toString()).fileName();
+ desc.totalSize = 0; // The total size will be retrieved during the download
+ desc.pos = pPos;
+ desc.size = pSize;
+ desc.isBackground = isBackground;
+
+ UBDownloadManager::downloadManager()->addFileToDownload(desc);
+ }
}
else
{
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 612813cd..78f3241a 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -148,8 +148,8 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
// RIGHT palette widgets
#ifndef USE_WEB_WIDGET
mpFeaturesWidget = new UBFeaturesWidget();
- mRightPalette->registerWidget(mpFeaturesWidget);
- mRightPalette->addTab(mpFeaturesWidget);
+ mRightPalette->registerWidget(mpFeaturesWidget);
+ mRightPalette->addTab(mpFeaturesWidget);
#endif
//Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget
@@ -332,15 +332,15 @@ void UBBoardPaletteManager::pagePaletteButtonReleased()
{
if( mPageButtonPressedTime.msecsTo(QTime::currentTime()) > 900)
{
- // The palette is reinstanciated because the duplication depends on the current scene
- delete(mPagePalette);
- mPagePalette = 0;
- QListpageActions;
- pageActions << UBApplication::mainWindow->actionNewPage;
- UBBoardController* boardController = UBApplication::boardController;
- if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){
- pageActions << UBApplication::mainWindow->actionDuplicatePage;
- }
+ // The palette is reinstanciated because the duplication depends on the current scene
+ delete(mPagePalette);
+ mPagePalette = 0;
+ QListpageActions;
+ pageActions << UBApplication::mainWindow->actionNewPage;
+ UBBoardController* boardController = UBApplication::boardController;
+ if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){
+ pageActions << UBApplication::mainWindow->actionDuplicatePage;
+ }
pageActions << UBApplication::mainWindow->actionImportPage;
mPagePalette = new UBActionPalette(pageActions, Qt::Horizontal , mContainer);
@@ -351,9 +351,9 @@ void UBBoardPaletteManager::pagePaletteButtonReleased()
// As we recreate the pagePalette every time, we must reconnect the slots
connect(UBApplication::mainWindow->actionNewPage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
- connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
- connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
- connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed()));
+ connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
+ connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
+ connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed()));
togglePagePalette(true);
}
@@ -955,7 +955,7 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
bool bVertical = var.toBool();
bool bVisible = mStylusPalette->isVisible();
- // Clean the old palette
+ // Clean the old palette
if(NULL != mStylusPalette)
{
// TODO : check why this line creates a crash in the application.
@@ -995,7 +995,6 @@ void UBBoardPaletteManager::startDownloads()
mDownloadInProgress = true;
mpDownloadWidget->setVisibleState(true);
mRightPalette->addTab(mpDownloadWidget);
- mpDownloadWidget;
}
}
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 1d68cc8a..1fef53e1 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -100,7 +100,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, int pStartLayer, int p
mStartLayer = pStartLayer;
mEndLayer = pEndLayer;
- mFilterZIndex = true;
+ mFilterZIndex = true;
mLongPressTimer.setInterval(mLongPressInterval);
mLongPressTimer.setSingleShot(true);
@@ -288,7 +288,7 @@ UBBoardView::keyPressEvent (QKeyEvent *event)
void UBBoardView::keyReleaseEvent(QKeyEvent *event)
{
// if (!event->isAccepted ())
- {
+ {
if (Qt::Key_Shift == event->key()
||Qt::Key_Control == event->key())
{
@@ -430,7 +430,7 @@ bool UBBoardView::itemHaveParentWithType(QGraphicsItem *item, int type)
if (type == item->type())
return true;
-
+
return itemHaveParentWithType(item->parentItem(), type);
}
@@ -447,7 +447,7 @@ bool UBBoardView::isUBItem(QGraphicsItem *item)
void UBBoardView::handleItemsSelection(QGraphicsItem *item)
{
// we need to select new pressed itemOnBoard and deselect all other items.
-// the trouble is in:
+// the trouble is in:
// some items can has parents (groupped items or strokes, or strokes in groups).
// some items is already selected and we don't need to reselect them
//
@@ -458,11 +458,11 @@ void UBBoardView::handleItemsSelection(QGraphicsItem *item)
// item has group as first parent - it is any item or UBGraphicsStrokesGroup.
if(item->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())
return;
-
+
// delegate buttons shouldn't selected
if (DelegateButton::Type == item->type())
return;
-
+
// click on svg items (images on Frame) shouldn't change selection.
if (QGraphicsSvgItem::Type == item->type())
return;
@@ -470,8 +470,8 @@ void UBBoardView::handleItemsSelection(QGraphicsItem *item)
// Delegate frame shouldn't selected
if (UBGraphicsDelegateFrame::Type == item->type())
return;
-
-
+
+
// if we need to uwe multiple selection - we shouldn't deselect other items.
if (!isMultipleSelectionEnabled())
{
@@ -495,8 +495,8 @@ void UBBoardView::handleItemsSelection(QGraphicsItem *item)
bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
{
/*
-Some items should receive mouse press events averytime,
-some items should receive that events when they are selected,
+Some items should receive mouse press events averytime,
+some items should receive that events when they are selected,
some items shouldn't receive mouse press events at mouse press, but should receive them at mouse release (suspended mouse press event)
Here we determines cases when items should to get mouse press event at pressing on mouse.
@@ -559,9 +559,9 @@ Here we determines cases when items should to get mouse press event at pressing
return true;
case UBGraphicsWidgetItem::Type:
- if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected())
+ if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected())
return true;
- if (currentTool == UBStylusTool::Selector && item->isSelected())
+ if (currentTool == UBStylusTool::Selector && item->isSelected())
return true;
if (currentTool == UBStylusTool::Play)
return true;
@@ -574,7 +574,7 @@ Here we determines cases when items should to get mouse press event at pressing
bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
{
- if (!item)
+ if (!item)
return false;
if (item == scene()->backgroundObject())
@@ -594,7 +594,7 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
if (currentTool == UBStylusTool::Selector && item->isSelected())
return true;
break;
-
+
case DelegateButton::Type:
case UBGraphicsMediaItem::Type:
return true;
@@ -606,7 +606,7 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
{
- if (!item)
+ if (!item)
return false;
if (item == scene()->backgroundObject())
@@ -614,15 +614,15 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
if (!(mMouseButtonIsPressed || mTabletStylusIsPressed))
return false;
-
+
if (movingItem->data(UBGraphicsItemData::ItemLocked).toBool())
return false;
if (movingItem->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type() && !movingItem->isSelected() && movingItem->parentItem()->isSelected())
return false;
- UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
-
+ UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
+
switch(item->type())
{
case UBGraphicsCurtainItem::Type:
@@ -630,7 +630,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
return true;
case UBGraphicsWidgetItem::Type:
- if(currentTool == UBStylusTool::Selector && item->isSelected())
+ if(currentTool == UBStylusTool::Selector && item->isSelected())
return false;
if(currentTool == UBStylusTool::Play)
return false;
@@ -640,7 +640,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
if (item->isSelected())
return false;
case UBGraphicsMediaItem::Type:
- case UBGraphicsStrokesGroup::Type:
+ case UBGraphicsStrokesGroup::Type:
return true;
case UBGraphicsTextItem::Type:
return !item->isSelected();
@@ -654,13 +654,13 @@ QGraphicsItem* UBBoardView::determineItemToPress(QGraphicsItem *item)
{
if(item)
{
- UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
-
+ UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
+
// if item is on group and group is not selected - group should take press.
- if (UBStylusTool::Selector == currentTool
- && item->parentItem()
- && UBGraphicsGroupContainerItem::Type == item->parentItem()->type()
- && !item->parentItem()->isSelected())
+ if (UBStylusTool::Selector == currentTool
+ && item->parentItem()
+ && UBGraphicsGroupContainerItem::Type == item->parentItem()->type()
+ && !item->parentItem()->isSelected())
return item->parentItem();
// items like polygons placed in two groups nested, so we need to recursive call.
@@ -676,7 +676,7 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item)
{
if(item)
{
- UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
+ UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
//W3C widgets should take mouse move events from play tool.
if ((UBStylusTool::Play == currentTool) && (UBGraphicsWidgetItem::Type == item->type()))
@@ -696,7 +696,7 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item)
// selected groups should be moved by moving any element
if (item->parentItem()->isSelected())
return item;
-
+
if (item->isSelected())
return NULL;
@@ -704,7 +704,7 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item)
}
// items like polygons placed in two groups nested, so we need to recursive call.
- if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type())
+ if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type())
return determineItemToMove(item->parentItem());
}
@@ -715,7 +715,7 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
{
mLastPressedMousePos = mapToScene(event->pos());
- // Determining item who will take mouse press event
+ // Determining item who will take mouse press event
//all other items will be deselected and if all item will be deselected, then
// wrong item can catch mouse press. because selected items placed on the top
movingItem = determineItemToPress(movingItem);
@@ -738,7 +738,7 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
delete suspendedMousePressEvent;
suspendedMousePressEvent = NULL;
}
-
+
if (itemShouldReceiveSuspendedMousePressEvent(movingItem))
{
suspendedMousePressEvent = new QMouseEvent(event->type(), event->pos(), event->button(), event->buttons(), event->modifiers());
@@ -752,7 +752,7 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
movingItem = determineItemToMove(movingItem);
// items should be moved not every mouse move.
- if (movingItem && itemShouldBeMoved(movingItem) && (mMouseButtonIsPressed || mTabletStylusIsPressed))
+ if (movingItem && itemShouldBeMoved(movingItem) && (mMouseButtonIsPressed || mTabletStylusIsPressed))
{
QPointF scenePos = mapToScene(event->pos());
QPointF newPos = movingItem->pos() + scenePos - mLastPressedMousePos;
@@ -761,7 +761,7 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
mWidgetMoved = true;
event->accept();
}
- else
+ else
{
QPointF posBeforeMove;
QPointF posAfterMove;
@@ -777,11 +777,10 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
mWidgetMoved = ((posAfterMove-posBeforeMove).manhattanLength() != 0);
// a cludge for terminate moving of w3c widgets.
- // in some cases w3c widgets catches mouse move and doesn't sends that events to web page,
+ // in some cases w3c widgets catches mouse move and doesn't sends that events to web page,
// at simple - in google map widget - mouse move events doesn't comes to web page from rectangle of wearch bar on bottom right corner of widget.
if (mWidgetMoved && UBGraphicsW3CWidgetItem::Type == movingItem->type())
movingItem->setPos(posBeforeMove);
-
}
}
@@ -801,7 +800,7 @@ void UBBoardView::moveRubberedItems(QPointF movingVector)
{
QRectF invalidateRect = scene()->itemsBoundingRect();
- foreach (QGraphicsItem *item, mRubberedItems)
+ foreach (QGraphicsItem *item, mRubberedItems)
{
if (item->type() == UBGraphicsW3CWidgetItem::Type
@@ -810,10 +809,10 @@ void UBBoardView::moveRubberedItems(QPointF movingVector)
|| item->type() == UBGraphicsSvgItem::Type
|| item->type() == UBGraphicsTextItem::Type
|| item->type() == UBGraphicsStrokesGroup::Type
- || item->type() == UBGraphicsGroupContainerItem::Type)
+ || item->type() == UBGraphicsGroupContainerItem::Type)
{
- item->setPos(item->pos()+movingVector);
- }
+ item->setPos(item->pos()+movingVector);
+ }
}
scene()->invalidate(invalidateRect);
@@ -829,7 +828,7 @@ void UBBoardView::longPressEvent()
UBDrawingController *drawingController = UBDrawingController::drawingController();
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
-
+
disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
if (UBStylusTool::Selector == currentTool)
@@ -899,7 +898,7 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
if (!movingItem && !mController->cacheIsVisible())
mLongPressTimer.start();
-
+
if (!movingItem) {
// Rubberband selection implementation
if (!mUBRubberBand) {
@@ -986,7 +985,7 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
void
UBBoardView::mouseMoveEvent (QMouseEvent *event)
{
- if(!mIsDragInProgress && ((mapToScene(event->pos()) - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance()))
+ if(!mIsDragInProgress && ((mapToScene(event->pos()) - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance()))
{
return;
}
@@ -1077,14 +1076,14 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
else
{
if (!mTabletStylusIsPressed && scene ())
- {
+ {
scene ()->inputDeviceMove (mapToScene (UBGeometryUtils::pointConstrainedInRect (event->pos (), rect ())), mMouseButtonIsPressed);
}
event->accept ();
}
- if((event->pos() - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance())
- mWidgetMoved = true;
+ if((event->pos() - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance())
+ mWidgetMoved = true;
}
void
@@ -1105,9 +1104,9 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
mWidgetMoved = false;
movingItem = NULL;
}
- else
+ else
if (movingItem)
- {
+ {
if (suspendedMousePressEvent)
{
QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop
@@ -1140,7 +1139,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
movingItem->setSelected(true);
}
-
+
}
}
}
@@ -1163,7 +1162,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
}
else
{
- if (suspendedMousePressEvent)
+ if (suspendedMousePressEvent)
{
QGraphicsView::mousePressEvent(suspendedMousePressEvent); // suspendedMousePressEvent is deleted by old Qt event loop
movingItem = NULL;
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index b39017ce..53e72d5a 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -642,19 +642,31 @@ void UBFeaturesController::importImage(const QImage &image, const QString &fileN
void UBFeaturesController::importImage( const QImage &image, const UBFeature &destination, const QString &fileName )
{
QString mFileName = fileName;
+ QString filePath;
+ UBFeature dest = destination;
if (mFileName.isNull()) {
QDateTime now = QDateTime::currentDateTime();
- mFileName = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+ static int imageCounter = 0;
+ mFileName = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss");
+
+ filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
+
+ if (QFile::exists(filePath+".png"))
+ mFileName += QString("-[%1]").arg(++imageCounter);
+ else
+ imageCounter = 0;
+
+ mFileName += ".png";
}
+
- UBFeature dest = destination;
if ( !destination.getFullVirtualPath().startsWith( picturesElement.getFullVirtualPath(), Qt::CaseInsensitive ) )
{
dest = picturesElement;
}
- QString filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
+ filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
image.save(filePath);
QImage thumb = createThumbnail( filePath );
@@ -723,7 +735,7 @@ UBFeature UBFeaturesController::getDestinationFeatureForUrl( const QUrl &url )
return audiosElement;
if ( mimetype.contains("video") )
return moviesElement;
- else if ( mimetype.contains("image") )
+ else if ( mimetype.contains("image") || mimetype.isEmpty())
return picturesElement;
else if ( mimetype.contains("application") )
{
@@ -739,13 +751,32 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
{
UBFeature dest = getDestinationFeatureForUrl(sourceUrl);
+ //TODO:claudio check this
if (dest == UBFeature())
return;
- QString fileName = QFileInfo( sourceUrl.toString() ).fileName();
- QString filePath = dest.getFullPath().toLocalFile() + "/" + fileName;
+ QString fileName("");
+ QString filePath("");
+
+ if(UBFileSystemUtils::mimeTypeFromFileName( sourceUrl.toString() ).isEmpty()){
+ fileName = tr("ImportedImage") + "-" + QDateTime::currentDateTime().toString("dd-MM-yyyy hh-mm-ss")+ ".jpg";
+ filePath = dest.getFullPath().toLocalFile() + "/" + fileName;
+ QImage::fromData(pData).save(filePath);
- QFile file( filePath );
+ UBFeature downloadedFeature = UBFeature(dest.getFullVirtualPath() + "/" + fileName, getIcon( filePath, fileTypeFromUrl(filePath)),
+ fileName, QUrl::fromLocalFile(filePath), FEATURE_ITEM);
+ if (downloadedFeature != UBFeature()) {
+ featuresModel->addItem(downloadedFeature);
+ }
+
+ }
+ else{
+ fileName = QFileInfo( sourceUrl.toString() ).fileName();
+ filePath = dest.getFullPath().toLocalFile() + "/" + fileName;
+
+
+
+ QFile file( filePath );
if ( file.open(QIODevice::WriteOnly ))
{
file.write(pData);
@@ -757,6 +788,7 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
featuresModel->addItem(downloadedFeature);
}
}
+ }
}
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index 580ef897..f673cc35 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -476,6 +476,8 @@ void UBApplication::closing()
if (webController)
webController->closing();
+ UBSettings::settings()->closing();
+
UBSettings::settings()->appToolBarPositionedAtTop->set(mainWindow->toolBarArea(mainWindow->boardToolBar) == Qt::TopToolBarArea);
quit();
diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index 6a07b0bf..d241772b 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -148,12 +148,14 @@ void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
{
if (mDisplayWidget)
{
+ mDisplayWidget->hide();
pDisplayWidget->setGeometry(mDisplayWidget->geometry());
pDisplayWidget->setWindowFlags(mDisplayWidget->windowFlags());
}
mDisplayWidget = pDisplayWidget;
mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
- mDisplayWidget->showFullScreen();
+ if (UBSettings::settings()->appUseMultiscreen->get().toBool())
+ mDisplayWidget->showFullScreen();
// !!!! Should be included into Windows after QT recompilation
#ifdef Q_WS_MAC
// mDisplayWidget->setAttribute(Qt::WA_MacNoShadow);
diff --git a/src/core/UBDownloadManager.cpp b/src/core/UBDownloadManager.cpp
index e120038a..74207826 100644
--- a/src/core/UBDownloadManager.cpp
+++ b/src/core/UBDownloadManager.cpp
@@ -33,19 +33,18 @@ UBAsyncLocalFileDownloader::UBAsyncLocalFileDownloader(sDownloadFileDesc desc, Q
UBAsyncLocalFileDownloader *UBAsyncLocalFileDownloader::download()
{
- if (!QFile::exists(QUrl(mDesc.srcUrl).toLocalFile())) {
- qDebug() << "file" << mDesc.srcUrl << "does not present in fs";
- return this;
- }
-
start();
-
return this;
}
void UBAsyncLocalFileDownloader::run()
{
+ if(mDesc.srcUrl.startsWith("file://"))
+ mDesc.srcUrl = QUrl(mDesc.srcUrl).toLocalFile();
+ else
+ mDesc.srcUrl = QUrl::fromLocalFile(mDesc.srcUrl).toLocalFile();
+
QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mDesc.srcUrl);
int position=mimeType.indexOf(";");
@@ -67,7 +66,7 @@ void UBAsyncLocalFileDownloader::run()
QString uuid = QUuid::createUuid();
UBPersistenceManager::persistenceManager()->addFileToDocument(UBApplication::boardController->selectedDocument(),
- QUrl(mDesc.srcUrl).toLocalFile(),
+ mDesc.srcUrl,
destDirectory,
uuid,
mTo,
diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp
index dae490b6..64fb3b20 100644
--- a/src/core/UBPreferencesController.cpp
+++ b/src/core/UBPreferencesController.cpp
@@ -67,8 +67,6 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog);
mPreferencesUI = new Ui::preferencesDialog(); // deleted in
mPreferencesUI->setupUi(mPreferencesWindow);
- connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged()));
- connect(mPreferencesUI->Password_textEdit, SIGNAL(editingFinished()), this, SLOT(onCommunityPasswordChanged()));
wire();
}
@@ -76,7 +74,7 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
UBPreferencesController::~UBPreferencesController()
{
- delete mPreferencesWindow;
+ delete mPreferencesWindow;
delete mPreferencesUI;
@@ -161,6 +159,12 @@ void UBPreferencesController::wire()
connect(mMarkerProperties->pressureSensitiveCheckBox, SIGNAL(clicked(bool)), settings, SLOT(setMarkerPressureSensitive(bool)));
connect(mMarkerProperties->opacitySlider, SIGNAL(valueChanged(int)), this, SLOT(opacitySliderChanged(int)));
+
+ //network
+ connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged()));
+ connect(mPreferencesUI->Password_textEdit, SIGNAL(editingFinished()), this, SLOT(onCommunityPasswordChanged()));
+ connect(mPreferencesUI->PSCredentialsPersistenceCheckBox,SIGNAL(clicked()),this, SLOT(onCommunityPersistenceChanged()));
+
// about tab
connect(mPreferencesUI->checkSoftwareUpdateAtLaunchCheckBox, SIGNAL(clicked(bool)), settings->appEnableAutomaticSoftwareUpdates, SLOT(setBool(bool)));
}
@@ -212,18 +216,36 @@ void UBPreferencesController::init()
mMarkerProperties->opacitySlider->setValue(settings->boardMarkerAlpha->get().toDouble() * 100);
+ //network
+ mPreferencesUI->PSCredentialsPersistenceCheckBox->setChecked(settings->getCommunityDataPersistence());
+ persistanceCheckboxUpdate();
+
}
void UBPreferencesController::onCommunityUsernameChanged()
{
UBSettings* settings = UBSettings::settings();
settings->setCommunityUsername(mPreferencesUI->Username_textBox->text());
+ persistanceCheckboxUpdate();
}
void UBPreferencesController::onCommunityPasswordChanged()
{
UBSettings* settings = UBSettings::settings();
settings->setCommunityPassword(mPreferencesUI->Password_textEdit->text());
+ persistanceCheckboxUpdate();
+}
+
+void UBPreferencesController::onCommunityPersistenceChanged()
+{
+ UBSettings::settings()->setCommunityPersistence(mPreferencesUI->PSCredentialsPersistenceCheckBox->isChecked());
+}
+
+void UBPreferencesController::persistanceCheckboxUpdate()
+{
+ bool checkBoxEnabled = mPreferencesUI->Username_textBox->text().length() || mPreferencesUI->Password_textEdit->text().length();
+ mPreferencesUI->PSCredentialsPersistenceCheckBox->setEnabled(checkBoxEnabled);
+ mPreferencesUI->PSCredentialsPersistenceCheckBox->setStyleSheet(checkBoxEnabled ? "color:black;" : "color:lightgray;");
}
diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h
index 3dc8c536..7ce7e0e9 100644
--- a/src/core/UBPreferencesController.h
+++ b/src/core/UBPreferencesController.h
@@ -83,12 +83,14 @@ class UBPreferencesController : public QObject
void toolbarOrientationHorizontal(bool checked);
void onCommunityUsernameChanged();
void onCommunityPasswordChanged();
+ void onCommunityPersistenceChanged();
private:
static qreal sSliderRatio;
static qreal sMinPenWidth;
static qreal sMaxPenWidth;
+ void persistanceCheckboxUpdate();
};
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 5bc973a3..77142126 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -173,7 +173,7 @@ void UBSettings::ValidateKeyboardPaletteKeyBtnSize()
{
// if boardKeyboardPaletteKeyBtnSize is not initialized, or supportedKeyboardSizes not initialized or empty
if( !boardKeyboardPaletteKeyBtnSize ||
- !supportedKeyboardSizes ||
+ !supportedKeyboardSizes ||
supportedKeyboardSizes->size() == 0 ) return;
// get original size value
@@ -243,7 +243,7 @@ void UBSettings::init()
pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3));
pageDpi = new UBSetting(this, "Board", "pageDpi", 0);
-
+
QStringList penLightBackgroundColors;
penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#C87400" << "#800040" << "#008080" << "#5F2D0A";
boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0);
@@ -350,6 +350,7 @@ void UBSettings::init()
podcastPublishToYoutube = new UBSetting(this, "Podcast", "PublishToYouTube", false);
youTubeUserEMail = new UBSetting(this, "YouTube", "UserEMail", "");
+ youTubeCredentialsPersistence = new UBSetting(this,"YouTube", "CredentialsPersistence",false);
uniboardWebEMail = new UBSetting(this, "UniboardWeb", "EMail", "");
uniboardWebAuthor = new UBSetting(this, "UniboardWeb", "Author", "");
@@ -357,6 +358,7 @@ void UBSettings::init()
communityUser = new UBSetting(this, "Community", "Username", "");
communityPsw = new UBSetting(this, "Community", "Password", "");
+ communityCredentialsPersistence = new UBSetting(this,"Community", "CredentialsPersistence",false);
QStringList uris = UBToolsManager::manager()->allToolIDs();
@@ -383,7 +385,7 @@ void UBSettings::init()
intranetPodcastPublishingUrl = new UBSetting(this, "IntranetPodcast", "PublishingUrl", "");
intranetPodcastAuthor = new UBSetting(this, "IntranetPodcast", "Author", "");
- KeyboardLocale = new UBSetting(this, "Board", "StartupKeyboardLocale", 0);
+ KeyboardLocale = new UBSetting(this, "Board", "StartupKeyboardLocale", 0);
swapControlAndDisplayScreens = new UBSetting(this, "App", "SwapControlAndDisplayScreens", false);
angleTolerance = new UBSetting(this, "App", "AngleTolerance", 4);
@@ -392,6 +394,8 @@ void UBSettings::init()
teacherGuideLessonPagesActivated = new UBSetting(this,"DockPalette","TeacherGuideActivateLessonPages",true);
libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize);
+
+ cleanNonPersistentSettings();
}
@@ -401,7 +405,7 @@ QVariant UBSettings::value ( const QString & key, const QVariant & defaultValue)
{
sAppSettings->setValue(key, defaultValue);
}
-
+
return mUserSettings->value(key, sAppSettings->value(key, defaultValue));
}
@@ -944,7 +948,7 @@ QString UBSettings::applicationImageLibraryDirectory()
{
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);
@@ -1180,12 +1184,17 @@ void UBSettings::setCommunityPassword(const QString &password)
communityPsw->set(QVariant(password));
}
+void UBSettings::setCommunityPersistence(const bool persistence)
+{
+ communityCredentialsPersistence->set(QVariant(persistence));
+}
+
int UBSettings::libraryIconSize(){
- return libIconSize->get().toInt();
+ return libIconSize->get().toInt();
}
void UBSettings::setLibraryIconsize(const int& size){
- libIconSize->set(QVariant(size));
+ libIconSize->set(QVariant(size));
}
bool UBSettings::checkDirectory(QString& dirPath)
@@ -1218,3 +1227,20 @@ QString UBSettings::replaceWildcard(QString& path)
return result;
}
+void UBSettings::closing()
+{
+ cleanNonPersistentSettings();
+}
+
+void UBSettings::cleanNonPersistentSettings()
+{
+ if(!communityCredentialsPersistence->get().toBool()){
+ communityPsw->set(QVariant(""));
+ communityUser->set(QVariant(""));
+ }
+
+ if(!youTubeCredentialsPersistence->get().toBool()){
+ removePassword(youTubeUserEMail->get().toString());
+ youTubeUserEMail->set(QVariant(""));
+ }
+}
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index 1567acbf..32e353d9 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -29,13 +29,14 @@ class UBSettings : public QObject
UBSettings(QObject *parent = 0);
virtual ~UBSettings();
+ void cleanNonPersistentSettings();
public:
QStringList* supportedKeyboardSizes;
void InitKeyboardPaletteKeyBtnSizes();
void ValidateKeyboardPaletteKeyBtnSize();
-
+ void closing();
int penWidthIndex();
@@ -95,12 +96,14 @@ class UBSettings : public QObject
void setCommunityUsername(const QString& username);
QString communityPassword();
void setCommunityPassword(const QString& password);
+ bool getCommunityDataPersistence(){return communityCredentialsPersistence->get().toBool();}
+ void setCommunityPersistence(const bool persistence);
int libraryIconSize();
void setLibraryIconsize(const int& size);
void init();
-
+
//user directories
static QString userDataDirectory();
static QString userDocumentDirectory();
@@ -115,9 +118,9 @@ class UBSettings : public QObject
static QString userInteractiveFavoritesDirectory();
static QString userPodcastRecordingDirectory();
- QString userGipLibraryDirectory();
-
- //application directory
+ QString userGipLibraryDirectory();
+
+ //application directory
QString applicationShapeLibraryDirectory();
QString applicationImageLibraryDirectory();
QString applicationApplicationsLibraryDirectory();
@@ -302,6 +305,7 @@ class UBSettings : public QObject
UBSetting* podcastPublishToYoutube;
UBSetting* youTubeUserEMail;
+ UBSetting* youTubeCredentialsPersistence;
UBSetting* uniboardWebEMail;
UBSetting* uniboardWebAuthor;
@@ -337,6 +341,7 @@ class UBSettings : public QObject
UBSetting* communityUser;
UBSetting* communityPsw;
+ UBSetting* communityCredentialsPersistence;
UBSetting* pageSize;
UBSetting* pageDpi;
diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp
index 71351090..24a17ffc 100644
--- a/src/domain/UBGraphicsDelegateFrame.cpp
+++ b/src/domain/UBGraphicsDelegateFrame.cpp
@@ -243,7 +243,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle)
QSize cursorSize(45,30);
-
+
QImage mask_img(cursorSize, QImage::Format_Mono);
mask_img.fill(0xff);
QPainter mask_ptr(&mask_img);
@@ -252,7 +252,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle)
QBitmap bmpMask = QBitmap::fromImage(mask_img);
- QPixmap pixCursor(cursorSize);
+ QPixmap pixCursor(cursorSize);
pixCursor.fill(QColor(Qt::white));
QPainter painter(&pixCursor);
@@ -293,12 +293,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos()
QPointF fixedPoint;
if (!moving() && !rotating())
{
- if (resizingTop())
+ if (resizingTop())
{
if (mMirrorX && mMirrorY)
{
if ((0 < mAngle) && (mAngle < 90))
- fixedPoint = delegated()->sceneBoundingRect().topLeft();
+ fixedPoint = delegated()->sceneBoundingRect().topLeft();
else
fixedPoint = delegated()->sceneBoundingRect().topRight();
}
@@ -310,12 +310,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos()
fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
}
}
- else if (resizingLeft())
+ else if (resizingLeft())
{
if (mMirrorX && mMirrorY)
{
if ((0 < mAngle) && (mAngle < 90))
- fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
+ fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
else
fixedPoint = delegated()->sceneBoundingRect().topLeft();
}
@@ -337,14 +337,14 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
qreal dPosX = 0;
qreal dPosY = 0;
- if (resizingTop())
+ if (resizingTop())
{
if (mMirrorX && mMirrorY)
dPosY = moveY;
else
dPosY = -moveY;
}
- else if (resizingLeft())
+ else if (resizingLeft())
{
if (mMirrorX && mMirrorY)
dPosX = moveX;
@@ -354,7 +354,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
else if (resizingRight())
dPosX = (mMirrorX) ? -moveX : moveX;
- else if (resizingBottom())
+ else if (resizingBottom())
dPosY = mMirrorY ? -moveY : moveY;
return QSizeF(dPosX, dPosY);
@@ -363,7 +363,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
{
QSizeF incVector;
- mFixedPoint = getFixedPointFromPos();
+ mFixedPoint = getFixedPointFromPos();
UBResizableGraphicsItem* resizableItem = dynamic_cast(delegated());
if (resizableItem)
@@ -382,15 +382,10 @@ QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
}
-void UBGraphicsDelegateFrame::scaleByPos(qreal scaleX, qreal scaleY)
-{
-
-}
-
void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
if (None == mCurrentTool)
- return;
+ return;
QLineF move = QLineF(mStartingPoint, event->scenePos());
qreal moveX = move.length() * cos((move.angle() - mAngle) * PI / 180);
@@ -399,7 +394,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
qreal height = delegated()->boundingRect().height() * mTotalScaleY;
if (mOperationMode == Scaling)
- {
+ {
if(!rotating())
{
mTranslateX = moveX;
@@ -504,7 +499,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
}
}
-
+
if (rotating())
{
mTranslateX = 0;
@@ -597,7 +592,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
delegated()->setTransform(buildTransform());
}
else // resizing/resizing horizontally
- {
+ {
if (resizingBottomRight())
{
@@ -609,9 +604,9 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
else
mCurrentTool = ResizeBottom;
- incV = resizeDelegate(moveX, moveY);
+ incV = resizeDelegate(moveX, moveY);
mOriginalSize += incV;
-
+
if (mMirrorX && mMirrorY)
mCurrentTool = ResizeLeft;
else
@@ -623,7 +618,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
mFixedPoint = getFixedPointFromPos();
- incH = resizeDelegate(moveX, moveY);
+ incH = resizeDelegate(moveX, moveY);
mOriginalSize -= incV;
mOriginalSize += incH;
@@ -631,7 +626,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
mCurrentTool = ResizeBottomRight;
}
else
- resizeDelegate(moveX, moveY);
+ resizeDelegate(moveX, moveY);
}
event->accept();
}
@@ -660,11 +655,11 @@ void UBGraphicsDelegateFrame::prepareFramesToMove(QListprepareLinkedFrameToMove();
- }
+ }
}
void UBGraphicsDelegateFrame::prepareLinkedFrameToMove()
-{
+{
mDelegate->startUndoStep();
mStartingPoint = QPointF(0,0);
@@ -685,12 +680,12 @@ void UBGraphicsDelegateFrame::prepareLinkedFrameToMove()
void UBGraphicsDelegateFrame::moveLinkedItems(QLineF movingVector, bool bLinked)
{
if (bLinked)
- {
+ {
mCurrentTool = Move;
mTranslateX = movingVector.dx();
mTranslateY = movingVector.dy();
-
+
delegated()->setTransform(buildTransform(), false);
}
else
@@ -777,7 +772,7 @@ void UBGraphicsDelegateFrame::setVisible(bool visible)
void UBGraphicsDelegateFrame::positionHandles()
{
QRectF itemRect = delegated()->boundingRect();
-
+
if (mDelegate->getToolBarItem() && mDelegate->getToolBarItem()->isVisibleOnBoard()
&& mDelegate->getToolBarItem()->isShifting())
{
diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h
index e171358b..87c11863 100644
--- a/src/domain/UBGraphicsDelegateFrame.h
+++ b/src/domain/UBGraphicsDelegateFrame.h
@@ -40,7 +40,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
QPointF getFixedPointFromPos();
QSizeF getResizeVector(qreal moveX, qreal moveY);
QSizeF resizeDelegate(qreal moveX, qreal moveY);
- void scaleByPos(qreal scaleX, qreal scaleY);
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 99bfe301..7eb8a3ea 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -303,12 +303,10 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta
UBGraphicsScene::~UBGraphicsScene()
{
- if (mCurrentStroke)
- if (mCurrentStroke->polygons().empty())
- {
- delete mCurrentStroke;
- mCurrentStroke = NULL;
- }
+ if (mCurrentStroke && mCurrentStroke->polygons().empty()){
+ delete mCurrentStroke;
+ mCurrentStroke = NULL;
+ }
if (mZLayerController)
delete mZLayerController;
@@ -437,7 +435,7 @@ bool UBGraphicsScene::inputDevicePress(const QPointF& scenePos, const qreal& pre
}
if (mCurrentStroke && mCurrentStroke->polygons().empty()){
- delete mCurrentStroke;
+ delete mCurrentStroke;
mCurrentStroke = NULL;
}
@@ -800,7 +798,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
}
}
else if (eraserPath.intersects(itemPainterPath))
- {
+ {
QPainterPath newPath = itemPainterPath.subtracted(eraserPath);
#pragma omp critical
@@ -820,7 +818,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
else
{
UBGraphicsPolygonItem *pi = intersectedItems[i];
-
+
for(int j = 0; j < intersectedPolygons[i].size(); j++)
{
QPolygonF p = intersectedPolygons[i][j];
@@ -2295,7 +2293,7 @@ void UBGraphicsScene::createPointer()
void UBGraphicsScene::setToolCursor(int tool)
{
if (tool == (int)UBStylusTool::Selector ||
- tool == (int)UBStylusTool::Text ||
+ tool == (int)UBStylusTool::Text ||
tool == (int)UBStylusTool::Play)
{
deselectAllItems();
@@ -2310,5 +2308,5 @@ void UBGraphicsScene::setToolCursor(int tool)
void UBGraphicsScene::initStroke()
{
- mCurrentStroke = new UBGraphicsStroke();
+ mCurrentStroke = new UBGraphicsStroke();
}
diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp
index 7d43c949..bb184956 100644
--- a/src/domain/UBGraphicsWidgetItem.cpp
+++ b/src/domain/UBGraphicsWidgetItem.cpp
@@ -48,7 +48,7 @@ UBGraphicsWidgetItem::UBGraphicsWidgetItem(const QUrl &pWidgetUrl, QGraphicsItem
: QGraphicsWebView(parent)
, mInitialLoadDone(false)
, mIsFreezable(true)
- , mIsResizable(false)
+ , mIsResizable(false)
, mLoadIsErronous(false)
, mCanBeContent(0)
, mCanBeTool(0)
@@ -56,7 +56,7 @@ UBGraphicsWidgetItem::UBGraphicsWidgetItem(const QUrl &pWidgetUrl, QGraphicsItem
, mIsFrozen(false)
, mIsTakingSnapshot(false)
, mShouldMoveWidget(false)
- , mUniboardAPI(0)
+ , mUniboardAPI(0)
{
setData(UBGraphicsItemData::ItemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
@@ -119,7 +119,7 @@ void UBGraphicsWidgetItem::initialize()
void UBGraphicsWidgetItem::onLinkClicked(const QUrl& url)
{
- UBApplication::webController->loadUrl(url);
+ load(url);
}
void UBGraphicsWidgetItem::initialLayoutCompleted()
@@ -147,24 +147,6 @@ QString UBGraphicsWidgetItem::mainHtmlFileName()
return mMainHtmlFileName;
}
-bool UBGraphicsWidgetItem::hasEmbededObjects()
-{
- if (page()->mainFrame()) {
- QList htmlObjects = UBWebKitUtils::objectsInFrame(page()->mainFrame());
- return htmlObjects.length() > 0;
- }
-
- return false;
-}
-
-bool UBGraphicsWidgetItem::hasEmbededFlash()
-{
- if (hasEmbededObjects())
- return page()->mainFrame()->toHtml().contains("application/x-shockwave-flash");
- else
- return false;
-}
-
bool UBGraphicsWidgetItem::canBeContent()
{
// if we under MAC OS
@@ -324,18 +306,18 @@ bool UBGraphicsWidgetItem::hasLoadedSuccessfully() const
return (mInitialLoadDone && !mLoadIsErronous);
}
-bool UBGraphicsWidgetItem::freezable()
-{
+bool UBGraphicsWidgetItem::freezable()
+{
return mIsFreezable;
}
bool UBGraphicsWidgetItem::resizable()
-{
+{
return mIsResizable;
-}
+}
bool UBGraphicsWidgetItem::isFrozen()
-{
+{
return mIsFrozen;
}
@@ -351,7 +333,7 @@ QPixmap UBGraphicsWidgetItem::takeSnapshot()
QPixmap pixmap(size().toSize());
pixmap.fill(Qt::transparent);
QPainter painter(&pixmap);
-
+
QStyleOptionGraphicsItem options;
paint(&painter, &options);
@@ -497,7 +479,7 @@ bool UBGraphicsWidgetItem::event(QEvent *event)
event->accept();
return true;
}
- }
+ }
else if (event->type() == QEvent::ShortcutOverride)
event->accept();
@@ -813,7 +795,7 @@ UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphi
if (roles.contains("tmac"))
mCanBeTool |= UBGraphicsWidgetItem::type_MAC;
-
+
if (roles.contains("tunix"))
mCanBeTool |= UBGraphicsWidgetItem::type_UNIX;
@@ -886,9 +868,6 @@ UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphi
/* is it a valid local file ? */
QFile f(mMainHtmlUrl.toLocalFile());
- qDebug() << mMainHtmlFileName;
- qDebug() << mMainHtmlUrl.toLocalFile();
-
if(!f.exists())
mMainHtmlUrl = QUrl(mMainHtmlFileName);
@@ -1108,11 +1087,11 @@ QString UBGraphicsW3CWidgetItem::freezedWidgetPage()
if (!wrapperFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug() << "can't open wrapper file " + freezedWidgetDefaultContentFilePath;
defaultcontent = "";
- }
+ }
else {
QByteArray arr = wrapperFile.readAll();
if (!arr.isEmpty())
- defaultcontent = QString(arr);
+ defaultcontent = QString(arr);
else {
qDebug() << "content of " + freezedWidgetDefaultContentFilePath + "is empty";
defaultcontent = QString();
diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h
index 412dbad8..0d214aae 100644
--- a/src/domain/UBGraphicsWidgetItem.h
+++ b/src/domain/UBGraphicsWidgetItem.h
@@ -62,14 +62,11 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
QUrl widgetUrl();
QString mainHtmlFileName();
- bool hasEmbededObjects();
- bool hasEmbededFlash();
-
bool canBeContent();
bool canBeTool();
QString preference(const QString& key) const;
- void setPreference(const QString& key, QString value);
+ void setPreference(const QString& key, QString value);
QMap preferences() const;
void removePreference(const QString& key);
void removeAllPreferences();
@@ -94,7 +91,7 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
virtual void setUuid(const QUuid &pUuid);
- QSize nominalSize() const;
+ QSize nominalSize() const;
bool hasLoadedSuccessfully() const;
@@ -110,7 +107,7 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
virtual UBGraphicsScene* scene();
static int widgetType(const QUrl& pUrl);
- static QString widgetName(const QUrl& pUrl);
+ static QString widgetName(const QUrl& pUrl);
static QString iconFilePath(const QUrl& pUrl);
public slots:
@@ -127,7 +124,7 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
type_ALL = 7, // 0111
};
- bool mFirstReleaseAfterMove;
+ bool mFirstReleaseAfterMove;
bool mInitialLoadDone;
bool mIsFreezable;
bool mIsResizable;
@@ -137,7 +134,7 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
int mCanBeTool;
QSize mNominalSize;
QString mMainHtmlFileName;
- QUrl mMainHtmlUrl;
+ QUrl mMainHtmlUrl;
QUrl mWidgetUrl;
QMap mDatastore;
QMap mPreferences;
@@ -162,21 +159,21 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe
void mainFrameLoadFinished(bool ok);
private slots:
- void onLinkClicked(const QUrl& url);
+ void onLinkClicked(const QUrl& url);
void initialLayoutCompleted();
private:
bool mIsFrozen;
bool mIsTakingSnapshot;
- bool mShouldMoveWidget;
+ bool mShouldMoveWidget;
UBWidgetUniboardAPI* mUniboardAPI;
QPixmap mSnapshot;
QPointF mLastMousePos;
QUrl ownFolder;
- QUrl SnapshotFile;
+ QUrl SnapshotFile;
static bool sInlineJavaScriptLoaded;
- static QStringList sInlineJavaScripts;
+ static QStringList sInlineJavaScripts;
};
class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
@@ -185,11 +182,11 @@ class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
public:
UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
- ~UBGraphicsAppleWidgetItem();
+ ~UBGraphicsAppleWidgetItem();
virtual void copyItemParameters(UBItem *copy) const;
virtual void setUuid(const QUuid &pUuid);
- virtual UBItem* deepCopy() const;
+ virtual UBItem* deepCopy() const;
};
class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
@@ -205,7 +202,7 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
{
/* NOOP */
}
-
+
PreferenceValue(const QString& pValue, bool pReadonly)
{
@@ -230,13 +227,13 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
};
UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
- ~UBGraphicsW3CWidgetItem();
+ ~UBGraphicsW3CWidgetItem();
virtual void setUuid(const QUuid &pUuid);
virtual UBItem* deepCopy() const;
virtual void copyItemParameters(UBItem *copy) const;
QMap preferences();
- Metadata metadatas() const;
+ Metadata metadatas() const;
static QString freezedWidgetFilePath();
static QString createNPAPIWrapper(const QString& url, const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150), const QString& pName = QString());
@@ -255,11 +252,11 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
static QString textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale);
UBW3CWidgetAPI* mW3CWidgetAPI;
- QMap mPreferences;
+ QMap mPreferences;
static bool sTemplateLoaded;
static QString sNPAPIWrappperConfigTemplate;
- static QMap sNPAPIWrapperTemplates;
+ static QMap sNPAPIWrapperTemplates;
};
#endif // UBGRAPHICSWIDGETITEM_H
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 6ee337cf..fff1e8c9 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -47,7 +47,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
//Bottom actionbar for DnD, quick search etc
mActionBar = new UBFeaturesActionBar(controller, this);
-
+
//Filling main layout
layout->addWidget(pathListView);
layout->addWidget(centralWidget);
@@ -153,7 +153,7 @@ void UBFeaturesWidget::deleteElements( const UBFeaturesMimeData * mimeData )
return;
QList featuresList = mimeData->features();
-
+
foreach ( UBFeature curFeature, featuresList ) {
if ( curFeature.inTrash()) {
controller->deleteItem(curFeature.getFullPath());
@@ -170,9 +170,14 @@ void UBFeaturesWidget::deleteSelectedElements()
{
QModelIndexList selected = centralWidget->listView()->selectionModel()->selectedIndexes();
- foreach ( QModelIndex sel, selected )
+ QList featureasToMove;
+ for (int i = 0; i < selected.count(); i++)
+ {
+ featureasToMove.append(controller->getFeature(selected.at(i), objNameFeatureList));
+ }
+
+ foreach (UBFeature feature, featureasToMove)
{
- UBFeature feature = sel.data(Qt::UserRole + 1).value();
if (feature.isDeletable()) {
if (feature.inTrash()) {
controller->deleteItem(feature);
@@ -181,7 +186,8 @@ void UBFeaturesWidget::deleteSelectedElements()
}
}
}
- controller->refreshModels();
+
+ controller->refreshModels();
}
void UBFeaturesWidget::rescanModel()
@@ -223,38 +229,45 @@ void UBFeaturesWidget::removeFromFavorite( const UBFeaturesMimeData * mimeData )
void UBFeaturesWidget::onDisplayMetadata( QMap metadata )
{
- QString previewImageUrl;
+ QString previewImageUrl = ":images/libpalette/notFound.png";
- switch (static_cast(UBFileSystemUtils::mimeTypeFromUrl(QUrl(metadata["Url"]))))
- {
- case UBMimeType::RasterImage:
- case UBMimeType::VectorImage:
- {
- previewImageUrl = ":images/libpalette/loading.png";
-
- if (!imageGatherer)
- imageGatherer = new UBDownloadHttpFile(0, this);
+ QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toAscii()).toString()/*metadata.value("Url", QString())*/;
+ QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toAscii()).toString();
- connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)));
+ QString strType = UBFileSystemUtils::mimeTypeFromFileName(widgetsUrl);
+ UBMimeType::Enum thumbType = UBFileSystemUtils::mimeTypeFromString(strType);
- // We send here the request and store its reply in order to be able to cancel it if needed
- imageGatherer->get(QUrl(metadata["Url"]), QPoint(0,0), QSize(), false);
- } break;
+ switch (static_cast(thumbType)) {
case UBMimeType::Audio:
- {
- previewImageUrl = ":images/libpalette/soundIcon.svg";
- }break;
+ previewImageUrl = ":images/libpalette/soundIcon.svg";
+ break;
+
case UBMimeType::Video:
- {
- previewImageUrl = ":images/libpalette/movieIcon.svg";
- }break;
+ previewImageUrl = ":images/libpalette/movieIcon.svg";
+ break;
+
case UBMimeType::Flash:
- {
- previewImageUrl = ":images/libpalette/FlashIcon.svg";
- }break;
+ previewImageUrl = ":images/libpalette/FlashIcon.svg";
+ break;
+
+ case UBMimeType::RasterImage:
+ case UBMimeType::VectorImage:
+ previewImageUrl = widgetsUrl;
+ break;
+ }
+
+ if (!widgetsThumbsUrl.isNull()) {
+ previewImageUrl = ":/images/libpalette/loading.png";
+ if (!imageGatherer)
+ imageGatherer = new UBDownloadHttpFile(0, this);
+
+ connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)));
+
+ // We send here the request and store its reply in order to be able to cancel it if needed
+ imageGatherer->get(QUrl(widgetsThumbsUrl), QPoint(0,0), QSize(), false);
}
- UBFeature feature( "/root", QImage(previewImageUrl), QString(), metadata["Url"], FEATURE_ITEM );
+ UBFeature feature( "/root", QImage(previewImageUrl), QString(), widgetsUrl, FEATURE_ITEM );
feature.setMetadata( metadata );
centralWidget->showElement(feature, UBFeaturesCentralWidget::FeaturePropertiesList);
@@ -283,8 +296,8 @@ void UBFeaturesWidget::onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QU
void UBFeaturesWidget::onAddDownloadedFileToLibrary(bool pSuccess, QUrl sourceUrl, QString pContentHeader, QByteArray pData)
{
Q_UNUSED(pContentHeader)
-
if (pSuccess) {
+ qDebug() << pData.length();
controller->addDownloadedFile(sourceUrl, pData);
controller->refreshModels();
}
@@ -353,7 +366,7 @@ void UBFeaturesWidget::importImage(const QImage &image, const QString &fileName)
controller->importImage(image, fileName);
}
-UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
+UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
: QListView(parent)
{
setObjectName(name);
@@ -362,7 +375,7 @@ UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
void UBFeaturesListView::dragEnterEvent( QDragEnterEvent *event )
{
if ( event->mimeData()->hasUrls() || event->mimeData()->hasImage() )
- event->acceptProposedAction();
+ event->acceptProposedAction();
}
void UBFeaturesListView::dragMoveEvent( QDragMoveEvent *event )
@@ -528,7 +541,7 @@ void UBFeaturesCentralWidget::setPropertiesThumbnail(const QPixmap &pix)
UBFeature UBFeaturesCentralWidget::getCurElementFromProperties()
{
- return mFeatureProperties->getCurrentElement();
+ return mFeatureProperties->getCurrentElement();
}
void UBFeaturesCentralWidget::showAdditionalData(AddWidget pWidgetType, AddWidgetState pState)
@@ -763,36 +776,36 @@ void UBFeaturesWebView::javaScriptWindowObjectCleared()
void UBFeaturesWebView::showElement(const UBFeature &elem)
{
- QString qsWidgetName;
+ QString qsWidgetName;
QString path = elem.getFullPath().toLocalFile();
- QString qsConfigPath = QString("%0/config.xml").arg(path);
-
- if(QFile::exists(qsConfigPath))
- {
- QFile f(qsConfigPath);
- if(f.open(QIODevice::ReadOnly))
- {
- QDomDocument domDoc;
- domDoc.setContent(QString(f.readAll()));
- QDomElement root = domDoc.documentElement();
-
- QDomNode node = root.firstChild();
- while(!node.isNull())
- {
- if(node.toElement().tagName() == "content")
- {
- QDomAttr srcAttr = node.toElement().attributeNode("src");
- qsWidgetName = srcAttr.value();
- break;
- }
- node = node.nextSibling();
- }
- f.close();
- }
- }
-
- mpView->load(QUrl::fromLocalFile(QString("%0/%1").arg(path).arg(qsWidgetName)));
+ QString qsConfigPath = QString("%0/config.xml").arg(path);
+
+ if(QFile::exists(qsConfigPath))
+ {
+ QFile f(qsConfigPath);
+ if(f.open(QIODevice::ReadOnly))
+ {
+ QDomDocument domDoc;
+ domDoc.setContent(QString(f.readAll()));
+ QDomElement root = domDoc.documentElement();
+
+ QDomNode node = root.firstChild();
+ while(!node.isNull())
+ {
+ if(node.toElement().tagName() == "content")
+ {
+ QDomAttr srcAttr = node.toElement().attributeNode("src");
+ qsWidgetName = srcAttr.value();
+ break;
+ }
+ node = node.nextSibling();
+ }
+ f.close();
+ }
+ }
+
+ mpView->load(QUrl::fromLocalFile(QString("%0/%1").arg(path).arg(qsWidgetName)));
}
void UBFeaturesWebView::onLoadFinished(bool ok)
@@ -815,7 +828,7 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
, mpOrigPixmap(NULL)
, mpElement(NULL)
{
- setObjectName(name);
+ setObjectName(name);
// Create the GUI
mpLayout = new QVBoxLayout(this);
@@ -850,7 +863,7 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
mpButtonLayout->addStretch(1);
- mpObjInfoLabel = new QLabel(tr("Object informations"));
+ mpObjInfoLabel = new QLabel(tr("Object informations"));
mpObjInfoLabel->setStyleSheet(QString("color: #888888; font-size : 18px; font-weight:bold;"));
mpLayout->addWidget(mpObjInfoLabel, 0);
@@ -864,23 +877,23 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
mpLayout->addWidget(mpObjInfos, 1);
mpLayout->setMargin(0);
- connect( mpAddPageButton, SIGNAL(clicked()), this, SLOT(onAddToPage()) );
+ connect( mpAddPageButton, SIGNAL(clicked()), this, SLOT(onAddToPage()) );
connect( mpSetAsBackgroundButton, SIGNAL( clicked() ), this, SLOT( onSetAsBackground() ) );
connect( mpAddToLibButton, SIGNAL( clicked() ), this, SLOT(onAddToLib() ) );
}
UBFeatureProperties::~UBFeatureProperties()
{
- if ( mpOrigPixmap )
+ if ( mpOrigPixmap )
{
delete mpOrigPixmap;
mpOrigPixmap = NULL;
}
- if ( mpElement )
- {
- delete mpElement;
- mpElement = NULL;
- }
+ if ( mpElement )
+ {
+ delete mpElement;
+ mpElement = NULL;
+ }
if ( mpThumbnail )
{
delete mpThumbnail;
@@ -940,7 +953,7 @@ UBFeature UBFeatureProperties::getCurrentElement() const
void UBFeatureProperties::setOrigPixmap(const QPixmap &pix)
{
-
+
if (mpOrigPixmap)
delete mpOrigPixmap;
@@ -948,7 +961,7 @@ void UBFeatureProperties::setOrigPixmap(const QPixmap &pix)
}
void UBFeatureProperties::setThumbnail(const QPixmap &pix)
-{
+{
mpThumbnail->setPixmap(pix.scaledToWidth(THUMBNAIL_WIDTH));
adaptSize();
}
@@ -970,42 +983,42 @@ void UBFeatureProperties::adaptSize()
void UBFeatureProperties::showElement(const UBFeature &elem)
{
- if ( mpOrigPixmap )
+ if ( mpOrigPixmap )
{
delete mpOrigPixmap;
mpOrigPixmap = NULL;
}
- if ( mpElement )
- {
- delete mpElement;
- mpElement = NULL;
- }
+ if ( mpElement )
+ {
+ delete mpElement;
+ mpElement = NULL;
+ }
mpElement = new UBFeature(elem);
mpOrigPixmap = new QPixmap(QPixmap::fromImage(elem.getThumbnail()));
mpThumbnail->setPixmap(QPixmap::fromImage(elem.getThumbnail()).scaledToWidth(THUMBNAIL_WIDTH));
populateMetadata();
if ( UBApplication::isFromWeb( elem.getFullPath().toString() ) )
- {
+ {
mpAddToLibButton->show();
- if( elem.getMetadata()["Type"].toLower().contains("image") )
- {
+ if( elem.getMetadata()["Type"].toLower().contains("image") )
+ {
mpSetAsBackgroundButton->show();
}
- else
- {
+ else
+ {
mpSetAsBackgroundButton->hide();
}
}
- else
- {
+ else
+ {
mpAddToLibButton->hide();
if (UBFileSystemUtils::mimeTypeFromFileName( elem.getFullPath().toLocalFile() ).contains("image"))
- {
+ {
mpSetAsBackgroundButton->show();
}
- else
- {
+ else
+ {
mpSetAsBackgroundButton->hide();
}
}
@@ -1015,7 +1028,7 @@ void UBFeatureProperties::populateMetadata()
{
if(NULL != mpObjInfos){
mpObjInfos->clear();
- QMap metas = mpElement->getMetadata();
+ QMap metas = mpElement->getMetadata();
QList lKeys = metas.keys();
QList lValues = metas.values();
@@ -1076,7 +1089,7 @@ UBFeatureItemButton::~UBFeatureItemButton()
QVariant UBFeaturesModel::data(const QModelIndex &index, int role) const
{
- if (!index.isValid())
+ if (!index.isValid())
return QVariant();
if (role == Qt::DisplayRole) {
@@ -1087,21 +1100,21 @@ QVariant UBFeaturesModel::data(const QModelIndex &index, int role) const
return QIcon( QPixmap::fromImage(featuresList->at(index.row()).getThumbnail()));
} else if (role == Qt::UserRole) {
- return featuresList->at(index.row()).getVirtualPath();
+ return featuresList->at(index.row()).getVirtualPath();
} else if (role == Qt::UserRole + 1) {
- //return featuresList->at(index.row()).getType();
- UBFeature f = featuresList->at(index.row());
- return QVariant::fromValue( f );
- }
+ //return featuresList->at(index.row()).getType();
+ UBFeature f = featuresList->at(index.row());
+ return QVariant::fromValue( f );
+ }
- return QVariant();
+ return QVariant();
}
QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
{
UBFeaturesMimeData *mimeData = new UBFeaturesMimeData();
- QList urlList;
+ QList urlList;
QList featuresList;
QByteArray typeData;
@@ -1117,8 +1130,8 @@ QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
typeData += UBFeaturesController::featureTypeSplitter();
}
typeData += QString::number(element.getType()).toAscii();
- }
- }
+ }
+ }
mimeData->setUrls(urlList);
mimeData->setFeatures(featuresList);
@@ -1140,11 +1153,11 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
dataFromSameModel = true;
if ((!mimeData->hasUrls() && !mimeData->hasImage()) )
- return false;
- if ( action == Qt::IgnoreAction )
- return true;
- if ( column > 0 )
- return false;
+ return false;
+ if ( action == Qt::IgnoreAction )
+ return true;
+ if ( column > 0 )
+ return false;
UBFeature parentFeature;
if (!parent.isValid()) {
@@ -1174,39 +1187,39 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
}
- return true;
+ return true;
}
void UBFeaturesModel::addItem( const UBFeature &item )
{
- beginInsertRows( QModelIndex(), featuresList->size(), featuresList->size() );
- featuresList->append( item );
- endInsertRows();
+ beginInsertRows( QModelIndex(), featuresList->size(), featuresList->size() );
+ featuresList->append( item );
+ endInsertRows();
}
void UBFeaturesModel::deleteFavoriteItem( const QString &path )
{
- for ( int i = 0; i < featuresList->size(); ++i )
- {
+ for ( int i = 0; i < featuresList->size(); ++i )
+ {
if ( !QString::compare( featuresList->at(i).getFullPath().toString(), path, Qt::CaseInsensitive ) &&
- !QString::compare( featuresList->at(i).getVirtualPath(), "/root/favorites", Qt::CaseInsensitive ) )
- {
- removeRow( i, QModelIndex() );
- return;
- }
- }
+ !QString::compare( featuresList->at(i).getVirtualPath(), "/root/favorites", Qt::CaseInsensitive ) )
+ {
+ removeRow( i, QModelIndex() );
+ return;
+ }
+ }
}
void UBFeaturesModel::deleteItem( const QString &path )
{
for ( int i = 0; i < featuresList->size(); ++i )
- {
+ {
if ( !QString::compare( featuresList->at(i).getFullPath().toString(), path, Qt::CaseInsensitive ) )
- {
- removeRow( i, QModelIndex() );
- return;
- }
- }
+ {
+ removeRow( i, QModelIndex() );
+ return;
+ }
+ }
}
void UBFeaturesModel::deleteItem(const UBFeature &feature)
@@ -1221,28 +1234,28 @@ void UBFeaturesModel::deleteItem(const UBFeature &feature)
bool UBFeaturesModel::removeRows( int row, int count, const QModelIndex & parent )
{
- if ( row < 0 )
- return false;
- if ( row + count > featuresList->size() )
- return false;
- beginRemoveRows( parent, row, row + count - 1 );
- //featuresList->remove( row, count );
- featuresList->erase( featuresList->begin() + row, featuresList->begin() + row + count );
- endRemoveRows();
- return true;
+ if ( row < 0 )
+ return false;
+ if ( row + count > featuresList->size() )
+ return false;
+ beginRemoveRows( parent, row, row + count - 1 );
+ //featuresList->remove( row, count );
+ featuresList->erase( featuresList->begin() + row, featuresList->begin() + row + count );
+ endRemoveRows();
+ return true;
}
bool UBFeaturesModel::removeRow( int row, const QModelIndex & parent )
{
- if ( row < 0 )
- return false;
- if ( row >= featuresList->size() )
- return false;
- beginRemoveRows( parent, row, row );
- //featuresList->remove( row );
- featuresList->erase( featuresList->begin() + row );
- endRemoveRows();
- return true;
+ if ( row < 0 )
+ return false;
+ if ( row >= featuresList->size() )
+ return false;
+ beginRemoveRows( parent, row, row );
+ //featuresList->remove( row );
+ featuresList->erase( featuresList->begin() + row );
+ endRemoveRows();
+ return true;
}
void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destination
@@ -1324,9 +1337,9 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina
Qt::ItemFlags UBFeaturesModel::flags( const QModelIndex &index ) const
{
Qt::ItemFlags resultFlags = QAbstractItemModel::flags(index);
- if ( index.isValid() )
- {
- UBFeature item = index.data( Qt::UserRole + 1 ).value();
+ if ( index.isValid() )
+ {
+ UBFeature item = index.data( Qt::UserRole + 1 ).value();
if ( item.getType() == FEATURE_INTERACTIVE
|| item.getType() == FEATURE_ITEM
|| item.getType() == FEATURE_AUDIO
@@ -1348,7 +1361,7 @@ Qt::ItemFlags UBFeaturesModel::flags( const QModelIndex &index ) const
QStringList UBFeaturesModel::mimeTypes() const
{
- QStringList types;
+ QStringList types;
types << "text/uri-list" << "image/png" << "image/tiff" << "image/gif" << "image/jpeg";
return types;
}
@@ -1363,17 +1376,17 @@ int UBFeaturesModel::rowCount(const QModelIndex &parent) const
bool UBFeaturesProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex & sourceParent )const
{
- QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
- QString path = index.data( Qt::UserRole ).toString();
-
- return filterRegExp().exactMatch(path);
+ QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
+ QString path = index.data( Qt::UserRole ).toString();
+
+ return filterRegExp().exactMatch(path);
}
bool UBFeaturesSearchProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex & sourceParent )const
{
- QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
- /*QString name = sourceModel()->data(index, Qt::DisplayRole).toString();
- eUBLibElementType type = (eUBLibElementType)sourceModel()->data(index, Qt::UserRole + 1).toInt();*/
+ QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
+ /*QString name = sourceModel()->data(index, Qt::DisplayRole).toString();
+ eUBLibElementType type = (eUBLibElementType)sourceModel()->data(index, Qt::UserRole + 1).toInt();*/
UBFeature feature = sourceModel()->data(index, Qt::UserRole + 1).value();
bool isFile = feature.getType() == FEATURE_INTERACTIVE
@@ -1390,10 +1403,10 @@ bool UBFeaturesSearchProxyModel::filterAcceptsRow( int sourceRow, const QModelIn
bool UBFeaturesPathProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex & sourceParent )const
{
- QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
+ QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
UBFeature feature = sourceModel()->data(index, Qt::UserRole + 1).value();
-
- return feature.isFolder() && path.startsWith( feature.getFullVirtualPath() );
+
+ return feature.isFolder() && path.startsWith( feature.getFullVirtualPath() );
}
QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const QLocale & locale ) const
@@ -1402,18 +1415,18 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const QLoc
QString text = value.toString();
text = text.replace(".wgt", "");
- if (listView)
- {
- const QFontMetrics fm = listView->fontMetrics();
+ if (listView)
+ {
+ const QFontMetrics fm = listView->fontMetrics();
const QSize iSize = listView->gridSize();
- return elidedText( fm, iSize.width(), Qt::ElideRight, text );
- }
- return text;
+ return elidedText( fm, iSize.width(), Qt::ElideRight, text );
+ }
+ return text;
}
UBFeaturesPathItemDelegate::UBFeaturesPathItemDelegate(QObject *parent) : QStyledItemDelegate(parent)
{
- arrowPixmap = new QPixmap(":images/navig_arrow.png");
+ arrowPixmap = new QPixmap(":images/navig_arrow.png");
}
QString UBFeaturesPathItemDelegate::displayText ( const QVariant & value, const QLocale & locale ) const
@@ -1426,20 +1439,20 @@ QString UBFeaturesPathItemDelegate::displayText ( const QVariant & value, const
void UBFeaturesPathItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
- UBFeature feature = index.data( Qt::UserRole + 1 ).value();
- QRect rect = option.rect;
- if ( !feature.getFullPath().isEmpty() )
- {
+ UBFeature feature = index.data( Qt::UserRole + 1 ).value();
+ QRect rect = option.rect;
+ if ( !feature.getFullPath().isEmpty() )
+ {
painter->drawPixmap( rect.left() - 10, rect.center().y() - 5, *arrowPixmap );
- }
+ }
painter->drawImage( rect.left() + 5, rect.center().y() - 5, feature.getThumbnail().scaledToHeight( 30, Qt::SmoothTransformation ) );
}
UBFeaturesPathItemDelegate::~UBFeaturesPathItemDelegate()
{
- if ( arrowPixmap )
- {
- delete arrowPixmap;
- arrowPixmap = NULL;
- }
+ if ( arrowPixmap )
+ {
+ delete arrowPixmap;
+ arrowPixmap = NULL;
+ }
}
diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp
index 84afd33d..c3a213bd 100644
--- a/src/gui/UBToolWidget.cpp
+++ b/src/gui/UBToolWidget.cpp
@@ -34,11 +34,12 @@ QPixmap* UBToolWidget::sUnpinPixmap = 0;
UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent)
: QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
+ , mWebView(0)
+ , mToolWidget(0)
, mShouldMoveWidget(false)
, mContentMargin(0)
, mFrameWidth(0)
- , mWebView(0)
- , mToolWidget(0)
+
{
int widgetType = UBGraphicsWidgetItem::widgetType(pUrl);
if (widgetType == UBWidgetType::Apple)
@@ -53,11 +54,12 @@ UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent)
UBToolWidget::UBToolWidget(UBGraphicsWidgetItem *pWidget, QWidget *pParent)
: QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
+ , mWebView(0)
+ , mToolWidget(pWidget)
, mShouldMoveWidget(false)
, mContentMargin(0)
, mFrameWidth(0)
- , mWebView(0)
- , mToolWidget(pWidget)
+
{
initialize();
javaScriptWindowObjectCleared();
@@ -92,7 +94,7 @@ void UBToolWidget::initialize()
mWebView->installEventFilter(this);
-
+
mFrameWidth = UBSettings::settings()->objectFrameWidth;
mContentMargin = sClosePixmap->width() / 2 + mFrameWidth;
setLayout(new QVBoxLayout());
diff --git a/src/pdf/PDFRenderer.cpp b/src/pdf/PDFRenderer.cpp
index 14d520f5..4539dfae 100644
--- a/src/pdf/PDFRenderer.cpp
+++ b/src/pdf/PDFRenderer.cpp
@@ -14,14 +14,14 @@
*/
#include
-#include
#include "PDFRenderer.h"
#include "XPDFRenderer.h"
-#include "core/memcheck.h"
#include "core/UBApplication.h"
+#include "core/memcheck.h"
+
QMap< QUuid, QPointer > PDFRenderer::sRenderers;
diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp
index ac6e0216..9069d232 100644
--- a/src/podcast/youtube/UBYouTubePublisher.cpp
+++ b/src/podcast/youtube/UBYouTubePublisher.cpp
@@ -94,16 +94,16 @@ void UBYouTubePublisher::postClientLoginRequest(const QString& userName, const Q
QUrl url("https://www.google.com/youtube/accounts/ClientLogin");
mAuthRequest = new UBServerXMLHttpRequest(UBNetworkAccessManager::defaultAccessManager()
- , "application/x-www-form-urlencoded"); // destroyed in postClientLoginResponse
+ , "application/x-www-form-urlencoded"); // destroyed in postClientLoginResponse
connect(mAuthRequest, SIGNAL(finished(bool, const QByteArray&)), this, SLOT(postClientLoginResponse(bool, const QByteArray&)));
mAuthRequest->addHeader("X-GData-Key", sYouTubeDeveloperKey);
QString payload = QString("Email=%1&Passwd=%2&service=youtube&source=%3")
- .arg(userName)
- .arg(password)
- .arg(tr("OpenSankore"));
+ .arg(userName)
+ .arg(password)
+ .arg(tr("OpenSankore"));
mAuthRequest->post(url, payload.toUtf8());
@@ -125,8 +125,8 @@ void UBYouTubePublisher::postClientLoginResponse(bool success, const QByteArray&
{
if(line.startsWith("Auth="))
{
- mAuthToken = line.replace("Auth=", "");
- break;
+ mAuthToken = line.replace("Auth=", "");
+ break;
}
}
}
@@ -137,7 +137,7 @@ void UBYouTubePublisher::postClientLoginResponse(bool success, const QByteArray&
if(mAuthToken.length() == 0)
{
UBApplication::showMessage(tr("YouTube authentication failed."));
-// success = false;
+ // success = false;
deleteLater();
}
else
@@ -188,7 +188,7 @@ void UBYouTubePublisher::postVideoUploadRequest()
QString contentType = QString("multipart/related; boundary=\"%1\"").arg(boundary);
mUploadRequest = new UBServerXMLHttpRequest(UBNetworkAccessManager::defaultAccessManager()
- , contentType); // destroyed in postVideoUploadResponse
+ , contentType); // destroyed in postVideoUploadResponse
mUploadRequest->setVerbose(true);
connect(mUploadRequest, SIGNAL(progress(qint64, qint64)), this, SLOT(progress(qint64, qint64)));
@@ -206,15 +206,15 @@ void UBYouTubePublisher::postVideoUploadRequest()
QByteArray payload;
payload.append(QString("\n--" + boundary + "\n").toUtf8())
- .append(QString("Content-Type: application/atom+xml; charset=UTF-8\n\n").toUtf8())
- .append(youtubeMetadata().toUtf8());
+ .append(QString("Content-Type: application/atom+xml; charset=UTF-8\n\n").toUtf8())
+ .append(youtubeMetadata().toUtf8());
payload.append(QString("\n--" + boundary + "\n").toUtf8());
QString videoMimeType = UBFileSystemUtils::mimeTypeFromFileName(mVideoFilePath);
payload.append((QString("Content-Type: %1\n").arg(videoMimeType)).toUtf8())
- .append(QString("Content-Transfer-Encoding: binary\n\n").toUtf8());
+ .append(QString("Content-Transfer-Encoding: binary\n\n").toUtf8());
payload.append(videoFile.readAll());
@@ -335,23 +335,45 @@ UBYouTubePublishingDialog::UBYouTubePublishingDialog(const QString& videoFilePat
connect(email, SIGNAL(textChanged(const QString&)), this, SLOT(updateUIState(const QString&)));
connect(password, SIGNAL(textChanged(const QString&)), this, SLOT(updateUIState(const QString&)));
+ connect(youtubeCredentialsPersistence,SIGNAL(clicked()), this, SLOT(updateCredentialPersistenceState()));
dialogButtons->button(QDialogButtonBox::Ok)->setEnabled(false);
dialogButtons->button(QDialogButtonBox::Ok)->setText(tr("Upload"));
+ UBSettings* settings = UBSettings::settings();
+
+ email->setText(settings->youTubeUserEMail->get().toString());
+ password->setText(settings->password(email->text()));
+
+ youtubeCredentialsPersistence->setChecked(UBSettings::settings()->youTubeCredentialsPersistence->get().toBool());
+ updatePersistanceEnableState();
+}
+
+
+void UBYouTubePublishingDialog::updateCredentialPersistenceState()
+{
+ UBSettings::settings()->youTubeCredentialsPersistence->set(QVariant(youtubeCredentialsPersistence->checkState()));
+}
+
+void UBYouTubePublishingDialog::updatePersistanceEnableState()
+{
+ bool enabled = email->text().length() || password->text().length();
+ youtubeCredentialsPersistence->setEnabled(enabled);
+ youtubeCredentialsPersistence->setStyleSheet(enabled ? "color:black;" : "color : lightgrey;");
}
void UBYouTubePublishingDialog::updateUIState(const QString& string)
{
Q_UNUSED(string);
- bool ok = title->text().length() > 0
- && description->toPlainText().length() > 0
- && keywords->text().length() > 0
- && email->text().length() > 0
- && password->text().length() > 0;
+ bool ok = title->text().length() > 0
+ && description->toPlainText().length() > 0
+ && keywords->text().length() > 0
+ && email->text().length() > 0
+ && password->text().length() > 0;
dialogButtons->button(QDialogButtonBox::Ok)->setEnabled(ok);
+ updatePersistanceEnableState();
}
diff --git a/src/podcast/youtube/UBYouTubePublisher.h b/src/podcast/youtube/UBYouTubePublisher.h
index f6c0d34d..fdea6314 100644
--- a/src/podcast/youtube/UBYouTubePublisher.h
+++ b/src/podcast/youtube/UBYouTubePublisher.h
@@ -78,9 +78,11 @@ class UBYouTubePublishingDialog : public QDialog, public Ui::YouTubePublishingDi
private:
QMap categories();
+ void updatePersistanceEnableState();
private slots:
void updateUIState(const QString& = QString(""));
+ void updateCredentialPersistenceState();
};