Changeset 262

Timestamp:

07/13/09 20:46:26 (3 years ago)

Author:

antonbatenev.ya.ru

Message:

Начало работы над проверкой орфографии

Location:

trunk

Files:

• dev/avalon.mysql.000.sql (modified) (1 diff)
• dev/build.sh (modified) (2 diffs)
• form_message.cpp (modified) (4 diffs)
• form_message.h (modified) (2 diffs)
• sysheaders.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/dev/avalon.mysql.000.sql

@@ -43 +43 @@
 (
         'version',
-        'v1.0rc1, patch avalon.000.sql'
+        'v1.0rc2, patch avalon.000.sql'
 );
 

trunk/dev/build.sh

@@ -55 +55 @@
         fi
 
-        ${QT_PATH}/bin/qmake -project -recursive -Wall -o ${PROJECT_NAME}.pro "QT += network sql webkit" "CONFIG += debug"
+        ${QT_PATH}/bin/qmake -project -recursive -Wall -o ${PROJECT_NAME}.pro "QT += network sql webkit" "CONFIG += debug" "LIBS += -laspell"
 
         touch "debug.out"
@@ -66 +66 @@
         fi
 
-        ${QT_PATH}/bin/qmake -project -recursive -Wall -o ${PROJECT_NAME}.pro "QT += network sql webkit"
+        ${QT_PATH}/bin/qmake -project -recursive -Wall -o ${PROJECT_NAME}.pro "QT += network sql webkit" "LIBS += -laspell"
 
         touch "release.out"

trunk/form_message.cpp

@@ -14 +14 @@
 FormMessage::FormMessage (QWidget* parent, bool is_reply, const AMessageInfoGUI& info, int edit_id) :  FormMessageUI (parent)
 {
+        #ifdef AVALON_USE_ASPELL
+
+        m_aspell_speller_en = NULL;
+        m_aspell_speller_ru = NULL;
+
+        m_aspell_config_en = new_aspell_config();
+        m_aspell_config_ru = NULL;
+
+        if (m_aspell_config_en != NULL)
+        {
+                //
+                // спеллер английского языка
+                //
+
+                bool fail = false;
+
+                if (aspell_config_replace(m_aspell_config_en, "lang", "en_US") == FALSE)
+                {
+                        QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_config_error_message(m_aspell_config_en)));
+                        fail = true;
+                }
+
+                if (fail == false && aspell_config_replace(m_aspell_config_en, "encoding", "utf-8") == FALSE)
+                {
+                        QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_config_error_message(m_aspell_config_en)));
+                        fail = true;
+                }
+
+                if (fail == false)
+                {
+                        AspellCanHaveError* possible_err = new_aspell_speller(m_aspell_config_en);
+
+                        if (aspell_error_number(possible_err) != 0)
+                        {
+                                QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_error_message(possible_err)));
+                                fail = true;
+                        }
+                        else
+                                m_aspell_speller_en = to_aspell_speller(possible_err);
+                }
+
+                //
+                // Спеллер русского языка
+                //
+
+                if (fail == false)
+                {
+                        m_aspell_config_ru = aspell_config_clone(m_aspell_config_en);
+
+                        if (m_aspell_config_ru != NULL)
+                        {
+                                if (aspell_config_replace(m_aspell_config_ru, "lang", "ru_RU") == FALSE)
+                                {
+                                        QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_config_error_message(m_aspell_config_ru)));
+                                        fail = true;
+                                }
+
+                                if (fail == false && aspell_config_replace(m_aspell_config_ru, "encoding", "utf-8") == FALSE)
+                                {
+                                        QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_config_error_message(m_aspell_config_ru)));
+                                        fail = true;
+                                }
+
+                                if (fail == false)
+                                {
+                                        AspellCanHaveError* possible_err = new_aspell_speller(m_aspell_config_ru);
+
+                                        if (aspell_error_number(possible_err) != 0)
+                                        {
+                                                QMessageBox::critical(parent, QString::fromUtf8("Ошибка!"), QString("Aspell error: ") + QString(aspell_error_message(possible_err)));
+                                                fail = true;
+                                        }
+                                        else
+                                                m_aspell_speller_ru = to_aspell_speller(possible_err);
+                                }
+
+                        }   // if (m_aspell_config_ru != NULL)
+
+                }   // if (fail == false)
+
+        }   // if (m_aspell_config_en != NULL)
+
+        #endif   // #ifdef AVALON_USE_ASPELL
+
         if (edit_id != 0)
                 is_reply = false;
@@ -147 +231 @@
         connect(m_text_subject, SIGNAL(textChanged(const QString&)), this, SLOT(text_subject_text_changed(const QString&)));
         connect(m_tab_message,  SIGNAL(currentChanged(int)),         this, SLOT(tab_changed(int)));
+
+        #ifdef AVALON_USE_ASPELL
+
+        m_aspell_timer = NULL;
+
+        if (m_aspell_speller_en != NULL && m_aspell_speller_ru != NULL)
+        {
+                m_aspell_timer = new QTimer(this);
+                m_aspell_timer->setInterval(1000);
+                m_aspell_timer->setSingleShot(true);
+
+                connect(m_aspell_timer, SIGNAL(timeout()),     this, SLOT(aspell_timer_on_timer()));
+                connect(m_text_source,  SIGNAL(textChanged()), this, SLOT(text_source_text_changed()));
+        }
+
+        #endif
 }
 //----------------------------------------------------------------------------------------------
