From 5c14d0367180b756273770a387733472121dec0f Mon Sep 17 00:00:00 2001 From: deva Date: Tue, 1 Jul 2008 06:22:14 +0000 Subject: Renamed PushButton to Button, to better match the specs. --- client/client.pro | 4 +- client/widgetbuilder.cc | 12 +++--- client/widgets.h | 2 +- client/widgets/button.cc | 92 ++++++++++++++++++++++++++++++++++++++++++++ client/widgets/button.h | 57 +++++++++++++++++++++++++++ client/widgets/pushbutton.cc | 92 -------------------------------------------- client/widgets/pushbutton.h | 57 --------------------------- 7 files changed, 158 insertions(+), 158 deletions(-) create mode 100644 client/widgets/button.cc create mode 100644 client/widgets/button.h delete mode 100644 client/widgets/pushbutton.cc delete mode 100644 client/widgets/pushbutton.h (limited to 'client') diff --git a/client/client.pro b/client/client.pro index 49b718a..cc69d96 100644 --- a/client/client.pro +++ b/client/client.pro @@ -35,7 +35,7 @@ HEADERS += \ widgets/lineedit.h \ widgets/multilist.h \ widgets/textedit.h \ - widgets/pushbutton.h \ + widgets/button.h \ widgets/combobox.h \ widgets/listbox.h \ widgets/frame.h \ @@ -58,7 +58,7 @@ SOURCES += \ widgets/lineedit.cc \ widgets/multilist.cc \ widgets/textedit.cc \ - widgets/pushbutton.cc \ + widgets/button.cc \ widgets/combobox.cc \ widgets/listbox.cc \ widgets/frame.cc \ diff --git a/client/widgetbuilder.cc b/client/widgetbuilder.cc index 8d23c0b..d458379 100644 --- a/client/widgetbuilder.cc +++ b/client/widgetbuilder.cc @@ -54,13 +54,13 @@ QVector< Widget* > widgetBuilder(QDomNode xml_node, QWidget *parent, MacroWindow widget = lineedit; } else if(xml_elem.tagName() == "button") { - PushButton *pushbutton = new PushButton(xml_elem, macrowindow); + Button *button = new Button(xml_elem, macrowindow); //macrowindow->connect(pushbutton, SIGNAL(act_continue()), main, SLOT(get_macro())); - macrowindow->connect(pushbutton, SIGNAL(act_commit()), macrowindow, SLOT(commit())); - macrowindow->connect(pushbutton, SIGNAL(act_reset()), macrowindow, SLOT(reset())); - macrowindow->connect(pushbutton, SIGNAL(act_cancel()), macrowindow, SLOT(cancel())); - macrowindow->connect(pushbutton, SIGNAL(act_continue(QString)), macrowindow, SLOT(cont(QString))); - widget = pushbutton; + macrowindow->connect(button, SIGNAL(act_commit()), macrowindow, SLOT(commit())); + macrowindow->connect(button, SIGNAL(act_reset()), macrowindow, SLOT(reset())); + macrowindow->connect(button, SIGNAL(act_cancel()), macrowindow, SLOT(cancel())); + macrowindow->connect(button, SIGNAL(act_continue(QString)), macrowindow, SLOT(cont(QString))); + widget = button; } else if(xml_elem.tagName() == "textedit") { TextEdit *textedit = new TextEdit(xml_elem, macrowindow); diff --git a/client/widgets.h b/client/widgets.h index 97f5962..18a2856 100644 --- a/client/widgets.h +++ b/client/widgets.h @@ -31,7 +31,7 @@ #include "widgets/label.h" #include "widgets/lineedit.h" #include "widgets/textedit.h" -#include "widgets/pushbutton.h" +#include "widgets/button.h" #include "widgets/combobox.h" #include "widgets/listbox.h" #include "widgets/multilist.h" diff --git a/client/widgets/button.cc b/client/widgets/button.cc new file mode 100644 index 0000000..f40b0ec --- /dev/null +++ b/client/widgets/button.cc @@ -0,0 +1,92 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * button.cc + * + * Fri Jul 13 12:38:45 CEST 2007 + * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen + * deva@aasimon.org and elsenator@gmail.com + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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. + * + * Pracro 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 Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#include "button.h" +#include + +Button::Button(QDomNode &node, MacroWindow *macrowindow) + : QPushButton(), Widget(node, macrowindow) +{ + QDomElement elem = node.toElement(); + + if(elem.hasAttribute("width")) { + //resize(elem.attribute("width").toInt(), height()); + setMinimumWidth(elem.attribute("width").toInt()); + } + + if(elem.hasAttribute("height")) { + //resize(width(), elem.attribute("height").toInt()); + setMinimumHeight(elem.attribute("height").toInt()); + } + + if(elem.hasAttribute("field")) { + field = elem.attribute("field"); + } + + if(elem.hasAttribute("caption")) { + setText(elem.attribute("caption")); + } else { + setText(""); + } + + if(elem.hasAttribute("action")) { + if(elem.attribute("action") == "commit") { + connect(this, SIGNAL(clicked()), this, SLOT(commit())); + } else if(elem.attribute("action") == "reset") { + connect(this, SIGNAL(clicked()), this, SLOT(reset())); + } else if(elem.attribute("action") == "cancel") { + connect(this, SIGNAL(clicked()), this, SLOT(cancel())); + } else if(elem.attribute("action") == "continue") { + connect(this, SIGNAL(clicked()), this, SLOT(cont())); + } + } else { + setEnabled(false); + } +} + +void Button::commit() +{ + emit act_commit(); + printf("Emit: commit\n"); +} + +void Button::reset() +{ + emit act_reset(); + printf("Emit: reset\n"); +} + +void Button::cancel() +{ + emit act_cancel(); + printf("Emit: cancel\n"); +} + +void Button::cont() +{ + emit act_continue(field); + printf("Emit: continue\n"); +} diff --git a/client/widgets/button.h b/client/widgets/button.h new file mode 100644 index 0000000..effcd79 --- /dev/null +++ b/client/widgets/button.h @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * button.h + * + * Fri Jul 13 12:38:45 CEST 2007 + * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen + * deva@aasimon.org and elsenator@gmail.com + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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. + * + * Pracro 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 Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#ifndef __PRACRO_BUTTON_H__ +#define __PRACRO_BUTTON_H__ + +#include "widget.h" +#include +#include +#include + +class Button : public QPushButton, public Widget +{ +Q_OBJECT +public: + Button(QDomNode &node, MacroWindow *macrowindow); + QString field; + +public slots: + void commit(); + void reset(); + void cancel(); + void cont(); + +signals: + void act_commit(); + void act_reset(); + void act_cancel(); + void act_continue(QString); + +private: + +}; +#endif/*__PRACRO_BUTTON_H__*/ diff --git a/client/widgets/pushbutton.cc b/client/widgets/pushbutton.cc deleted file mode 100644 index 21d5c1b..0000000 --- a/client/widgets/pushbutton.cc +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * pushbutton.cc - * - * Fri Jul 13 12:38:45 CEST 2007 - * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen - * deva@aasimon.org and elsenator@gmail.com - ****************************************************************************/ - -/* - * This file is part of Pracro. - * - * Pracro 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. - * - * Pracro 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 Pracro; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#include "pushbutton.h" -#include - -PushButton::PushButton(QDomNode &node, MacroWindow *macrowindow) - : QPushButton(), Widget(node, macrowindow) -{ - QDomElement elem = node.toElement(); - - if(elem.hasAttribute("width")) { - //resize(elem.attribute("width").toInt(), height()); - setMinimumWidth(elem.attribute("width").toInt()); - } - - if(elem.hasAttribute("height")) { - //resize(width(), elem.attribute("height").toInt()); - setMinimumHeight(elem.attribute("height").toInt()); - } - - if(elem.hasAttribute("field")) { - field = elem.attribute("field"); - } - - if(elem.hasAttribute("caption")) { - setText(elem.attribute("caption")); - } else { - setText(""); - } - - if(elem.hasAttribute("action")) { - if(elem.attribute("action") == "commit") { - connect(this, SIGNAL(clicked()), this, SLOT(commit())); - } else if(elem.attribute("action") == "reset") { - connect(this, SIGNAL(clicked()), this, SLOT(reset())); - } else if(elem.attribute("action") == "cancel") { - connect(this, SIGNAL(clicked()), this, SLOT(cancel())); - } else if(elem.attribute("action") == "continue") { - connect(this, SIGNAL(clicked()), this, SLOT(cont())); - } - } else { - setEnabled(false); - } -} - -void PushButton::commit() -{ - emit act_commit(); - printf("Emit: commit\n"); -} - -void PushButton::reset() -{ - emit act_reset(); - printf("Emit: reset\n"); -} - -void PushButton::cancel() -{ - emit act_cancel(); - printf("Emit: cancel\n"); -} - -void PushButton::cont() -{ - emit act_continue(field); - printf("Emit: continue\n"); -} diff --git a/client/widgets/pushbutton.h b/client/widgets/pushbutton.h deleted file mode 100644 index acefdf1..0000000 --- a/client/widgets/pushbutton.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * pushbutton.h - * - * Fri Jul 13 12:38:45 CEST 2007 - * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen - * deva@aasimon.org and elsenator@gmail.com - ****************************************************************************/ - -/* - * This file is part of Pracro. - * - * Pracro 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. - * - * Pracro 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 Pracro; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#ifndef __PRACRO_PUSHBUTTON_H__ -#define __PRACRO_PUSHBUTTON_H__ - -#include "widget.h" -#include -#include -#include - -class PushButton : public QPushButton, public Widget -{ -Q_OBJECT -public: - PushButton(QDomNode &node, MacroWindow *macrowindow); - QString field; - -public slots: - void commit(); - void reset(); - void cancel(); - void cont(); - -signals: - void act_commit(); - void act_reset(); - void act_cancel(); - void act_continue(QString); - -private: - -}; -#endif/*__PRACRO_PUSHBUTTON_H__*/ -- cgit v1.2.3