Mateusz Półrola [Wed, 8 Sep 2010 12:36:26 +0000 (14:36 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
data/xsl/style.css
Piotrek [Wed, 8 Sep 2010 12:32:56 +0000 (14:32 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Wed, 8 Sep 2010 12:30:42 +0000 (14:30 +0200)]
Search line gets focus afer start
Mateusz Półrola [Wed, 8 Sep 2010 07:34:32 +0000 (09:34 +0200)]
Add sorting of dictionary list
Mateusz Półrola [Wed, 8 Sep 2010 06:56:22 +0000 (08:56 +0200)]
In settings widget on maemo add info button next to spin boxes
Mateusz Półrola [Tue, 7 Sep 2010 13:28:09 +0000 (15:28 +0200)]
Add outline to xdxf plugin icon, now it is visible on black background
Mateusz Półrola [Tue, 7 Sep 2010 13:08:49 +0000 (15:08 +0200)]
Removed scroll area frame boarder on desktop
Mateusz Półrola [Tue, 7 Sep 2010 12:35:34 +0000 (14:35 +0200)]
Fixed xdxf caching dialog to not allow reject only cancel
Piotrek [Tue, 7 Sep 2010 11:53:32 +0000 (13:53 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
data/xsl/style.css
data/xsl/xsl.xsl
src/mdictionary/gui/DictManagerWidget.cpp
src/plugins/xdxf/XdxfLoadDialog.cpp
src/plugins/xdxf/XdxfLoadDialog.h
src/plugins/xdxf/XdxfSettingsDialog.cpp
Piotrek [Tue, 7 Sep 2010 11:27:11 +0000 (13:27 +0200)]
changes in xsl and css, 0 instead of NULL in code
Mateusz Półrola [Tue, 7 Sep 2010 10:14:11 +0000 (12:14 +0200)]
Fixed translations
Mateusz Półrola [Tue, 7 Sep 2010 09:31:46 +0000 (11:31 +0200)]
some changes in translations
Mateusz Półrola [Tue, 7 Sep 2010 08:21:03 +0000 (10:21 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Tue, 7 Sep 2010 08:15:13 +0000 (10:15 +0200)]
remove dictionaryInfo() from translation interface
Mateusz Półrola [Tue, 7 Sep 2010 08:14:19 +0000 (10:14 +0200)]
Modified google plugin dialog
Mateusz Półrola [Tue, 7 Sep 2010 06:37:59 +0000 (08:37 +0200)]
Merge branch 'gui'
Mateusz Półrola [Tue, 7 Sep 2010 06:37:51 +0000 (08:37 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Tue, 7 Sep 2010 06:37:17 +0000 (08:37 +0200)]
Some changes in look of xdxf dialog on desktop
Jakub Jaszczynski [Tue, 7 Sep 2010 06:29:30 +0000 (08:29 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Tue, 7 Sep 2010 06:28:54 +0000 (08:28 +0200)]
refaktoring
Mateusz Półrola [Tue, 7 Sep 2010 06:09:51 +0000 (08:09 +0200)]
Fixed notification manager, to display properly notifications from pluins
Mateusz Półrola [Mon, 6 Sep 2010 13:55:06 +0000 (15:55 +0200)]
New xdxf dialog, one which provides methods to add new or change setting of existing one dictionary
Fixed norifications of dialogs
Dariusz Wiechecki [Mon, 6 Sep 2010 12:21:58 +0000 (14:21 +0200)]
* adding GPL licence in the main directory
Mateusz Półrola [Mon, 6 Sep 2010 09:33:19 +0000 (11:33 +0200)]
Some changes in xdxf dialogs
Mateusz Półrola [Mon, 6 Sep 2010 06:12:45 +0000 (08:12 +0200)]
added doc files
Mateusz Półrola [Fri, 3 Sep 2010 13:28:55 +0000 (15:28 +0200)]
Added plugins icon to package
Mateusz Półrola [Fri, 3 Sep 2010 12:59:31 +0000 (14:59 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Fri, 3 Sep 2010 12:58:04 +0000 (14:58 +0200)]
Merge branch 'google'
Jakub Jaszczynski [Fri, 3 Sep 2010 12:57:20 +0000 (14:57 +0200)]
add test
Mateusz Półrola [Fri, 3 Sep 2010 12:49:10 +0000 (14:49 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Piotrek [Fri, 3 Sep 2010 12:46:00 +0000 (14:46 +0200)]
Added translation files
Mateusz Półrola [Fri, 3 Sep 2010 12:42:58 +0000 (14:42 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 3 Sep 2010 12:40:41 +0000 (14:40 +0200)]
Little change in search bar icons
Piotrek [Fri, 3 Sep 2010 12:39:59 +0000 (14:39 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Piotrek [Fri, 3 Sep 2010 12:39:27 +0000 (14:39 +0200)]
Separate translations for each plugin
Jakub Jaszczynski [Fri, 3 Sep 2010 11:50:24 +0000 (13:50 +0200)]
Merge branch 'master' into google
Conflicts:
src/plugins/google/google.pro
Jakub Jaszczynski [Fri, 3 Sep 2010 11:48:52 +0000 (13:48 +0200)]
plugins icon in translation
Mateusz Półrola [Fri, 3 Sep 2010 11:21:21 +0000 (13:21 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 3 Sep 2010 11:20:53 +0000 (13:20 +0200)]
Added doc and dev package
Mateusz Półrola [Fri, 3 Sep 2010 10:19:53 +0000 (12:19 +0200)]
Fixed packages generation
Jakub Jaszczynski [Fri, 3 Sep 2010 08:09:05 +0000 (10:09 +0200)]
xdxf wrong file format
Mateusz Półrola [Fri, 3 Sep 2010 07:53:55 +0000 (09:53 +0200)]
Added check target to qmake
Jakub Jaszczynski [Fri, 3 Sep 2010 06:29:17 +0000 (08:29 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Fri, 3 Sep 2010 06:28:50 +0000 (08:28 +0200)]
check xdxf file
Mateusz Półrola [Fri, 3 Sep 2010 06:23:17 +0000 (08:23 +0200)]
Changed include folder name
Mateusz Półrola [Fri, 3 Sep 2010 05:46:14 +0000 (07:46 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Fri, 3 Sep 2010 05:45:47 +0000 (07:45 +0200)]
Some changes in tests
Jakub Jaszczynski [Thu, 2 Sep 2010 14:05:25 +0000 (16:05 +0200)]
fix small error
Jakub Jaszczynski [Thu, 2 Sep 2010 13:58:16 +0000 (15:58 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Thu, 2 Sep 2010 13:55:57 +0000 (15:55 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Thu, 2 Sep 2010 13:55:37 +0000 (15:55 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
src/plugins/xdxf/xdxfplugin.h
Bartosz Szatkowski [Thu, 2 Sep 2010 13:54:57 +0000 (15:54 +0200)]
Fixed #6344 - enabling/disabling accents sstripping settings dialog
Jakub Jaszczynski [Thu, 2 Sep 2010 13:35:38 +0000 (15:35 +0200)]
fix bug xdxf wrong format
Piotrek [Thu, 2 Sep 2010 13:22:05 +0000 (15:22 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
src/common/CommonDictInterface.h
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/DictManagerWidget.h
src/mdictionary/gui/SettingsWidget.cpp
src/mdictionary/gui/WelcomeScreenWidget.h
src/plugins/xdxf/xdxfplugin.h
Bartosz Szatkowski [Thu, 2 Sep 2010 13:05:44 +0000 (15:05 +0200)]
Small configuration changes
Jakub Jaszczynski [Thu, 2 Sep 2010 12:51:38 +0000 (14:51 +0200)]
change in test
Piotrek [Thu, 2 Sep 2010 12:22:13 +0000 (14:22 +0200)]
Updated translation, corrected remaining spelling errors
Mateusz Półrola [Thu, 2 Sep 2010 12:18:31 +0000 (14:18 +0200)]
Merge branch 'master' into qmake
Conflicts:
mdictionary.pro
src/mdictionary/gui/WordListWidget.cpp
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/src.pro
Mateusz Półrola [Thu, 2 Sep 2010 12:15:49 +0000 (14:15 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Jakub Jaszczynski [Thu, 2 Sep 2010 12:10:20 +0000 (14:10 +0200)]
fix merge with master
Mateusz Półrola [Thu, 2 Sep 2010 12:07:18 +0000 (14:07 +0200)]
Changed repo structure
Jakub Jaszczynski [Thu, 2 Sep 2010 11:53:18 +0000 (13:53 +0200)]
Merge branch 'master' into google
Conflicts:
trunk/src/plugins/google/src/GooglePlugin.cpp
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
Jakub Jaszczynski [Thu, 2 Sep 2010 11:49:57 +0000 (13:49 +0200)]
smal change
Bartosz Szatkowski [Thu, 2 Sep 2010 11:46:51 +0000 (13:46 +0200)]
Fixed some leaks and minor bookmark bug
Jakub Jaszczynski [Thu, 2 Sep 2010 10:47:54 +0000 (12:47 +0200)]
fix db worning in xdxf plugin
Jakub Jaszczynski [Thu, 2 Sep 2010 09:28:24 +0000 (11:28 +0200)]
fig delete settings
Mateusz Półrola [Thu, 2 Sep 2010 08:54:07 +0000 (10:54 +0200)]
Deleting notifies after user close it
Bartosz Szatkowski [Thu, 2 Sep 2010 08:38:34 +0000 (10:38 +0200)]
Fixed some of the memmory leaks
Mateusz Półrola [Thu, 2 Sep 2010 07:30:12 +0000 (09:30 +0200)]
Rest of refactorization
Mateusz Półrola [Thu, 2 Sep 2010 07:05:51 +0000 (09:05 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Thu, 2 Sep 2010 07:05:15 +0000 (09:05 +0200)]
Partialy refactorized, fixed some bugs
Jakub Jaszczynski [Wed, 1 Sep 2010 13:49:30 +0000 (15:49 +0200)]
Merge branch 'master' into google
Piotrek [Wed, 1 Sep 2010 13:42:28 +0000 (15:42 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Piotrek [Wed, 1 Sep 2010 13:41:39 +0000 (15:41 +0200)]
Translation of title screen added
Mateusz Półrola [Wed, 1 Sep 2010 13:24:55 +0000 (15:24 +0200)]
Fixed saving on desktop
Mateusz Półrola [Wed, 1 Sep 2010 13:18:00 +0000 (15:18 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Piotrek [Wed, 1 Sep 2010 13:15:32 +0000 (15:15 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Wed, 1 Sep 2010 13:15:07 +0000 (15:15 +0200)]
Fixed comments
Piotrek [Wed, 1 Sep 2010 13:13:29 +0000 (15:13 +0200)]
Fixed resources
Bartosz Szatkowski [Wed, 1 Sep 2010 13:12:47 +0000 (15:12 +0200)]
Fixed #6342: Asking if user want to save change when in dict list widget
Piotrek [Wed, 1 Sep 2010 13:04:28 +0000 (15:04 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Conflicts:
data/icons/gui.qrc
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
Piotrek [Wed, 1 Sep 2010 12:57:55 +0000 (14:57 +0200)]
Polish translation complete
Jakub Jaszczynski [Wed, 1 Sep 2010 12:34:08 +0000 (14:34 +0200)]
refactoring code
Bartosz Szatkowski [Wed, 1 Sep 2010 12:09:41 +0000 (14:09 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Bartosz Szatkowski [Wed, 1 Sep 2010 12:05:47 +0000 (14:05 +0200)]
Fixed bookmarks database creation
Mateusz Półrola [Wed, 1 Sep 2010 12:01:15 +0000 (14:01 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Wed, 1 Sep 2010 12:00:14 +0000 (14:00 +0200)]
Added notify manager, which prevent from showing the same notify multiple times
Bartosz Szatkowski [Wed, 1 Sep 2010 10:37:56 +0000 (12:37 +0200)]
Fixed minor bug with creating configuration dir
Bartosz Szatkowski [Wed, 1 Sep 2010 09:49:46 +0000 (11:49 +0200)]
~/.mdictionary is created when its dosent exists
Jakub Jaszczynski [Wed, 1 Sep 2010 09:32:49 +0000 (11:32 +0200)]
refactoring xdxfPlugin
Bartosz Szatkowski [Wed, 1 Sep 2010 09:20:34 +0000 (11:20 +0200)]
Backbone's part of #6330 infinite search when no search backend selected
Bartosz Szatkowski [Wed, 1 Sep 2010 09:00:16 +0000 (11:00 +0200)]
Fixed #6336: Lighting stars on word list even when bookmark search is off
Jakub Jaszczynski [Wed, 1 Sep 2010 08:49:56 +0000 (10:49 +0200)]
add check exist xdxf file
Jakub Jaszczynski [Wed, 1 Sep 2010 08:39:17 +0000 (10:39 +0200)]
fix bug - delete cache file,
- cache name is same as dict file name
- manual remov cache file
Bartosz Szatkowski [Wed, 1 Sep 2010 08:13:00 +0000 (10:13 +0200)]
Fixed #6283 - Smeared dialog
When we put file name on label, long enough to fall partialy in blind
spot all window become smeared, now I move button to line belowe so its
more space for label
Bartosz Szatkowski [Wed, 1 Sep 2010 07:23:54 +0000 (09:23 +0200)]
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
Mateusz Półrola [Wed, 1 Sep 2010 07:15:58 +0000 (09:15 +0200)]
Fixed sizes of screen widget, after clicking on logo program will start, added return handling in line edit, if program is in background after search from widget it will show self
Bartosz Szatkowski [Wed, 1 Sep 2010 07:08:51 +0000 (09:08 +0200)]
Fixed some platform specific issues
Bartosz Szatkowski [Tue, 31 Aug 2010 12:49:34 +0000 (14:49 +0200)]
Merge branch 'master' into webkit
Conflicts:
trunk/src/base/base.pro
Bartosz Szatkowski [Tue, 31 Aug 2010 12:46:52 +0000 (14:46 +0200)]
Added preserving zoom level
projects / mdictionary / log