From 6b97d88a5acfa871e3a0d43728b09c79fd992564 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 17:25:30 -0600 Subject: Fix FTBFS --- src/bookmarkselector.cpp | 183 --------------------------------------------- src/bookmarkselector.h | 99 ------------------------ src/bookmartdeselector.cpp | 183 +++++++++++++++++++++++++++++++++++++++++++++ src/bookmartdeselector.h | 99 ++++++++++++++++++++++++ 4 files changed, 282 insertions(+), 282 deletions(-) delete mode 100644 src/bookmarkselector.cpp delete mode 100644 src/bookmarkselector.h create mode 100644 src/bookmartdeselector.cpp create mode 100644 src/bookmartdeselector.h (limited to 'src') diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp deleted file mode 100644 index c9fee79..0000000 --- a/src/bookmarkselector.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/*************************************************************************** - * 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 * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#include -#include -#include -#include - -#include -#include -#include - -#include "bookmarkselector.h" -#include "dolphinsettings.h" -#include "dolphinview.h" -#include "dolphin.h" -#include "urlnavigator.h" - -BookmarkSelector::BookmarkSelector(URLNavigator* parent) : - URLButton(parent), - m_selectedIndex(0) -{ - setFocusPolicy(TQ_NoFocus); - - m_bookmarksMenu = new TQPopupMenu(this); - - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - connect(manager, TQT_SIGNAL(changed(const TQString&, const TQString&)), - this, TQT_SLOT(updateBookmarks())); - - updateBookmarks(); - - connect(m_bookmarksMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotBookmarkActivated(int))); - - setPopup(m_bookmarksMenu); -} - -BookmarkSelector::~BookmarkSelector() -{ -} - -void BookmarkSelector::updateBookmarks() -{ - m_bookmarksMenu->clear(); - - KBookmarkGroup root = DolphinSettings::instance().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) { - TQPixmap pixmap = SmallIcon(bookmark.icon()); - setPixmap(pixmap); - setMinimumWidth(pixmap.width() + 2); - } - bookmark = root.next(bookmark); - ++i; - } - -} - -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; - } - - if (m_selectedIndex < 0) { - // No bookmark has been found which matches to the given URL. Show - // a generic folder icon as pixmap for indication: - setPixmap(SmallIcon("folder")); - } -} - -KBookmark BookmarkSelector::selectedBookmark() const -{ - return DolphinSettings::instance().bookmark(m_selectedIndex); -} - -void BookmarkSelector::drawButton(TQPainter* painter) -{ - const int buttonWidth = width(); - const int buttonHeight = height(); - - TQColor backgroundColor; - TQColor foregroundColor; - const bool isHighlighted = isDisplayHintEnabled(EnteredHint) || - isDisplayHintEnabled(DraggedHint); - if (isHighlighted) { - backgroundColor = TDEGlobalSettings::highlightColor(); - foregroundColor = TDEGlobalSettings::highlightedTextColor(); - } - else { - backgroundColor = colorGroup().background(); - foregroundColor = TDEGlobalSettings::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); - if (!isActive) { - TQColor dimmColor(colorGroup().background()); - foregroundColor = mixColors(foregroundColor, dimmColor); - if (isHighlighted) { - backgroundColor = mixColors(backgroundColor, dimmColor); - } - } - - if (!(isDisplayHintEnabled(ActivatedHint) && isActive) && !isHighlighted) { - // dimm the foreground color by mixing it with the background - foregroundColor = mixColors(foregroundColor, backgroundColor); - painter->setPen(foregroundColor); - } - - // draw button backround - painter->setPen(NoPen); - painter->setBrush(backgroundColor); - painter->drawRect(0, 0, buttonWidth, buttonHeight); - - // draw icon - const TQPixmap* icon = pixmap(); - if (icon != 0) { - const int x = (buttonWidth - icon->width()) / 2; - const int y = (buttonHeight - icon->height()) / 2; - painter->drawPixmap(x, y, *icon); - } -} - -void BookmarkSelector::slotBookmarkActivated(int index) -{ - m_selectedIndex = index; - - KBookmark bookmark = selectedBookmark(); - setPixmap(SmallIcon(bookmark.icon())); - - emit bookmarkActivated(index); -} - -#include "bookmarkselector.moc" - diff --git a/src/bookmarkselector.h b/src/bookmarkselector.h deleted file mode 100644 index 74d1138..0000000 --- a/src/bookmarkselector.h +++ /dev/null @@ -1,99 +0,0 @@ -/*************************************************************************** - * 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 * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef BOOKMARKSELECTOR_H -#define BOOKMARKSELECTOR_H - -#include -#include - -class URLNavigator; -class TQPopupMenu; -class KURL; - -/** - * @brief Allows to select a bookmark from a popup menu. - * - * The icon from the current selected bookmark is shown - * inside the bookmark selector. - * - * @see URLNavigator - * @author Peter Penz - */ -class BookmarkSelector : public URLButton -{ - Q_OBJECT - - -public: - /** - * @param parent Parent widget where the bookmark selector - * is embedded into. - */ - BookmarkSelector(URLNavigator* parent); - - virtual ~BookmarkSelector(); - - /** - * Updates the selection dependent from the given URL \a url. The - * URL must not match exactly to one of the available bookmarks: - * The bookmark which is equal to the URL or at least is a parent URL - * is selected. If there are more than one possible parent URL candidates, - * the bookmark which covers the bigger range of the URL is selected. - */ - void updateSelection(const KURL& url); - - /** - * Returns the index of the selected bookmark. To get - * the bookmark, use BookmarkSelector::selectedBookmark(). - */ - int selectedIndex() const { return m_selectedIndex; } - - /** Returns the selected bookmark. */ - KBookmark selectedBookmark() const; - -signals: - /** - * Is send when a bookmark has been activated by the user. - * @param index Index of the selected bookmark. - */ - void bookmarkActivated(int index); - -protected: - /** - * Draws the icon of the selected URL as content of the URL - * selector. - */ - virtual void drawButton(TQPainter* painter); - -private slots: - /** - * Updates the selected index and the icon if a bookmark - * has been activated by the user. - */ - void slotBookmarkActivated(int index); - void updateBookmarks(); - -private: - int m_selectedIndex; - TQPopupMenu* m_bookmarksMenu; -}; - -#endif diff --git a/src/bookmartdeselector.cpp b/src/bookmartdeselector.cpp new file mode 100644 index 0000000..c9fee79 --- /dev/null +++ b/src/bookmartdeselector.cpp @@ -0,0 +1,183 @@ +/*************************************************************************** + * 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 * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + + +#include +#include +#include +#include + +#include +#include +#include + +#include "bookmarkselector.h" +#include "dolphinsettings.h" +#include "dolphinview.h" +#include "dolphin.h" +#include "urlnavigator.h" + +BookmarkSelector::BookmarkSelector(URLNavigator* parent) : + URLButton(parent), + m_selectedIndex(0) +{ + setFocusPolicy(TQ_NoFocus); + + m_bookmarksMenu = new TQPopupMenu(this); + + KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); + connect(manager, TQT_SIGNAL(changed(const TQString&, const TQString&)), + this, TQT_SLOT(updateBookmarks())); + + updateBookmarks(); + + connect(m_bookmarksMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotBookmarkActivated(int))); + + setPopup(m_bookmarksMenu); +} + +BookmarkSelector::~BookmarkSelector() +{ +} + +void BookmarkSelector::updateBookmarks() +{ + m_bookmarksMenu->clear(); + + KBookmarkGroup root = DolphinSettings::instance().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) { + TQPixmap pixmap = SmallIcon(bookmark.icon()); + setPixmap(pixmap); + setMinimumWidth(pixmap.width() + 2); + } + bookmark = root.next(bookmark); + ++i; + } + +} + +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; + } + + if (m_selectedIndex < 0) { + // No bookmark has been found which matches to the given URL. Show + // a generic folder icon as pixmap for indication: + setPixmap(SmallIcon("folder")); + } +} + +KBookmark BookmarkSelector::selectedBookmark() const +{ + return DolphinSettings::instance().bookmark(m_selectedIndex); +} + +void BookmarkSelector::drawButton(TQPainter* painter) +{ + const int buttonWidth = width(); + const int buttonHeight = height(); + + TQColor backgroundColor; + TQColor foregroundColor; + const bool isHighlighted = isDisplayHintEnabled(EnteredHint) || + isDisplayHintEnabled(DraggedHint); + if (isHighlighted) { + backgroundColor = TDEGlobalSettings::highlightColor(); + foregroundColor = TDEGlobalSettings::highlightedTextColor(); + } + else { + backgroundColor = colorGroup().background(); + foregroundColor = TDEGlobalSettings::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); + if (!isActive) { + TQColor dimmColor(colorGroup().background()); + foregroundColor = mixColors(foregroundColor, dimmColor); + if (isHighlighted) { + backgroundColor = mixColors(backgroundColor, dimmColor); + } + } + + if (!(isDisplayHintEnabled(ActivatedHint) && isActive) && !isHighlighted) { + // dimm the foreground color by mixing it with the background + foregroundColor = mixColors(foregroundColor, backgroundColor); + painter->setPen(foregroundColor); + } + + // draw button backround + painter->setPen(NoPen); + painter->setBrush(backgroundColor); + painter->drawRect(0, 0, buttonWidth, buttonHeight); + + // draw icon + const TQPixmap* icon = pixmap(); + if (icon != 0) { + const int x = (buttonWidth - icon->width()) / 2; + const int y = (buttonHeight - icon->height()) / 2; + painter->drawPixmap(x, y, *icon); + } +} + +void BookmarkSelector::slotBookmarkActivated(int index) +{ + m_selectedIndex = index; + + KBookmark bookmark = selectedBookmark(); + setPixmap(SmallIcon(bookmark.icon())); + + emit bookmarkActivated(index); +} + +#include "bookmarkselector.moc" + diff --git a/src/bookmartdeselector.h b/src/bookmartdeselector.h new file mode 100644 index 0000000..74d1138 --- /dev/null +++ b/src/bookmartdeselector.h @@ -0,0 +1,99 @@ +/*************************************************************************** + * 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 * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef BOOKMARKSELECTOR_H +#define BOOKMARKSELECTOR_H + +#include +#include + +class URLNavigator; +class TQPopupMenu; +class KURL; + +/** + * @brief Allows to select a bookmark from a popup menu. + * + * The icon from the current selected bookmark is shown + * inside the bookmark selector. + * + * @see URLNavigator + * @author Peter Penz + */ +class BookmarkSelector : public URLButton +{ + Q_OBJECT + + +public: + /** + * @param parent Parent widget where the bookmark selector + * is embedded into. + */ + BookmarkSelector(URLNavigator* parent); + + virtual ~BookmarkSelector(); + + /** + * Updates the selection dependent from the given URL \a url. The + * URL must not match exactly to one of the available bookmarks: + * The bookmark which is equal to the URL or at least is a parent URL + * is selected. If there are more than one possible parent URL candidates, + * the bookmark which covers the bigger range of the URL is selected. + */ + void updateSelection(const KURL& url); + + /** + * Returns the index of the selected bookmark. To get + * the bookmark, use BookmarkSelector::selectedBookmark(). + */ + int selectedIndex() const { return m_selectedIndex; } + + /** Returns the selected bookmark. */ + KBookmark selectedBookmark() const; + +signals: + /** + * Is send when a bookmark has been activated by the user. + * @param index Index of the selected bookmark. + */ + void bookmarkActivated(int index); + +protected: + /** + * Draws the icon of the selected URL as content of the URL + * selector. + */ + virtual void drawButton(TQPainter* painter); + +private slots: + /** + * Updates the selected index and the icon if a bookmark + * has been activated by the user. + */ + void slotBookmarkActivated(int index); + void updateBookmarks(); + +private: + int m_selectedIndex; + TQPopupMenu* m_bookmarksMenu; +}; + +#endif -- cgit v1.2.1