From 09bfa457e8147890b6e8ea9e1d275fc844c9f512 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Mon, 18 Feb 2013 23:33:46 +0330 Subject: [PATCH] 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();