Bartosz Szatkowski [Mon, 16 Aug 2010 08:36:20 +0000 (10:36 +0200)]
First draft of Bookmarks interface
Bartosz Szatkowski [Mon, 16 Aug 2010 08:10:05 +0000 (10:10 +0200)]
Added Bookmarks class
Bartosz Szatkowski [Mon, 16 Aug 2010 07:16:25 +0000 (09:16 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Bartosz Szatkowski [Mon, 16 Aug 2010 07:14:59 +0000 (09:14 +0200)]
Adding single character wildcards
Mateusz Półrola [Mon, 16 Aug 2010 06:40:42 +0000 (08:40 +0200)]
Fixed caching from settings widget
Mateusz Półrola [Fri, 13 Aug 2010 12:08:48 +0000 (14:08 +0200)]
Fixed bug in load plugin dialog
Mateusz Półrola [Fri, 13 Aug 2010 11:24:50 +0000 (13:24 +0200)]
Merge branch 'master' into cache
Mateusz Półrola [Fri, 13 Aug 2010 10:46:36 +0000 (12:46 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Bartosz Szatkowski [Fri, 13 Aug 2010 10:44:25 +0000 (12:44 +0200)]
Added possibility of stopping cache process
Bartosz Szatkowski [Fri, 13 Aug 2010 10:32:07 +0000 (12:32 +0200)]
Fixed caching time and place
Mateusz Półrola [Fri, 13 Aug 2010 09:31:42 +0000 (11:31 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Fri, 13 Aug 2010 09:25:50 +0000 (11:25 +0200)]
Resolve conflict after pull
Bartosz Szatkowski [Fri, 13 Aug 2010 09:25:00 +0000 (11:25 +0200)]
Added searching for final translation in cache
Bartosz Szatkowski [Fri, 13 Aug 2010 09:16:08 +0000 (11:16 +0200)]
Fixed wildcards hanling
Mateusz Półrola [Fri, 13 Aug 2010 08:59:49 +0000 (10:59 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Bartosz Szatkowski [Fri, 13 Aug 2010 08:59:37 +0000 (10:59 +0200)]
Fixed crashes and db error connected with threads
Mateusz Półrola [Fri, 13 Aug 2010 08:22:25 +0000 (10:22 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Bartosz Szatkowski [Fri, 13 Aug 2010 08:22:24 +0000 (10:22 +0200)]
Added searching for word list in cache
Mateusz Półrola [Fri, 13 Aug 2010 08:21:26 +0000 (10:21 +0200)]
Added caching dialog with casching progress
Bartosz Szatkowski [Fri, 13 Aug 2010 07:32:38 +0000 (09:32 +0200)]
Added caching to xdxf plugin
Mateusz Półrola [Fri, 13 Aug 2010 06:21:00 +0000 (08:21 +0200)]
Changed history behaviour, history next and prev buttons now start searching after 500 ms
Mateusz Półrola [Fri, 13 Aug 2010 05:54:53 +0000 (07:54 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Thu, 12 Aug 2010 14:51:34 +0000 (16:51 +0200)]
Added word counting function in xdxf plugin
Bartosz Szatkowski [Thu, 12 Aug 2010 14:47:16 +0000 (16:47 +0200)]
searching for word list in xdxf plugin refactorized into searching in file and searchin in cache -> depends whether cache exists.
Bartosz Szatkowski [Thu, 12 Aug 2010 14:23:46 +0000 (16:23 +0200)]
After stoping search non of (partial) results are returned; searchCanceled signal is emmited
Mateusz Półrola [Thu, 12 Aug 2010 13:01:12 +0000 (15:01 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Thu, 12 Aug 2010 13:01:07 +0000 (15:01 +0200)]
Minor behavioral fixes
Mateusz Półrola [Thu, 12 Aug 2010 12:59:47 +0000 (14:59 +0200)]
Merge branch 'gui'
Conflicts:
trunk/src/base/backbone/backbone.h
Mateusz Półrola [Thu, 12 Aug 2010 12:36:03 +0000 (14:36 +0200)]
Updated documentation
Bartosz Szatkowski [Thu, 12 Aug 2010 12:31:29 +0000 (14:31 +0200)]
Changed timer based result fatching for signal based
Bartosz Szatkowski [Thu, 12 Aug 2010 12:06:20 +0000 (14:06 +0200)]
Set number of thred to idealCount+1=cores number+1
Bartosz Szatkowski [Thu, 12 Aug 2010 10:32:16 +0000 (12:32 +0200)]
Fixed tests: some modification in runtime order
Bartosz Szatkowski [Thu, 12 Aug 2010 10:17:06 +0000 (12:17 +0200)]
Changed thread handling for translation fetching
Mateusz Półrola [Thu, 12 Aug 2010 10:05:58 +0000 (12:05 +0200)]
Refactorization of gui
Bartosz Szatkowski [Thu, 12 Aug 2010 09:00:11 +0000 (11:00 +0200)]
Changed threading style - now its map-like type;
Mapping word (to translate) on list of dictionaries
Bartosz Szatkowski [Thu, 12 Aug 2010 06:25:57 +0000 (08:25 +0200)]
Added docstrings and changed file header (license + file doc)
Mateusz Półrola [Wed, 11 Aug 2010 12:31:36 +0000 (14:31 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Wed, 11 Aug 2010 12:31:09 +0000 (14:31 +0200)]
Fixed phantom errors linked with saving/loading settings
Mateusz Półrola [Wed, 11 Aug 2010 12:31:07 +0000 (14:31 +0200)]
Added xdxf icon and resource file
Mateusz Półrola [Wed, 11 Aug 2010 12:19:28 +0000 (14:19 +0200)]
Added icon to xdxf plugin and commonDictInterface
Mateusz Półrola [Wed, 11 Aug 2010 11:54:53 +0000 (13:54 +0200)]
Fixed bug with disabling history buttons while searching
Bartosz Szatkowski [Wed, 11 Aug 2010 10:50:08 +0000 (12:50 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Wed, 11 Aug 2010 10:48:46 +0000 (12:48 +0200)]
Added default configuration file installing
Mateusz Półrola [Wed, 11 Aug 2010 10:47:29 +0000 (12:47 +0200)]
Fixed bug in tests
Mateusz Półrola [Wed, 11 Aug 2010 10:34:01 +0000 (12:34 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/tests/mDictionaryTests/mDictionaryTests.pro.user
trunk/tests/mDictionaryTests/tst_Backbone.cpp
Bartosz Szatkowski [Wed, 11 Aug 2010 10:32:22 +0000 (12:32 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Wed, 11 Aug 2010 10:30:31 +0000 (12:30 +0200)]
Added tests for history
Bartosz Szatkowski [Wed, 11 Aug 2010 10:27:03 +0000 (12:27 +0200)]
Backbone test fixed
Mateusz Półrola [Wed, 11 Aug 2010 09:59:51 +0000 (11:59 +0200)]
Added history
Bartosz Szatkowski [Wed, 11 Aug 2010 09:27:13 +0000 (11:27 +0200)]
Added default configuration handling
Mateusz Półrola [Wed, 11 Aug 2010 08:04:30 +0000 (10:04 +0200)]
Added creation of inactive and rotated icons from standard hildon methods. Added blocking menu while backbone is busy.
Mateusz Półrola [Wed, 11 Aug 2010 07:43:28 +0000 (09:43 +0200)]
Added direct search of translation, changed searching for translation of words list to single word
Bartosz Szatkowski [Tue, 10 Aug 2010 13:17:58 +0000 (15:17 +0200)]
Merge branch 'master' into backbone
Bartosz Szatkowski [Tue, 10 Aug 2010 13:16:34 +0000 (15:16 +0200)]
Small refactoring and added test
Mateusz Półrola [Tue, 10 Aug 2010 13:07:38 +0000 (15:07 +0200)]
fixed minor bugs with gui, added secon dictionary file
Mateusz Półrola [Tue, 10 Aug 2010 11:19:56 +0000 (13:19 +0200)]
Moved script to make package
Bartosz Szatkowski [Tue, 10 Aug 2010 10:16:00 +0000 (12:16 +0200)]
Added building scripts
Mateusz Półrola [Tue, 10 Aug 2010 10:15:44 +0000 (12:15 +0200)]
Merge branch 'backbone' of ssh://drop.maemo.org/git/mdictionary into backbone
Mateusz Półrola [Tue, 10 Aug 2010 10:13:58 +0000 (12:13 +0200)]
Merge branch 'master' into backbone
Conflicts:
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/TranslationWidget.cpp
Mateusz Półrola [Tue, 10 Aug 2010 10:12:09 +0000 (12:12 +0200)]
Minor changes in html translation fetching
Mateusz Półrola [Tue, 10 Aug 2010 10:04:03 +0000 (12:04 +0200)]
Merge branch 'backbone' of ssh://drop.maemo.org/git/mdictionary into backbone
Mateusz Półrola [Tue, 10 Aug 2010 10:03:13 +0000 (12:03 +0200)]
Added changes to run search of translation in different thread
Bartosz Szatkowski [Tue, 10 Aug 2010 09:58:00 +0000 (11:58 +0200)]
Added html search result fetching
Mateusz Półrola [Tue, 10 Aug 2010 09:48:58 +0000 (11:48 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/base/backbone/backbone.cpp
Mateusz Półrola [Tue, 10 Aug 2010 09:47:00 +0000 (11:47 +0200)]
Merge branch 'gui'
Bartosz Szatkowski [Tue, 10 Aug 2010 09:45:27 +0000 (11:45 +0200)]
Added tohtml handling in separate thread
Mateusz Półrola [Tue, 10 Aug 2010 09:42:52 +0000 (11:42 +0200)]
Fixed scrolling in translation widget
Bartosz Szatkowski [Tue, 10 Aug 2010 09:19:59 +0000 (11:19 +0200)]
Added saving state after deleted some dictionaries
Bartosz Szatkowski [Tue, 10 Aug 2010 08:34:31 +0000 (10:34 +0200)]
Added saving to configs new dictionaries and active/inactive state
Mateusz Półrola [Tue, 10 Aug 2010 08:02:51 +0000 (10:02 +0200)]
Added ingring national characters in searching
Bartosz Szatkowski [Tue, 10 Aug 2010 07:37:44 +0000 (09:37 +0200)]
Merge branch 'searching' into backbone
Bartosz Szatkowski [Tue, 10 Aug 2010 07:37:22 +0000 (09:37 +0200)]
Added saving/loading settings from/to file
Bartosz Szatkowski [Tue, 10 Aug 2010 07:13:54 +0000 (09:13 +0200)]
Merge branch 'master' into backbone
Mateusz Półrola [Tue, 10 Aug 2010 07:09:29 +0000 (09:09 +0200)]
Merge branch 'gui' into searching
Mateusz Półrola [Tue, 10 Aug 2010 07:05:42 +0000 (09:05 +0200)]
Merge branch 'gui'
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Tue, 10 Aug 2010 07:04:51 +0000 (09:04 +0200)]
Added search from command line
Mateusz Półrola [Tue, 10 Aug 2010 06:36:59 +0000 (08:36 +0200)]
Merge branch 'searching' of ssh://drop.maemo.org/git/mdictionary into searching
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Tue, 10 Aug 2010 06:34:37 +0000 (08:34 +0200)]
Added settings change in dictionary
Bartosz Szatkowski [Tue, 10 Aug 2010 06:23:55 +0000 (08:23 +0200)]
Changed searching to accept list of words (backbone).
Bartosz Szatkowski [Mon, 9 Aug 2010 13:55:47 +0000 (15:55 +0200)]
Added configuration file handling with dynamic loading dicts
Bartosz Szatkowski [Mon, 9 Aug 2010 13:49:07 +0000 (15:49 +0200)]
Merge branch 'master' into backbone
Conflicts:
debian/files
Mateusz Półrola [Mon, 9 Aug 2010 13:41:18 +0000 (15:41 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Mon, 9 Aug 2010 13:40:41 +0000 (15:40 +0200)]
Merge branch 'gui'
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Mon, 9 Aug 2010 13:24:05 +0000 (15:24 +0200)]
Added settings widget in xdxf plugin, added dictionaries management(adding, removing, activating, deactivating)
Bartosz Szatkowski [Mon, 9 Aug 2010 12:23:12 +0000 (14:23 +0200)]
Fixed disappearing translation when using multiple dicts
Bartosz Szatkowski [Mon, 9 Aug 2010 11:21:00 +0000 (13:21 +0200)]
Cleaning and maintaince
Mateusz Półrola [Mon, 9 Aug 2010 11:12:47 +0000 (13:12 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Mon, 9 Aug 2010 11:10:25 +0000 (13:10 +0200)]
Fixed displaying translation of the same keyword from different dictionaries
Bartosz Szatkowski [Mon, 9 Aug 2010 08:46:08 +0000 (10:46 +0200)]
Some backbone refactorization
Bartosz Szatkowski [Mon, 9 Aug 2010 08:14:24 +0000 (10:14 +0200)]
Merge branch 'master' into backbone
Bartosz Szatkowski [Mon, 9 Aug 2010 08:13:04 +0000 (10:13 +0200)]
Merged with master
Mateusz Półrola [Mon, 9 Aug 2010 08:10:02 +0000 (10:10 +0200)]
Added dictionary file
Mateusz Półrola [Mon, 9 Aug 2010 08:07:53 +0000 (10:07 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Mon, 9 Aug 2010 08:07:19 +0000 (10:07 +0200)]
Added dictionaries settings dialog
Bartosz Szatkowski [Mon, 9 Aug 2010 06:39:56 +0000 (08:39 +0200)]
Further xdxf tests fixing
Bartosz Szatkowski [Mon, 9 Aug 2010 06:28:11 +0000 (08:28 +0200)]
Fixed tests for xdxf plugin
Bartosz Szatkowski [Mon, 9 Aug 2010 06:16:36 +0000 (08:16 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into xdxf
Bartosz Szatkowski [Mon, 9 Aug 2010 06:16:26 +0000 (08:16 +0200)]
Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf
Mateusz Półrola [Fri, 6 Aug 2010 13:53:49 +0000 (15:53 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 6 Aug 2010 13:53:17 +0000 (15:53 +0200)]
Added target in mDictionary.pro to rename plugin names