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
Bartosz Szatkowski [Tue, 10 Aug 2010 10:16:00 +0000 (12:16 +0200)]
Added building scripts
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
Bartosz Szatkowski [Fri, 6 Aug 2010 13:52:02 +0000 (15:52 +0200)]
Fixed test handling for backbone
Bartosz Szatkowski [Fri, 6 Aug 2010 13:39:39 +0000 (15:39 +0200)]
Documentation added
Mateusz Półrola [Fri, 6 Aug 2010 13:39:38 +0000 (15:39 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 6 Aug 2010 13:38:58 +0000 (15:38 +0200)]
Fixed translation widget refreshing
Bartosz Szatkowski [Fri, 6 Aug 2010 13:19:01 +0000 (15:19 +0200)]
Added one consistent building and testing system
Jakub Jaszczynski [Fri, 6 Aug 2010 13:17:57 +0000 (15:17 +0200)]
add test: getNew() in xdxf plugin, and add some comments
Jakub Jaszczynski [Fri, 6 Aug 2010 12:50:54 +0000 (14:50 +0200)]
add dictcionary file for test
Jakub Jaszczynski [Fri, 6 Aug 2010 12:13:05 +0000 (14:13 +0200)]
Merge branch 'master' into xdxf
Jakub Jaszczynski [Fri, 6 Aug 2010 12:09:48 +0000 (14:09 +0200)]
added calls to yieldCurrentThread() in XdxtPlugin::search()
Jakub Jaszczynski [Fri, 6 Aug 2010 12:03:25 +0000 (14:03 +0200)]
in CommonDictionaryInterface in searchWordList added default limit value
Mateusz Półrola [Fri, 6 Aug 2010 08:42:12 +0000 (10:42 +0200)]
Changed .desktop file
Bartosz Szatkowski [Fri, 6 Aug 2010 08:38:06 +0000 (10:38 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Fri, 6 Aug 2010 08:37:21 +0000 (10:37 +0200)]
Changed path to plugins folder
Bartosz Szatkowski [Fri, 6 Aug 2010 08:35:20 +0000 (10:35 +0200)]
Added tests and some maintenance
Jakub Jaszczynski [Fri, 6 Aug 2010 08:13:29 +0000 (10:13 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 6 Aug 2010 08:05:16 +0000 (10:05 +0200)]
Fixed icon problem in meaemo main menu
Jakub Jaszczynski [Fri, 6 Aug 2010 08:02:25 +0000 (10:02 +0200)]
in XdxfPlugin in function searchWordList add unlimited number of words
Bartosz Szatkowski [Fri, 6 Aug 2010 07:48:51 +0000 (09:48 +0200)]
Added Backbone::removeDicitionary and tests for it
Bartosz Szatkowski [Fri, 6 Aug 2010 07:35:12 +0000 (09:35 +0200)]
Small unifying changes in plugin Settings
Bartosz Szatkowski [Fri, 6 Aug 2010 07:34:06 +0000 (09:34 +0200)]
Small fixes in plugin loader engine
Bartosz Szatkowski [Fri, 6 Aug 2010 07:20:49 +0000 (09:20 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Fri, 6 Aug 2010 07:19:50 +0000 (09:19 +0200)]
Added scanning catalogs for plugins
Mateusz Półrola [Fri, 6 Aug 2010 07:18:03 +0000 (09:18 +0200)]
Merge branch 'gui'
Mateusz Półrola [Fri, 6 Aug 2010 07:16:59 +0000 (09:16 +0200)]
Added new scripts for building app, plugins and packages
Jakub Jaszczynski [Fri, 6 Aug 2010 06:47:26 +0000 (08:47 +0200)]
repair the bug in XdxfPlugin::getNew
Jakub Jaszczynski [Fri, 6 Aug 2010 06:37:32 +0000 (08:37 +0200)]
Merge branch 'xdxf'
Conflicts:
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Jakub Jaszczynski [Fri, 6 Aug 2010 06:30:04 +0000 (08:30 +0200)]
Now it doesn't print the same keys more than once
Mateusz Półrola [Thu, 5 Aug 2010 13:37:35 +0000 (15:37 +0200)]
Moved files from old XdxfPlugin directory
Mateusz Półrola [Thu, 5 Aug 2010 13:27:29 +0000 (15:27 +0200)]
Merge branch 'master' into gui
Conflicts:
trunk/src/plugins/xdxf/src/XdxfPlugin.pro
Mateusz Półrola [Thu, 5 Aug 2010 13:22:48 +0000 (15:22 +0200)]
Added comments to XdxfLoadDialog
Bartosz Szatkowski [Thu, 5 Aug 2010 13:19:20 +0000 (15:19 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Thu, 5 Aug 2010 13:18:31 +0000 (15:18 +0200)]
Added script for making plugins
Bartosz Szatkowski [Thu, 5 Aug 2010 13:18:04 +0000 (15:18 +0200)]
Changed plugin tree schema
Mateusz Półrola [Thu, 5 Aug 2010 13:07:01 +0000 (15:07 +0200)]
Fixed bug in XdxfLoadDialog class
Mateusz Półrola [Thu, 5 Aug 2010 12:43:46 +0000 (14:43 +0200)]
Merge branch 'xdxf' into gui
Conflicts:
trunk/src/includes/settings.h
Mateusz Półrola [Thu, 5 Aug 2010 12:37:38 +0000 (14:37 +0200)]
Added ifdef to maemo5 specific code parts
Mateusz Półrola [Thu, 5 Aug 2010 12:34:57 +0000 (14:34 +0200)]
Merge branch 'master' into gui
Mateusz Półrola [Thu, 5 Aug 2010 12:33:11 +0000 (14:33 +0200)]
Added XdxfDictDialog to XdxfPlugin
Bartosz Szatkowski [Thu, 5 Aug 2010 11:52:32 +0000 (13:52 +0200)]
Added multi-dictionary handling
Commit has two part (sadly couldnt divide it to few separate)
* Changed dictionaries->translation handling to QFuture and timer events
(earlier it was based on signals)
* Added possibility of handling multiple dictionaries/plugins at one time
Jakub Jaszczynski [Thu, 5 Aug 2010 11:44:27 +0000 (13:44 +0200)]
Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf
Jakub Jaszczynski [Thu, 5 Aug 2010 11:43:02 +0000 (13:43 +0200)]
"convert list<Translation*> to set<Translation*> in XdxfPlugin"
Jakub Jaszczynski [Thu, 5 Aug 2010 11:33:27 +0000 (13:33 +0200)]
add simple xdxfPlugin::getNew
Mateusz Półrola [Thu, 5 Aug 2010 11:33:15 +0000 (13:33 +0200)]
Added DictDialog interface, XdxfDictDialog class and XdxfLoadDialog class,
modified CommonDictInterface
Jakub Jaszczynski [Thu, 5 Aug 2010 11:19:58 +0000 (13:19 +0200)]
add operator == to Translation
Mateusz Półrola [Thu, 5 Aug 2010 11:04:09 +0000 (13:04 +0200)]
Merge branch 'xdxf', remote branch 'origin'
Mateusz Półrola [Thu, 5 Aug 2010 11:02:41 +0000 (13:02 +0200)]
Changed Setting interface to concret class
Mateusz Półrola [Thu, 5 Aug 2010 10:18:47 +0000 (12:18 +0200)]
Added .gitignore
Mateusz Półrola [Thu, 5 Aug 2010 10:15:39 +0000 (12:15 +0200)]
Merge branch 'xdxf'
Conflicts:
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
Piotrek [Thu, 5 Aug 2010 10:11:08 +0000 (12:11 +0200)]
Removed cyclic dependencies
Mateusz Półrola [Thu, 5 Aug 2010 10:03:31 +0000 (12:03 +0200)]
Merge branch 'master' into gui
Mateusz Półrola [Thu, 5 Aug 2010 10:01:45 +0000 (12:01 +0200)]
Added context menu to TranslationWidget
Jakub Jaszczynski [Thu, 5 Aug 2010 10:01:28 +0000 (12:01 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
Jakub Jaszczynski [Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)]
Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf
Jakub Jaszczynski [Thu, 5 Aug 2010 09:56:39 +0000 (11:56 +0200)]
minor changes in plugin
Piotrek [Thu, 5 Aug 2010 09:54:04 +0000 (11:54 +0200)]
Removed two signals
Jakub Jaszczynski [Thu, 5 Aug 2010 09:43:23 +0000 (11:43 +0200)]
add setHash function to interface
projects / mdictionary / log