From df8eeb9525db6f345d40ef9cc951ba44e139bc83 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Mon, 18 Feb 2013 23:25:31 +0330 Subject: [PATCH 1/2] Faster 'filterString()' for CookieManager. --- src/lib/cookies/cookiemanager.cpp | 23 ++++++++++++++++++++--- src/lib/cookies/cookiemanager.h | 2 ++ src/lib/tools/treewidget.h | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp index abeee4a82..5837309ff 100644 --- a/src/lib/cookies/cookiemanager.cpp +++ b/src/lib/cookies/cookiemanager.cpp @@ -46,7 +46,7 @@ CookieManager::CookieManager(QWidget* parent) connect(ui->close, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close())); connect(ui->close2, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close())); connect(ui->close3, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close())); - connect(ui->search, SIGNAL(textChanged(QString)), ui->cookieTree, SLOT(filterString(QString))); + connect(ui->search, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString))); // Cookie Filtering connect(ui->whiteAdd, SIGNAL(clicked()), this, SLOT(addWhitelist())); @@ -158,9 +158,9 @@ void CookieManager::currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem void CookieManager::refreshTable() { - disconnect(ui->search, SIGNAL(textChanged(QString)), ui->cookieTree, SLOT(filterString(QString))); + disconnect(ui->search, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString))); ui->search->clear(); - connect(ui->search, SIGNAL(textChanged(QString)), ui->cookieTree, SLOT(filterString(QString))); + connect(ui->search, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString))); QTimer::singleShot(0, this, SLOT(slotRefreshTable())); QTimer::singleShot(0, this, SLOT(slotRefreshFilters())); @@ -282,6 +282,23 @@ void CookieManager::saveCookiesChanged(bool state) ui->deleteCookiesOnClose->setEnabled(state); } +void CookieManager::filterString(const QString &string) +{ + if (string.isEmpty()) { + for (int i = 0; i < ui->cookieTree->topLevelItemCount(); ++i) { + ui->cookieTree->topLevelItem(i)->setHidden(false); + ui->cookieTree->topLevelItem(i)->setExpanded(ui->cookieTree->defaultItemShowMode() == TreeWidget::ItemsExpanded); + } + } + else { + for (int i = 0; i < ui->cookieTree->topLevelItemCount(); ++i) { + QString text = "." + ui->cookieTree->topLevelItem(i)->text(0); + ui->cookieTree->topLevelItem(i)->setHidden(!text.contains(string, Qt::CaseInsensitive)); + ui->cookieTree->topLevelItem(i)->setExpanded(true); + } + } +} + void CookieManager::closeEvent(QCloseEvent* e) { QStringList whitelist; diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h index 68a1623b5..30cfdf4c6 100644 --- a/src/lib/cookies/cookiemanager.h +++ b/src/lib/cookies/cookiemanager.h @@ -57,6 +57,8 @@ private slots: void deletePressed(); void saveCookiesChanged(bool state); + void filterString(const QString &string); + private: void closeEvent(QCloseEvent* e); void keyPressEvent(QKeyEvent* e); diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h index d21bbc93e..4b864ca69 100644 --- a/src/lib/tools/treewidget.h +++ b/src/lib/tools/treewidget.h @@ -28,6 +28,7 @@ class QT_QUPZILLA_EXPORT TreeWidget : public QTreeWidget public: explicit TreeWidget(QWidget* parent = 0); enum ItemShowMode { ItemsCollapsed = 0, ItemsExpanded = 1 }; + ItemShowMode defaultItemShowMode() { return m_showMode; } void setDefaultItemShowMode(ItemShowMode mode) { m_showMode = mode; } QList allItems(); bool appendToParentItem(const QString &parentText, QTreeWidgetItem* item); From 09bfa457e8147890b6e8ea9e1d275fc844c9f512 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Mon, 18 Feb 2013 23:33:46 +0330 Subject: [PATCH 2/2] Forgotten changes from 91c88872f8, 6a4c45c0ad and 7b3b4f9b94 --- src/lib/app/qupzilla.cpp | 8 +------- src/lib/other/macmenureceiver.cpp | 4 ++-- src/lib/other/macmenureceiver.h | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 0e46f7896..8d0b4e7d8 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -231,7 +231,7 @@ void QupZilla::postLaunch() #ifdef Q_OS_MAC // fill menus even if user don't call them - if (m_startBehaviour == Qz::BW_FirstAppWindow) { + if (m_windowType == Qz::BW_FirstAppWindow) { aboutToShowBookmarksMenu(); aboutToShowHistoryMostMenu(); aboutToShowHistoryRecentMenu(); @@ -1581,12 +1581,6 @@ void QupZilla::triggerTabsOnTop(bool enable) } qzSettings->tabsOnTop = enable; - -#ifdef Q_OS_WIN - if (QtWin::isCompositionEnabled()) { - applyBlurToMainWindow(); - } -#endif } void QupZilla::refreshHistory() diff --git a/src/lib/other/macmenureceiver.cpp b/src/lib/other/macmenureceiver.cpp index f2abf26b4..e9272c518 100644 --- a/src/lib/other/macmenureceiver.cpp +++ b/src/lib/other/macmenureceiver.cpp @@ -299,9 +299,9 @@ void MacMenuReceiver::zoomReset() callSlot("zoomReset"); } -void MacMenuReceiver::fullScreen(bool make) +void MacMenuReceiver::toggleFullScreen(bool make) { - callSlot("fullScreen", false, Q_ARG(bool, make)); + callSlot("toggleFullScreen", false, Q_ARG(bool, make)); } void MacMenuReceiver::changeEncoding(QObject* obj) diff --git a/src/lib/other/macmenureceiver.h b/src/lib/other/macmenureceiver.h index 8f7e02dea..bf90417a5 100644 --- a/src/lib/other/macmenureceiver.h +++ b/src/lib/other/macmenureceiver.h @@ -116,7 +116,7 @@ private slots: void zoomIn(); void zoomOut(); void zoomReset(); - void fullScreen(bool make); + void toggleFullScreen(bool make); void changeEncoding(QObject* obj = 0); void triggerCaretBrowsing();