/***************************************************************************
- * Copyright (C) 2006 by Peter Penz *
- * peter.penz@gmx.at *
+ * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
+#include "bookmarkselector.h"
+
+#include "urlnavigator.h"
#include <assert.h>
-#include <q3popupmenu.h>
-#include <qpainter.h>
-#include <qpixmap.h>
#include <kiconloader.h>
#include <kglobalsettings.h>
#include <kbookmarkmanager.h>
+#include <kmenu.h>
+#include <kdebug.h>
-#include "bookmarkselector.h"
-#include "dolphinsettings.h"
-#include "dolphinview.h"
-#include "dolphin.h"
-#include "urlnavigator.h"
+#include <QPainter>
+#include <QPixmap>
+#include <kicon.h>
-BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
+BookmarkSelector::BookmarkSelector(UrlNavigator* parent, KBookmarkManager* bookmarkManager) :
UrlButton(parent),
- m_selectedIndex(0)
+ m_selectedAddress(),
+ m_urlNavigator(parent),
+ m_bookmarkManager(bookmarkManager)
{
setFocusPolicy(Qt::NoFocus);
- m_bookmarksMenu = new Q3PopupMenu(this);
+ m_bookmarksMenu = new KMenu(this);
- KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
+ KBookmarkGroup root = m_bookmarkManager->root();
KBookmark bookmark = root.first();
int i = 0;
while (!bookmark.isNull()) {
- m_bookmarksMenu->insertItem(MainBarIcon(bookmark.icon()),
- bookmark.text(),
- i);
- if (i == m_selectedIndex) {
+ QAction* action = new QAction(MainBarIcon(bookmark.icon()),
+ bookmark.text(),
+ this);
+ m_bookmarksMenu->addAction(action);
+ QString address = QChar('/');
+ address += QString::number(i);
+ action->setData(address);
+ if (address == m_selectedAddress) {
QPixmap pixmap = SmallIcon(bookmark.icon());
- setPixmap(pixmap);
+ setIcon(QIcon(pixmap));
+ setIconSize(pixmap.size());
setMinimumWidth(pixmap.width() + 2);
}
bookmark = root.next(bookmark);
++i;
}
- connect(m_bookmarksMenu, SIGNAL(activated(int)),
- this, SLOT(slotBookmarkActivated(int)));
+ connect(m_bookmarksMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(activateBookmark(QAction*)));
- setPopup(m_bookmarksMenu);
+ setMenu(m_bookmarksMenu);
}
BookmarkSelector::~BookmarkSelector()
void BookmarkSelector::updateSelection(const KUrl& url)
{
- KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
- KBookmark bookmark = root.first();
-
- int maxLength = 0;
- m_selectedIndex = -1;
-
- // Search the bookmark which is equal to the Url or at least is a parent Url.
- // If there are more than one possible parent Url candidates, choose the bookmark
- // which covers the bigger range of the Url.
- int i = 0;
- while (!bookmark.isNull()) {
- const KUrl bookmarkUrl = bookmark.url();
- if (bookmarkUrl.isParentOf(url)) {
- const int length = bookmarkUrl.prettyUrl().length();
- if (length > maxLength) {
- m_selectedIndex = i;
- setPixmap(SmallIcon(bookmark.icon()));
- maxLength = length;
- }
- }
- bookmark = root.next(bookmark);
- ++i;
+ KBookmark bookmark = m_bookmarkManager->root().closestBookmark(url);
+ if (!bookmark.isNull()) {
+ m_selectedAddress = bookmark.address();
+ setIcon(KIcon(bookmark.icon()));
}
-
- if (m_selectedIndex < 0) {
+ else {
+ m_selectedAddress = QString();
// No bookmark has been found which matches to the given Url. Show
// a generic folder icon as pixmap for indication:
- setPixmap(SmallIcon("folder"));
+ setIcon(KIcon("folder"));
}
}
KBookmark BookmarkSelector::selectedBookmark() const
{
- return DolphinSettings::instance().bookmark(m_selectedIndex);
+ return m_bookmarkManager->findByAddress(m_selectedAddress);
}
QSize BookmarkSelector::sizeHint() const
return QSize(height, height);
}
-void BookmarkSelector::paintEvent(QPaintEvent* event)
+void BookmarkSelector::paintEvent(QPaintEvent* /*event*/)
{
QPainter painter(this);
foregroundColor = KGlobalSettings::highlightedTextColor();
}
else {
- backgroundColor = colorGroup().background();
+ backgroundColor = palette().brush(QPalette::Background).color();
foregroundColor = KGlobalSettings::buttonTextColor();
}
// dimm the colors if the parent view does not have the focus
- const DolphinView* parentView = urlNavigator()->dolphinView();
- const Dolphin& dolphin = Dolphin::mainWin();
-
- const bool isActive = (dolphin.activeView() == parentView);
+ const bool isActive = m_urlNavigator->isActive();
if (!isActive) {
- QColor dimmColor(colorGroup().background());
+ QColor dimmColor(palette().brush(QPalette::Background).color());
foregroundColor = mixColors(foregroundColor, dimmColor);
if (isHighlighted) {
backgroundColor = mixColors(backgroundColor, dimmColor);
painter.drawPixmap(x, y, pixmap);
}
-void BookmarkSelector::slotBookmarkActivated(int index)
+void BookmarkSelector::activateBookmark(QAction* action)
{
- m_selectedIndex = index;
+ assert(action != 0);
+ m_selectedAddress = action->data().toString();
- KBookmark bookmark = selectedBookmark();
+ const KBookmark bookmark = selectedBookmark();
setPixmap(SmallIcon(bookmark.icon()));
-
- emit bookmarkActivated(index);
+ emit bookmarkActivated(bookmark.url());
}
#include "bookmarkselector.moc"
projects / dolphin.git / blobdiff