diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp index 0914d5f5a..67da5eda0 100644 --- a/src/webview/webpage.cpp +++ b/src/webview/webpage.cpp @@ -210,17 +210,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &r } } - if (!frame && type != QWebPage::NavigationTypeOther) { - qDebug() << "coming from javascript"; - } - -// TabWidget::OpenUrlIn openIn= frame ? TabWidget::CurrentTab: TabWidget::NewTab; - bool accept = QWebPage::acceptNavigationRequest(frame, request, type); -// if (accept && openIn == TabWidget::NewTab) { -// m_isOpeningNextWindowAsNewTab = true; -// p_QupZilla->tabWidget()->addView(request.url(),tr("New tab"), openIn); -// } return accept; } @@ -247,7 +237,6 @@ QWebPage* WebPage::createWindow(QWebPage::WebWindowType type) // view->show(); // return view->page(); - qDebug() << "createWindow"; Q_UNUSED(type); int index = p_QupZilla->tabWidget()->addView(QUrl(), tr("New tab"), TabWidget::CleanSelectedPage); return p_QupZilla->weView(index)->page(); diff --git a/windows/installer.nsi b/windows/installer.nsi index b4fac5f2c..e8310afb5 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -91,6 +91,9 @@ Section !$(TITLE_SecMain) SecMain File "codecs\qjpcodecs4.dll" File "codecs\qkrcodecs4.dll" File "codecs\qtwcodecs4.dll" + + SetOutPath "$INSTDIR\iconengines" + File "iconengines\qsvgicon4.dll" SetOutPath "$INSTDIR\sqldrivers" File "sqldrivers\qsqlite4.dll" @@ -205,6 +208,14 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations File "locale\pt_PT.qm" File "locale\qt_pt.qm" SectionEnd + + Section "Serbian" + SetOutPath "$INSTDIR\locale" + File "locale\sr_BA.qm" + File "locale\sr_RS.qm" + File "locale\qt_sr_BA.qm" + File "locale\qt_sr_RS.qm" + SectionEnd SectionGroupEnd @@ -215,14 +226,13 @@ SectionGroup $(TITLE_SecPlugins) SecPlugins SectionEnd SectionGroupEnd - Section $(TITLE_SecExtensions) SecExtensions SetOutPath "$INSTDIR" ${registerExtension} "$INSTDIR\qupzilla.exe" ".htm" $(FILE_Htm) ${registerExtension} "$INSTDIR\qupzilla.exe" ".html" $(FILE_Html) SectionEnd -Section "-StartMenu" +Section -StartMenu SetOutPath "$INSTDIR" SetShellVarContext all CreateDirectory "$SMPROGRAMS\QupZilla" @@ -246,7 +256,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes) !insertmacro MUI_FUNCTION_DESCRIPTION_END -Section "-Uninstaller" +Section -Uninstaller WriteUninstaller "$INSTDIR\uninstall.exe" WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\qupzilla.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" @@ -255,6 +265,14 @@ Section "-Uninstaller" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" SectionEnd +Section -MSVC + InitPluginsDir + SetOutPath $PLUGINSDIR + File "wininstall\vcredist_x86.exe" + DetailPrint "Installing Visual C++ 2008 Libraries" + ExecWait '"$PLUGINSDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /quiet"' +SectionEnd + Section Uninstall KillProcDLL::KillProc "qupzilla.exe" Sleep 100