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

preferencesAboutTextFull
Anna Udovichenko 13 years ago
commit 59221084e8
  1. 6
      Sankore 3.1.iss
  2. 2
      release.win7.vc9.64.bat
  3. 2
      release.win7.vc9.bat
  4. 0
      resources/library/applications/Calculatrice.wgt/config.xml
  5. 0
      resources/library/applications/Calculatrice.wgt/css/ubwidget.css
  6. 0
      resources/library/applications/Calculatrice.wgt/icon.png
  7. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_out/bottom.png
  8. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_out/left.png
  9. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_out/right.png
  10. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_out/top.png
  11. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_bottom.png
  12. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_left.png
  13. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_right.png
  14. 0
      resources/library/applications/Calculatrice.wgt/images/arrows_over/button_arrow_top.png
  15. 0
      resources/library/applications/Calculatrice.wgt/images/back.png
  16. 0
      resources/library/applications/Calculatrice.wgt/images/back_small.png
  17. 0
      resources/library/applications/Calculatrice.wgt/images/button_out-copie.png
  18. 0
      resources/library/applications/Calculatrice.wgt/images/button_out.gif
  19. 0
      resources/library/applications/Calculatrice.wgt/images/button_out.png
  20. 0
      resources/library/applications/Calculatrice.wgt/images/button_out_dark.gif
  21. 0
      resources/library/applications/Calculatrice.wgt/images/button_out_dark.png
  22. 0
      resources/library/applications/Calculatrice.wgt/images/button_over.gif
  23. 0
      resources/library/applications/Calculatrice.wgt/images/button_toggle.png
  24. 0
      resources/library/applications/Calculatrice.wgt/images/button_toggle_invert.png
  25. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/back.png
  26. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/bottom.png
  27. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomleft.png
  28. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/cbottomright.png
  29. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopleft.png
  30. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/ctopright.png
  31. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/left.png
  32. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/right.png
  33. 0
      resources/library/applications/Calculatrice.wgt/images/buttons_shadow/top.png
  34. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pi.png
  35. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pi.psd
  36. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pi_click.png
  37. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pi_over.png
  38. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pow.png
  39. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/pow.psd
  40. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/sq.png
  41. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/sq.psd
  42. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/sq_click.png
  43. 0
      resources/library/applications/Calculatrice.wgt/images/calculator/sq_over.png
  44. 0
      resources/library/applications/Calculatrice.wgt/images/display copy.png
  45. 0
      resources/library/applications/Calculatrice.wgt/images/display.png
  46. 0
      resources/library/applications/Calculatrice.wgt/images/historyback.png
  47. 0
      resources/library/applications/Calculatrice.wgt/images/historytab.png
  48. 0
      resources/library/applications/Calculatrice.wgt/images/historytabOver.png
  49. 0
      resources/library/applications/Calculatrice.wgt/images/inspector.png
  50. 0
      resources/library/applications/Calculatrice.wgt/images/touche0.png
  51. 0
      resources/library/applications/Calculatrice.wgt/images/touche0_over.png
  52. 0
      resources/library/applications/Calculatrice.wgt/images/touche0_over_down.png
  53. 0
      resources/library/applications/Calculatrice.wgt/images/touche1.png
  54. 0
      resources/library/applications/Calculatrice.wgt/images/touche1_over.png
  55. 0
      resources/library/applications/Calculatrice.wgt/images/touche1_over_down.png
  56. 0
      resources/library/applications/Calculatrice.wgt/images/touche2.png
  57. 0
      resources/library/applications/Calculatrice.wgt/images/touche2_over.png
  58. 0
      resources/library/applications/Calculatrice.wgt/images/touche2_over_down.png
  59. 0
      resources/library/applications/Calculatrice.wgt/images/touche3.png
  60. 0
      resources/library/applications/Calculatrice.wgt/images/touche3_over.png
  61. 0
      resources/library/applications/Calculatrice.wgt/images/touche3_over_down.png
  62. 0
      resources/library/applications/Calculatrice.wgt/images/touche4.png
  63. 0
      resources/library/applications/Calculatrice.wgt/images/touche4_over.png
  64. 0
      resources/library/applications/Calculatrice.wgt/images/touche4_over_down.png
  65. 0
      resources/library/applications/Calculatrice.wgt/images/touche5.png
  66. 0
      resources/library/applications/Calculatrice.wgt/images/touche5_over.png
  67. 0
      resources/library/applications/Calculatrice.wgt/images/touche5_over_down.png
  68. 0
      resources/library/applications/Calculatrice.wgt/images/touche6.png
  69. 0
      resources/library/applications/Calculatrice.wgt/images/touche6_over.png
  70. 0
      resources/library/applications/Calculatrice.wgt/images/touche6_over_down.png
  71. 0
      resources/library/applications/Calculatrice.wgt/images/touche7.png
  72. 0
      resources/library/applications/Calculatrice.wgt/images/touche7_over.png
  73. 0
      resources/library/applications/Calculatrice.wgt/images/touche7_over_down.png
  74. 0
      resources/library/applications/Calculatrice.wgt/images/touche8.png
  75. 0
      resources/library/applications/Calculatrice.wgt/images/touche8_over.png
  76. 0
      resources/library/applications/Calculatrice.wgt/images/touche8_over_down.png
  77. 0
      resources/library/applications/Calculatrice.wgt/images/touche9.png
  78. 0
      resources/library/applications/Calculatrice.wgt/images/touche9_over.png
  79. 0
      resources/library/applications/Calculatrice.wgt/images/touche9_over_down.png
  80. 0
      resources/library/applications/Calculatrice.wgt/images/touchec.png
  81. 0
      resources/library/applications/Calculatrice.wgt/images/touchec_over.png
  82. 0
      resources/library/applications/Calculatrice.wgt/images/touchec_over_down.png
  83. 0
      resources/library/applications/Calculatrice.wgt/images/touchediv.png
  84. 0
      resources/library/applications/Calculatrice.wgt/images/touchediv_over.png
  85. 0
      resources/library/applications/Calculatrice.wgt/images/touchediv_over_down.png
  86. 0
      resources/library/applications/Calculatrice.wgt/images/touchedot.png
  87. 0
      resources/library/applications/Calculatrice.wgt/images/touchedot_over.png
  88. 0
      resources/library/applications/Calculatrice.wgt/images/touchedot_over_down.png
  89. 0
      resources/library/applications/Calculatrice.wgt/images/toucheeq.png
  90. 0
      resources/library/applications/Calculatrice.wgt/images/toucheeq_over.png
  91. 0
      resources/library/applications/Calculatrice.wgt/images/toucheeq_over_down.png
  92. 0
      resources/library/applications/Calculatrice.wgt/images/touchef.png
  93. 0
      resources/library/applications/Calculatrice.wgt/images/touchef_over.png
  94. 0
      resources/library/applications/Calculatrice.wgt/images/touchef_over_down.png
  95. 0
      resources/library/applications/Calculatrice.wgt/images/touchem.png
  96. 0
      resources/library/applications/Calculatrice.wgt/images/touchem_over.png
  97. 0
      resources/library/applications/Calculatrice.wgt/images/touchem_over_down.png
  98. 0
      resources/library/applications/Calculatrice.wgt/images/touchep.png
  99. 0
      resources/library/applications/Calculatrice.wgt/images/touchep_over.png
  100. 0
      resources/library/applications/Calculatrice.wgt/images/touchep_over_down.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -45,7 +45,10 @@ Type: files ; Name: "{app}\*.dll"
[Files]
Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
;Sankore plugins
Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion
;OpenSSL
Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
@ -60,6 +63,7 @@ Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignorever
Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Qt-sankore3.1\lib\QtOpenGL4.dll"; DestDir: "{app}"; Flags: ignoreversion
;Qt plugins
Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion

@ -62,7 +62,7 @@ nmake release-install
copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\
del build\win32\release\product\i18n\qt_help*
del ".\build\win32\release\product\Sankore.pdb"
del "build\win32\release\product\Sankore.pdb"
set INSTALLER_NAME=Open-Sankore

@ -66,7 +66,7 @@ copy resources\customizations build\win32\release\product\
del build\win32\release\product\i18n\qt_help*
del ".\build\win32\release\product\Sankore.pdb"
del "build\win32\release\product\Sankore.pdb"
set INSTALLER_NAME=Open-Sankore

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save