Merge branch 'master' into qt5

.gitignore

@@ -52,6 +52,7 @@ doc/manual.html
 doc/quickstart.html
 *.txt.user
 *.kdev4
+*.kdev_include_paths
 pack/archlinux/pkg
 pack/archlinux/src
 pack/archlinux/*.tar.gz

.travis.yml

@@ -22,24 +22,25 @@ before_install:
   - export TAGAINI_VERSION
   - env | sort
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update ; sudo apt-get install -qq libtext-multimarkdown-perl sqlite3 qt4-dev-tools rpm ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew install cmake multimarkdown qt; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew install multimarkdown qt; fi
   - qmake -version
 
 before_script:
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake -DCMAKE_BUILD_TYPE=Release -DEMBED_SQLITE=1 ..
 
 after_success:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cpack -G DEB ; cpack -G RPM ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ../pack/source/buildsourcerelease.sh ; cpack -G DEB ; cpack -G RPM ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo -s -- "cpack -G DragNDrop" ; sudo -s -- "chown travis Tagaini\ Jisho-$TAGAINI_VERSION.dmg " ; fi
 
 deploy:
   - provider: releases
     skip_cleanup: true
     api_key:
-      secure: gLeWm6YoQn9Bbxo3okJXS3zodqgb+cn3+J9KvL/JN4p+QQF7LiFUCnJhZMdW1ldcXCoeYsUQJQFMS22gQYq4wN3ohtgCqTaiF4tY18glG3tI51sQaBq+3T99VyGf4IfcjIwbafwxnme6raplUvZvnbn1bUJ5Gx/WsOuyNylD7t8=
+      secure: N/wOTfrlb4TxMVHSjUkfX5AnJqlOnTMVPYYf22/AnOU1ecA5r45hF+3Q6rA1UUCf4My/cPCWRaxmKvgZIg3rTCvTZM43JxuUuqqYcmCzrQnnPtiV+CXutPQC2s3Y+Kkecbv+XApPq8D2RMYcw/aiz/dv/KRMoVM2jGZODyqAe9E=
     file:
+      - tagainijisho-$TAGAINI_VERSION.tar.gz
       - tagainijisho-$TAGAINI_VERSION.deb
       - tagainijisho-$TAGAINI_VERSION.rpm
     on:
@@ -49,7 +50,7 @@ deploy:
   - provider: releases
     skip_cleanup: true
     api_key:
-      secure: gLeWm6YoQn9Bbxo3okJXS3zodqgb+cn3+J9KvL/JN4p+QQF7LiFUCnJhZMdW1ldcXCoeYsUQJQFMS22gQYq4wN3ohtgCqTaiF4tY18glG3tI51sQaBq+3T99VyGf4IfcjIwbafwxnme6raplUvZvnbn1bUJ5Gx/WsOuyNylD7t8=
+      secure: N/wOTfrlb4TxMVHSjUkfX5AnJqlOnTMVPYYf22/AnOU1ecA5r45hF+3Q6rA1UUCf4My/cPCWRaxmKvgZIg3rTCvTZM43JxuUuqqYcmCzrQnnPtiV+CXutPQC2s3Y+Kkecbv+XApPq8D2RMYcw/aiz/dv/KRMoVM2jGZODyqAe9E=
     file:
       - "Tagaini Jisho-$TAGAINI_VERSION.dmg"
     on:

Changelog

@@ -1,3 +1,17 @@
+1.0.3 release on 2015/03/08
+* Update to SQLite 3.8.8.3
+* Update JMdict, kanjidic and KanjiVG data
+* Lots of improvements to non-english translations (especially
+  French) thanks to the jmdict-i18n project
+* New GUI (partial) translations: Persian, Hungarian, Indonesian
+* Re-enable SKIP support now that licensing issues are solved
+* Remove a bunch of invalid entries from the JLPT lists
+* Fix a bug when exporting the database to an existing file
+* Enable shortcuts for training window on MacOS X
+* Fix a bug that prevented the creation of a search folder
+* Fix a dimension bug in the preferences window
+* Fix a crash when moving an entry to the list below it
+
 1.0.2 release on 2014/04/14
 * Update to SQLite 3.8.4
 * Remove SKIP support due to distribution concerns

doc/manual.txt

@@ -407,6 +407,11 @@ the number. No two characters have the same value. For instance, the character
 `取` has a Unicode value of `0x53D6`. Putting that in the Unicode field will
 result in the entry for `取` being listed.
 
+The next section is for finding kanji by **SKIP code**. A skip code is a way
+of categorising kanji according to its type. SKIP codes are comprised of three
+numbers and are annotated X-Y-Z. Each slider in the **SKIP code** section
+relates to one of these numbers.[^SKIPfoot]
+
 The fifth section, or second from the right, is labelled **Four corner**. It
 provides four drop down boxes corresponding to each corner of a Chinese
 character and a fifth box for miscellaneous strokes. Four corner method is a
@@ -415,6 +420,8 @@ Chinese input method to used to find kanji.[^FCfoot]
 The last section, **School grade**, represents which Japanese school level the
 kanji is taught in. 
 
+[^SKIPfoot]: http://www.basic-japanese.com/Hilfsdateien/skipCode.html  
+
 [^FCfoot]: http://en.wikipedia.org/wiki/Four_Corner_Method
 
 [^hex]: http://en.wikipedia.org/wiki/Hexadecimal
@@ -522,6 +529,9 @@ common sections.
 **JLPT**
 :   The kanji's JLPT level.  
 
+**SKIP**
+:   The kanji's SKIP code.
+
 **Radicals**
 :   Formal radicals found within the kanji.
 
@@ -1027,6 +1037,9 @@ element on and off.
 **Unicode**
 :   The kanji's Unicode value.
 
+**SKIP code**
+:   The kanji's SKIP code.
+
 **Four corner code**
 :   The kanji's four corner code.
 
@@ -1114,6 +1127,9 @@ information.
 **Unicode**
 :   Show the kanji's Unicode value.
 
+**SKIP code**
+:   Show the kanji's SKIP code.
+
 **Four corner code**
 :   Show the kanji's four corner code.
 

doc/quickstart.txt

@@ -113,6 +113,7 @@ parameters are available:
 * Components: enter some kanjis in this text field, and only kanjis containing
   them will be shown.
 * Unicode: lookup by unicode.
+* SKIP Code: lookup by skip code.
 * Four Corner: lookup with the four corner method.
 * School grade: choose the school grade from which a kanji is learnt.