diff --git a/src/currency_core/offers_service_basics.h b/src/currency_core/offers_service_basics.h index 16d2990a..809bf88b 100644 --- a/src/currency_core/offers_service_basics.h +++ b/src/currency_core/offers_service_basics.h @@ -32,6 +32,7 @@ namespace bc_services std::string payment_types; // []money accept type(bank transaction, internet money, cash, etc) std::string deal_option; // []full amount, by parts std::string category; // [] + std::string preview_url; // [] uint8_t expiration_time; // n-days //----------------- @@ -50,6 +51,7 @@ namespace bc_services KV_SERIALIZE_N(deal_option, "do") KV_SERIALIZE_N(category, "cat") KV_SERIALIZE_N(expiration_time, "et") + KV_SERIALIZE_N(preview_url, "url") END_KV_SERIALIZE_MAP() }; diff --git a/src/gui/qt-daemon/application/urleventfilter.cpp b/src/gui/qt-daemon/application/urleventfilter.cpp index d7e4e35e..3fb1b24d 100644 --- a/src/gui/qt-daemon/application/urleventfilter.cpp +++ b/src/gui/qt-daemon/application/urleventfilter.cpp @@ -7,9 +7,10 @@ bool URLEventFilter::eventFilter(QObject *obj, QEvent *event) QFileOpenEvent *fileEvent = static_cast(event); if(!fileEvent->url().isEmpty()) { - QMessageBox msg; - msg.setText(fileEvent->url().toString()); - msg.exec(); + m_pmainwindow->handle_deeplink_click(fileEvent->url()); + //QMessageBox msg; + //msg.setText(fileEvent->url().toString()); + //msg.exec(); } } else { // standard event processing diff --git a/src/gui/qt-daemon/application/urleventfilter.h b/src/gui/qt-daemon/application/urleventfilter.h index 54341dbd..1e3e0dc2 100644 --- a/src/gui/qt-daemon/application/urleventfilter.h +++ b/src/gui/qt-daemon/application/urleventfilter.h @@ -1,12 +1,17 @@ #include #include #include +#include "mainwindow.h" class URLEventFilter : public QObject { Q_OBJECT public: - URLEventFilter() : QObject(){}; + URLEventFilter(MainWindow* pmainwindow) : m_pmainwindow(pmainwindow),QObject() + {}; protected: bool eventFilter(QObject *obj, QEvent *event) override; + +private: + MainWindow* m_pmainwindow; }; \ No newline at end of file diff --git a/src/gui/qt-daemon/main.cpp b/src/gui/qt-daemon/main.cpp index f32dde0f..39ecae9d 100644 --- a/src/gui/qt-daemon/main.cpp +++ b/src/gui/qt-daemon/main.cpp @@ -66,11 +66,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); - -#ifdef Q_OS_DARWIN - URLEventFilter url_event_filter; - app.installEventFilter(&url_event_filter); -#endif MainWindow viewer; if (!viewer.init_backend(argc, argv)) @@ -78,6 +73,11 @@ int main(int argc, char *argv[]) return 1; } +#ifdef Q_OS_DARWIN + URLEventFilter url_event_filter(&viewer); + app.installEventFilter(&url_event_filter); +#endif + app.installNativeEventFilter(&viewer); viewer.setWindowTitle(CURRENCY_NAME_BASE); viewer.show_inital();