mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-13 10:32:11 +01:00
Forgotten changes from 91c88872f8
, 6a4c45c0ad
and 7b3b4f9b94
This commit is contained in:
parent
df8eeb9525
commit
09bfa457e8
|
@ -231,7 +231,7 @@ void QupZilla::postLaunch()
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
// fill menus even if user don't call them
|
// fill menus even if user don't call them
|
||||||
if (m_startBehaviour == Qz::BW_FirstAppWindow) {
|
if (m_windowType == Qz::BW_FirstAppWindow) {
|
||||||
aboutToShowBookmarksMenu();
|
aboutToShowBookmarksMenu();
|
||||||
aboutToShowHistoryMostMenu();
|
aboutToShowHistoryMostMenu();
|
||||||
aboutToShowHistoryRecentMenu();
|
aboutToShowHistoryRecentMenu();
|
||||||
|
@ -1581,12 +1581,6 @@ void QupZilla::triggerTabsOnTop(bool enable)
|
||||||
}
|
}
|
||||||
|
|
||||||
qzSettings->tabsOnTop = enable;
|
qzSettings->tabsOnTop = enable;
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
if (QtWin::isCompositionEnabled()) {
|
|
||||||
applyBlurToMainWindow();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QupZilla::refreshHistory()
|
void QupZilla::refreshHistory()
|
||||||
|
|
|
@ -299,9 +299,9 @@ void MacMenuReceiver::zoomReset()
|
||||||
callSlot("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)
|
void MacMenuReceiver::changeEncoding(QObject* obj)
|
||||||
|
|
|
@ -116,7 +116,7 @@ private slots:
|
||||||
void zoomIn();
|
void zoomIn();
|
||||||
void zoomOut();
|
void zoomOut();
|
||||||
void zoomReset();
|
void zoomReset();
|
||||||
void fullScreen(bool make);
|
void toggleFullScreen(bool make);
|
||||||
void changeEncoding(QObject* obj = 0);
|
void changeEncoding(QObject* obj = 0);
|
||||||
|
|
||||||
void triggerCaretBrowsing();
|
void triggerCaretBrowsing();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user