@@ -152 +252 @@
 FormMessage::~FormMessage ()
 {
+        #ifdef AVALON_USE_ASPELL
+        delete_aspell_speller(m_aspell_speller_en);
+        delete_aspell_speller(m_aspell_speller_ru);
+        delete_aspell_config(m_aspell_config_en);
+        delete_aspell_config(m_aspell_config_ru);
+        #endif
 }
 //----------------------------------------------------------------------------------------------
@@ -307 +413 @@
 }
 //----------------------------------------------------------------------------------------------
+
+#ifdef AVALON_USE_ASPELL
+void FormMessage::text_source_text_changed ()
+{
+        if (m_aspell_timer != NULL)
+        {
+                m_aspell_timer->stop();
+                m_aspell_timer->start();
+        }
+}
+#endif
+//----------------------------------------------------------------------------------------------
+
+#ifdef AVALON_USE_ASPELL
+void FormMessage::aspell_timer_on_timer ()
+{
+/*
+        QString text = m_text_source->toPlainText();
+
+        QRegExp word_regexp("(\\c+|(\\c+\\-\\c+))");
+
+        int pos = 0;
+
+        while ((pos = word_regexp.indexIn(text, pos)) != -1)
+        {
+                int len = word_regexp.matchedLength();
+                QString word = text.mid(pos, len);
+                pos += len;
+
+                DEBUG_MSG(word);
+        }
+*/
+
+/*
+        QString text = m_text_source->toPlainText();
+        QString word = "";
+
+        for (int i = 0; i < text.length(); i++)
+        {
+                QChar ch = text[i];
+
+                if (ch == ' ' || ch == '\n')
+                {
+                        if (word.length() > 0)
+                        {
+                                QByteArray data = word.toUtf8();
+
+                                int correct = aspell_speller_check(m_aspell_speller, data.data(), data.length());
+
+                                if (correct == -1)
+                                {
+                                        unsigned int err_num = aspell_speller_error_number(m_aspell_speller);
+                                        const char*  err_msg = aspell_speller_error_message(m_aspell_speller);
+
+                                        QString error = QString("Aspell error: [") + QString::number(err_num) + "] " + QString(err_msg);
+
+                                        QMessageBox::critical(this, QString::fromUtf8("Ошибка!"), error);
+                                }
+                                else
+                                {
+                                        QString result;
+                                        if (correct == 1)
+                                                result = word + " - OK";
+                                        else
+                                                result = word + " - Error";
+                                        DEBUG_MSG(result);
+                                        //QTextCursor cursor =
+                                }
+
+                                word = "";
+                        }
+                }
+                else
+                        word = word + ch;
+        }
+
+        QTextCharFormat char_format = m_text_source->currentCharFormat();
+        char_format.setUnderlineStyle(QTextCharFormat::SpellCheckUnderline);
+        char_format.setUnderlineColor(Qt::red);
+        m_text_source->setCurrentCharFormat(char_format);
+*/
+}
+#endif
+//----------------------------------------------------------------------------------------------

trunk/form_message.h

@@ -67 +67 @@
                 int m_edit_id;
 
+                #ifdef AVALON_USE_ASPELL
+
+                AspellConfig*  m_aspell_config_en;  /*!< \brief Конфиг aspell для проверки английского  */
+                AspellConfig*  m_aspell_config_ru;  /*!< \brief Конфиг aspell для проверки русского     */
+
+                AspellSpeller* m_aspell_speller_en; /*!< \brief Спеллер aspell для проверки английского */
+                AspellSpeller* m_aspell_speller_ru; /*!< \brief Спеллер aspell для проверки русского    */
+
+                QTimer*        m_aspell_timer;      /*!< \brief Таймер для проверки (чтобы не грузить)  */
+
+                #endif
+
                 /*!
                  * \brief Событие закрытия формы (см. Qt::QDialog).
@@ -100 +112 @@
                 void text_subject_text_changed (const QString& text);
 
+                #ifdef AVALON_USE_ASPELL
+                /*!
+                 * \brief Смена текста
+                 */
+                void text_source_text_changed ();
+
+                /*!
+                 * \brief Таймер проверки
+                 */
+                void aspell_timer_on_timer ();
+                #endif
+
                 /*!
                  * \brief Событие клика по линку

trunk/sysheaders.h

@@ -80 +80 @@
 // возможность сжатия тел сообщений
 #define AVALON_USE_ZLIB
-
 #ifdef AVALON_USE_ZLIB
         #include <zlib.h>
 #endif
 
+// проверка орфографии
+#define AVALON_USE_ASPELL
+#ifdef AVALON_USE_ASPELL
+        #include <aspell.h>
+#endif
+
 /*!
  * \brief Получение строки версии (см. version.cpp)
- * \return Строка версии вида "avalon 1.0b rev NNN"
+ * \return Строка версии вида "avalon 1.0rc2 rev NNN"
  */
 QString getVersionString ();

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Пнд Июл 13 16:37:12 MSD 2009"
+#define AVALON_DATE "Пнд Июл 13 20:44:51 MSD 2009"
 
 #endif