Merge branch 'master' into google

[mdictionary] / trunk / src / base / gui / MainWindow.h

diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h
index 2a5ae66..e65769b 100644 (file)
--- a/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@ -43,9 +43,9 @@
 
 //! Implements interface for GUI
 /*!
-  Create all of GUI subcomponents, and connects all GUI interface signals with
+  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 request of subcomponents e. g. searching of
+  backbone object. It manages all requests of subcomponents e. g. searching of
   given word, displaying history, removing dictionary.
   It also provide data from backbone to subcomponents e. g. result of search.
 */
@@ -56,7 +56,7 @@ class MainWindow : public GUIInterface
 public:
     //! Constructor
     /*!
-      \param backbone object which will doing all searches and returns data
+      \param backbone object which will be doing all searches and returning data
       \param parent parent widget of this window
       */
 
@@ -78,19 +78,19 @@ public:
     QList<CommonDictInterface*> getPlugins();
 
     //! Indicates if GUI is in exact search mode.
-    /*! When GUI is in exact search mode it search for word, and
-        if find exacly matching translation it directly displays it, whithout
+    /*! When GUI is in exact search mode it searches for word, and
+        if it finds exactly matching translation it directly displays it, without
         displaying matching word list. This mode is used for browsing search
-        history and search words from application arguments.
+        history and searching words from application arguments.
         \returns flag indicating if GUI is in exact search mode
     */
     bool exactSearch();
 
     //! Sets GUI exact search mode.
-    /*! When GUI is in exact search mode it search for word, and
-        if find exacly matching translation it directly displays it, whithout
+    /*! When GUI is in exact search mode it searches for word, and
+        if it finds exactly matching translation it directly displays it, without
         displaying matching word list. This mode is used for browsing search
-        history and search words from application arguments.
+        history and searching words from application arguments.
         \param exactSearch flag indicating if GUI will be in exact search mode
         \sa exactSearch()
     */
@@ -99,7 +99,7 @@ public:
 
     //! Returns current settings.
     /*!
-       \returns Settings object containing curren application settings
+       \returns Settings object containing current application settings
       */
     Settings* settings();
 
@@ -112,9 +112,9 @@ public:
 
 
  public Q_SLOTS:
-    //! Search in exact mode for given word
+    //! Searches in exact mode for given word
     /*!
-      GUI will be automaticaly set into exact search mode, and after search or
+      GUI will be automatically set into exact search mode, and after search or
       break will be unset from exact search mode.
       \param word which will be searched in dictionaries
       */
@@ -134,20 +134,20 @@ public:
       Checks if received list is empty, in that case displays suitable
       information. If GUI is in exact search mode it will search for exact
       word in received list, and if word is found it will emit signal to
-      display it's translation. Otherwise it will display list of matching
+      display its translation. Otherwise it will display list of matching
       words and show suitable information.
       \sa exactSearch()
       \sa showTranslation()
      */
     void wordListReady();
 
-    //! Gets translation strings from backbone and emit signal to display them
+    //! Gets translation strings from backbone and emits signal to display them
     void translationsReady();
 
     //! Adds to history key words from given translations
     /*!
-      By default this slot is connected to signal searchTranslations, and
-      passed translation list contains only translation with the same key, so
+      By default this slot is connected to searchTranslations signal, and
+      passed translation list contains only translations with the same key, so
       only one word is added to history.
       \param list of translations with key words
       \sa searchTranslations()
@@ -187,7 +187,7 @@ private Q_SLOTS:
     //! Enables menu
     void enableMenu();
 
-    //! When user break searching it make sure that exact search mode will be
+    //! When user breaks searching it makes sure that exact search mode will be
     //! disabled
     void breakSearching();
 
@@ -196,7 +196,7 @@ private Q_SLOTS:
 
 
 protected:
-    /*! When user wants to close application, we first sends signal to stop all
+    /*! When user wants to close application, we first send signal to stop all
         ongoing searches.
     */
     void closeEvent(QCloseEvent *);