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

Conflicts: src/board/UBFeaturesController.h
13 years ago · c601a63984
parent abd1c8cb1a 865f0769f0
commit c601a63984
637 changed files with 2428 additions and 668 deletions
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@ -69,7 +69,6 @@
   <addaction name="actionForward"/>
   <addaction name="separator"/>
   <addaction name="actionErase"/>
   <addaction name="actionGroupItems"/>
   <addaction name="actionBoard"/>
   <addaction name="actionTutorial"/>
   <addaction name="actionWeb"/>
--- a/resources/library/applications/Calculatrice.wgt/config.xml
+++ b/resources/library/applications/Calculatrice.wgt/config.xml
--- a/resources/library/applications/Calculatrice.wgt/css/ubwidget.css
+++ b/resources/library/applications/Calculatrice.wgt/css/ubwidget.css
--- a/resources/library/applications/Calculatrice.wgt/icon.png
+++ b/resources/library/applications/Calculatrice.wgt/icon.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_out/bottom.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_out/bottom.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_out/left.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_out/left.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_out/right.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_out/right.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_out/top.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_out/top.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_bottom.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_bottom.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_left.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_left.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_right.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_right.png
--- a/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_top.png
+++ b/resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_top.png
--- a/resources/library/applications/Calculatrice.wgt/images/back.png
+++ b/resources/library/applications/Calculatrice.wgt/images/back.png
--- a/resources/library/applications/Calculatrice.wgt/images/back_small.png
+++ b/resources/library/applications/Calculatrice.wgt/images/back_small.png
--- a/resources/library/applications/Calculatrice.wgt/images/button_out-copie.png
+++ b/resources/library/applications/Calculatrice.wgt/images/button_out-copie.png
--- a/resources/library/applications/Calculatrice.wgt/images/button_out.gif
+++ b/resources/library/applications/Calculatrice.wgt/images/button_out.gif
--- a/resources/library/applications/Calculatrice.wgt/images/button_out.png
+++ b/resources/library/applications/Calculatrice.wgt/images/button_out.png
--- a/resources/library/applications/Calculatrice.wgt/images/button_out_dark.gif
+++ b/resources/library/applications/Calculatrice.wgt/images/button_out_dark.gif
--- a/resources/library/applications/Calculatrice.wgt/images/button_out_dark.png
+++ b/resources/library/applications/Calculatrice.wgt/images/button_out_dark.png
--- a/resources/library/applications/Calculatrice.wgt/images/button_over.gif
+++ b/resources/library/applications/Calculatrice.wgt/images/button_over.gif
--- a/resources/library/applications/Calculatrice.wgt/images/button_toggle.png
+++ b/resources/library/applications/Calculatrice.wgt/images/button_toggle.png
--- a/resources/library/applications/Calculatrice.wgt/images/button_toggle_invert.png
+++ b/resources/library/applications/Calculatrice.wgt/images/button_toggle_invert.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/back.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/back.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/bottom.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/bottom.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomleft.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomleft.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomright.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomright.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopleft.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopleft.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopright.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopright.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/left.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/left.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/right.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/right.png
--- a/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/top.png
+++ b/resources/library/applications/Calculatrice.wgt/images/buttons_shadow/top.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pi.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pi.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pi.psd
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pi.psd
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pi_click.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pi_click.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pi_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pi_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pow.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pow.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/pow.psd
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/pow.psd
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/sq.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/sq.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/sq.psd
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/sq.psd
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/sq_click.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/sq_click.png
--- a/resources/library/applications/Calculatrice.wgt/images/calculator/sq_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/calculator/sq_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/display
+++ b/resources/library/applications/Calculatrice.wgt/images/display
--- a/resources/library/applications/Calculatrice.wgt/images/display.png
+++ b/resources/library/applications/Calculatrice.wgt/images/display.png
--- a/resources/library/applications/Calculatrice.wgt/images/historyback.png
+++ b/resources/library/applications/Calculatrice.wgt/images/historyback.png
--- a/resources/library/applications/Calculatrice.wgt/images/historytab.png
+++ b/resources/library/applications/Calculatrice.wgt/images/historytab.png
--- a/resources/library/applications/Calculatrice.wgt/images/historytabOver.png
+++ b/resources/library/applications/Calculatrice.wgt/images/historytabOver.png
--- a/resources/library/applications/Calculatrice.wgt/images/inspector.png
+++ b/resources/library/applications/Calculatrice.wgt/images/inspector.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche0.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche0.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche0_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche0_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche0_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche0_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche1.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche1.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche1_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche1_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche1_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche1_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche2.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche2.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche2_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche2_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche2_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche2_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche3.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche3.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche3_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche3_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche3_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche3_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche4.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche4.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche4_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche4_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche4_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche4_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche5.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche5.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche5_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche5_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche5_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche5_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche6.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche6.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche6_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche6_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche6_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche6_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche7.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche7.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche7_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche7_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche7_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche7_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche8.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche8.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche8_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche8_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche8_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche8_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche9.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche9.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche9_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche9_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touche9_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touche9_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchec.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchec.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchec_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchec_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchec_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchec_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchediv.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchediv.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchediv_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchediv_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchediv_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchediv_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchedot.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchedot.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchedot_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchedot_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchedot_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchedot_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/toucheeq.png
+++ b/resources/library/applications/Calculatrice.wgt/images/toucheeq.png
--- a/resources/library/applications/Calculatrice.wgt/images/toucheeq_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/toucheeq_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/toucheeq_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/toucheeq_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchef.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchef.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchef_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchef_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchef_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchef_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchem.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchem.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchem_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchem_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchem_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchem_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchep.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchep.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchep_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchep_over.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchep_over_down.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchep_over_down.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchepd.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchepd.png
--- a/resources/library/applications/Calculatrice.wgt/images/touchepd_over.png
+++ b/resources/library/applications/Calculatrice.wgt/images/touchepd_over.png
--- a/Show More
+++ b/Show More