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

[SideBarManager] Fixed ambiguous shortcuts when calling refreshMenu()

Browse Source 
-also fixed compile issue after 621ab569
This commit is contained in:
S. Razi Alavizadeh 2013-08-02 00:21:56 +04:30
parent 567d6c74f4
commit 65cb4bdb9a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/desktopnotifications/desktopnotificationsfactory.cpp
View File

@ -120,6 +120,7 @@ void DesktopNotificationsFactory::nativeNotificationPreview()
#endif #endif
} }
#if defined(QZ_WS_X11) && !defined(DISABLE_DBUS)
void DesktopNotificationsFactory::updateLastId(const QDBusMessage &msg) void DesktopNotificationsFactory::updateLastId(const QDBusMessage &msg)
{ {
QVariantList list = msg.arguments(); QVariantList list = msg.arguments();
@ -132,3 +133,4 @@ void DesktopNotificationsFactory::error(const QDBusError &error)
{ {
qWarning() << "QDBusError:" << error.message(); qWarning() << "QDBusError:" << error.message();
} }
#endif

2
src/lib/desktopnotifications/desktopnotificationsfactory.h
View File

@ -47,8 +47,10 @@ public:
void nativeNotificationPreview(); void nativeNotificationPreview();
private slots: private slots:
#if defined(QZ_WS_X11) && !defined(DISABLE_DBUS)
void updateLastId(const QDBusMessage &msg); void updateLastId(const QDBusMessage &msg);
void error(const QDBusError &error); void error(const QDBusError &error);
#endif
private: private:
bool m_enabled; bool m_enabled;

6
src/lib/sidebar/sidebar.cpp
View File

@ -123,7 +123,11 @@ void SideBarManager::refreshMenu()
return; return;
} }
foreach (QAction* action, m_menu->actions()) {
p_QupZilla->removeAction(action);
}
m_menu->clear(); m_menu->clear();
QAction* act = m_menu->addAction(SideBar::tr("Bookmarks"), this, SLOT(slotShowSideBar())); QAction* act = m_menu->addAction(SideBar::tr("Bookmarks"), this, SLOT(slotShowSideBar()));
act->setCheckable(true); act->setCheckable(true);
act->setShortcut(QKeySequence("Ctrl+Shift+B")); act->setShortcut(QKeySequence("Ctrl+Shift+B"));
@ -146,6 +150,8 @@ void SideBarManager::refreshMenu()
m_menu->addAction(act); m_menu->addAction(act);
} }
p_QupZilla->addActions(m_menu->actions());
updateActions(); updateActions();
} }