From 4b064ca4a4b938814fdbe3d14c075d8e3de326e3 Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Fri, 8 Oct 2010 14:18:04 +0000 Subject: don't use generic name --- examples/GuiClient/GuiClient.pro | 4 +- examples/GuiClient/customToolButton.cpp | 78 --------------------------------- examples/GuiClient/customToolButton.h | 38 ---------------- examples/GuiClient/statusToolButton.cpp | 78 +++++++++++++++++++++++++++++++++ examples/GuiClient/statusToolButton.h | 38 ++++++++++++++++ examples/GuiClient/statusWidget.ui | 6 +-- 6 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 examples/GuiClient/customToolButton.cpp delete mode 100644 examples/GuiClient/customToolButton.h create mode 100644 examples/GuiClient/statusToolButton.cpp create mode 100644 examples/GuiClient/statusToolButton.h (limited to 'examples/GuiClient') diff --git a/examples/GuiClient/GuiClient.pro b/examples/GuiClient/GuiClient.pro index dd528beb..6633f51a 100644 --- a/examples/GuiClient/GuiClient.pro +++ b/examples/GuiClient/GuiClient.pro @@ -20,7 +20,7 @@ SOURCES += main.cpp \ customLabel.cpp \ avatarWidget.cpp \ statusTextWidget.cpp \ - customToolButton.cpp \ + statusToolButton.cpp \ vCardCache.cpp \ profileDialog.cpp \ capabilitiesCache.cpp \ @@ -42,7 +42,7 @@ HEADERS += messageGraphicsItem.h \ customLabel.h \ avatarWidget.h \ statusTextWidget.h \ - customToolButton.h \ + statusToolButton.h \ vCardCache.h \ profileDialog.h \ capabilitiesCache.h \ diff --git a/examples/GuiClient/customToolButton.cpp b/examples/GuiClient/customToolButton.cpp deleted file mode 100644 index 966a0a3c..00000000 --- a/examples/GuiClient/customToolButton.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2008-2010 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - */ - - -#include "customToolButton.h" -#include -#include -#include - -customToolButton::customToolButton(QWidget* parent) : QToolButton(parent) -{ - setMinimumSize(QSize(20, 18)); -} - -void customToolButton::paintEvent(QPaintEvent* event) -{ - Q_UNUSED(event); - QPainter painter(this); - if(underMouse()) - { - QStyleOptionToolButton panel; - initStyleOption(&panel); - style()->drawPrimitive(QStyle::PE_PanelButtonTool, &panel, &painter, this); - } - QRect r = rect(); - QFont font; - painter.setFont(font); - painter.setPen(Qt::gray); - - QRect rectSize(0, 0, sizeHint().width(), sizeHint().height()); - rectSize.moveCenter(r.center()); - r = rectSize; - r.adjust(0, 0, -1, -1); - painter.setPen(Qt::black); - painter.setBrush(Qt::black); - r.moveLeft(r.left() + 3); - font.setBold(true); - painter.setFont(font); - painter.drawText(r, Qt::AlignVCenter|Qt::TextSingleLine, text()); - - QImage image(":/icons/resource/downArrow.png"); - QRect rectDelta(0, 0, 7, 4); - rectDelta.moveRight(r.right() - 4); - rectDelta.moveCenter(QPoint(rectDelta.center().x(), r.center().y())); - painter.drawImage(rectDelta, image); -} - -QSize customToolButton::sizeHint() const -{ - QFont font; - font.setBold(true); - QFontMetrics fm(font); - int width = fm.width(text()); - if(width <= (160 - 8 - 9)) - return QSize(width+8+9, 18); - else - return QSize(160, 18); -} diff --git a/examples/GuiClient/customToolButton.h b/examples/GuiClient/customToolButton.h deleted file mode 100644 index 0fd3d958..00000000 --- a/examples/GuiClient/customToolButton.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008-2010 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - */ - - -#ifndef CUSTOMTOOLBUTTON_H -#define CUSTOMTOOLBUTTON_H - -#include - -class customToolButton : public QToolButton -{ -public: - customToolButton(QWidget* parent = 0); - void paintEvent(QPaintEvent* event); - QSize sizeHint() const; -}; - -#endif // CUSTOMTOOLBUTTON_H diff --git a/examples/GuiClient/statusToolButton.cpp b/examples/GuiClient/statusToolButton.cpp new file mode 100644 index 00000000..acd8f165 --- /dev/null +++ b/examples/GuiClient/statusToolButton.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2008-2010 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + */ + + +#include "statusToolButton.h" +#include +#include +#include + +statusToolButton::statusToolButton(QWidget* parent) : QToolButton(parent) +{ + setMinimumSize(QSize(20, 18)); +} + +void statusToolButton::paintEvent(QPaintEvent* event) +{ + Q_UNUSED(event); + QPainter painter(this); + if(underMouse()) + { + QStyleOptionToolButton panel; + initStyleOption(&panel); + style()->drawPrimitive(QStyle::PE_PanelButtonTool, &panel, &painter, this); + } + QRect r = rect(); + QFont font; + painter.setFont(font); + painter.setPen(Qt::gray); + + QRect rectSize(0, 0, sizeHint().width(), sizeHint().height()); + rectSize.moveCenter(r.center()); + r = rectSize; + r.adjust(0, 0, -1, -1); + painter.setPen(Qt::black); + painter.setBrush(Qt::black); + r.moveLeft(r.left() + 3); + font.setBold(true); + painter.setFont(font); + painter.drawText(r, Qt::AlignVCenter|Qt::TextSingleLine, text()); + + QImage image(":/icons/resource/downArrow.png"); + QRect rectDelta(0, 0, 7, 4); + rectDelta.moveRight(r.right() - 4); + rectDelta.moveCenter(QPoint(rectDelta.center().x(), r.center().y())); + painter.drawImage(rectDelta, image); +} + +QSize statusToolButton::sizeHint() const +{ + QFont font; + font.setBold(true); + QFontMetrics fm(font); + int width = fm.width(text()); + if(width <= (160 - 8 - 9)) + return QSize(width+8+9, 18); + else + return QSize(160, 18); +} diff --git a/examples/GuiClient/statusToolButton.h b/examples/GuiClient/statusToolButton.h new file mode 100644 index 00000000..e60924f1 --- /dev/null +++ b/examples/GuiClient/statusToolButton.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2008-2010 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + */ + + +#ifndef STATUSTOOLBUTTON_H +#define STATUSTOOLBUTTON_H + +#include + +class statusToolButton : public QToolButton +{ +public: + statusToolButton(QWidget* parent = 0); + void paintEvent(QPaintEvent* event); + QSize sizeHint() const; +}; + +#endif // STATUSTOOLBUTTON_H diff --git a/examples/GuiClient/statusWidget.ui b/examples/GuiClient/statusWidget.ui index 32e27d9c..2b8771ca 100644 --- a/examples/GuiClient/statusWidget.ui +++ b/examples/GuiClient/statusWidget.ui @@ -59,7 +59,7 @@ 0 - + toolbutton @@ -201,9 +201,9 @@ 1 - customToolButton + statusToolButton QToolButton -
customToolButton.h
+
statusToolButton.h
-- cgit v1.2.3