CVS_SILENT

- use [email protected] in every file as contact email address - add credit to Klas Kalass - update some doxygen comments, more coming in the next days - change version to 3.3-alpha (so use the same as KDE in general) - update Makefiles to autogenerate version.h defining version found in file VERSION svn path=/trunk/kdeedu/kbruch/; revision=289224
gupta2140 · Feb 18, 2004 · 825a969 · 825a969
1 parent fdfc427
commit 825a969
Show file tree

Hide file tree

Showing 21 changed files with 75 additions and 54 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,7 +1,7 @@
 Coding
 =======
 
-Sebastian Stein <kbruch@hpfsc.de>
+Sebastian Stein <seb.kde@hpfsc.de>
 
 Eva Brucherseifer <[email protected]>
 (wrote KMath -> KBruch's GUI is based on this work)
@@ -23,6 +23,7 @@ Stefan Schumacher <[email protected]>
 Thanks
 ======
 
+Klas Kalass <[email protected]> for helping design the interface
 David Faure <[email protected]> for helping with KDE CVS and KDE Bugzilla
 Robert Gogolok <[email protected]> for helping with KDE CVS
 Anne-Marie Mahfouf <[email protected]> for managing the KDE Edu project
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-2003-04-28 Sebastian Stein <kbruch@hpfsc.de>
+2003-04-28 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* fixed layout problem with help of Dominique Devries
 
@@ -8,15 +8,15 @@
 
 	* for all other changes see the CVS ChangeLog
 
-2003-04-24 Sebastian Stein <kbruch@hpfsc.de>
+2003-04-24 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* experiments with the layout problem, but found no solution
 
 	* removed #define TRUE, used type bool instead
 
 	* version 0.24
 
-2003-04-22 Sebastian Stein <kbruch@hpfsc.de>
+2003-04-22 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* added MaxMainDenominator, NrOfTerms and Operation actions to the toolbar
 
@@ -26,11 +26,11 @@
 
 	* did some code cleanup
 
-2003-02-16 Sebastian Stein <kbruch@hpfsc.de>
+2003-02-16 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* started to rewrite QT GUI code completely based on KMath
 
-2002-07-15 Sebastian Stein <kbruch@hpfsc.de>
+2002-07-15 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* added screenshots to the handbook
 
@@ -42,19 +42,19 @@
 
 	* now using the common KDE way to handle command line options
 
-2002-06-25 Sebastian Stein <kbruch@hpfsc.de>
+2002-06-25 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* added the handbook and the help buttons calling the fitting chapter
 
 	* added tool tips to all important widgets
 
-2002-05-30 Sebastian Stein <kbruch@hpfsc.de>
+2002-05-30 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* renamed the project to KBruch
 
 	* ported the program to KDE3/Qt3
 
-2002-05-02 Sebastian Stein <kbruch@hpfsc.de>
+2002-05-02 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* the statistic window is positionated next to the task window
 
@@ -64,7 +64,7 @@
 
 	* version 0.19
 
-2002-04-16 Sebastian Stein <bruch@hpfsc.de>
+2002-04-16 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* ported it to KDE 2
 
@@ -77,7 +77,7 @@
 	* version 0.18
 
 
-2002-03-16 Sebastian Stein <bruch@hpfsc.de>
+2002-03-16 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* first version of the answer and result window (finished in most cases)
 
@@ -92,7 +92,7 @@
 	* version 0.17
 
 
-2002-01-30 Sebastian Stein <bruch@hpfsc.de>
+2002-01-30 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* fixed autoconf/automake for Qt support (thanks to Kevin Krammer)
 
@@ -102,7 +102,7 @@
 
 	* version 0.16
 
-2002-01-29 Sebastian Stein <bruch@hpfsc.de>
+2002-01-29 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* added autoconf/automake for Qt support
 
@@ -116,7 +116,7 @@
 
 	* version 0.15
 
-2002-01-25 Sebastian Stein <bruch@hpfsc.de>
+2002-01-25 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* some finetuning to the text GUI
 
@@ -127,7 +127,7 @@
 
 	* version 0.14
 
-2002-01-24 Sebastian Stein <bruch@hpfsc.de>
+2002-01-24 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* some finetuning to the task generating
 
@@ -143,15 +143,15 @@
 
 	* version 0.13
 
-2002-01-23 Sebastian Stein <bruch@hpfsc.de>
+2002-01-23 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* the program now compiles on AIX and SunOS as well
 
 	* added a gui for text mode
 
 	* version 0.12
 
-2002-01-17 Sebastian Stein <bruch@hpfsc.de>
+2002-01-17 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* the first working version without a gui
 
@@ -162,7 +162,7 @@
 	* version 0.10
 
 
-2001-11-29 Sebastian Stein <bruch@hpfsc.de>
+2001-11-29 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* classes are now using vector<T> template
 
@@ -171,7 +171,7 @@
 	* bugfix in class primzahl
 
 
-2001-11-28 Sebastian Stein <bruch@hpfsc.de>
+2001-11-28 Sebastian Stein <seb.kde@hpfsc.de>
 
 	* started to program
 

diff --git a/Makefile.am b/Makefile.am
@@ -2,3 +2,4 @@ SUBDIRS = src
 
 EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION
 
+VERSION:=`cat ${PWD}/VERSION`
diff --git a/README b/README
@@ -0,0 +1 @@
+Please see: http://edu.kde.org/kbruch/
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.24
+3.3-alpha
diff --git a/kbruch.lsm b/kbruch.lsm
@@ -1,11 +1,11 @@
 Begin3
 Title:          KBruch
-Version:        0.24
-Entered-date:   2003-04-24
+Version:        3.3-alpha
+Entered-date:   2004-02-18
 Description:    task generator for calculations with fractions
 Keywords:       ratio, fraction, generator, denominator
-Author:         Sebastian Stein <bruch@hpfsc.de> 
-Maintained-by:  Sebastian Stein <bruch@hpfsc.de> 
+Author:         Sebastian Stein <seb.kde@hpfsc.de> 
+Maintained-by:  Sebastian Stein <seb.kde@hpfsc.de> 
 Primary-site:   http://edu.kde.org/kbruch/
 Home-page:      http://edu.kde.org/kbruch/
 Original-site:  http://edu.kde.org/kbruch/

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,6 @@
 bin_PROGRAMS = kbruch
+
+kbruch_COMPILE_FIRST = version.h
 kbruch_SOURCES = task.cpp ratio.cpp taskview.cpp statisticsview.cpp primzahl.cpp kbruch.cpp mainqtwidget.cpp settingsclass.kcfgc
 kbruch_LDADD   =  $(LIB_KDEUI)
 # the library search path.
@@ -39,3 +41,9 @@ messages: rc.cpp
 	 $(XGETTEXT) $$LIST -o $(podir)/kbruch.pot; \
 	fi
 
+version.h: $(top_srcdir)/kbruch/VERSION
+	printf "#undef KBRUCH_VERSION\n#define KBRUCH_VERSION \"`cat $(top_srcdir)/kbruch/VERSION`\"\n" > version.h
+
+CLEANFILES = version.h
+
+noinst_HEADERS = version.h
diff --git a/src/kbruch.cpp b/src/kbruch.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************
@@ -17,6 +17,8 @@
 
 #include "kbruch.h"
 
+#include "version.h"
+
 #include <math.h>
 
 #include <iostream>
@@ -29,7 +31,7 @@ char show_main_txt()
 	char chrInput;
 
 	CLEAR; /* clear the console */
-	output << "\tKBruch " << VERSION << " " << DATE << endl;
+	output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 	output << "\n\n\tWhat do you want to do:" << endl;
 	output << "\n\n\t\t[a]ddition/subtraction" << endl;
 	output << "\n\t\t[m]ultiplication/division" << endl;
@@ -54,7 +56,7 @@ void ask_parameters_txt(short & nr_ratios, unsigned int & max_md)
 	short tmp_short;
 	unsigned int tmp_ui;
 
-	output << "\tKBruch " << VERSION << " " << DATE << endl;
+	output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 	output << "\n\n\tEnter number of ratios (between 2 and 5): ";
 
 	/* get the input and check for errors */
@@ -104,7 +106,7 @@ short run_task_txt(short add_sub, short mul_div,
 	short wrong = FALSE;
 
 	CLEAR;
-	output << "\tKBruch " << VERSION << " " << DATE << endl;
+	output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 	output << "\n\n\tSolve the given task: \n" << endl;
 
 	/* create a new task with the given parameters */
@@ -157,7 +159,7 @@ if (abs(result.get_zaehler() > 200))
 	if (wrong == TRUE)
 	{
 		CLEAR;
-		output << "\tKBruch " << VERSION << " " << DATE << endl;
+		output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 		output << "\n\n\tYou entered the wrong result for the task:\n" << endl;
 		output << qSetW(8) << klausur << endl; /* display the task */
 		output << "\n\n\tThe correct result is:\n" << endl;
@@ -179,7 +181,7 @@ if (abs(result.get_zaehler() > 200))
 void show_about_txt()
 {
 	CLEAR;
-	output << "\tKBruch " << VERSION << " " << DATE << endl;
+	output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 	output << "\n\t\tDescription: task generator for calculations with fractions";
 	output << endl << "\n\t\tHomepage: " << HOMEPAGE << endl;
 	output << "\n\t\tMaintainer: " << MAINTAINER << " <" << MAINTAINER_EMAIL;
@@ -232,7 +234,7 @@ int gui_konsole(void)
 				count++;
 
 				CLEAR;
-				output << "\tKBruch " << VERSION << " " << DATE << endl;
+				output << "\tKBruch " << KBRUCH_VERSION << " " << DATE << endl;
 				output << "\n\n\ttasks so far: \t" << count << endl;
 				output << "\tcorrect: \t" << correct;
 				output << "  " << int(double(correct) / count * 100) << "%" << endl;
@@ -272,12 +274,12 @@ int gui_qt_ini(int argc, char * argv[])
 	 * user */
 	KAboutData aboutData( "kbruch",
 		description,
-		VERSION,
+		KBRUCH_VERSION,
 		I18N_NOOP("KBruch is an application to automatically generate tasks with fractions."),
 		KAboutData::License_GPL,
-    	"(c) 2002, Sebastian Stein", 0, "http://edu.kde.org/kbruch/",
-		"kbruch@hpfsc.de");
-	aboutData.addAuthor("Sebastian Stein",0, "kbruch@hpfsc.de");
+    	"(c) 2002-2004, Sebastian Stein", 0, "http://edu.kde.org/kbruch/",
+		"seb.kde@hpfsc.de");
+	aboutData.addAuthor("Sebastian Stein",0, "seb.kde@hpfsc.de");
  	KCmdLineArgs::init( argc, argv, &aboutData );
 
 	/* our own options -t and -g are already checked before to prevent

diff --git a/src/kbruch.h b/src/kbruch.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************
@@ -23,9 +23,9 @@
 #include <config.h>
 
 #define MAINTAINER "Sebastian Stein"
-#define MAINTAINER_EMAIL "kbruch@hpfsc.de"
+#define MAINTAINER_EMAIL "seb.kde@hpfsc.de"
 #define HOMEPAGE "http://edu.kde.org/kbruch/"
-#define DATE "[2003-04-24]"
+#define DATE "[2004-02-18]"
 
 #include "primzahl.h"
 #include "ratio.h"

diff --git a/src/mainqtwidget.cpp b/src/mainqtwidget.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Mar 16 00:00:00 CET 2003
     copyright            : (C) 2003-2004 by Sebastian Stein
-    email                : kbruch@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************

diff --git a/src/mainqtwidget.h b/src/mainqtwidget.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Mar 16 00:00:00 CET 2003
     copyright            : (C) 2003-2004 by Sebastian Stein
-    email                : kbruch@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************
@@ -27,12 +27,12 @@ class QLabel;
 class StatisticsView;
 class TaskView;
 
-/*! Constructs the main window and presents the user interface.
+/** Constructs the main window and presents the user interface.
  *  The window is seperated into 2 sections. In the left section is the
  *  statistic view and in the right section the task view.
  *  \author Sebastian Stein
  *  \author Eva Brucherseifer
- * */
+ **/
 class MainQtWidget : public KMainWindow
 {
 	Q_OBJECT
@@ -88,6 +88,9 @@ class MainQtWidget : public KMainWindow
 		void OperationBoxSlot();
 
 	protected:
+		/** Function is called when user calls termination.
+		 *  Used to save the current statistics and settings before exiting.
+		 **/
 		bool queryExit();
 };
 

diff --git a/src/primzahl.cpp b/src/primzahl.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************

diff --git a/src/primzahl.h b/src/primzahl.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************

diff --git a/src/ratio.cpp b/src/ratio.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************

diff --git a/src/ratio.h b/src/ratio.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Tue Nov 27 16:40:42 CET 2001
     copyright            : (C) 2001 by Sebastian Stein
-    email                : seb.stein@hpfsc.de
+    email                : seb.kde@hpfsc.de
  ***************************************************************************/
 
 /***************************************************************************
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ SUBDIRS = src

		EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION

		VERSION:=`cat ${PWD}/VERSION`