From 9b8fd9143d3fcfe5b842c3e21752b7732edd10c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mateusz=20P=C3=B3=C5=82rola?= Date: Thu, 5 Aug 2010 14:33:11 +0200 Subject: [PATCH] Added XdxfDictDialog to XdxfPlugin --- trunk/src/base/gui/MainWindow.cpp | 5 ++++- trunk/src/base/gui/TranslationWidget.cpp | 4 +++- .../plugins/xdxf/src/XdxfPlugin/XdxfDictDialog.cpp | 4 ++++ .../plugins/xdxf/src/XdxfPlugin/XdxfLoadDialog.cpp | 2 +- .../src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp | 3 ++- trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h | 2 ++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp index 6c2d121..53a2eb6 100644 --- a/trunk/src/base/gui/MainWindow.cpp +++ b/trunk/src/base/gui/MainWindow.cpp @@ -31,7 +31,10 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent): this->backbone = backbone; ui->setupUi(this); - setAttribute(Qt::WA_Maemo5StackedWindow); + + #ifdef Q_WS_MAEMO_5 + setAttribute(Qt::WA_Maemo5StackedWindow); + #endif searchBarWidget = new SearchBarWidget(backbone); wordListWidget = new WordListWidget(backbone); diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp index a14b821..f4dcf51 100644 --- a/trunk/src/base/gui/TranslationWidget.cpp +++ b/trunk/src/base/gui/TranslationWidget.cpp @@ -29,7 +29,9 @@ TranslationWidget::TranslationWidget(Backbone *backbone, QWidget *parent): this->backbone = backbone; - setAttribute(Qt::WA_Maemo5StackedWindow); + #ifdef Q_WS_MAEMO_5 + setAttribute(Qt::WA_Maemo5StackedWindow); + #endif setWindowFlags(windowFlags() | Qt::Window); initializeUI(); diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfDictDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfDictDialog.cpp index 14f875c..0e672ce 100644 --- a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfDictDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfDictDialog.cpp @@ -33,3 +33,7 @@ XdxfDictDialog::XdxfDictDialog(QObject *parent) : Settings* XdxfDictDialog::addNewDictionary(QWidget *parent) { return XdxfLoadDialog::getSettings(parent); } + +void XdxfDictDialog::changeSettings(QWidget *) { + +} diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfLoadDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfLoadDialog.cpp index 1db0e05..937c2db 100644 --- a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfLoadDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfLoadDialog.cpp @@ -84,7 +84,7 @@ Settings* XdxfLoadDialog::getSettings(QWidget *parent) { XdxfLoadDialog loadDialog(parent); Settings* settings = new Settings; - if(loadDialog.exec()==0) { + if(loadDialog.exec()==QDialog::Accepted) { settings->setValue("dictionaryFile", dicitonaryFilePath); if(generateCache) { settings->setValue("cache", "1"); diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp index 78a3b19..34d6d22 100644 --- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp @@ -12,6 +12,7 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent), path="dict.xdxf"; stopped = false; _settings = new Settings(); + _dictDialog = new XdxfDictDialog(this); } QString XdxfPlugin::langFrom() const { @@ -116,7 +117,7 @@ void XdxfPlugin::stop() { } DictDialog* XdxfPlugin::dictDialog() { - return NULL; + return _dictDialog; } diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h index bb37196..148c430 100644 --- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h +++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h @@ -6,6 +6,7 @@ #include #include #include +#include "XdxfDictDialog.h" class TranslationXdxf; @@ -81,6 +82,7 @@ private: uint _hash; bool stopped; /*volatile*/ Settings *_settings; + XdxfDictDialog* _dictDialog; }; #endif // XDXFPLUGIN_H -- 1.7.9.5