From a1aa8254a43d6f819fc0d297a40246abd0ede32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 25 Feb 2013 23:09:09 +0100 Subject: Fix unintended rename of kastaskpopup --- kicker/extensions/kasbar/CMakeLists.txt | 2 +- kicker/extensions/kasbar/Makefile.am | 2 +- kicker/extensions/kasbar/kastaskitem.cpp | 2 +- kicker/extensions/kasbar/kastaskpopup.cpp | 139 ++++++++++++++++++++++++++++ kicker/extensions/kasbar/kastaskpopup.h | 90 ++++++++++++++++++ kicker/extensions/kasbar/kastastdepopup.cpp | 139 ---------------------------- kicker/extensions/kasbar/kastastdepopup.h | 90 ------------------ 7 files changed, 232 insertions(+), 232 deletions(-) create mode 100644 kicker/extensions/kasbar/kastaskpopup.cpp create mode 100644 kicker/extensions/kasbar/kastaskpopup.h delete mode 100644 kicker/extensions/kasbar/kastastdepopup.cpp delete mode 100644 kicker/extensions/kasbar/kastastdepopup.h diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt index 31a1db895..c9fd0e736 100644 --- a/kicker/extensions/kasbar/CMakeLists.txt +++ b/kicker/extensions/kasbar/CMakeLists.txt @@ -33,7 +33,7 @@ set( target kasbar ) set( ${target}_SRCS kasbar.cpp kasitem.cpp kastaskitem.cpp kastasker.cpp - kaspopup.cpp kastastdepopup.cpp kasstartupitem.cpp + kaspopup.cpp kastaskpopup.cpp kasstartupitem.cpp kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp kasgroupitem.cpp kasresources.cpp kasgrouper.cpp kasloaditem.cpp diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index 25635299d..e186aad17 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkasbar.la libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \ kastaskitem.cpp kastasker.cpp kaspopup.cpp \ - kastastdepopup.cpp kasstartupitem.cpp \ + kastaskpopup.cpp kasstartupitem.cpp \ kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp \ kasgroupitem.cpp kasresources.cpp kasgrouper.cpp \ kasloaditem.cpp diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index f9fb23649..0f57524cc 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -81,7 +81,7 @@ #include #include "kastasker.h" -#include "kastastdepopup.h" +#include "kastaskpopup.h" #include "kastaskitem.h" #include "kasbarextension.h" diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp new file mode 100644 index 000000000..7b5fe4ed5 --- /dev/null +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -0,0 +1,139 @@ +/* kastaskpopup.cpp +** +** Copyright (C) 2001-2004 Richard Moore +** Contributor: Mosfet +** All rights reserved. +** +** KasBar is dual-licensed: you can choose the GPL or the BSD license. +** Short forms of both licenses are included below. +*/ + +/* +** 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 in a file called COPYING; if not, write to +** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +** MA 02110-1301, USA. +*/ + +/* +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** 2. Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +** ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +** SUCH DAMAGE. +*/ + +/* +** Bug reports and questions can be sent to kde-devel@kde.org +*/ +#include +#include + +#include +#include +#include + +#include + +#include "kastaskitem.h" +#include "kastasker.h" + +#include "kastaskpopup.h" +#include "kastaskpopup.moc" + +static const int TITLE_HEIGHT = 13; + +KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) + : KasPopup( item, name ) +{ + this->item = item; + + setFont(TDEGlobalSettings::generalFont()); + setMouseTracking( true ); + + TQString text = item->task()->visibleIconicName(); + if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { + titleBg.resize( width(), TITLE_HEIGHT ); + + setFixedSize( item->task()->thumbnail().width() + 2, + TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); + } + else { + int w = fontMetrics().width( text ) + 4; + int h = TITLE_HEIGHT + 1; + titleBg.resize( w, h ); + setFixedSize( w, h ); + } + + KPixmapEffect::gradient( titleBg, + Qt::black, colorGroup().mid(), + KPixmapEffect::DiagonalGradient ); + + connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); +} + +KasTaskPopup::~KasTaskPopup() +{ +} + +void KasTaskPopup::refresh() +{ + TQString text = item->task()->visibleIconicName(); + if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { + resize( item->task()->thumbnail().width() + 2, + TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); + titleBg.resize( width(), TITLE_HEIGHT ); + } + update(); +} + +void KasTaskPopup::paintEvent( TQPaintEvent * ) +{ + TQPainter p( this ); + p.drawPixmap( 0, 0, titleBg ); + + TQString text = item->task()->visibleIconicName(); + + p.setPen( Qt::white ); + if ( fontMetrics().width( text ) > width() - 4 ) + p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter, + text ); + else + p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignCenter, text ); + + TQPixmap thumb = item->task()->thumbnail(); + if ( !thumb.isNull() ) + p.drawPixmap( 1, TITLE_HEIGHT, thumb ); + + // + // Draw border + // + p.setPen( Qt::black ); + p.drawRect( 0, 0, width(), height() ); +} + diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h new file mode 100644 index 000000000..dcdc33107 --- /dev/null +++ b/kicker/extensions/kasbar/kastaskpopup.h @@ -0,0 +1,90 @@ +/* kastaskpopup.h +** +** Copyright (C) 2001-2004 Richard Moore +** Contributor: Mosfet +** All rights reserved. +** +** KasBar is dual-licensed: you can choose the GPL or the BSD license. +** Short forms of both licenses are included below. +*/ + +/* +** 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 in a file called COPYING; if not, write to +** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +** MA 02110-1301, USA. +*/ + +/* +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** 2. Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +** ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +** SUCH DAMAGE. +*/ + +/* +** Bug reports and questions can be sent to kde-devel@kde.org +*/ +// -*- c++ -*- + +#ifndef KASTASKPOPUP_H +#define KASTASKPOPUP_H + +#include +#include "kaspopup.h" + +class KasTaskItem; + +/** + * A subclass of KasPopup which shows info about a task. + * + * @author Richard Moore, rich@kde.org + */ +class KasTaskPopup : public KasPopup +{ + Q_OBJECT + +public: + KasTaskPopup( KasTaskItem *item, const char *name=0 ); + virtual ~KasTaskPopup(); + +public slots: + void refresh(); + +protected: + virtual void paintEvent( TQPaintEvent * ); + + private: + KasTaskItem *item; + KPixmap titleBg; +}; + +#endif // KASTASKPOPUP_H + + diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp deleted file mode 100644 index 292b6d86f..000000000 --- a/kicker/extensions/kasbar/kastastdepopup.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/* kastastdepopup.cpp -** -** Copyright (C) 2001-2004 Richard Moore -** Contributor: Mosfet -** All rights reserved. -** -** KasBar is dual-licensed: you can choose the GPL or the BSD license. -** Short forms of both licenses are included below. -*/ - -/* -** 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 in a file called COPYING; if not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -** MA 02110-1301, USA. -*/ - -/* -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -** SUCH DAMAGE. -*/ - -/* -** Bug reports and questions can be sent to kde-devel@kde.org -*/ -#include -#include - -#include -#include -#include - -#include - -#include "kastaskitem.h" -#include "kastasker.h" - -#include "kastastdepopup.h" -#include "kastastdepopup.moc" - -static const int TITLE_HEIGHT = 13; - -KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) - : KasPopup( item, name ) -{ - this->item = item; - - setFont(TDEGlobalSettings::generalFont()); - setMouseTracking( true ); - - TQString text = item->task()->visibleIconicName(); - if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { - titleBg.resize( width(), TITLE_HEIGHT ); - - setFixedSize( item->task()->thumbnail().width() + 2, - TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); - } - else { - int w = fontMetrics().width( text ) + 4; - int h = TITLE_HEIGHT + 1; - titleBg.resize( w, h ); - setFixedSize( w, h ); - } - - KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), - KPixmapEffect::DiagonalGradient ); - - connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); -} - -KasTaskPopup::~KasTaskPopup() -{ -} - -void KasTaskPopup::refresh() -{ - TQString text = item->task()->visibleIconicName(); - if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { - resize( item->task()->thumbnail().width() + 2, - TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); - titleBg.resize( width(), TITLE_HEIGHT ); - } - update(); -} - -void KasTaskPopup::paintEvent( TQPaintEvent * ) -{ - TQPainter p( this ); - p.drawPixmap( 0, 0, titleBg ); - - TQString text = item->task()->visibleIconicName(); - - p.setPen( Qt::white ); - if ( fontMetrics().width( text ) > width() - 4 ) - p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter, - text ); - else - p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignCenter, text ); - - TQPixmap thumb = item->task()->thumbnail(); - if ( !thumb.isNull() ) - p.drawPixmap( 1, TITLE_HEIGHT, thumb ); - - // - // Draw border - // - p.setPen( Qt::black ); - p.drawRect( 0, 0, width(), height() ); -} - diff --git a/kicker/extensions/kasbar/kastastdepopup.h b/kicker/extensions/kasbar/kastastdepopup.h deleted file mode 100644 index 60cff87bb..000000000 --- a/kicker/extensions/kasbar/kastastdepopup.h +++ /dev/null @@ -1,90 +0,0 @@ -/* kastastdepopup.h -** -** Copyright (C) 2001-2004 Richard Moore -** Contributor: Mosfet -** All rights reserved. -** -** KasBar is dual-licensed: you can choose the GPL or the BSD license. -** Short forms of both licenses are included below. -*/ - -/* -** 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 in a file called COPYING; if not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -** MA 02110-1301, USA. -*/ - -/* -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -** SUCH DAMAGE. -*/ - -/* -** Bug reports and questions can be sent to kde-devel@kde.org -*/ -// -*- c++ -*- - -#ifndef KASTASKPOPUP_H -#define KASTASKPOPUP_H - -#include -#include "kaspopup.h" - -class KasTaskItem; - -/** - * A subclass of KasPopup which shows info about a task. - * - * @author Richard Moore, rich@kde.org - */ -class KasTaskPopup : public KasPopup -{ - Q_OBJECT - -public: - KasTaskPopup( KasTaskItem *item, const char *name=0 ); - virtual ~KasTaskPopup(); - -public slots: - void refresh(); - -protected: - virtual void paintEvent( TQPaintEvent * ); - - private: - KasTaskItem *item; - KPixmap titleBg; -}; - -#endif // KASTASKPOPUP_H - - -- cgit v1.2.1