From d7be307005c9bda20d27027a5ed7f72ade268757 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 12 Oct 2011 16:48:13 +0300 Subject: [PATCH 1/3] SANKORE-305 add required object initialize to constructor --- src/adaptors/publishing/UBDocumentPublisher.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index 97d1645e..f04ff140 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -56,6 +56,7 @@ UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *pa , bLoginCookieSet(false) { //NOOP + init(); } @@ -555,8 +556,8 @@ void UBDocumentPublisher::init() mDocInfos.title = ""; mDocInfos.description = ""; - mpNetworkMgr = new QNetworkAccessManager(this); mpCookieJar = new QNetworkCookieJar(); + mpNetworkMgr = new QNetworkAccessManager(this); connect(mpNetworkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*))); } From 39211e361fe984d0fa9a3b8395576f3166db9969 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 12 Oct 2011 16:49:00 +0300 Subject: [PATCH 2/3] SANKORE-320 automatically remove all invalid characters from application name, and show correspond popup messagebox when user try add it manually --- src/domain/UBGraphicsScene.cpp | 11 ++++++++- src/web/UBTrapFlashController.cpp | 38 +++++++++++++++++++++++++++++++ src/web/UBTrapFlashController.h | 3 +++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 63efc636..524d7054 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -453,7 +453,16 @@ void UBGraphicsScene::DisposeMagnifierQWidgets() magniferDisplayViewWidget = NULL; } - UBApplication::app()->restoreOverrideCursor(); + // some time have crash here on access to app (when call from destructor when close sankore app) + // so i just add try/catch section here + try + { + UBApplication::app()->restoreOverrideCursor(); + } + catch (...) + { + } + } void UBGraphicsScene::moveTo(const QPointF &pPoint) diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index 1e933ed2..9c987d40 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -73,12 +73,50 @@ void UBTrapFlashController::showTrapFlash() , viewHeight); connect(mTrapFlashUi->flashCombobox, SIGNAL(currentIndexChanged(int)), this, SLOT(selectFlash(int))); + connect(mTrapFlashUi->widgetNameLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(text_Changed(const QString &))); + connect(mTrapFlashUi->widgetNameLineEdit, SIGNAL(textEdited(const QString &)), this, SLOT(text_Edited(const QString &))); connect(mTrapFlashUi->createWidgetButton, SIGNAL(clicked(bool)), this, SLOT(createWidget())); } mTrapFlashDialog->show(); } +void UBTrapFlashController::text_Changed(const QString &newText) +{ + QString new_text = newText; + +#ifdef Q_WS_WIN // Defined on Windows. + QString illegalCharList(" < > : \" / \\ | ? * "); + QRegExp regExp("[<>:\"/\\\\|?*]"); +#endif + +#ifdef Q_WS_QWS // Defined on Qt for Embedded Linux. + QString illegalCharList(" < > : \" / \\ | ? * "); + QRegExp regExp("[<>:\"/\\\\|?*]"); +#endif + +#ifdef Q_WS_MAC // Defined on Mac OS X. + QString illegalCharList(" < > : \" / \\ | ? * "); + QRegExp regExp("[<>:\"/\\\\|?*]"); +#endif + +#ifdef Q_WS_X11 // Defined on X11. + QString illegalCharList(" < > : \" / \\ | ? * "); + QRegExp regExp("[<>:\"/\\\\|?*]"); +#endif + + if(new_text.indexOf(regExp) > -1) + { + new_text.remove(regExp); + mTrapFlashUi->widgetNameLineEdit->setText(new_text); + QToolTip::showText(mTrapFlashUi->widgetNameLineEdit->mapToGlobal(QPoint()), "Application name can`t contain any of the following characters:\r\n"+illegalCharList); + } +} + +void UBTrapFlashController::text_Edited(const QString &newText) +{ + +} void UBTrapFlashController::hideTrapFlash() { diff --git a/src/web/UBTrapFlashController.h b/src/web/UBTrapFlashController.h index 7fae4430..f38a1282 100644 --- a/src/web/UBTrapFlashController.h +++ b/src/web/UBTrapFlashController.h @@ -37,6 +37,9 @@ class UBTrapFlashController : public QObject public slots: void updateTrapFlashFromPage(QWebFrame* pCurrentWebFrame); + void text_Changed(const QString &); + void text_Edited(const QString &); + private slots: void selectFlash(int pFlashIndex); From 0d8350e5f7e1f10cd91865891a4665b3a0165d48 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 12 Oct 2011 17:32:57 +0300 Subject: [PATCH 3/3] SANKORE-321 refactroing main html create from trap widgets --- src/web/UBTrapFlashController.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index 9c987d40..f88136af 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -319,15 +319,15 @@ QString UBTrapFlashController::generateFullPageHtml(const QString& pDirPath, boo QString htmlContentString; - htmlContentString += "\n"; - htmlContentString += "\n"; - htmlContentString += "\n"; - htmlContentString += " \n"; - htmlContentString += "\n"; - htmlContentString += " \n"; - htmlContentString += " url().toString() + "\"/>\n"; - htmlContentString += " \n"; - htmlContentString += "\n"; + htmlContentString += "\r\n"; + htmlContentString += "\r\n"; + htmlContentString += " \r\n"; + htmlContentString += " url().toString() + "\">\r\n"; + htmlContentString += " \r\n"; + htmlContentString += " \r\n"; + htmlContentString += " Redirect to target...\r\n"; + htmlContentString += " \r\n"; + htmlContentString += "\r\n"; if (!pGenerateFile) {