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

[Mac] Fixed, actions were not triggered.

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2013-02-09 03:47:58 +03:30
parent a1ff0799cb
commit 05a8b7fcc5
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,9 +182,6 @@ private:
#endif #endif
DatabaseWriter* m_dbWriter; DatabaseWriter* m_dbWriter;
UserAgentManager* m_uaManager; UserAgentManager* m_uaManager;
#ifdef Q_OS_MAC
MacMenuReceiver* m_macMenuReceiver;
#endif
QList<QPointer<QupZilla> > m_mainWindows; QList<QPointer<QupZilla> > m_mainWindows;
QString m_activeProfil; QString m_activeProfil;
@ -203,6 +200,9 @@ private:
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
RegisterQAppAssociation* m_registerQAppAssociation; RegisterQAppAssociation* m_registerQAppAssociation;
#endif #endif
#ifdef Q_OS_MAC
MacMenuReceiver* m_macMenuReceiver;
#endif
}; };
#endif // MAINAPPLICATION_H #endif // MAINAPPLICATION_H

6
src/lib/app/qupzilla.cpp
View File

@ -1076,7 +1076,9 @@ void QupZilla::aboutToShowViewMenu()
void QupZilla::aboutToHideViewMenu() void QupZilla::aboutToHideViewMenu()
{ {
#ifndef Q_OS_MAC
m_actionPageSource->setEnabled(false); m_actionPageSource->setEnabled(false);
#endif
} }
void QupZilla::aboutToShowEditMenu() void QupZilla::aboutToShowEditMenu()
@ -1095,9 +1097,11 @@ void QupZilla::aboutToShowEditMenu()
void QupZilla::aboutToHideEditMenu() void QupZilla::aboutToHideEditMenu()
{ {
#ifndef Q_OS_MAC
foreach(QAction * act, m_menuEdit->actions()) { foreach(QAction * act, m_menuEdit->actions()) {
act->setEnabled(false); act->setEnabled(false);
} }
#endif
m_menuEdit->actions().at(8)->setEnabled(true); m_menuEdit->actions().at(8)->setEnabled(true);
m_actionPreferences->setEnabled(true); m_actionPreferences->setEnabled(true);
@ -1110,7 +1114,9 @@ void QupZilla::aboutToShowToolsMenu()
void QupZilla::aboutToHideToolsMenu() void QupZilla::aboutToHideToolsMenu()
{ {
#ifndef Q_OS_MAC
m_actionPageInfo->setEnabled(false); m_actionPageInfo->setEnabled(false);
#endif
} }
void QupZilla::aboutToShowEncodingMenu() void QupZilla::aboutToShowEncodingMenu()

6
src/lib/other/macmenureceiver.cpp
View File

@ -29,8 +29,8 @@
MacMenuReceiver::MacMenuReceiver(QObject* parent) MacMenuReceiver::MacMenuReceiver(QObject* parent)
: QObject(parent) : QObject(parent)
, m_macMenuBar(0) , m_macMenuBar(0)
, m_menuBookmarksAction(0)
, m_bookmarksMenuChanged(true) , m_bookmarksMenuChanged(true)
, m_menuBookmarksAction(0)
{ {
} }
@ -49,7 +49,7 @@ void MacMenuReceiver::setEnabledSelectedMenuActions(QMenu* menu, const QList<int
} }
foreach (int index, indexList) { foreach (int index, indexList) {
Q_ASSERT(index < 0 || index >= menu->actions().size()); Q_ASSERT(index >= 0 && index < menu->actions().size());
menu->actions().at(index)->setEnabled(true); menu->actions().at(index)->setEnabled(true);
} }
} }
@ -69,7 +69,7 @@ void MacMenuReceiver::setDisabledSelectedMenuActions(QMenu* menu, const QList<in
} }
foreach (int index, indexList) { foreach (int index, indexList) {
Q_ASSERT(index < 0 || index >= menu->actions().size()); Q_ASSERT(index >= 0 && index < menu->actions().size());
menu->actions().at(index)->setDisabled(true); menu->actions().at(index)->setDisabled(true);
} }
} }