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

preferencesAboutTextFull
Claudio Valerio 14 years ago
commit e8aff5a39e
  1. 2
      resources/forms/mainWindow.ui
  2. BIN
      resources/images/toolbar/tutorial.png
  3. BIN
      resources/library/interactive/ColorPicker.wgt/icon.png
  4. BIN
      resources/library/interactive/Graphme.wgt/icon.png
  5. BIN
      resources/library/interactive/Notes.wgt/icon.png
  6. 2
      resources/library/interactive/Notes.wgt/index.html
  7. BIN
      resources/library/interactive/Stopwatch.wgt/icon.png
  8. BIN
      resources/library/interactive/VideoPicker.wgt/icon.png
  9. BIN
      resources/library/interactive/Wikipedia.wgt/icon.png
  10. BIN
      resources/library/interactive/Wiktionary.wgt/icon.png
  11. BIN
      resources/library/interactive/barre_prof.wgt/icon.png
  12. 2
      resources/sankore.qrc
  13. 2
      thirdparty/freetype/README.txt

@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

@ -16,7 +16,7 @@
</head>
<body onunload="alert("!!")">
<body>
<script type="text/javascript">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

@ -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>

@ -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

Loading…
Cancel
Save