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

AdBlockDialog: Change to QDialog

Browse Source
This commit is contained in:
David Rosca 2018-02-09 17:50:02 +01:00
parent 68bee4ba8f
commit 6f880b43cf
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/adblock/adblockdialog.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,7 +29,7 @@
#include <QInputDialog> #include <QInputDialog>
AdBlockDialog::AdBlockDialog(QWidget* parent) AdBlockDialog::AdBlockDialog(QWidget* parent)
: QWidget(parent) : QDialog(parent)
, m_manager(AdBlockManager::instance()) , m_manager(AdBlockManager::instance())
, m_currentTreeWidget(0) , m_currentTreeWidget(0)
, m_currentSubscription(0) , m_currentSubscription(0)

6
src/lib/adblock/adblockdialog.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,7 +18,7 @@
#ifndef ADBLOCKDIALOG_H #ifndef ADBLOCKDIALOG_H
#define ADBLOCKDIALOG_H #define ADBLOCKDIALOG_H
#include <QWidget> #include <QDialog>
#include "qzcommon.h" #include "qzcommon.h"
#include "ui_adblockdialog.h" #include "ui_adblockdialog.h"
@ -28,7 +28,7 @@ class AdBlockTreeWidget;
class AdBlockManager; class AdBlockManager;
class AdBlockRule; class AdBlockRule;
class FALKON_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog class FALKON_EXPORT AdBlockDialog : public QDialog, public Ui_AdBlockDialog
{ {
Q_OBJECT Q_OBJECT

2
src/lib/adblock/adblockdialog.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>AdBlockDialog</class> <class>AdBlockDialog</class>
<widget class="QWidget" name="AdBlockDialog"> <widget class="QDialog" name="AdBlockDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

2
src/lib/adblock/adblockmanager.cpp
View File

@ -433,7 +433,7 @@ AdBlockSubscription* AdBlockManager::subscriptionByName(const QString &name) con
AdBlockDialog* AdBlockManager::showDialog() AdBlockDialog* AdBlockManager::showDialog()
{ {
if (!m_adBlockDialog) { if (!m_adBlockDialog) {
m_adBlockDialog = new AdBlockDialog; m_adBlockDialog = new AdBlockDialog(mApp->getWindow());
} }
m_adBlockDialog.data()->show(); m_adBlockDialog.data()->show();