From f37ecd6ecfab9bc1d2929504b4f6e4363f8137b9 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 14 Jan 2009 20:14:36 +0000 Subject: Cleanup panel related class names: The terms "sidebar"/"sidebarpage" are relicts from the KDE 3 version of Dolphin and are called "Panels" in the KDE 4 version of Dolphin. Yes, renaming classes may take more than 1 year ;-) svn path=/trunk/KDE/kdebase/apps/; revision=911089 --- src/panels/places/dolphinfileplacesview.cpp | 56 ----------------------------- src/panels/places/dolphinfileplacesview.h | 51 -------------------------- src/panels/places/placespanel.cpp | 56 +++++++++++++++++++++++++++++ src/panels/places/placespanel.h | 50 ++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 107 deletions(-) delete mode 100644 src/panels/places/dolphinfileplacesview.cpp delete mode 100644 src/panels/places/dolphinfileplacesview.h create mode 100644 src/panels/places/placespanel.cpp create mode 100644 src/panels/places/placespanel.h (limited to 'src/panels/places') diff --git a/src/panels/places/dolphinfileplacesview.cpp b/src/panels/places/dolphinfileplacesview.cpp deleted file mode 100644 index df3e6fd87..000000000 --- a/src/panels/places/dolphinfileplacesview.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008 by Peter Penz * - * * - * 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 "dolphinfileplacesview.h" -#include "draganddrophelper.h" -#include -#include - -DolphinFilePlacesView::DolphinFilePlacesView(QWidget* parent) : - KFilePlacesView(parent), - m_mouseButtons(Qt::NoButton) -{ - setDropOnPlaceEnabled(true); - connect(this, SIGNAL(urlsDropped(const KUrl&, QDropEvent*, QWidget*)), - this, SLOT(slotUrlsDropped(const KUrl&, QDropEvent*, QWidget*))); - connect(this, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(emitExtendedUrlChangedSignal(const KUrl&))); -} - -DolphinFilePlacesView::~DolphinFilePlacesView() -{ -} - -void DolphinFilePlacesView::mousePressEvent(QMouseEvent* event) -{ - m_mouseButtons = event->buttons(); - KFilePlacesView::mousePressEvent(event); -} - -void DolphinFilePlacesView::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent) -{ - DragAndDropHelper::instance().dropUrls(KFileItem(), dest, event, parent); -} - -void DolphinFilePlacesView::emitExtendedUrlChangedSignal(const KUrl& url) -{ - emit urlChanged(url, m_mouseButtons); -} - -#include "dolphinfileplacesview.moc" diff --git a/src/panels/places/dolphinfileplacesview.h b/src/panels/places/dolphinfileplacesview.h deleted file mode 100644 index 46d574606..000000000 --- a/src/panels/places/dolphinfileplacesview.h +++ /dev/null @@ -1,51 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008 by Peter Penz * - * * - * 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 DOLPHINFILEPLACESVIEW_H -#define DOLPHINFILEPLACESVIEW_H - -#include - -/** - * @brief Combines bookmarks and mounted devices as list which is - * embedded as panel. - */ -class DolphinFilePlacesView : public KFilePlacesView -{ - Q_OBJECT - -public: - DolphinFilePlacesView(QWidget* parent); - virtual ~DolphinFilePlacesView(); - -signals: - void urlChanged(const KUrl& url, Qt::MouseButtons buttons); - -protected: - virtual void mousePressEvent(QMouseEvent* event); - -private slots: - void slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent); - void emitExtendedUrlChangedSignal(const KUrl& url); - -private: - Qt::MouseButtons m_mouseButtons; -}; - -#endif // DOLPHINFILEPLACESVIEW_H diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp new file mode 100644 index 000000000..e1e63ba9b --- /dev/null +++ b/src/panels/places/placespanel.cpp @@ -0,0 +1,56 @@ +/*************************************************************************** + * Copyright (C) 2008 by Peter Penz * + * * + * 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 "placespanel.h" +#include "draganddrophelper.h" +#include +#include + +PlacesPanel::PlacesPanel(QWidget* parent) : + KFilePlacesView(parent), + m_mouseButtons(Qt::NoButton) +{ + setDropOnPlaceEnabled(true); + connect(this, SIGNAL(urlsDropped(const KUrl&, QDropEvent*, QWidget*)), + this, SLOT(slotUrlsDropped(const KUrl&, QDropEvent*, QWidget*))); + connect(this, SIGNAL(urlChanged(const KUrl&)), + this, SLOT(emitExtendedUrlChangedSignal(const KUrl&))); +} + +PlacesPanel::~PlacesPanel() +{ +} + +void PlacesPanel::mousePressEvent(QMouseEvent* event) +{ + m_mouseButtons = event->buttons(); + KFilePlacesView::mousePressEvent(event); +} + +void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent) +{ + DragAndDropHelper::instance().dropUrls(KFileItem(), dest, event, parent); +} + +void PlacesPanel::emitExtendedUrlChangedSignal(const KUrl& url) +{ + emit urlChanged(url, m_mouseButtons); +} + +#include "placespanel.moc" diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h new file mode 100644 index 000000000..1b6681af8 --- /dev/null +++ b/src/panels/places/placespanel.h @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright (C) 2008 by Peter Penz * + * * + * 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 PLACESPANEL_H +#define PLACESPANEL_H + +#include + +/** + * @brief Combines bookmarks and mounted devices as list. + */ +class PlacesPanel : public KFilePlacesView +{ + Q_OBJECT + +public: + PlacesPanel(QWidget* parent); + virtual ~PlacesPanel(); + +signals: + void urlChanged(const KUrl& url, Qt::MouseButtons buttons); + +protected: + virtual void mousePressEvent(QMouseEvent* event); + +private slots: + void slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent); + void emitExtendedUrlChangedSignal(const KUrl& url); + +private: + Qt::MouseButtons m_mouseButtons; +}; + +#endif // PLACESPANEL_H -- cgit v1.3.1