diff --git a/resources/library/interactive/WebBrowser.wgt/index.html b/resources/library/interactive/WebBrowser.wgt/index.html index 53a7c5de..d477b265 100644 --- a/resources/library/interactive/WebBrowser.wgt/index.html +++ b/resources/library/interactive/WebBrowser.wgt/index.html @@ -225,10 +225,12 @@ $(window).trigger("resize"); return false; }; - if(resizerIndex > 100){ + if(resizerIndex > 80){ resizerIndex = 0; - $("#textbox").val("http://www.google.com/search?q=" + $("#textbox").val().replace("http://", "")); - $("#search-button").trigger("click"); + $("#back-button").trigger("click"); + alert(sankoreLang[lang].alert); + //$("#textbox").val("http://www.google.com/search?q=" + $("#textbox").val().replace("http://", "")); + //$("#search-button").trigger("click"); }else{ resizer = setTimeout(function(){checkLoading()}, 100); resizerIndex++; diff --git a/resources/library/interactive/WebBrowser.wgt/scripts/languages.js b/resources/library/interactive/WebBrowser.wgt/scripts/languages.js index 2683dfd8..70eb834f 100644 --- a/resources/library/interactive/WebBrowser.wgt/scripts/languages.js +++ b/resources/library/interactive/WebBrowser.wgt/scripts/languages.js @@ -5,7 +5,8 @@ var sankoreLang = { "show":"Show", "prev_page":"Previous page", "next_page":"Next page", - "open":"Open the site" + "open":"Open the site", + "alert":"Cannot open a page! Maybe it's because of a security policy or a wrong url. Also check your internet connection." }, "ru":{ "previous":"Пред.", @@ -13,7 +14,8 @@ var sankoreLang = { "show":"Показать", "prev_page":"Пред. страница", "next_page":"След. страница", - "open":"Перейти" + "open":"Перейти", + "alert":"Невозможно отобразить страницу! Возможно это из-за политики безопасности сайта или неверного адреса.Также стоит проверить подключение к интернету." }, "fr":{ "previous":"Précédente", @@ -21,7 +23,8 @@ var sankoreLang = { "show":"Voir", "prev_page":"Page précédente", "next_page":"Page suivante", - "open":"Ouvrez le site" + "open":"Ouvrez le site", + "alert":"Impossible d'ouvrir une page! Peut-être c'est à cause d'une politique de sécurité ou une URL erronée. Vérifiez aussi votre connexion internet." } }; diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index f0952ac3..a6f17114 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -92,7 +92,6 @@ UBGraphicsDelegateFrame::~UBGraphicsDelegateFrame() // NOOP } - void UBGraphicsDelegateFrame::setAntiScale(qreal pAntiScale) { mFrameWidth = mNominalFrameWidth * pAntiScale; @@ -298,8 +297,8 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) QSizeF newSize = resizableItem->size() + incVector; - if (newSize.width() < 50 /*0*/ || newSize.height() < /*0*/ 50) - return; +// if (newSize.width() < 50 /*0*/ || newSize.height() < /*0*/ 50) +// return; resizableItem->resize(newSize); } @@ -596,4 +595,3 @@ QRectF UBGraphicsDelegateFrame::rotateButtonBounds() const return QRectF(rect().right()- mFrameWidth, rect().top(), mFrameWidth, mFrameWidth); } - diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index c4a8ab5e..93746dd3 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -368,7 +368,7 @@ void UBThumbnailWidget::mouseMoveEvent(QMouseEvent *event) if (qlElements.size() > 0){ mime->setUrls(qlElements); drag->setMimeData(mime); - drag->exec(); + drag->exec(Qt::CopyAction); } } }