Jakub Jaszczynski [Fri, 20 Aug 2010 09:48:20 +0000 (11:48 +0200)]
Merge branch 'gui' into cache
Conflicts:
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
Mateusz Półrola [Fri, 20 Aug 2010 09:46:54 +0000 (11:46 +0200)]
Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui
Mateusz Półrola [Fri, 20 Aug 2010 09:45:57 +0000 (11:45 +0200)]
Moved icons from resources to data/ fixed bug with segmentation fault when starting application
Bartosz Szatkowski [Fri, 20 Aug 2010 09:43:00 +0000 (11:43 +0200)]
Stuffed another memory leak
Jakub Jaszczynski [Fri, 20 Aug 2010 09:40:59 +0000 (11:40 +0200)]
xdxf code refactoring
Bartosz Szatkowski [Fri, 20 Aug 2010 09:37:59 +0000 (11:37 +0200)]
Fixed some of memory leaks and sigsev and bugs
Mainly fixed sigsev after fetching translation after removing
coresponding dictionary
Jakub Jaszczynski [Fri, 20 Aug 2010 08:30:20 +0000 (10:30 +0200)]
changed the format of translation display
Mateusz Półrola [Thu, 19 Aug 2010 13:21:56 +0000 (15:21 +0200)]
Merge branch 'cache' into gui
Mateusz Półrola [Thu, 19 Aug 2010 13:20:22 +0000 (15:20 +0200)]
Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui
Mateusz Półrola [Thu, 19 Aug 2010 13:19:58 +0000 (15:19 +0200)]
Change of tool button
Bartosz Szatkowski [Thu, 19 Aug 2010 13:19:49 +0000 (15:19 +0200)]
Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui
Bartosz Szatkowski [Thu, 19 Aug 2010 13:19:26 +0000 (15:19 +0200)]
Fixed about window
Jakub Jaszczynski [Thu, 19 Aug 2010 12:42:29 +0000 (14:42 +0200)]
fix xslt conversion (show all translation)
Jakub Jaszczynski [Thu, 19 Aug 2010 11:31:15 +0000 (13:31 +0200)]
small change in xsl file
Mateusz Półrola [Thu, 19 Aug 2010 11:16:03 +0000 (13:16 +0200)]
Fixed merge bug in translation widget
Mateusz Półrola [Thu, 19 Aug 2010 11:04:58 +0000 (13:04 +0200)]
Merge branch 'gui'
Jakub Jaszczynski [Thu, 19 Aug 2010 10:51:54 +0000 (12:51 +0200)]
Merge branch 'master' into cache
Conflicts:
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/gui/TranslationWidget.h
Bartosz Szatkowski [Thu, 19 Aug 2010 10:46:16 +0000 (12:46 +0200)]
Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui
Conflicts:
trunk/src/base/base.pro
Jakub Jaszczynski [Thu, 19 Aug 2010 10:44:10 +0000 (12:44 +0200)]
fixed characters coding problem
Mateusz Półrola [Thu, 19 Aug 2010 10:38:23 +0000 (12:38 +0200)]
Added forgotten source files
Mateusz Półrola [Thu, 19 Aug 2010 10:25:47 +0000 (12:25 +0200)]
Merge branch 'gui'
Bartosz Szatkowski [Thu, 19 Aug 2010 10:11:31 +0000 (12:11 +0200)]
Added about dialog scaling
Mateusz Półrola [Thu, 19 Aug 2010 10:05:48 +0000 (12:05 +0200)]
Added on screen button in maemo and hardware zoom buttons
Bartosz Szatkowski [Thu, 19 Aug 2010 09:54:04 +0000 (11:54 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Thu, 19 Aug 2010 09:53:27 +0000 (11:53 +0200)]
Added notification iterface
Jakub Jaszczynski [Thu, 19 Aug 2010 08:53:24 +0000 (10:53 +0200)]
add test for searchCache and searchWordListCache
Jakub Jaszczynski [Thu, 19 Aug 2010 07:06:10 +0000 (09:06 +0200)]
Merge branch 'master' into cache
Conflicts:
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Thu, 19 Aug 2010 07:02:16 +0000 (09:02 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Thu, 19 Aug 2010 07:01:09 +0000 (09:01 +0200)]
Updated comments
Jakub Jaszczynski [Thu, 19 Aug 2010 06:48:18 +0000 (08:48 +0200)]
add xslt transformation
Bartosz Szatkowski [Wed, 18 Aug 2010 14:46:37 +0000 (16:46 +0200)]
Added documentation
Mateusz Półrola [Wed, 18 Aug 2010 13:37:07 +0000 (15:37 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Wed, 18 Aug 2010 13:16:41 +0000 (15:16 +0200)]
Merge branch 'bookmarks'
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Wed, 18 Aug 2010 13:13:55 +0000 (15:13 +0200)]
Added standard menu for bookmarks in meego gui
Bartosz Szatkowski [Wed, 18 Aug 2010 12:56:13 +0000 (14:56 +0200)]
Changed about dialog image size policy
Bartosz Szatkowski [Wed, 18 Aug 2010 12:51:32 +0000 (14:51 +0200)]
Added link to gnu licenses size
Bartosz Szatkowski [Wed, 18 Aug 2010 12:37:21 +0000 (14:37 +0200)]
Fixed welcome screen layout
Bartosz Szatkowski [Wed, 18 Aug 2010 11:53:36 +0000 (13:53 +0200)]
Fixed internationalization in about
Bartosz Szatkowski [Wed, 18 Aug 2010 11:49:57 +0000 (13:49 +0200)]
Working (opens browser) link to mDictionary site added
Bartosz Szatkowski [Wed, 18 Aug 2010 11:36:27 +0000 (13:36 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Conflicts:
trunk/src/base/gui/AboutWidget.cpp
Bartosz Szatkowski [Wed, 18 Aug 2010 11:30:00 +0000 (13:30 +0200)]
Link to mdictionary www added
Mateusz Półrola [Wed, 18 Aug 2010 11:19:43 +0000 (13:19 +0200)]
Fixed closing menu, added bookmarks operations in different thread
Mateusz Półrola [Wed, 18 Aug 2010 10:45:31 +0000 (12:45 +0200)]
Added welcome screen widget
Mateusz Półrola [Wed, 18 Aug 2010 10:31:56 +0000 (12:31 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Bartosz Szatkowski [Wed, 18 Aug 2010 10:31:25 +0000 (12:31 +0200)]
Added forgotten files
Mateusz Półrola [Wed, 18 Aug 2010 10:24:21 +0000 (12:24 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Conflicts:
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/MainWindow.h
Mateusz Półrola [Wed, 18 Aug 2010 10:18:30 +0000 (12:18 +0200)]
Added welcome screen
Bartosz Szatkowski [Wed, 18 Aug 2010 10:18:27 +0000 (12:18 +0200)]
Added "about" dialog
Jakub Jaszczynski [Wed, 18 Aug 2010 09:57:13 +0000 (11:57 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Piotrek [Wed, 18 Aug 2010 09:46:16 +0000 (11:46 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Conflicts:
trunk/src/plugins/xdxf/tests/test.cpp
Jakub Jaszczynski [Wed, 18 Aug 2010 09:45:34 +0000 (11:45 +0200)]
Merge branch 'master' into cache
Piotrek [Wed, 18 Aug 2010 09:41:59 +0000 (11:41 +0200)]
Fixed multiple database connections problem
Jakub Jaszczynski [Wed, 18 Aug 2010 09:41:20 +0000 (11:41 +0200)]
add change from searchFile to searchCache in XdxfPlugin
Jakub Jaszczynski [Wed, 18 Aug 2010 09:34:12 +0000 (11:34 +0200)]
read color atribute in xdxfPlugin
Bartosz Szatkowski [Wed, 18 Aug 2010 08:38:56 +0000 (10:38 +0200)]
Small refactoring within bookmarks
Bartosz Szatkowski [Wed, 18 Aug 2010 08:09:07 +0000 (10:09 +0200)]
Changed interface and backend for searching and removing bookmarks
Bartosz Szatkowski [Wed, 18 Aug 2010 07:44:18 +0000 (09:44 +0200)]
Merged and fixed backbone settings
Bartosz Szatkowski [Wed, 18 Aug 2010 07:23:21 +0000 (09:23 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Bartosz Szatkowski [Wed, 18 Aug 2010 07:22:01 +0000 (09:22 +0200)]
Added settings handling for backbone
search_limit, history_size, search_bookmarks, search_dictionaries
Mateusz Półrola [Wed, 18 Aug 2010 07:09:19 +0000 (09:09 +0200)]
Added settings widget
Bartosz Szatkowski [Wed, 18 Aug 2010 06:20:08 +0000 (08:20 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Bartosz Szatkowski [Wed, 18 Aug 2010 06:16:38 +0000 (08:16 +0200)]
Merge branch 'cache'
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Tue, 17 Aug 2010 12:56:40 +0000 (14:56 +0200)]
Fixed removing from bookmarks database
Jakub Jaszczynski [Tue, 17 Aug 2010 12:35:43 +0000 (14:35 +0200)]
improve a search function in xdxfPlugin
Mateusz Półrola [Tue, 17 Aug 2010 12:30:35 +0000 (14:30 +0200)]
Merge branch 'gui' into bookmarks
Mateusz Półrola [Tue, 17 Aug 2010 12:28:02 +0000 (14:28 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Bartosz Szatkowski [Tue, 17 Aug 2010 11:22:49 +0000 (13:22 +0200)]
Added isBookmark() to translation and other changes to inform gui about
bookmarked translation
Mateusz Półrola [Tue, 17 Aug 2010 11:21:44 +0000 (13:21 +0200)]
Changed word list widget to use qtreeview
Bartosz Szatkowski [Tue, 17 Aug 2010 10:58:23 +0000 (12:58 +0200)]
Fixed sigsev after searching in bookmarks
Jakub Jaszczynski [Tue, 17 Aug 2010 10:25:57 +0000 (12:25 +0200)]
fix a bug in xdxfplugin (in makeCache)
Jakub Jaszczynski [Tue, 17 Aug 2010 10:09:56 +0000 (12:09 +0200)]
fix a bug in xdxfPlugin
Bartosz Szatkowski [Tue, 17 Aug 2010 08:09:37 +0000 (10:09 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Bartosz Szatkowski [Tue, 17 Aug 2010 08:09:15 +0000 (10:09 +0200)]
Searching in bookmarks
Mateusz Półrola [Tue, 17 Aug 2010 07:57:26 +0000 (09:57 +0200)]
Merge branch 'cache' into gui
Mateusz Półrola [Tue, 17 Aug 2010 07:50:04 +0000 (09:50 +0200)]
Stars connected to add and remove bookmark signals
Mateusz Półrola [Tue, 17 Aug 2010 07:22:48 +0000 (09:22 +0200)]
Merge branch 'bookmarks' into gui
Conflicts:
trunk/src/base/base.pro
trunk/src/base/gui/WordListItem.cpp
trunk/src/base/gui/WordListProxyStyle.h
trunk/src/base/gui/WordListWidget.cpp
trunk/src/base/gui/WordListWidget.h
Mateusz Półrola [Tue, 17 Aug 2010 07:18:38 +0000 (09:18 +0200)]
Added QWidgetList with proxy style to display stars as checkboxes
Mateusz Półrola [Mon, 16 Aug 2010 13:46:40 +0000 (15:46 +0200)]
Connected button in word list to add bookmark signal
Mateusz Półrola [Mon, 16 Aug 2010 13:34:15 +0000 (15:34 +0200)]
Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
Conflicts:
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Mon, 16 Aug 2010 13:24:47 +0000 (15:24 +0200)]
Merge branch 'gui' into bookmarks
Conflicts:
trunk/src/base/base.pro
Mateusz Półrola [Mon, 16 Aug 2010 13:23:28 +0000 (15:23 +0200)]
Added custom word list
Bartosz Szatkowski [Mon, 16 Aug 2010 13:14:05 +0000 (15:14 +0200)]
Bookamarks adding, removing, searching (basic), listing -> ready
Piotrek [Mon, 16 Aug 2010 12:34:27 +0000 (14:34 +0200)]
Added some tests for xdxf plugin
Mateusz Półrola [Mon, 16 Aug 2010 11:54:35 +0000 (13:54 +0200)]
Merge branch 'gui'
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Mateusz Półrola [Mon, 16 Aug 2010 11:48:05 +0000 (13:48 +0200)]
Added Desktop/MeeGo GUI
Bartosz Szatkowski [Mon, 16 Aug 2010 10:37:24 +0000 (12:37 +0200)]
Merged with stashed state
Bartosz Szatkowski [Mon, 16 Aug 2010 10:36:25 +0000 (12:36 +0200)]
Added BookmarkTranslation
Translation implementation for searching in bookmarks
Bartosz Szatkowski [Mon, 16 Aug 2010 10:30:04 +0000 (12:30 +0200)]
Added HistoryTranslation class
Translation specyfic implementation for bookmarks
Bartosz Szatkowski [Mon, 16 Aug 2010 10:29:14 +0000 (12:29 +0200)]
Merge branch 'cache' into bookmarks
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Bartosz Szatkowski [Mon, 16 Aug 2010 10:20:18 +0000 (12:20 +0200)]
Merge branch 'master' into bookmarks
Bartosz Szatkowski [Mon, 16 Aug 2010 10:19:45 +0000 (12:19 +0200)]
Merge branch 'master' into bookmarks
Piotrek [Mon, 16 Aug 2010 09:47:51 +0000 (11:47 +0200)]
XdxfPlugin::searchWordList() update: '_' and '%' wildcarts
Jakub Jaszczynski [Mon, 16 Aug 2010 09:06:41 +0000 (11:06 +0200)]
add "*" to end of word when this word have't wildcard
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
Mateusz Półrola [Mon, 16 Aug 2010 08:02:37 +0000 (10:02 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Mateusz Półrola [Mon, 16 Aug 2010 08:01:59 +0000 (10:01 +0200)]
Add missing xdxf caching dialog source files
Jakub Jaszczynski [Mon, 16 Aug 2010 07:49:30 +0000 (09:49 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Jakub Jaszczynski [Mon, 16 Aug 2010 07:48:24 +0000 (09:48 +0200)]
add wildcard ("?") in xdxf_plugin
Mateusz Półrola [Mon, 16 Aug 2010 07:24:49 +0000 (09:24 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache