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

13 years ago · e8aff5a39e
parent d89ed79398 d94f23c79d
commit e8aff5a39e
13 changed files with 4 additions and 4 deletions
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@ -1618,7 +1618,7 @@
  <action name="actionCheckUpdate">
   <property name="icon">
    <iconset resource="../sankore.qrc">
-     <normaloff>:/images/toolbar/softwareUpdate.png</normaloff>:/images/toolbar/softwareUpdate.png</iconset>
+     <normaloff>:/images/toolbar/updates.png</normaloff>:/images/toolbar/updates.png</iconset>
   </property>
   <property name="text">
    <string>Check Update</string>
--- a/resources/images/toolbar/tutorial.png
+++ b/resources/images/toolbar/tutorial.png
--- a/resources/library/interactive/ColorPicker.wgt/icon.png
+++ b/resources/library/interactive/ColorPicker.wgt/icon.png
--- a/resources/library/interactive/Graphme.wgt/icon.png
+++ b/resources/library/interactive/Graphme.wgt/icon.png
--- a/resources/library/interactive/Notes.wgt/icon.png
+++ b/resources/library/interactive/Notes.wgt/icon.png
--- a/resources/library/interactive/Notes.wgt/index.html
+++ b/resources/library/interactive/Notes.wgt/index.html
@ -16,7 +16,7 @@

 </head>

-<body onunload="alert("!!")">
+<body>

    <script type="text/javascript">

--- a/resources/library/interactive/Stopwatch.wgt/icon.png
+++ b/resources/library/interactive/Stopwatch.wgt/icon.png
--- a/resources/library/interactive/VideoPicker.wgt/icon.png
+++ b/resources/library/interactive/VideoPicker.wgt/icon.png
--- a/resources/library/interactive/Wikipedia.wgt/icon.png
+++ b/resources/library/interactive/Wikipedia.wgt/icon.png
--- a/resources/library/interactive/Wiktionary.wgt/icon.png
+++ b/resources/library/interactive/Wiktionary.wgt/icon.png
--- a/resources/library/interactive/barre_prof.wgt/icon.png
+++ b/resources/library/interactive/barre_prof.wgt/icon.png
--- a/resources/sankore.qrc
+++ b/resources/sankore.qrc
@ -202,7 +202,6 @@
        <file>images/toolbar/tutorial.png</file>
        <file>images/edit-mode.svg</file>
        <file>images/save.svg</file>
-        <file>images/toolbar/softwareUpdate.png</file>
        <file>images/toolbar/stylusTab.png</file>
        <file>images/libpalette/social.png</file>
        <file>images/navig_arrow.png</file>
@ -284,5 +283,6 @@
        <file>images/libpalette/miniNewFolder.png</file>
        <file>images/libpalette/miniFavorite.png</file>
        <file>images/libpalette/home.png</file>
+        <file>images/toolbar/updates.png</file>
    </qresource>
 </RCC>
--- a/thirdparty/freetype/README.txt
+++ b/thirdparty/freetype/README.txt
@ -6,5 +6,5 @@ instructions
 1. Download freetype (http://www.freetype.org/download.html#stable)
 2. Decompress freetype.XXX.tar.gz
 3. Update on freetype.pro file the freetype directory 
-4. Run qmake freetype.pro
+4. Run qmake freetype.pro (on mac add -spec macx-g++)
 5. Run make