Merge branch 'master' into google

diff --git a/data/css/images/header-background.png b/data/css/images/header-background.png
new file mode 100644 (file)
index 0000000..6209dc5
Binary files /dev/null and b/data/css/images/header-background.png differ

diff --git a/data/css/images/header-background.xcf b/data/css/images/header-background.xcf
new file mode 100644 (file)
index 0000000..158d845
Binary files /dev/null and b/data/css/images/header-background.xcf differ

diff --git a/data/css/images/header-border.png b/data/css/images/header-border.png
new file mode 100644 (file)
index 0000000..dfb92f2
Binary files /dev/null and b/data/css/images/header-border.png differ

diff --git a/data/css/images/header-border.xcf b/data/css/images/header-border.xcf
new file mode 100644 (file)
index 0000000..5515f28
Binary files /dev/null and b/data/css/images/header-border.xcf differ

diff --git a/data/css/images/key-background.png b/data/css/images/key-background.png
new file mode 100644 (file)
index 0000000..4f32dd2
Binary files /dev/null and b/data/css/images/key-background.png differ

diff --git a/data/css/images/key-background.xcf b/data/css/images/key-background.xcf
new file mode 100644 (file)
index 0000000..7264399
Binary files /dev/null and b/data/css/images/key-background.xcf differ

diff --git a/data/css/images/shadow-grey-bg.png b/data/css/images/shadow-grey-bg.png
new file mode 100644 (file)
index 0000000..062aba7
Binary files /dev/null and b/data/css/images/shadow-grey-bg.png differ

diff --git a/data/css/images/shadow-grey-bg.xcf b/data/css/images/shadow-grey-bg.xcf
new file mode 100644 (file)
index 0000000..2de7518
Binary files /dev/null and b/data/css/images/shadow-grey-bg.xcf differ

diff --git a/data/css/images/shadow-white-bg.png b/data/css/images/shadow-white-bg.png
new file mode 100644 (file)
index 0000000..a2d3b53
Binary files /dev/null and b/data/css/images/shadow-white-bg.png differ

diff --git a/data/css/images/shadow-white-bg.xcf b/data/css/images/shadow-white-bg.xcf
new file mode 100644 (file)
index 0000000..8e8a72c
Binary files /dev/null and b/data/css/images/shadow-white-bg.xcf differ

diff --git a/data/css/images/tab-background.png b/data/css/images/tab-background.png
new file mode 100644 (file)
index 0000000..8a65250
Binary files /dev/null and b/data/css/images/tab-background.png differ

diff --git a/data/css/images/tab-background.xcf b/data/css/images/tab-background.xcf
new file mode 100644 (file)
index 0000000..fc8c10a
Binary files /dev/null and b/data/css/images/tab-background.xcf differ

diff --git a/data/css/style.css b/data/css/style.css
new file mode 100644 (file)
index 0000000..5f03e05
--- /dev/null
+++ b/data/css/style.css
@@ -0,0 +1,81 @@
+body, html, body *, html * {
+       margin                  : 0px;
+       padding                 : 0px;
+       color                   : #eee;
+       font-size               : 10pt;
+       font-family             : Tahoma, Helvetica, Arial, Arial, sans-serif;
+} 
+body {
+       background-color        : black;
+}
+
+div.tab {
+       display                 : block;
+       margin                  : 4px;
+       margin-top              : 8px;
+       padding                 : 2px;
+       padding-bottom          : 0px;
+        background-color       : #333;
+       border-radius           : 5px;
+       border                  : 1px solid #555;
+       background-image        : url("images/tab-background.png");
+       background-repeat       : repeat-y;
+       -webkit-box-reflect     : below 5px -webkit-gradient(linear, 0% 0%, 0% 150%, from(transparent), color-stop(0.3, transparent), to(white));
+}
+
+div.dict {
+       margin                  : 0px 0px 5px 5px;
+       padding                 : 0px;
+       background-color        : transparent;
+
+       border                  : solid transparent;
+       border-width            : 13px 13px 13px 13px;
+       -webkit-border-image    : url("images/shadow-grey-bg.png") 13 13 13 13;
+}
+
+div.info {
+       font-weight             : bold;
+       text-align              : center;
+       padding                 : 3px;
+       background-color        : #444;
+       color                   : #dcbba0;
+
+       border                  : solid transparent;
+       border-width            : 5px 5px 5px 5px;
+       -webkit-border-image    : url("images/header-border.png") 5 5 5 5;
+
+       background-image        : url("images/header-background.png");
+       background-repeat       : repeat-y;
+       background-position     : -3 0;
+}
+
+
+div.key {
+       text-align              : center;
+       color                   : #9c9;
+
+       background-image        : url("images/key-background.png");
+       background-repeat       : no-repeat;
+       background-position     : center;
+
+       border-radius           : 10px 10px 40px 40px;
+       border-width            : 1px 1px 1px 1px;
+       border-style            : solid;
+       border-color            : #1f1f1f;
+
+       margin-top              : 5px;
+}
+
+div.cell {
+       padding                 : 0px 0px 0px 10px;
+}
+
+span.i {
+       font-style              : italic;
+}
+span.b {
+       font-weight             : bold;
+}
+span.u {
+       text-decoration         : underline;
+}

diff --git a/data/gui.qrc b/data/gui.qrc
index 18cf9df..6133b0d 100644 (file)
--- a/data/gui.qrc
+++ b/data/gui.qrc
@@ -8,10 +8,8 @@
         <file>icons/16x16/staron.png</file>
         <file>icons/16x16/staroff.png</file>
         <file>config/mdictionary.config</file>
-        <file>xsl/style.css</file>
         <file>xsl/xsl.xsl</file>
         <file>translations/en_US.qm</file>
         <file>translations/pl_PL.qm</file>
-        <file>xsl/mask.png</file>
     </qresource>
 </RCC>

