Commit graph

31 commits

Author SHA1 Message Date
Abs62 b9666f7f9f Merge branch 'Original' into Qt4x5
Conflicts:
	bgl_babylon.cc
2014-05-12 18:10:26 +04:00
Abs62 e2b0a7f39c Mac-specific: Adjust code for Qt5 build 2014-05-12 17:53:13 +04:00
Igor Kushnir 55bf661ca4 Fixed compilation error. 2014-05-11 11:39:55 +03:00
Abs62 5e79fabb0d Adjust code for Qt5 2014-04-11 20:50:24 +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 c8c7262c34 Win-specific: Fix initialization 2014-04-01 20:42:24 +04:00
Abs62 50e16d4c46 Fix compilation under Linux (issue #450) 2014-03-21 16:46:11 +04:00
Abs62 269ea601f5 Win-specific: ScanPopup: Fix GD main window scanning under Win7+ 2014-03-17 18:53:47 +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 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
Abs62 1a8bb0ae10 Linux-specific: Handle Qt::Meta key in hotkeys (issue #404) 2013-09-24 17:55:58 +04: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 47c4646642 Fixed #359: Crash on Xubuntu 13.04 x64 due to XGrabKey 2013-07-19 15:22:40 +02:00
Timon Wong f0885d4c78 Merge branch 'master' into qt4x5
Conflicts:
	hotkeywrapper.cc
	xdxf2html.cc
2013-06-10 23:49:09 +08:00
Abs62 b210c1a45e Win-specific: Pass-through first part of compound hotkey 2013-06-10 17:49:42 +04:00
Timon Wong a08102dd42 Win-Specific: Fix hotkey handling in Qt5 2013-06-08 22:36:05 +08:00
Timon Wong 8015841a1a Replace Q_WS_X11 -> HAVE_X11 2013-05-31 13:28:36 +08:00
Timon Wong d057752c74 Change Q_WS_MAC to Q_OS_MAC, Change Q_WS_WIN* to Q_OS_WIN* 2013-05-31 12:28:29 +08:00
Timon Wong 1d85f1b359 #212: Scratch, currently works under windows, for both Qt4 and Qt5 2013-05-30 21:24:21 +08:00
Abs62 450a4656d4 Win-specific: Fix Ctrl+C emulation pass-through in hotkey wrapper 2013-04-29 23:35:26 +04:00
Abs62 d2a8ecd7c1 Win-specific: Fix Ctrl+Ins pass-through in hotkey wrapper 2013-04-29 20:52:15 +04:00
Abs62 10378302e8 Mac-specific: Implement hotkeys under Mac OS X (issue #129) 2013-04-05 16:25:34 +04:00
Vladimir Sizikov 28b96427ac Compilation fixes under Embedded Linux (for ARM) envvironment.
Needed to properly compile GoldenDict for Kindle eInk readers.
2012-12-04 09:21:13 +01:00
Abs62 2a215927ce Fix some warnings 2012-10-31 17:58:35 +04:00
Abs62 fa6a856ed5 Fix hotkeys registration under Windows 2011-11-17 17:01:42 +04:00
Denis Loginov b1553ccc75 Added MAC OS X support and updated program icon from the old project wiki for better looks in Dock etc. Scan popup and hotkeys are not supported. The program is tested on Snow Leopard and Lion. Works with the default system libraries.
Signed-off-by: Denis Loginov <dinvlad@gmail.com>
2011-08-06 14:39:16 -04:00
Abs62 36e509a2ab Replace printf in code by a macro DPRINTF 2011-06-19 22:50:11 +04:00
Konstantin Isakov 63e99204fc Switch to QtSingleApplication for maintaining single instance running.
This should put an end to all those pidfile-related problems.
2010-11-20 16:43:55 +03:00
Konstantin Isakov 15d3ccbc83 Properly handle QApplication::commitData(), hopefully providing proper config file saving when the system shuts down. 2010-06-28 19:14:07 +04:00
Konstantin Isakov ab88fa4867 Drop the src/ directory. It's superfluous. 2010-05-15 16:42:18 +04:00
Renamed from src/hotkeywrapper.cc (Browse further)