Исправлены ошибки компиляции. Отлажено.

diff --git a/src/ananas/ananasmainform.cpp b/src/ananas/ananasmainform.cpp
index 4468f0b..4b8364d 100644 (file)
--- a/src/ananas/ananasmainform.cpp
+++ b/src/ananas/ananasmainform.cpp
@@ -316,5 +316,5 @@ void
 MainForm::miniCalc()
 {
        const QString code = "var calc= new Calc(); calc.Show();";
-       engine->project.interpreter()->evaluate(code);
+       engine.project.interpreter()->evaluate(code);
 }

diff --git a/src/ananas/ananasmainform.h b/src/ananas/ananasmainform.h
index 189f614..44eea5c 100644 (file)
--- a/src/ananas/ananasmainform.h
+++ b/src/ananas/ananasmainform.h
@@ -93,6 +93,7 @@ public slots:
        void windowsMenuActivated( int id );
        void tileHorizontal();
        void setBackground( const QPixmap &pix );
+       void miniCalc();
 
 protected:
        protected slots:

diff --git a/src/extensions/minicalc/acalc.cpp b/src/extensions/minicalc/acalc.cpp
index 5944a31..7ec9c3f 100644 (file)
--- a/src/extensions/minicalc/acalc.cpp
+++ b/src/extensions/minicalc/acalc.cpp
@@ -1,3 +1,24 @@
+/****************************************************************************
+** $Id$
+**
+** Source file of Ananas project
+* 
+** Copyright (C) 2008 Andrey Paskal.
+**
+** This file is part of the extention of the Ananas
+** automation accounting system.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+
 #include "acalc.h"
 
 /**
@@ -6,7 +27,8 @@
  * 
  *\_en
  *\ru
- *     \brief 
+ *     \brief Создает экземпляр диалога
+ *     \see aCalc::Show()
  * 
  *\_ru
  */
@@ -34,10 +56,10 @@ aCalc::~aCalc()
 
 /**
  *\en
- *     \brief Destructor
+ *     \brief 
  *\_en
  *\ru
- *     \brief Деструктор
+ *     \brief Открывает окно калькулятора перед пользователем на экране.
  *\_ru
  */
 void

diff --git a/src/extensions/minicalc/acalc.h b/src/extensions/minicalc/acalc.h
index b949ec5..48c2f1e 100644 (file)
--- a/src/extensions/minicalc/acalc.h
+++ b/src/extensions/minicalc/acalc.h
@@ -1,3 +1,23 @@
+/****************************************************************************
+** $Id$
+**
+** Source file of Ananas project
+* 
+** Copyright (C) 2008 Andrey Paskal.
+**
+** This file is part of the extention of the Ananas
+** automation accounting system.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
 #ifndef ACALC_H
 #define ACALC_H
 
@@ -16,6 +36,6 @@ class ANANAS_EXPORT aCalc : public AExtension
                
        protected:
                MiniCalc*       calcInstance;
-}
+};
 
 #endif // ACALC_H

diff --git a/src/extensions/minicalc/aminicalc.cpp b/src/extensions/minicalc/aminicalc.cpp
index cb8d7ec..105ce6b 100644 (file)
--- a/src/extensions/minicalc/aminicalc.cpp
+++ b/src/extensions/minicalc/aminicalc.cpp
@@ -1,10 +1,24 @@
 /****************************************************************************
-** Form implementation generated from reading ui file 'aminicalc.ui'
+** $Id$
 **
-** Created: 2008-06-18T13:53:05
+** Source file of Ananas project
+**  
+**  Copyright (C) 2005-2005 Trolltech AS. All rights reserved.
+**  Copyright (C) 2008 Dmitry Kruglikov.
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** This file is part of the extention of the Ananas
+** automation accounting system.
+** Based on code samples of the documentation of the Qt Toolkit
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
 
 #include "aminicalc.h"
 
@@ -525,7 +539,7 @@ MiniCalc::~MiniCalc()
  */
 void MiniCalc::languageChange()
 {
-    setCaption( tr( "A-Calc" ) );
+    setCaption( tr( "Calculator" ) );
     extMem->setText( tr( "ME" ) );
     toDocButton->setText( tr( "->" ) );
     clearMemoryButton->setText( tr( "MC" ) );

diff --git a/src/extensions/minicalc/aminicalc.h b/src/extensions/minicalc/aminicalc.h
index 09064b6..36b51e1 100644 (file)
--- a/src/extensions/minicalc/aminicalc.h
+++ b/src/extensions/minicalc/aminicalc.h
@@ -1,10 +1,24 @@
 /****************************************************************************
-** Form interface generated from reading ui file 'aminicalc.ui'
+** $Id$
 **
-** Created: 2008-06-18T13:52:59
+** Source file of Ananas project
+**  
+**  Copyright (C) 2005-2005 Trolltech AS. All rights reserved.
+**  Copyright (C) 2008 Dmitry Kruglikov.
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** This file is part of the extention of the Ananas
+** automation accounting system.
+** Based on code samples of the documentation of the Qt Toolkit
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
 
 #ifndef MINICALC_H
 #define MINICALC_H

diff --git a/src/extensions/minicalc/calc.cpp b/src/extensions/minicalc/calc.cpp
deleted file mode 100644 (file)
index 61e18e0..0000000
--- a/src/extensions/minicalc/calc.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "calc.h"
-
-/**
- *\en
- *     \brief Constructor that create object aDateService for use in ananas script.
- * 
- *     Constructs current date object. 
- *\_en
- *\ru
- *     \brief Конструктор, который создает aDateService для работы в ананас скрипте.
- * 
- *     Создается объект с текущей датой.
- *\_ru
- */
-aCalc::aCalc(): AExtension("Calc")
-{
-       QDate date = QDate::currentDate();
-       calcInstance = new MiniCalc();
-}
-

diff --git a/src/extensions/minicalc/calc.h b/src/extensions/minicalc/calc.h
deleted file mode 100644 (file)
index 9485189..0000000
--- a/src/extensions/minicalc/calc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef ACALC_H
-#define ACALC_H
-
-#include       <qdatetime.h> 
-#include       "aextension.h"
-#include "aminicalc.h"
-
-class ANANAS_EXPORT aCalc : public AExtension
-{
-               Q_OBJECT
-       public:                 
-               aCalc();
-               ~aCalc();
-       
-       public slots:
-               void    Show();
-               
-       protected:
-               MiniCalc*       calcInstance;
-}
-
-#endif // ACALC_H