mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 00:41:23 +00:00
Fixes: The filtered bookmark setting takes effect immediately.
It's no longer necessary to restart the browser. svn path=/trunk/KDE/kdebase/apps/; revision=696774
This commit is contained in:
parent
d2940c668f
commit
9df63964b0
|
@ -359,6 +359,9 @@ void KMiscHTMLOptions::save()
|
|||
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
|
||||
QDBusConnection::sessionBus().send(message);
|
||||
|
||||
message = QDBusMessage::createSignal("/KBookmarkManager/konqueror", "org.kde.KIO.KBookmarkManager", "bookmarkConfigChanged" );
|
||||
QDBusConnection::sessionBus().send(message);
|
||||
|
||||
emit changed(false);
|
||||
}
|
||||
|
||||
|
|
|
@ -82,6 +82,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
|
|||
|
||||
connect( mgr, SIGNAL( changed(const QString &, const QString &) ),
|
||||
SLOT( slotBookmarksChanged(const QString &) ) );
|
||||
connect( mgr, SIGNAL( configChanged() ),
|
||||
SLOT( slotConfigChanged() ) );
|
||||
|
||||
KBookmarkGroup toolbar = getToolbar();
|
||||
fillBookmarkBar( toolbar );
|
||||
|
@ -99,7 +101,10 @@ QString KBookmarkBar::parentAddress()
|
|||
|
||||
KBookmarkGroup KBookmarkBar::getToolbar()
|
||||
{
|
||||
return m_pManager->toolbar();
|
||||
if(d->m_filteredToolbar)
|
||||
return m_pManager->root();
|
||||
else
|
||||
return m_pManager->toolbar();
|
||||
}
|
||||
|
||||
KBookmarkBar::~KBookmarkBar()
|
||||
|
@ -148,6 +153,16 @@ void KBookmarkBar::slotBookmarksChanged( const QString & group )
|
|||
}
|
||||
}
|
||||
|
||||
void KBookmarkBar::slotConfigChanged()
|
||||
{
|
||||
KConfig config("kbookmarkrc", KConfig::NoGlobals);
|
||||
KConfigGroup cg(&config, "Bookmarks");
|
||||
d->m_filteredToolbar = cg.readEntry( "FilteredToolbar", false );
|
||||
d->m_contextMenu = cg.readEntry( "ContextMenuActions", true );
|
||||
clear();
|
||||
fillBookmarkBar(getToolbar());
|
||||
}
|
||||
|
||||
void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
|
||||
{
|
||||
if (parent.isNull())
|
||||
|
|
|
@ -68,6 +68,7 @@ public Q_SLOTS:
|
|||
void contextMenu( const QPoint & );
|
||||
|
||||
void slotBookmarksChanged( const QString & );
|
||||
void slotConfigChanged();
|
||||
|
||||
protected:
|
||||
void fillBookmarkBar( const KBookmarkGroup & parent );
|
||||
|
|
Loading…
Reference in a new issue