Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

New window will not be made from calling qupzilla while other instance

Browse Source 
is running and app is going to close
This commit is contained in:
nowrep 2011-03-31 16:01:59 +02:00
parent 168c7a84b5
commit 2c0cf65018
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mainapplication.cpp
View File

@ -223,7 +223,7 @@ void MainApplication::receiveAppMessage(QString message)
}
QupZilla* actWin = getWindow();
if (!actWin) { // It can only occur if download manager window was still open
if (!actWin && !isClosing()) { // It can only occur if download manager window was still open
makeNewWindow(true);
return;
}

7
src/webview/webview.cpp
View File

@ -59,6 +59,7 @@ WebView::WebView(QupZilla* mainClass, QWidget* parent)
connect(this, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
connect(this, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));
connect(this, SIGNAL(titleChanged(QString)), this, SLOT(titleChanged()));
connect(this, SIGNAL(iconChanged()), this, SLOT(slotIconChanged()));
connect(this, SIGNAL(statusBarMessage(QString)), p_QupZilla->statusBar(), SLOT(showMessage(QString)));
@ -73,6 +74,12 @@ WebView::WebView(QupZilla* mainClass, QWidget* parent)
m_zoomLevels << 30 << 50 << 67 << 80 << 90 << 100 << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
}
void WebView::slotIconChanged()
{
if (!isLoading())
qDebug() << "icon changed";
}
WebPage* WebView::webPage() const
{
return m_page;

1
src/webview/webview.h
View File

@ -99,6 +99,7 @@ private slots:
void stopAnimation();
void setIp(QHostInfo info);
void checkRss();
void slotIconChanged();
private:
void keyPressEvent(QKeyEvent* event);