kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-25 05:48:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Method of tabWidget changing a webView work by default on current webView.

Browse Source
This commit is contained in:
Matthieu Gautier 2018-07-23 15:18:01 +02:00
parent ca309c0701
commit 5e80464128
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tabwidget.cpp
View File

@ -1,5 +1,8 @@
#include "tabwidget.h"
#define QUITIFNULL(VIEW) if (nullptr==(VIEW)) { return; }
#define CURRENTIFNULL(VIEW) if(nullptr==VIEW) { VIEW = currentWidget();}
TabWidget::TabWidget(QWidget *parent) :
QTabWidget(parent)
{
@ -11,10 +14,10 @@ TabWidget::TabWidget(QWidget *parent) :
WebView* TabWidget::createNewTab(bool setCurrent)
{
WebView* webView = new WebView();
QObject::connect(webView, &WebView::titleChanged, this,
[=](const QString& str) { setTitleOf(webView, str); });
QObject::connect(webView, &WebView::iconChanged, this,
[=](const QIcon& icon) { setIconOf(webView, icon); });
connect(webView, &WebView::titleChanged, this,
[=](const QString& str) { setTitleOf(str, webView); });
connect(webView, &WebView::iconChanged, this,
[=](const QIcon& icon) { setIconOf(icon, webView); });
// Ownership of webview is passed to the tabWidget
addTab(webView, "");
if (setCurrent) {
@ -32,8 +35,9 @@ void TabWidget::openUrl(const QUrl& url, bool newTab)
webView->setUrl(url);
}
void TabWidget::setTitleOf(WebView* webView, const QString& title)
void TabWidget::setTitleOf(const QString& title, WebView* webView)
{
CURRENTIFNULL(webView);
if (title.startsWith("zim://")) {
auto url = QUrl(title);
setTabText(indexOf(webView), url.path());
@ -42,17 +46,18 @@ void TabWidget::setTitleOf(WebView* webView, const QString& title)
}
}
void TabWidget::setIconOf(WebView *webView, const QIcon &icon)
void TabWidget::setIconOf(const QIcon &icon, WebView *webView)
{
CURRENTIFNULL(webView);
setTabIcon(indexOf(webView), icon);
}
void TabWidget::triggerWebPageAction(QWebEnginePage::WebAction action)
void TabWidget::triggerWebPageAction(QWebEnginePage::WebAction action, WebView *webView)
{
if (auto webView = currentWidget()) {
webView->triggerPageAction(action);
webView->setFocus();
}
CURRENTIFNULL(webView);
QUITIFNULL(webView);
webView->triggerPageAction(action);
webView->setFocus();
}
void TabWidget::closeTab(int index)

10
src/tabwidget.h
View File

@ -14,11 +14,13 @@ public:
WebView* createNewTab(bool setCurrent);
WebView* widget(int index) { return static_cast<WebView*>(QTabWidget::widget(index)); }
WebView* currentWidget() { return static_cast<WebView*>(QTabWidget::currentWidget()); }
void openUrl(const QUrl &url, bool newTab);
void setTitleOf(WebView* webView, const QString& title);
void setIconOf(WebView* webView, const QIcon& icon);
void triggerWebPageAction(QWebEnginePage::WebAction action);
void openUrl(const QUrl &url, bool newTab);
// Redirect call to sub-webView
void setTitleOf(const QString& title, WebView* webView=nullptr);
void setIconOf(const QIcon& icon, WebView* webView=nullptr);
void triggerWebPageAction(QWebEnginePage::WebAction action, WebView* webView=nullptr);
signals:
void webActionEnabledChanged(QWebEnginePage::WebAction action, bool enabled);