diff --git a/resources/library/interactive/Anyembed.wgt/config.xml b/resources/library/applications/Anyembed.wgt/config.xml similarity index 100% rename from resources/library/interactive/Anyembed.wgt/config.xml rename to resources/library/applications/Anyembed.wgt/config.xml diff --git a/resources/library/interactive/Anyembed.wgt/css/ubwidget.css b/resources/library/applications/Anyembed.wgt/css/ubwidget.css similarity index 100% rename from resources/library/interactive/Anyembed.wgt/css/ubwidget.css rename to resources/library/applications/Anyembed.wgt/css/ubwidget.css diff --git a/resources/library/interactive/Anyembed.wgt/icon.png b/resources/library/applications/Anyembed.wgt/icon.png similarity index 100% rename from resources/library/interactive/Anyembed.wgt/icon.png rename to resources/library/applications/Anyembed.wgt/icon.png diff --git a/resources/library/interactive/Anyembed.wgt/index.html b/resources/library/applications/Anyembed.wgt/index.html similarity index 100% rename from resources/library/interactive/Anyembed.wgt/index.html rename to resources/library/applications/Anyembed.wgt/index.html diff --git a/resources/library/interactive/Anyembed.wgt/js/jquery-1.3.2.min.js b/resources/library/applications/Anyembed.wgt/js/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/Anyembed.wgt/js/jquery-1.3.2.min.js rename to resources/library/applications/Anyembed.wgt/js/jquery-1.3.2.min.js diff --git a/resources/library/interactive/Anyembed.wgt/js/jquery.disable.text.select.js b/resources/library/applications/Anyembed.wgt/js/jquery.disable.text.select.js similarity index 100% rename from resources/library/interactive/Anyembed.wgt/js/jquery.disable.text.select.js rename to resources/library/applications/Anyembed.wgt/js/jquery.disable.text.select.js diff --git a/resources/library/interactive/Anyembed.wgt/js/languages.js b/resources/library/applications/Anyembed.wgt/js/languages.js similarity index 100% rename from resources/library/interactive/Anyembed.wgt/js/languages.js rename to resources/library/applications/Anyembed.wgt/js/languages.js diff --git a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js b/resources/library/applications/Anyembed.wgt/js/ubw-main.js similarity index 100% rename from resources/library/interactive/Anyembed.wgt/js/ubw-main.js rename to resources/library/applications/Anyembed.wgt/js/ubw-main.js diff --git a/resources/library/interactive/Calculator.wgt/config.xml b/resources/library/applications/Calculator.wgt/config.xml similarity index 100% rename from resources/library/interactive/Calculator.wgt/config.xml rename to resources/library/applications/Calculator.wgt/config.xml diff --git a/resources/library/interactive/Calculator.wgt/css/ubwidget.css b/resources/library/applications/Calculator.wgt/css/ubwidget.css similarity index 100% rename from resources/library/interactive/Calculator.wgt/css/ubwidget.css rename to resources/library/applications/Calculator.wgt/css/ubwidget.css diff --git a/resources/library/interactive/Calculator.wgt/icon.png b/resources/library/applications/Calculator.wgt/icon.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/icon.png rename to resources/library/applications/Calculator.wgt/icon.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_out/bottom.png b/resources/library/applications/Calculator.wgt/images/arrows_out/bottom.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_out/bottom.png rename to resources/library/applications/Calculator.wgt/images/arrows_out/bottom.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_out/left.png b/resources/library/applications/Calculator.wgt/images/arrows_out/left.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_out/left.png rename to resources/library/applications/Calculator.wgt/images/arrows_out/left.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_out/right.png b/resources/library/applications/Calculator.wgt/images/arrows_out/right.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_out/right.png rename to resources/library/applications/Calculator.wgt/images/arrows_out/right.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_out/top.png b/resources/library/applications/Calculator.wgt/images/arrows_out/top.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_out/top.png rename to resources/library/applications/Calculator.wgt/images/arrows_out/top.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_bottom.png b/resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_bottom.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_bottom.png rename to resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_bottom.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_left.png b/resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_left.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_left.png rename to resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_left.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_right.png b/resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_right.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_right.png rename to resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_right.png diff --git a/resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_top.png b/resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_top.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/arrows_over/button_arrow_top.png rename to resources/library/applications/Calculator.wgt/images/arrows_over/button_arrow_top.png diff --git a/resources/library/interactive/Calculator.wgt/images/back.png b/resources/library/applications/Calculator.wgt/images/back.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/back.png rename to resources/library/applications/Calculator.wgt/images/back.png diff --git a/resources/library/interactive/Calculator.wgt/images/back_small.png b/resources/library/applications/Calculator.wgt/images/back_small.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/back_small.png rename to resources/library/applications/Calculator.wgt/images/back_small.png diff --git a/resources/library/interactive/Calculator.wgt/images/button_out-copie.png b/resources/library/applications/Calculator.wgt/images/button_out-copie.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_out-copie.png rename to resources/library/applications/Calculator.wgt/images/button_out-copie.png diff --git a/resources/library/interactive/Calculator.wgt/images/button_out.gif b/resources/library/applications/Calculator.wgt/images/button_out.gif similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_out.gif rename to resources/library/applications/Calculator.wgt/images/button_out.gif diff --git a/resources/library/interactive/Calculator.wgt/images/button_out.png b/resources/library/applications/Calculator.wgt/images/button_out.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_out.png rename to resources/library/applications/Calculator.wgt/images/button_out.png diff --git a/resources/library/interactive/Calculator.wgt/images/button_out_dark.gif b/resources/library/applications/Calculator.wgt/images/button_out_dark.gif similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_out_dark.gif rename to resources/library/applications/Calculator.wgt/images/button_out_dark.gif diff --git a/resources/library/interactive/Calculator.wgt/images/button_out_dark.png b/resources/library/applications/Calculator.wgt/images/button_out_dark.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_out_dark.png rename to resources/library/applications/Calculator.wgt/images/button_out_dark.png diff --git a/resources/library/interactive/Calculator.wgt/images/button_over.gif b/resources/library/applications/Calculator.wgt/images/button_over.gif similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_over.gif rename to resources/library/applications/Calculator.wgt/images/button_over.gif diff --git a/resources/library/interactive/Calculator.wgt/images/button_toggle.png b/resources/library/applications/Calculator.wgt/images/button_toggle.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_toggle.png rename to resources/library/applications/Calculator.wgt/images/button_toggle.png diff --git a/resources/library/interactive/Calculator.wgt/images/button_toggle_invert.png b/resources/library/applications/Calculator.wgt/images/button_toggle_invert.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/button_toggle_invert.png rename to resources/library/applications/Calculator.wgt/images/button_toggle_invert.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/back.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/back.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/back.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/back.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/bottom.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/bottom.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/bottom.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/bottom.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/cbottomleft.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/cbottomleft.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/cbottomleft.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/cbottomleft.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/cbottomright.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/cbottomright.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/cbottomright.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/cbottomright.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/ctopleft.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/ctopleft.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/ctopleft.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/ctopleft.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/ctopright.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/ctopright.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/ctopright.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/ctopright.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/left.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/left.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/left.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/left.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/right.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/right.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/right.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/right.png diff --git a/resources/library/interactive/Calculator.wgt/images/buttons_shadow/top.png b/resources/library/applications/Calculator.wgt/images/buttons_shadow/top.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/buttons_shadow/top.png rename to resources/library/applications/Calculator.wgt/images/buttons_shadow/top.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pi.png b/resources/library/applications/Calculator.wgt/images/calculator/pi.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pi.png rename to resources/library/applications/Calculator.wgt/images/calculator/pi.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pi.psd b/resources/library/applications/Calculator.wgt/images/calculator/pi.psd similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pi.psd rename to resources/library/applications/Calculator.wgt/images/calculator/pi.psd diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pi_click.png b/resources/library/applications/Calculator.wgt/images/calculator/pi_click.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pi_click.png rename to resources/library/applications/Calculator.wgt/images/calculator/pi_click.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pi_over.png b/resources/library/applications/Calculator.wgt/images/calculator/pi_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pi_over.png rename to resources/library/applications/Calculator.wgt/images/calculator/pi_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pow.png b/resources/library/applications/Calculator.wgt/images/calculator/pow.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pow.png rename to resources/library/applications/Calculator.wgt/images/calculator/pow.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/pow.psd b/resources/library/applications/Calculator.wgt/images/calculator/pow.psd similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/pow.psd rename to resources/library/applications/Calculator.wgt/images/calculator/pow.psd diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/sq.png b/resources/library/applications/Calculator.wgt/images/calculator/sq.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/sq.png rename to resources/library/applications/Calculator.wgt/images/calculator/sq.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/sq.psd b/resources/library/applications/Calculator.wgt/images/calculator/sq.psd similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/sq.psd rename to resources/library/applications/Calculator.wgt/images/calculator/sq.psd diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/sq_click.png b/resources/library/applications/Calculator.wgt/images/calculator/sq_click.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/sq_click.png rename to resources/library/applications/Calculator.wgt/images/calculator/sq_click.png diff --git a/resources/library/interactive/Calculator.wgt/images/calculator/sq_over.png b/resources/library/applications/Calculator.wgt/images/calculator/sq_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/calculator/sq_over.png rename to resources/library/applications/Calculator.wgt/images/calculator/sq_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/display copy.png b/resources/library/applications/Calculator.wgt/images/display copy.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/display copy.png rename to resources/library/applications/Calculator.wgt/images/display copy.png diff --git a/resources/library/interactive/Calculator.wgt/images/display.png b/resources/library/applications/Calculator.wgt/images/display.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/display.png rename to resources/library/applications/Calculator.wgt/images/display.png diff --git a/resources/library/interactive/Calculator.wgt/images/historyback.png b/resources/library/applications/Calculator.wgt/images/historyback.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/historyback.png rename to resources/library/applications/Calculator.wgt/images/historyback.png diff --git a/resources/library/interactive/Calculator.wgt/images/historytab.png b/resources/library/applications/Calculator.wgt/images/historytab.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/historytab.png rename to resources/library/applications/Calculator.wgt/images/historytab.png diff --git a/resources/library/interactive/Calculator.wgt/images/historytabOver.png b/resources/library/applications/Calculator.wgt/images/historytabOver.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/historytabOver.png rename to resources/library/applications/Calculator.wgt/images/historytabOver.png diff --git a/resources/library/interactive/Calculator.wgt/images/inspector.png b/resources/library/applications/Calculator.wgt/images/inspector.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/inspector.png rename to resources/library/applications/Calculator.wgt/images/inspector.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche0.png b/resources/library/applications/Calculator.wgt/images/touche0.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche0.png rename to resources/library/applications/Calculator.wgt/images/touche0.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche0_over.png b/resources/library/applications/Calculator.wgt/images/touche0_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche0_over.png rename to resources/library/applications/Calculator.wgt/images/touche0_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche0_over_down.png b/resources/library/applications/Calculator.wgt/images/touche0_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche0_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche0_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche1.png b/resources/library/applications/Calculator.wgt/images/touche1.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche1.png rename to resources/library/applications/Calculator.wgt/images/touche1.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche1_over.png b/resources/library/applications/Calculator.wgt/images/touche1_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche1_over.png rename to resources/library/applications/Calculator.wgt/images/touche1_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche1_over_down.png b/resources/library/applications/Calculator.wgt/images/touche1_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche1_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche1_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche2.png b/resources/library/applications/Calculator.wgt/images/touche2.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche2.png rename to resources/library/applications/Calculator.wgt/images/touche2.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche2_over.png b/resources/library/applications/Calculator.wgt/images/touche2_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche2_over.png rename to resources/library/applications/Calculator.wgt/images/touche2_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche2_over_down.png b/resources/library/applications/Calculator.wgt/images/touche2_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche2_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche2_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche3.png b/resources/library/applications/Calculator.wgt/images/touche3.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche3.png rename to resources/library/applications/Calculator.wgt/images/touche3.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche3_over.png b/resources/library/applications/Calculator.wgt/images/touche3_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche3_over.png rename to resources/library/applications/Calculator.wgt/images/touche3_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche3_over_down.png b/resources/library/applications/Calculator.wgt/images/touche3_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche3_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche3_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche4.png b/resources/library/applications/Calculator.wgt/images/touche4.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche4.png rename to resources/library/applications/Calculator.wgt/images/touche4.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche4_over.png b/resources/library/applications/Calculator.wgt/images/touche4_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche4_over.png rename to resources/library/applications/Calculator.wgt/images/touche4_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche4_over_down.png b/resources/library/applications/Calculator.wgt/images/touche4_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche4_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche4_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche5.png b/resources/library/applications/Calculator.wgt/images/touche5.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche5.png rename to resources/library/applications/Calculator.wgt/images/touche5.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche5_over.png b/resources/library/applications/Calculator.wgt/images/touche5_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche5_over.png rename to resources/library/applications/Calculator.wgt/images/touche5_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche5_over_down.png b/resources/library/applications/Calculator.wgt/images/touche5_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche5_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche5_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche6.png b/resources/library/applications/Calculator.wgt/images/touche6.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche6.png rename to resources/library/applications/Calculator.wgt/images/touche6.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche6_over.png b/resources/library/applications/Calculator.wgt/images/touche6_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche6_over.png rename to resources/library/applications/Calculator.wgt/images/touche6_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche6_over_down.png b/resources/library/applications/Calculator.wgt/images/touche6_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche6_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche6_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche7.png b/resources/library/applications/Calculator.wgt/images/touche7.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche7.png rename to resources/library/applications/Calculator.wgt/images/touche7.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche7_over.png b/resources/library/applications/Calculator.wgt/images/touche7_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche7_over.png rename to resources/library/applications/Calculator.wgt/images/touche7_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche7_over_down.png b/resources/library/applications/Calculator.wgt/images/touche7_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche7_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche7_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche8.png b/resources/library/applications/Calculator.wgt/images/touche8.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche8.png rename to resources/library/applications/Calculator.wgt/images/touche8.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche8_over.png b/resources/library/applications/Calculator.wgt/images/touche8_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche8_over.png rename to resources/library/applications/Calculator.wgt/images/touche8_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche8_over_down.png b/resources/library/applications/Calculator.wgt/images/touche8_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche8_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche8_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche9.png b/resources/library/applications/Calculator.wgt/images/touche9.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche9.png rename to resources/library/applications/Calculator.wgt/images/touche9.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche9_over.png b/resources/library/applications/Calculator.wgt/images/touche9_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche9_over.png rename to resources/library/applications/Calculator.wgt/images/touche9_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touche9_over_down.png b/resources/library/applications/Calculator.wgt/images/touche9_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touche9_over_down.png rename to resources/library/applications/Calculator.wgt/images/touche9_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchec.png b/resources/library/applications/Calculator.wgt/images/touchec.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchec.png rename to resources/library/applications/Calculator.wgt/images/touchec.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchec_over.png b/resources/library/applications/Calculator.wgt/images/touchec_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchec_over.png rename to resources/library/applications/Calculator.wgt/images/touchec_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchec_over_down.png b/resources/library/applications/Calculator.wgt/images/touchec_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchec_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchec_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchediv.png b/resources/library/applications/Calculator.wgt/images/touchediv.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchediv.png rename to resources/library/applications/Calculator.wgt/images/touchediv.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchediv_over.png b/resources/library/applications/Calculator.wgt/images/touchediv_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchediv_over.png rename to resources/library/applications/Calculator.wgt/images/touchediv_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchediv_over_down.png b/resources/library/applications/Calculator.wgt/images/touchediv_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchediv_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchediv_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchedot.png b/resources/library/applications/Calculator.wgt/images/touchedot.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchedot.png rename to resources/library/applications/Calculator.wgt/images/touchedot.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchedot_over.png b/resources/library/applications/Calculator.wgt/images/touchedot_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchedot_over.png rename to resources/library/applications/Calculator.wgt/images/touchedot_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchedot_over_down.png b/resources/library/applications/Calculator.wgt/images/touchedot_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchedot_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchedot_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/toucheeq.png b/resources/library/applications/Calculator.wgt/images/toucheeq.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/toucheeq.png rename to resources/library/applications/Calculator.wgt/images/toucheeq.png diff --git a/resources/library/interactive/Calculator.wgt/images/toucheeq_over.png b/resources/library/applications/Calculator.wgt/images/toucheeq_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/toucheeq_over.png rename to resources/library/applications/Calculator.wgt/images/toucheeq_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/toucheeq_over_down.png b/resources/library/applications/Calculator.wgt/images/toucheeq_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/toucheeq_over_down.png rename to resources/library/applications/Calculator.wgt/images/toucheeq_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchef.png b/resources/library/applications/Calculator.wgt/images/touchef.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchef.png rename to resources/library/applications/Calculator.wgt/images/touchef.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchef_over.png b/resources/library/applications/Calculator.wgt/images/touchef_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchef_over.png rename to resources/library/applications/Calculator.wgt/images/touchef_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchef_over_down.png b/resources/library/applications/Calculator.wgt/images/touchef_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchef_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchef_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchem.png b/resources/library/applications/Calculator.wgt/images/touchem.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchem.png rename to resources/library/applications/Calculator.wgt/images/touchem.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchem_over.png b/resources/library/applications/Calculator.wgt/images/touchem_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchem_over.png rename to resources/library/applications/Calculator.wgt/images/touchem_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchem_over_down.png b/resources/library/applications/Calculator.wgt/images/touchem_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchem_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchem_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchep.png b/resources/library/applications/Calculator.wgt/images/touchep.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchep.png rename to resources/library/applications/Calculator.wgt/images/touchep.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchep_over.png b/resources/library/applications/Calculator.wgt/images/touchep_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchep_over.png rename to resources/library/applications/Calculator.wgt/images/touchep_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchep_over_down.png b/resources/library/applications/Calculator.wgt/images/touchep_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchep_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchep_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepd.png b/resources/library/applications/Calculator.wgt/images/touchepd.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepd.png rename to resources/library/applications/Calculator.wgt/images/touchepd.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepd_over.png b/resources/library/applications/Calculator.wgt/images/touchepd_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepd_over.png rename to resources/library/applications/Calculator.wgt/images/touchepd_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepd_over_down.png b/resources/library/applications/Calculator.wgt/images/touchepd_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepd_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchepd_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepg.png b/resources/library/applications/Calculator.wgt/images/touchepg.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepg.png rename to resources/library/applications/Calculator.wgt/images/touchepg.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepg_over.png b/resources/library/applications/Calculator.wgt/images/touchepg_over.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepg_over.png rename to resources/library/applications/Calculator.wgt/images/touchepg_over.png diff --git a/resources/library/interactive/Calculator.wgt/images/touchepg_over_down.png b/resources/library/applications/Calculator.wgt/images/touchepg_over_down.png similarity index 100% rename from resources/library/interactive/Calculator.wgt/images/touchepg_over_down.png rename to resources/library/applications/Calculator.wgt/images/touchepg_over_down.png diff --git a/resources/library/interactive/Calculator.wgt/index.html b/resources/library/applications/Calculator.wgt/index.html similarity index 100% rename from resources/library/interactive/Calculator.wgt/index.html rename to resources/library/applications/Calculator.wgt/index.html diff --git a/resources/library/interactive/Calculator.wgt/js/DD_roundies_0.0.2a.js b/resources/library/applications/Calculator.wgt/js/DD_roundies_0.0.2a.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/DD_roundies_0.0.2a.js rename to resources/library/applications/Calculator.wgt/js/DD_roundies_0.0.2a.js diff --git a/resources/library/interactive/Calculator.wgt/js/calculate.js b/resources/library/applications/Calculator.wgt/js/calculate.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/calculate.js rename to resources/library/applications/Calculator.wgt/js/calculate.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery-1.3.2.min.js b/resources/library/applications/Calculator.wgt/js/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery-1.3.2.min.js rename to resources/library/applications/Calculator.wgt/js/jquery-1.3.2.min.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery-ui-1.7.2.custom.min.js b/resources/library/applications/Calculator.wgt/js/jquery-ui-1.7.2.custom.min.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery-ui-1.7.2.custom.min.js rename to resources/library/applications/Calculator.wgt/js/jquery-ui-1.7.2.custom.min.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery.center.js b/resources/library/applications/Calculator.wgt/js/jquery.center.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery.center.js rename to resources/library/applications/Calculator.wgt/js/jquery.center.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery.disable.text.select.js b/resources/library/applications/Calculator.wgt/js/jquery.disable.text.select.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery.disable.text.select.js rename to resources/library/applications/Calculator.wgt/js/jquery.disable.text.select.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery.easing.1.2.js b/resources/library/applications/Calculator.wgt/js/jquery.easing.1.2.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery.easing.1.2.js rename to resources/library/applications/Calculator.wgt/js/jquery.easing.1.2.js diff --git a/resources/library/interactive/Calculator.wgt/js/jquery.ubwidget.js b/resources/library/applications/Calculator.wgt/js/jquery.ubwidget.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/jquery.ubwidget.js rename to resources/library/applications/Calculator.wgt/js/jquery.ubwidget.js diff --git a/resources/library/interactive/Calculator.wgt/js/ubw-main.js b/resources/library/applications/Calculator.wgt/js/ubw-main.js similarity index 100% rename from resources/library/interactive/Calculator.wgt/js/ubw-main.js rename to resources/library/applications/Calculator.wgt/js/ubw-main.js diff --git a/resources/library/interactive/ColorPicker.wgt/Default.png b/resources/library/applications/ColorPicker.wgt/Default.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/Default.png rename to resources/library/applications/ColorPicker.wgt/Default.png diff --git a/resources/library/interactive/ColorPicker.wgt/config.xml b/resources/library/applications/ColorPicker.wgt/config.xml similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/config.xml rename to resources/library/applications/ColorPicker.wgt/config.xml diff --git a/resources/library/interactive/ColorPicker.wgt/css/colorpicker.css b/resources/library/applications/ColorPicker.wgt/css/colorpicker.css similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/css/colorpicker.css rename to resources/library/applications/ColorPicker.wgt/css/colorpicker.css diff --git a/resources/library/interactive/ColorPicker.wgt/css/layout.css b/resources/library/applications/ColorPicker.wgt/css/layout.css similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/css/layout.css rename to resources/library/applications/ColorPicker.wgt/css/layout.css diff --git a/resources/library/interactive/ColorPicker.wgt/icon.png b/resources/library/applications/ColorPicker.wgt/icon.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/icon.png rename to resources/library/applications/ColorPicker.wgt/icon.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/blank.png b/resources/library/applications/ColorPicker.wgt/images/blank.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/blank.png rename to resources/library/applications/ColorPicker.wgt/images/blank.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_background.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_background.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_background.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_background.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_hex.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_hex.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_hex.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_hex.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_b.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_b.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_b.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_b.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_h.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_h.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_h.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_h.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_s.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_s.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_hsb_s.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_hsb_s.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_indic.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_indic.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_overlay.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_overlay.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_overlay.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_overlay.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_b.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_b.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_b.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_b.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_g.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_g.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_g.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_g.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_r.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_r.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_rgb_r.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_rgb_r.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_select.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_select.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/colorpicker_submit.png b/resources/library/applications/ColorPicker.wgt/images/colorpicker_submit.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/colorpicker_submit.png rename to resources/library/applications/ColorPicker.wgt/images/colorpicker_submit.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_background.png b/resources/library/applications/ColorPicker.wgt/images/custom_background.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_background.png rename to resources/library/applications/ColorPicker.wgt/images/custom_background.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_hex.png b/resources/library/applications/ColorPicker.wgt/images/custom_hex.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_hex.png rename to resources/library/applications/ColorPicker.wgt/images/custom_hex.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_hsb_b.png b/resources/library/applications/ColorPicker.wgt/images/custom_hsb_b.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_hsb_b.png rename to resources/library/applications/ColorPicker.wgt/images/custom_hsb_b.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_hsb_h.png b/resources/library/applications/ColorPicker.wgt/images/custom_hsb_h.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_hsb_h.png rename to resources/library/applications/ColorPicker.wgt/images/custom_hsb_h.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_hsb_s.png b/resources/library/applications/ColorPicker.wgt/images/custom_hsb_s.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_hsb_s.png rename to resources/library/applications/ColorPicker.wgt/images/custom_hsb_s.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_indic.png b/resources/library/applications/ColorPicker.wgt/images/custom_indic.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_indic.png rename to resources/library/applications/ColorPicker.wgt/images/custom_indic.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_rgb_b.png b/resources/library/applications/ColorPicker.wgt/images/custom_rgb_b.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_rgb_b.png rename to resources/library/applications/ColorPicker.wgt/images/custom_rgb_b.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_rgb_g.png b/resources/library/applications/ColorPicker.wgt/images/custom_rgb_g.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_rgb_g.png rename to resources/library/applications/ColorPicker.wgt/images/custom_rgb_g.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_rgb_r.png b/resources/library/applications/ColorPicker.wgt/images/custom_rgb_r.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_rgb_r.png rename to resources/library/applications/ColorPicker.wgt/images/custom_rgb_r.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/custom_submit.png b/resources/library/applications/ColorPicker.wgt/images/custom_submit.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/custom_submit.png rename to resources/library/applications/ColorPicker.wgt/images/custom_submit.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/select.png b/resources/library/applications/ColorPicker.wgt/images/select.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/select.png rename to resources/library/applications/ColorPicker.wgt/images/select.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/select2.png b/resources/library/applications/ColorPicker.wgt/images/select2.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/select2.png rename to resources/library/applications/ColorPicker.wgt/images/select2.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/slider.png b/resources/library/applications/ColorPicker.wgt/images/slider.png similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/slider.png rename to resources/library/applications/ColorPicker.wgt/images/slider.png diff --git a/resources/library/interactive/ColorPicker.wgt/images/tools.jpg b/resources/library/applications/ColorPicker.wgt/images/tools.jpg similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/images/tools.jpg rename to resources/library/applications/ColorPicker.wgt/images/tools.jpg diff --git a/resources/library/interactive/ColorPicker.wgt/index.html b/resources/library/applications/ColorPicker.wgt/index.html similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/index.html rename to resources/library/applications/ColorPicker.wgt/index.html diff --git a/resources/library/interactive/ColorPicker.wgt/js/colorpicker.js b/resources/library/applications/ColorPicker.wgt/js/colorpicker.js similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/js/colorpicker.js rename to resources/library/applications/ColorPicker.wgt/js/colorpicker.js diff --git a/resources/library/interactive/ColorPicker.wgt/js/eye.js b/resources/library/applications/ColorPicker.wgt/js/eye.js similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/js/eye.js rename to resources/library/applications/ColorPicker.wgt/js/eye.js diff --git a/resources/library/interactive/ColorPicker.wgt/js/jquery.js b/resources/library/applications/ColorPicker.wgt/js/jquery.js similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/js/jquery.js rename to resources/library/applications/ColorPicker.wgt/js/jquery.js diff --git a/resources/library/interactive/ColorPicker.wgt/js/layout.js b/resources/library/applications/ColorPicker.wgt/js/layout.js similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/js/layout.js rename to resources/library/applications/ColorPicker.wgt/js/layout.js diff --git a/resources/library/interactive/ColorPicker.wgt/js/utils.js b/resources/library/applications/ColorPicker.wgt/js/utils.js similarity index 100% rename from resources/library/interactive/ColorPicker.wgt/js/utils.js rename to resources/library/applications/ColorPicker.wgt/js/utils.js diff --git a/resources/library/interactive/GeoInfo.wgt/GeoInfo.html b/resources/library/applications/GeoInfo.wgt/GeoInfo.html similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/GeoInfo.html rename to resources/library/applications/GeoInfo.wgt/GeoInfo.html diff --git a/resources/library/interactive/GeoInfo.wgt/config.xml b/resources/library/applications/GeoInfo.wgt/config.xml similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/config.xml rename to resources/library/applications/GeoInfo.wgt/config.xml diff --git a/resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css b/resources/library/applications/GeoInfo.wgt/css/GeoInfo.css similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css rename to resources/library/applications/GeoInfo.wgt/css/GeoInfo.css diff --git a/resources/library/interactive/GeoInfo.wgt/gpl-3.0.txt b/resources/library/applications/GeoInfo.wgt/gpl-3.0.txt similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/gpl-3.0.txt rename to resources/library/applications/GeoInfo.wgt/gpl-3.0.txt diff --git a/resources/library/interactive/GeoInfo.wgt/icon.png b/resources/library/applications/GeoInfo.wgt/icon.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/icon.png rename to resources/library/applications/GeoInfo.wgt/icon.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Afrique.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Afrique.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Afrique.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Afrique.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/AmeriqueNord.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/AmeriqueNord.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/AmeriqueNord.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/AmeriqueNord.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/AmeriqueSud.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/AmeriqueSud.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/AmeriqueSud.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/AmeriqueSud.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Asie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Asie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Asie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Asie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_1.png b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_1.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_1.png rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_1.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Afrique.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Afrique.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Afrique.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Afrique.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueNord.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueNord.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueNord.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueNord.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueSud.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueSud.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueSud.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_AmeriqueSud.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Eurasie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Eurasie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Eurasie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Eurasie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Oceanie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Oceanie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Carte_Monde_Oceanie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Carte_Monde_Oceanie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Eurasie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Eurasie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Eurasie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Eurasie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Eurasie2.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Eurasie2.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Eurasie2.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Eurasie2.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Europe.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Europe.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Europe.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Europe.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/EuropeOuest.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/EuropeOuest.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/EuropeOuest.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/EuropeOuest.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/EuropeOuestAsie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/EuropeOuestAsie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/EuropeOuestAsie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/EuropeOuestAsie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Cartes/Oceanie.bmp b/resources/library/applications/GeoInfo.wgt/images/Cartes/Oceanie.bmp similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Cartes/Oceanie.bmp rename to resources/library/applications/GeoInfo.wgt/images/Cartes/Oceanie.bmp diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png b/resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png rename to resources/library/applications/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/cursor.png b/resources/library/applications/GeoInfo.wgt/images/cursor.png similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/cursor.png rename to resources/library/applications/GeoInfo.wgt/images/cursor.png diff --git a/resources/library/interactive/GeoInfo.wgt/images/question.jpg b/resources/library/applications/GeoInfo.wgt/images/question.jpg similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/images/question.jpg rename to resources/library/applications/GeoInfo.wgt/images/question.jpg diff --git a/resources/library/interactive/GeoInfo.wgt/js/GeoInfo.js b/resources/library/applications/GeoInfo.wgt/js/GeoInfo.js similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/js/GeoInfo.js rename to resources/library/applications/GeoInfo.wgt/js/GeoInfo.js diff --git a/resources/library/interactive/GeoInfo.wgt/js/jquery-1.6.2.min.js b/resources/library/applications/GeoInfo.wgt/js/jquery-1.6.2.min.js similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/js/jquery-1.6.2.min.js rename to resources/library/applications/GeoInfo.wgt/js/jquery-1.6.2.min.js diff --git a/resources/library/interactive/GeoInfo.wgt/js/languages.js b/resources/library/applications/GeoInfo.wgt/js/languages.js similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/js/languages.js rename to resources/library/applications/GeoInfo.wgt/js/languages.js diff --git a/resources/library/interactive/GeoInfo.wgt/js/soapclient.js b/resources/library/applications/GeoInfo.wgt/js/soapclient.js similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/js/soapclient.js rename to resources/library/applications/GeoInfo.wgt/js/soapclient.js diff --git a/resources/library/interactive/GeoInfo.wgt/js/tinyxmldom.js b/resources/library/applications/GeoInfo.wgt/js/tinyxmldom.js similarity index 100% rename from resources/library/interactive/GeoInfo.wgt/js/tinyxmldom.js rename to resources/library/applications/GeoInfo.wgt/js/tinyxmldom.js diff --git a/resources/library/interactive/GoogleMap.wgt/config.xml b/resources/library/applications/GoogleMap.wgt/config.xml similarity index 100% rename from resources/library/interactive/GoogleMap.wgt/config.xml rename to resources/library/applications/GoogleMap.wgt/config.xml diff --git a/resources/library/interactive/GoogleMap.wgt/icon.png b/resources/library/applications/GoogleMap.wgt/icon.png similarity index 100% rename from resources/library/interactive/GoogleMap.wgt/icon.png rename to resources/library/applications/GoogleMap.wgt/icon.png diff --git a/resources/library/interactive/GoogleMap.wgt/index.html b/resources/library/applications/GoogleMap.wgt/index.html similarity index 100% rename from resources/library/interactive/GoogleMap.wgt/index.html rename to resources/library/applications/GoogleMap.wgt/index.html diff --git a/resources/library/interactive/Graphme.wgt/Grapheur.xhtml b/resources/library/applications/Graphme.wgt/Grapheur.xhtml similarity index 100% rename from resources/library/interactive/Graphme.wgt/Grapheur.xhtml rename to resources/library/applications/Graphme.wgt/Grapheur.xhtml diff --git a/resources/library/interactive/Graphme.wgt/Guide_Utilisateur.html b/resources/library/applications/Graphme.wgt/Guide_Utilisateur.html similarity index 100% rename from resources/library/interactive/Graphme.wgt/Guide_Utilisateur.html rename to resources/library/applications/Graphme.wgt/Guide_Utilisateur.html diff --git a/resources/library/interactive/Graphme.wgt/Images/.directory b/resources/library/applications/Graphme.wgt/Images/.directory similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/.directory rename to resources/library/applications/Graphme.wgt/Images/.directory diff --git a/resources/library/interactive/Graphme.wgt/Images/GraphMe.png b/resources/library/applications/Graphme.wgt/Images/GraphMe.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/GraphMe.png rename to resources/library/applications/Graphme.wgt/Images/GraphMe.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_AjouterWidget.png b/resources/library/applications/Graphme.wgt/Images/Guide_AjouterWidget.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_AjouterWidget.png rename to resources/library/applications/Graphme.wgt/Images/Guide_AjouterWidget.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Deplacement.png b/resources/library/applications/Graphme.wgt/Images/Guide_Deplacement.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Deplacement.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Deplacement.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Navigateur.png b/resources/library/applications/Graphme.wgt/Images/Guide_Navigateur.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Navigateur.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Navigateur.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Options.png b/resources/library/applications/Graphme.wgt/Images/Guide_Options.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Options.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Options.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Plus.png b/resources/library/applications/Graphme.wgt/Images/Guide_Plus.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Plus.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Plus.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Presentation.png b/resources/library/applications/Graphme.wgt/Images/Guide_Presentation.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Presentation.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Presentation.png diff --git a/resources/library/interactive/Graphme.wgt/Images/Guide_Uniboard.png b/resources/library/applications/Graphme.wgt/Images/Guide_Uniboard.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/Guide_Uniboard.png rename to resources/library/applications/Graphme.wgt/Images/Guide_Uniboard.png diff --git a/resources/library/interactive/Graphme.wgt/Images/fond1.png b/resources/library/applications/Graphme.wgt/Images/fond1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/fond1.png rename to resources/library/applications/Graphme.wgt/Images/fond1.png diff --git a/resources/library/interactive/Graphme.wgt/Images/fond2.png b/resources/library/applications/Graphme.wgt/Images/fond2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/fond2.png rename to resources/library/applications/Graphme.wgt/Images/fond2.png diff --git a/resources/library/interactive/Graphme.wgt/Images/fond3.png b/resources/library/applications/Graphme.wgt/Images/fond3.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/fond3.png rename to resources/library/applications/Graphme.wgt/Images/fond3.png diff --git a/resources/library/interactive/Graphme.wgt/Images/fond4.png b/resources/library/applications/Graphme.wgt/Images/fond4.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/fond4.png rename to resources/library/applications/Graphme.wgt/Images/fond4.png diff --git a/resources/library/interactive/Graphme.wgt/Images/fond5.png b/resources/library/applications/Graphme.wgt/Images/fond5.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/fond5.png rename to resources/library/applications/Graphme.wgt/Images/fond5.png diff --git a/resources/library/interactive/Graphme.wgt/Images/gauche1.png b/resources/library/applications/Graphme.wgt/Images/gauche1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/gauche1.png rename to resources/library/applications/Graphme.wgt/Images/gauche1.png diff --git a/resources/library/interactive/Graphme.wgt/Images/gauche2.png b/resources/library/applications/Graphme.wgt/Images/gauche2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/gauche2.png rename to resources/library/applications/Graphme.wgt/Images/gauche2.png diff --git a/resources/library/interactive/Graphme.wgt/Images/gauche3.png b/resources/library/applications/Graphme.wgt/Images/gauche3.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/gauche3.png rename to resources/library/applications/Graphme.wgt/Images/gauche3.png diff --git a/resources/library/interactive/Graphme.wgt/Images/onglet1.png b/resources/library/applications/Graphme.wgt/Images/onglet1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/onglet1.png rename to resources/library/applications/Graphme.wgt/Images/onglet1.png diff --git a/resources/library/interactive/Graphme.wgt/Images/onglet2.png b/resources/library/applications/Graphme.wgt/Images/onglet2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/Images/onglet2.png rename to resources/library/applications/Graphme.wgt/Images/onglet2.png diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/Affichage3D.js b/resources/library/applications/Graphme.wgt/JavaScript/Affichage3D.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/Affichage3D.js rename to resources/library/applications/Graphme.wgt/JavaScript/Affichage3D.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/AffichageStandard.js b/resources/library/applications/Graphme.wgt/JavaScript/AffichageStandard.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/AffichageStandard.js rename to resources/library/applications/Graphme.wgt/JavaScript/AffichageStandard.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/AffichageUniboard.js b/resources/library/applications/Graphme.wgt/JavaScript/AffichageUniboard.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/AffichageUniboard.js rename to resources/library/applications/Graphme.wgt/JavaScript/AffichageUniboard.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/AffichageXPM.js b/resources/library/applications/Graphme.wgt/JavaScript/AffichageXPM.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/AffichageXPM.js rename to resources/library/applications/Graphme.wgt/JavaScript/AffichageXPM.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/ColorPicker.js b/resources/library/applications/Graphme.wgt/JavaScript/ColorPicker.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/ColorPicker.js rename to resources/library/applications/Graphme.wgt/JavaScript/ColorPicker.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/Etude.js b/resources/library/applications/Graphme.wgt/JavaScript/Etude.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/Etude.js rename to resources/library/applications/Graphme.wgt/JavaScript/Etude.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/Interface.js b/resources/library/applications/Graphme.wgt/JavaScript/Interface.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/Interface.js rename to resources/library/applications/Graphme.wgt/JavaScript/Interface.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/Outils.js b/resources/library/applications/Graphme.wgt/JavaScript/Outils.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/Outils.js rename to resources/library/applications/Graphme.wgt/JavaScript/Outils.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/Sauvegardes.js b/resources/library/applications/Graphme.wgt/JavaScript/Sauvegardes.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/Sauvegardes.js rename to resources/library/applications/Graphme.wgt/JavaScript/Sauvegardes.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/jquery-1.3.2.min.js b/resources/library/applications/Graphme.wgt/JavaScript/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/jquery-1.3.2.min.js rename to resources/library/applications/Graphme.wgt/JavaScript/jquery-1.3.2.min.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/jquery.disable.text.select.js b/resources/library/applications/Graphme.wgt/JavaScript/jquery.disable.text.select.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/jquery.disable.text.select.js rename to resources/library/applications/Graphme.wgt/JavaScript/jquery.disable.text.select.js diff --git a/resources/library/interactive/Graphme.wgt/JavaScript/languages.js b/resources/library/applications/Graphme.wgt/JavaScript/languages.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/JavaScript/languages.js rename to resources/library/applications/Graphme.wgt/JavaScript/languages.js diff --git a/resources/library/interactive/Graphme.wgt/Style/Guide_Utilisateur.css b/resources/library/applications/Graphme.wgt/Style/Guide_Utilisateur.css similarity index 100% rename from resources/library/interactive/Graphme.wgt/Style/Guide_Utilisateur.css rename to resources/library/applications/Graphme.wgt/Style/Guide_Utilisateur.css diff --git a/resources/library/interactive/Graphme.wgt/Style/default.css b/resources/library/applications/Graphme.wgt/Style/default.css similarity index 100% rename from resources/library/interactive/Graphme.wgt/Style/default.css rename to resources/library/applications/Graphme.wgt/Style/default.css diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._Grapheur.xhtml b/resources/library/applications/Graphme.wgt/__MACOSX/._Grapheur.xhtml similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._Grapheur.xhtml rename to resources/library/applications/Graphme.wgt/__MACOSX/._Grapheur.xhtml diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._Guide_Utilisateur.html b/resources/library/applications/Graphme.wgt/__MACOSX/._Guide_Utilisateur.html similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._Guide_Utilisateur.html rename to resources/library/applications/Graphme.wgt/__MACOSX/._Guide_Utilisateur.html diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._Images b/resources/library/applications/Graphme.wgt/__MACOSX/._Images similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._Images rename to resources/library/applications/Graphme.wgt/__MACOSX/._Images diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._JavaScript b/resources/library/applications/Graphme.wgt/__MACOSX/._JavaScript similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._JavaScript rename to resources/library/applications/Graphme.wgt/__MACOSX/._JavaScript diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._Style b/resources/library/applications/Graphme.wgt/__MACOSX/._Style similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._Style rename to resources/library/applications/Graphme.wgt/__MACOSX/._Style diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._config.xml b/resources/library/applications/Graphme.wgt/__MACOSX/._config.xml similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._config.xml rename to resources/library/applications/Graphme.wgt/__MACOSX/._config.xml diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._icon.png b/resources/library/applications/Graphme.wgt/__MACOSX/._icon.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._icon.png rename to resources/library/applications/Graphme.wgt/__MACOSX/._icon.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/._version.html b/resources/library/applications/Graphme.wgt/__MACOSX/._version.html similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/._version.html rename to resources/library/applications/Graphme.wgt/__MACOSX/._version.html diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._.directory b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._.directory similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._.directory rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._.directory diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._GraphMe.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._GraphMe.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._GraphMe.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._GraphMe.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_AjouterWidget.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_AjouterWidget.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_AjouterWidget.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_AjouterWidget.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Deplacement.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Deplacement.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Deplacement.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Deplacement.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Navigateur.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Navigateur.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Navigateur.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Navigateur.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Options.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Options.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Options.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Options.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Plus.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Plus.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Plus.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Plus.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Presentation.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Presentation.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Presentation.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Presentation.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Uniboard.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Uniboard.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._Guide_Uniboard.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._Guide_Uniboard.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond1.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond1.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond1.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond2.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond2.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond2.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond3.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond3.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond3.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond3.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond4.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond4.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond4.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond4.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond5.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond5.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._fond5.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._fond5.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche1.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche1.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche1.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche2.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche2.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche2.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche3.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche3.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._gauche3.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._gauche3.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._onglet1.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._onglet1.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._onglet1.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._onglet1.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Images/._onglet2.png b/resources/library/applications/Graphme.wgt/__MACOSX/Images/._onglet2.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Images/._onglet2.png rename to resources/library/applications/Graphme.wgt/__MACOSX/Images/._onglet2.png diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._.directory b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._.directory similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._.directory rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._.directory diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Affichage3D.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Affichage3D.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Affichage3D.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Affichage3D.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageStandard.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageStandard.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageStandard.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageStandard.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageUniboard.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageUniboard.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageUniboard.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageUniboard.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageXPM.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageXPM.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._AffichageXPM.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._AffichageXPM.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._ColorPicker.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._ColorPicker.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._ColorPicker.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._ColorPicker.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Etude.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Etude.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Etude.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Etude.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Interface.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Interface.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Interface.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Interface.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Outils.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Outils.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Outils.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Outils.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Sauvegardes.js b/resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Sauvegardes.js similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/JavaScript/._Sauvegardes.js rename to resources/library/applications/Graphme.wgt/__MACOSX/JavaScript/._Sauvegardes.js diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Style/._Guide_Utilisateur.css b/resources/library/applications/Graphme.wgt/__MACOSX/Style/._Guide_Utilisateur.css similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Style/._Guide_Utilisateur.css rename to resources/library/applications/Graphme.wgt/__MACOSX/Style/._Guide_Utilisateur.css diff --git a/resources/library/interactive/Graphme.wgt/__MACOSX/Style/._default.css b/resources/library/applications/Graphme.wgt/__MACOSX/Style/._default.css similarity index 100% rename from resources/library/interactive/Graphme.wgt/__MACOSX/Style/._default.css rename to resources/library/applications/Graphme.wgt/__MACOSX/Style/._default.css diff --git a/resources/library/interactive/Graphme.wgt/config.xml b/resources/library/applications/Graphme.wgt/config.xml similarity index 100% rename from resources/library/interactive/Graphme.wgt/config.xml rename to resources/library/applications/Graphme.wgt/config.xml diff --git a/resources/library/interactive/Graphme.wgt/icon.png b/resources/library/applications/Graphme.wgt/icon.png similarity index 100% rename from resources/library/interactive/Graphme.wgt/icon.png rename to resources/library/applications/Graphme.wgt/icon.png diff --git a/resources/library/interactive/Graphme.wgt/version.html b/resources/library/applications/Graphme.wgt/version.html similarity index 100% rename from resources/library/interactive/Graphme.wgt/version.html rename to resources/library/applications/Graphme.wgt/version.html diff --git a/resources/library/interactive/Html.wgt/config.xml b/resources/library/applications/Html.wgt/config.xml similarity index 100% rename from resources/library/interactive/Html.wgt/config.xml rename to resources/library/applications/Html.wgt/config.xml diff --git a/resources/library/interactive/Html.wgt/icon.png b/resources/library/applications/Html.wgt/icon.png similarity index 100% rename from resources/library/interactive/Html.wgt/icon.png rename to resources/library/applications/Html.wgt/icon.png diff --git a/resources/library/interactive/Html.wgt/images/bts.png b/resources/library/applications/Html.wgt/images/bts.png similarity index 100% rename from resources/library/interactive/Html.wgt/images/bts.png rename to resources/library/applications/Html.wgt/images/bts.png diff --git a/resources/library/interactive/Html.wgt/images/style.css b/resources/library/applications/Html.wgt/images/style.css similarity index 100% rename from resources/library/interactive/Html.wgt/images/style.css rename to resources/library/applications/Html.wgt/images/style.css diff --git a/resources/library/interactive/Html.wgt/index.html b/resources/library/applications/Html.wgt/index.html similarity index 100% rename from resources/library/interactive/Html.wgt/index.html rename to resources/library/applications/Html.wgt/index.html diff --git a/resources/library/interactive/Html.wgt/jquery.pack.js b/resources/library/applications/Html.wgt/jquery.pack.js similarity index 100% rename from resources/library/interactive/Html.wgt/jquery.pack.js rename to resources/library/applications/Html.wgt/jquery.pack.js diff --git a/resources/library/interactive/Html.wgt/languages.js b/resources/library/applications/Html.wgt/languages.js similarity index 100% rename from resources/library/interactive/Html.wgt/languages.js rename to resources/library/applications/Html.wgt/languages.js diff --git a/resources/library/interactive/Html.wgt/markitup/jquery.markitup.js b/resources/library/applications/Html.wgt/markitup/jquery.markitup.js similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/jquery.markitup.js rename to resources/library/applications/Html.wgt/markitup/jquery.markitup.js diff --git a/resources/library/interactive/Html.wgt/markitup/jquery.markitup.pack.js b/resources/library/applications/Html.wgt/markitup/jquery.markitup.pack.js similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/jquery.markitup.pack.js rename to resources/library/applications/Html.wgt/markitup/jquery.markitup.pack.js diff --git a/resources/library/interactive/Html.wgt/markitup/readme.txt b/resources/library/applications/Html.wgt/markitup/readme.txt similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/readme.txt rename to resources/library/applications/Html.wgt/markitup/readme.txt diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/bold.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/bold.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/bold.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/bold.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/clean.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/clean.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/clean.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/clean.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/image.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/image.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/image.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/image.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/italic.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/italic.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/italic.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/italic.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/link.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/link.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/link.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/link.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/picture.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/picture.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/picture.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/picture.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/preview.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/preview.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/preview.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/preview.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/images/stroke.png b/resources/library/applications/Html.wgt/markitup/sets/default/images/stroke.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/images/stroke.png rename to resources/library/applications/Html.wgt/markitup/sets/default/images/stroke.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/set.js b/resources/library/applications/Html.wgt/markitup/sets/default/set.js similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/set.js rename to resources/library/applications/Html.wgt/markitup/sets/default/set.js diff --git a/resources/library/interactive/Html.wgt/markitup/sets/default/style.css b/resources/library/applications/Html.wgt/markitup/sets/default/style.css similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/default/style.css rename to resources/library/applications/Html.wgt/markitup/sets/default/style.css diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/bold.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/bold.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/bold.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/bold.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/clean.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/clean.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/clean.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/clean.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h1.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h1.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h1.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h1.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h2.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h2.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h2.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h2.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h3.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h3.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h3.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h3.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h4.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h4.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h4.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h4.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h5.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h5.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h5.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h5.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/h6.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/h6.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/h6.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/h6.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/image.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/image.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/image.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/image.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/italic.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/italic.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/italic.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/italic.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/link.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/link.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/link.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/link.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/list-bullet.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/list-bullet.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/list-bullet.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/list-bullet.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/list-item.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/list-item.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/list-item.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/list-item.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/list-numeric.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/list-numeric.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/list-numeric.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/list-numeric.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/paragraph.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/paragraph.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/paragraph.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/paragraph.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/picture.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/picture.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/picture.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/picture.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/preview.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/preview.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/preview.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/preview.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/images/stroke.png b/resources/library/applications/Html.wgt/markitup/sets/html/images/stroke.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/images/stroke.png rename to resources/library/applications/Html.wgt/markitup/sets/html/images/stroke.png diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/readme.txt b/resources/library/applications/Html.wgt/markitup/sets/html/readme.txt similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/readme.txt rename to resources/library/applications/Html.wgt/markitup/sets/html/readme.txt diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/set.js b/resources/library/applications/Html.wgt/markitup/sets/html/set.js similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/set.js rename to resources/library/applications/Html.wgt/markitup/sets/html/set.js diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/style.css b/resources/library/applications/Html.wgt/markitup/sets/html/style.css similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/sets/html/style.css rename to resources/library/applications/Html.wgt/markitup/sets/html/style.css diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-container-white.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-container-white.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-container-white.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-container-white.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-container.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-container.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-container.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-container.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-footer-white.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-footer-white.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-footer-white.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-footer-white.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-footer.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-footer.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-footer.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-footer.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-header-white.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-header-white.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-header-white.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-header-white.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-header.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-header.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/bg-header.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/bg-header.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/handle.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/handle.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/handle.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/handle.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/menu.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/menu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/menu.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/menu.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/spacer.gif b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/spacer.gif similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/spacer.gif rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/spacer.gif diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/images/submenu.png b/resources/library/applications/Html.wgt/markitup/skins/macosx/images/submenu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/images/submenu.png rename to resources/library/applications/Html.wgt/markitup/skins/macosx/images/submenu.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/readme.txt b/resources/library/applications/Html.wgt/markitup/skins/macosx/readme.txt similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/readme.txt rename to resources/library/applications/Html.wgt/markitup/skins/macosx/readme.txt diff --git a/resources/library/interactive/Html.wgt/markitup/skins/macosx/style.css b/resources/library/applications/Html.wgt/markitup/skins/macosx/style.css similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/macosx/style.css rename to resources/library/applications/Html.wgt/markitup/skins/macosx/style.css diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-container.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-container.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-container.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-container.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-bbcode.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-bbcode.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-bbcode.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-bbcode.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-dotclear.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-dotclear.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-dotclear.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-dotclear.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-html.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-html.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-html.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-html.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-json.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-json.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-json.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-json.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-markdown.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-markdown.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-markdown.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-markdown.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-textile.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-textile.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-textile.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-textile.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-wiki.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-wiki.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-wiki.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-wiki.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-xml.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-xml.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor-xml.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor-xml.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/bg-editor.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/bg-editor.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/handle.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/handle.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/handle.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/handle.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/menu.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/menu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/menu.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/menu.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/images/submenu.png b/resources/library/applications/Html.wgt/markitup/skins/markitup/images/submenu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/images/submenu.png rename to resources/library/applications/Html.wgt/markitup/skins/markitup/images/submenu.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/markitup/style.css b/resources/library/applications/Html.wgt/markitup/skins/markitup/style.css similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/markitup/style.css rename to resources/library/applications/Html.wgt/markitup/skins/markitup/style.css diff --git a/resources/library/interactive/Html.wgt/markitup/skins/simple/images/handle.png b/resources/library/applications/Html.wgt/markitup/skins/simple/images/handle.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/simple/images/handle.png rename to resources/library/applications/Html.wgt/markitup/skins/simple/images/handle.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/simple/images/menu.png b/resources/library/applications/Html.wgt/markitup/skins/simple/images/menu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/simple/images/menu.png rename to resources/library/applications/Html.wgt/markitup/skins/simple/images/menu.png diff --git a/resources/library/interactive/Html.wgt/markitup/skins/simple/images/submenu.png b/resources/library/applications/Html.wgt/markitup/skins/simple/images/submenu.png similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/skins/simple/images/submenu.png rename to resources/library/applications/Html.wgt/markitup/skins/simple/images/submenu.png diff --git a/resources/library/interactive/Html.wgt/markitup/templates/preview.css b/resources/library/applications/Html.wgt/markitup/templates/preview.css similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/templates/preview.css rename to resources/library/applications/Html.wgt/markitup/templates/preview.css diff --git a/resources/library/interactive/Html.wgt/markitup/templates/preview.html b/resources/library/applications/Html.wgt/markitup/templates/preview.html similarity index 100% rename from resources/library/interactive/Html.wgt/markitup/templates/preview.html rename to resources/library/applications/Html.wgt/markitup/templates/preview.html diff --git a/resources/library/interactive/Notes.wgt/config.xml b/resources/library/applications/Notes.wgt/config.xml similarity index 100% rename from resources/library/interactive/Notes.wgt/config.xml rename to resources/library/applications/Notes.wgt/config.xml diff --git a/resources/library/interactive/Notes.wgt/css/jScrollPane.css b/resources/library/applications/Notes.wgt/css/jScrollPane.css similarity index 100% rename from resources/library/interactive/Notes.wgt/css/jScrollPane.css rename to resources/library/applications/Notes.wgt/css/jScrollPane.css diff --git a/resources/library/interactive/Notes.wgt/css/ubwidget.css b/resources/library/applications/Notes.wgt/css/ubwidget.css similarity index 100% rename from resources/library/interactive/Notes.wgt/css/ubwidget.css rename to resources/library/applications/Notes.wgt/css/ubwidget.css diff --git a/resources/library/interactive/Notes.wgt/icon.png b/resources/library/applications/Notes.wgt/icon.png similarity index 100% rename from resources/library/interactive/Notes.wgt/icon.png rename to resources/library/applications/Notes.wgt/icon.png diff --git a/resources/library/interactive/Notes.wgt/images/back.png b/resources/library/applications/Notes.wgt/images/back.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/back.png rename to resources/library/applications/Notes.wgt/images/back.png diff --git a/resources/library/interactive/Notes.wgt/images/shadowcenter.png b/resources/library/applications/Notes.wgt/images/shadowcenter.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/shadowcenter.png rename to resources/library/applications/Notes.wgt/images/shadowcenter.png diff --git a/resources/library/interactive/Notes.wgt/images/shadowleft.png b/resources/library/applications/Notes.wgt/images/shadowleft.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/shadowleft.png rename to resources/library/applications/Notes.wgt/images/shadowleft.png diff --git a/resources/library/interactive/Notes.wgt/images/shadowright.png b/resources/library/applications/Notes.wgt/images/shadowright.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/shadowright.png rename to resources/library/applications/Notes.wgt/images/shadowright.png diff --git a/resources/library/interactive/Notes.wgt/images/stick-but-aminus.png b/resources/library/applications/Notes.wgt/images/stick-but-aminus.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/stick-but-aminus.png rename to resources/library/applications/Notes.wgt/images/stick-but-aminus.png diff --git a/resources/library/interactive/Notes.wgt/images/stick-but-aplus.png b/resources/library/applications/Notes.wgt/images/stick-but-aplus.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/stick-but-aplus.png rename to resources/library/applications/Notes.wgt/images/stick-but-aplus.png diff --git a/resources/library/interactive/Notes.wgt/images/stick-but-maximize.png b/resources/library/applications/Notes.wgt/images/stick-but-maximize.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/stick-but-maximize.png rename to resources/library/applications/Notes.wgt/images/stick-but-maximize.png diff --git a/resources/library/interactive/Notes.wgt/images/stick-but-minimize.png b/resources/library/applications/Notes.wgt/images/stick-but-minimize.png similarity index 100% rename from resources/library/interactive/Notes.wgt/images/stick-but-minimize.png rename to resources/library/applications/Notes.wgt/images/stick-but-minimize.png diff --git a/resources/library/interactive/Notes.wgt/index.html b/resources/library/applications/Notes.wgt/index.html similarity index 100% rename from resources/library/interactive/Notes.wgt/index.html rename to resources/library/applications/Notes.wgt/index.html diff --git a/resources/library/interactive/Notes.wgt/js/jquery-1.3.2.min.js b/resources/library/applications/Notes.wgt/js/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/Notes.wgt/js/jquery-1.3.2.min.js rename to resources/library/applications/Notes.wgt/js/jquery-1.3.2.min.js diff --git a/resources/library/interactive/Notes.wgt/js/jquery-ui-1.7.2.custom.min.js b/resources/library/applications/Notes.wgt/js/jquery-ui-1.7.2.custom.min.js similarity index 100% rename from resources/library/interactive/Notes.wgt/js/jquery-ui-1.7.2.custom.min.js rename to resources/library/applications/Notes.wgt/js/jquery-ui-1.7.2.custom.min.js diff --git a/resources/library/interactive/Notes.wgt/js/jquery.disable.text.select.js b/resources/library/applications/Notes.wgt/js/jquery.disable.text.select.js similarity index 100% rename from resources/library/interactive/Notes.wgt/js/jquery.disable.text.select.js rename to resources/library/applications/Notes.wgt/js/jquery.disable.text.select.js diff --git a/resources/library/interactive/Notes.wgt/js/jquery.ubwidget.js b/resources/library/applications/Notes.wgt/js/jquery.ubwidget.js similarity index 100% rename from resources/library/interactive/Notes.wgt/js/jquery.ubwidget.js rename to resources/library/applications/Notes.wgt/js/jquery.ubwidget.js diff --git a/resources/library/interactive/Notes.wgt/js/ubw-main.js b/resources/library/applications/Notes.wgt/js/ubw-main.js similarity index 100% rename from resources/library/interactive/Notes.wgt/js/ubw-main.js rename to resources/library/applications/Notes.wgt/js/ubw-main.js diff --git a/resources/library/interactive/Notes.wgt/ubw-main.js b/resources/library/applications/Notes.wgt/ubw-main.js similarity index 100% rename from resources/library/interactive/Notes.wgt/ubw-main.js rename to resources/library/applications/Notes.wgt/ubw-main.js diff --git a/resources/library/interactive/Stopwatch.wgt/beep.wav b/resources/library/applications/Stopwatch.wgt/beep.wav similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/beep.wav rename to resources/library/applications/Stopwatch.wgt/beep.wav diff --git a/resources/library/interactive/Stopwatch.wgt/config.xml b/resources/library/applications/Stopwatch.wgt/config.xml similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/config.xml rename to resources/library/applications/Stopwatch.wgt/config.xml diff --git a/resources/library/interactive/Stopwatch.wgt/css/ubwidget.css b/resources/library/applications/Stopwatch.wgt/css/ubwidget.css similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/css/ubwidget.css rename to resources/library/applications/Stopwatch.wgt/css/ubwidget.css diff --git a/resources/library/interactive/Stopwatch.wgt/finalbeep.wav b/resources/library/applications/Stopwatch.wgt/finalbeep.wav similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/finalbeep.wav rename to resources/library/applications/Stopwatch.wgt/finalbeep.wav diff --git a/resources/library/interactive/Stopwatch.wgt/icon.png b/resources/library/applications/Stopwatch.wgt/icon.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/icon.png rename to resources/library/applications/Stopwatch.wgt/icon.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_out/bottom.png b/resources/library/applications/Stopwatch.wgt/images/arrows_out/bottom.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_out/bottom.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_out/bottom.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_out/left.png b/resources/library/applications/Stopwatch.wgt/images/arrows_out/left.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_out/left.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_out/left.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_out/right.png b/resources/library/applications/Stopwatch.wgt/images/arrows_out/right.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_out/right.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_out/right.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_out/top.png b/resources/library/applications/Stopwatch.wgt/images/arrows_out/top.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_out/top.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_out/top.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/bottom.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/bottom.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/bottom.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/bottom.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_bottom.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_bottom.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_bottom.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_bottom.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_left.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_left.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_left.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_left.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_right.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_right.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_right.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_right.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_top.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_top.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/button_arrow_top.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/button_arrow_top.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/arrows_over/top.png b/resources/library/applications/Stopwatch.wgt/images/arrows_over/top.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/arrows_over/top.png rename to resources/library/applications/Stopwatch.wgt/images/arrows_over/top.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/back.png b/resources/library/applications/Stopwatch.wgt/images/back.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/back.png rename to resources/library/applications/Stopwatch.wgt/images/back.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_out-copie.png b/resources/library/applications/Stopwatch.wgt/images/button_out-copie.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_out-copie.png rename to resources/library/applications/Stopwatch.wgt/images/button_out-copie.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_out.gif b/resources/library/applications/Stopwatch.wgt/images/button_out.gif similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_out.gif rename to resources/library/applications/Stopwatch.wgt/images/button_out.gif diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_out.png b/resources/library/applications/Stopwatch.wgt/images/button_out.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_out.png rename to resources/library/applications/Stopwatch.wgt/images/button_out.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_out_dark.png b/resources/library/applications/Stopwatch.wgt/images/button_out_dark.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_out_dark.png rename to resources/library/applications/Stopwatch.wgt/images/button_out_dark.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_pause.png b/resources/library/applications/Stopwatch.wgt/images/button_pause.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_pause.png rename to resources/library/applications/Stopwatch.wgt/images/button_pause.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_pause_invert.png b/resources/library/applications/Stopwatch.wgt/images/button_pause_invert.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_pause_invert.png rename to resources/library/applications/Stopwatch.wgt/images/button_pause_invert.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_pause_invertxov.png b/resources/library/applications/Stopwatch.wgt/images/button_pause_invertxov.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_pause_invertxov.png rename to resources/library/applications/Stopwatch.wgt/images/button_pause_invertxov.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_play.png b/resources/library/applications/Stopwatch.wgt/images/button_play.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_play.png rename to resources/library/applications/Stopwatch.wgt/images/button_play.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_play_invert.png b/resources/library/applications/Stopwatch.wgt/images/button_play_invert.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_play_invert.png rename to resources/library/applications/Stopwatch.wgt/images/button_play_invert.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_play_invertxov.png b/resources/library/applications/Stopwatch.wgt/images/button_play_invertxov.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_play_invertxov.png rename to resources/library/applications/Stopwatch.wgt/images/button_play_invertxov.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_reset_invert.png b/resources/library/applications/Stopwatch.wgt/images/button_reset_invert.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_reset_invert.png rename to resources/library/applications/Stopwatch.wgt/images/button_reset_invert.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_toggle.png b/resources/library/applications/Stopwatch.wgt/images/button_toggle.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_toggle.png rename to resources/library/applications/Stopwatch.wgt/images/button_toggle.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/button_toggle_invert.png b/resources/library/applications/Stopwatch.wgt/images/button_toggle_invert.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/button_toggle_invert.png rename to resources/library/applications/Stopwatch.wgt/images/button_toggle_invert.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/back.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/back.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/back.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/back.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/bottom.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/bottom.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/bottom.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/bottom.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/cbottomleft.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/cbottomleft.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/cbottomleft.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/cbottomleft.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/cbottomright.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/cbottomright.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/cbottomright.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/cbottomright.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/ctopleft.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/ctopleft.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/ctopleft.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/ctopleft.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/ctopright.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/ctopright.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/ctopright.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/ctopright.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/left.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/left.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/left.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/left.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/right.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/right.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/right.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/right.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/top.png b/resources/library/applications/Stopwatch.wgt/images/buttons_shadow/top.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/buttons_shadow/top.png rename to resources/library/applications/Stopwatch.wgt/images/buttons_shadow/top.png diff --git a/resources/library/interactive/Stopwatch.wgt/images/inspector.png b/resources/library/applications/Stopwatch.wgt/images/inspector.png similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/images/inspector.png rename to resources/library/applications/Stopwatch.wgt/images/inspector.png diff --git a/resources/library/interactive/Stopwatch.wgt/index.html b/resources/library/applications/Stopwatch.wgt/index.html similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/index.html rename to resources/library/applications/Stopwatch.wgt/index.html diff --git a/resources/library/interactive/Stopwatch.wgt/js/DD_roundies_0.0.2a.js b/resources/library/applications/Stopwatch.wgt/js/DD_roundies_0.0.2a.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/DD_roundies_0.0.2a.js rename to resources/library/applications/Stopwatch.wgt/js/DD_roundies_0.0.2a.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/calculate.js b/resources/library/applications/Stopwatch.wgt/js/calculate.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/calculate.js rename to resources/library/applications/Stopwatch.wgt/js/calculate.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery-1.3.2.min.js b/resources/library/applications/Stopwatch.wgt/js/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery-1.3.2.min.js rename to resources/library/applications/Stopwatch.wgt/js/jquery-1.3.2.min.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery-ui-1.7.2.custom.min.js b/resources/library/applications/Stopwatch.wgt/js/jquery-ui-1.7.2.custom.min.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery-ui-1.7.2.custom.min.js rename to resources/library/applications/Stopwatch.wgt/js/jquery-ui-1.7.2.custom.min.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery.center.js b/resources/library/applications/Stopwatch.wgt/js/jquery.center.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery.center.js rename to resources/library/applications/Stopwatch.wgt/js/jquery.center.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery.disable.text.select.js b/resources/library/applications/Stopwatch.wgt/js/jquery.disable.text.select.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery.disable.text.select.js rename to resources/library/applications/Stopwatch.wgt/js/jquery.disable.text.select.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery.easing.1.2.js b/resources/library/applications/Stopwatch.wgt/js/jquery.easing.1.2.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery.easing.1.2.js rename to resources/library/applications/Stopwatch.wgt/js/jquery.easing.1.2.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/jquery.ubwidget.js b/resources/library/applications/Stopwatch.wgt/js/jquery.ubwidget.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/jquery.ubwidget.js rename to resources/library/applications/Stopwatch.wgt/js/jquery.ubwidget.js diff --git a/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js b/resources/library/applications/Stopwatch.wgt/js/ubw-main.js similarity index 100% rename from resources/library/interactive/Stopwatch.wgt/js/ubw-main.js rename to resources/library/applications/Stopwatch.wgt/js/ubw-main.js diff --git a/resources/library/interactive/VideoPicker.wgt/config.xml b/resources/library/applications/VideoPicker.wgt/config.xml similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/config.xml rename to resources/library/applications/VideoPicker.wgt/config.xml diff --git a/resources/library/interactive/VideoPicker.wgt/css/howto.css b/resources/library/applications/VideoPicker.wgt/css/howto.css similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/css/howto.css rename to resources/library/applications/VideoPicker.wgt/css/howto.css diff --git a/resources/library/interactive/VideoPicker.wgt/css/main.css b/resources/library/applications/VideoPicker.wgt/css/main.css similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/css/main.css rename to resources/library/applications/VideoPicker.wgt/css/main.css diff --git a/resources/library/interactive/VideoPicker.wgt/icon.png b/resources/library/applications/VideoPicker.wgt/icon.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/icon.png rename to resources/library/applications/VideoPicker.wgt/icon.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/arrow.png b/resources/library/applications/VideoPicker.wgt/imgs/arrow.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/arrow.png rename to resources/library/applications/VideoPicker.wgt/imgs/arrow.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/bts.png b/resources/library/applications/VideoPicker.wgt/imgs/bts.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/bts.png rename to resources/library/applications/VideoPicker.wgt/imgs/bts.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/btson.png b/resources/library/applications/VideoPicker.wgt/imgs/btson.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/btson.png rename to resources/library/applications/VideoPicker.wgt/imgs/btson.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/button.png b/resources/library/applications/VideoPicker.wgt/imgs/button.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/button.png rename to resources/library/applications/VideoPicker.wgt/imgs/button.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/button_anim.gif b/resources/library/applications/VideoPicker.wgt/imgs/button_anim.gif similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/button_anim.gif rename to resources/library/applications/VideoPicker.wgt/imgs/button_anim.gif diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/button_over.png b/resources/library/applications/VideoPicker.wgt/imgs/button_over.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/button_over.png rename to resources/library/applications/VideoPicker.wgt/imgs/button_over.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/button_show.png b/resources/library/applications/VideoPicker.wgt/imgs/button_show.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/button_show.png rename to resources/library/applications/VideoPicker.wgt/imgs/button_show.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/capture_youtube.jpg b/resources/library/applications/VideoPicker.wgt/imgs/capture_youtube.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/capture_youtube.jpg rename to resources/library/applications/VideoPicker.wgt/imgs/capture_youtube.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/center.png b/resources/library/applications/VideoPicker.wgt/imgs/center.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/center.png rename to resources/library/applications/VideoPicker.wgt/imgs/center.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/howto_back.png b/resources/library/applications/VideoPicker.wgt/imgs/howto_back.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/howto_back.png rename to resources/library/applications/VideoPicker.wgt/imgs/howto_back.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/info_ico.png b/resources/library/applications/VideoPicker.wgt/imgs/info_ico.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/info_ico.png rename to resources/library/applications/VideoPicker.wgt/imgs/info_ico.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/inputfield_back.png b/resources/library/applications/VideoPicker.wgt/imgs/inputfield_back.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/inputfield_back.png rename to resources/library/applications/VideoPicker.wgt/imgs/inputfield_back.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/keys_copy.jpg b/resources/library/applications/VideoPicker.wgt/imgs/keys_copy.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/keys_copy.jpg rename to resources/library/applications/VideoPicker.wgt/imgs/keys_copy.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/keys_paste.jpg b/resources/library/applications/VideoPicker.wgt/imgs/keys_paste.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/keys_paste.jpg rename to resources/library/applications/VideoPicker.wgt/imgs/keys_paste.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/left.png b/resources/library/applications/VideoPicker.wgt/imgs/left.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/left.png rename to resources/library/applications/VideoPicker.wgt/imgs/left.png diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/logos_web.jpg b/resources/library/applications/VideoPicker.wgt/imgs/logos_web.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/logos_web.jpg rename to resources/library/applications/VideoPicker.wgt/imgs/logos_web.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/imgs/right.png b/resources/library/applications/VideoPicker.wgt/imgs/right.png similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/imgs/right.png rename to resources/library/applications/VideoPicker.wgt/imgs/right.png diff --git a/resources/library/interactive/VideoPicker.wgt/index.html b/resources/library/applications/VideoPicker.wgt/index.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/index.html rename to resources/library/applications/VideoPicker.wgt/index.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/en/capture_widget.jpg b/resources/library/applications/VideoPicker.wgt/locales/en/capture_widget.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/en/capture_widget.jpg rename to resources/library/applications/VideoPicker.wgt/locales/en/capture_widget.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/locales/en/error.html b/resources/library/applications/VideoPicker.wgt/locales/en/error.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/en/error.html rename to resources/library/applications/VideoPicker.wgt/locales/en/error.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/en/howto.html b/resources/library/applications/VideoPicker.wgt/locales/en/howto.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/en/howto.html rename to resources/library/applications/VideoPicker.wgt/locales/en/howto.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/fr/capture_widget.jpg b/resources/library/applications/VideoPicker.wgt/locales/fr/capture_widget.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/fr/capture_widget.jpg rename to resources/library/applications/VideoPicker.wgt/locales/fr/capture_widget.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/locales/fr/error.html b/resources/library/applications/VideoPicker.wgt/locales/fr/error.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/fr/error.html rename to resources/library/applications/VideoPicker.wgt/locales/fr/error.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/fr/howto.html b/resources/library/applications/VideoPicker.wgt/locales/fr/howto.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/fr/howto.html rename to resources/library/applications/VideoPicker.wgt/locales/fr/howto.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/ru/capture_widget.jpg b/resources/library/applications/VideoPicker.wgt/locales/ru/capture_widget.jpg similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/ru/capture_widget.jpg rename to resources/library/applications/VideoPicker.wgt/locales/ru/capture_widget.jpg diff --git a/resources/library/interactive/VideoPicker.wgt/locales/ru/error.html b/resources/library/applications/VideoPicker.wgt/locales/ru/error.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/ru/error.html rename to resources/library/applications/VideoPicker.wgt/locales/ru/error.html diff --git a/resources/library/interactive/VideoPicker.wgt/locales/ru/howto.html b/resources/library/applications/VideoPicker.wgt/locales/ru/howto.html similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/locales/ru/howto.html rename to resources/library/applications/VideoPicker.wgt/locales/ru/howto.html diff --git a/resources/library/interactive/VideoPicker.wgt/scripts/jquery-1.3.2.min.js b/resources/library/applications/VideoPicker.wgt/scripts/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/scripts/jquery-1.3.2.min.js rename to resources/library/applications/VideoPicker.wgt/scripts/jquery-1.3.2.min.js diff --git a/resources/library/interactive/VideoPicker.wgt/scripts/jquery.oembed.js b/resources/library/applications/VideoPicker.wgt/scripts/jquery.oembed.js similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/scripts/jquery.oembed.js rename to resources/library/applications/VideoPicker.wgt/scripts/jquery.oembed.js diff --git a/resources/library/interactive/VideoPicker.wgt/scripts/languages.js b/resources/library/applications/VideoPicker.wgt/scripts/languages.js similarity index 100% rename from resources/library/interactive/VideoPicker.wgt/scripts/languages.js rename to resources/library/applications/VideoPicker.wgt/scripts/languages.js diff --git a/resources/library/interactive/WebBrowser.wgt/config.xml b/resources/library/applications/WebBrowser.wgt/config.xml similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/config.xml rename to resources/library/applications/WebBrowser.wgt/config.xml diff --git a/resources/library/interactive/WebBrowser.wgt/css/howto.css b/resources/library/applications/WebBrowser.wgt/css/howto.css similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/css/howto.css rename to resources/library/applications/WebBrowser.wgt/css/howto.css diff --git a/resources/library/interactive/WebBrowser.wgt/css/main.css b/resources/library/applications/WebBrowser.wgt/css/main.css similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/css/main.css rename to resources/library/applications/WebBrowser.wgt/css/main.css diff --git a/resources/library/interactive/WebBrowser.wgt/icon.png b/resources/library/applications/WebBrowser.wgt/icon.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/icon.png rename to resources/library/applications/WebBrowser.wgt/icon.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/arrow.png b/resources/library/applications/WebBrowser.wgt/imgs/arrow.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/arrow.png rename to resources/library/applications/WebBrowser.wgt/imgs/arrow.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/button.png b/resources/library/applications/WebBrowser.wgt/imgs/button.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/button.png rename to resources/library/applications/WebBrowser.wgt/imgs/button.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/button_anim.gif b/resources/library/applications/WebBrowser.wgt/imgs/button_anim.gif similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/button_anim.gif rename to resources/library/applications/WebBrowser.wgt/imgs/button_anim.gif diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/button_over.png b/resources/library/applications/WebBrowser.wgt/imgs/button_over.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/button_over.png rename to resources/library/applications/WebBrowser.wgt/imgs/button_over.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/button_show.png b/resources/library/applications/WebBrowser.wgt/imgs/button_show.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/button_show.png rename to resources/library/applications/WebBrowser.wgt/imgs/button_show.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/capture_youtube.jpg b/resources/library/applications/WebBrowser.wgt/imgs/capture_youtube.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/capture_youtube.jpg rename to resources/library/applications/WebBrowser.wgt/imgs/capture_youtube.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/center.png b/resources/library/applications/WebBrowser.wgt/imgs/center.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/center.png rename to resources/library/applications/WebBrowser.wgt/imgs/center.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/howto_back.png b/resources/library/applications/WebBrowser.wgt/imgs/howto_back.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/howto_back.png rename to resources/library/applications/WebBrowser.wgt/imgs/howto_back.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/info_ico.png b/resources/library/applications/WebBrowser.wgt/imgs/info_ico.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/info_ico.png rename to resources/library/applications/WebBrowser.wgt/imgs/info_ico.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/inputfield_back.png b/resources/library/applications/WebBrowser.wgt/imgs/inputfield_back.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/inputfield_back.png rename to resources/library/applications/WebBrowser.wgt/imgs/inputfield_back.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/keys_copy.jpg b/resources/library/applications/WebBrowser.wgt/imgs/keys_copy.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/keys_copy.jpg rename to resources/library/applications/WebBrowser.wgt/imgs/keys_copy.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/keys_paste.jpg b/resources/library/applications/WebBrowser.wgt/imgs/keys_paste.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/keys_paste.jpg rename to resources/library/applications/WebBrowser.wgt/imgs/keys_paste.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/left.png b/resources/library/applications/WebBrowser.wgt/imgs/left.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/left.png rename to resources/library/applications/WebBrowser.wgt/imgs/left.png diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/logos_web.jpg b/resources/library/applications/WebBrowser.wgt/imgs/logos_web.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/logos_web.jpg rename to resources/library/applications/WebBrowser.wgt/imgs/logos_web.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/imgs/right.png b/resources/library/applications/WebBrowser.wgt/imgs/right.png similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/imgs/right.png rename to resources/library/applications/WebBrowser.wgt/imgs/right.png diff --git a/resources/library/interactive/WebBrowser.wgt/index.html b/resources/library/applications/WebBrowser.wgt/index.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/index.html rename to resources/library/applications/WebBrowser.wgt/index.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/en/capture_widget.jpg b/resources/library/applications/WebBrowser.wgt/locales/en/capture_widget.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/en/capture_widget.jpg rename to resources/library/applications/WebBrowser.wgt/locales/en/capture_widget.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/locales/en/error.html b/resources/library/applications/WebBrowser.wgt/locales/en/error.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/en/error.html rename to resources/library/applications/WebBrowser.wgt/locales/en/error.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/en/howto.html b/resources/library/applications/WebBrowser.wgt/locales/en/howto.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/en/howto.html rename to resources/library/applications/WebBrowser.wgt/locales/en/howto.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/fr/capture_widget.jpg b/resources/library/applications/WebBrowser.wgt/locales/fr/capture_widget.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/fr/capture_widget.jpg rename to resources/library/applications/WebBrowser.wgt/locales/fr/capture_widget.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/locales/fr/error.html b/resources/library/applications/WebBrowser.wgt/locales/fr/error.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/fr/error.html rename to resources/library/applications/WebBrowser.wgt/locales/fr/error.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/fr/howto.html b/resources/library/applications/WebBrowser.wgt/locales/fr/howto.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/fr/howto.html rename to resources/library/applications/WebBrowser.wgt/locales/fr/howto.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/ru/capture_widget.jpg b/resources/library/applications/WebBrowser.wgt/locales/ru/capture_widget.jpg similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/ru/capture_widget.jpg rename to resources/library/applications/WebBrowser.wgt/locales/ru/capture_widget.jpg diff --git a/resources/library/interactive/WebBrowser.wgt/locales/ru/error.html b/resources/library/applications/WebBrowser.wgt/locales/ru/error.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/ru/error.html rename to resources/library/applications/WebBrowser.wgt/locales/ru/error.html diff --git a/resources/library/interactive/WebBrowser.wgt/locales/ru/howto.html b/resources/library/applications/WebBrowser.wgt/locales/ru/howto.html similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/locales/ru/howto.html rename to resources/library/applications/WebBrowser.wgt/locales/ru/howto.html diff --git a/resources/library/interactive/WebBrowser.wgt/scripts/jquery-1.3.2.min.js b/resources/library/applications/WebBrowser.wgt/scripts/jquery-1.3.2.min.js similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/scripts/jquery-1.3.2.min.js rename to resources/library/applications/WebBrowser.wgt/scripts/jquery-1.3.2.min.js diff --git a/resources/library/interactive/WebBrowser.wgt/scripts/languages.js b/resources/library/applications/WebBrowser.wgt/scripts/languages.js similarity index 100% rename from resources/library/interactive/WebBrowser.wgt/scripts/languages.js rename to resources/library/applications/WebBrowser.wgt/scripts/languages.js diff --git a/resources/library/interactive/Wikipedia.wgt/config.xml b/resources/library/applications/Wikipedia.wgt/config.xml similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/config.xml rename to resources/library/applications/Wikipedia.wgt/config.xml diff --git a/resources/library/interactive/Wikipedia.wgt/css/master.css b/resources/library/applications/Wikipedia.wgt/css/master.css similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/css/master.css rename to resources/library/applications/Wikipedia.wgt/css/master.css diff --git a/resources/library/interactive/Wikipedia.wgt/css/superfish.css b/resources/library/applications/Wikipedia.wgt/css/superfish.css similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/css/superfish.css rename to resources/library/applications/Wikipedia.wgt/css/superfish.css diff --git a/resources/library/interactive/Wikipedia.wgt/icon.png b/resources/library/applications/Wikipedia.wgt/icon.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/icon.png rename to resources/library/applications/Wikipedia.wgt/icon.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarBody.png b/resources/library/applications/Wikipedia.wgt/images/toolbarBody.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarBody.png rename to resources/library/applications/Wikipedia.wgt/images/toolbarBody.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarButtonBack.png b/resources/library/applications/Wikipedia.wgt/images/toolbarButtonBack.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarButtonBack.png rename to resources/library/applications/Wikipedia.wgt/images/toolbarButtonBack.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarButtonForward.png b/resources/library/applications/Wikipedia.wgt/images/toolbarButtonForward.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarButtonForward.png rename to resources/library/applications/Wikipedia.wgt/images/toolbarButtonForward.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarButtonLanguages.png b/resources/library/applications/Wikipedia.wgt/images/toolbarButtonLanguages.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarButtonLanguages.png rename to resources/library/applications/Wikipedia.wgt/images/toolbarButtonLanguages.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarButtonSearch.png b/resources/library/applications/Wikipedia.wgt/images/toolbarButtonSearch.png similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarButtonSearch.png rename to resources/library/applications/Wikipedia.wgt/images/toolbarButtonSearch.png diff --git a/resources/library/interactive/Wikipedia.wgt/images/toolbarLoading.jpg b/resources/library/applications/Wikipedia.wgt/images/toolbarLoading.jpg similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/images/toolbarLoading.jpg rename to resources/library/applications/Wikipedia.wgt/images/toolbarLoading.jpg diff --git a/resources/library/interactive/Wikipedia.wgt/index.html b/resources/library/applications/Wikipedia.wgt/index.html similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/index.html rename to resources/library/applications/Wikipedia.wgt/index.html diff --git a/resources/library/interactive/Wikipedia.wgt/script/jquery.min.js b/resources/library/applications/Wikipedia.wgt/script/jquery.min.js similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/script/jquery.min.js rename to resources/library/applications/Wikipedia.wgt/script/jquery.min.js diff --git a/resources/library/interactive/Wikipedia.wgt/script/languages.js b/resources/library/applications/Wikipedia.wgt/script/languages.js similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/script/languages.js rename to resources/library/applications/Wikipedia.wgt/script/languages.js diff --git a/resources/library/interactive/Wikipedia.wgt/script/superfish.js b/resources/library/applications/Wikipedia.wgt/script/superfish.js similarity index 100% rename from resources/library/interactive/Wikipedia.wgt/script/superfish.js rename to resources/library/applications/Wikipedia.wgt/script/superfish.js diff --git a/resources/library/interactive/Wiktionary.wgt/config.xml b/resources/library/applications/Wiktionary.wgt/config.xml similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/config.xml rename to resources/library/applications/Wiktionary.wgt/config.xml diff --git a/resources/library/interactive/Wiktionary.wgt/css/master.css b/resources/library/applications/Wiktionary.wgt/css/master.css similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/css/master.css rename to resources/library/applications/Wiktionary.wgt/css/master.css diff --git a/resources/library/interactive/Wiktionary.wgt/css/superfish.css b/resources/library/applications/Wiktionary.wgt/css/superfish.css similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/css/superfish.css rename to resources/library/applications/Wiktionary.wgt/css/superfish.css diff --git a/resources/library/interactive/Wiktionary.wgt/icon.png b/resources/library/applications/Wiktionary.wgt/icon.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/icon.png rename to resources/library/applications/Wiktionary.wgt/icon.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarBody.png b/resources/library/applications/Wiktionary.wgt/images/toolbarBody.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarBody.png rename to resources/library/applications/Wiktionary.wgt/images/toolbarBody.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarButtonBack.png b/resources/library/applications/Wiktionary.wgt/images/toolbarButtonBack.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarButtonBack.png rename to resources/library/applications/Wiktionary.wgt/images/toolbarButtonBack.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarButtonForward.png b/resources/library/applications/Wiktionary.wgt/images/toolbarButtonForward.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarButtonForward.png rename to resources/library/applications/Wiktionary.wgt/images/toolbarButtonForward.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarButtonLanguages.png b/resources/library/applications/Wiktionary.wgt/images/toolbarButtonLanguages.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarButtonLanguages.png rename to resources/library/applications/Wiktionary.wgt/images/toolbarButtonLanguages.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarButtonSearch.png b/resources/library/applications/Wiktionary.wgt/images/toolbarButtonSearch.png similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarButtonSearch.png rename to resources/library/applications/Wiktionary.wgt/images/toolbarButtonSearch.png diff --git a/resources/library/interactive/Wiktionary.wgt/images/toolbarLoading.jpg b/resources/library/applications/Wiktionary.wgt/images/toolbarLoading.jpg similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/images/toolbarLoading.jpg rename to resources/library/applications/Wiktionary.wgt/images/toolbarLoading.jpg diff --git a/resources/library/interactive/Wiktionary.wgt/index.html b/resources/library/applications/Wiktionary.wgt/index.html similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/index.html rename to resources/library/applications/Wiktionary.wgt/index.html diff --git a/resources/library/interactive/Wiktionary.wgt/script/jquery.min.js b/resources/library/applications/Wiktionary.wgt/script/jquery.min.js similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/script/jquery.min.js rename to resources/library/applications/Wiktionary.wgt/script/jquery.min.js diff --git a/resources/library/interactive/Wiktionary.wgt/script/languages.js b/resources/library/applications/Wiktionary.wgt/script/languages.js similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/script/languages.js rename to resources/library/applications/Wiktionary.wgt/script/languages.js diff --git a/resources/library/interactive/Wiktionary.wgt/script/superfish.js b/resources/library/applications/Wiktionary.wgt/script/superfish.js similarity index 100% rename from resources/library/interactive/Wiktionary.wgt/script/superfish.js rename to resources/library/applications/Wiktionary.wgt/script/superfish.js diff --git a/resources/library/interactive/iCell.wgt/config.xml b/resources/library/applications/iCell.wgt/config.xml similarity index 100% rename from resources/library/interactive/iCell.wgt/config.xml rename to resources/library/applications/iCell.wgt/config.xml diff --git a/resources/library/interactive/iCell.wgt/icon.png b/resources/library/applications/iCell.wgt/icon.png similarity index 100% rename from resources/library/interactive/iCell.wgt/icon.png rename to resources/library/applications/iCell.wgt/icon.png diff --git a/resources/library/interactive/iCell.wgt/icon_old.png b/resources/library/applications/iCell.wgt/icon_old.png similarity index 100% rename from resources/library/interactive/iCell.wgt/icon_old.png rename to resources/library/applications/iCell.wgt/icon_old.png diff --git a/resources/library/interactive/iCell.wgt/images/ADN.gif b/resources/library/applications/iCell.wgt/images/ADN.gif similarity index 100% rename from resources/library/interactive/iCell.wgt/images/ADN.gif rename to resources/library/applications/iCell.wgt/images/ADN.gif diff --git a/resources/library/interactive/iCell.wgt/images/ADN.jpg b/resources/library/applications/iCell.wgt/images/ADN.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/ADN.jpg rename to resources/library/applications/iCell.wgt/images/ADN.jpg diff --git a/resources/library/interactive/iCell.wgt/images/ADN_zoom.jpg b/resources/library/applications/iCell.wgt/images/ADN_zoom.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/ADN_zoom.jpg rename to resources/library/applications/iCell.wgt/images/ADN_zoom.jpg diff --git a/resources/library/interactive/iCell.wgt/images/ARN_in.jpg b/resources/library/applications/iCell.wgt/images/ARN_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/ARN_in.jpg rename to resources/library/applications/iCell.wgt/images/ARN_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/ARN_zoom.jpg b/resources/library/applications/iCell.wgt/images/ARN_zoom.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/ARN_zoom.jpg rename to resources/library/applications/iCell.wgt/images/ARN_zoom.jpg diff --git a/resources/library/interactive/iCell.wgt/images/Golgi_aura.png b/resources/library/applications/iCell.wgt/images/Golgi_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/Golgi_aura.png rename to resources/library/applications/iCell.wgt/images/Golgi_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/Lys_aura.png b/resources/library/applications/iCell.wgt/images/Lys_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/Lys_aura.png rename to resources/library/applications/iCell.wgt/images/Lys_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/Mitoch_aura.png b/resources/library/applications/iCell.wgt/images/Mitoch_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/Mitoch_aura.png rename to resources/library/applications/iCell.wgt/images/Mitoch_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/Noy_aura.png b/resources/library/applications/iCell.wgt/images/Noy_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/Noy_aura.png rename to resources/library/applications/iCell.wgt/images/Noy_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/REL_aura.png b/resources/library/applications/iCell.wgt/images/REL_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/REL_aura.png rename to resources/library/applications/iCell.wgt/images/REL_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/RER_aura.png b/resources/library/applications/iCell.wgt/images/RER_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/RER_aura.png rename to resources/library/applications/iCell.wgt/images/RER_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/Vesic_aura.png b/resources/library/applications/iCell.wgt/images/Vesic_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/Vesic_aura.png rename to resources/library/applications/iCell.wgt/images/Vesic_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/centriole_aura.png b/resources/library/applications/iCell.wgt/images/centriole_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/centriole_aura.png rename to resources/library/applications/iCell.wgt/images/centriole_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/centriole_in.jpg b/resources/library/applications/iCell.wgt/images/centriole_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/centriole_in.jpg rename to resources/library/applications/iCell.wgt/images/centriole_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/fond_ADN.png b/resources/library/applications/iCell.wgt/images/fond_ADN.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/fond_ADN.png rename to resources/library/applications/iCell.wgt/images/fond_ADN.png diff --git a/resources/library/interactive/iCell.wgt/images/golgi_in.jpg b/resources/library/applications/iCell.wgt/images/golgi_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/golgi_in.jpg rename to resources/library/applications/iCell.wgt/images/golgi_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/index.png b/resources/library/applications/iCell.wgt/images/index.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/index.png rename to resources/library/applications/iCell.wgt/images/index.png diff --git a/resources/library/interactive/iCell.wgt/images/lys_in.jpg b/resources/library/applications/iCell.wgt/images/lys_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/lys_in.jpg rename to resources/library/applications/iCell.wgt/images/lys_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/mitoch_in.jpg b/resources/library/applications/iCell.wgt/images/mitoch_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/mitoch_in.jpg rename to resources/library/applications/iCell.wgt/images/mitoch_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/noy_in.jpg b/resources/library/applications/iCell.wgt/images/noy_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/noy_in.jpg rename to resources/library/applications/iCell.wgt/images/noy_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/nucl_aura.png b/resources/library/applications/iCell.wgt/images/nucl_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/nucl_aura.png rename to resources/library/applications/iCell.wgt/images/nucl_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/nucl_in.jpg b/resources/library/applications/iCell.wgt/images/nucl_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/nucl_in.jpg rename to resources/library/applications/iCell.wgt/images/nucl_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/rel_in.jpg b/resources/library/applications/iCell.wgt/images/rel_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/rel_in.jpg rename to resources/library/applications/iCell.wgt/images/rel_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/rer_in.jpg b/resources/library/applications/iCell.wgt/images/rer_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/rer_in.jpg rename to resources/library/applications/iCell.wgt/images/rer_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/rib_aura.png b/resources/library/applications/iCell.wgt/images/rib_aura.png similarity index 100% rename from resources/library/interactive/iCell.wgt/images/rib_aura.png rename to resources/library/applications/iCell.wgt/images/rib_aura.png diff --git a/resources/library/interactive/iCell.wgt/images/rib_in.jpg b/resources/library/applications/iCell.wgt/images/rib_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/rib_in.jpg rename to resources/library/applications/iCell.wgt/images/rib_in.jpg diff --git a/resources/library/interactive/iCell.wgt/images/vesic_in.jpg b/resources/library/applications/iCell.wgt/images/vesic_in.jpg similarity index 100% rename from resources/library/interactive/iCell.wgt/images/vesic_in.jpg rename to resources/library/applications/iCell.wgt/images/vesic_in.jpg diff --git a/resources/library/interactive/iCell.wgt/js/script.js b/resources/library/applications/iCell.wgt/js/script.js similarity index 100% rename from resources/library/interactive/iCell.wgt/js/script.js rename to resources/library/applications/iCell.wgt/js/script.js diff --git a/resources/library/interactive/iCell.wgt/js/textes_descriptifs.js b/resources/library/applications/iCell.wgt/js/textes_descriptifs.js similarity index 100% rename from resources/library/interactive/iCell.wgt/js/textes_descriptifs.js rename to resources/library/applications/iCell.wgt/js/textes_descriptifs.js diff --git a/resources/library/interactive/iCell.wgt/js/textes_descriptifs.js0 b/resources/library/applications/iCell.wgt/js/textes_descriptifs.js0 similarity index 100% rename from resources/library/interactive/iCell.wgt/js/textes_descriptifs.js0 rename to resources/library/applications/iCell.wgt/js/textes_descriptifs.js0 diff --git a/resources/library/interactive/iCell.wgt/readme.txt b/resources/library/applications/iCell.wgt/readme.txt similarity index 100% rename from resources/library/interactive/iCell.wgt/readme.txt rename to resources/library/applications/iCell.wgt/readme.txt diff --git a/resources/library/interactive/iCell.wgt/style/style.css b/resources/library/applications/iCell.wgt/style/style.css similarity index 100% rename from resources/library/interactive/iCell.wgt/style/style.css rename to resources/library/applications/iCell.wgt/style/style.css diff --git a/resources/library/interactive/iCell.wgt/widget.html b/resources/library/applications/iCell.wgt/widget.html similarity index 100% rename from resources/library/interactive/iCell.wgt/widget.html rename to resources/library/applications/iCell.wgt/widget.html diff --git a/resources/library/image/Backgrounds/2009_calendar_EU.svg b/resources/library/image/Backgrounds/2009_calendar_EU.svg deleted file mode 100644 index 5007696f..00000000 --- a/resources/library/image/Backgrounds/2009_calendar_EU.svg +++ /dev/null @@ -1,6619 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/image/Backgrounds/2009_calendar_US.svg b/resources/library/image/Backgrounds/2009_calendar_US.svg deleted file mode 100644 index 697691fb..00000000 --- a/resources/library/image/Backgrounds/2009_calendar_US.svg +++ /dev/null @@ -1,5811 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/calendrier_2011.png b/resources/library/image/Backgrounds/calendrier_2011.png similarity index 100% rename from resources/library/userImage/Backgrounds/calendrier_2011.png rename to resources/library/image/Backgrounds/calendrier_2011.png diff --git a/resources/library/userImage/Backgrounds/calendrier_2012.png b/resources/library/image/Backgrounds/calendrier_2012.png similarity index 100% rename from resources/library/userImage/Backgrounds/calendrier_2012.png rename to resources/library/image/Backgrounds/calendrier_2012.png diff --git a/resources/library/userImage/Voltaire.jpg b/resources/library/image/Voltaire.jpg similarity index 100% rename from resources/library/userImage/Voltaire.jpg rename to resources/library/image/Voltaire.jpg diff --git a/resources/library/userImage/cartepolitiqueeurope.jpg b/resources/library/image/cartepolitiqueeurope.jpg similarity index 100% rename from resources/library/userImage/cartepolitiqueeurope.jpg rename to resources/library/image/cartepolitiqueeurope.jpg diff --git a/resources/library/userImage/open-sankore.svg b/resources/library/image/open-sankore.svg similarity index 100% rename from resources/library/userImage/open-sankore.svg rename to resources/library/image/open-sankore.svg diff --git a/resources/library/userImage/violon.jpg b/resources/library/image/violon.jpg similarity index 100% rename from resources/library/userImage/violon.jpg rename to resources/library/image/violon.jpg diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/config.xml b/resources/library/interactivities/BlackYellow.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/config.xml rename to resources/library/interactivities/BlackYellow.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/css/basic.css b/resources/library/interactivities/BlackYellow.wgt/css/basic.css similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/css/basic.css rename to resources/library/interactivities/BlackYellow.wgt/css/basic.css diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/icon.png b/resources/library/interactivities/BlackYellow.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/icon.png rename to resources/library/interactivities/BlackYellow.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/images/greySquare.png b/resources/library/interactivities/BlackYellow.wgt/images/greySquare.png similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/images/greySquare.png rename to resources/library/interactivities/BlackYellow.wgt/images/greySquare.png diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/images/greySquare2.png b/resources/library/interactivities/BlackYellow.wgt/images/greySquare2.png similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/images/greySquare2.png rename to resources/library/interactivities/BlackYellow.wgt/images/greySquare2.png diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/images/icon-close.png b/resources/library/interactivities/BlackYellow.wgt/images/icon-close.png similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/images/icon-close.png rename to resources/library/interactivities/BlackYellow.wgt/images/icon-close.png diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/images/popupBack.png b/resources/library/interactivities/BlackYellow.wgt/images/popupBack.png similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/images/popupBack.png rename to resources/library/interactivities/BlackYellow.wgt/images/popupBack.png diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/index.html b/resources/library/interactivities/BlackYellow.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/index.html rename to resources/library/interactivities/BlackYellow.wgt/index.html diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/blackYellow.js b/resources/library/interactivities/BlackYellow.wgt/scripts/blackYellow.js similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/blackYellow.js rename to resources/library/interactivities/BlackYellow.wgt/scripts/blackYellow.js diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/jquery-1.6.2.min.js b/resources/library/interactivities/BlackYellow.wgt/scripts/jquery-1.6.2.min.js similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/jquery-1.6.2.min.js rename to resources/library/interactivities/BlackYellow.wgt/scripts/jquery-1.6.2.min.js diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/jquery.disable.text.select.js b/resources/library/interactivities/BlackYellow.wgt/scripts/jquery.disable.text.select.js similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/jquery.disable.text.select.js rename to resources/library/interactivities/BlackYellow.wgt/scripts/jquery.disable.text.select.js diff --git a/resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/languages.js b/resources/library/interactivities/BlackYellow.wgt/scripts/languages.js similarity index 100% rename from resources/library/sankoreInteractivities/BlackYellow.wgt/scripts/languages.js rename to resources/library/interactivities/BlackYellow.wgt/scripts/languages.js diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/config.xml b/resources/library/interactivities/Choisir.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/config.xml rename to resources/library/interactivities/Choisir.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/css/basic.css rename to resources/library/interactivities/Choisir.wgt/css/basic.css diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/icon.png b/resources/library/interactivities/Choisir.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/icon.png rename to resources/library/interactivities/Choisir.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/1thOption.png b/resources/library/interactivities/Choisir.wgt/images/1thOption.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/1thOption.png rename to resources/library/interactivities/Choisir.wgt/images/1thOption.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/2thOption.png b/resources/library/interactivities/Choisir.wgt/images/2thOption.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/2thOption.png rename to resources/library/interactivities/Choisir.wgt/images/2thOption.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/3thOption.png b/resources/library/interactivities/Choisir.wgt/images/3thOption.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/3thOption.png rename to resources/library/interactivities/Choisir.wgt/images/3thOption.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/addSomething.png b/resources/library/interactivities/Choisir.wgt/images/addSomething.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/addSomething.png rename to resources/library/interactivities/Choisir.wgt/images/addSomething.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/bigBlackClose.png b/resources/library/interactivities/Choisir.wgt/images/bigBlackClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/bigBlackClose.png rename to resources/library/interactivities/Choisir.wgt/images/bigBlackClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/blueClose.png b/resources/library/interactivities/Choisir.wgt/images/blueClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/blueClose.png rename to resources/library/interactivities/Choisir.wgt/images/blueClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/boldBlackClose.png b/resources/library/interactivities/Choisir.wgt/images/boldBlackClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/boldBlackClose.png rename to resources/library/interactivities/Choisir.wgt/images/boldBlackClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/boldClose.png b/resources/library/interactivities/Choisir.wgt/images/boldClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/boldClose.png rename to resources/library/interactivities/Choisir.wgt/images/boldClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/boldGreyClose.png b/resources/library/interactivities/Choisir.wgt/images/boldGreyClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/boldGreyClose.png rename to resources/library/interactivities/Choisir.wgt/images/boldGreyClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/bottomLeftThing.png b/resources/library/interactivities/Choisir.wgt/images/bottomLeftThing.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/bottomLeftThing.png rename to resources/library/interactivities/Choisir.wgt/images/bottomLeftThing.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/complete.png b/resources/library/interactivities/Choisir.wgt/images/complete.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/complete.png rename to resources/library/interactivities/Choisir.wgt/images/complete.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/grayClose.png b/resources/library/interactivities/Choisir.wgt/images/grayClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/grayClose.png rename to resources/library/interactivities/Choisir.wgt/images/grayClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/greySquare.png b/resources/library/interactivities/Choisir.wgt/images/greySquare.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/greySquare.png rename to resources/library/interactivities/Choisir.wgt/images/greySquare.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/greySquareArrow.png b/resources/library/interactivities/Choisir.wgt/images/greySquareArrow.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/greySquareArrow.png rename to resources/library/interactivities/Choisir.wgt/images/greySquareArrow.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/horSep.png b/resources/library/interactivities/Choisir.wgt/images/horSep.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/horSep.png rename to resources/library/interactivities/Choisir.wgt/images/horSep.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/leftThing.png b/resources/library/interactivities/Choisir.wgt/images/leftThing.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/leftThing.png rename to resources/library/interactivities/Choisir.wgt/images/leftThing.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/lessBottomBorder.png b/resources/library/interactivities/Choisir.wgt/images/lessBottomBorder.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/lessBottomBorder.png rename to resources/library/interactivities/Choisir.wgt/images/lessBottomBorder.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/lessTopBorder.png b/resources/library/interactivities/Choisir.wgt/images/lessTopBorder.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/lessTopBorder.png rename to resources/library/interactivities/Choisir.wgt/images/lessTopBorder.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBack.png b/resources/library/interactivities/Choisir.wgt/images/lowerBack.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBack.png rename to resources/library/interactivities/Choisir.wgt/images/lowerBack.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBorder.png b/resources/library/interactivities/Choisir.wgt/images/lowerBorder.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBorder.png rename to resources/library/interactivities/Choisir.wgt/images/lowerBorder.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBorder2.png b/resources/library/interactivities/Choisir.wgt/images/lowerBorder2.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/lowerBorder2.png rename to resources/library/interactivities/Choisir.wgt/images/lowerBorder2.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack.png b/resources/library/interactivities/Choisir.wgt/images/niceBack.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack.png rename to resources/library/interactivities/Choisir.wgt/images/niceBack.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack2.png b/resources/library/interactivities/Choisir.wgt/images/niceBack2.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack2.png rename to resources/library/interactivities/Choisir.wgt/images/niceBack2.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack3.png b/resources/library/interactivities/Choisir.wgt/images/niceBack3.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/niceBack3.png rename to resources/library/interactivities/Choisir.wgt/images/niceBack3.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/pencil.png b/resources/library/interactivities/Choisir.wgt/images/pencil.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/pencil.png rename to resources/library/interactivities/Choisir.wgt/images/pencil.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/point.png b/resources/library/interactivities/Choisir.wgt/images/point.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/point.png rename to resources/library/interactivities/Choisir.wgt/images/point.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/redBoldClose.png b/resources/library/interactivities/Choisir.wgt/images/redBoldClose.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/redBoldClose.png rename to resources/library/interactivities/Choisir.wgt/images/redBoldClose.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/reload.jpg b/resources/library/interactivities/Choisir.wgt/images/reload.jpg similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/reload.jpg rename to resources/library/interactivities/Choisir.wgt/images/reload.jpg diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/reload2.png b/resources/library/interactivities/Choisir.wgt/images/reload2.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/reload2.png rename to resources/library/interactivities/Choisir.wgt/images/reload2.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/rightThing.png b/resources/library/interactivities/Choisir.wgt/images/rightThing.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/rightThing.png rename to resources/library/interactivities/Choisir.wgt/images/rightThing.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/separator.png b/resources/library/interactivities/Choisir.wgt/images/separator.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/separator.png rename to resources/library/interactivities/Choisir.wgt/images/separator.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/separator2.png b/resources/library/interactivities/Choisir.wgt/images/separator2.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/separator2.png rename to resources/library/interactivities/Choisir.wgt/images/separator2.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/settings.png b/resources/library/interactivities/Choisir.wgt/images/settings.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/settings.png rename to resources/library/interactivities/Choisir.wgt/images/settings.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/sidePoints.png b/resources/library/interactivities/Choisir.wgt/images/sidePoints.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/sidePoints.png rename to resources/library/interactivities/Choisir.wgt/images/sidePoints.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/spanner.png b/resources/library/interactivities/Choisir.wgt/images/spanner.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/spanner.png rename to resources/library/interactivities/Choisir.wgt/images/spanner.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/star.png b/resources/library/interactivities/Choisir.wgt/images/star.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/star.png rename to resources/library/interactivities/Choisir.wgt/images/star.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/stop.jpg b/resources/library/interactivities/Choisir.wgt/images/stop.jpg similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/stop.jpg rename to resources/library/interactivities/Choisir.wgt/images/stop.jpg diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/tool.png b/resources/library/interactivities/Choisir.wgt/images/tool.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/tool.png rename to resources/library/interactivities/Choisir.wgt/images/tool.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/topLeftThing.png b/resources/library/interactivities/Choisir.wgt/images/topLeftThing.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/topLeftThing.png rename to resources/library/interactivities/Choisir.wgt/images/topLeftThing.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/transparentBack.png b/resources/library/interactivities/Choisir.wgt/images/transparentBack.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/transparentBack.png rename to resources/library/interactivities/Choisir.wgt/images/transparentBack.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/upperBorder.png b/resources/library/interactivities/Choisir.wgt/images/upperBorder.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/upperBorder.png rename to resources/library/interactivities/Choisir.wgt/images/upperBorder.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/images/upperBorder2.png b/resources/library/interactivities/Choisir.wgt/images/upperBorder2.png similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/images/upperBorder2.png rename to resources/library/interactivities/Choisir.wgt/images/upperBorder2.png diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/index.html b/resources/library/interactivities/Choisir.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/index.html rename to resources/library/interactivities/Choisir.wgt/index.html diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/scripts/jquery-1.6.2.min.js b/resources/library/interactivities/Choisir.wgt/scripts/jquery-1.6.2.min.js similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/scripts/jquery-1.6.2.min.js rename to resources/library/interactivities/Choisir.wgt/scripts/jquery-1.6.2.min.js diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/scripts/languages.js b/resources/library/interactivities/Choisir.wgt/scripts/languages.js similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/scripts/languages.js rename to resources/library/interactivities/Choisir.wgt/scripts/languages.js diff --git a/resources/library/sankoreInteractivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js similarity index 100% rename from resources/library/sankoreInteractivities/Choisir.wgt/scripts/selQuestionApp.js rename to resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/config.xml b/resources/library/interactivities/associer_images.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/config.xml rename to resources/library/interactivities/associer_images.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/css/basic.css b/resources/library/interactivities/associer_images.wgt/css/basic.css similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/css/basic.css rename to resources/library/interactivities/associer_images.wgt/css/basic.css diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/add_block.png b/resources/library/interactivities/associer_images.wgt/img/add_block.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/add_block.png rename to resources/library/interactivities/associer_images.wgt/img/add_block.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/add_img.png b/resources/library/interactivities/associer_images.wgt/img/add_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/add_img.png rename to resources/library/interactivities/associer_images.wgt/img/add_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/circle.png b/resources/library/interactivities/associer_images.wgt/img/circle.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/circle.png rename to resources/library/interactivities/associer_images.wgt/img/circle.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/clear_img.png b/resources/library/interactivities/associer_images.wgt/img/clear_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/clear_img.png rename to resources/library/interactivities/associer_images.wgt/img/clear_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/close_cont.png b/resources/library/interactivities/associer_images.wgt/img/close_cont.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/close_cont.png rename to resources/library/interactivities/associer_images.wgt/img/close_cont.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/close_img.png b/resources/library/interactivities/associer_images.wgt/img/close_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/close_img.png rename to resources/library/interactivities/associer_images.wgt/img/close_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/drop_img.png b/resources/library/interactivities/associer_images.wgt/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/drop_img.png rename to resources/library/interactivities/associer_images.wgt/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/false.png b/resources/library/interactivities/associer_images.wgt/img/false.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/false.png rename to resources/library/interactivities/associer_images.wgt/img/false.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/green_point.png b/resources/library/interactivities/associer_images.wgt/img/green_point.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/green_point.png rename to resources/library/interactivities/associer_images.wgt/img/green_point.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/numb_img.png b/resources/library/interactivities/associer_images.wgt/img/numb_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/numb_img.png rename to resources/library/interactivities/associer_images.wgt/img/numb_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/red_point.png b/resources/library/interactivities/associer_images.wgt/img/red_point.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/red_point.png rename to resources/library/interactivities/associer_images.wgt/img/red_point.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/img/true.png b/resources/library/interactivities/associer_images.wgt/img/true.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/img/true.png rename to resources/library/interactivities/associer_images.wgt/img/true.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/index.html b/resources/library/interactivities/associer_images.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/index.html rename to resources/library/interactivities/associer_images.wgt/index.html diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/js/jquery-1.6.2.min.js b/resources/library/interactivities/associer_images.wgt/js/jquery-1.6.2.min.js similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/js/jquery-1.6.2.min.js rename to resources/library/interactivities/associer_images.wgt/js/jquery-1.6.2.min.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/js/jquery-ui-1.8.9.custom.min.js b/resources/library/interactivities/associer_images.wgt/js/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/js/jquery-ui-1.8.9.custom.min.js rename to resources/library/interactivities/associer_images.wgt/js/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/js/script.js b/resources/library/interactivities/associer_images.wgt/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/js/script.js rename to resources/library/interactivities/associer_images.wgt/js/script.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/img/drop_img.png b/resources/library/interactivities/associer_images.wgt/locales/fr/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/img/drop_img.png rename to resources/library/interactivities/associer_images.wgt/locales/fr/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/index.html b/resources/library/interactivities/associer_images.wgt/locales/fr/index.html similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/index.html rename to resources/library/interactivities/associer_images.wgt/locales/fr/index.html diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/js/script.js b/resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/fr/js/script.js rename to resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/img/drop_img.png b/resources/library/interactivities/associer_images.wgt/locales/ru/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/img/drop_img.png rename to resources/library/interactivities/associer_images.wgt/locales/ru/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/index.html b/resources/library/interactivities/associer_images.wgt/locales/ru/index.html similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/index.html rename to resources/library/interactivities/associer_images.wgt/locales/ru/index.html diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/js/script.js b/resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/locales/ru/js/script.js rename to resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/objects/0.gif b/resources/library/interactivities/associer_images.wgt/objects/0.gif similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/objects/0.gif rename to resources/library/interactivities/associer_images.wgt/objects/0.gif diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/objects/1.gif b/resources/library/interactivities/associer_images.wgt/objects/1.gif similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/objects/1.gif rename to resources/library/interactivities/associer_images.wgt/objects/1.gif diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/objects/2.gif b/resources/library/interactivities/associer_images.wgt/objects/2.gif similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/objects/2.gif rename to resources/library/interactivities/associer_images.wgt/objects/2.gif diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/objects/3.gif b/resources/library/interactivities/associer_images.wgt/objects/3.gif similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/objects/3.gif rename to resources/library/interactivities/associer_images.wgt/objects/3.gif diff --git a/resources/library/sankoreInteractivities/associer_images.wgt/objects/4.gif b/resources/library/interactivities/associer_images.wgt/objects/4.gif similarity index 100% rename from resources/library/sankoreInteractivities/associer_images.wgt/objects/4.gif rename to resources/library/interactivities/associer_images.wgt/objects/4.gif diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/config.xml b/resources/library/interactivities/ord-phrases.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/config.xml rename to resources/library/interactivities/ord-phrases.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/icon.png b/resources/library/interactivities/ord-phrases.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/icon.png rename to resources/library/interactivities/ord-phrases.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/index.html b/resources/library/interactivities/ord-phrases.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/index.html rename to resources/library/interactivities/ord-phrases.wgt/index.html diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js b/resources/library/interactivities/ord-phrases.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js rename to resources/library/interactivities/ord-phrases.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery144.js b/resources/library/interactivities/ord-phrases.wgt/template/scripts/jquery144.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/jquery144.js rename to resources/library/interactivities/ord-phrases.wgt/template/scripts/jquery144.js diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/template2.js b/resources/library/interactivities/ord-phrases.wgt/template/scripts/template2.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/template/scripts/template2.js rename to resources/library/interactivities/ord-phrases.wgt/template/scripts/template2.js diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/master.css b/resources/library/interactivities/ord-phrases.wgt/template/styles/master.css similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/master.css rename to resources/library/interactivities/ord-phrases.wgt/template/styles/master.css diff --git a/resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/of_puppets.css b/resources/library/interactivities/ord-phrases.wgt/template/styles/of_puppets.css similarity index 100% rename from resources/library/sankoreInteractivities/ord-phrases.wgt/template/styles/of_puppets.css rename to resources/library/interactivities/ord-phrases.wgt/template/styles/of_puppets.css diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/config.xml b/resources/library/interactivities/ord-words.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/config.xml rename to resources/library/interactivities/ord-words.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/icon.png b/resources/library/interactivities/ord-words.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/icon.png rename to resources/library/interactivities/ord-words.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/index.html b/resources/library/interactivities/ord-words.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/index.html rename to resources/library/interactivities/ord-words.wgt/index.html diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js b/resources/library/interactivities/ord-words.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js rename to resources/library/interactivities/ord-words.wgt/template/scripts/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery144.js b/resources/library/interactivities/ord-words.wgt/template/scripts/jquery144.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/jquery144.js rename to resources/library/interactivities/ord-words.wgt/template/scripts/jquery144.js diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/template2.js b/resources/library/interactivities/ord-words.wgt/template/scripts/template2.js similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/template/scripts/template2.js rename to resources/library/interactivities/ord-words.wgt/template/scripts/template2.js diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/template/styles/master.css b/resources/library/interactivities/ord-words.wgt/template/styles/master.css similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/template/styles/master.css rename to resources/library/interactivities/ord-words.wgt/template/styles/master.css diff --git a/resources/library/sankoreInteractivities/ord-words.wgt/template/styles/of_puppets.css b/resources/library/interactivities/ord-words.wgt/template/styles/of_puppets.css similarity index 100% rename from resources/library/sankoreInteractivities/ord-words.wgt/template/styles/of_puppets.css rename to resources/library/interactivities/ord-words.wgt/template/styles/of_puppets.css diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml b/resources/library/interactivities/ordonner_des_images.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml rename to resources/library/interactivities/ordonner_des_images.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css b/resources/library/interactivities/ordonner_des_images.wgt/css/basic.css similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css rename to resources/library/interactivities/ordonner_des_images.wgt/css/basic.css diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_block.png b/resources/library/interactivities/ordonner_des_images.wgt/img/add_block.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_block.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/add_block.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_img.png b/resources/library/interactivities/ordonner_des_images.wgt/img/add_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/add_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/circle.png b/resources/library/interactivities/ordonner_des_images.wgt/img/circle.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/circle.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/circle.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/clear_img.png b/resources/library/interactivities/ordonner_des_images.wgt/img/clear_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/clear_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/clear_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_cont.png b/resources/library/interactivities/ordonner_des_images.wgt/img/close_cont.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_cont.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/close_cont.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_img.png b/resources/library/interactivities/ordonner_des_images.wgt/img/close_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/close_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/drop_img.png b/resources/library/interactivities/ordonner_des_images.wgt/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/drop_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_hor.png b/resources/library/interactivities/ordonner_des_images.wgt/img/fill_hor.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_hor.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/fill_hor.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_vert.png b/resources/library/interactivities/ordonner_des_images.wgt/img/fill_vert.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_vert.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/fill_vert.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/green_point.png b/resources/library/interactivities/ordonner_des_images.wgt/img/green_point.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/green_point.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/green_point.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/numb_img.png b/resources/library/interactivities/ordonner_des_images.wgt/img/numb_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/numb_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/numb_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/red_point.png b/resources/library/interactivities/ordonner_des_images.wgt/img/red_point.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/red_point.png rename to resources/library/interactivities/ordonner_des_images.wgt/img/red_point.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html b/resources/library/interactivities/ordonner_des_images.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html rename to resources/library/interactivities/ordonner_des_images.wgt/index.html diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js b/resources/library/interactivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js rename to resources/library/interactivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js b/resources/library/interactivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js rename to resources/library/interactivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js b/resources/library/interactivities/ordonner_des_images.wgt/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js rename to resources/library/interactivities/ordonner_des_images.wgt/js/script.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/img/drop_img.png b/resources/library/interactivities/ordonner_des_images.wgt/locales/fr/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/img/drop_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/locales/fr/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/index.html b/resources/library/interactivities/ordonner_des_images.wgt/locales/fr/index.html similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/index.html rename to resources/library/interactivities/ordonner_des_images.wgt/locales/fr/index.html diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/js/script.js b/resources/library/interactivities/ordonner_des_images.wgt/locales/fr/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/fr/js/script.js rename to resources/library/interactivities/ordonner_des_images.wgt/locales/fr/js/script.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/img/drop_img.png b/resources/library/interactivities/ordonner_des_images.wgt/locales/ru/img/drop_img.png similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/img/drop_img.png rename to resources/library/interactivities/ordonner_des_images.wgt/locales/ru/img/drop_img.png diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/index.html b/resources/library/interactivities/ordonner_des_images.wgt/locales/ru/index.html similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/index.html rename to resources/library/interactivities/ordonner_des_images.wgt/locales/ru/index.html diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/js/script.js b/resources/library/interactivities/ordonner_des_images.wgt/locales/ru/js/script.js similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/locales/ru/js/script.js rename to resources/library/interactivities/ordonner_des_images.wgt/locales/ru/js/script.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/0.gif b/resources/library/interactivities/ordonner_des_images.wgt/objects/0.gif similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/0.gif rename to resources/library/interactivities/ordonner_des_images.wgt/objects/0.gif diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/1.gif b/resources/library/interactivities/ordonner_des_images.wgt/objects/1.gif similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/1.gif rename to resources/library/interactivities/ordonner_des_images.wgt/objects/1.gif diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/2.gif b/resources/library/interactivities/ordonner_des_images.wgt/objects/2.gif similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/2.gif rename to resources/library/interactivities/ordonner_des_images.wgt/objects/2.gif diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/3.gif b/resources/library/interactivities/ordonner_des_images.wgt/objects/3.gif similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/3.gif rename to resources/library/interactivities/ordonner_des_images.wgt/objects/3.gif diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/4.gif b/resources/library/interactivities/ordonner_des_images.wgt/objects/4.gif similarity index 100% rename from resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/4.gif rename to resources/library/interactivities/ordonner_des_images.wgt/objects/4.gif diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/config.xml b/resources/library/interactivities/spl-phrase.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/config.xml rename to resources/library/interactivities/spl-phrase.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/icon.png b/resources/library/interactivities/spl-phrase.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/icon.png rename to resources/library/interactivities/spl-phrase.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/index.html b/resources/library/interactivities/spl-phrase.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/index.html rename to resources/library/interactivities/spl-phrase.wgt/index.html diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/app.js b/resources/library/interactivities/spl-phrase.wgt/scripts/app.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/app.js rename to resources/library/interactivities/spl-phrase.wgt/scripts/app.js diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/ext.js b/resources/library/interactivities/spl-phrase.wgt/scripts/ext.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/ext.js rename to resources/library/interactivities/spl-phrase.wgt/scripts/ext.js diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/jquery144.js b/resources/library/interactivities/spl-phrase.wgt/scripts/jquery144.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/jquery144.js rename to resources/library/interactivities/spl-phrase.wgt/scripts/jquery144.js diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/wcontainer.js b/resources/library/interactivities/spl-phrase.wgt/scripts/wcontainer.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/scripts/wcontainer.js rename to resources/library/interactivities/spl-phrase.wgt/scripts/wcontainer.js diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/styles/app.css b/resources/library/interactivities/spl-phrase.wgt/styles/app.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/styles/app.css rename to resources/library/interactivities/spl-phrase.wgt/styles/app.css diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/styles/master.css b/resources/library/interactivities/spl-phrase.wgt/styles/master.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/styles/master.css rename to resources/library/interactivities/spl-phrase.wgt/styles/master.css diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-activated.png b/resources/library/interactivities/spl-phrase.wgt/styles/separator-activated.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-activated.png rename to resources/library/interactivities/spl-phrase.wgt/styles/separator-activated.png diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-hover.png b/resources/library/interactivities/spl-phrase.wgt/styles/separator-hover.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/styles/separator-hover.png rename to resources/library/interactivities/spl-phrase.wgt/styles/separator-hover.png diff --git a/resources/library/sankoreInteractivities/spl-phrase.wgt/styles/wcontainer.css b/resources/library/interactivities/spl-phrase.wgt/styles/wcontainer.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-phrase.wgt/styles/wcontainer.css rename to resources/library/interactivities/spl-phrase.wgt/styles/wcontainer.css diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/config.xml b/resources/library/interactivities/spl-text.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/config.xml rename to resources/library/interactivities/spl-text.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/icon.png b/resources/library/interactivities/spl-text.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/icon.png rename to resources/library/interactivities/spl-text.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/index.html b/resources/library/interactivities/spl-text.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/index.html rename to resources/library/interactivities/spl-text.wgt/index.html diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/scripts/app2.js b/resources/library/interactivities/spl-text.wgt/scripts/app2.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/scripts/app2.js rename to resources/library/interactivities/spl-text.wgt/scripts/app2.js diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/scripts/ext.js b/resources/library/interactivities/spl-text.wgt/scripts/ext.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/scripts/ext.js rename to resources/library/interactivities/spl-text.wgt/scripts/ext.js diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/scripts/jquery144.js b/resources/library/interactivities/spl-text.wgt/scripts/jquery144.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/scripts/jquery144.js rename to resources/library/interactivities/spl-text.wgt/scripts/jquery144.js diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/scripts/wcontainer.js b/resources/library/interactivities/spl-text.wgt/scripts/wcontainer.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/scripts/wcontainer.js rename to resources/library/interactivities/spl-text.wgt/scripts/wcontainer.js diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/styles/app.css b/resources/library/interactivities/spl-text.wgt/styles/app.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/styles/app.css rename to resources/library/interactivities/spl-text.wgt/styles/app.css diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/styles/master.css b/resources/library/interactivities/spl-text.wgt/styles/master.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/styles/master.css rename to resources/library/interactivities/spl-text.wgt/styles/master.css diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-activated.png b/resources/library/interactivities/spl-text.wgt/styles/separator-activated.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-activated.png rename to resources/library/interactivities/spl-text.wgt/styles/separator-activated.png diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-hover.png b/resources/library/interactivities/spl-text.wgt/styles/separator-hover.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/styles/separator-hover.png rename to resources/library/interactivities/spl-text.wgt/styles/separator-hover.png diff --git a/resources/library/sankoreInteractivities/spl-text.wgt/styles/wcontainer.css b/resources/library/interactivities/spl-text.wgt/styles/wcontainer.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-text.wgt/styles/wcontainer.css rename to resources/library/interactivities/spl-text.wgt/styles/wcontainer.css diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/config.xml b/resources/library/interactivities/spl-word.wgt/config.xml similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/config.xml rename to resources/library/interactivities/spl-word.wgt/config.xml diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/icon.png b/resources/library/interactivities/spl-word.wgt/icon.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/icon.png rename to resources/library/interactivities/spl-word.wgt/icon.png diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/index.html b/resources/library/interactivities/spl-word.wgt/index.html similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/index.html rename to resources/library/interactivities/spl-word.wgt/index.html diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/scripts/ext.js b/resources/library/interactivities/spl-word.wgt/scripts/ext.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/scripts/ext.js rename to resources/library/interactivities/spl-word.wgt/scripts/ext.js diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery-ui-1.8.9.custom.min.js b/resources/library/interactivities/spl-word.wgt/scripts/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery-ui-1.8.9.custom.min.js rename to resources/library/interactivities/spl-word.wgt/scripts/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery144.js b/resources/library/interactivities/spl-word.wgt/scripts/jquery144.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/scripts/jquery144.js rename to resources/library/interactivities/spl-word.wgt/scripts/jquery144.js diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/scripts/spl-word.js b/resources/library/interactivities/spl-word.wgt/scripts/spl-word.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/scripts/spl-word.js rename to resources/library/interactivities/spl-word.wgt/scripts/spl-word.js diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/scripts/wcontainer.js b/resources/library/interactivities/spl-word.wgt/scripts/wcontainer.js similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/scripts/wcontainer.js rename to resources/library/interactivities/spl-word.wgt/scripts/wcontainer.js diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/styles/master.css b/resources/library/interactivities/spl-word.wgt/styles/master.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/styles/master.css rename to resources/library/interactivities/spl-word.wgt/styles/master.css diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-activated.png b/resources/library/interactivities/spl-word.wgt/styles/separator-activated.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-activated.png rename to resources/library/interactivities/spl-word.wgt/styles/separator-activated.png diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-hover.png b/resources/library/interactivities/spl-word.wgt/styles/separator-hover.png similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/styles/separator-hover.png rename to resources/library/interactivities/spl-word.wgt/styles/separator-hover.png diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/styles/spl-word.css b/resources/library/interactivities/spl-word.wgt/styles/spl-word.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/styles/spl-word.css rename to resources/library/interactivities/spl-word.wgt/styles/spl-word.css diff --git a/resources/library/sankoreInteractivities/spl-word.wgt/styles/wcontainer.css b/resources/library/interactivities/spl-word.wgt/styles/wcontainer.css similarity index 100% rename from resources/library/sankoreInteractivities/spl-word.wgt/styles/wcontainer.css rename to resources/library/interactivities/spl-word.wgt/styles/wcontainer.css diff --git a/resources/library/userImage/Backgrounds/3_D_cartesian_grid.svg b/resources/library/userImage/Backgrounds/3_D_cartesian_grid.svg deleted file mode 100644 index 7bbac66c..00000000 --- a/resources/library/userImage/Backgrounds/3_D_cartesian_grid.svg +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/3_D_cartesian_no_grid.svg b/resources/library/userImage/Backgrounds/3_D_cartesian_no_grid.svg deleted file mode 100644 index b24adf39..00000000 --- a/resources/library/userImage/Backgrounds/3_D_cartesian_no_grid.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/Two_dim_cartesian_grid.svg b/resources/library/userImage/Backgrounds/Two_dim_cartesian_grid.svg deleted file mode 100644 index 21225536..00000000 --- a/resources/library/userImage/Backgrounds/Two_dim_cartesian_grid.svg +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/blank_timeline.svg b/resources/library/userImage/Backgrounds/blank_timeline.svg deleted file mode 100644 index 84213caa..00000000 --- a/resources/library/userImage/Backgrounds/blank_timeline.svg +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/music.svg b/resources/library/userImage/Backgrounds/music.svg deleted file mode 100644 index f60cbdc6..00000000 --- a/resources/library/userImage/Backgrounds/music.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/userImage/Backgrounds/week_timesheet.svg b/resources/library/userImage/Backgrounds/week_timesheet.svg deleted file mode 100644 index e92e6d39..00000000 --- a/resources/library/userImage/Backgrounds/week_timesheet.svg +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - -SUNDAY -MONDAY -TUESDAY -WEDNESDAY -THURSDAY -FRIDAY -SATURDAY - diff --git a/resources/library/userImage/Backgrounds/worldmap.svg b/resources/library/userImage/Backgrounds/worldmap.svg deleted file mode 100644 index 010403fa..00000000 --- a/resources/library/userImage/Backgrounds/worldmap.svg +++ /dev/null @@ -1,18335 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/adaptors/UBImportAdaptor.cpp b/src/adaptors/UBImportAdaptor.cpp index b09ba0ff..0770fa39 100644 --- a/src/adaptors/UBImportAdaptor.cpp +++ b/src/adaptors/UBImportAdaptor.cpp @@ -35,7 +35,7 @@ UBImportAdaptor::~UBImportAdaptor() UBDocumentProxy* UBImportAdaptor::importFile(const QFile& pFile, const QString& pGroup) { - QString documentName = QFileInfo(pFile.fileName()).baseName(); + QString documentName = QFileInfo(pFile.fileName()).completeBaseName(); UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocument(pGroup, documentName); diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index 6a689b76..7d43feee 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -1,219 +1,217 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "UBImportDocument.h" -#include "document/UBDocumentProxy.h" - -#include "frameworks/UBFileSystemUtils.h" - -#include "core/UBApplication.h" -#include "core/UBSettings.h" -#include "core/UBPersistenceManager.h" - -#include "globals/UBGlobals.h" - -THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" -THIRD_PARTY_WARNINGS_ENABLE - -#include "core/memcheck.h" - -UBImportDocument::UBImportDocument(QObject *parent) - :UBImportAdaptor(parent) -{ - // NOOP -} - -UBImportDocument::~UBImportDocument() -{ - // NOOP -} - - -QStringList UBImportDocument::supportedExtentions() -{ - return QStringList("ubz"); -} - - -QString UBImportDocument::importFileFilter() -{ - return tr("Open-Sankore (*.ubz)"); -} - - -QString UBImportDocument::expandFileToDir(const QFile& pZipFile, const QString& pDir) -{ - - QDir rootDir(pDir); - QuaZip zip(pZipFile.fileName()); - - if(!zip.open(QuaZip::mdUnzip)) - { - qWarning() << "Import failed. Cause zip.open(): " << zip.getZipError(); - return ""; - } - - zip.setFileNameCodec("UTF-8"); - QuaZipFileInfo info; - QuaZipFile file(&zip); - - // TODO UB 4.x implement a mechanism that can replace an existing - // document based on the UID of the document. - bool createNewDocument = true; - QString documentRootFolder; - - // first we search the metadata.rdf to check the document properties - for(bool more = zip.goToFirstFile(); more; more = zip.goToNextFile()) - { - if(!zip.getCurrentFileInfo(&info)) - { - qWarning() << "Import failed. Cause: getCurrentFileInfo(): " << zip.getZipError(); - return ""; - } - - QFileInfo currentFileInfo(pDir + "/" + file.getActualFileName()); - } - - if (createNewDocument) - documentRootFolder = UBPersistenceManager::persistenceManager()->generateUniqueDocumentPath(); - - - QFile out; - char c; - for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) - { - if(!zip.getCurrentFileInfo(&info)) - { - //TOD UB 4.3 O display error to user or use crash reporter - qWarning() << "Import failed. Cause: getCurrentFileInfo(): " << zip.getZipError(); - return ""; - } - - if(!file.open(QIODevice::ReadOnly)) - { - qWarning() << "Import failed. Cause: file.open(): " << zip.getZipError(); - return ""; - } - - if(file.getZipError()!= UNZ_OK) - { - qWarning() << "Import failed. Cause: file.getFileName(): " << zip.getZipError(); - return ""; - } - - QString newFileName = documentRootFolder + "/" + file.getActualFileName(); - QFileInfo newFileInfo(newFileName); - rootDir.mkpath(newFileInfo.absolutePath()); - - out.setFileName(newFileName); - out.open(QIODevice::WriteOnly); - - // Slow like hell (on GNU/Linux at least), but it is not my fault. - // Not ZIP/UNZIP package's fault either. - // The slowest thing here is out.putChar(c). - QByteArray outFileContent = file.readAll(); - if (out.write(outFileContent) == -1) - { - qWarning() << "Import failed. Cause: Unable to write file"; - out.close(); - return ""; - } - - while(file.getChar(&c)) - out.putChar(c); - - out.close(); - - if(file.getZipError()!=UNZ_OK) - { - qWarning() << "Import failed. Cause: " << zip.getZipError(); - return ""; - } - - if(!file.atEnd()) - { - qWarning() << "Import failed. Cause: read all but not EOF"; - return ""; - } - - file.close(); - - if(file.getZipError()!=UNZ_OK) - { - qWarning() << "Import failed. Cause: file.close(): " << file.getZipError(); - return ""; - } - - } - - zip.close(); - - if(zip.getZipError()!=UNZ_OK) - { - qWarning() << "Import failed. Cause: zip.close(): " << zip.getZipError(); - return ""; - } - - - return documentRootFolder; -} - - -UBDocumentProxy* UBImportDocument::importFile(const QFile& pFile, const QString& pGroup) -{ - Q_UNUSED(pGroup); // group is defined in the imported file - - QFileInfo fi(pFile); - UBApplication::showMessage(tr("Importing file %1...").arg(fi.baseName()), true); - - // first unzip the file to the correct place - QString path = UBSettings::settings()->uniboardDocumentDirectory(); - - QString documentRootFolder = expandFileToDir(pFile, path); - - if(!documentRootFolder.length()){ - UBApplication::showMessage(tr("Import of file %1 failed.").arg(fi.baseName())); - return 0; - } - else{ - UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder, pGroup); - - UBApplication::showMessage(tr("Import successful.")); - - return newDocument; - } -} - - -bool UBImportDocument::addFileToDocument(UBDocumentProxy* pDocument, const QFile& pFile) -{ - QFileInfo fi(pFile); - UBApplication::showMessage(tr("Importing file %1...").arg(fi.baseName()), true); - - QString path = UBFileSystemUtils::createTempDir(); - - QString documentRootFolder = expandFileToDir(pFile, path); - - UBPersistenceManager::persistenceManager()->addDirectoryContentToDocument(documentRootFolder, pDocument); - - UBFileSystemUtils::deleteDir(path); - - UBApplication::showMessage(tr("Import successful.")); - - return true; -} +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "UBImportDocument.h" +#include "document/UBDocumentProxy.h" + +#include "frameworks/UBFileSystemUtils.h" + +#include "core/UBApplication.h" +#include "core/UBSettings.h" +#include "core/UBPersistenceManager.h" + +#include "globals/UBGlobals.h" + +THIRD_PARTY_WARNINGS_DISABLE +#include "quazip.h" +#include "quazipfile.h" +#include "quazipfileinfo.h" +THIRD_PARTY_WARNINGS_ENABLE + +#include "core/memcheck.h" + +UBImportDocument::UBImportDocument(QObject *parent) + :UBImportAdaptor(parent) +{ + // NOOP +} + +UBImportDocument::~UBImportDocument() +{ + // NOOP +} + + +QStringList UBImportDocument::supportedExtentions() +{ + return QStringList("ubz"); +} + + +QString UBImportDocument::importFileFilter() +{ + return tr("Open-Sankore (*.ubz)"); +} + + +QString UBImportDocument::expandFileToDir(const QFile& pZipFile, const QString& pDir) +{ + + QDir rootDir(pDir); + QuaZip zip(pZipFile.fileName()); + + if(!zip.open(QuaZip::mdUnzip)) + { + qWarning() << "Import failed. Cause zip.open(): " << zip.getZipError(); + return ""; + } + + zip.setFileNameCodec("UTF-8"); + QuaZipFileInfo info; + QuaZipFile file(&zip); + + // TODO UB 4.x implement a mechanism that can replace an existing + // document based on the UID of the document. + bool createNewDocument = true; + QString documentRootFolder; + + // first we search the metadata.rdf to check the document properties + for(bool more = zip.goToFirstFile(); more; more = zip.goToNextFile()) + { + if(!zip.getCurrentFileInfo(&info)) + { + qWarning() << "Import failed. Cause: getCurrentFileInfo(): " << zip.getZipError(); + return ""; + } + + QFileInfo currentFileInfo(pDir + "/" + file.getActualFileName()); + } + + if (createNewDocument) + documentRootFolder = UBPersistenceManager::persistenceManager()->generateUniqueDocumentPath(); + + + QFile out; + char c; + for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) + { + if(!zip.getCurrentFileInfo(&info)) + { + //TOD UB 4.3 O display error to user or use crash reporter + qWarning() << "Import failed. Cause: getCurrentFileInfo(): " << zip.getZipError(); + return ""; + } + + if(!file.open(QIODevice::ReadOnly)) + { + qWarning() << "Import failed. Cause: file.open(): " << zip.getZipError(); + return ""; + } + + if(file.getZipError()!= UNZ_OK) + { + qWarning() << "Import failed. Cause: file.getFileName(): " << zip.getZipError(); + return ""; + } + + QString newFileName = documentRootFolder + "/" + file.getActualFileName(); + QFileInfo newFileInfo(newFileName); + rootDir.mkpath(newFileInfo.absolutePath()); + + out.setFileName(newFileName); + out.open(QIODevice::WriteOnly); + + // Slow like hell (on GNU/Linux at least), but it is not my fault. + // Not ZIP/UNZIP package's fault either. + // The slowest thing here is out.putChar(c). + QByteArray outFileContent = file.readAll(); + if (out.write(outFileContent) == -1) + { + qWarning() << "Import failed. Cause: Unable to write file"; + out.close(); + return ""; + } + + while(file.getChar(&c)) + out.putChar(c); + + out.close(); + + if(file.getZipError()!=UNZ_OK) + { + qWarning() << "Import failed. Cause: " << zip.getZipError(); + return ""; + } + + if(!file.atEnd()) + { + qWarning() << "Import failed. Cause: read all but not EOF"; + return ""; + } + + file.close(); + + if(file.getZipError()!=UNZ_OK) + { + qWarning() << "Import failed. Cause: file.close(): " << file.getZipError(); + return ""; + } + + } + + zip.close(); + + if(zip.getZipError()!=UNZ_OK) + { + qWarning() << "Import failed. Cause: zip.close(): " << zip.getZipError(); + return ""; + } + + + return documentRootFolder; +} + + +UBDocumentProxy* UBImportDocument::importFile(const QFile& pFile, const QString& pGroup) +{ + Q_UNUSED(pGroup); // group is defined in the imported file + + QFileInfo fi(pFile); + UBApplication::showMessage(tr("Importing file %1...").arg(fi.baseName()), true); + + // first unzip the file to the correct place + QString path = UBSettings::userDocumentDirectory(); + + QString documentRootFolder = expandFileToDir(pFile, path); + + if(!documentRootFolder.length()){ + UBApplication::showMessage(tr("Import of file %1 failed.").arg(fi.baseName())); + return 0; + } + else{ + UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder); + UBApplication::showMessage(tr("Import successful.")); + return newDocument; + } +} + + +bool UBImportDocument::addFileToDocument(UBDocumentProxy* pDocument, const QFile& pFile) +{ + QFileInfo fi(pFile); + UBApplication::showMessage(tr("Importing file %1...").arg(fi.baseName()), true); + + QString path = UBFileSystemUtils::createTempDir(); + + QString documentRootFolder = expandFileToDir(pFile, path); + + UBPersistenceManager::persistenceManager()->addDirectoryContentToDocument(documentRootFolder, pDocument); + + UBFileSystemUtils::deleteDir(path); + + UBApplication::showMessage(tr("Import successful.")); + + return true; +} diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index 2335c3cf..d3dc75fa 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -171,20 +171,15 @@ class UBSvgSubsetAdaptor int pointsCount = crashedPoints.size(); QString svgPoints; - static const int maxBufferLengthPerPoint = 30; - int maxBufferLength = maxBufferLengthPerPoint * pointsCount; - char *buffer = new char[maxBufferLength]; int length = 0; - + QString sBuf; for(int j = 0; j < pointsCount; j++) { - const QPointF & point = crashedPoints.at(j); - int n = sprintf(buffer + length, "%.2f,%.2f ", point.x(), point.y()); - length += n; + const QPointF & point = crashedPoints.at(j); + sBuf.sprintf("%.2f,%.2f ", point.x(), point.y()); + svgPoints.insert(length, sBuf); + length += sBuf.length(); } - - svgPoints = QString::fromAscii(buffer, length); - delete buffer; return svgPoints; } diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 2025076a..4e11cdd0 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -842,8 +842,6 @@ void UBBoardPaletteManager::addItemToLibrary() if(!mPixmap.isNull()) { - QString imageDir = UBSettings::settings()->defaultUserImagesDirectory(); - if(mScaleFactor != 1.) { mPixmap = mPixmap.scaled(mScaleFactor * mPixmap.width(), mScaleFactor* mPixmap.height() diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index a3f56738..72e5dd1c 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -53,18 +53,15 @@ UBLibraryController::UBLibraryController(QWidget *pParentWidget) : { readFavoriteList(); - mAudioStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); - userPath(mAudioStandardDirectoryPath); + mAudioStandardDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->userAudioDirectory()); - mVideoStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); - userPath(mVideoStandardDirectoryPath); + mVideoStandardDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->userVideoDirectory()); - mPicturesStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation)); - userPath(mPicturesStandardDirectoryPath); + mPicturesStandardDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->userImageDirectory()); - mInteractiveUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardInteractiveUserDirectory()); + mInteractiveUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->userInteractiveDirectory()); - mAnimationUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->animationUserDirectory()); + mAnimationUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->userAnimationDirectory()); createInternalWidgetItems(); @@ -72,8 +69,8 @@ UBLibraryController::UBLibraryController(QWidget *pParentWidget) : bool UBLibraryController::canItemsOnElementBeDeleted(UBLibElement *pElement) { - return !pElement->path().toLocalFile().startsWith(UBSettings::settings()->uniboardShapeLibraryDirectory()) && - !pElement->path().toLocalFile().startsWith(UBSettings::settings()->sankoreDistributedInteractiveDirectory()) && + return !pElement->path().toLocalFile().startsWith(UBSettings::settings()->applicationShapeLibraryDirectory()) && + !pElement->path().toLocalFile().startsWith(UBSettings::settings()->applicationInteractivesDirectory()) && pElement->isDeletable(); } @@ -163,7 +160,7 @@ void UBLibraryController::importItemOnLibrary(QString& pItemString) bool isZip = false; if(itemToImport.isDir() || (isZip = UBFileSystemUtils::isAZipFile(pItemString))){ if(pItemString.contains(".wgt",Qt::CaseInsensitive) || pItemString.contains(".wdgt",Qt::CaseInsensitive)){ - QString destination = UBSettings::settings()->uniboardInteractiveUserDirectory() + "/" + itemToImport.fileName(); + QString destination = UBSettings::settings()->userInteractiveDirectory() + "/" + itemToImport.fileName(); if(isZip) UBFileSystemUtils::expandZipToDir(pItemString,destination); else{ @@ -209,12 +206,6 @@ void UBLibraryController::importItemOnLibrary(QString& pItemString) } -void UBLibraryController::userPath(QUrl& pPath) -{ - pPath = QUrl::fromLocalFile(pPath.toLocalFile() + "/Sankore"); - createDirectory(pPath); -} - QList UBLibraryController::rootCategoriesList() { QList categories; @@ -234,7 +225,7 @@ QList UBLibraryController::rootCategoriesList() element->setMoveable(false); categories << element; - QString path = UBSettings::settings()->uniboardShapeLibraryDirectory(); + QString path = UBSettings::settings()->applicationShapeLibraryDirectory(); element = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(path), tr("Shapes", "Shapes category element")); element->setThumbnail(QImage(":images/libpalette/ShapesCategory.svg")); element->setMoveable(false); @@ -250,14 +241,14 @@ QList UBLibraryController::rootCategoriesList() element->setMoveable(false); categories << element; - mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardGipLibraryDirectory()); + mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->applicationGipLibraryDirectory()); element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactivities", "Interactives category element")); element->setThumbnail(QImage(":images/libpalette/InteractivesCategory.svg")); element->setMoveable(false); categories << element; // Note : FEATURE IN DEVELOPMENT, DO NOT ERASE (or you will get problems) !!!! - mSearchCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardSearchDirectory()); + mSearchCategoryPath = QUrl::fromLocalFile(UBSettings::userSearchDirectory()); element = new UBLibElement(eUBLibElementType_Folder, mSearchCategoryPath, tr("Web Search", "Web search category element")); element->setThumbnail(QImage(":images/libpalette/WebSearchCategory.svg")); element->setMoveable(false); @@ -333,19 +324,17 @@ QList UBLibraryController::addVirtualElementsForItemPath(const QS { QList content; if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ - content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); - content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); + content << listElementsInPath(UBSettings::settings()->applicationApplicationsLibraryDirectory()); + content << listElementsInPath(UBSettings::settings()->userInteractiveFavoritesDirectory()); foreach(UBLibElement* eachElement, mInternalLibElements) content << new UBLibElement(eachElement); } else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){ - QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory()); - userPath(path); + QUrl path = QUrl::fromLocalFile(UBSettings::settings()->applicationImageLibraryDirectory()); content << listElementsInPath(path.toLocalFile()); - content << listElementsInPath(UBSettings::settings()->uniboardDefaultUserImageLibraryDirectory()); } else if (pPath == mInteractiveCategoryPath.toLocalFile()){ - content << listElementsInPath(UBSettings::settings()->sankoreDistributedInteractiveDirectory()); + content << listElementsInPath(UBSettings::settings()->applicationInteractivesDirectory()); } return content; @@ -548,7 +537,7 @@ UBGraphicsScene* UBLibraryController::activeScene() void UBLibraryController::persistFavoriteList() { - QFile file(UBSettings::libraryPaletteFavoriteListFilePath()); + QFile file(UBSettings::userFavoriteListFilePath()); file.open(QIODevice::WriteOnly); QDataStream out(&file); //magic number @@ -567,7 +556,7 @@ void UBLibraryController::persistFavoriteList() void UBLibraryController::readFavoriteList() { - QFile file(UBSettings::libraryPaletteFavoriteListFilePath()); + QFile file(UBSettings::userFavoriteListFilePath()); file.open(QIODevice::ReadOnly); QDataStream in(&file); // read the data serialized from the file quint32 magicNumber; @@ -649,11 +638,11 @@ QRectF UBLibraryController::visibleSceneRect() void UBLibraryController::addImagesToCurrentPage(const QList& images) { - QPointF pos = visibleSceneRect().center(); + QPointF pos = UBApplication::boardController->activeScene()->normalizedSceneRect().center(); + foreach(const QUrl url, images) { - mLastItemOffsetIndex++; mLastItemOffsetIndex = qMin(mLastItemOffsetIndex, 5); QGraphicsItem* itemInScene = 0; @@ -662,6 +651,8 @@ void UBLibraryController::addImagesToCurrentPage(const QList& images) QString mimeType = UBFileSystemUtils::mimeTypeFromFileName( url.toString()); + pos = QPointF(pos.x() + 50 * mLastItemOffsetIndex, pos.y() + 50 * mLastItemOffsetIndex); + mLastItemOffsetIndex++; //TODO UB 4.x move this logic to the scene .. if (mimeType == "image/svg+xml") { itemInScene = activeScene()->addSvg(url, pos); @@ -673,8 +664,6 @@ void UBLibraryController::addImagesToCurrentPage(const QList& images) if (itemInScene) { itemInScene = activeScene()->scaleToFitDocumentSize(itemInScene, false, UBSettings::objectInControlViewMargin); - - itemInScene->setPos(QPoint(pos.x() + 50 * mLastItemOffsetIndex, pos.y() + 50 * mLastItemOffsetIndex)); } } } @@ -819,7 +808,7 @@ QUrl UBChainedLibElement::lastItemPath() UBLibElement* UBLibElement::trashElement() { UBLibElement *trashElement; - trashElement = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(UBSettings::trashLibraryPaletteDirPath()), QObject::tr("Trash", "Pictures category element")); + trashElement = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(UBSettings::userTrashDirPath()), QObject::tr("Trash", "Pictures category element")); trashElement->setThumbnail(QImage(":images/libpalette/TrashCategory.svg")); trashElement->setMoveable(false); diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 45c5a586..c0771af2 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -212,7 +212,7 @@ int UBApplication::exec(const QString& pFileToImport) { QPixmapCache::setCacheLimit(1024 * 100); - QString webDbPath = UBSettings::uniboardDataDirectory() + "/web-databases"; + QString webDbPath = UBSettings::userDataDirectory() + "/web-databases"; QDir webDbDir(webDbPath); if (!webDbDir.exists(webDbPath)) webDbDir.mkpath(webDbPath); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 689b0293..926ae03f 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -313,7 +313,7 @@ void UBApplicationController::addCapturedEmbedCode(const QString& embedCode) { showBoard(); - const QString userWidgetPath = UBSettings::settings()->uniboardInteractiveUserDirectory() + "/" + tr("Web"); // TODO UB 4.x synch with w3cWidget + const QString userWidgetPath = UBSettings::settings()->userInteractiveDirectory() + "/" + tr("Web"); // TODO UB 4.x synch with w3cWidget QDir userWidgetDir(userWidgetPath); int width = 300; diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 2406e28e..1ae24c27 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1,1185 +1,1157 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "UBPersistenceManager.h" -#include "gui/UBMainWindow.h" - -#include - -#include "frameworks/UBPlatformUtils.h" -#include "frameworks/UBFileSystemUtils.h" - -#include "core/UBApplication.h" -#include "core/UBSettings.h" -#include "core/UBSetting.h" - -#include "document/UBDocumentProxy.h" - -#include "adaptors/UBExportPDF.h" -#include "adaptors/UBSvgSubsetAdaptor.h" -#include "adaptors/UBThumbnailAdaptor.h" -#include "adaptors/UBMetadataDcSubsetAdaptor.h" - -#include "core/memcheck.h" - -const QString UBPersistenceManager::imageDirectory = "images"; // added to UBPersistenceManager::mAllDirectories -const QString UBPersistenceManager::objectDirectory = "objects"; // added to UBPersistenceManager::mAllDirectories -const QString UBPersistenceManager::widgetDirectory = "widgets"; // added to UBPersistenceManager::mAllDirectories -const QString UBPersistenceManager::videoDirectory = "videos"; // added to UBPersistenceManager::mAllDirectories -const QString UBPersistenceManager::audioDirectory = "audios"; // added to - -UBPersistenceManager * UBPersistenceManager::sSingleton = 0; - -UBPersistenceManager::UBPersistenceManager(QObject *pParent) - : QObject(pParent) - , mHasPurgedDocuments(false) -{ - - mDocumentSubDirectories << imageDirectory; - mDocumentSubDirectories << objectDirectory; - mDocumentSubDirectories << widgetDirectory; - mDocumentSubDirectories << videoDirectory; - mDocumentSubDirectories << audioDirectory; - - documentProxies = allDocumentProxies(); - emit proxyListChanged(); -} - -UBPersistenceManager* UBPersistenceManager::persistenceManager() -{ - if (!sSingleton) - { - sSingleton = new UBPersistenceManager(UBApplication::staticMemoryCleaner); - } - - return sSingleton; -} - -void UBPersistenceManager::destroy() -{ - if (sSingleton) - delete sSingleton; - sSingleton = NULL; -} - -UBPersistenceManager::~UBPersistenceManager() -{ - foreach(QPointer proxyGuard, documentProxies) - { - if (!proxyGuard.isNull()) - delete proxyGuard.data(); - } -} - - -QList > UBPersistenceManager::allDocumentProxies() -{ - mDocumentRepositoryPath = UBSettings::settings()->uniboardDocumentDirectory(); - - QDir rootDir(mDocumentRepositoryPath); - rootDir.mkpath(rootDir.path()); - - - QFileSystemWatcher* watcher = new QFileSystemWatcher(this); - watcher->addPath(mDocumentRepositoryPath); - - connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(documentRepositoryChanged(const QString&))); - - QList > proxies; - - foreach(QString path, rootDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, - QDir::Time | QDir::Reversed)) - { - QString fullPath = rootDir.path() + "/" + path; - - QDir dir(fullPath); - - if (dir.entryList(QDir::Files | QDir::NoDotAndDotDot).size() > 0) - { - UBDocumentProxy* proxy = new UBDocumentProxy(fullPath); // deleted in UBPersistenceManager::destructor - - QMap metadatas = UBMetadataDcSubsetAdaptor::load(fullPath); - - foreach(QString key, metadatas.keys()) - { - proxy->setMetaData(key, metadatas.value(key)); - } - - proxy->setPageCount(sceneCount(proxy)); - - proxies << QPointer(proxy); - - } - } - - return proxies; -} - - -QStringList UBPersistenceManager::allShapes() -{ - QString shapeLibraryPath = UBSettings::settings()->uniboardShapeLibraryDirectory(); - - QDir dir(shapeLibraryPath); - - if (!dir.exists()) - dir.mkpath(shapeLibraryPath); - - QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - paths.append(shapeLibraryPath + QString("/") + file); - } - - return paths; -} - -QStringList UBPersistenceManager::allGips() -{ - QString gipLibraryPath = UBSettings::settings()->uniboardGipLibraryDirectory(); - - QDir dir(gipLibraryPath); - - QStringList files = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - QFileInfo fi(file); - - if (UBSettings::settings()->widgetFileExtensions.contains(fi.suffix())) - paths.append(dir.path() + QString("/") + file); - } - - return paths; -} - -QStringList UBPersistenceManager::allSounds() -{ - QString soundLibraryPath = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); - - QDir dir(soundLibraryPath); - - QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - QFileInfo fi(file); - paths.append(dir.path() + QString("/") + file); - } - - return paths; -} - -QStringList UBPersistenceManager::allImages(const QDir& dir) -{ - if (!dir.exists()) - dir.mkpath(dir.path()); - - QStringList files = dir.entryList(QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - paths.append(dir.path() + QString("/") + file); - } - - return paths; -} - - -QStringList UBPersistenceManager::allVideos(const QDir& dir) -{ - if (!dir.exists()) - dir.mkpath(dir.path()); - - QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - paths.append(dir.path() + QString("/") + file); - } - - return paths; -} - - -QStringList UBPersistenceManager::allWidgets(const QDir& dir) -{ - if (!dir.exists()) - dir.mkpath(dir.path()); - - QStringList files = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - QStringList paths; - - foreach(QString file, files) - { - QFileInfo fi(file); - - if (UBSettings::settings()->widgetFileExtensions.contains(fi.suffix())) - paths.append(dir.path() + QString("/") + file); - } - - return paths; -} - - -UBDocumentProxy* UBPersistenceManager::createDocument(const QString& pGroupName, const QString& pName, bool withEmptyPage) -{ - checkIfDocumentRepositoryExists(); - - UBDocumentProxy *doc = new UBDocumentProxy(); // deleted in UBPersistenceManager::destructor - - if (pGroupName.length() > 0) - { - doc->setMetaData(UBSettings::documentGroupName, pGroupName); - } - - if (pName.length() > 0) - { - doc->setMetaData(UBSettings::documentName, pName); - } - - doc->setMetaData(UBSettings::documentVersion, UBSettings::currentFileVersion); - doc->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); - - if (withEmptyPage) createDocumentSceneAt(doc, 0); - - documentProxies.insert(0, QPointer(doc)); - - emit proxyListChanged(); - - emit documentCreated(doc); - - mDocumentCreatedDuringSession << doc; - - return doc; -} - -UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName, const QString& pName, bool withEmptyPage) -{ - checkIfDocumentRepositoryExists(); - - UBDocumentProxy* doc = new UBDocumentProxy(pDocumentDirectory); // deleted in UBPersistenceManager::destructor - - if (pGroupName.length() > 0) - { - doc->setMetaData(UBSettings::documentGroupName, pGroupName); - } - - if (pName.length() > 0) - { - doc->setMetaData(UBSettings::documentName, pName); - } - if (withEmptyPage) createDocumentSceneAt(doc, 0); - - QMap metadatas = UBMetadataDcSubsetAdaptor::load(pDocumentDirectory); - - foreach(QString key, metadatas.keys()) - { - doc->setMetaData(key, metadatas.value(key)); - } - - doc->setUuid(QUuid::createUuid()); - doc->setPageCount(sceneCount(doc)); - - UBMetadataDcSubsetAdaptor::persist(doc); - - for(int i = 0; i < doc->pageCount(); i++) - { - UBSvgSubsetAdaptor::setSceneUuid(doc, i, QUuid::createUuid()); - } - - documentProxies << QPointer(doc); - - emit proxyListChanged(); - - emit documentCreated(doc); - - return doc; -} - - -void UBPersistenceManager::deleteDocument(UBDocumentProxy* pDocumentProxy) -{ - checkIfDocumentRepositoryExists(); - - emit documentWillBeDeleted(pDocumentProxy); - - UBFileSystemUtils::deleteDir(pDocumentProxy->persistencePath()); - - documentProxies.removeAll(QPointer(pDocumentProxy)); - mDocumentCreatedDuringSession.removeAll(pDocumentProxy); - - mSceneCache.removeAllScenes(pDocumentProxy); - - pDocumentProxy->deleteLater(); - - emit proxyListChanged(); - -} - - -UBDocumentProxy* UBPersistenceManager::duplicateDocument(UBDocumentProxy* pDocumentProxy) -{ - checkIfDocumentRepositoryExists(); - - UBDocumentProxy *copy = new UBDocumentProxy(); // deleted in UBPersistenceManager::destructor - - generatePathIfNeeded(copy); - - UBFileSystemUtils::copyDir(pDocumentProxy->persistencePath(), copy->persistencePath()); - - // regenerate scenes UUIDs - for(int i = 0; i < pDocumentProxy->pageCount(); i++) - { - UBSvgSubsetAdaptor::setSceneUuid(pDocumentProxy, i, QUuid::createUuid()); - } - - foreach(QString key, pDocumentProxy->metaDatas().keys()) - { - copy->setMetaData(key, pDocumentProxy->metaDatas().value(key)); - } - - copy->setMetaData(UBSettings::documentName, - pDocumentProxy->metaData(UBSettings::documentName).toString() + " " + tr("(copy)")); - - copy->setUuid(QUuid::createUuid()); - - persistDocumentMetadata(copy); - - copy->setPageCount(sceneCount(copy)); - - documentProxies << QPointer(copy); - - emit proxyListChanged(); - - emit documentCreated(copy); - - return copy; - -} - - -void UBPersistenceManager::deleteDocumentScenes(UBDocumentProxy* proxy, const QList& indexes) -{ - checkIfDocumentRepositoryExists(); - - int pageCount = UBPersistenceManager::persistenceManager()->sceneCount(proxy); - - QList compactedIndexes; - - foreach(int index, indexes) - { - if (!compactedIndexes.contains(index)) - compactedIndexes.append(index); - } - - if (compactedIndexes.size() == pageCount) - { - deleteDocument(proxy); - return; - } - - if (compactedIndexes.size() == 0) - return; - - foreach(int index, compactedIndexes) - { - emit documentSceneWillBeDeleted(proxy, index); - } - - QString sourceGroupName = proxy->metaData(UBSettings::documentGroupName).toString(); - QString sourceName = proxy->metaData(UBSettings::documentName).toString(); - UBDocumentProxy *trashDocProxy = createDocument(UBSettings::trashedDocumentGroupNamePrefix + sourceGroupName, sourceName, false); - - foreach(int index, compactedIndexes) - { - UBGraphicsScene *scene = loadDocumentScene(proxy, index); - if (scene) - { - //scene is about to move into new document - foreach (QUrl relativeFile, scene->relativeDependencies()) - { - QString source = scene->document()->persistencePath() + "/" + relativeFile.toString(); - QString target = trashDocProxy->persistencePath() + "/" + relativeFile.toString(); - - QFileInfo fi(target); - QDir d = fi.dir(); - - d.mkpath(d.absolutePath()); - QFile::copy(source, target); - } - - insertDocumentSceneAt(trashDocProxy, scene, trashDocProxy->pageCount()); - } - } - - for (int i = 1; i < pageCount; i++) - { - renamePage(trashDocProxy, i , i - 1); - } - - foreach(int index, compactedIndexes) - { - QString svgFileName = proxy->persistencePath() + - UBFileSystemUtils::digitFileFormat("/page%1.svg", index + 1); - - QFile::remove(svgFileName); - - QString thumbFileName = proxy->persistencePath() + - UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", index + 1); - - QFile::remove(thumbFileName); - - mSceneCache.removeScene(proxy, index); - - proxy->decPageCount(); - - } - - qSort(compactedIndexes); - - int offset = 1; - - for (int i = compactedIndexes.at(0) + 1; i < pageCount; i++) - { - if(compactedIndexes.contains(i)) - { - offset++; - } - else - { - renamePage(proxy, i , i - offset); - - mSceneCache.moveScene(proxy, i, i - offset); - - } - } - - foreach(int index, compactedIndexes) - { - emit documentSceneDeleted(proxy, index); - } -} - - -void UBPersistenceManager::duplicateDocumentScene(UBDocumentProxy* proxy, int index) -{ - checkIfDocumentRepositoryExists(); - - int pageCount = UBPersistenceManager::persistenceManager()->sceneCount(proxy); - - for (int i = pageCount; i > index + 1; i--) - { - renamePage(proxy, i - 1 , i); - - mSceneCache.moveScene(proxy, i - 1, i); - - } - - copyPage(proxy, index , index + 1); - - proxy->incPageCount(); - - //due to architectural peculiarity we need to save teacher bar info, otherwise we'll see not exactly what we expect - sTeacherBarInfos properInfo = getTeacherBarInfos(proxy, index + 1); - //after the call below - emit documentSceneCreated(proxy, index + 1); - //restoring info - persistTeacherBar(proxy, index + 1, properInfo); -} - - -UBGraphicsScene* UBPersistenceManager::createDocumentSceneAt(UBDocumentProxy* proxy, int index) -{ - int count = sceneCount(proxy); - - for(int i = count - 1; i >= index; i--) - { - renamePage(proxy, i , i + 1); - } - - mSceneCache.shiftUpScenes(proxy, index, count -1); - - UBGraphicsScene *newScene = mSceneCache.createScene(proxy, index); - - newScene->setBackground(UBSettings::settings()->isDarkBackground(), - UBSettings::settings()->UBSettings::isCrossedBackground()); - - persistDocumentScene(proxy, newScene, index); - - proxy->incPageCount(); - - emit documentSceneCreated(proxy, index); - - return newScene; -} - - -void UBPersistenceManager::insertDocumentSceneAt(UBDocumentProxy* proxy, UBGraphicsScene* scene, int index) -{ - scene->setDocument(proxy); - - int count = sceneCount(proxy); - - for(int i = count - 1; i >= index; i--) - { - renamePage(proxy, i , i + 1); - } - - mSceneCache.shiftUpScenes(proxy, index, count -1); - - mSceneCache.insert(proxy, index, scene); - - persistDocumentScene(proxy, scene, index); - - proxy->incPageCount(); - - emit documentSceneCreated(proxy, index); - -} - - -void UBPersistenceManager::moveSceneToIndex(UBDocumentProxy* proxy, int source, int target) -{ - checkIfDocumentRepositoryExists(); - - if (source == target) - return; - - QFile svgTmp(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", source + 1)); - svgTmp.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.tmp", target + 1)); - - QFile thumbTmp(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", source + 1)); - thumbTmp.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.tmp", target + 1)); - - if (source < target) - { - for (int i = source + 1; i <= target; i++) - { - renamePage(proxy, i , i - 1); - } - } - else - { - for (int i = source - 1; i >= target; i--) - { - renamePage(proxy, i , i + 1); - } - } - - QFile svg(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.tmp", target + 1)); - svg.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", target + 1)); - - QFile thumb(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.tmp", target + 1)); - thumb.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", target + 1)); - - mSceneCache.moveScene(proxy, source, target); - - emit documentSceneMoved(proxy, target); -} - - -UBGraphicsScene* UBPersistenceManager::loadDocumentScene(UBDocumentProxy* proxy, int sceneIndex) -{ - if (mSceneCache.contains(proxy, sceneIndex)) - { - //qDebug() << "scene" << sceneIndex << "retrieved from cache ..."; - return mSceneCache.value(proxy, sceneIndex); - } - else - { - UBGraphicsScene* scene = UBSvgSubsetAdaptor::loadScene(proxy, sceneIndex); - - if (scene) - mSceneCache.insert(proxy, sceneIndex, scene); - - return scene; - } -} - - -void UBPersistenceManager::persistDocumentScene(UBDocumentProxy* pDocumentProxy, UBGraphicsScene* pScene, const int pSceneIndex) -{ - checkIfDocumentRepositoryExists(); - - pScene->deselectAllItems(); - - generatePathIfNeeded(pDocumentProxy); - - QDir dir(pDocumentProxy->persistencePath()); - dir.mkpath(pDocumentProxy->persistencePath()); - - if (pDocumentProxy->isModified()) - UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); - - if (pScene->isModified()) - { - UBThumbnailAdaptor::persistScene(pDocumentProxy->persistencePath(), pScene, pSceneIndex); - - UBSvgSubsetAdaptor::persistScene(pDocumentProxy, pScene, pSceneIndex); - - pScene->setModified(false); - } - - mSceneCache.insert(pDocumentProxy, pSceneIndex, pScene); - - emit documentCommitted(pDocumentProxy); - -} - - -UBDocumentProxy* UBPersistenceManager::persistDocumentMetadata(UBDocumentProxy* pDocumentProxy) -{ - UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); - - emit documentMetadataChanged(pDocumentProxy); - - return pDocumentProxy; -} - - -void UBPersistenceManager::renamePage(UBDocumentProxy* pDocumentProxy, const int sourceIndex, const int targetIndex) -{ - QFile svg(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); - svg.rename(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); - - QFile thumb(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); - thumb.rename(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); -} - - -void UBPersistenceManager::copyPage(UBDocumentProxy* pDocumentProxy, const int sourceIndex, const int targetIndex) -{ - QFile svg(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); - svg.copy(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); - - UBSvgSubsetAdaptor::setSceneUuid(pDocumentProxy, targetIndex, QUuid::createUuid()); - - QFile thumb(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); - thumb.copy(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); -} - - -int UBPersistenceManager::sceneCount(const UBDocumentProxy* proxy) -{ - return sceneCountInDir(proxy->persistencePath()); -} - -int UBPersistenceManager::sceneCountInDir(const QString& pPath) -{ - int pageIndex = 0; - bool moreToProcess = true; - - while (moreToProcess) - { - QString fileName = pPath + UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex + 1); - - QFile file(fileName); - - if (file.exists()) - { - pageIndex++; - } - else - { - moreToProcess = false; - } - } - - return pageIndex; -} - - -QString UBPersistenceManager::generateUniqueDocumentPath() -{ - QString ubPath = UBSettings::settings()->uniboardDocumentDirectory(); - - QDateTime now = QDateTime::currentDateTime(); - QString dirName = now.toString("yyyy-MM-dd hh-mm-ss.zzz"); - - return ubPath + QString("/Sankore Document %1").arg(dirName); -} - - -void UBPersistenceManager::generatePathIfNeeded(UBDocumentProxy* pDocumentProxy) -{ - if (pDocumentProxy->persistencePath().length() == 0) - { - pDocumentProxy->setPersistencePath(generateUniqueDocumentPath()); - } -} - - -void UBPersistenceManager::addDirectoryContentToDocument(const QString& documentRootFolder, UBDocumentProxy* pDocument) -{ - int sourcePageCount = sceneCountInDir(documentRootFolder); - - int targetPageCount = pDocument->pageCount(); - - for(int sourceIndex = 0 ; sourceIndex < sourcePageCount; sourceIndex++) - { - int targetIndex = targetPageCount + sourceIndex; - - QFile svg(documentRootFolder + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); - svg.copy(pDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); - - UBSvgSubsetAdaptor::setSceneUuid(pDocument, targetIndex, QUuid::createUuid()); - - QFile thumb(documentRootFolder + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); - thumb.copy(pDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); - } - - foreach(QString dir, mDocumentSubDirectories) - { - qDebug() << "copying " << documentRootFolder << "/" << dir << " to " << pDocument->persistencePath() << "/" + dir; - - UBFileSystemUtils::copyDir(documentRootFolder + "/" + dir, pDocument->persistencePath() + "/" + dir); - } - - pDocument->setPageCount(sceneCount(pDocument)); - -} - - -void UBPersistenceManager::upgradeDocumentIfNeeded(UBDocumentProxy* pDocumentProxy) -{ - int pageCount = pDocumentProxy->pageCount(); - - for(int index = 0 ; index < pageCount; index++) - { - UBSvgSubsetAdaptor::upgradeScene(pDocumentProxy, index); - } - - pDocumentProxy->setMetaData(UBSettings::documentVersion, UBSettings::currentFileVersion); - - UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); -} - - -void UBPersistenceManager::upgradeAllDocumentsIfNeeded() -{ - foreach(QPointer proxy, documentProxies) - { - upgradeDocumentIfNeeded(proxy); - } -} - - - -UBDocumentProxy* UBPersistenceManager::documentByUuid(const QUuid& pUuid) -{ - for(int i = 0 ; i < documentProxies.length(); i++) - { - UBDocumentProxy* proxy = documentProxies.at(i); - - if (proxy && proxy->uuid() == pUuid) - { - return proxy; - } - } - - return 0; - -} - - -bool UBPersistenceManager::isEmpty(UBDocumentProxy* pDocumentProxy) -{ - if(!pDocumentProxy) - return true; - - if (pDocumentProxy->pageCount() > 1) - return false; - - UBGraphicsScene *theSoleScene = UBSvgSubsetAdaptor::loadScene(pDocumentProxy, 0); - - bool empty = false; - - if (theSoleScene) - { - empty = theSoleScene->isEmpty(); - delete theSoleScene; - } - else - { - empty = true; - } - - return empty; -} - - -void UBPersistenceManager::purgeEmptyDocuments() -{ - if(!mHasPurgedDocuments) // hack to workaround the fact that app closing is called twice :-( - { - QList toBeDeleted; - - foreach(UBDocumentProxy* docProxy, mDocumentCreatedDuringSession) - { - if (isEmpty(docProxy)) - { - toBeDeleted << docProxy; - } - } - - foreach(UBDocumentProxy* docProxy, toBeDeleted) - { - deleteDocument(docProxy); - } - - mHasPurgedDocuments = true; - } -} - - -QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) -{ - QFileInfo fi(path); - - if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) - return ""; - - QString fileName = UBPersistenceManager::videoDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); - - QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; - - if (!QFile::exists(destPath)) - { - QDir dir; - dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); - - QFile source(path); - - source.copy(destPath); - - } - - return fileName; - -} - - -QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid) -{ - if (!pDocumentProxy || objectUuid.isNull()) - return ""; - - QString urlPath = sourceUrl.path(); - int lastDot = urlPath.lastIndexOf("."); - QString suffix = urlPath.right(urlPath.length() - lastDot - 1); - - QString fileName = UBPersistenceManager::videoDirectory + "/" + objectUuid.toString() + "." + suffix; - QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; - - if (!QFile::exists(destPath)) - { - QDir dir; - dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); - - QFile newFile(destPath); - - if (newFile.open(QIODevice::WriteOnly)) - { - newFile.write(pPayload); - newFile.flush(); - newFile.close(); - } - } - - return fileName; - -} - - - -QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) -{ - QFileInfo fi(path); - - if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) - return ""; - - QString fileName = UBPersistenceManager::audioDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); - - QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; - - if (!QFile::exists(destPath)) - { - QDir dir; - dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); - - QFile source(path); - - source.copy(destPath); - - } - - return fileName; - -} - - -QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid) -{ - if (!pDocumentProxy || objectUuid.isNull()) - return ""; - - QString urlPath = sourceUrl.path(); - int lastDot = urlPath.lastIndexOf("."); - QString suffix = urlPath.right(urlPath.length() - lastDot - 1); - - QString fileName = UBPersistenceManager::audioDirectory + "/" + objectUuid.toString() + "." + suffix; - QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; - - if (!QFile::exists(destPath)) - { - QDir dir; - dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); - - QFile newFile(destPath); - - if (newFile.open(QIODevice::WriteOnly)) - { - newFile.write(pPayload); - newFile.flush(); - newFile.close(); - } - } - - return fileName; - -} - - -QString UBPersistenceManager::addPdfFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) -{ - QFileInfo fi(path); - - if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) - return ""; - - QString fileName = UBPersistenceManager::objectDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); - QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; - - if (!QFile::exists(destPath)) - { - QDir dir; - dir.mkpath(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::objectDirectory); - - QFile source(path); - source.copy(destPath); - } - - return fileName; -} -QString UBPersistenceManager::addGraphicsWidgteToDocument(UBDocumentProxy *pDocumentProxy, QString path, QUuid objectUuid) -{ - QFileInfo fi(path); - - if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) - return ""; - - QString widgetRootDir = path; - QString extension = QFileInfo(widgetRootDir).suffix(); - - QString widgetTargetDir = pDocumentProxy->persistencePath() + "/" + widgetDirectory + "/" + objectUuid.toString() + "." + extension; - - if (!QFile::exists(widgetTargetDir)) { - QDir dir; - dir.mkpath(widgetTargetDir); - UBFileSystemUtils::copyDir(widgetRootDir, widgetTargetDir); - } - - if (!QFile::exists(widgetTargetDir)) - widgetTargetDir = QString(); - - return widgetTargetDir; -} - - -void UBPersistenceManager::documentRepositoryChanged(const QString& path) -{ - Q_UNUSED(path); - checkIfDocumentRepositoryExists(); -} - - -void UBPersistenceManager::checkIfDocumentRepositoryExists() -{ - QDir rp(mDocumentRepositoryPath); - - if (!rp.exists()) - { - // we have lost the document repository .. - - QString humanPath = QDir::cleanPath(mDocumentRepositoryPath); - humanPath = QDir::toNativeSeparators(humanPath); - - UBApplication::mainWindow->warning(tr("Document Repository Loss"),tr("Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath)); - - UBApplication::quit(); - } -} - - -bool UBPersistenceManager::mayHaveVideo(UBDocumentProxy* pDocumentProxy) -{ - QDir videoDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); - - return videoDir.exists() && videoDir.entryInfoList().length() > 0; -} - -bool UBPersistenceManager::mayHaveAudio(UBDocumentProxy* pDocumentProxy) -{ - QDir audioDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); - - return audioDir.exists() && audioDir.entryInfoList().length() > 0; -} - -bool UBPersistenceManager::mayHavePDF(UBDocumentProxy* pDocumentProxy) -{ - QDir objectDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::objectDirectory); - - QStringList filters; - filters << "*.pdf"; - - return objectDir.exists() && objectDir.entryInfoList(filters).length() > 0; -} - - -bool UBPersistenceManager::mayHaveSVGImages(UBDocumentProxy* pDocumentProxy) -{ - QDir imageDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::imageDirectory); - - QStringList filters; - filters << "*.svg"; - - return imageDir.exists() && imageDir.entryInfoList(filters).length() > 0; -} - - -bool UBPersistenceManager::mayHaveWidget(UBDocumentProxy* pDocumentProxy) -{ - QDir widgetDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::widgetDirectory); - - return widgetDir.exists() && widgetDir.entryInfoList(QDir::Dirs).length() > 0; -} - -void UBPersistenceManager::persistTeacherBar(UBDocumentProxy* pDocumentProxy, int page, sTeacherBarInfos infos) -{ - if(NULL != pDocumentProxy) - { - QFile f(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", page + 1)); - if(f.exists()) - { - if(f.open(QIODevice::ReadOnly)) - { - QDomDocument domDoc; - if(domDoc.setContent(f.readAll())) - { - f.close(); - if(f.open(QIODevice::WriteOnly)) - { - QDomElement rootElem = domDoc.documentElement(); - QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); - if(teacherBarNode.isNull()) - { - // Create the element - QDomElement teacherElem = domDoc.createElement("teacherBar"); - rootElem.appendChild(teacherElem); - teacherBarNode = teacherElem; - } - - // Set the element values - QDomElement teacherBarElem = teacherBarNode.toElement(); - teacherBarElem.setAttribute("title", infos.title); - - QString qsAct; - for(int i=0; ipersistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", page + 1)); - if(f.exists()) - { - if(f.open(QIODevice::ReadWrite)) - { - QDomDocument domDoc; - if(domDoc.setContent(f.readAll())) - { - QDomElement rootElem = domDoc.documentElement(); - QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); - - infos.title = teacherBarNode.toElement().attributeNode("title").value(); - infos.actions = teacherBarNode.toElement().attributeNode("actions").value().split("@"); - infos.medias = teacherBarNode.toElement().attributeNode("medias").value().split("@"); - infos.urls = teacherBarNode.toElement().attributeNode("links").value().split("@"); - infos.comments = teacherBarNode.toElement().attributeNode("comments").value(); - } - f.close(); - } - } - } - - return infos; -} +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "UBPersistenceManager.h" +#include "gui/UBMainWindow.h" + +#include + +#include "frameworks/UBPlatformUtils.h" +#include "frameworks/UBFileSystemUtils.h" + +#include "core/UBApplication.h" +#include "core/UBSettings.h" +#include "core/UBSetting.h" + +#include "document/UBDocumentProxy.h" + +#include "adaptors/UBExportPDF.h" +#include "adaptors/UBSvgSubsetAdaptor.h" +#include "adaptors/UBThumbnailAdaptor.h" +#include "adaptors/UBMetadataDcSubsetAdaptor.h" + +#include "core/memcheck.h" + +const QString UBPersistenceManager::imageDirectory = "images"; // added to UBPersistenceManager::mAllDirectories +const QString UBPersistenceManager::objectDirectory = "objects"; // added to UBPersistenceManager::mAllDirectories +const QString UBPersistenceManager::widgetDirectory = "widgets"; // added to UBPersistenceManager::mAllDirectories +const QString UBPersistenceManager::videoDirectory = "videos"; // added to UBPersistenceManager::mAllDirectories +const QString UBPersistenceManager::audioDirectory = "audios"; // added to + +UBPersistenceManager * UBPersistenceManager::sSingleton = 0; + +UBPersistenceManager::UBPersistenceManager(QObject *pParent) + : QObject(pParent) + , mHasPurgedDocuments(false) +{ + + mDocumentSubDirectories << imageDirectory; + mDocumentSubDirectories << objectDirectory; + mDocumentSubDirectories << widgetDirectory; + mDocumentSubDirectories << videoDirectory; + mDocumentSubDirectories << audioDirectory; + + documentProxies = allDocumentProxies(); + emit proxyListChanged(); +} + +UBPersistenceManager* UBPersistenceManager::persistenceManager() +{ + if (!sSingleton) + { + sSingleton = new UBPersistenceManager(UBApplication::staticMemoryCleaner); + } + + return sSingleton; +} + +void UBPersistenceManager::destroy() +{ + if (sSingleton) + delete sSingleton; + sSingleton = NULL; +} + +UBPersistenceManager::~UBPersistenceManager() +{ + foreach(QPointer proxyGuard, documentProxies) + { + if (!proxyGuard.isNull()) + delete proxyGuard.data(); + } +} + + +QList > UBPersistenceManager::allDocumentProxies() +{ + mDocumentRepositoryPath = UBSettings::userDocumentDirectory(); + + QDir rootDir(mDocumentRepositoryPath); + rootDir.mkpath(rootDir.path()); + + + QFileSystemWatcher* watcher = new QFileSystemWatcher(this); + watcher->addPath(mDocumentRepositoryPath); + + connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(documentRepositoryChanged(const QString&))); + + QList > proxies; + + foreach(QString path, rootDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, + QDir::Time | QDir::Reversed)) + { + QString fullPath = rootDir.path() + "/" + path; + + QDir dir(fullPath); + + if (dir.entryList(QDir::Files | QDir::NoDotAndDotDot).size() > 0) + { + UBDocumentProxy* proxy = new UBDocumentProxy(fullPath); // deleted in UBPersistenceManager::destructor + + QMap metadatas = UBMetadataDcSubsetAdaptor::load(fullPath); + + foreach(QString key, metadatas.keys()) + { + proxy->setMetaData(key, metadatas.value(key)); + } + + proxy->setPageCount(sceneCount(proxy)); + + proxies << QPointer(proxy); + + } + } + + return proxies; +} + + +QStringList UBPersistenceManager::allShapes() +{ + QString shapeLibraryPath = UBSettings::settings()->applicationShapeLibraryDirectory(); + + QDir dir(shapeLibraryPath); + + if (!dir.exists()) + dir.mkpath(shapeLibraryPath); + + QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); + QStringList paths; + + foreach(QString file, files) + { + paths.append(shapeLibraryPath + QString("/") + file); + } + + return paths; +} + +QStringList UBPersistenceManager::allGips() +{ + QString gipLibraryPath = UBSettings::settings()->applicationGipLibraryDirectory(); + + QDir dir(gipLibraryPath); + + QStringList files = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); + QStringList paths; + + foreach(QString file, files) + { + QFileInfo fi(file); + + if (UBSettings::settings()->widgetFileExtensions.contains(fi.suffix())) + paths.append(dir.path() + QString("/") + file); + } + + return paths; +} + +QStringList UBPersistenceManager::allImages(const QDir& dir) +{ + if (!dir.exists()) + dir.mkpath(dir.path()); + + QStringList files = dir.entryList(QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDir::Name); + QStringList paths; + + foreach(QString file, files) + { + paths.append(dir.path() + QString("/") + file); + } + + return paths; +} + + +QStringList UBPersistenceManager::allVideos(const QDir& dir) +{ + if (!dir.exists()) + dir.mkpath(dir.path()); + + QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); + QStringList paths; + + foreach(QString file, files) + { + paths.append(dir.path() + QString("/") + file); + } + + return paths; +} + + +QStringList UBPersistenceManager::allWidgets(const QDir& dir) +{ + if (!dir.exists()) + dir.mkpath(dir.path()); + + QStringList files = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); + QStringList paths; + + foreach(QString file, files) + { + QFileInfo fi(file); + + if (UBSettings::settings()->widgetFileExtensions.contains(fi.suffix())) + paths.append(dir.path() + QString("/") + file); + } + + return paths; +} + + +UBDocumentProxy* UBPersistenceManager::createDocument(const QString& pGroupName, const QString& pName, bool withEmptyPage) +{ + checkIfDocumentRepositoryExists(); + + UBDocumentProxy *doc = new UBDocumentProxy(); // deleted in UBPersistenceManager::destructor + + if (pGroupName.length() > 0) + { + doc->setMetaData(UBSettings::documentGroupName, pGroupName); + } + + if (pName.length() > 0) + { + doc->setMetaData(UBSettings::documentName, pName); + } + + doc->setMetaData(UBSettings::documentVersion, UBSettings::currentFileVersion); + doc->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); + + if (withEmptyPage) createDocumentSceneAt(doc, 0); + + documentProxies.insert(0, QPointer(doc)); + + emit proxyListChanged(); + + emit documentCreated(doc); + + mDocumentCreatedDuringSession << doc; + + return doc; +} + + +UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory) +{ + checkIfDocumentRepositoryExists(); + + UBDocumentProxy* doc = new UBDocumentProxy(pDocumentDirectory); // deleted in UBPersistenceManager::destructor + + QMap metadatas = UBMetadataDcSubsetAdaptor::load(pDocumentDirectory); + + foreach(QString key, metadatas.keys()) + { + doc->setMetaData(key, metadatas.value(key)); + } + + doc->setUuid(QUuid::createUuid()); + doc->setPageCount(sceneCount(doc)); + + UBMetadataDcSubsetAdaptor::persist(doc); + + for(int i = 0; i < doc->pageCount(); i++) + { + UBSvgSubsetAdaptor::setSceneUuid(doc, i, QUuid::createUuid()); + } + + documentProxies << QPointer(doc); + + emit proxyListChanged(); + + emit documentCreated(doc); + + return doc; +} + + +void UBPersistenceManager::deleteDocument(UBDocumentProxy* pDocumentProxy) +{ + checkIfDocumentRepositoryExists(); + + emit documentWillBeDeleted(pDocumentProxy); + + UBFileSystemUtils::deleteDir(pDocumentProxy->persistencePath()); + + documentProxies.removeAll(QPointer(pDocumentProxy)); + mDocumentCreatedDuringSession.removeAll(pDocumentProxy); + + mSceneCache.removeAllScenes(pDocumentProxy); + + pDocumentProxy->deleteLater(); + + emit proxyListChanged(); + +} + + +UBDocumentProxy* UBPersistenceManager::duplicateDocument(UBDocumentProxy* pDocumentProxy) +{ + checkIfDocumentRepositoryExists(); + + UBDocumentProxy *copy = new UBDocumentProxy(); // deleted in UBPersistenceManager::destructor + + generatePathIfNeeded(copy); + + UBFileSystemUtils::copyDir(pDocumentProxy->persistencePath(), copy->persistencePath()); + + // regenerate scenes UUIDs + for(int i = 0; i < pDocumentProxy->pageCount(); i++) + { + UBSvgSubsetAdaptor::setSceneUuid(pDocumentProxy, i, QUuid::createUuid()); + } + + foreach(QString key, pDocumentProxy->metaDatas().keys()) + { + copy->setMetaData(key, pDocumentProxy->metaDatas().value(key)); + } + + copy->setMetaData(UBSettings::documentName, + pDocumentProxy->metaData(UBSettings::documentName).toString() + " " + tr("(copy)")); + + copy->setUuid(QUuid::createUuid()); + + persistDocumentMetadata(copy); + + copy->setPageCount(sceneCount(copy)); + + documentProxies << QPointer(copy); + + emit proxyListChanged(); + + emit documentCreated(copy); + + return copy; + +} + + +void UBPersistenceManager::deleteDocumentScenes(UBDocumentProxy* proxy, const QList& indexes) +{ + checkIfDocumentRepositoryExists(); + + int pageCount = UBPersistenceManager::persistenceManager()->sceneCount(proxy); + + QList compactedIndexes; + + foreach(int index, indexes) + { + if (!compactedIndexes.contains(index)) + compactedIndexes.append(index); + } + + if (compactedIndexes.size() == pageCount) + { + deleteDocument(proxy); + return; + } + + if (compactedIndexes.size() == 0) + return; + + foreach(int index, compactedIndexes) + { + emit documentSceneWillBeDeleted(proxy, index); + } + + QString sourceGroupName = proxy->metaData(UBSettings::documentGroupName).toString(); + QString sourceName = proxy->metaData(UBSettings::documentName).toString(); + UBDocumentProxy *trashDocProxy = createDocument(UBSettings::trashedDocumentGroupNamePrefix + sourceGroupName, sourceName, false); + + foreach(int index, compactedIndexes) + { + UBGraphicsScene *scene = loadDocumentScene(proxy, index); + if (scene) + { + //scene is about to move into new document + foreach (QUrl relativeFile, scene->relativeDependencies()) + { + QString source = scene->document()->persistencePath() + "/" + relativeFile.toString(); + QString target = trashDocProxy->persistencePath() + "/" + relativeFile.toString(); + + QFileInfo fi(target); + QDir d = fi.dir(); + + d.mkpath(d.absolutePath()); + QFile::copy(source, target); + } + + insertDocumentSceneAt(trashDocProxy, scene, trashDocProxy->pageCount()); + } + } + + for (int i = 1; i < pageCount; i++) + { + renamePage(trashDocProxy, i , i - 1); + } + + foreach(int index, compactedIndexes) + { + QString svgFileName = proxy->persistencePath() + + UBFileSystemUtils::digitFileFormat("/page%1.svg", index + 1); + + QFile::remove(svgFileName); + + QString thumbFileName = proxy->persistencePath() + + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", index + 1); + + QFile::remove(thumbFileName); + + mSceneCache.removeScene(proxy, index); + + proxy->decPageCount(); + + } + + qSort(compactedIndexes); + + int offset = 1; + + for (int i = compactedIndexes.at(0) + 1; i < pageCount; i++) + { + if(compactedIndexes.contains(i)) + { + offset++; + } + else + { + renamePage(proxy, i , i - offset); + + mSceneCache.moveScene(proxy, i, i - offset); + + } + } + + foreach(int index, compactedIndexes) + { + emit documentSceneDeleted(proxy, index); + } +} + + +void UBPersistenceManager::duplicateDocumentScene(UBDocumentProxy* proxy, int index) +{ + checkIfDocumentRepositoryExists(); + + int pageCount = UBPersistenceManager::persistenceManager()->sceneCount(proxy); + + for (int i = pageCount; i > index + 1; i--) + { + renamePage(proxy, i - 1 , i); + + mSceneCache.moveScene(proxy, i - 1, i); + + } + + copyPage(proxy, index , index + 1); + + proxy->incPageCount(); + + //due to architectural peculiarity we need to save teacher bar info, otherwise we'll see not exactly what we expect + sTeacherBarInfos properInfo = getTeacherBarInfos(proxy, index + 1); + //after the call below + emit documentSceneCreated(proxy, index + 1); + //restoring info + persistTeacherBar(proxy, index + 1, properInfo); +} + + +UBGraphicsScene* UBPersistenceManager::createDocumentSceneAt(UBDocumentProxy* proxy, int index) +{ + int count = sceneCount(proxy); + + for(int i = count - 1; i >= index; i--) + { + renamePage(proxy, i , i + 1); + } + + mSceneCache.shiftUpScenes(proxy, index, count -1); + + UBGraphicsScene *newScene = mSceneCache.createScene(proxy, index); + + newScene->setBackground(UBSettings::settings()->isDarkBackground(), + UBSettings::settings()->UBSettings::isCrossedBackground()); + + persistDocumentScene(proxy, newScene, index); + + proxy->incPageCount(); + + emit documentSceneCreated(proxy, index); + + return newScene; +} + + +void UBPersistenceManager::insertDocumentSceneAt(UBDocumentProxy* proxy, UBGraphicsScene* scene, int index) +{ + scene->setDocument(proxy); + + int count = sceneCount(proxy); + + for(int i = count - 1; i >= index; i--) + { + renamePage(proxy, i , i + 1); + } + + mSceneCache.shiftUpScenes(proxy, index, count -1); + + mSceneCache.insert(proxy, index, scene); + + persistDocumentScene(proxy, scene, index); + + proxy->incPageCount(); + + emit documentSceneCreated(proxy, index); + +} + + +void UBPersistenceManager::moveSceneToIndex(UBDocumentProxy* proxy, int source, int target) +{ + checkIfDocumentRepositoryExists(); + + if (source == target) + return; + + QFile svgTmp(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", source + 1)); + svgTmp.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.tmp", target + 1)); + + QFile thumbTmp(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", source + 1)); + thumbTmp.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.tmp", target + 1)); + + if (source < target) + { + for (int i = source + 1; i <= target; i++) + { + renamePage(proxy, i , i - 1); + } + } + else + { + for (int i = source - 1; i >= target; i--) + { + renamePage(proxy, i , i + 1); + } + } + + QFile svg(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.tmp", target + 1)); + svg.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", target + 1)); + + QFile thumb(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.tmp", target + 1)); + thumb.rename(proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", target + 1)); + + mSceneCache.moveScene(proxy, source, target); + + emit documentSceneMoved(proxy, target); +} + + +UBGraphicsScene* UBPersistenceManager::loadDocumentScene(UBDocumentProxy* proxy, int sceneIndex) +{ + if (mSceneCache.contains(proxy, sceneIndex)) + { + //qDebug() << "scene" << sceneIndex << "retrieved from cache ..."; + return mSceneCache.value(proxy, sceneIndex); + } + else + { + UBGraphicsScene* scene = UBSvgSubsetAdaptor::loadScene(proxy, sceneIndex); + + if (scene) + mSceneCache.insert(proxy, sceneIndex, scene); + + return scene; + } +} + + +void UBPersistenceManager::persistDocumentScene(UBDocumentProxy* pDocumentProxy, UBGraphicsScene* pScene, const int pSceneIndex) +{ + checkIfDocumentRepositoryExists(); + + pScene->deselectAllItems(); + + generatePathIfNeeded(pDocumentProxy); + + QDir dir(pDocumentProxy->persistencePath()); + dir.mkpath(pDocumentProxy->persistencePath()); + + if (pDocumentProxy->isModified()) + UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); + + if (pScene->isModified()) + { + UBThumbnailAdaptor::persistScene(pDocumentProxy->persistencePath(), pScene, pSceneIndex); + + UBSvgSubsetAdaptor::persistScene(pDocumentProxy, pScene, pSceneIndex); + + pScene->setModified(false); + } + + mSceneCache.insert(pDocumentProxy, pSceneIndex, pScene); + + emit documentCommitted(pDocumentProxy); + +} + + +UBDocumentProxy* UBPersistenceManager::persistDocumentMetadata(UBDocumentProxy* pDocumentProxy) +{ + UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); + + emit documentMetadataChanged(pDocumentProxy); + + return pDocumentProxy; +} + + +void UBPersistenceManager::renamePage(UBDocumentProxy* pDocumentProxy, const int sourceIndex, const int targetIndex) +{ + QFile svg(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); + svg.rename(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); + + QFile thumb(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); + thumb.rename(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); +} + + +void UBPersistenceManager::copyPage(UBDocumentProxy* pDocumentProxy, const int sourceIndex, const int targetIndex) +{ + QFile svg(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); + svg.copy(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); + + UBSvgSubsetAdaptor::setSceneUuid(pDocumentProxy, targetIndex, QUuid::createUuid()); + + QFile thumb(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); + thumb.copy(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); +} + + +int UBPersistenceManager::sceneCount(const UBDocumentProxy* proxy) +{ + return sceneCountInDir(proxy->persistencePath()); +} + +int UBPersistenceManager::sceneCountInDir(const QString& pPath) +{ + int pageIndex = 0; + bool moreToProcess = true; + + while (moreToProcess) + { + QString fileName = pPath + UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex + 1); + + QFile file(fileName); + + if (file.exists()) + { + pageIndex++; + } + else + { + moreToProcess = false; + } + } + + return pageIndex; +} + + +QString UBPersistenceManager::generateUniqueDocumentPath() +{ + QString ubPath = UBSettings::userDocumentDirectory(); + + QDateTime now = QDateTime::currentDateTime(); + QString dirName = now.toString("yyyy-MM-dd hh-mm-ss.zzz"); + + return ubPath + QString("/Sankore Document %1").arg(dirName); +} + + +void UBPersistenceManager::generatePathIfNeeded(UBDocumentProxy* pDocumentProxy) +{ + if (pDocumentProxy->persistencePath().length() == 0) + { + pDocumentProxy->setPersistencePath(generateUniqueDocumentPath()); + } +} + + +void UBPersistenceManager::addDirectoryContentToDocument(const QString& documentRootFolder, UBDocumentProxy* pDocument) +{ + int sourcePageCount = sceneCountInDir(documentRootFolder); + + int targetPageCount = pDocument->pageCount(); + + for(int sourceIndex = 0 ; sourceIndex < sourcePageCount; sourceIndex++) + { + int targetIndex = targetPageCount + sourceIndex; + + QFile svg(documentRootFolder + UBFileSystemUtils::digitFileFormat("/page%1.svg", sourceIndex + 1)); + svg.copy(pDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", targetIndex + 1)); + + UBSvgSubsetAdaptor::setSceneUuid(pDocument, targetIndex, QUuid::createUuid()); + + QFile thumb(documentRootFolder + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", sourceIndex + 1)); + thumb.copy(pDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", targetIndex + 1)); + } + + foreach(QString dir, mDocumentSubDirectories) + { + qDebug() << "copying " << documentRootFolder << "/" << dir << " to " << pDocument->persistencePath() << "/" + dir; + + UBFileSystemUtils::copyDir(documentRootFolder + "/" + dir, pDocument->persistencePath() + "/" + dir); + } + + pDocument->setPageCount(sceneCount(pDocument)); + +} + + +void UBPersistenceManager::upgradeDocumentIfNeeded(UBDocumentProxy* pDocumentProxy) +{ + int pageCount = pDocumentProxy->pageCount(); + + for(int index = 0 ; index < pageCount; index++) + { + UBSvgSubsetAdaptor::upgradeScene(pDocumentProxy, index); + } + + pDocumentProxy->setMetaData(UBSettings::documentVersion, UBSettings::currentFileVersion); + + UBMetadataDcSubsetAdaptor::persist(pDocumentProxy); +} + + +void UBPersistenceManager::upgradeAllDocumentsIfNeeded() +{ + foreach(QPointer proxy, documentProxies) + { + upgradeDocumentIfNeeded(proxy); + } +} + + + +UBDocumentProxy* UBPersistenceManager::documentByUuid(const QUuid& pUuid) +{ + for(int i = 0 ; i < documentProxies.length(); i++) + { + UBDocumentProxy* proxy = documentProxies.at(i); + + if (proxy && proxy->uuid() == pUuid) + { + return proxy; + } + } + + return 0; + +} + + +bool UBPersistenceManager::isEmpty(UBDocumentProxy* pDocumentProxy) +{ + if(!pDocumentProxy) + return true; + + if (pDocumentProxy->pageCount() > 1) + return false; + + UBGraphicsScene *theSoleScene = UBSvgSubsetAdaptor::loadScene(pDocumentProxy, 0); + + bool empty = false; + + if (theSoleScene) + { + empty = theSoleScene->isEmpty(); + delete theSoleScene; + } + else + { + empty = true; + } + + return empty; +} + + +void UBPersistenceManager::purgeEmptyDocuments() +{ + if(!mHasPurgedDocuments) // hack to workaround the fact that app closing is called twice :-( + { + QList toBeDeleted; + + foreach(UBDocumentProxy* docProxy, mDocumentCreatedDuringSession) + { + if (isEmpty(docProxy)) + { + toBeDeleted << docProxy; + } + } + + foreach(UBDocumentProxy* docProxy, toBeDeleted) + { + deleteDocument(docProxy); + } + + mHasPurgedDocuments = true; + } +} + + +QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) +{ + QFileInfo fi(path); + + if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) + return ""; + + QString fileName = UBPersistenceManager::videoDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); + + QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; + + if (!QFile::exists(destPath)) + { + QDir dir; + dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); + + QFile source(path); + + source.copy(destPath); + + } + + return fileName; + +} + + +QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid) +{ + if (!pDocumentProxy || objectUuid.isNull()) + return ""; + + QString urlPath = sourceUrl.path(); + int lastDot = urlPath.lastIndexOf("."); + QString suffix = urlPath.right(urlPath.length() - lastDot - 1); + + QString fileName = UBPersistenceManager::videoDirectory + "/" + objectUuid.toString() + "." + suffix; + QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; + + if (!QFile::exists(destPath)) + { + QDir dir; + dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); + + QFile newFile(destPath); + + if (newFile.open(QIODevice::WriteOnly)) + { + newFile.write(pPayload); + newFile.flush(); + newFile.close(); + } + } + + return fileName; + +} + + + +QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) +{ + QFileInfo fi(path); + + if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) + return ""; + + QString fileName = UBPersistenceManager::audioDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); + + QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; + + if (!QFile::exists(destPath)) + { + QDir dir; + dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); + + QFile source(path); + + source.copy(destPath); + + } + + return fileName; + +} + + +QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid) +{ + if (!pDocumentProxy || objectUuid.isNull()) + return ""; + + QString urlPath = sourceUrl.path(); + int lastDot = urlPath.lastIndexOf("."); + QString suffix = urlPath.right(urlPath.length() - lastDot - 1); + + QString fileName = UBPersistenceManager::audioDirectory + "/" + objectUuid.toString() + "." + suffix; + QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; + + if (!QFile::exists(destPath)) + { + QDir dir; + dir.mkdir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); + + QFile newFile(destPath); + + if (newFile.open(QIODevice::WriteOnly)) + { + newFile.write(pPayload); + newFile.flush(); + newFile.close(); + } + } + + return fileName; + +} + + +QString UBPersistenceManager::addPdfFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid) +{ + QFileInfo fi(path); + + if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) + return ""; + + QString fileName = UBPersistenceManager::objectDirectory + "/" + objectUuid.toString() + "." + fi.suffix(); + QString destPath = pDocumentProxy->persistencePath() + "/" + fileName; + + if (!QFile::exists(destPath)) + { + QDir dir; + dir.mkpath(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::objectDirectory); + + QFile source(path); + source.copy(destPath); + } + + return fileName; +} +QString UBPersistenceManager::addGraphicsWidgteToDocument(UBDocumentProxy *pDocumentProxy, QString path, QUuid objectUuid) +{ + QFileInfo fi(path); + + if (!fi.exists() || !pDocumentProxy || objectUuid.isNull()) + return ""; + + QString widgetRootDir = path; + QString extension = QFileInfo(widgetRootDir).suffix(); + + QString widgetTargetDir = pDocumentProxy->persistencePath() + "/" + widgetDirectory + "/" + objectUuid.toString() + "." + extension; + + if (!QFile::exists(widgetTargetDir)) { + QDir dir; + dir.mkpath(widgetTargetDir); + UBFileSystemUtils::copyDir(widgetRootDir, widgetTargetDir); + } + + if (!QFile::exists(widgetTargetDir)) + widgetTargetDir = QString(); + + return widgetTargetDir; +} + + +void UBPersistenceManager::documentRepositoryChanged(const QString& path) +{ + Q_UNUSED(path); + checkIfDocumentRepositoryExists(); +} + + +void UBPersistenceManager::checkIfDocumentRepositoryExists() +{ + QDir rp(mDocumentRepositoryPath); + + if (!rp.exists()) + { + // we have lost the document repository .. + + QString humanPath = QDir::cleanPath(mDocumentRepositoryPath); + humanPath = QDir::toNativeSeparators(humanPath); + + UBApplication::mainWindow->warning(tr("Document Repository Loss"),tr("Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath)); + + UBApplication::quit(); + } +} + + +bool UBPersistenceManager::mayHaveVideo(UBDocumentProxy* pDocumentProxy) +{ + QDir videoDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::videoDirectory); + + return videoDir.exists() && videoDir.entryInfoList().length() > 0; +} + +bool UBPersistenceManager::mayHaveAudio(UBDocumentProxy* pDocumentProxy) +{ + QDir audioDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::audioDirectory); + + return audioDir.exists() && audioDir.entryInfoList().length() > 0; +} + +bool UBPersistenceManager::mayHavePDF(UBDocumentProxy* pDocumentProxy) +{ + QDir objectDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::objectDirectory); + + QStringList filters; + filters << "*.pdf"; + + return objectDir.exists() && objectDir.entryInfoList(filters).length() > 0; +} + + +bool UBPersistenceManager::mayHaveSVGImages(UBDocumentProxy* pDocumentProxy) +{ + QDir imageDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::imageDirectory); + + QStringList filters; + filters << "*.svg"; + + return imageDir.exists() && imageDir.entryInfoList(filters).length() > 0; +} + + +bool UBPersistenceManager::mayHaveWidget(UBDocumentProxy* pDocumentProxy) +{ + QDir widgetDir(pDocumentProxy->persistencePath() + "/" + UBPersistenceManager::widgetDirectory); + + return widgetDir.exists() && widgetDir.entryInfoList(QDir::Dirs).length() > 0; +} + +void UBPersistenceManager::persistTeacherBar(UBDocumentProxy* pDocumentProxy, int page, sTeacherBarInfos infos) +{ + if(NULL != pDocumentProxy) + { + QFile f(pDocumentProxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", page + 1)); + if(f.exists()) + { + if(f.open(QIODevice::ReadOnly)) + { + QDomDocument domDoc; + if(domDoc.setContent(f.readAll())) + { + f.close(); + if(f.open(QIODevice::WriteOnly)) + { + QDomElement rootElem = domDoc.documentElement(); + QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); + if(teacherBarNode.isNull()) + { + // Create the element + QDomElement teacherElem = domDoc.createElement("teacherBar"); + rootElem.appendChild(teacherElem); + teacherBarNode = teacherElem; + } + + // Set the element values + QDomElement teacherBarElem = teacherBarNode.toElement(); + teacherBarElem.setAttribute("title", infos.title); + + QString qsAct; + for(int i=0; ipersistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", page + 1)); + if(f.exists()) + { + if(f.open(QIODevice::ReadWrite)) + { + QDomDocument domDoc; + if(domDoc.setContent(f.readAll())) + { + QDomElement rootElem = domDoc.documentElement(); + QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); + + infos.title = teacherBarNode.toElement().attributeNode("title").value(); + infos.actions = teacherBarNode.toElement().attributeNode("actions").value().split("@"); + infos.medias = teacherBarNode.toElement().attributeNode("medias").value().split("@"); + infos.urls = teacherBarNode.toElement().attributeNode("links").value().split("@"); + infos.comments = teacherBarNode.toElement().attributeNode("comments").value(); + } + f.close(); + } + } + } + + return infos; +} diff --git a/src/core/UBPersistenceManager.h b/src/core/UBPersistenceManager.h index 63943150..7e77a80c 100644 --- a/src/core/UBPersistenceManager.h +++ b/src/core/UBPersistenceManager.h @@ -1,175 +1,174 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef UBPERSISTENCEMANAGER_H_ -#define UBPERSISTENCEMANAGER_H_ - -#include - -#include "UBSceneCache.h" - -struct sTeacherBarInfos -{ - QString title; - QStringList actions; - QStringList medias; - QStringList urls; - QString comments; -}; - -class UBDocument; -class UBDocumentProxy; -class UBGraphicsScene; - -class UBPersistenceManager : public QObject -{ - Q_OBJECT - - private: - UBPersistenceManager(QObject *pParent = 0); - static UBPersistenceManager* sSingleton; - - public: - - virtual ~UBPersistenceManager(); - - static const QString imageDirectory; - static const QString objectDirectory; - static const QString videoDirectory; - static const QString audioDirectory; - static const QString widgetDirectory; - - static UBPersistenceManager* persistenceManager(); - static void destroy(); - - virtual UBDocumentProxy* createDocument(const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = true); - virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = false); - - virtual UBDocumentProxy* persistDocumentMetadata(UBDocumentProxy* pDocumentProxy); - - virtual UBDocumentProxy* duplicateDocument(UBDocumentProxy* pDocumentProxy); - - virtual void deleteDocument(UBDocumentProxy* pDocumentProxy); - - virtual void deleteDocumentScenes(UBDocumentProxy* pDocumentProxy, const QList& indexes); - - virtual void duplicateDocumentScene(UBDocumentProxy* pDocumentProxy, int index); - - virtual void persistDocumentScene(UBDocumentProxy* pDocumentProxy, - UBGraphicsScene* pScene, const int pSceneIndex); - virtual void persistTeacherBar(UBDocumentProxy* pDocumentProxy, int page, sTeacherBarInfos infos); - - sTeacherBarInfos getTeacherBarInfos(UBDocumentProxy* pDocumentProxy, int page); - - virtual UBGraphicsScene* createDocumentSceneAt(UBDocumentProxy* pDocumentProxy, int index); - - virtual void insertDocumentSceneAt(UBDocumentProxy* pDocumentProxy, UBGraphicsScene* scene, int index); - - virtual void moveSceneToIndex(UBDocumentProxy* pDocumentProxy, int source, int target); - - virtual UBGraphicsScene* loadDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex); - UBGraphicsScene *getDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex) {return mSceneCache.value(pDocumentProxy, sceneIndex);} - - QList > documentProxies; - - virtual QStringList allShapes(); - virtual QStringList allGips(); - virtual QStringList allSounds(); - virtual QStringList allImages(const QDir& dir); - virtual QStringList allVideos(const QDir& dir); - virtual QStringList allWidgets(const QDir& dir); - - virtual QString generateUniqueDocumentPath(); - - virtual void addDirectoryContentToDocument(const QString& documentRootFolder, UBDocumentProxy* pDocument); - - virtual void upgradeDocumentIfNeeded(UBDocumentProxy* pDocumentProxy); - - virtual void upgradeAllDocumentsIfNeeded(); - - virtual UBDocumentProxy* documentByUuid(const QUuid& pUuid); - - QStringList documentSubDirectories() - { - return mDocumentSubDirectories; - } - - virtual bool isEmpty(UBDocumentProxy* pDocumentProxy); - virtual void purgeEmptyDocuments(); - - virtual QString addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); - virtual QString addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid); - virtual QString addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); - virtual QString addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid); - virtual QString addPdfFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); - virtual QString addGraphicsWidgteToDocument(UBDocumentProxy *mDocumentProxy, QString path, QUuid objectUuid); - - bool mayHaveVideo(UBDocumentProxy* pDocumentProxy); - bool mayHaveAudio(UBDocumentProxy* pDocumentProxy); - bool mayHavePDF(UBDocumentProxy* pDocumentProxy); - bool mayHaveSVGImages(UBDocumentProxy* pDocumentProxy); - bool mayHaveWidget(UBDocumentProxy* pDocumentProxy); - - signals: - - void proxyListChanged(); - - void documentCreated(UBDocumentProxy* pDocumentProxy); - void documentMetadataChanged(UBDocumentProxy* pDocumentProxy); - void documentCommitted(UBDocumentProxy* pDocumentProxy); - void documentWillBeDeleted(UBDocumentProxy* pDocumentProxy); - - void documentSceneCreated(UBDocumentProxy* pDocumentProxy, int pIndex); - void documentSceneMoved(UBDocumentProxy* pDocumentProxy, int pIndex); - void documentSceneWillBeDeleted(UBDocumentProxy* pDocumentProxy, int pIndex); - void documentSceneDeleted(UBDocumentProxy* pDocumentProxy, int pDeletedIndex); - - private: - - int sceneCount(const UBDocumentProxy* pDocumentProxy); - - int sceneCountInDir(const QString& pPath); - - QList > allDocumentProxies(); - - void renamePage(UBDocumentProxy* pDocumentProxy, - const int sourceIndex, const int targetIndex); - - void copyPage(UBDocumentProxy* pDocumentProxy, - const int sourceIndex, const int targetIndex); - - void generatePathIfNeeded(UBDocumentProxy* pDocumentProxy); - - void checkIfDocumentRepositoryExists(); - - UBSceneCache mSceneCache; - - QStringList mDocumentSubDirectories; - - QMutex mDeletedListMutex; - - bool mHasPurgedDocuments; - - QList mDocumentCreatedDuringSession; - - QString mDocumentRepositoryPath; - - private slots: - void documentRepositoryChanged(const QString& path); - -}; - - -#endif /* UBPERSISTENCEMANAGER_H_ */ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UBPERSISTENCEMANAGER_H_ +#define UBPERSISTENCEMANAGER_H_ + +#include + +#include "UBSceneCache.h" + +struct sTeacherBarInfos +{ + QString title; + QStringList actions; + QStringList medias; + QStringList urls; + QString comments; +}; + +class UBDocument; +class UBDocumentProxy; +class UBGraphicsScene; + +class UBPersistenceManager : public QObject +{ + Q_OBJECT + + private: + UBPersistenceManager(QObject *pParent = 0); + static UBPersistenceManager* sSingleton; + + public: + + virtual ~UBPersistenceManager(); + + static const QString imageDirectory; + static const QString objectDirectory; + static const QString videoDirectory; + static const QString audioDirectory; + static const QString widgetDirectory; + + static UBPersistenceManager* persistenceManager(); + static void destroy(); + + virtual UBDocumentProxy* createDocument(const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = true); + virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory); + + virtual UBDocumentProxy* persistDocumentMetadata(UBDocumentProxy* pDocumentProxy); + + virtual UBDocumentProxy* duplicateDocument(UBDocumentProxy* pDocumentProxy); + + virtual void deleteDocument(UBDocumentProxy* pDocumentProxy); + + virtual void deleteDocumentScenes(UBDocumentProxy* pDocumentProxy, const QList& indexes); + + virtual void duplicateDocumentScene(UBDocumentProxy* pDocumentProxy, int index); + + virtual void persistDocumentScene(UBDocumentProxy* pDocumentProxy, + UBGraphicsScene* pScene, const int pSceneIndex); + virtual void persistTeacherBar(UBDocumentProxy* pDocumentProxy, int page, sTeacherBarInfos infos); + + sTeacherBarInfos getTeacherBarInfos(UBDocumentProxy* pDocumentProxy, int page); + + virtual UBGraphicsScene* createDocumentSceneAt(UBDocumentProxy* pDocumentProxy, int index); + + virtual void insertDocumentSceneAt(UBDocumentProxy* pDocumentProxy, UBGraphicsScene* scene, int index); + + virtual void moveSceneToIndex(UBDocumentProxy* pDocumentProxy, int source, int target); + + virtual UBGraphicsScene* loadDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex); + UBGraphicsScene *getDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex) {return mSceneCache.value(pDocumentProxy, sceneIndex);} + + QList > documentProxies; + + virtual QStringList allShapes(); + virtual QStringList allGips(); + virtual QStringList allImages(const QDir& dir); + virtual QStringList allVideos(const QDir& dir); + virtual QStringList allWidgets(const QDir& dir); + + virtual QString generateUniqueDocumentPath(); + + virtual void addDirectoryContentToDocument(const QString& documentRootFolder, UBDocumentProxy* pDocument); + + virtual void upgradeDocumentIfNeeded(UBDocumentProxy* pDocumentProxy); + + virtual void upgradeAllDocumentsIfNeeded(); + + virtual UBDocumentProxy* documentByUuid(const QUuid& pUuid); + + QStringList documentSubDirectories() + { + return mDocumentSubDirectories; + } + + virtual bool isEmpty(UBDocumentProxy* pDocumentProxy); + virtual void purgeEmptyDocuments(); + + virtual QString addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); + virtual QString addVideoFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid); + virtual QString addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); + virtual QString addAudioFileToDocument(UBDocumentProxy* pDocumentProxy, QUrl sourceUrl, QByteArray pPayload, QUuid objectUuid); + virtual QString addPdfFileToDocument(UBDocumentProxy* pDocumentProxy, QString path, QUuid objectUuid); + virtual QString addGraphicsWidgteToDocument(UBDocumentProxy *mDocumentProxy, QString path, QUuid objectUuid); + + bool mayHaveVideo(UBDocumentProxy* pDocumentProxy); + bool mayHaveAudio(UBDocumentProxy* pDocumentProxy); + bool mayHavePDF(UBDocumentProxy* pDocumentProxy); + bool mayHaveSVGImages(UBDocumentProxy* pDocumentProxy); + bool mayHaveWidget(UBDocumentProxy* pDocumentProxy); + + signals: + + void proxyListChanged(); + + void documentCreated(UBDocumentProxy* pDocumentProxy); + void documentMetadataChanged(UBDocumentProxy* pDocumentProxy); + void documentCommitted(UBDocumentProxy* pDocumentProxy); + void documentWillBeDeleted(UBDocumentProxy* pDocumentProxy); + + void documentSceneCreated(UBDocumentProxy* pDocumentProxy, int pIndex); + void documentSceneMoved(UBDocumentProxy* pDocumentProxy, int pIndex); + void documentSceneWillBeDeleted(UBDocumentProxy* pDocumentProxy, int pIndex); + void documentSceneDeleted(UBDocumentProxy* pDocumentProxy, int pDeletedIndex); + + private: + + int sceneCount(const UBDocumentProxy* pDocumentProxy); + + int sceneCountInDir(const QString& pPath); + + QList > allDocumentProxies(); + + void renamePage(UBDocumentProxy* pDocumentProxy, + const int sourceIndex, const int targetIndex); + + void copyPage(UBDocumentProxy* pDocumentProxy, + const int sourceIndex, const int targetIndex); + + void generatePathIfNeeded(UBDocumentProxy* pDocumentProxy); + + void checkIfDocumentRepositoryExists(); + + UBSceneCache mSceneCache; + + QStringList mDocumentSubDirectories; + + QMutex mDeletedListMutex; + + bool mHasPurgedDocuments; + + QList mDocumentCreatedDuringSession; + + QString mDocumentRepositoryPath; + + private slots: + void documentRepositoryChanged(const QString& path); + +}; + + +#endif /* UBPERSISTENCEMANAGER_H_ */ diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index f218f22c..8eed4e4e 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -146,7 +146,7 @@ UBSettings::UBSettings(QObject *parent) mAppSettings = UBSettings::getAppSettings(); - QString userSettingsFile = UBSettings::uniboardDataDirectory() + "/UniboardUser.config"; + QString userSettingsFile = UBSettings::userDataDirectory() + "/UniboardUser.config"; mUserSettings = new QSettings(userSettingsFile, QSettings::IniFormat, parent); @@ -729,519 +729,272 @@ void UBSettings::setItalicFont(bool italic) } -QString UBSettings::uniboardDataDirectory() +QString UBSettings::userDataDirectory() { - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("App/DataDirectory")) - { - QString dataDirectory = getAppSettings()->value("App/DataDirectory").toString(); + static QString dataDirPath = ""; + if(dataDirPath.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/DataDirectory")) { + dataDirPath = getAppSettings()->value("App/DataDirectory").toString(); + dataDirPath = replaceWildcard(dataDirPath); - // mute it to something absolute - if (dataDirectory.startsWith("{Documents}")) - { - dataDirectory = dataDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if(dataDirectory.startsWith("{Home}")) - { - dataDirectory = dataDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); - } + if(checkDirectory(dataDirPath)) + return dataDirPath; + else + qCritical() << "Impossible to create datadirpath " << dataDirPath; - if(dataDirectory.contains("{UserLoginName}") && UBPlatformUtils::osUserLoginName().length() > 0) - { - dataDirectory = dataDirectory.replace("{UserLoginName}", UBPlatformUtils::osUserLoginName()); - } - - // valid ? - QDir dir(dataDirectory); - dir.mkpath(dataDirectory); - - if (dir.exists(dataDirectory)) - { - return dataDirectory; - } - else - { - // Do not log anything here, we need data directory to be valid to be able to log to it - // - //qWarning << "Failed to interpret App/DataDirectory config : " + getAppSettings()->value("App/DataDirectory").toString() + - // ", defaulting to " + UBDesktopServices::storageLocation(QDesktopServices::DataLocation); } + dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); + dataDirPath.replace("/Open-Sankore", ""); } - QString qtDataPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); - qtDataPath.replace("/Open-Sankore", ""); - return qtDataPath; + return dataDirPath; } -QString UBSettings::uniboardUserImageDirectory() +QString UBSettings::userImageDirectory() { - QString valideUserImageDirectory = - QDesktopServices::storageLocation(QDesktopServices::PicturesLocation) - + "/" + QCoreApplication::applicationName(); + static QString imageDirectory = ""; + if(imageDirectory.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/UserImageDirectory")) { + imageDirectory = getAppSettings()->value("App/UserImageDirectory").toString(); - bool hasCreatedDir = false; - - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("App/UserImageDirectory")) - { - QString userImageDirectory = getAppSettings()->value("App/UserImageDirectory").toString(); - - // mute it to something absolute - if (userImageDirectory.startsWith("{Documents}")) - { - userImageDirectory = userImageDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if (userImageDirectory.startsWith("{Home}")) - { - userImageDirectory = userImageDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); + imageDirectory = replaceWildcard(imageDirectory); + if(checkDirectory(imageDirectory)) + return imageDirectory; + else + qCritical() << "failed to create image directory " << imageDirectory; } - else if(userImageDirectory.startsWith("{Pictures}")) - { - userImageDirectory = userImageDirectory.replace("{Pictures}", - QDesktopServices::storageLocation(QDesktopServices::PicturesLocation)); - } - - if(userImageDirectory.contains("{UserLoginName}") && UBPlatformUtils::osUserLoginName() > 0) - { - userImageDirectory = userImageDirectory.replace("{UserLoginName}", UBPlatformUtils::osUserLoginName()); - } - - // valid ? - QDir dir(userImageDirectory); - if (!dir.exists()) - { - dir.mkpath(userImageDirectory); - hasCreatedDir = true; - } - - if (dir.exists()) - { - valideUserImageDirectory = userImageDirectory; - } - else - { - hasCreatedDir = false; - qWarning() << "Failed to interpret App/UserImageDirectory config : " - + getAppSettings()->value("App/UserImageDirectory").toString() - + ", defaulting to " + valideUserImageDirectory; - } - } - - QDir userImageDir(valideUserImageDirectory); - - userImageDir.mkpath(valideUserImageDirectory); - - if (hasCreatedDir || !userImageDir.exists()) - { - QString defaultUserImageDir = valideUserImageDirectory + "/" + tr("Images"); - UBFileSystemUtils::copyDir(uniboardDefaultUserImageLibraryDirectory(), - defaultUserImageDir); + imageDirectory = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation) + "/Sankore"; + checkDirectory(imageDirectory); } - - return valideUserImageDirectory; -} - - -QString UBSettings::defaultUserImagesDirectory() -{ - QString userImageDir = uniboardUserImageDirectory() + "/" + tr("Images"); - QDir dir(userImageDir); - dir.mkpath(userImageDir); - - return userImageDir; + return imageDirectory; } -QString UBSettings::uniboardUserVideoDirectory() +QString UBSettings::userVideoDirectory() { - QString valideUserVideoDirectory = - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation); - - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("App/UserVideoDirectory")) - { - QString userVideoDirectory = getAppSettings()->value("App/UserVideoDirectory").toString(); - - // mute it to something absolute - if (userVideoDirectory.startsWith("{Documents}")) - { - userVideoDirectory = userVideoDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if(userVideoDirectory.startsWith("{Home}")) - { - userVideoDirectory = userVideoDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); - } - else if(userVideoDirectory.startsWith("{Videos}")) - { - userVideoDirectory = userVideoDirectory.replace("{Videos}", - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); + static QString videoDirectory = ""; + if(videoDirectory.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/UserVideoDirectory")) { + videoDirectory = getAppSettings()->value("App/UserVideoDirectory").toString(); + videoDirectory = replaceWildcard(videoDirectory); + if(checkDirectory(videoDirectory)) + return videoDirectory; + else + qCritical() << "failed to create video directory " << videoDirectory; } - if(userVideoDirectory.contains("{UserLoginName}") && UBPlatformUtils::osUserLoginName() > 0) - { - userVideoDirectory = userVideoDirectory.replace("{UserLoginName}", UBPlatformUtils::osUserLoginName()); - } - // valid ? - QDir dir(userVideoDirectory); + videoDirectory = QDesktopServices::storageLocation(QDesktopServices::MoviesLocation); - if (!dir.exists()) - { - dir.mkpath(userVideoDirectory); - } - - if (dir.exists()) - { - valideUserVideoDirectory = userVideoDirectory; - } + if(videoDirectory.isEmpty()) + videoDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) + "/" + tr("My Movies"); else - { - qWarning() << "Failed to interpret App/UserVideoDirectory config : " - + getAppSettings()->value("App/UserVideoDirectory").toString() - + ", defaulting to " + valideUserVideoDirectory; - } - } - else - { - // May not exists (on windows XP) - if (valideUserVideoDirectory.length() == 0) - { - valideUserVideoDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) + "/" + tr("My Movies"); - } - - QDir dir(valideUserVideoDirectory); + videoDirectory = videoDirectory + "/Sankore"; - if (!dir.exists()) - { - dir.mkpath(valideUserVideoDirectory); - } + checkDirectory(videoDirectory); } - - return valideUserVideoDirectory; + return videoDirectory; } - -QString UBSettings::podcastRecordingDirectory() +QString UBSettings::userAudioDirectory() { - QString validePodcastRecordingDirectory = - QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); + static QString audioDirectory = ""; + if(audioDirectory.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/UserAudioDirectory")) { + audioDirectory = getAppSettings()->value("App/UserAudioDirectory").toString(); - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("Podcast/RecordingDirectory")) - { - QString userPodcastRecordingDirectory = getAppSettings()->value("Podcast/RecordingDirectory").toString(); - - // mute it to something absolute - if (userPodcastRecordingDirectory.startsWith("{Documents}")) - { - userPodcastRecordingDirectory = userPodcastRecordingDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if(userPodcastRecordingDirectory.startsWith("{Home}")) - { - userPodcastRecordingDirectory = userPodcastRecordingDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); - } - else if(userPodcastRecordingDirectory.startsWith("{Videos}")) - { - userPodcastRecordingDirectory = userPodcastRecordingDirectory.replace("{Videos}", - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); - } - - if(userPodcastRecordingDirectory.contains("{UserLoginName}") && UBPlatformUtils::osUserLoginName() > 0) - { - userPodcastRecordingDirectory = userPodcastRecordingDirectory.replace("{UserLoginName}", UBPlatformUtils::osUserLoginName()); - } - - // valid ? - QDir dir(userPodcastRecordingDirectory); - - if (!dir.exists()) - { - dir.mkpath(userPodcastRecordingDirectory); + audioDirectory = replaceWildcard(audioDirectory); + if(checkDirectory(audioDirectory)) + return audioDirectory; + else + qCritical() << "failed to create image directory " << audioDirectory; } - if (dir.exists()) - { - validePodcastRecordingDirectory = userPodcastRecordingDirectory; - } - else - { - qWarning() << "Failed to interpret Podcast/RecordingDirectory config : " - + getAppSettings()->value("Podcast/RecordingDirectory").toString() - + ", defaulting to user Desktop"; - } + audioDirectory = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "/Sankore"; + checkDirectory(audioDirectory); } - else - { + return audioDirectory; +} - QDir dir(validePodcastRecordingDirectory); - if (!dir.exists()) +QString UBSettings::userPodcastRecordingDirectory() +{ + static QString dirPath = ""; + if(dirPath.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("Podcast/RecordingDirectory")) { - dir.mkpath(validePodcastRecordingDirectory); + dirPath = getAppSettings()->value("Podcast/RecordingDirectory").toString(); + dirPath = replaceWildcard(dirPath); + if(checkDirectory(dirPath)) + return dirPath; + else + qCritical() << "failed to create dir " << dirPath; + } + dirPath = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); + checkDirectory(dirPath); } - - return validePodcastRecordingDirectory; + return dirPath; } -QString UBSettings::uniboardDocumentDirectory() +QString UBSettings::userDocumentDirectory() { - return uniboardDataDirectory() + "/document"; + static QString documentDirectory = ""; + if(documentDirectory.isEmpty()){ + documentDirectory = userDataDirectory() + "/document"; + checkDirectory(documentDirectory); + } + return documentDirectory; } -QString UBSettings::libraryPaletteFavoriteListFilePath() +QString UBSettings::userFavoriteListFilePath() { - QString filePath = uniboardDataDirectory() + "/libraryPalette/favorite.dat"; - - if (!QDir(uniboardDataDirectory() + "/libraryPalette").exists()) - QDir().mkpath(uniboardDataDirectory() + "/libraryPalette"); - + static QString filePath = ""; + if(filePath.isEmpty()){ + QString dirPath = userDataDirectory() + "/libraryPalette"; + checkDirectory(dirPath); + filePath = dirPath + "/favorite.dat"; + } return filePath; } -QString UBSettings::trashLibraryPaletteDirPath() +QString UBSettings::userTrashDirPath() { - QString trashPath = uniboardDataDirectory() + "/libraryPalette/trash"; - if (!QDir(trashPath).exists()) - QDir().mkpath(trashPath); + static QString trashPath = ""; + if(trashPath.isEmpty()){ + trashPath = userDataDirectory() + "/libraryPalette/trash"; + checkDirectory(trashPath); + } return trashPath; } -QString UBSettings::uniboardShapeLibraryDirectory() +QString UBSettings::applicationShapeLibraryDirectory() { QString defaultRelativePath = QString("./library/shape"); QString configPath = value("Library/ShapeDirectory", QVariant(defaultRelativePath)).toString(); - if (configPath.startsWith(".")) - { + if (configPath.startsWith(".")) { return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1); } - else - { + else { return configPath; } } -QString UBSettings::uniboardGipLibraryDirectory() +QString UBSettings::applicationGipLibraryDirectory() { - QString dirPath = UBPlatformUtils::applicationResourcesDirectory() + "/library/gips"; - if (!QDir(dirPath).exists()) - QDir().mkpath(dirPath); - + static QString dirPath = ""; + if(dirPath.isEmpty()){ + dirPath = UBPlatformUtils::applicationResourcesDirectory() + "/library/gips"; + checkDirectory(dirPath); + } return dirPath; } -QString UBSettings::uniboardSearchDirectory() +QString UBSettings::userSearchDirectory() { - QString dirPath = UBPlatformUtils::applicationResourcesDirectory() + "/library/search"; - if (!QDir(dirPath).exists()) - QDir().mkpath(dirPath); - + static QString dirPath = ""; + if(dirPath.isEmpty()){ + dirPath = UBPlatformUtils::applicationResourcesDirectory() + "/library/search"; + checkDirectory(dirPath); + } return dirPath; } -QString UBSettings::uniboardImageLibraryDirectory() +QString UBSettings::applicationImageLibraryDirectory() { QString defaultRelativePath = QString("./library/image"); QString configPath = value("Library/ImageDirectory", QVariant(defaultRelativePath)).toString(); - if (configPath.startsWith(".")) - { + if (configPath.startsWith(".")) { return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1); } - else - { + else { return configPath; } } - -QString UBSettings::uniboardDefaultUserImageLibraryDirectory() +QString UBSettings::userAnimationDirectory() { - QString defaultRelativePath = QString("./library/userImage"); - - QString configPath = value("Library/DefaultUserImageDirectory", QVariant(defaultRelativePath)).toString(); - - if (configPath.startsWith(".")) - { - return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1); + static QString animationDirectory = ""; + if(animationDirectory.isEmpty()){ + animationDirectory = userDataDirectory() + "/animationUserDirectory"; + checkDirectory(animationDirectory); } - else - { - return configPath; - } -} - - -QString UBSettings::animationUserDirectory() -{ - QString animationDirectory = uniboardDataDirectory() + "/animationUserDirectory"; - if (!QDir(animationDirectory).exists()) - QDir().mkpath(animationDirectory); - return animationDirectory; } -QString UBSettings::uniboardInteractiveUserDirectory() +QString UBSettings::userInteractiveDirectory() { - QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive content"; - - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("App/UserInteractiveContentDirectory")) - { - QString userWidgetDirectory = getAppSettings()->value("App/UserInteractiveContentDirectory").toString(); - - // mute it to something absolute - if (userWidgetDirectory.startsWith("{Documents}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if(userWidgetDirectory.startsWith("{Home}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); - } - else if(userWidgetDirectory.startsWith("{Videos}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Videos}", - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); - } - - // valid ? - QDir dir(userWidgetDirectory); - - if (!dir.exists()) - { - dir.mkpath(userWidgetDirectory); - } - - if (dir.exists()) - { - valideUserInteractiveDirectory = userWidgetDirectory; - } - else - { - qWarning() << "Failed to interpret App/UserInteractiveContentDirectory config : " - + getAppSettings()->value("App/UserInteractiveContentDirectory").toString() - + ", defaulting to " + valideUserInteractiveDirectory; - } - } - else - { - QDir widgetUserDir = QDir(valideUserInteractiveDirectory); - if (!widgetUserDir.exists()) - { - widgetUserDir.mkpath(valideUserInteractiveDirectory); + static QString interactiveDirectory = ""; + if(interactiveDirectory.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/UserInteractiveContentDirectory")) { + interactiveDirectory = getAppSettings()->value("App/UserInteractiveContentDirectory").toString(); + interactiveDirectory = replaceWildcard(interactiveDirectory); + if(checkDirectory(interactiveDirectory)) + return interactiveDirectory; + else + qCritical() << "failed to create directory " << interactiveDirectory; } + interactiveDirectory = userDataDirectory() + "/interactive content"; + checkDirectory(interactiveDirectory); } - - return valideUserInteractiveDirectory; + return interactiveDirectory; } -QString UBSettings::sankoreDistributedInteractiveDirectory() +QString UBSettings::applicationInteractivesDirectory() { - QString defaultRelativePath = QString("./library/sankoreInteractivities"); + QString defaultRelativePath = QString("./library/interactivities"); - QString configPath = value("Library/sankoreInteractivities", QVariant(defaultRelativePath)).toString(); + QString configPath = value("Library/InteractivitiesDirectory", QVariant(defaultRelativePath)).toString(); - if (configPath.startsWith(".")) - { + if (configPath.startsWith(".")) { return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1); } - else - { + else { return configPath; } } -QString UBSettings::uniboardInteractiveLibraryDirectory() +QString UBSettings::applicationApplicationsLibraryDirectory() { - QString defaultRelativePath = QString("./library/interactive"); + QString defaultRelativePath = QString("./library/applications"); - QString configPath = value("Library/InteractiveContentDirectory", QVariant(defaultRelativePath)).toString(); + QString configPath = value("Library/ApplicationsDirectory", QVariant(defaultRelativePath)).toString(); - if (configPath.startsWith(".")) - { + if (configPath.startsWith(".")) { return UBPlatformUtils::applicationResourcesDirectory() + configPath.right(configPath.size() - 1); } - else - { + else { return configPath; } } -QString UBSettings::uniboardInteractiveFavoritesDirectory() +QString UBSettings::userInteractiveFavoritesDirectory() { - QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive favorites"; - - // first look into the application settings - if (sAppSettings && getAppSettings()->contains("App/UserInteractiveFavoritesDirectory")) - { - QString userWidgetDirectory = getAppSettings()->value("App/UserInteractiveFavoritesDirectory").toString(); - - // mute it to something absolute - if (userWidgetDirectory.startsWith("{Documents}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Documents}", - QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); - } - else if(userWidgetDirectory.startsWith("{Home}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Home}", - QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); - } - else if(userWidgetDirectory.startsWith("{Videos}")) - { - userWidgetDirectory = userWidgetDirectory.replace("{Videos}", - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); - } - - // valid ? - QDir dir(userWidgetDirectory); - - if (!dir.exists()) - { - dir.mkpath(userWidgetDirectory); + static QString dirPath = ""; + if(dirPath.isEmpty()){ + if (sAppSettings && getAppSettings()->contains("App/UserInteractiveFavoritesDirectory")) { + dirPath = getAppSettings()->value("App/UserInteractiveFavoritesDirectory").toString(); + dirPath = replaceWildcard(dirPath); + if(checkDirectory(dirPath)) + return dirPath; + else + qCritical() << "failed to create directory " << dirPath; } - if (dir.exists()) - { - valideUserInteractiveDirectory = userWidgetDirectory; - } - else - { - qWarning() << "Failed to interpret App/UserInteractiveFavoritesDirectory config : " - + getAppSettings()->value("App/UserInteractiveFavoritesDirectory").toString() - + ", defaulting to " + valideUserInteractiveDirectory; - } - } - else - { - QDir widgetUserDir = QDir(valideUserInteractiveDirectory); - if (!widgetUserDir.exists()) - { - widgetUserDir.mkpath(valideUserInteractiveDirectory); - } + dirPath = userDataDirectory() + "/interactive favorites"; + checkDirectory(dirPath); } - - return valideUserInteractiveDirectory; + return dirPath; } @@ -1350,3 +1103,34 @@ void UBSettings::setCommunityPassword(const QString &password) { communityPsw->set(QVariant(password)); } + + +bool UBSettings::checkDirectory(QString& dirPath) +{ + bool result = true; + QDir dir(dirPath); + if(!dir.exists()) + result = dir.mkpath(dirPath); + return result; +} + +QString UBSettings::replaceWildcard(QString& path) +{ + QString result(path); + + if (result.startsWith("{Documents}")) { + result = result.replace("{Documents}", QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)); + } + else if(result.startsWith("{Home}")) { + result = result.replace("{Home}", QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); + } + else if(result.startsWith("{Desktop}")) { + result = result.replace("{Desktop}", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)); + } + + if(result.contains("{UserLoginName}") && UBPlatformUtils::osUserLoginName().length() > 0) { + result = result.replace("{UserLoginName}", UBPlatformUtils::osUserLoginName()); + } + + return result; +} diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index fd25cd4b..2a314795 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -98,29 +98,28 @@ class UBSettings : public QObject void init(); - static QString uniboardDataDirectory(); - static QString uniboardDocumentDirectory(); - static QString libraryPaletteFavoriteListFilePath(); - static QString trashLibraryPaletteDirPath(); + //user directories + static QString userDataDirectory(); + static QString userDocumentDirectory(); + static QString userFavoriteListFilePath(); + static QString userTrashDirPath(); + static QString userImageDirectory(); + static QString userVideoDirectory(); + static QString userAudioDirectory(); + static QString userSearchDirectory(); + static QString userAnimationDirectory(); + static QString userInteractiveDirectory(); + static QString userInteractiveFavoritesDirectory(); + static QString userPodcastRecordingDirectory(); + + //application directory + QString applicationShapeLibraryDirectory(); + QString applicationGipLibraryDirectory(); + QString applicationImageLibraryDirectory(); + QString applicationApplicationsLibraryDirectory(); + QString applicationInteractivesDirectory(); - QString uniboardShapeLibraryDirectory(); - QString uniboardGipLibraryDirectory(); - QString uniboardImageLibraryDirectory(); - QString uniboardUserImageDirectory(); - QString defaultUserImagesDirectory(); - QString uniboardSearchDirectory(); - - QString uniboardUserVideoDirectory(); - QString uniboardDefaultUserImageLibraryDirectory(); - - QString uniboardInteractiveUserDirectory(); - QString animationUserDirectory(); - QString uniboardInteractiveLibraryDirectory(); - QString uniboardInteractiveFavoritesDirectory(); - QString sankoreDistributedInteractiveDirectory(); - - QString podcastRecordingDirectory(); QNetworkProxy* httpProxy(); @@ -319,11 +318,6 @@ class UBSettings : public QObject UBSetting* pageSize; - /* - static int navigPaletteWidth; - static int libPaletteWidth; - */ - UBSetting* KeyboardLocale; public slots: @@ -347,10 +341,7 @@ class UBSettings : public QObject QVariant value ( const QString & key, const QVariant & defaultValue = QVariant() ) const; void setValue (const QString & key,const QVariant & value); - void colorChanged() - { - emit colorContextChanged(); - } + void colorChanged() { emit colorContextChanged(); } signals: void colorContextChanged(); @@ -363,13 +354,14 @@ class UBSettings : public QObject static const int sDefaultFontPixelSize; static const char *sDefaultFontFamily; - private: - static QSettings* getAppSettings(); static QPointer sAppSettings; static QPointer sSingleton; + static bool checkDirectory(QString& dirPath); + static QString replaceWildcard(QString& path); + }; diff --git a/src/core/main.cpp b/src/core/main.cpp index aa5c6918..80c8a989 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -50,8 +50,7 @@ void ub_message_output(QtMsgType type, const char *msg) { #endif if (UBApplication::app() && UBApplication::app()->isVerbose()) { - QString logFileNamePath = UBSettings::uniboardDataDirectory() - + "/log/uniboard.log"; + QString logFileNamePath = UBSettings::userDataDirectory() + "/log/uniboard.log"; QFile logFile(logFileNamePath); if (logFile.exists() && logFile.size() > 10000000) @@ -102,7 +101,7 @@ int main(int argc, char *argv[]) QStringList args = app.arguments(); - QString dumpPath = UBSettings::uniboardDataDirectory() + "/log"; + QString dumpPath = UBSettings::userDataDirectory() + "/log"; QDir logDir(dumpPath); if (!logDir.exists()) logDir.mkdir(dumpPath); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 4a489a1f..d2632678 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1239,7 +1239,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co UBGraphicsW3CWidgetItem* UBGraphicsScene::addOEmbed(const QUrl& pContentUrl, const QPointF& pPos) { - QStringList widgetPaths = UBPersistenceManager::persistenceManager()->allWidgets(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); + QStringList widgetPaths = UBPersistenceManager::persistenceManager()->allWidgets(UBSettings::settings()->applicationApplicationsLibraryDirectory()); UBGraphicsW3CWidgetItem *widget = 0; diff --git a/src/domain/UBW3CWidget.cpp b/src/domain/UBW3CWidget.cpp index ad0d4be9..d5e399b2 100644 --- a/src/domain/UBW3CWidget.cpp +++ b/src/domain/UBW3CWidget.cpp @@ -231,7 +231,7 @@ bool UBW3CWidget::hasNPAPIWrapper(const QString& pMimeType) QString UBW3CWidget::createNPAPIWrapper(const QString& url, const QString& pMimeType, const QSize& sizeHint, const QString& pName) { - const QString userWidgetPath = UBSettings::settings()->uniboardInteractiveUserDirectory() + "/" + tr("Web"); + const QString userWidgetPath = UBSettings::settings()->userInteractiveDirectory() + "/" + tr("Web"); QDir userWidgetDir(userWidgetPath); return createNPAPIWrapperInDir(url, userWidgetDir, pMimeType, sizeHint, pName); diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index 6605ebe4..c60f0fc7 100644 Binary files a/src/frameworks/UBPlatformUtils_win.cpp and b/src/frameworks/UBPlatformUtils_win.cpp differ diff --git a/src/gui/UBFavoriteToolPalette.cpp b/src/gui/UBFavoriteToolPalette.cpp index a4bee941..ffc6cb84 100644 --- a/src/gui/UBFavoriteToolPalette.cpp +++ b/src/gui/UBFavoriteToolPalette.cpp @@ -56,7 +56,7 @@ UBFavoriteToolPalette::UBFavoriteToolPalette(QWidget* parent) } } - QDir favoritesDir(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); + QDir favoritesDir(UBSettings::settings()->userInteractiveFavoritesDirectory()); QStringList favoritesSubDirs = favoritesDir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks, QDir::Name); QStringList appPathes; diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index c0e9dc93..b3ed29b8 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -268,7 +268,6 @@ void UBMediaPlayer::openFile() for (int i=1; isetEnabled(m_MediaObject.queue().size() > 0); } void UBMediaPlayer::bufferStatus(int percent) diff --git a/src/network/UBCookieJar.cpp b/src/network/UBCookieJar.cpp index 02b0bfe9..a0b9226d 100644 --- a/src/network/UBCookieJar.cpp +++ b/src/network/UBCookieJar.cpp @@ -135,7 +135,7 @@ void UBCookieJar::load() // load cookies and exceptions qRegisterMetaTypeStreamOperators >("QList"); - QSettings cookieSettings(UBSettings::uniboardDataDirectory() + QLatin1String("/cookies.ini"), QSettings::IniFormat); + QSettings cookieSettings(UBSettings::userDataDirectory() + QLatin1String("/cookies.ini"), QSettings::IniFormat); QVariant vCookies = cookieSettings.value(QLatin1String("cookies")); QList cookies = qvariant_cast >(vCookies); @@ -180,7 +180,7 @@ void UBCookieJar::save() if (!mLoaded) return; purgeOldCookies(); - QString directory = UBSettings::uniboardDataDirectory(); + QString directory = UBSettings::userDataDirectory(); if (directory.isEmpty()) directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); if (!QFile::exists(directory)) { diff --git a/src/network/UBNetworkAccessManager.cpp b/src/network/UBNetworkAccessManager.cpp index 4a7f1ed1..182eefd7 100644 --- a/src/network/UBNetworkAccessManager.cpp +++ b/src/network/UBNetworkAccessManager.cpp @@ -63,7 +63,7 @@ UBNetworkAccessManager::UBNetworkAccessManager(QObject *parent) } QNetworkDiskCache *diskCache = new QNetworkDiskCache(this); - QString location = UBSettings::uniboardDataDirectory() + "/web-cache"; + QString location = UBSettings::userDataDirectory() + "/web-cache"; diskCache->setCacheDirectory(location); setCache(diskCache); } diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index e377249a..8de31752 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -332,7 +332,7 @@ void UBPodcastController::start() mPartNumber = 0; - mPodcastRecordingPath = UBSettings::settings()->podcastRecordingDirectory(); + mPodcastRecordingPath = UBSettings::settings()->userPodcastRecordingDirectory(); qDebug() << "mPodcastRecordingPath: " << mPodcastRecordingPath; diff --git a/src/transition/UniboardSankoreTransition.cpp b/src/transition/UniboardSankoreTransition.cpp index 32c320af..1a1a900f 100644 --- a/src/transition/UniboardSankoreTransition.cpp +++ b/src/transition/UniboardSankoreTransition.cpp @@ -60,7 +60,7 @@ void UniboardSankoreTransition::rollbackDocumentsTransition(QFileInfoList& fileI if (fileInfo->isDir() && fileInfo->fileName().startsWith("Uniboard Document ")){ QString sankoreDocumentName = fileInfo->fileName(); sankoreDocumentName.replace("Uniboard","Sankore"); - QString sankoreDocumentDirectoryPath = UBSettings::uniboardDocumentDirectory() + "/" + sankoreDocumentName; + QString sankoreDocumentDirectoryPath = UBSettings::userDocumentDirectory() + "/" + sankoreDocumentName; if (QFileInfo(sankoreDocumentDirectoryPath).exists()){ UBFileSystemUtils::deleteDir(sankoreDocumentDirectoryPath); } @@ -244,7 +244,7 @@ void UniboardSankoreTransition::executeTransition() fileInfoList.append(UBFileSystemUtils::allElementsInDirectory(mOldSankoreDirectory + "/document")); QFileInfoList::iterator fileInfo; - QString sankoreDocumentDirectory = UBSettings::uniboardDocumentDirectory(); + QString sankoreDocumentDirectory = UBSettings::userDocumentDirectory(); for (fileInfo = fileInfoList.begin(); fileInfo != fileInfoList.end() && result; fileInfo += 1) { if (fileInfo->isDir() && (fileInfo->fileName().startsWith("Uniboard Document ") || fileInfo->fileName().startsWith("Sankore Document "))){ diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index a701353d..830d4a46 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -207,7 +207,7 @@ void UBTrapFlashController::createWidget() void UBTrapFlashController::importWidgetInLibrary(QDir pSourceDir) { - const QString userWidgetPath = UBSettings::settings()->uniboardInteractiveUserDirectory() + "/" + tr("Web"); + const QString userWidgetPath = UBSettings::settings()->userInteractiveDirectory() + "/" + tr("Web"); QDir userWidgetDir(userWidgetPath); if (!userWidgetDir.exists()) diff --git a/src/web/browser/WBHistory.cpp b/src/web/browser/WBHistory.cpp index caebebb7..9801be60 100644 --- a/src/web/browser/WBHistory.cpp +++ b/src/web/browser/WBHistory.cpp @@ -246,8 +246,7 @@ void WBHistoryManager::load() { loadSettings(); - QFile historyFile(UBSettings::uniboardDataDirectory() - + QLatin1String("/history")); + QFile historyFile(UBSettings::userDataDirectory() + QLatin1String("/history")); if (!historyFile.exists()) return; if (!historyFile.open(QFile::ReadOnly)) @@ -332,7 +331,7 @@ void WBHistoryManager::save() if (first == m_history.count() - 1) saveAll = true; - QString directory = UBSettings::uniboardDataDirectory(); + QString directory = UBSettings::userDataDirectory(); if (directory.isEmpty()) directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); if (!QFile::exists(directory)) diff --git a/src/web/browser/WBWebView.cpp b/src/web/browser/WBWebView.cpp index 98fea023..b58fbddd 100644 --- a/src/web/browser/WBWebView.cpp +++ b/src/web/browser/WBWebView.cpp @@ -187,7 +187,7 @@ void WBWebPage::handleUnsupportedContent(QNetworkReply *reply) if (!isPDF && reply->error() == QNetworkReply::NoError) { if(contentType == "application/widget") - WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply,false, UBSettings::settings()->uniboardGipLibraryDirectory()); + WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply,false, UBSettings::settings()->applicationGipLibraryDirectory()); else WBBrowserWindow::downloadManager()->handleUnsupportedContent(reply); return;