diff --git a/CMakeLists.txt b/CMakeLists.txt index a97583d16..7a6f7da92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,14 +59,15 @@ set(plasma_LIB_SRCS scripting/dataenginescript.cpp scripting/runnerscript.cpp scripting/scriptengine.cpp + widgets/flash.cpp widgets/icon.cpp widgets/label.cpp widgets/lineedit.cpp - widgets/webcontent.cpp widgets/meter.cpp widgets/pushbutton.cpp + widgets/radiobutton.cpp widgets/signalplotter.cpp - widgets/flash.cpp + widgets/webcontent.cpp ) kde4_add_ui_files ( @@ -143,13 +144,15 @@ install(FILES DESTINATION ${INCLUDE_INSTALL_DIR}/plasma) install(FILES + widgets/flash.h widgets/icon.h widgets/label.h widgets/lineedit.h - widgets/webcontent.h widgets/meter.h + widgets/pushbutton.h + widgets/radiobutton.h widgets/signalplotter.h - widgets/flash.h + widgets/webcontent.h DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets) #For future @@ -195,6 +198,15 @@ install(FILES includes/Delegate DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma) +install(FILES + includes/Label + includes/LineEdit + includes/PushButton + includes/RadioButton + includes/WebContent + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma/Widgets) + + if(QT_QTOPENGL_FOUND AND OPENGL_FOUND) install(FILES includes/GLApplet diff --git a/includes/PushButton b/includes/PushButton index 55da654bb..cdcaaedc0 100644 --- a/includes/PushButton +++ b/includes/PushButton @@ -1 +1 @@ -#include ../../plasma/pushbutton.h +#include ../../plasma/widgets/pushbutton.h diff --git a/widgets/radiobutton.cpp b/widgets/radiobutton.cpp new file mode 100644 index 000000000..754bf64ea --- /dev/null +++ b/widgets/radiobutton.cpp @@ -0,0 +1,163 @@ +/* + * Copyright 2008 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, 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 Library 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 "radiobutton.h" + +#include +#include + +#include + +#include "theme.h" +#include "svg.h" + +namespace Plasma +{ + +class RadioButton::Private +{ +public: + Private() + : svg(0) + { + } + + ~Private() + { + delete svg; + } + + void setPixmap(RadioButton *q) + { + if (imagePath.isEmpty()) { + return; + } + + KMimeType::Ptr mime = KMimeType::findByPath(absImagePath); + QPixmap pm(q->size().toSize()); + + if (mime->is("image/svg+xml")) { + svg = new Svg(); + QPainter p(&pm); + svg->paint(&p, pm.rect()); + } else { + pm = QPixmap(absImagePath); + } + + static_cast(q->widget())->setIcon(QIcon(pm)); + } + + QString imagePath; + QString absImagePath; + Svg *svg; +}; + +RadioButton::RadioButton(QGraphicsWidget *parent) + : QGraphicsProxyWidget(parent), + d(new Private) +{ + QRadioButton* native = new QRadioButton; + connect(native, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool))); + setWidget(native); + native->setAttribute(Qt::WA_NoSystemBackground); +} + +RadioButton::~RadioButton() +{ + delete d; +} + +void RadioButton::setText(const QString &text) +{ + static_cast(widget())->setText(text); +} + +QString RadioButton::text() const +{ + return static_cast(widget())->text(); +} + +void RadioButton::setImage(const QString &path) +{ + if (d->imagePath == path) { + return; + } + + delete d->svg; + d->svg = 0; + d->imagePath = path; + + bool absolutePath = !path.isEmpty() && + #ifdef Q_WS_WIN + !QDir::isRelativePath(path) + #else + path[0] == '/' + #endif + ; + + if (absolutePath) { + d->absImagePath = path; + } else { + //TODO: package support + d->absImagePath = Theme::defaultTheme()->imagePath(path); + } + + d->setPixmap(this); +} + +QString RadioButton::image() const +{ + return d->imagePath; +} + +void RadioButton::setStylesheet(const QString &stylesheet) +{ + widget()->setStyleSheet(stylesheet); +} + +QString RadioButton::stylesheet() +{ + return widget()->styleSheet(); +} + +QRadioButton* RadioButton::nativeWidget() const +{ + return static_cast(widget()); +} + +void RadioButton::resizeEvent(QGraphicsSceneResizeEvent *event) +{ + d->setPixmap(this); + QGraphicsProxyWidget::resizeEvent(event); +} + +void RadioButton::setChecked(bool checked) +{ + static_cast(widget())->setChecked(checked); +} + +bool RadioButton::isChecked() const +{ + return static_cast(widget())->isChecked(); +} + +} // namespace Plasma + +#include + diff --git a/widgets/radiobutton.h b/widgets/radiobutton.h new file mode 100644 index 000000000..42dc39b7f --- /dev/null +++ b/widgets/radiobutton.h @@ -0,0 +1,112 @@ +/* + * Copyright 2008 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, 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 Library 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 PLASMA__H +#define PLASMA__H + +#include + +class QRadioButton; + +namespace Plasma +{ + +class RadioButton : public QGraphicsProxyWidget +{ + Q_OBJECT + + Q_PROPERTY(QGraphicsWidget* parentWidget READ parentWidget) + Q_PROPERTY(QString text READ text WRITE setText) + Q_PROPERTY(QString image READ image WRITE setImage) + Q_PROPERTY(QString stylesheet READ stylesheet WRITE setStylesheet) + Q_PROPERTY(QRadioButton* nativeWidget READ nativeWidget) + Q_PROPERTY(bool isChecked READ isChecked WRITE setChecked) + +public: + explicit RadioButton(QGraphicsWidget *parent = 0); + ~RadioButton(); + + /** + * Sets the display text for this RadioButton + * + * @arg text the text to display; should be translated. + */ + void setText(const QString &text); + + /** + * @return the display text + */ + QString text() const; + + /** + * Sets the path to an image to display. + * + * @arg path the path to the image; if a relative path, then a themed image will be loaded. + */ + void setImage(const QString &path); + + /** + * @return the image path being displayed currently, or an empty string if none. + */ + QString image() const; + + /** + * Sets the style sheet used to control the visual display of this RadioButton + * + * @arg stylehseet a CSS string + */ + void setStylesheet(const QString &stylesheet); + + /** + * @return the stylesheet currently used with this widget + */ + QString stylesheet(); + + /** + * @return the native widget wrapped by this RadioButton + */ + QRadioButton* nativeWidget() const; + + /** + * Sets the checked state. + * + * @arg checked true if checked, false if not + */ + void setChecked(bool checked); + + /** + * @return the checked state + */ + bool isChecked() const; + +Q_SIGNALS: + void toggled(bool); + +protected: + void resizeEvent(QGraphicsSceneResizeEvent *event); + +private: + class Private; + Private * const d; +}; + +} // namespace Plasma + +#endif // multiple inclusion guard