Commit graph

159 commits

Author SHA1 Message Date
Abs62 e24de4d881 Merge branch 'Original' into Qt4x5
Conflicts:
	xdxf2html.cc
2015-10-14 18:23:46 +03:00
Zhe Wang a04917833c Remove dependency on libavutil 2015-10-11 23:01:24 +08:00
Abs62 1df1b3d5d5 Linux-specific: Fix compilation with Qt5 (issue #595) 2015-06-24 17:56:29 +03:00
Abs62 40de8fcdd1 Merge branch 'Original' into Qt4x5 2015-02-09 18:57:32 +03:00
Abs62 0912df7cb5 Add SLOB dictionaries support 2015-01-22 18:17:05 +03:00
Abs62 407bc7e4b0 Merge branch 'Original' into Qt4x5 2014-07-21 17:38:05 +04:00
Abs62 8e56dae5cd Mac-specific: Fix help installing for any build directory 2014-07-21 17:36:32 +04:00
Abs62 d4adf591a9 Adjust code for Qt5 2014-07-11 18:18:37 +04:00
Abs62 8cabcacf55 Merge branch 'Original' into Qt4x5
Conflicts:
	btreeidx.cc
	fulltextsearch.cc
	goldendict.pro
	main.cc
2014-07-11 18:17:43 +04:00
Abs62 d4c68d3c49 Add help system 2014-06-23 20:03:14 +04:00
Abs62 35433d9ea6 Merge branch 'Original' into Qt4x5 2014-05-27 17:59:50 +04:00
Abs62 08dd0423d9 Add Macedonian Translation by Vladimir Gerovski 2014-05-26 19:48:18 +04:00
Abs62 8b3a7a4f43 Epwing: Fix monochrome images, use unicode symbols instead of some extra symbol images 2014-05-22 22:16:10 +04:00
Abs62 d9169bd45b Add support for Epwing dictionaries 2014-05-20 17:59:56 +04:00
Abs62 273b1b5757 Merge branch 'Original' into Qt4x5
Conflicts:
	articleview.cc
	btreeidx.cc
2014-05-05 21:31:16 +04:00
Abs62 ceb04dbd6a DICT protocol support 2014-05-02 17:36:50 +04:00
Abs62 10532279b1 Merge branch 'Original' into Qt4x5
Conflicts:
	article_netmgr.cc
	mainwindow.cc
2014-04-23 18:16:06 +04:00
Abs62 9ad0d5f985 Implement full-text search 2014-04-16 20:18:28 +04:00
Abs62 4cf35cc7e3 Merge branch 'Original' into Qt4x5
Conflicts:
	hotkeywrapper.hh
	mainwindow.cc
	mainwindow.hh
2014-04-11 19:29:56 +04:00
Abs62 9623cbdd7a Add proxy authentication dialog 2014-04-03 18:21:02 +04:00
Abs62 59ebab589c Add Persian translation by Noori 2014-03-18 22:54:53 +04:00
Abs62 4bbe1aaee5 Merge branch 'Original' into Qt4x5
Conflicts:
	scanpopup.cc
2014-03-14 17:34:33 +04:00
Abs62 4a4bfade1d Show all headwords for selected dictionary 2014-02-28 16:36:28 +04:00
Abs62 0fa4087b38 Merge branch 'Original' into Qt4x5
Conflicts:
	goldendict.pro
	mainwindow.cc
	zim.cc
	zipsounds.cc
2014-02-11 23:39:31 +04:00
Abs62 0c2b182647 Handle 1-bit black/white TIFF images without photometric interpretation tag
(QImage don't handle such images)
2014-02-11 18:02:00 +04:00
Abs62 97c4697a80 Handle some touch screen gestures in article view window 2014-02-04 22:38:50 +04:00
Abs62 34271ecc1d Merge branch 'Temp' into Qt4x5
Conflicts:
	article_maker.cc
	article_netmgr.cc
	articleview.cc
	forvo.cc
	goldendict.pro
	hotkeywrapper.cc
	hunspell.cc
	mainwindow.cc
2013-12-18 19:09:48 +04:00
Abs62 444938a330 Fix logging to file UTF-8 encoded messages 2013-11-16 22:34:09 +04:00
Abs62 2b15f925e6 Win-specific: Adjust project file for 64-bit MinGW build 2013-09-30 16:06:30 +04:00
Abs62 c4baa470b5 Win-specific: Adjust project file for 64-bit MinGW build 2013-09-30 16:03:25 +04:00
Abs62 750cccbe15 Qt5-Win-specific: Repair animation of dictionaries initializing indicator on Vista and higher with classic appearance 2013-09-27 17:04:57 +04:00
Abs62 1f87d8a911 Merge branch 'master' into Qt4x5
Conflicts:
	btreeidx.cc
	goldendict.pro
	lsa.cc
	mouseover.cc
	sounddir.cc
	xdxf2html.cc
2013-09-27 17:03:27 +04:00
Julian Depetris Chauvin 7f112ea2e9 Merge branch '1.5-dev' 2013-09-23 15:09:09 -03:00
Julian Depetris Chauvin b78a817ae1 Add Turkmen translation by Berdy 2013-09-23 07:30:57 -03:00
Abs62 5ba083e74f Merge branch 'zim-support' 2013-09-19 18:28:08 +04:00
Abs62 7916cc5a87 Some tuning for MinGW 4.8 build 2013-09-17 18:11:27 +04:00
Abs62 a56329ce24 Zim: Add liblzma.a and it headers for MacOS, turn on Zim support under MacOS by default. 2013-09-16 18:13:52 +04:00
Julian Depetris Chauvin b567dd4d37 Add Swedish translation by Lakrits 2013-09-16 10:07:20 -03:00
Abs62 68665167d5 Add ZIM format support (issue #267). Now turned on by default for Windows only. Under Linux/MacOS use "qmake "CONFIG+=zim_support"" (liblzma-dev package required. Or take xz 5.0.5 sources from http://tukaani.org/xz/ and compile it). 2013-09-14 20:17:32 +04:00
Julian Depetris Chauvin 2ebda7879a Customize info.plist to add key to use font auto-scaling in OS X. This should at least fix the blurry texts in Macs with retina display support (issue #264) 2013-08-25 21:56:32 -03:00
Tvangeste 8d29a10d7c Serbian translation by ozzii (issue #388) 2013-08-24 19:24:05 +02:00
Timon Wong e09ca5402d Merge branch 'master' into qt4x5
Conflicts:
	goldendict.pro
2013-08-19 10:54:38 +08:00
Tvangeste b254127b3a Handle MSVC++ x64 2013-08-11 18:05:10 +02:00
Tvangeste b81f008a18 Tweaked compilation flags for MSVC++ 2013-08-10 21:44:33 +02:00
Tvangeste ea24b9e858 Disable stupid MS-specific compiler CRT-related warnings 2013-08-10 20:43:37 +02:00
Tvangeste d878802948 Fixed a compilation problem on windows 2013-08-09 12:24:33 +02:00
Tvangeste dd695f93dc Re-enable the internal ffmpeg based media player for Visual C++ 2012 2013-08-08 23:07:27 +02:00
Tvangeste f03cd6f41d Adjust the goldendict.pro file to handle MSVC++ 2013-08-07 20:32:26 +02:00
Timon Wong ee0fc80001 Merge branch 'master' into qt4x5
Conflicts:
	articleview.cc
	btreeidx.cc
	goldendict.pro
	mediawiki.cc
2013-08-02 17:00:16 +08:00
Tvangeste 2a12036438 Linux: Better detection of installation prefix
1. qmake PREFIX=/usr

or

2. PREFIX=/usr qmake

or

3. export PREFIX=/usr; qmake

All should work.

Previously, the most typical #1 was not working.
2013-07-21 12:29:28 +02:00