diff options
Diffstat (limited to 'src/plugins/Visual/analyzer')
| -rw-r--r-- | src/plugins/Visual/analyzer/colorwidget.cpp | 26 | ||||
| -rw-r--r-- | src/plugins/Visual/analyzer/colorwidget.h | 12 |
2 files changed, 18 insertions, 20 deletions
diff --git a/src/plugins/Visual/analyzer/colorwidget.cpp b/src/plugins/Visual/analyzer/colorwidget.cpp index 32196db76..ebe8aba7a 100644 --- a/src/plugins/Visual/analyzer/colorwidget.cpp +++ b/src/plugins/Visual/analyzer/colorwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005 by Ilya Kotov * + * Copyright (C) 2005-2012 by Ilya Kotov * * qmmeter_freedevelop@mail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -17,8 +17,10 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "colorwidget.h" +#include <QColorDialog> +#include <QPalette> +#include "colorwidget.h" ColorWidget::ColorWidget(QWidget *parent) : QFrame(parent) { @@ -26,31 +28,29 @@ ColorWidget::ColorWidget(QWidget *parent) : QFrame(parent) setAutoFillBackground(true); } - ColorWidget::~ColorWidget() {} -void ColorWidget::mousePressEvent( QMouseEvent *) +void ColorWidget::mousePressEvent(QMouseEvent *) { - QColor color = QColorDialog::getColor(); + QColor color = QColorDialog::getColor(palette().color(backgroundRole()), parentWidget(), + tr("Select Color")); if (color.isValid()) { QPalette palette; - palette.setColor(this->backgroundRole(), color); - this->setPalette(palette); + palette.setColor(backgroundRole(), color); + setPalette(palette); } } void ColorWidget::setColor(QString c) { QPalette palette; - palette.setColor(this->backgroundRole(), c); - this->setPalette(palette); + palette.setColor(backgroundRole(), c); + setPalette(palette); } -QString ColorWidget::colorName() +const QString ColorWidget::colorName() const { - QPalette palette; - palette = this->palette(); - return (palette.color(this->backgroundRole())).name(); + return palette().color(backgroundRole()).name(); } diff --git a/src/plugins/Visual/analyzer/colorwidget.h b/src/plugins/Visual/analyzer/colorwidget.h index 693ad5877..f7bff5b92 100644 --- a/src/plugins/Visual/analyzer/colorwidget.h +++ b/src/plugins/Visual/analyzer/colorwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005 by Ilya Kotov * + * Copyright (C) 2005-2012 by Ilya Kotov * * qmmeter_freedevelop@mail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -21,11 +21,10 @@ #define COLORWIDGET_H #include <QFrame> -#include <QColorDialog> #include <QPaintEvent> /** -@author user +@author Ilya Kotov */ class ColorWidget : public QFrame { @@ -35,14 +34,13 @@ public: ~ColorWidget(); - QString colorName(); + const QString colorName() const; public slots: void setColor (QString); - -protected: - virtual void mousePressEvent ( QMouseEvent *); +private: + void mousePressEvent(QMouseEvent *); }; |