diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index 51f034b94..5c3ac1242 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -1316,7 +1316,7 @@ void QupZilla::showWebInspector(bool toggle)
{
if (m_webInspectorDock) {
if (toggle) {
- m_webInspectorDock.data()->setVisible(!m_webInspectorDock.data()->isVisible());
+ m_webInspectorDock.data()->toggleVisibility();
}
else {
m_webInspectorDock.data()->show();
diff --git a/src/lib/network/qupzillaschemehandler.cpp b/src/lib/network/qupzillaschemehandler.cpp
index a69e506bb..575f35479 100644
--- a/src/lib/network/qupzillaschemehandler.cpp
+++ b/src/lib/network/qupzillaschemehandler.cpp
@@ -58,10 +58,12 @@ QupZillaSchemeReply::QupZillaSchemeReply(const QNetworkRequest &req, QObject* pa
setOperation(QNetworkAccessManager::GetOperation);
setRequest(req);
setUrl(req.url());
-
m_pageName = req.url().path();
- if (m_pageName == "about" || m_pageName == "reportbug" || m_pageName == "start" ||
- m_pageName == "speeddial" || m_pageName == "config") {
+
+ QStringList knownPages;
+ knownPages << "about" << "reportbug" << "start" << "speeddial" << "config";
+
+ if (knownPages.contains(m_pageName)) {
m_buffer.open(QIODevice::ReadWrite);
setError(QNetworkReply::NoError, tr("No Error"));
diff --git a/src/lib/webview/webinspectordockwidget.cpp b/src/lib/webview/webinspectordockwidget.cpp
index c31687195..55a0204a3 100644
--- a/src/lib/webview/webinspectordockwidget.cpp
+++ b/src/lib/webview/webinspectordockwidget.cpp
@@ -34,6 +34,16 @@ WebInspectorDockWidget::WebInspectorDockWidget(QupZilla* mainClass)
show();
}
+void WebInspectorDockWidget::toggleVisibility()
+{
+ if (isVisible()) {
+ close();
+ }
+ else {
+ show();
+ }
+}
+
void WebInspectorDockWidget::close()
{
p_QupZilla->weView()->webTab()->setInspectorVisible(false);
diff --git a/src/lib/webview/webinspectordockwidget.h b/src/lib/webview/webinspectordockwidget.h
index fde5998f8..1c24d1090 100644
--- a/src/lib/webview/webinspectordockwidget.h
+++ b/src/lib/webview/webinspectordockwidget.h
@@ -44,6 +44,8 @@ public:
explicit WebInspectorDockWidget(QupZilla* mainClass);
~WebInspectorDockWidget();
+ void toggleVisibility();
+
signals:
public slots:
diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp
index 0959e2ce9..fb28d5ba8 100644
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@@ -294,7 +294,7 @@ void WebPage::featurePermissionRequested(QWebFrame* frame, const QWebPage::Featu
}
#endif
-bool WebPage::event(QEvent *event)
+bool WebPage::event(QEvent* event)
{
if (event->type() == QEvent::Leave) {
// QWebPagePrivate::leaveEvent():
diff --git a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
index 7358a43f1..2ec825c06 100644
--- a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
+++ b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
@@ -20,6 +20,8 @@ RESOURCES = akn_res.qrc
TRANSLATIONS = \
translations/cs_CZ.ts \
translations/de_DE.ts \
+ translations/id_ID.ts \
+ translations/ja_JP.ts \
translations/nl_NL.ts \
translations/sr_BA.ts \
translations/sr_RS.ts \
diff --git a/src/plugins/AccessKeysNavigation/akn_res.qrc b/src/plugins/AccessKeysNavigation/akn_res.qrc
index 779423e34..e5381513d 100644
--- a/src/plugins/AccessKeysNavigation/akn_res.qrc
+++ b/src/plugins/AccessKeysNavigation/akn_res.qrc
@@ -4,6 +4,8 @@
data/copyright
locale/cs_CZ.qm
locale/de_DE.qm
+ locale/id_ID.qm
+ locale/ja_JP.qm
locale/nl_NL.qm
locale/sr_BA.qm
locale/sr_RS.qm
diff --git a/src/plugins/MouseGestures/MouseGestures.pro b/src/plugins/MouseGestures/MouseGestures.pro
index c5156b125..ff03a253c 100644
--- a/src/plugins/MouseGestures/MouseGestures.pro
+++ b/src/plugins/MouseGestures/MouseGestures.pro
@@ -28,6 +28,8 @@ RESOURCES = mousegestures.qrc
TRANSLATIONS = \
translations/cs_CZ.ts \
translations/de_DE.ts \
+ translations/id_ID.ts \
+ translations/ja_JP.ts \
translations/nl_NL.ts \
translations/sk_SK.ts \
translations/sr_BA.ts \
diff --git a/src/plugins/MouseGestures/mousegestures.qrc b/src/plugins/MouseGestures/mousegestures.qrc
index 8d14606e1..0092a9b8f 100644
--- a/src/plugins/MouseGestures/mousegestures.qrc
+++ b/src/plugins/MouseGestures/mousegestures.qrc
@@ -14,6 +14,8 @@
data/copyright
locale/cs_CZ.qm
locale/de_DE.qm
+ locale/id_ID.qm
+ locale/ja_JP.qm
locale/nl_NL.qm
locale/sk_SK.qm
locale/sr_BA.qm