From c601b5a27f74b16158adafe429faefbe573e64a2 Mon Sep 17 00:00:00 2001 From: Szymon Tomasz Stefanek Date: Sat, 1 Jan 2011 20:19:56 +0000 Subject: The big rename for modules. Still some details remaining. git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5284 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/codetester/CMakeLists.txt | 4 +- src/modules/codetester/CodeTesterWindow.cpp | 141 ++++++++++++++++++++++++++++ src/modules/codetester/CodeTesterWindow.h | 69 ++++++++++++++ src/modules/codetester/codetester.cpp | 141 ---------------------------- src/modules/codetester/codetester.h | 69 -------------- src/modules/codetester/libkvicodetester.cpp | 10 +- 6 files changed, 217 insertions(+), 217 deletions(-) create mode 100644 src/modules/codetester/CodeTesterWindow.cpp create mode 100644 src/modules/codetester/CodeTesterWindow.h delete mode 100644 src/modules/codetester/codetester.cpp delete mode 100644 src/modules/codetester/codetester.h (limited to 'src/modules/codetester') diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt index 87c4cedca..1cc744655 100644 --- a/src/modules/codetester/CMakeLists.txt +++ b/src/modules/codetester/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/codetester SET(kvicodetester_MOC_HDRS - codetester.h + CodeTesterWindow.h ) SET(kvicodetester_SRCS libkvicodetester.cpp - codetester.cpp + CodeTesterWindow.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp new file mode 100644 index 000000000..f21a610da --- /dev/null +++ b/src/modules/codetester/CodeTesterWindow.cpp @@ -0,0 +1,141 @@ +//============================================================================= +// +// File : CodeTesterWindow.cpp +// Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek +// +// This file is part of the KVIrc irc client distribution +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) +// +// This program is FREE software. You can redistribute it and/or +// modify it under the linkss of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your opinion) 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. If not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +//============================================================================= + +#include "CodeTesterWindow.h" + +#include "KviIconManager.h" +#include "KviOptions.h" +#include "KviLocale.h" +#include "KviConfigurationFile.h" +#include "KviFileDialog.h" +#include "KviFileUtils.h" +#include "KviScriptEditor.h" +#include "KviApplication.h" +#include "KviConsoleWindow.h" +#include "KviParameterList.h" +#include "KviKvsScript.h" +#include "KviKvsVariantList.h" +#include "KviTalPopupMenu.h" + +#include +#include +#include + + +extern KviPointerList * g_pCodeTesterWindowList; + + +CodeTesterWidget::CodeTesterWidget(QWidget * par) +: QWidget(par) +{ + setObjectName("code_tester"); + QGridLayout * g = new QGridLayout(this); + m_pEditor = KviScriptEditor::createInstance(this); + g->addWidget(m_pEditor,0,0,1,4); + //g->addMultiCellWidget(m_pEditor,0,0,0,3); + m_pExecuteButton = new QPushButton(__tr2qs_ctx("&Execute","editor"),this); + g->addWidget(m_pExecuteButton,1,3); + connect(m_pExecuteButton,SIGNAL(clicked()),this,SLOT(execute())); + + m_pModeLabel = new QLabel(__tr2qs_ctx("Params:","editor"),this); + g->addWidget(m_pModeLabel,1,1); + m_pParams = new QLineEdit(this); + g->addWidget(m_pParams,1,2); +} + +CodeTesterWidget::~CodeTesterWidget() +{ + KviScriptEditor::destroyInstance(m_pEditor); +} + +//#warning "Allow to bind the command to a specified window" + +void CodeTesterWidget::execute() +{ + QString parms = m_pParams->text(); + QString buffer; + m_pEditor->getText(buffer); + KviConsoleWindow * con = g_pApp->activeConsole(); + //KviParameterList * l = new KviParameterList(parms.ptr()); + KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms))); +} + +CodeTesterWindow::CodeTesterWindow(KviMainWindow * lpFrm) +: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"codetester",0) +{ + g_pCodeTesterWindowList->append(this); + + m_pTester = new CodeTesterWidget(this); +} + +CodeTesterWindow::~CodeTesterWindow() +{ + g_pCodeTesterWindowList->removeRef(this); +} + +QPixmap * CodeTesterWindow::myIconPtr() +{ + return g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB); +} + +void CodeTesterWindow::resizeEvent(QResizeEvent *) +{ + m_pTester->setGeometry(0,0,width(),height()); +} + +void CodeTesterWindow::fillCaptionBuffers() +{ + m_szPlainTextCaption = __tr2qs_ctx("Script Tester","editor"); +} + +void CodeTesterWindow::getConfigGroupName(QString &szName) +{ + szName = "codetester"; +} + +void CodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg +{ +/* +#ifdef COMPILE_SCRIPTTOOLBAR + cfg->writeEntry("Sizes",m_pEditor->sizes()); + cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr()); + //qDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr()); +#endif // COMPILE_SCRIPTTOOLBAR +*/ +} + +void CodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg +{ +/* +#ifdef COMPILE_SCRIPTTOOLBAR + QValueList def; + def.append(20); + def.append(80); + m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); + KviCString tmp = cfg->readEntry("LastRaw",""); + m_pEditor->editRaw(tmp); + //qDebug("LAST EDITED WAS %s",tmp.ptr()); +#endif // COMPILE_SCRIPTTOOLBAR +*/ +} diff --git a/src/modules/codetester/CodeTesterWindow.h b/src/modules/codetester/CodeTesterWindow.h new file mode 100644 index 000000000..eccdd433e --- /dev/null +++ b/src/modules/codetester/CodeTesterWindow.h @@ -0,0 +1,69 @@ +#ifndef _CODETESTER_H_ +#define _CODETESTER_H_ +//============================================================================= +// +// File : EventEditorWindow.h +// Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek +// +// This file is part of the KVIrc irc client distribution +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) +// +// This program is FREE software. You can redistribute it and/or +// modify it under the linkss of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your opinion) 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. If not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +//============================================================================= + +#include "KviWindow.h" +#include "KviCString.h" + +#include + +class QPushButton; +class QLabel; +class KviScriptEditor; + + +class CodeTesterWidget : public QWidget +{ + Q_OBJECT +public: + CodeTesterWidget(QWidget * par); + ~CodeTesterWidget(); +private: + KviScriptEditor * m_pEditor; + QLineEdit * m_pParams; + QPushButton * m_pExecuteButton; + QLabel * m_pModeLabel; +private slots: + void execute(); +}; + +class CodeTesterWindow : public KviWindow +{ + Q_OBJECT +public: + CodeTesterWindow(KviMainWindow * lpFrm); + ~CodeTesterWindow(); +protected: + CodeTesterWidget * m_pTester; +protected: + virtual QPixmap * myIconPtr(); + virtual void fillCaptionBuffers(); + virtual void resizeEvent(QResizeEvent *e); + virtual void getConfigGroupName(QString &szName); + virtual void saveProperties(KviConfigurationFile *); + virtual void loadProperties(KviConfigurationFile *); +}; + +#endif //_CODETESTER_H_ diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp deleted file mode 100644 index 093f85b04..000000000 --- a/src/modules/codetester/codetester.cpp +++ /dev/null @@ -1,141 +0,0 @@ -//============================================================================= -// -// File : codetester.cpp -// Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek -// -// This file is part of the KVIrc irc client distribution -// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the linkss of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) 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. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -#include "codetester.h" - -#include "KviIconManager.h" -#include "KviOptions.h" -#include "KviLocale.h" -#include "KviConfigurationFile.h" -#include "KviFileDialog.h" -#include "KviFileUtils.h" -#include "KviScriptEditor.h" -#include "KviApplication.h" -#include "KviConsoleWindow.h" -#include "KviParameterList.h" -#include "KviKvsScript.h" -#include "KviKvsVariantList.h" -#include "KviTalPopupMenu.h" - -#include -#include -#include - - -extern KviPointerList * g_pCodeTesterWindowList; - - -KviCodeTester::KviCodeTester(QWidget * par) -: QWidget(par) -{ - setObjectName("code_tester"); - QGridLayout * g = new QGridLayout(this); - m_pEditor = KviScriptEditor::createInstance(this); - g->addWidget(m_pEditor,0,0,1,4); - //g->addMultiCellWidget(m_pEditor,0,0,0,3); - m_pExecuteButton = new QPushButton(__tr2qs_ctx("&Execute","editor"),this); - g->addWidget(m_pExecuteButton,1,3); - connect(m_pExecuteButton,SIGNAL(clicked()),this,SLOT(execute())); - - m_pModeLabel = new QLabel(__tr2qs_ctx("Params:","editor"),this); - g->addWidget(m_pModeLabel,1,1); - m_pParams = new QLineEdit(this); - g->addWidget(m_pParams,1,2); -} - -KviCodeTester::~KviCodeTester() -{ - KviScriptEditor::destroyInstance(m_pEditor); -} - -//#warning "Allow to bind the command to a specified window" - -void KviCodeTester::execute() -{ - QString parms = m_pParams->text(); - QString buffer; - m_pEditor->getText(buffer); - KviConsoleWindow * con = g_pApp->activeConsole(); - //KviParameterList * l = new KviParameterList(parms.ptr()); - KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms))); -} - -KviCodeTesterWindow::KviCodeTesterWindow(KviMainWindow * lpFrm) -: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"codetester",0) -{ - g_pCodeTesterWindowList->append(this); - - m_pTester = new KviCodeTester(this); -} - -KviCodeTesterWindow::~KviCodeTesterWindow() -{ - g_pCodeTesterWindowList->removeRef(this); -} - -QPixmap * KviCodeTesterWindow::myIconPtr() -{ - return g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB); -} - -void KviCodeTesterWindow::resizeEvent(QResizeEvent *) -{ - m_pTester->setGeometry(0,0,width(),height()); -} - -void KviCodeTesterWindow::fillCaptionBuffers() -{ - m_szPlainTextCaption = __tr2qs_ctx("Script Tester","editor"); -} - -void KviCodeTesterWindow::getConfigGroupName(QString &szName) -{ - szName = "codetester"; -} - -void KviCodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg -{ -/* -#ifdef COMPILE_SCRIPTTOOLBAR - cfg->writeEntry("Sizes",m_pEditor->sizes()); - cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr()); - //qDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr()); -#endif // COMPILE_SCRIPTTOOLBAR -*/ -} - -void KviCodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg -{ -/* -#ifdef COMPILE_SCRIPTTOOLBAR - QValueList def; - def.append(20); - def.append(80); - m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); - KviCString tmp = cfg->readEntry("LastRaw",""); - m_pEditor->editRaw(tmp); - //qDebug("LAST EDITED WAS %s",tmp.ptr()); -#endif // COMPILE_SCRIPTTOOLBAR -*/ -} diff --git a/src/modules/codetester/codetester.h b/src/modules/codetester/codetester.h deleted file mode 100644 index d54cc96be..000000000 --- a/src/modules/codetester/codetester.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef _CODETESTER_H_ -#define _CODETESTER_H_ -//============================================================================= -// -// File : eventeditor.h -// Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek -// -// This file is part of the KVIrc irc client distribution -// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the linkss of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) 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. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -#include "KviWindow.h" -#include "KviCString.h" - -#include - -class QPushButton; -class QLabel; -class KviScriptEditor; - - -class KviCodeTester : public QWidget -{ - Q_OBJECT -public: - KviCodeTester(QWidget * par); - ~KviCodeTester(); -private: - KviScriptEditor * m_pEditor; - QLineEdit * m_pParams; - QPushButton * m_pExecuteButton; - QLabel * m_pModeLabel; -private slots: - void execute(); -}; - -class KviCodeTesterWindow : public KviWindow -{ - Q_OBJECT -public: - KviCodeTesterWindow(KviMainWindow * lpFrm); - ~KviCodeTesterWindow(); -protected: - KviCodeTester * m_pTester; -protected: - virtual QPixmap * myIconPtr(); - virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); - virtual void getConfigGroupName(QString &szName); - virtual void saveProperties(KviConfigurationFile *); - virtual void loadProperties(KviConfigurationFile *); -}; - -#endif //_CODETESTER_H_ diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp index 8c38db8ee..c90fcf843 100644 --- a/src/modules/codetester/libkvicodetester.cpp +++ b/src/modules/codetester/libkvicodetester.cpp @@ -22,7 +22,7 @@ // //=============================================================================== -#include "codetester.h" +#include "CodeTesterWindow.h" #include "KviModule.h" #include "KviLocale.h" @@ -30,7 +30,7 @@ #include "KviPointerList.h" -KviPointerList * g_pCodeTesterWindowList = 0; +KviPointerList * g_pCodeTesterWindowList = 0; /* @@ -49,7 +49,7 @@ KviPointerList * g_pCodeTesterWindowList = 0; static bool codetester_kvs_cmd_open(KviKvsModuleCommandCall * c) { - KviCodeTesterWindow * w = new KviCodeTesterWindow(c->window()->frame()); + CodeTesterWindow * w = new CodeTesterWindow(c->window()->frame()); c->window()->frame()->addWindow(w); w->setFocus(); return true; @@ -59,7 +59,7 @@ static bool codetester_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m,"open",codetester_kvs_cmd_open); - g_pCodeTesterWindowList = new KviPointerList(); + g_pCodeTesterWindowList = new KviPointerList(); g_pCodeTesterWindowList->setAutoDelete(false); return true; } @@ -71,7 +71,7 @@ static bool codetester_module_can_unload(KviModule *) static bool codetester_module_cleanup(KviModule *) { - while(KviCodeTesterWindow * w = g_pCodeTesterWindowList->first()) + while(CodeTesterWindow * w = g_pCodeTesterWindowList->first()) { w->close(); // deleted path! } -- cgit v1.3.1-10-gc9f91