Jakub Jaszczynski [Thu, 26 Aug 2010 06:47:46 +0000 (08:47 +0200)]
Merge branch 'master' into google
Conflicts:
trunk/src/base/backbone/backbone.cpp
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/base/gui/SearchBarWidget.cpp
Jakub Jaszczynski [Thu, 26 Aug 2010 06:35:37 +0000 (08:35 +0200)]
detect a disconect error in GooglePlugin
Jakub Jaszczynski [Wed, 25 Aug 2010 13:04:28 +0000 (15:04 +0200)]
googlePlugin remove bookmark
Jakub Jaszczynski [Wed, 25 Aug 2010 12:45:55 +0000 (14:45 +0200)]
add googleSettingsDialog
Bartosz Szatkowski [Wed, 25 Aug 2010 10:30:26 +0000 (12:30 +0200)]
Fixed gui: search progress bar, result list
Bartosz Szatkowski [Wed, 25 Aug 2010 08:47:30 +0000 (10:47 +0200)]
Small fixes
Jakub Jaszczynski [Wed, 25 Aug 2010 08:35:48 +0000 (10:35 +0200)]
display code afrer JsonParse
Jakub Jaszczynski [Tue, 24 Aug 2010 13:16:10 +0000 (15:16 +0200)]
Merge branch 'cache' into google
Conflicts:
trunk/src/base/gui/MenuWidget.cpp
Jakub Jaszczynski [Tue, 24 Aug 2010 13:14:47 +0000 (15:14 +0200)]
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
Conflicts:
trunk/src/base/gui/MenuWidget.cpp
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/xsl.xsl
trunk/src/plugins/xdxf/src/xdxfplugin.h
Jakub Jaszczynski [Tue, 24 Aug 2010 13:05:00 +0000 (15:05 +0200)]
change in jsonParse in GooglePlugin
Piotrek [Tue, 24 Aug 2010 13:00:04 +0000 (15:00 +0200)]
added css file
Jakub Jaszczynski [Tue, 24 Aug 2010 12:47:29 +0000 (14:47 +0200)]
add Json parse to Google translator
Jakub Jaszczynski [Tue, 24 Aug 2010 10:18:15 +0000 (12:18 +0200)]
add getTranslationFor function for googlePlugin
Jakub Jaszczynski [Tue, 24 Aug 2010 10:17:13 +0000 (12:17 +0200)]
add draft of googleDictDialog class
Jakub Jaszczynski [Tue, 24 Aug 2010 10:15:18 +0000 (12:15 +0200)]
implement a lot's of function of googlePlugin
Jakub Jaszczynski [Tue, 24 Aug 2010 06:27:44 +0000 (08:27 +0200)]
change CommonDictInterface - add getTranslationFor virtual function
Bartosz Szatkowski [Mon, 23 Aug 2010 14:54:34 +0000 (16:54 +0200)]
Added language : google_abrv dict
Bartosz Szatkowski [Mon, 23 Aug 2010 14:07:15 +0000 (16:07 +0200)]
Fixed "no search result number limit"
Jakub Jaszczynski [Mon, 23 Aug 2010 13:55:23 +0000 (15:55 +0200)]
add draft of google translation
Bartosz Szatkowski [Mon, 23 Aug 2010 13:32:18 +0000 (15:32 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Mon, 23 Aug 2010 13:26:59 +0000 (15:26 +0200)]
remove this in MenuWidget (line 32)
Jakub Jaszczynski [Mon, 23 Aug 2010 13:22:56 +0000 (15:22 +0200)]
Merge branch 'cache'
Conflicts:
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Jakub Jaszczynski [Mon, 23 Aug 2010 13:19:28 +0000 (15:19 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Mon, 23 Aug 2010 13:12:38 +0000 (15:12 +0200)]
Fixed AboutWidget text size
Bartosz Szatkowski [Mon, 23 Aug 2010 12:44:12 +0000 (14:44 +0200)]
Fixed button positioning on line edit
Jakub Jaszczynski [Mon, 23 Aug 2010 12:23:19 +0000 (14:23 +0200)]
add "this" when create Qt obiect.
Bartosz Szatkowski [Mon, 23 Aug 2010 11:58:28 +0000 (13:58 +0200)]
Added saving changes before proceed to new dialog
Bartosz Szatkowski [Mon, 23 Aug 2010 10:50:42 +0000 (12:50 +0200)]
Few small fixes for confirmation system
Jakub Jaszczynski [Mon, 23 Aug 2010 10:36:59 +0000 (12:36 +0200)]
add bookmark icon to translation
Piotrek [Mon, 23 Aug 2010 10:31:16 +0000 (12:31 +0200)]
further code cleanup
Bartosz Szatkowski [Mon, 23 Aug 2010 10:28:38 +0000 (12:28 +0200)]
Ask for confirmation (general setting) only after changing some of the settings
Bartosz Szatkowski [Mon, 23 Aug 2010 10:15:22 +0000 (12:15 +0200)]
Add confirmation dialog when deleting all bookmarks
Jakub Jaszczynski [Mon, 23 Aug 2010 09:44:28 +0000 (11:44 +0200)]
add information about bookmark to translation (in toHtml())
Bartosz Szatkowski [Mon, 23 Aug 2010 09:41:56 +0000 (11:41 +0200)]
Added saving confirmation for dictionary list widget
Bartosz Szatkowski [Mon, 23 Aug 2010 09:25:40 +0000 (11:25 +0200)]
Added save confirm for general settings
Bartosz Szatkowski [Mon, 23 Aug 2010 08:33:09 +0000 (10:33 +0200)]
A bit of documentation and explenations for backbone
Bartosz Szatkowski [Mon, 23 Aug 2010 07:58:59 +0000 (09:58 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Mon, 23 Aug 2010 07:56:40 +0000 (09:56 +0200)]
Added exception and event handling: gui & plugin
Piotrek [Mon, 23 Aug 2010 07:24:58 +0000 (09:24 +0200)]
corrected some linguistic errors, changed emit to Q_EMIT in xdxfplugin.cpp
Mateusz Półrola [Fri, 20 Aug 2010 13:58:11 +0000 (15:58 +0200)]
Commit before weekend
Piotrek [Fri, 20 Aug 2010 12:27:06 +0000 (14:27 +0200)]
Removed #include of header file from MainWindow.cpp
Bartosz Szatkowski [Fri, 20 Aug 2010 12:04:19 +0000 (14:04 +0200)]
Small cleanup
Mateusz Półrola [Fri, 20 Aug 2010 11:15:41 +0000 (13:15 +0200)]
Disabled horizontal scroll bar in about widget
Piotrek [Fri, 20 Aug 2010 11:14:00 +0000 (13:14 +0200)]
Moved reading xsl file from XslConversion() to TranslationWidget constructor
Jakub Jaszczynski [Fri, 20 Aug 2010 10:44:57 +0000 (12:44 +0200)]
Merge branch 'master' into cache
Jakub Jaszczynski [Fri, 20 Aug 2010 10:44:21 +0000 (12:44 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Fri, 20 Aug 2010 10:43:29 +0000 (12:43 +0200)]
change in xdxfPlugin destructor
Mateusz Półrola [Fri, 20 Aug 2010 10:37:16 +0000 (12:37 +0200)]
Disable scroll in text edit
Mateusz Półrola [Fri, 20 Aug 2010 10:20:58 +0000 (12:20 +0200)]
Merge branch 'cache'
Conflicts:
trunk/src/base/gui/TranslationWidget.cpp
Mateusz Półrola [Fri, 20 Aug 2010 10:19:12 +0000 (12:19 +0200)]
Deleting old translations pointers after new search
Jakub Jaszczynski [Fri, 20 Aug 2010 10:18:31 +0000 (12:18 +0200)]
small change
Mateusz Półrola [Fri, 20 Aug 2010 10:13:22 +0000 (12:13 +0200)]
Merge master into gui
Mateusz Półrola [Fri, 20 Aug 2010 10:12:55 +0000 (12:12 +0200)]
Merge branch 'gui'
Mateusz Półrola [Fri, 20 Aug 2010 10:12:09 +0000 (12:12 +0200)]
Added smaller star icons for desktop
Mateusz Półrola [Fri, 20 Aug 2010 10:07:31 +0000 (12:07 +0200)]
normal sizes of buttons in meego/desktop gui
Bartosz Szatkowski [Fri, 20 Aug 2010 10:07:10 +0000 (12:07 +0200)]
Merge branch 'backbone'
Conflicts:
trunk/src/base/base.pro
Bartosz Szatkowski [Fri, 20 Aug 2010 10:03:53 +0000 (12:03 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
trunk/src/base/base.pro
Bartosz Szatkowski [Fri, 20 Aug 2010 10:02:00 +0000 (12:02 +0200)]
Fixed doubling ready() signal when searching for word list
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
projects / mdictionary / log