Merge branch 'master' into master

Author: ciscorn

README.md

@@ -1,5 +1,7 @@
 # LDOCE5 Viewer
 
+![image](https://cloud.githubusercontent.com/assets/15828926/24585732/efb068a4-17bb-11e7-8294-7241f73d9ed8.png)
+
 The LDOCE5 Viewer is an alternative dictionary viewer for the Longman Dictionary of Contemporary English 5th Edition (LDOCE 5).
 
 Website: http://hakidame.net/ldoce5viewer/
@@ -12,6 +14,27 @@ This software is free and open source software licensed under the terms of GPLv3
 ## Prerequisites
 
 * Longman Dictionary of Contemporary English 5th Edition (DVD-ROM)
+* Python 2.7 or 2.6 (or 3.x)
+* Development tools for PyQt4
+* lxml
+* Whoosh 2.x
+
+
+## Installation
+
+### Windows 
+
+Simple download and execute the .exe file [here](https://forward-backward.co.jp/ldoce5viewer/download).
+
+### Linux
+
+If a package is yet to be available for your distro, you need to build it from source.
+
+#### Available Packages
+
+For Arch Linux, two packages [ldoce5viewer](https://aur.archlinux.org/packages/ldoce5viewer/) and [ldoce5viewer-git](https://aur.archlinux.org/packages/ldoce5viewer-git/) exist on AUR.
+
+#### Prequisites for building from source  
 
 * Python 2.7 or 2.6 (or 3.x)
 
@@ -69,7 +92,11 @@ For Arch Linux, two packages [ldoce5viewer](https://aur.archlinux.org/packages/l
 
 ### Mac OS X
 
-(for advanced users)
+#### Available packages
+
+Download and run your .app file [here](https://forward-backward.co.jp/ldoce5viewer/download)
+
+#### Install manually From Source
 
 *Homebrew*:
 ```bash
@@ -81,16 +108,11 @@ $ open dist/LDOCE5\ Viewer.app/
 ```
 
 Or if you are using *MacPorts*:
-<ol>
-  <li><p>Install the following ports:</p>
-    <ul>
-      <li>python27 (or python3x)</li>
-      <li>py27-pyqt4</li>
-      <li>py27-lxml</li>
-      <li>py27-whoosh</li>
-      <li>py27-pyobjc-cocoa</li>
-    </ul>
-  </li>
-  <li><p>Run the LDOCE5 Viewer</p></li>
-</ol>
+- Install the following ports:
+    * python27 (or python3x)
+    * py27-pyqt4
+    * py27-lxml
+    * py27-whoosh
+    * py27-pyobjc-cocoa
+- Run the LDOCE5 Viewer
 

ldoce5viewer.appdata.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Damian Wrobel <[email protected]> -->
+<component type="desktop">
+  <id>ldoce5viewer.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>ldoce5viewer</name>
+  <summary>Viewer Application for the Longman Dictionary (LDOCE 5)</summary>
+  <description>
+    <p>
+      The ldoce5viewer is an alternative dictionary viewer for the
+      Longman Dictionary of Contemporary English 5th Edition (LDOCE 5).
+    </p>
+
+    <p>Some features:</p>
+      <ul>
+        <li>Comprehensive instant search</li>
+        <li>Pleasant to use</li>
+        <li>Clean and readable</li>
+        <li>Full sound playback</li>
+        <li>Access virtually all of the LDOCE content</li>
+        <li>Powerful advanced search</li>
+        <li>Search in definitions and example sentences</li>
+        <li>Clipboard monitoring</li>
+      </ul>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://forward-backward.co.jp/ldoce5viewer/static/images/sc/linux1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://forward-backward.co.jp/ldoce5viewer/static/images/sc/activator.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://forward-backward.co.jp/ldoce5viewer/static/images/sc/advsearch.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://forward-backward.co.jp/ldoce5viewer/</url>
+  <update_contact>dwrobel_at_ertelnet.rybnik.pl</update_contact>
+</component>

ldoce5viewer/qtgui/resources/icons/icongen.py

@@ -2,7 +2,7 @@
 
 import sys
 
-import Image, ImageFilter, ImageChops, ImageEnhance, ImageDraw
+from PIL import Image, ImageFilter, ImageChops, ImageEnhance, ImageDraw
 
 
 OFFSET_S = 4
@@ -29,7 +29,7 @@ def make_inset_shadow(alpha):
     m1 = alpha.copy()
     for i in xrange(6):
         m1 = m1.filter(ImageFilter.SMOOTH_MORE)
-    m1 = m1.offset(0, OFFSET_S)
+    m1 = ImageChops.offset(m1, 0, OFFSET_S)
     m1 = ImageChops.subtract(alpha, m1)
     m1b = ImageEnhance.Brightness(m1).enhance(0.35)
 
@@ -48,7 +48,7 @@ def make_highlight(alpha):
     m1 = alpha.copy()
     for i in xrange(2):
         m1 = m1.filter(ImageFilter.SMOOTH_MORE)
-    m1 = m1.offset(0, OFFSET_H)
+    m1 = ImageChops.offset(m1, 0, OFFSET_H)
     m1 = ImageChops.subtract(m1, alpha)
     m1b = ImageEnhance.Brightness(m1).enhance(0.35)