MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
preferencesAboutTextFull
Claudio Valerio 13 years ago
parent d89ed79398 d94f23c79d
commit e8aff5a39e
13 changed files with 4 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  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

2
resources/forms/mainWindow.ui
Unescape View File

@ -1618,7 +1618,7 @@
<action name="actionCheckUpdate"> <action name="actionCheckUpdate">
<property name="icon"> <property name="icon">
<iconset resource="../sankore.qrc"> <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>
<property name="text"> <property name="text">
<string>Check Update</string> <string>Check Update</string>

BIN
resources/images/toolbar/tutorial.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
resources/library/interactive/ColorPicker.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
resources/library/interactive/Graphme.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
resources/library/interactive/Notes.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

2
resources/library/interactive/Notes.wgt/index.html
Unescape View File

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

BIN
resources/library/interactive/Stopwatch.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
resources/library/interactive/VideoPicker.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
resources/library/interactive/Wikipedia.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
resources/library/interactive/Wiktionary.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
resources/library/interactive/barre_prof.wgt/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

2
resources/sankore.qrc
Unescape View File

@ -202,7 +202,6 @@
<file>images/toolbar/tutorial.png</file> <file>images/toolbar/tutorial.png</file>
<file>images/edit-mode.svg</file> <file>images/edit-mode.svg</file>
<file>images/save.svg</file> <file>images/save.svg</file>
<file>images/toolbar/softwareUpdate.png</file>
<file>images/toolbar/stylusTab.png</file> <file>images/toolbar/stylusTab.png</file>
<file>images/libpalette/social.png</file> <file>images/libpalette/social.png</file>
<file>images/navig_arrow.png</file> <file>images/navig_arrow.png</file>
@ -284,5 +283,6 @@
<file>images/libpalette/miniNewFolder.png</file> <file>images/libpalette/miniNewFolder.png</file>
<file>images/libpalette/miniFavorite.png</file> <file>images/libpalette/miniFavorite.png</file>
<file>images/libpalette/home.png</file> <file>images/libpalette/home.png</file>
<file>images/toolbar/updates.png</file>
</qresource> </qresource>
</RCC> </RCC>

2
thirdparty/freetype/README.txt vendored
Unescape View File

@ -6,5 +6,5 @@ instructions
1. Download freetype (http://www.freetype.org/download.html#stable) 1. Download freetype (http://www.freetype.org/download.html#stable)
2. Decompress freetype.XXX.tar.gz 2. Decompress freetype.XXX.tar.gz
3. Update on freetype.pro file the freetype directory 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 5. Run make

Write Preview
Loading…
Cancel
Save