コントローラ実装前。

diff --git a/languages/japanese/japanese.cpp b/languages/japanese/japanese.cpp
index 67166c2..3d0a5db 100644 (file)
--- a/languages/japanese/japanese.cpp
+++ b/languages/japanese/japanese.cpp
@@ -31,7 +31,10 @@ void JapanesePlugin::set_settings(Settings const *settings)
 
        char *arg[3] = { system.data(), rc.data(), dic.data() };
        m_mecab_model = MeCab::Model::create(3, arg);
-       if(!m_mecab_model) qFatal(MeCab::getLastError());
+       if(!m_mecab_model)
+       {
+               qFatal(MeCab::getLastError());
+       }
        m_mecab_tagger = m_mecab_model->createTagger();
        m_mecab_lattice = m_mecab_model->createLattice();
 }
@@ -86,6 +89,10 @@ QString JapanesePlugin::normalize(QString string)
        return string;
 }
 
+QString JapanesePlugin::stem(QString word)
+{
+       return word;
+}
 
 
 

diff --git a/languages/japanese/japanese.h b/languages/japanese/japanese.h
index 18f53db..bbc6255 100644 (file)
--- a/languages/japanese/japanese.h
+++ b/languages/japanese/japanese.h
@@ -29,6 +29,7 @@ public:
        Text::pointer divide_into_words(Text::pointer sentence);
 
        QString normalize(QString string);
+       QString stem(QString word);
 
 private:
        Settings const *m_settings;

diff --git a/proxy/main.cpp b/proxy/main.cpp
index a61096e..5170b65 100644 (file)
--- a/proxy/main.cpp
+++ b/proxy/main.cpp
@@ -24,7 +24,7 @@
 
 #include "debug.h"
 
-#define TM_VERSION 2
+#define TM_VERSION 1
 #define TM_DATABASE_VERSION 1
 
 int main(int argc, char *argv[])
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 #endif
 
        bool remove = false;
+       remove = true; // 設定評価法が実装されるまで設定を常に消す。
 
        // 設定ファイルのバージョンと違う場合、必要に応じてファイルや設定を消去する。
        if(settings.value("Main/version", 0) != TM_VERSION)
@@ -61,28 +62,31 @@ int main(int argc, char *argv[])
 
        // Language
 #ifdef QT_DEBUG
-       settings.setValue(
-               "Japanese/mecabdic", "C:\\Users\\Kouichi\\Documents\\OSDN\\wordring-tm\\third-party\\lib\\ipadic");
+       QString mecab = QString(PROXYSRCDIR);
+       mecab += "/../third-party/lib/ipadic";
+       QDir dir(mecab);
+       settings.setValue("Japanese/mecabdic", dir.absolutePath());
 #else
        if(remove) settings.remove("Japanese/mecabdic");
        if(!settings.contains("Japanese/mecabdic"))
        {
-               QString mecabdic = app_path + "/ipadic";
+               QString mecabdic = app_path + "\\ipadic";
                QDir dir(mecabdic);
                mecabdic = dir.absolutePath();
                settings.setValue("Japanese/mecabdic", mecabdic);
        }
+
 #endif
 
        // HttpServer
        if(remove) settings.remove("HttpServer/port");
        if(!settings.contains("HttpServer/port"))
-               settings.setValue("HttpServer/port", 82);
+               settings.setValue("HttpServer/port", 8080);
 
        // SocketServer
        if(remove) settings.remove("SocketServer/port");
        if(!settings.contains("SocketServer/port"))
-               settings.setValue("SocketServer/port", 83);
+               settings.setValue("SocketServer/port", 8081);
 
        // ProxyModule
        if(remove) settings.remove("ProxyModule/prefix");
@@ -129,7 +133,7 @@ int main(int argc, char *argv[])
 
        // メインウィンドウ。
        MainWindow w(&settings, service);
-       w.setFont(QFont("Meiryo", 10.5));
+       w.setFont(QFont("Meiryo"));
 
        service->load_languages(QApplication::applicationDirPath() + "/plugins");
 

diff --git a/proxy/proxy.pro b/proxy/proxy.pro
index bf6edfb..47c57f4 100644 (file)
--- a/proxy/proxy.pro
+++ b/proxy/proxy.pro
@@ -21,7 +21,7 @@ SOURCES += main.cpp\
        tmdatabase.cpp \
        tmcandidatewidget.cpp \
        tmeditorwidget.cpp \
-    tmcandidate.cpp
+       tmcandidate.cpp
 
 HEADERS  += mainwindow.h \
        tmhttp.h \
@@ -32,7 +32,7 @@ HEADERS  += mainwindow.h \
        tmdatabase.h \
        tmcandidatewidget.h \
        tmeditorwidget.h \
-    tmcandidate.h
+       tmcandidate.h
 
 DEFINES += PROXYSRCDIR=\\\"$$PWD\\\"
 #INCLUDEPATH += $$PWD/../language

diff --git a/proxy/tmservice.cpp b/proxy/tmservice.cpp
index 629f7ce..6146cf7 100644 (file)
--- a/proxy/tmservice.cpp
+++ b/proxy/tmservice.cpp
@@ -403,6 +403,7 @@ void TM::Service::load_languages(QString const &path)
        for(QString fname : pdir.entryList(QDir::Files))
        {
                QPluginLoader loader(pdir.absoluteFilePath(fname));
+
                if(Language *language = qobject_cast<Language*>(loader.instance()))
                {
                        int code = language->code();

diff --git a/proxy/tmservice.h b/proxy/tmservice.h
index 21227d0..5b1f31f 100644 (file)
--- a/proxy/tmservice.h
+++ b/proxy/tmservice.h
@@ -121,8 +121,6 @@ public:
 
        void find_candidates(TextSentence::pointer sentence);
 
-private:
-public:
 signals:
        /*!
         * \brief 言語プラグインが読み込まれたときに発火するシグナルです。
@@ -132,6 +130,11 @@ signals:
         */
        void languageLoaded(int code, QString name, QIcon icon);
 
+       //
+       void editModeChanged(bool editable);
+       void sourceLanguageChenged(int scode);
+       void targetLanguageChanged(int tcode);
+
 public slots:
        // データベースから
        void sentence_found(sentence_data_type result, TextSentence::weak_pointer token);

diff --git a/utility/debug.h b/utility/debug.h
index c4eb976..dbd823b 100644 (file)
--- a/utility/debug.h
+++ b/utility/debug.h
@@ -1,6 +1,8 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+#undef QT_NO_DEBUG_OUTPUT
+
 #include <QDebug>
 
 #if defined(WIN32) && defined(_DEBUG)