diff --git a/data/translations/pl_PL.qm b/data/translations/pl_PL.qm
index 3b3a37b..50b8233 100644 (file)
Binary files a/data/translations/pl_PL.qm and b/data/translations/pl_PL.qm differ

diff --git a/data/xsl/mask.png b/data/xsl/mask.png
deleted file mode 100644 (file)
index f3f986a..0000000
Binary files a/data/xsl/mask.png and /dev/null differ

diff --git a/data/xsl/style.css b/data/xsl/style.css
deleted file mode 100644 (file)
index e4289dd..0000000
--- a/data/xsl/style.css
+++ /dev/null
@@ -1,93 +0,0 @@
-body {
-background-color: #000000 
-    
- } 
-
-div.tab {
-       -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0px 3px 10px;
-        background-color: #D6E4FF;
-       border-bottom-left-radius: 8px 8px;
-       border-bottom-right-radius: 8px 8px;
-       border-top-left-radius: 8px 8px;
-       border-top-right-radius: 8px 8px;
-       color: black;
-       font-family: 'Lucida Sans MS', 'Lucida Grande', Helvetica, sans-serif;
-       font-size: 10pt;
-       padding: 10px 10px;
-       padding-left: 5px;
-       padding-right: 5px;
-       -webkit-box-reflect:below 5px -webkit-gradient(linear, 0% 0%, 0% 190%, from(transparent), color-stop(0.3, transparent), to(white));
-}
-
-div.dict {
-       -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0px 3px 10px;
-       background: -webkit-gradient(linear, 50% 0%, 50% 100%, from(#FFFFFA), color-stop(0.3, #FED), color-stop(0.8, #FED), to(#FFFFFA));
-       border-bottom-left-radius: 8px 8px;
-       border-bottom-right-radius: 8px 8px;
-       border-top-left-radius: 8px 8px;
-       border-top-right-radius: 8px 8px;
-       color: black;
-       font-family: 'Lucida Sans MS', 'Lucida Grande', Helvetica, sans-serif;
-       font-size: 10pt;
-       margin-bottom: 10px;
-       padding: 10px 18px;
-       padding-left: 5px;
-       padding-right: 5px;
-}
-
-
-div.info {
-        font-weight            : bold;
-        text-align             : center;
-    
-       background: -webkit-gradient(
-    linear,
-    left top,
-    left bottom,
-    color-stop(0.05, rgb(255,190,245)),
-    color-stop(0.85, rgb(255,49,61)));
-       
-       padding-bottom: 5px;
-       padding-left: 5px;
-       padding-right: 5px;
-       padding-top: 5px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-
-div.key {
-       font-weight             : bold;
-       text-align              : center;
-       background: -webkit-gradient(
-    linear,
-    left top,
-    left bottom,
-    color-stop(0.01, rgb(88,190,245)),
-    color-stop(0.95, rgb(0,49,61)));
-       padding-bottom: 5px;
-       padding-left: 5px;
-       padding-right: 5px;
-       padding-top: 5px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-
-div.cell {
-       background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fffcca), to(#FFFFFA));
-       padding-top: 5px;
-       padding-left: 25px;
-       padding-right: 25px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-span.i {
-        font-style             : italic;
-}
-
-span.b {
-         font-weight           : bold;
-}
-
-span.u {
-            text-decoration    : underline;
-}
-
-
-

diff --git a/debian/changelog b/debian/changelog
index 6880238..56fe512 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mdictionary (2.0.0) stable; urgency=low
-  * initial release
-  * mdictionary 2.0.0 is a qt version of mdictionary
+mdictionary (2.0.0beta) stable; urgency=low
+  * beta release
+  * mdictionary 2.0.0 beta is a qt version of mdictionary
  -- Mateusz Półrola <mateusz.polrola@comarch.pl>  Tue, 07 Sep 2010 12:19:18 +0200

diff --git a/debian/control b/debian/control
index 1a68d86..a3673fc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: mdictionary
 Section: user/education
 Priority: optional
-Maintainer: Jakub Jaszczyński <jakub.jaszczynski@comarch.pl>, Piotr Pilarczyk <piotr.pilarczyk@comarch.pl>, Mateusz Półrola <mateusz.polrola@comarch.pl>, Bartosz Szatkowski <bartosz.szatkowski@comarch.pl>
+Maintainer: Dariusz Wiechecki <dariusz.wiechecki@comarch.pl>
 Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen
 Standards-Version: 3.8.0
 
@@ -12,18 +12,266 @@ Section: user/education
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Multilanguage dictionary
+XB-Maemo-Icon-26:
+ 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
+ n3yfyBHbivPuAAAAAElFTkSuQmCC
 
 Package: mdictionary-google-plugin
 Section: user/education
 Architecture: any
 Depends: mdictionary, libqt4-network (>= 4.6)
 Description: Google plugin for mDictionary
+XB-Maemo-Icon-26:
+ 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
+ QmCC
 
 Package: mdictionary-homescreen-widget
 Section: user/education
 Architecture: any
 Depends: mdictionary, qt4-homescreen-loader
 Description: home screen widget for mDictionary
+XB-Maemo-Icon-26:
+ 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
+ n3yfyBHbivPuAAAAAElFTkSuQmCC
+
 
 Package: mdictionary-dev
 Section: devel

diff --git a/debian/mdictionary.install b/debian/mdictionary.install
index d211746..9dc5e8a 100644 (file)
--- a/debian/mdictionary.install
+++ b/debian/mdictionary.install
@@ -1,10 +1,10 @@
 usr/share/dbus-1/
 usr/share/icons/
 usr/share/mdictionary/staron.png
-usr/share/mdictionary/mask.png
 usr/bin/mdictionary
 usr/lib/mdictionary/plugins/libxdxf.so
 usr/lib/mdictionary/plugins/eng-us.xdxf
 usr/lib/mdictionary/plugins/eng-thai.xdxf
 usr/share/mdictionary/xdxf.png
 usr/share/applications/hildon/mdictionary.desktop
+usr/share/mdictionary/css/

diff --git a/debian/mdictionary.png b/debian/mdictionary.png
old mode 100644 (file)
new mode 100755 (executable)
index 8b83a3b..4a7ff08
Binary files a/debian/mdictionary.png and b/debian/mdictionary.png differ

diff --git a/src/desktopWidget/MainWidget.h b/src/desktopWidget/MainWidget.h
index 3ee4c2b..c3386a7 100644 (file)
--- a/src/desktopWidget/MainWidget.h
+++ b/src/desktopWidget/MainWidget.h
@@ -33,7 +33,7 @@
 //! Implements widget for maemo that allows user to search quickly right from home screen using mdictionary.
 /*!
   Shows tool button with logo of mDictionary which can start application.
-  In line edit user inputs word, and using button next to it or by pressing enter, widget runs mDictionary which immediately starts searching for given word.
+  In line edit user inputs word, and using button next to it or by pressing enter, widget runs mDictionary which immediately starts searching for a given word.
   If mDictionary is already running in background it will show the program.
   */
 class HomeWidget : public QWidget

diff --git a/src/desktopWidget/desktopWidget.pro b/src/desktopWidget/desktopWidget.pro
index 1d792b1..794f143 100644 (file)
--- a/src/desktopWidget/desktopWidget.pro
+++ b/src/desktopWidget/desktopWidget.pro
@@ -18,8 +18,11 @@ HEADERS += \
     MainWidget.h
 
 RESOURCES += \
-    ../../data/gui.qrc
+    ../../data/gui.qrc \
+    desktopWidget.qrc
 
+TRANSLATIONS += pl_PL.ts \
+                en_US.ts
 
 unix {
         target.path = $$INSTALL_PREFIX/lib/hildon-desktop

diff --git a/src/desktopWidget/desktopWidget.qrc b/src/desktopWidget/desktopWidget.qrc
new file mode 100644 (file)
index 0000000..8315db8
--- /dev/null
+++ b/src/desktopWidget/desktopWidget.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/desktopWidget">
+        <file>translations/en_US.qm</file>
+        <file>translations/pl_PL.qm</file>
+    </qresource>
+</RCC>

diff --git a/src/desktopWidget/main.cpp b/src/desktopWidget/main.cpp
index 2f9b15d..cfe07d6 100644 (file)
--- a/src/desktopWidget/main.cpp
+++ b/src/desktopWidget/main.cpp
@@ -35,6 +35,17 @@ int main(int argc, char *argv[]) {
     }
 
     QApplication a(dpy, argc, argv);
+
+    QString locale = QLocale::system().name();
+
+    QTranslator translator;
+
+    if(!translator.load("://desktopWidget/translations/" + locale)) {
+        translator.load("://desktopWidget/translations/en_US");
+    }
+
+    QCoreApplication::installTranslator(&translator);
+
     QApplication::setOrganizationName("Comarch S.A.");
     QApplication::setOrganizationDomain("comarch.com");
     QApplication::setApplicationName("mDictionaryWidget");

diff --git a/src/desktopWidget/translations/en_US.qm b/src/desktopWidget/translations/en_US.qm
new file mode 100644 (file)
index 0000000..be651ee
--- /dev/null
+++ b/src/desktopWidget/translations/en_US.qm
@@ -0,0 +1 @@
+<¸d\18Êï\9c\95Í!\1c¿`¡½Ý
\ No newline at end of file

diff --git a/src/desktopWidget/translations/pl_PL.qm b/src/desktopWidget/translations/pl_PL.qm
new file mode 100644 (file)
index 0000000..07f6827
Binary files /dev/null and b/src/desktopWidget/translations/pl_PL.qm differ

diff --git a/src/include/AccentsNormalizer.h b/src/include/AccentsNormalizer.h
index 9381313..9246901 100644 (file)
--- a/src/include/AccentsNormalizer.h
+++ b/src/include/AccentsNormalizer.h
@@ -37,7 +37,7 @@ class AccentsNormalizer {
     QMap<QChar, QRegExp> letters;
     QRegExp noLetter;
 
-    //! removes accents from letters in searched word (e.g. ą -> a, ł -> l)
+    //! removes accents from letters in a word searched for (e.g. ą -> a, ł -> l)
     QString removeAccents(QString string) {
        string = string.toLower();
        QString normalized = string.normalized(QString::NormalizationForm_KD);

diff --git a/src/include/CommonDictInterface.h b/src/include/CommonDictInterface.h
index a3c9790..b9ed0bb 100644 (file)
--- a/src/include/CommonDictInterface.h
+++ b/src/include/CommonDictInterface.h
@@ -76,13 +76,13 @@ class CommonDictInterface : public QObject, public AccentsNormalizer {
     virtual QString search(QString key) = 0;
 
     //! \returns unique value (unique for every dictionary, not plugin)
-    uint hash() const {
+    virtual uint hash() const {
         return _hash;
     }
 
     //! sets unique value (unique for every dictionary, not plugin)
-    void setHash(uint) {
-        this->_hash=_hash;
+    virtual void setHash(uint h) {
+        this->_hash=h;
     }
 
     //! returns current plugin settings
@@ -101,8 +101,8 @@ class CommonDictInterface : public QObject, public AccentsNormalizer {
 
 
  public Q_SLOTS:
-    /*! performs search in dictionary
-        \param  word word to search in dictionary
+    /*! performs search in a dictionary
+        \param  word word to search for in a dictionary
         \param  limit limit on number of results,
                 if limit=0 all matching words are returned
 
@@ -118,7 +118,7 @@ class CommonDictInterface : public QObject, public AccentsNormalizer {
     virtual void retranslate() {}
 
   Q_SIGNALS:
-    //! emitted after change in dictionary settings
+    //! emitted after change in a dictionary settings
     void settingsChanged();
 
     /*! emitted to backbone when it's needed to inform user about something
@@ -130,14 +130,13 @@ class CommonDictInterface : public QObject, public AccentsNormalizer {
     
 
 protected:
-//! removes accents from letters in searched word (e.g. ą -> a, ł -> l)
+//! removes accents from letters in a word searched for (e.g. ą -> a, ł -> l)
     QString removeAccents(QString string) {
         if(settings()->value("strip_accents") == "true")
             return AccentsNormalizer::removeAccents(string);
         return string;
     }
 
-private:
     uint _hash;
 
 };

diff --git a/src/include/GUIInterface.h b/src/include/GUIInterface.h
index 6f94f06..ceb7796 100644 (file)
--- a/src/include/GUIInterface.h
+++ b/src/include/GUIInterface.h
@@ -61,10 +61,10 @@ public:
     virtual QList<CommonDictInterface*> getPlugins() = 0;
 
     //! Indicates if GUI is in exact search mode.
-    /*! When GUI is in exact search mode it searches for word, and
+    /*! When GUI is in exact search mode it searches for a word, and
         if it finds exactly matching translation it directly displays it, without
         displaying matching word list. This mode should be
-        used for browsing search history and searching words from application
+        used for browsing search history and searching for words from application
         arguments.
         \returns flag indicating if GUI is in exact search mode
     */
@@ -80,11 +80,11 @@ public:
 
 
 public Q_SLOTS:
-    //! Searches in exact mode for given word
+    //! Searches in exact mode for a given word
     /*!
       GUI will be automatically set into exact search mode, and after search or
       break it will be unset from exact search mode.
-      \param word which will be searched in dictionaries
+      \param word which will be searched for in dictionaries
       */
     virtual void searchExact(QString word) = 0;
 
@@ -104,7 +104,7 @@ public Q_SLOTS:
     //! Shows translation of next word in history
     /*!
       It will work only if there is next word available in history.
-      Translation of word is searched with searchExact() function
+      Translation of a word is searched for with searchExact() function
       \sa searchExact()
       */
     virtual void historyNext() = 0;
@@ -112,7 +112,7 @@ public Q_SLOTS:
     //! Shows translation of previous word in history
     /*!
       It will work only if there is previous word available in history.
-      Translation of word is searched with searchExact() function
+      Translation of word is searched for with searchExact() function
       \sa searchExact()
       */
     virtual void historyPrev() = 0;
@@ -137,13 +137,13 @@ Q_SIGNALS:
     //! all ongoing searches
     void quit();
 
-    //! Emitted when user wants to search for list of words matching given word
+    //! Emitted when user wants to search for a list of words matching a given word
     /*! \param word word which will be matched, it can contain wildcards
     */
     void searchWordList(QString word);
 
     //! Emitted when user wants to see translation of words.
-    /*! \param list of translations for given word which will be received
+    /*! \param list of translations for a given word which will be received
         in wordListReady() slot
         \sa wordListReady()
     */
@@ -167,7 +167,7 @@ Q_SIGNALS:
     void showWordList(QHash<QString, QList<Translation*> >);
 
     //! Emitted after receiving translation strings in translationsReady() slot,
-    //! will display translation of given word
+    //! will display translation of a given word
     /*! \param list of translations from different dictionaries
          in dictionaries
      */

diff --git a/src/include/translation.h b/src/include/translation.h
index 7e9ebf7..d6e63c8 100644 (file)
--- a/src/include/translation.h
+++ b/src/include/translation.h
@@ -36,7 +36,7 @@ class CommonDictInterface;
 
 
 /*! Translation is kind of GoF proxy, it stores key:translation pair and
-  provides it in lazy way -> key is available always, but translation is fetched
+  provides it in a lazy way -> key is available always, but translation is fetched
   as late as possible*/
 class Translation {
   public:

diff --git a/src/mdictionary/backbone/Bookmarks.h b/src/mdictionary/backbone/Bookmarks.h
index 472ac2b..fb4ffd2 100644 (file)
--- a/src/mdictionary/backbone/Bookmarks.h
+++ b/src/mdictionary/backbone/Bookmarks.h
@@ -46,7 +46,7 @@
 class BookmarkTranslation;
 
 
-/*! Bookmarks are way to store words that You think You will need to search
+/*! Bookmarks are a way to store words that You think You will need to search
   for often.
 
   When You add bookmark (by clicking on "star" in words list) You add it to
@@ -73,13 +73,13 @@ public:
      */
     QList<Translation*> list();
 
-    /*! Searches in bookmarks for given word (wildcards may apply '*' and '?')
+    /*! Searches in bookmarks for a given word (wildcards may apply '*' and '?')
       \param word to search for
       \return list of matching Translation objects
       */
     QList<Translation*> searchWordList(QString word);
 
-    /*! Searches for final translation of given word
+    /*! Searches for final translation of a given word
       \return word translation list in text format xml or html to be formatted
         and displayed
       \param word word to search for
@@ -91,7 +91,7 @@ public:
     void clear();
 
 
-    /*! \return true if given word is already in bookmarks
+    /*! \return true if a given word is already in bookmarks
       \param word to check
       */
     bool inBookmarks(QString word);

diff --git a/src/mdictionary/backbone/History.cpp b/src/mdictionary/backbone/History.cpp
index 1060d52..154abfa 100644 (file)
--- a/src/mdictionary/backbone/History.cpp
+++ b/src/mdictionary/backbone/History.cpp
@@ -59,7 +59,7 @@ int History::maxSize() {
 
 void History::add(QString word) {
     if(currentElement != -1) {
-        //we search the same word so we don't add it again
+        //we search for the same word so we don't add it again
         if(_history[currentElement] == word)
             return;
     }

diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index 15bab69..62e1e12 100644 (file)
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -81,7 +81,7 @@ void Backbone::init() {
 
    //Install default config files
    ConfigGenerator confGen;
-   confGen.generateCss(_dir + "style.css");
+   ///confGen.generateCss(_dir + "style.css");
    confGen.generateDefaultConfig(_configPath);
 
    loadPrefs(_configPath);
@@ -470,7 +470,7 @@ void Backbone::dictUpdated() {
 
     // For convienence this function is called for each change in dictionaries
     // and each call dumps configuration for all dictionaries into file.
-    // Maybe better way would be to store new/changed configuration but
+    // Maybe a better way would be to store new/changed configuration but
     // parsing settings file and figuring out what was changed, in my opinion,
     // would take more time
     _history->setMaxSize(_historyLen);

diff --git a/src/mdictionary/backbone/backbone.h b/src/mdictionary/backbone/backbone.h
index 89a9da7..c87a2f2 100644 (file)
--- a/src/mdictionary/backbone/backbone.h
+++ b/src/mdictionary/backbone/backbone.h
@@ -60,7 +60,7 @@
   new searches and threads, merging search results from multiple dictionaries.
 
   Each plugin may live in multiple instances - each with its own dictionary,
-  backbone must provide way to create them at start (with specific Settings) and
+  backbone must provide a way to create them at start (with specific Settings) and
   distinguish each ditionary.
 
   Backbone also manages bookmarks and history: providing interface to GUI.
@@ -149,7 +149,7 @@ public Q_SLOTS:
       */
     void search(QString word);
 
-    /*! sets active dictionaries (searches are performed only in active dicts
+    /*! sets active dictionaries (searches are performed only in active dicts)
        \param List of dictionaries to be activated
       */
     void selectedDictionaries(QList<CommonDictInterface* >);
@@ -217,9 +217,9 @@ public Q_SLOTS:
     }
 
 
-   /*! Searching for list of bookmarks may take some time, so I moved it to
+   /*! Searching a list of bookmarks may take some time, so I moved it to
        new thread (to avoid GUI blocking), further it's consistent with ordinary
-       searching for list of words (\see search)
+       searching a list of words (\see search)
        */
    void fetchBookmarks() {
         _result.clear();
@@ -328,7 +328,7 @@ private:
     void addInternalDictionary(CommonDictInterface*, bool);
     void savePrefs(QSettings*);
 
-    CommonDictInterface* plugin(QString type); // searches for plugin of given type
+    CommonDictInterface* plugin(QString type); // searches for plugin of a given type
     QList<CommonDictInterface*> activeDicts();
     bool containsDict(uint hash) const;
     int _dictNum;

diff --git a/src/mdictionary/gui/DBusAdapter.h b/src/mdictionary/gui/DBusAdapter.h
index e9ed118..80337b3 100644 (file)
--- a/src/mdictionary/gui/DBusAdapter.h
+++ b/src/mdictionary/gui/DBusAdapter.h
@@ -40,10 +40,10 @@ public:
     explicit DBusAdapter(MainWindow* w);
 
 public slots:
-    //! Search for given word
+    //! Searches for a given word
     void search(QString word);
 
-    //! Shows application in foreground, can be used to trun on mdictionary
+    //! Shows application in foreground, can be used to turn on mdictionary
     //! by another application
     void showApplication();
 

diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index e94295a..e66482d 100644 (file)
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -545,7 +545,7 @@ void MainWindow::connectMenu() {
 
 void MainWindow::connectBookmarksWidget() {
     #ifdef Q_WS_MAEMO_5
-        //after removing bookmarks we search for them once again to clear word list
+        //after removing bookmarks we search for them once again to clear the words list
         connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
                 this, SLOT(removeBookmarks()));
 
@@ -575,8 +575,11 @@ void MainWindow::removeBookmarks() {
         par = this;
     #endif
     if(QMessageBox::question(par, tr("Delete all bookmarks"),
-             tr("Do you want to delete all bookmarks? (This action cannot be revoked)"),
+             tr("Do you want to delete all bookmarks? (This action cannot be revoked, and will clear current word list)"),
              QMessageBox::Yes, QMessageBox::Cancel) == QMessageBox::Yes) {
         backbone->removeAllBookmarks();
+        ((WordListWidget*)wordListWidget)->clear();
     }
+
+
 }

diff --git a/src/mdictionary/gui/MainWindow.h b/src/mdictionary/gui/MainWindow.h
index b4738b3..f4a0f0b 100644 (file)
--- a/src/mdictionary/gui/MainWindow.h
+++ b/src/mdictionary/gui/MainWindow.h
@@ -46,7 +46,7 @@
   Creates all of GUI subcomponents, and connects all GUI interface signals
   with suitable backbone signals and slots.
   Only this class has direct access to backbone object.
-  It manages all requests of subcomponents e. g. searching of given word,
+  It manages all requests of subcomponents e. g. searching for a given word,
   displaying history, removing dictionary.
   It also provides data from backbone to subcomponents e. g. result of search.
 */
@@ -78,7 +78,7 @@ public:
     QList<CommonDictInterface*> getPlugins();
 
     //! Indicates if GUI is in exact search mode.
-    /*! When GUI is in exact search mode it searches for word, and if it
+    /*! When GUI is in exact search mode it searches for a word, and if it
         finds exactly matching translation it displays matching words list
         and then directly displays translation of first exactly matched word.
         This mode is used for browsing search history and searching words
@@ -105,30 +105,30 @@ public:
 
 
  public Q_SLOTS:
-    //! Searches in exact mode for given word
+    //! Searches in exact mode for a given word
     /*!
       GUI will be automatically set into exact search mode, and after search or
       when user breaks the search it will be unset from exact search mode.
-      \param word which will be searched in dictionaries
+      \param word which will be searched for in dictionaries
       \sa search()
     */
     void searchExact(QString);
 
 
-    //! Searches for given word
+    //! Searches for a given word
     /*!
-      It sets passed word in line edit of search bar and searches for given word.
-      \param word which will be searched in dictionaries
+      It sets passed word in line edit of a search bar and searches for a given word.
+      \param word which will be searched for in dictionaries
       \sa SearchBarWidget
       \sa searchExact()
     */
     void search(QString);
 
-    //! Starts searching for given word after 500 ms delay
+    //! Starts searching for a given word after 500 ms delay
     /*!
       After time's up it sets passed word in line edit of search bar and searches
-      for given word.
-      \param word which will be searched in dictionaries
+      for a given word.
+      \param word which will be searched for in dictionaries
       \sa SearchBarWidget
       \sa searchExact()
       \sa search()
@@ -160,7 +160,7 @@ public:
       Checks if received list is empty, in that case it displays suitable
       information. Otherwise it merges results of the same key word and emits
       signal to display word list.
-      If GUI is in exact search mode it will search for exact word in received
+      If GUI is in exact search mode it will search for an exact word in received
       list and if any of found words match exactly the word passed to
       searchExact() method.
       \sa isInExactSearch()
@@ -195,7 +195,7 @@ public:
     //! Shows translation of next word in history
     /*!
       It will work only if there is next word available in history.
-      Translation of word is searched with searchDelay() function.
+      Translation of word is searched for with searchDelay() function.
       On maemo search is in normal mode, on desktop in exact search mode.
       \sa searchDelay()
       \sa searchExact()
@@ -205,7 +205,7 @@ public:
     //! Shows translation of previous word in history
     /*!
       It will work only if there is available previous word in history.
-      Translation of word is searched with searchDelay() function.
+      Translation of word is searched for with searchDelay() function.
       On maemo search is in normal mode, on desktop in exact search mode.
       \sa searchDelay()
       \sa searchExact()

diff --git a/src/mdictionary/gui/SearchBarWidget.h b/src/mdictionary/gui/SearchBarWidget.h
index 0309bd9..31e8fa7 100644 (file)
--- a/src/mdictionary/gui/SearchBarWidget.h
+++ b/src/mdictionary/gui/SearchBarWidget.h
@@ -45,7 +45,7 @@ public:
     ~SearchBarWidget();
 
 Q_SIGNALS:
-    //! Requests to search for list of words matching word passed as
+    //! Requests to search for a list of words matching word passed as
     //! parameter
     void searchForTranslations(QString);
 
@@ -90,13 +90,13 @@ public Q_SLOTS:
     */
     void setIdle();
 
-    //! Searches for given word
+    //! Searches for a given word
     /*!
       Sets word as text in search word line edit
     */
     void search(QString word);
 
-    //! Starts to search for given word after 500 ms delay
+    //! Starts to search for a given word after 500 ms delay
     /*!
       Sets word as text in search word line edit, and waits 500 ms to start
       search. If in the meantime this slot is called again it will stop previous

diff --git a/src/mdictionary/gui/SettingsWidget.cpp b/src/mdictionary/gui/SettingsWidget.cpp
index 6bd634e..6a66817 100644 (file)
--- a/src/mdictionary/gui/SettingsWidget.cpp
+++ b/src/mdictionary/gui/SettingsWidget.cpp
@@ -68,7 +68,7 @@ void SettingsWidget::initalizeUI() {
     searchResultSizeSpinBox->setSpecialValueText(tr("Unlimited"));
 
     searchResultSizeToolTip = tr("Limits maximum number of found words, affects"
-                                 "only when searching in file.");
+                                 " only when searching in file.");
 
     #ifdef Q_WS_MAEMO_5
         searchResultSizeInfoToolButton = new QToolButton;

diff --git a/src/mdictionary/gui/TranslationWidget.cpp b/src/mdictionary/gui/TranslationWidget.cpp
index 18604d6..404ca2f 100644 (file)
--- a/src/mdictionary/gui/TranslationWidget.cpp
+++ b/src/mdictionary/gui/TranslationWidget.cpp
@@ -88,7 +88,7 @@ void TranslationWidget::show(QStringList translations) {
 
     QString head = "<html><head>";
     head += "<link rel=\"stylesheet\" type=\"text/css\" " ;
-    head += "href=\"" + QDir::homePath() + "/.mdictionary/style.css";
+    head += "href=\"/usr/share/mdictionary/css/" "style.css";
     head += "\" /></head><body ondragstart=\"return false\">";
     trans = head + trans;
 
@@ -96,8 +96,6 @@ void TranslationWidget::show(QStringList translations) {
     trans.replace("$STAR$", "/usr/share/mdictionary/staron.png");
 
     webkit->setHtml(trans, QUrl().fromLocalFile("/"));
-
-
     //webkit->repaint(this->rect());
     //update(this->rect());
 

diff --git a/src/mdictionary/gui/WordListWidget.h b/src/mdictionary/gui/WordListWidget.h
index f06d889..b854730 100644 (file)
--- a/src/mdictionary/gui/WordListWidget.h
+++ b/src/mdictionary/gui/WordListWidget.h
@@ -70,6 +70,9 @@ public Q_SLOTS:
     //! Unlocks words list
     void unlockList();
 
+    //! clears list
+    void clear();
+
 protected:
     //! Reimplemented standard mouseReleaseEvent to check if user clicked on
     //! word or on its star to emit suitable signal
@@ -79,6 +82,8 @@ protected:
     //! side next to scroll bar
     void resizeEvent(QResizeEvent *event);
 
+
+
 private Q_SLOTS:
     //! Emits signal to show translation of clicked item. Signal is emitted
     //! only when word was clicked.
@@ -88,8 +93,7 @@ private Q_SLOTS:
     //! Signal is emitted only when star was clicked.
     void wordChecked(QModelIndex index);
 
-    //! clears list
-    void clear();
+
 
 private:
     //! Adds word to model. Row is row in the model

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 91bb85b..096f288 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -93,10 +93,21 @@ unix {
     shared.files += ../../data/icons/16x16/staron.png
     shared.files += ../../data/xsl/mask.png
 
+    css.path = $$DATA_DIR/css
+    css.files += ../../data/css/style.css
+
+    css_images.path = $$DATA_DIR/css/images
+    css_images.files += ../../data/css/images/header-background.png
+    css_images.files += ../../data/css/images/header-border.png
+    css_images.files += ../../data/css/images/shadow-grey-bg.png
+    css_images.files += ../../data/css/images/shadow-white-bg.png
+    css_images.files += ../../data/css/images/tab-background.png
+    css_images.files += ../../data/css/images/key-background.png
+
        service.path = $$SHARE_DIR/dbus-1/services
        service.files += ../../data/other/com.comarch.mdictionary.service
        
-    INSTALLS += desktop icon64 shared service
+    INSTALLS += desktop icon64 shared service css css_images
 }
 
 

diff --git a/src/plugins/google/GooglePlugin.h b/src/plugins/google/GooglePlugin.h
index a87e7e9..5050c9e 100644 (file)
--- a/src/plugins/google/GooglePlugin.h
+++ b/src/plugins/google/GooglePlugin.h
@@ -109,8 +109,8 @@ public:
     static QMap<QString, QString> languages;
 
 public slots:
-    /*! performs search in dictionary
-      \param  word word to search in dictionary
+    /*! performs search in a dictionary
+      \param  word word to search for in a dictionary
       \param limit limit on number of results
 
       After finishing search it has to emit
@@ -140,8 +140,7 @@ private:
     QString _type;
     //! information about dictionary
     QString _infoNote;
-    //! unique number of a dictionary assigned to it by backbone
-    uint _hash;
+
     //! icon displayed during translations and when the dictionary is chosen
     QIcon _icon;
     Settings *_settings;

diff --git a/src/plugins/google/TranslationGoogle.h b/src/plugins/google/TranslationGoogle.h
index b92189e..92d036c 100644 (file)
--- a/src/plugins/google/TranslationGoogle.h
+++ b/src/plugins/google/TranslationGoogle.h
@@ -57,7 +57,7 @@ public:
         return _bookmark;
    }
 
-    //! returns coresponding dict object
+    //! returns corresponding dict object
     uint dict() const {return _dictHash;}
 
 private:

diff --git a/src/plugins/google/translations/pl_PL.qm b/src/plugins/google/translations/pl_PL.qm
index a546bd7..332fd8c 100644 (file)
Binary files a/src/plugins/google/translations/pl_PL.qm and b/src/plugins/google/translations/pl_PL.qm differ

diff --git a/src/plugins/xdxf/XdxfCachingDialog.cpp b/src/plugins/xdxf/XdxfCachingDialog.cpp
index 7471f15..29a8d18 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.cpp
+++ b/src/plugins/xdxf/XdxfCachingDialog.cpp
@@ -28,7 +28,7 @@
 #include <QDebug>
 
 
-XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
+XdxfCachingDialog::XdxfCachingDialog(QWidget *parent): QDialog(parent) {
     verticalLayout = new QVBoxLayout(this);
     setLayout(verticalLayout);
 
@@ -52,9 +52,9 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
     connect(cancelButton, SIGNAL(clicked()),
             this, SIGNAL(cancelCaching()));
 
-    connect(parent, SIGNAL(updateCachingProgress(int, int)),
-       this, SLOT(updateCachingProgress(int, int)));
     time.start();
+
+    setModal(true);
 }
 
 

diff --git a/src/plugins/xdxf/XdxfCachingDialog.h b/src/plugins/xdxf/XdxfCachingDialog.h
index aacb56d..5632bd9 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.h
+++ b/src/plugins/xdxf/XdxfCachingDialog.h
@@ -41,7 +41,7 @@ class XdxfCachingDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit XdxfCachingDialog(XdxfPlugin *parent = 0);
+    explicit XdxfCachingDialog(QWidget *parent = 0);
 
 public Q_SLOTS:
     void reject();

diff --git a/src/plugins/xdxf/XdxfDialog.cpp b/src/plugins/xdxf/XdxfDialog.cpp
index ef18a4b..90fc21e 100644 (file)
--- a/src/plugins/xdxf/XdxfDialog.cpp
+++ b/src/plugins/xdxf/XdxfDialog.cpp
@@ -33,7 +33,7 @@ XdxfDialog::XdxfDialog(XdxfPlugin *plugin,
 
 
     cacheToolTip = tr("Optimize for quicker searches (may take some time)");
-    accentsToolTip = tr("Strip accents (searching takes more time, but spelling don't have to be exact)");
+    accentsToolTip = tr("Strip accents (searching takes more time, but spelling doesn't have to be exact)");
 
     initializeUI();
 
@@ -169,6 +169,8 @@ void XdxfDialog::initializeUI() {
 
     #ifndef Q_WS_MAEMO_5
         setMinimumSize(400,200);
+    #else
+        setMinimumHeight(350);
     #endif
 
     scrollArea->setLineWidth(0);

diff --git a/src/plugins/xdxf/XdxfDictDialog.cpp b/src/plugins/xdxf/XdxfDictDialog.cpp
index 9baf951..07b7b31 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDialog.cpp
+++ b/src/plugins/xdxf/XdxfDictDialog.cpp
@@ -31,11 +31,18 @@
 XdxfDictDialog::XdxfDictDialog(XdxfPlugin *plugin, QObject *parent) :
     DictDialog(parent) {
     this->plugin = plugin;
+    _lastDialogParent=0;
+}
+
+QWidget* XdxfDictDialog::lastDialogParent() {
+    return _lastDialogParent;
 }
 
 Settings* XdxfDictDialog::addNewDictionary(QWidget *parent) {
     XdxfDialog d(0, XdxfDialog::New, parent);
 
+    _lastDialogParent = parent;
+
     connect(&d, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
@@ -48,6 +55,8 @@ Settings* XdxfDictDialog::addNewDictionary(QWidget *parent) {
 void XdxfDictDialog::changeSettings(QWidget * parent) {
     XdxfDialog d(plugin, XdxfDialog::Change, parent);
 
+    _lastDialogParent = parent;
+
     connect(&d, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 

diff --git a/src/plugins/xdxf/XdxfDictDialog.h b/src/plugins/xdxf/XdxfDictDialog.h
index 5edadbe..fe6e2f4 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDialog.h
+++ b/src/plugins/xdxf/XdxfDictDialog.h
@@ -47,8 +47,11 @@ public:
       */
     void changeSettings(QWidget *parent);
 
+    QWidget* lastDialogParent();
+
 private:
     XdxfPlugin* plugin;
+    QWidget* _lastDialogParent;
 };
 
 #endif // XDXFDICTDIALOG_H

diff --git a/src/plugins/xdxf/translations/pl_PL.qm b/src/plugins/xdxf/translations/pl_PL.qm
index a9dec1f..07a9e30 100644 (file)
Binary files a/src/plugins/xdxf/translations/pl_PL.qm and b/src/plugins/xdxf/translations/pl_PL.qm differ

diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index df0936d..b49efba 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -35,18 +35,12 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
     connect(_dictDialog, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
-    cachingDialog = new XdxfCachingDialog(this);
-
 
     _settings->setValue("type","xdxf");
     _icon = QIcon("/usr/share/mdictionary/xdxf.png");
     _wordsCount = -1;
     stopped = false;
 
-    connect(cachingDialog, SIGNAL(cancelCaching()),
-            this, SLOT(stop()));
-    connect(this, SIGNAL(updateCachingProgress(int,int)),
-            cachingDialog, SLOT(updateCachingProgress(int,int)));
     initAccents();
 }
 
@@ -64,7 +58,6 @@ void XdxfPlugin::retranslate() {
 
 XdxfPlugin::~XdxfPlugin() {
     delete _settings;
-    delete cachingDialog;
     delete _dictDialog;
 }
 
@@ -490,7 +483,17 @@ int XdxfPlugin::countWords() {
 
 
 bool XdxfPlugin::makeCache(QString) {
-    cachingDialog->setVisible(true);
+
+    XdxfCachingDialog d(_dictDialog->lastDialogParent());
+
+    connect(&d, SIGNAL(cancelCaching()),
+            this, SLOT(stop()));
+
+    connect(this, SIGNAL(updateCachingProgress(int,int)),
+            &d, SLOT(updateCachingProgress(int,int)));
+
+    d.show();
+
     QCoreApplication::processEvents();
     QFileInfo dictFileN(_settings->value("path"));
     QString cachePathN;
@@ -550,6 +553,7 @@ bool XdxfPlugin::makeCache(QString) {
 
     /*add all words to db*/
     while (!reader.atEnd() && !stopped) {
+
         QCoreApplication::processEvents();
         reader.readNext();
         if(reader.tokenType() == QXmlStreamReader::StartElement) {
@@ -590,7 +594,7 @@ bool XdxfPlugin::makeCache(QString) {
             cur.exec();
             counter++;
             int prog = counter*100/_wordsCount;
-            if(prog % 5 == 0 && lastProg != prog) {
+            if(prog % 2 == 0 && lastProg != prog) {
                 Q_EMIT updateCachingProgress(prog,timer.restart());
                 lastProg = prog;
             }
@@ -598,7 +602,6 @@ bool XdxfPlugin::makeCache(QString) {
     }
     cur.exec("END;");
     cur.exec("select count(*) from dict");
-    cachingDialog->setVisible(false);
 
     /*checke errors (wrong number of added words)*/
     countWords();
@@ -613,6 +616,13 @@ bool XdxfPlugin::makeCache(QString) {
     _settings->setValue("cache_path", cachePathN);
     _settings->setValue("cached", "true");
 
+
+    disconnect(&d, SIGNAL(cancelCaching()),
+            this, SLOT(stop()));
+
+    disconnect(this, SIGNAL(updateCachingProgress(int,int)),
+            &d, SLOT(updateCachingProgress(int,int)));
+
     db.close();
     return true;
 }

diff --git a/src/plugins/xdxf/xdxfplugin.h b/src/plugins/xdxf/xdxfplugin.h
index d47d43f..bd4b37c 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.h
+++ b/src/plugins/xdxf/xdxfplugin.h
@@ -86,7 +86,7 @@ public:
     //! returns current plugin settings
     Settings* settings();
 
-    //! returns words count in dictionary
+    //! returns words count in a dictionary
     long wordsCount();
 
     //! Sets new settings
@@ -103,8 +103,8 @@ public:
 
 
 public Q_SLOTS:
-    /*! performs search in dictionary
-      \param  word word to search in dictionary
+    /*! performs search in a dictionary
+      \param  word word to search for in a dictionary
       \param limit limit on number of results
 
       After finishing search it has to emit
@@ -175,13 +175,11 @@ private:
 
     QString _dictionaryInfo;
 
-    //! unique number of a dictionary assigned to it by backbone
-    uint _hash;
     //! icon displayed during translations and when the dictionary is chosen
     QIcon _icon;
     QSqlDatabase db;
     QString db_name;
-    //! number of words in dictionary
+    //! number of words in a dictionary
     long _wordsCount;
     //! indicates if search is stopped
     volatile bool stopped;