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/terminal/terminalpanel.cpp | 96 ++++++++++++++++++++++++++++ src/panels/terminal/terminalpanel.h | 62 ++++++++++++++++++ src/panels/terminal/terminalsidebarpage.cpp | 97 ----------------------------- src/panels/terminal/terminalsidebarpage.h | 62 ------------------ 4 files changed, 158 insertions(+), 159 deletions(-) create mode 100644 src/panels/terminal/terminalpanel.cpp create mode 100644 src/panels/terminal/terminalpanel.h delete mode 100644 src/panels/terminal/terminalsidebarpage.cpp delete mode 100644 src/panels/terminal/terminalsidebarpage.h (limited to 'src/panels/terminal') diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp new file mode 100644 index 000000000..cc3b85318 --- /dev/null +++ b/src/panels/terminal/terminalpanel.cpp @@ -0,0 +1,96 @@ +/*************************************************************************** + * Copyright (C) 2007 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 "terminalpanel.h" + +#include +#include +#include +#include + +#include +#include + +TerminalPanel::TerminalPanel(QWidget* parent) : + Panel(parent), + m_layout(0), + m_terminal(0), + m_terminalWidget(0) +{ + m_layout = new QVBoxLayout(this); + m_layout->setMargin(0); +} + +TerminalPanel::~TerminalPanel() +{ +} + +QSize TerminalPanel::sizeHint() const +{ + QSize size = Panel::sizeHint(); + size.setHeight(200); + return size; +} + +void TerminalPanel::setUrl(const KUrl& url) +{ + if (!url.isValid() || (url == Panel::url())) { + return; + } + + Panel::setUrl(url); + if ((m_terminal != 0) && isVisible() && url.isLocalFile()) { + m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n'); + } +} + +void TerminalPanel::terminalExited() +{ + emit hideTerminalPanel(); + m_terminal = 0; +} + +void TerminalPanel::showEvent(QShowEvent* event) +{ + if (event->spontaneous()) { + Panel::showEvent(event); + return; + } + + if (m_terminal == 0) { + KPluginFactory* factory = KPluginLoader("libkonsolepart").factory(); + KParts::ReadOnlyPart* part = factory ? (factory->create(this)) : 0; + if (part != 0) { + connect(part, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited())); + m_terminalWidget = part->widget(); + m_layout->addWidget(m_terminalWidget); + m_terminal = qobject_cast(part); + m_terminal->showShellInDir(url().path()); + } + } + if (m_terminal != 0) { + m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n'); + m_terminal->sendInput("clear\n"); + m_terminalWidget->setFocus(); + } + + Panel::showEvent(event); +} + +#include "terminalpanel.moc" diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h new file mode 100644 index 000000000..672938c32 --- /dev/null +++ b/src/panels/terminal/terminalpanel.h @@ -0,0 +1,62 @@ +/*************************************************************************** + * Copyright (C) 2007 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 TERMINALPANEL_H +#define TERMINALPANEL_H + +#include + +class TerminalInterface; +class QVBoxLayout; +class QWidget; + +/** + * @brief Shows the terminal which is synchronized with the URL of the + * active view. + */ +class TerminalPanel : public Panel +{ + Q_OBJECT + +public: + TerminalPanel(QWidget* parent = 0); + virtual ~TerminalPanel(); + + /** @see QWidget::sizeHint() */ + virtual QSize sizeHint() const; + +public slots: + /** @see Panel::setUrl(). */ + virtual void setUrl(const KUrl& url); + void terminalExited(); + +signals: + void hideTerminalPanel(); + +protected: + /** @see QWidget::showEvent() */ + virtual void showEvent(QShowEvent* event); + +private: + QVBoxLayout* m_layout; + TerminalInterface* m_terminal; + QWidget* m_terminalWidget; +}; + +#endif // TERMINALPANEL_H diff --git a/src/panels/terminal/terminalsidebarpage.cpp b/src/panels/terminal/terminalsidebarpage.cpp deleted file mode 100644 index 4749e7714..000000000 --- a/src/panels/terminal/terminalsidebarpage.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 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 "terminalsidebarpage.h" - -#include -#include -#include -#include - -#include -#include - -TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) : - SidebarPage(parent), - m_layout(0), - m_terminal(0), - m_terminalWidget(0) -{ - m_layout = new QVBoxLayout(this); - m_layout->setMargin(0); -} - -TerminalSidebarPage::~TerminalSidebarPage() -{ -} - -QSize TerminalSidebarPage::sizeHint() const -{ - QSize size = SidebarPage::sizeHint(); - size.setHeight(200); - return size; -} - -void TerminalSidebarPage::setUrl(const KUrl& url) -{ - if (!url.isValid() || (url == SidebarPage::url())) { - return; - } - - SidebarPage::setUrl(url); - if ((m_terminal != 0) && isVisible() && url.isLocalFile()) { - m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n'); - } -} - -void TerminalSidebarPage::terminalExited() -{ - emit hideTerminalSidebarPage(); - - m_terminal = 0; -} - -void TerminalSidebarPage::showEvent(QShowEvent* event) -{ - if (event->spontaneous()) { - SidebarPage::showEvent(event); - return; - } - - if (m_terminal == 0) { - KPluginFactory* factory = KPluginLoader("libkonsolepart").factory(); - KParts::ReadOnlyPart* part = factory ? (factory->create(this)) : 0; - if (part != 0) { - connect(part, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited())); - m_terminalWidget = part->widget(); - m_layout->addWidget(m_terminalWidget); - m_terminal = qobject_cast(part); - m_terminal->showShellInDir(url().path()); - } - } - if (m_terminal != 0) { - m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n'); - m_terminal->sendInput("clear\n"); - m_terminalWidget->setFocus(); - } - - SidebarPage::showEvent(event); -} - -#include "terminalsidebarpage.moc" diff --git a/src/panels/terminal/terminalsidebarpage.h b/src/panels/terminal/terminalsidebarpage.h deleted file mode 100644 index 4e8c40593..000000000 --- a/src/panels/terminal/terminalsidebarpage.h +++ /dev/null @@ -1,62 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 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 TERMINALSIDEBARPAGE_H -#define TERMINALSIDEBARPAGE_H - -#include - -class TerminalInterface; -class QVBoxLayout; -class QWidget; - -/** - * @brief Shows the terminal which is synchronized with the URL of the - * active view. - */ -class TerminalSidebarPage : public SidebarPage -{ - Q_OBJECT - -public: - TerminalSidebarPage(QWidget* parent = 0); - virtual ~TerminalSidebarPage(); - - /** @see QWidget::sizeHint() */ - virtual QSize sizeHint() const; - -public slots: - /** @see SidebarPage::setUrl(). */ - virtual void setUrl(const KUrl& url); - void terminalExited(); - -signals: - void hideTerminalSidebarPage(); - -protected: - /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); - -private: - QVBoxLayout* m_layout; - TerminalInterface* m_terminal; - QWidget* m_terminalWidget; -}; - -#endif // TERMINALSIDEBARPAGE_H -- cgit v1.3