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

Windows: After showing QZ window (1s delay) try to check as default and show dialogs as child of QZ window.

Browse Source 
- Closes #1632
This commit is contained in:
srazi 2015-10-15 11:14:03 +03:30 committed by David Rosca
parent e3ed2547db
commit dd5c5db142
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/app/mainapplication.cpp
View File

@ -681,8 +681,9 @@ void MainApplication::postLaunch()
connect(this, SIGNAL(messageReceived(QString)), this, SLOT(messageReceived(QString))); connect(this, SIGNAL(messageReceived(QString)), this, SLOT(messageReceived(QString)));
connect(this, SIGNAL(aboutToQuit()), this, SLOT(saveSettings())); connect(this, SIGNAL(aboutToQuit()), this, SLOT(saveSettings()));
checkDefaultWebBrowser();
QtWin::createJumpList(); QtWin::createJumpList();
QTimer::singleShot(1000, this, SLOT(checkDefaultWebBrowser()));
} }
void MainApplication::saveSession() void MainApplication::saveSession()

2
src/lib/app/mainapplication.h
View File

@ -128,6 +128,7 @@ private slots:
void messageReceived(const QString &message); void messageReceived(const QString &message);
void windowDestroyed(QObject* window); void windowDestroyed(QObject* window);
void onFocusChanged(); void onFocusChanged();
void checkDefaultWebBrowser();
void downloadRequested(QWebEngineDownloadItem *download); void downloadRequested(QWebEngineDownloadItem *download);
@ -143,7 +144,6 @@ private:
void translateApp(); void translateApp();
void backupSavedSessions(); void backupSavedSessions();
void checkDefaultWebBrowser();
void setUserStyleSheet(const QString &filePath); void setUserStyleSheet(const QString &filePath);

4
src/lib/other/registerqappassociation.cpp
View File

@ -18,6 +18,8 @@
* ============================================================ */ * ============================================================ */
#include "registerqappassociation.h" #include "registerqappassociation.h"
#include "mainapplication.h"
#include "browserwindow.h"
#include "ShlObj.h" #include "ShlObj.h"
#include <QMessageBox> #include <QMessageBox>
@ -105,7 +107,7 @@ bool RegisterQAppAssociation::registerAppCapabilities()
capabilitiesKey = regLocalMachine.value("Software/RegisteredApplications/" + _appRegisteredName).toString(); capabilitiesKey = regLocalMachine.value("Software/RegisteredApplications/" + _appRegisteredName).toString();
if (capabilitiesKey.isEmpty()) { if (capabilitiesKey.isEmpty()) {
QMessageBox::warning(0, tr("Warning!"), QMessageBox::warning(mApp->getWindow(), tr("Warning!"),
tr("There are some problems. Please, reinstall QupZilla.\n" tr("There are some problems. Please, reinstall QupZilla.\n"
"Maybe relaunch with administrator right do a magic for you! ;)")); "Maybe relaunch with administrator right do a magic for you! ;)"));
return false; return false;