diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf index 1f20a077..577818a4 100644 Binary files a/JournalDesModifications.pdf and b/JournalDesModifications.pdf differ diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf index 5511bf1a..0f4885f3 100644 Binary files a/ReleaseNotes.pdf and b/ReleaseNotes.pdf differ diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index d6530001..c08d5dec 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -11,7 +11,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 2 VERSION_MIN = 00 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 04 +VERSION_PATCH = 05 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/resources/library/interactivities/Balance.wgt/config.xml b/resources/inDevelopmentWidgets/Balance.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Balance.wgt/config.xml rename to resources/inDevelopmentWidgets/Balance.wgt/config.xml diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Balance.wgt/css/images/balance.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/balance.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/balance.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/balance.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/bg.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/bg.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/delete.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/delete.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/graduations.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/graduations.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/pad-bd.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/pad-bd.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/parameters-bg.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/pivot.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/pivot.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/scale.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/scale.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/scales.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/scales.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-bd.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-help.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-reload.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/weight-add.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight.png b/resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/weight.png rename to resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png diff --git a/resources/library/interactivities/Balance.wgt/css/main.css b/resources/inDevelopmentWidgets/Balance.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/main.css rename to resources/inDevelopmentWidgets/Balance.wgt/css/main.css diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-help.css b/resources/inDevelopmentWidgets/Balance.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/ubw-help.css rename to resources/inDevelopmentWidgets/Balance.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-main.css b/resources/inDevelopmentWidgets/Balance.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/ubw-main.css rename to resources/inDevelopmentWidgets/Balance.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Balance.wgt/help.html b/resources/inDevelopmentWidgets/Balance.wgt/help.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/help.html rename to resources/inDevelopmentWidgets/Balance.wgt/help.html diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages.properties b/resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Balance.wgt/i18n/Messages.properties rename to resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties b/resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties rename to resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Balance.wgt/icon.png b/resources/inDevelopmentWidgets/Balance.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/icon.png rename to resources/inDevelopmentWidgets/Balance.wgt/icon.png diff --git a/resources/library/interactivities/Balance.wgt/index.html b/resources/inDevelopmentWidgets/Balance.wgt/index.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/index.html rename to resources/inDevelopmentWidgets/Balance.wgt/index.html diff --git a/resources/library/interactivities/Balance.wgt/js/help-template.js b/resources/inDevelopmentWidgets/Balance.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/help-template.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/help-template.js diff --git a/resources/library/interactivities/Balance.wgt/js/help_fr-template.js b/resources/inDevelopmentWidgets/Balance.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/help_fr-template.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-css-transform.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/modernizr.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/mustache.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/mustache.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js b/resources/inDevelopmentWidgets/Balance.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Balance.wgt/js/main.js b/resources/inDevelopmentWidgets/Balance.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/main.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/main.js diff --git a/resources/library/interactivities/Balance.wgt/js/templates.js b/resources/inDevelopmentWidgets/Balance.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/templates.js rename to resources/inDevelopmentWidgets/Balance.wgt/js/templates.js diff --git a/resources/library/interactivities/Cadran.wgt/config.xml b/resources/inDevelopmentWidgets/Cadran.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Cadran.wgt/config.xml rename to resources/inDevelopmentWidgets/Cadran.wgt/config.xml diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Cadran.wgt/css/images/bg.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/bg.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/pad-bd.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/parameters-bg.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-help.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png b/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png rename to resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-reload.png diff --git a/resources/library/interactivities/Cadran.wgt/css/main.css b/resources/inDevelopmentWidgets/Cadran.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/main.css rename to resources/inDevelopmentWidgets/Cadran.wgt/css/main.css diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-help.css b/resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/ubw-help.css rename to resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-main.css b/resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/ubw-main.css rename to resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Cadran.wgt/help.html b/resources/inDevelopmentWidgets/Cadran.wgt/help.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/help.html rename to resources/inDevelopmentWidgets/Cadran.wgt/help.html diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages.properties b/resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Cadran.wgt/i18n/Messages.properties rename to resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties b/resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties rename to resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Cadran.wgt/icon.png b/resources/inDevelopmentWidgets/Cadran.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/icon.png rename to resources/inDevelopmentWidgets/Cadran.wgt/icon.png diff --git a/resources/library/interactivities/Cadran.wgt/index.html b/resources/inDevelopmentWidgets/Cadran.wgt/index.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/index.html rename to resources/inDevelopmentWidgets/Cadran.wgt/index.html diff --git a/resources/library/interactivities/Cadran.wgt/js/help-template.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/help-template.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/help-template.js diff --git a/resources/library/interactivities/Cadran.wgt/js/help_fr-template.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/help_fr-template.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-css-transform.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/mustache.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/mustache.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Cadran.wgt/js/main.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/main.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/main.js diff --git a/resources/library/interactivities/Cadran.wgt/js/templates.js b/resources/inDevelopmentWidgets/Cadran.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/templates.js rename to resources/inDevelopmentWidgets/Cadran.wgt/js/templates.js diff --git a/resources/library/interactivities/Morpion.wgt/config.xml b/resources/inDevelopmentWidgets/Morpion.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Morpion.wgt/config.xml rename to resources/inDevelopmentWidgets/Morpion.wgt/config.xml diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Morpion.wgt/css/images/bg.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/bg.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/pad-bd.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/parameters-bg.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player1.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/player1.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/player1.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/player1.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player2.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/player2.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/player2.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/player2.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/result-bg.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/result-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/result-bg.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/result-bg.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-help.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/submit.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/submit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/submit.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/submit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png b/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png rename to resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-reload.png diff --git a/resources/library/interactivities/Morpion.wgt/css/main.css b/resources/inDevelopmentWidgets/Morpion.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/main.css rename to resources/inDevelopmentWidgets/Morpion.wgt/css/main.css diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-help.css b/resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/ubw-help.css rename to resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-main.css b/resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/ubw-main.css rename to resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Morpion.wgt/help.html b/resources/inDevelopmentWidgets/Morpion.wgt/help.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/help.html rename to resources/inDevelopmentWidgets/Morpion.wgt/help.html diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties b/resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Morpion.wgt/i18n/Messages.properties rename to resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties b/resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties rename to resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Morpion.wgt/icon.png b/resources/inDevelopmentWidgets/Morpion.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/icon.png rename to resources/inDevelopmentWidgets/Morpion.wgt/icon.png diff --git a/resources/library/interactivities/Morpion.wgt/images/failed.png b/resources/inDevelopmentWidgets/Morpion.wgt/images/failed.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/images/failed.png rename to resources/inDevelopmentWidgets/Morpion.wgt/images/failed.png diff --git a/resources/library/interactivities/Morpion.wgt/images/succeed.png b/resources/inDevelopmentWidgets/Morpion.wgt/images/succeed.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/images/succeed.png rename to resources/inDevelopmentWidgets/Morpion.wgt/images/succeed.png diff --git a/resources/library/interactivities/Morpion.wgt/index.html b/resources/inDevelopmentWidgets/Morpion.wgt/index.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/index.html rename to resources/inDevelopmentWidgets/Morpion.wgt/index.html diff --git a/resources/library/interactivities/Morpion.wgt/js/help-template.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/help-template.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/help-template.js diff --git a/resources/library/interactivities/Morpion.wgt/js/help_fr-template.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/help_fr-template.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/mustache.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/mustache.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Morpion.wgt/js/main.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/main.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/main.js diff --git a/resources/library/interactivities/Morpion.wgt/js/templates.js b/resources/inDevelopmentWidgets/Morpion.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/templates.js rename to resources/inDevelopmentWidgets/Morpion.wgt/js/templates.js diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index c2701f10..483e955b 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -214,7 +214,7 @@ UBBoardView::keyPressEvent (QKeyEvent *event) case Qt::Key_Control: case Qt::Key_Shift: { - mMultipleSelectionIsEnabled = true; + setMultiselection(true); }break; } @@ -274,6 +274,10 @@ UBBoardView::keyPressEvent (QKeyEvent *event) } } } + + // if ctrl of shift was pressed combined with other keys - we need to disable multiple selection. + if (event->isAccepted()) + setMultiselection(false); } @@ -284,7 +288,7 @@ void UBBoardView::keyReleaseEvent(QKeyEvent *event) if (Qt::Key_Shift == event->key() ||Qt::Key_Control == event->key()) { - mMultipleSelectionIsEnabled = false; + setMultiselection(false); } } @@ -439,27 +443,27 @@ void UBBoardView::handleItemsSelection(QGraphicsItem *item) // // item selection managed by QGraphicsView::mousePressEvent(). It should be called later. - if (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; - - // Delegate frame shouldn't selected - if (UBGraphicsDelegateFrame::Type == item->type()) - return; + if (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; + + // 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 (!mMultipleSelectionIsEnabled) + if (!isMultipleSelectionEnabled()) { // here we need to determine what item is pressed. We should work // only with UB items. @@ -520,14 +524,13 @@ Here we determines cases when items should to get mouse press event at pressing break; // Groups shouldn't reacts on any presses and moves for Play tool. + case UBGraphicsStrokesGroup::Type: case UBGraphicsGroupContainerItem::Type: if(currentTool == UBStylusTool::Play) { movingItem = NULL; - return false; } - else - return true; + return false; break; case QGraphicsWebView::Type: @@ -570,10 +573,8 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item) return true; } - if (!dynamic_cast(item)) - return true; - else - return false; + return false; + } bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) @@ -590,9 +591,9 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) if (movingItem->data(UBGraphicsItemData::ItemLocked).toBool()) return false; - if (movingItem->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type() && !movingItem->isSelected() && movingItem->parentItem()->isSelected()) - 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(); switch(item->type()) @@ -616,7 +617,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) case UBGraphicsTextItem::Type: return !item->isSelected(); } - + return false; } @@ -624,18 +625,21 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) QGraphicsItem* UBBoardView::determineItemToPress(QGraphicsItem *item) { if(item) - { + { UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); - - // groups should should be moved instead of strokes groups - if (item->parentItem() && UBGraphicsStrokesGroup::Type == item->type()) + + // groups should should be moved instead of strokes groups + if (item->parentItem() && UBGraphicsStrokesGroup::Type == item->type()) return item->parentItem(); - // if item is on group and froup is not selected - group should take press. - if (UBStylusTool::Selector == currentTool && item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type() && !item->parentItem()->isSelected()) + // 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()) return item->parentItem(); - // items like polygons placed in two groups nested, so we need to recursive call. + // items like polygons placed in two groups nested, so we need to recursive call. if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type()) return determineItemToPress(item->parentItem()); } @@ -649,33 +653,33 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item) if(item) { UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); - - //W3C widgets should take mouse move events from play tool. + + //W3C widgets should take mouse move events from play tool. if ((UBStylusTool::Play == currentTool) && (UBGraphicsW3CWidgetItem::Type == item->type())) return item; - // if item is in group + // if item is in group if(item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type()) { - // play tool should move groups by any element + // play tool should move groups by any element if (UBStylusTool::Play == currentTool && item->parentItem()->isSelected()) return item->parentItem(); - - // groups should should be moved instead of strokes groups - if (UBGraphicsStrokesGroup::Type == item->type()) - return item->parentItem(); - - // selected groups should be moved by moving any element + + // groups should should be moved instead of strokes groups + if (UBGraphicsStrokesGroup::Type == item->type()) + return item->parentItem(); + + // selected groups should be moved by moving any element if (item->parentItem()->isSelected()) return item; - + if (item->isSelected()) return NULL; return item->parentItem(); } - // items like polygons placed in two groups nested, so we need to recursive call. + // items like polygons placed in two groups nested, so we need to recursive call. if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type()) return determineItemToMove(item->parentItem()); } @@ -687,14 +691,13 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event) { mLastPressedMousePos = mapToScene(event->pos()); - // 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 - QGraphicsItem *pressedItem = determineItemToPress(movingItem); - - handleItemsSelection(movingItem); + // 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); + handleItemsSelection(movingItem); - if (mMultipleSelectionIsEnabled) + if (isMultipleSelectionEnabled()) return; if (itemShouldReceiveMousePressEvent(movingItem)) @@ -721,10 +724,10 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event) void UBBoardView::handleItemMouseMove(QMouseEvent *event) { - // determine item to move (maybee we need to move group of item or his parent. - movingItem = determineItemToMove(movingItem); + // determine item to move (maybee we need to move group of item or his parent. + movingItem = determineItemToMove(movingItem); - // items should be moved not every mouse move. + // items should be moved not every mouse move. if (movingItem && itemShouldBeMoved(movingItem) && (mMouseButtonIsPressed || mTabletStylusIsPressed)) { QPointF scenePos = mapToScene(event->pos()); @@ -750,8 +753,8 @@ 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, - // 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. + // 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); @@ -792,6 +795,11 @@ void UBBoardView::moveRubberedItems(QPointF movingVector) scene()->invalidate(invalidateRect); } +void UBBoardView::setMultiselection(bool enable) +{ + mMultipleSelectionIsEnabled = enable; +} + void UBBoardView::longPressEvent() { UBDrawingController *drawingController = UBDrawingController::drawingController(); @@ -1085,14 +1093,17 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) { if (QGraphicsSvgItem::Type != movingItem->type() && UBGraphicsDelegateFrame::Type != movingItem->type() && - UBToolWidget::Type != movingItem->type() && - QGraphicsWebView::Type != movingItem->type() && // for W3C widgets as Tools. - !(movingItem->parentItem() && UBGraphicsW3CWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())) + UBToolWidget::Type != movingItem->type() && + QGraphicsWebView::Type != movingItem->type() && // for W3C widgets as Tools. + !(!isMultipleSelectionEnabled() && movingItem->parentItem() && UBGraphicsWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())) { bReleaseIsNeed = false; - if (movingItem->isSelected() && mMultipleSelectionIsEnabled) + if (movingItem->isSelected() && isMultipleSelectionEnabled()) movingItem->setSelected(false); else + if (movingItem->parentItem() && movingItem->parentItem()->isSelected() && isMultipleSelectionEnabled()) + movingItem->parentItem()->setSelected(false); + else { if (movingItem->isSelected()) bReleaseIsNeed = true; @@ -1308,14 +1319,20 @@ void UBBoardView::dragMoveEvent(QDragMoveEvent *event) void UBBoardView::dropEvent (QDropEvent *event) { - if (!itemAt(event->pos().x(),event->pos().y())) { - if (!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) { - mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); - event->acceptProposedAction(); + QGraphicsItem *onItem = itemAt(event->pos().x(),event->pos().y()); + if (onItem && onItem->type() == UBGraphicsWidgetItem::Type) { + QGraphicsView::dropEvent(event); + } else { + if (!event->source() + || qobject_cast(event->source()) + || qobject_cast(event->source()) + || qobject_cast(event->source()) + || qobject_cast(event->source()) + || qobject_cast(event->source())) { + mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); + event->acceptProposedAction(); + } } - } - else - QGraphicsView::dropEvent(event); } void @@ -1504,11 +1521,11 @@ UBBoardView::setToolCursor (int tool) } -bool UBBoardView::hasSelectedParents(QGraphicsItem * item) -{ - if (item->isSelected()) - return true; - if (item->parentItem()==NULL) - return false; - return hasSelectedParents(item->parentItem()); -} +bool UBBoardView::hasSelectedParents(QGraphicsItem * item) +{ + if (item->isSelected()) + return true; + if (item->parentItem()==NULL) + return false; + return hasSelectedParents(item->parentItem()); +} diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h index f2aa69ee..1aae71ba 100644 --- a/src/board/UBBoardView.h +++ b/src/board/UBBoardView.h @@ -44,6 +44,9 @@ class UBBoardView : public QGraphicsView void rubberItems(); void moveRubberedItems(QPointF movingVector); + void setMultiselection(bool enable); + bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; } + signals: void resized(QResizeEvent* event); diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index ec8280e4..75591e73 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -582,6 +582,12 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) boardController->controlView()->forcedTabletRelease(); } + + if (event->type() == QEvent::ApplicationActivate) + { + boardController->controlView()->setMultiselection(false); + } + #ifdef Q_WS_MAC if (bIsMinimized && event->type() == QEvent::ApplicationActivate){ if (mainWindow->isHidden()) mainWindow->show(); diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 9e5003c6..cf4cc7f7 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -66,7 +66,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) , mDesktopStylusTool(UBDrawingController::drawingController()->stylusTool()) { - mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor + mTransparentDrawingView = new UBBoardView(UBApplication::boardController, NULL, true); // deleted in UBDesktopAnnotationController::destructor mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true); #ifdef Q_WS_MAC diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 52ab6418..b4cbfc4e 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -249,6 +249,11 @@ itemLayerType::Enum UBZLayerController::typeForData(QGraphicsItem *item) const return result; } +void UBZLayerController::setLayerType(QGraphicsItem *pItem, itemLayerType::Enum pNewType) +{ + pItem->setData(UBGraphicsItemData::itemLayerType, QVariant(pNewType)); +} + UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent) : UBCoreGraphicsScene(parent) , mEraser(0) @@ -1637,8 +1642,6 @@ QGraphicsItem* UBGraphicsScene::setAsBackgroundObject(QGraphicsItem* item, bool item->setAcceptedMouseButtons(Qt::NoButton); item->setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::FixedBackground); - UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(itemLayerType::BackgroundItem)); - if (pAdaptTransformation) { item = scaleToFitDocumentSize(item, true, 0, pExpand); @@ -1647,6 +1650,9 @@ QGraphicsItem* UBGraphicsScene::setAsBackgroundObject(QGraphicsItem* item, bool if (item->scene() != this) addItem(item); + mZLayerController->setLayerType(item, itemLayerType::BackgroundItem); + UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(item)); + mBackgroundObject = item; } diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 027ef706..738bd429 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -87,6 +87,7 @@ public: qreal changeZLevelTo(QGraphicsItem *item, moveDestination dest); itemLayerType::Enum typeForData(QGraphicsItem *item) const; + void setLayerType(QGraphicsItem *pItem, itemLayerType::Enum pNewType); private: ScopeMap scopeMap; diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index b126f9a6..ee69e3d3 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -64,6 +64,11 @@ UBWebController::UBWebController(UBMainWindow* mainWindow) { connect(mMainWindow->actionWebTools, SIGNAL(toggled(bool)), this, SLOT(toggleWebToolsPalette(bool))); + mStackedWidget = new QStackedWidget(); + mStackedWidget->addWidget(new QWidget(mStackedWidget)); + mStackedWidget->addWidget(new QWidget(mStackedWidget)); + mStackedWidget->addWidget(new QWidget(mStackedWidget)); + mMainWindow->addWebWidget(mStackedWidget); for (int i = 0; i < TotalNumberOfWebInstances; i += 1){ @@ -76,13 +81,15 @@ UBWebController::UBWebController(UBMainWindow* mainWindow) // TODO : Comment the next line to continue the Youtube button bugfix initialiazemOEmbedProviders(); - } UBWebController::~UBWebController() { // NOOP + if (mStackedWidget) { + delete mStackedWidget; + } } void UBWebController::initialiazemOEmbedProviders() @@ -119,6 +126,7 @@ void UBWebController::webBrowserInstance() mCurrentWebBrowser = &mWebBrowserList[WebBrowser]; mToolsCurrentPalette = &mToolsPaletteList[WebBrowser]; mToolsPalettePositionned = mToolsPalettePositionnedList[WebBrowser]; + if (!(*mCurrentWebBrowser)) { (*mCurrentWebBrowser) = new WBBrowserWindow(mMainWindow->centralWidget(), mMainWindow); @@ -134,6 +142,10 @@ void UBWebController::webBrowserInstance() mMainWindow->actionBookmarks->setVisible(showAddBookmarkButtons); mMainWindow->actionAddBookmark->setVisible(showAddBookmarkButtons); + mStackedWidget->setCurrentIndex(WebBrowser); + if (mStackedWidget->currentWidget()) { + mStackedWidget->removeWidget(mStackedWidget->currentWidget()); + } mStackedWidget->insertWidget(WebBrowser, (*mCurrentWebBrowser)); showTabAtTop(UBSettings::settings()->appToolBarPositionedAtTop->get().toBool()); @@ -150,9 +162,8 @@ void UBWebController::webBrowserInstance() (*mCurrentWebBrowser)->tabWidget()->lineEdits()->show(); } - UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); - mStackedWidget->setCurrentIndex(WebBrowser); + UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); mMainWindow->switchToWebWidget(); setupPalettes(); @@ -165,7 +176,6 @@ void UBWebController::webBrowserInstance() if (mDownloadViewIsVisible) WBBrowserWindow::downloadManager()->show(); - } void UBWebController::tutorialWebInstance() @@ -191,13 +201,17 @@ void UBWebController::tutorialWebInstance() { mCurrentWebBrowser = &mWebBrowserList[Tutorial]; mToolsPalettePositionned = &mToolsPalettePositionnedList[Tutorial]; + if (!(*mCurrentWebBrowser)) { (*mCurrentWebBrowser) = new WBBrowserWindow(mMainWindow->centralWidget(), mMainWindow, true); connect((*mCurrentWebBrowser), SIGNAL(activeViewChange(QWidget*)), this, SLOT(setSourceWidget(QWidget*))); + mStackedWidget->setCurrentIndex(Tutorial); + if (mStackedWidget->currentWidget()) { + mStackedWidget->removeWidget(mStackedWidget->currentWidget()); + } mStackedWidget->insertWidget(Tutorial, (*mCurrentWebBrowser)); - adaptToolBar(); mTrapFlashController = new UBTrapFlashController((*mCurrentWebBrowser)); @@ -212,12 +226,9 @@ void UBWebController::tutorialWebInstance() else (*mCurrentWebBrowser)->loadUrl(currentUrl); - UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); - - mStackedWidget->setCurrentIndex(Tutorial); + UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); mMainWindow->switchToWebWidget(); - screenLayoutChanged(); bool mirroring = UBSettings::settings()->webShowPageImmediatelyOnMirroredScreen->get().toBool(); @@ -246,6 +257,7 @@ void UBWebController::paraschoolWebInstance() if (UBSettings::settings()->webUseExternalBrowser->get().toBool()){ QDesktopServices::openUrl(currentUrl); } + else { mCurrentWebBrowser = &mWebBrowserList[Paraschool]; mToolsCurrentPalette = &mToolsPaletteList[Paraschool]; @@ -254,6 +266,10 @@ void UBWebController::paraschoolWebInstance() (*mCurrentWebBrowser) = new WBBrowserWindow(mMainWindow->centralWidget(), mMainWindow, true); connect((*mCurrentWebBrowser), SIGNAL(activeViewChange(QWidget*)), this, SLOT(setSourceWidget(QWidget*))); + mStackedWidget->setCurrentIndex(Paraschool); + if (mStackedWidget->currentWidget()) { + mStackedWidget->removeWidget(mStackedWidget->currentWidget()); + } mStackedWidget->insertWidget(Paraschool, (*mCurrentWebBrowser)); adaptToolBar(); @@ -267,11 +283,9 @@ void UBWebController::paraschoolWebInstance() } - UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); - mStackedWidget->setCurrentIndex(Paraschool); + UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget()); mMainWindow->switchToWebWidget(); - screenLayoutChanged(); bool mirroring = UBSettings::settings()->webShowPageImmediatelyOnMirroredScreen->get().toBool(); diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index 78950431..c0c9f6eb 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -104,7 +104,7 @@ class UBWebController : public QObject void lookForEmbedContent(QString* pHtml, QString tag, QString attribute, QList* pList); void checkForOEmbed(QString* pHtml); - QStackedWidget mStackedWidget[TotalNumberOfWebInstances]; + QStackedWidget *mStackedWidget; UBMainWindow *mMainWindow;