From 34784ccef6ac9dd33b4460560c68e5422a73560a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 16:06:06 -0600 Subject: Finish rename from prior commit --- libkdeedu/AUTHORS | 3 - libkdeedu/Makefile.am | 6 - libkdeedu/README | 29 - libkdeedu/extdate/Makefile.am | 21 - libkdeedu/extdate/README | 43 - libkdeedu/extdate/extcalendarsystem.cpp | 151 -- libkdeedu/extdate/extcalendarsystem.h | 357 --- libkdeedu/extdate/extcalendarsystemgregorian.cpp | 328 --- libkdeedu/extdate/extcalendarsystemgregorian.h | 96 - libkdeedu/extdate/extdatepicker.cpp | 532 ----- libkdeedu/extdate/extdatepicker.h | 254 -- libkdeedu/extdate/extdatetbl.cpp | 968 -------- libkdeedu/extdate/extdatetbl.h | 432 ---- libkdeedu/extdate/extdatetime.cpp | 1150 --------- libkdeedu/extdate/extdatetime.h | 190 -- libkdeedu/extdate/extdatetimeedit.cpp | 2724 ---------------------- libkdeedu/extdate/extdatetimeedit.h | 374 --- libkdeedu/extdate/extdatewidget.cpp | 177 -- libkdeedu/extdate/extdatewidget.h | 90 - libkdeedu/extdate/main.cpp | 30 - libkdeedu/extdate/test_extdate.cc | 334 --- libkdeedu/extdate/testwidget.cpp | 68 - libkdeedu/extdate/testwidget.h | 52 - libkdeedu/ideas/README | 10 - libkdeedu/ideas/TODO | 3 - libkdeedu/kdeeducore/Makefile.am | 17 - libkdeedu/kdeeducore/kdeeducore.kdevprj | 84 - libkdeedu/kdeeducore/keduvocdata.cpp | 111 - libkdeedu/kdeeducore/keduvocdata.h | 51 - libkdeedu/kdeeducore/tests/Makefile.am | 10 - libkdeedu/kdeeducore/tests/loader.cpp | 7 - libkdeedu/kdeeduplot/Makefile.am | 15 - libkdeedu/kdeeduplot/README | 23 - libkdeedu/kdeeduplot/kplotaxis.cpp | 32 - libkdeedu/kdeeduplot/kplotaxis.h | 86 - libkdeedu/kdeeduplot/kplotobject.cpp | 49 - libkdeedu/kdeeduplot/kplotobject.h | 205 -- libkdeedu/kdeeduplot/kplotwidget.cpp | 405 ---- libkdeedu/kdeeduplot/kplotwidget.h | 264 --- libkdeedu/kdeeduui/Makefile.am | 16 - libkdeedu/kdeeduui/kdeeduglossary.cpp | 406 ---- libkdeedu/kdeeduui/kdeeduglossary.h | 293 --- libkdeedu/kdeeduui/kdeeduui.kdevprj | 92 - libkdeedu/kdeeduui/kedusimpleentrydlg.cpp | 3 - libkdeedu/kdeeduui/kedusimpleentrydlg.h | 20 - libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui | 110 - libkdeedu/kdeeduui/tests/Makefile.am | 11 - libkdeedu/kdeeduui/tests/entrydialogs.cpp | 6 - 48 files changed, 10738 deletions(-) delete mode 100644 libkdeedu/AUTHORS delete mode 100644 libkdeedu/Makefile.am delete mode 100644 libkdeedu/README delete mode 100644 libkdeedu/extdate/Makefile.am delete mode 100644 libkdeedu/extdate/README delete mode 100644 libkdeedu/extdate/extcalendarsystem.cpp delete mode 100644 libkdeedu/extdate/extcalendarsystem.h delete mode 100644 libkdeedu/extdate/extcalendarsystemgregorian.cpp delete mode 100644 libkdeedu/extdate/extcalendarsystemgregorian.h delete mode 100644 libkdeedu/extdate/extdatepicker.cpp delete mode 100644 libkdeedu/extdate/extdatepicker.h delete mode 100644 libkdeedu/extdate/extdatetbl.cpp delete mode 100644 libkdeedu/extdate/extdatetbl.h delete mode 100644 libkdeedu/extdate/extdatetime.cpp delete mode 100644 libkdeedu/extdate/extdatetime.h delete mode 100644 libkdeedu/extdate/extdatetimeedit.cpp delete mode 100644 libkdeedu/extdate/extdatetimeedit.h delete mode 100644 libkdeedu/extdate/extdatewidget.cpp delete mode 100644 libkdeedu/extdate/extdatewidget.h delete mode 100644 libkdeedu/extdate/main.cpp delete mode 100644 libkdeedu/extdate/test_extdate.cc delete mode 100644 libkdeedu/extdate/testwidget.cpp delete mode 100644 libkdeedu/extdate/testwidget.h delete mode 100644 libkdeedu/ideas/README delete mode 100644 libkdeedu/ideas/TODO delete mode 100644 libkdeedu/kdeeducore/Makefile.am delete mode 100644 libkdeedu/kdeeducore/kdeeducore.kdevprj delete mode 100644 libkdeedu/kdeeducore/keduvocdata.cpp delete mode 100644 libkdeedu/kdeeducore/keduvocdata.h delete mode 100644 libkdeedu/kdeeducore/tests/Makefile.am delete mode 100644 libkdeedu/kdeeducore/tests/loader.cpp delete mode 100644 libkdeedu/kdeeduplot/Makefile.am delete mode 100644 libkdeedu/kdeeduplot/README delete mode 100644 libkdeedu/kdeeduplot/kplotaxis.cpp delete mode 100644 libkdeedu/kdeeduplot/kplotaxis.h delete mode 100644 libkdeedu/kdeeduplot/kplotobject.cpp delete mode 100644 libkdeedu/kdeeduplot/kplotobject.h delete mode 100644 libkdeedu/kdeeduplot/kplotwidget.cpp delete mode 100644 libkdeedu/kdeeduplot/kplotwidget.h delete mode 100644 libkdeedu/kdeeduui/Makefile.am delete mode 100644 libkdeedu/kdeeduui/kdeeduglossary.cpp delete mode 100644 libkdeedu/kdeeduui/kdeeduglossary.h delete mode 100644 libkdeedu/kdeeduui/kdeeduui.kdevprj delete mode 100644 libkdeedu/kdeeduui/kedusimpleentrydlg.cpp delete mode 100644 libkdeedu/kdeeduui/kedusimpleentrydlg.h delete mode 100644 libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui delete mode 100644 libkdeedu/kdeeduui/tests/Makefile.am delete mode 100644 libkdeedu/kdeeduui/tests/entrydialogs.cpp (limited to 'libkdeedu') diff --git a/libkdeedu/AUTHORS b/libkdeedu/AUTHORS deleted file mode 100644 index ac809ea7..00000000 --- a/libkdeedu/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Developers: -* Scott Wheeler - Original author and current maintainer diff --git a/libkdeedu/Makefile.am b/libkdeedu/Makefile.am deleted file mode 100644 index 5eeda1f1..00000000 --- a/libkdeedu/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIRS = tdeeducore tdeeduui tdeeduplot extdate - -messages: - $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libtdeedu.pot - -include ../admin/Doxyfile.am diff --git a/libkdeedu/README b/libkdeedu/README deleted file mode 100644 index 34f0fbed..00000000 --- a/libkdeedu/README +++ /dev/null @@ -1,29 +0,0 @@ -Contents of libtdeedu as of Jul 2005, and brief description of each module: - -extdate: -Contains a reimplementation of QDate named ExtDate which eliminates the -limitation on the year (1752-8000) imposed by QDate. Also contains -related reimplemented classes such as ExtDateTime, ExtDatePicker, -ExtDateTimeEdit, and ExtCalendarSystem. -Currently used by: kstars. - -tdeeducore: -Contains classes KEduVocData and KEduVocDataItem, for storing and parsing -vocabulary data in a QDom object. -Currently used by: khangman, klatin - -tdeeduplot: -Constains classes KPlotObject and KPlotWidget for easy plotting of -data points, including automatic generation of labeled axes with -"smart" tickmarks. -Currently used by: kalzium, kstars, ktouch - -tdeeduui: -Contains: -- KEduSimpleEntryDlg, a simple dialog for entering vocabulary data -- Glossary, GlossaryItem and GLossaryDialog, which can be useful to embed a - small glossary in an application -Currently used by: kalzium, kstars - -ideas: stub directory, contains generic README and TODO files. - diff --git a/libkdeedu/extdate/Makefile.am b/libkdeedu/extdate/Makefile.am deleted file mode 100644 index f02c4924..00000000 --- a/libkdeedu/extdate/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -check_PROGRAMS = test_extdate test_extdatepicker - -INCLUDES= $(all_includes) - -lib_LTLIBRARIES = libextdate.la - -libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp - -libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -libextdate_la_LIBADD = $(LIB_TDEUI) - -test_extdate_SOURCES = test_extdate.cc -test_extdate_LDADD = libextdate.la -test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor - -test_extdatepicker_SOURCES = testwidget.cpp main.cpp -test_extdatepicker_LDADD = libextdate.la -test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor - -METASOURCES = AUTO - diff --git a/libkdeedu/extdate/README b/libkdeedu/extdate/README deleted file mode 100644 index fc9b21b1..00000000 --- a/libkdeedu/extdate/README +++ /dev/null @@ -1,43 +0,0 @@ -This libray consists of a group of classes which allow KDE -applications to access calendar dates outside of the limited range -of years imposed by QDate. - -The QDate class has a limited range of valid dates. It does not -recognize dates prior to 14 Oct 1752 (when the Gregorian calendar -was adopted by England), nor dates after 31 Dec 8000. Both of these -limits are arbitrary. - - -The following classes are included: - -ExtDate: Replaces QDate. There is no restriction on what dates -may be entered. For dates in the valid QDate range, it is -completely equivalent to QDate. - -ExtDateTime: Replaces QDateTime. Consists of a QTime object -and an ExtDate object. - -ExtCalendarSystem: Replaces KCalendarSystem. Uses ExtDate instead -of QDate. ExtCalendarSystem is a baseclass foundation for several -different calendar systems. A "calendar system" is just a method for -hierarchically subdividing the long count of days known as the Julian -Day Calendar into groups (weeks, months, years). - -ExtCalendarSystemGregorian: Replaces KCalendarSystemGregorian. -The most common calendar system in modern western societies is the -Gregorian calendar. This class implements the Gregorian calendar -as a ExtCalendarSystem. - -ExtDateTable: Replaces KDateTable. -ExtDatePicker: Replaces KDatePicker. -ExtDateTimeEdit: Replaces QDateTimeEdit. -ExtDateWidget: Replaces KDateWidget. - -There are two test programs with the library, to verify the -functionality of the ExtDate classes: - -test_extdate tests the non-GUI functionality, comparing results of -several operations with the results from QDate. - -test_extdatepicker presents a KDatePicker widget and an ExtDatePicker -widget side-by-side. diff --git a/libkdeedu/extdate/extcalendarsystem.cpp b/libkdeedu/extdate/extcalendarsystem.cpp deleted file mode 100644 index 58960986..00000000 --- a/libkdeedu/extdate/extcalendarsystem.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* - Copyright (c) 2002 Carlos Moro - Copyright (c) 2002 Hans Petter Bieker - Copyright (c) 2004 Jason Harris - - This class has been derived from ExtCalendarSystem; - the changesd made just replace TQDate objects with ExtDate objects. - These changes by Jason Harris - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// Gregorian calendar system implementation factory for creation of kde calendar -// systems. -// Also default gregorian and factory classes - -#include - -#include "extcalendarsystem.h" -#include "klocale.h" - -class ExtCalendarSystemPrivate -{ -public: - const KLocale * locale; -}; - -ExtCalendarSystem::ExtCalendarSystem(const KLocale * locale) - : d(new ExtCalendarSystemPrivate) -{ - d->locale = locale; -} - -ExtCalendarSystem::~ExtCalendarSystem() -{ - delete d; -} - -const KLocale * ExtCalendarSystem::locale() const -{ - if ( d->locale ) - return d->locale; - - return KGlobal::locale(); -} - -TQString ExtCalendarSystem::dayString(const ExtDate & pDate, bool bShort) const -{ - TQString sResult; - - sResult.setNum(day(pDate)); - if (!bShort && sResult.length() == 1 ) - sResult.prepend('0'); - - return sResult; -} - -TQString ExtCalendarSystem::monthString(const ExtDate & pDate, bool bShort) const -{ - TQString sResult; - - sResult.setNum(month(pDate)); - if (!bShort && sResult.length() == 1 ) - sResult.prepend('0'); - - return sResult; -} - -TQString ExtCalendarSystem::yearString(const ExtDate & pDate, bool bShort) const -{ - TQString sResult; - - sResult.setNum(year(pDate)); - if (bShort && sResult.length() == 4 ) - sResult = sResult.right(2); - - return sResult; -} - -static int stringToInteger(const TQString & sNum, int & iLength) -{ - unsigned int iPos = 0; - - int result = 0; - for (; sNum.length() > iPos && sNum.at(iPos).isDigit(); iPos++) - { - result *= 10; - result += sNum.at(iPos).digitValue(); - } - - iLength = iPos; - return result; -} - - -int ExtCalendarSystem::dayStringToInteger(const TQString & sNum, int & iLength) const -{ - return stringToInteger(sNum, iLength); -} - -int ExtCalendarSystem::monthStringToInteger(const TQString & sNum, int & iLength) const -{ - return stringToInteger(sNum, iLength); -} - -int ExtCalendarSystem::yearStringToInteger(const TQString & sNum, int & iLength) const -{ - return stringToInteger(sNum, iLength); -} - -TQString ExtCalendarSystem::weekDayName (int weekDay, bool shortName) const -{ - if ( shortName ) - switch ( weekDay ) - { - case 1: return locale()->translate("Monday", "Mon"); - case 2: return locale()->translate("Tuesday", "Tue"); - case 3: return locale()->translate("Wednesday", "Wed"); - case 4: return locale()->translate("Thursday", "Thu"); - case 5: return locale()->translate("Friday", "Fri"); - case 6: return locale()->translate("Saturday", "Sat"); - case 7: return locale()->translate("Sunday", "Sun"); - } - else - switch ( weekDay ) - { - case 1: return locale()->translate("Monday"); - case 2: return locale()->translate("Tuesday"); - case 3: return locale()->translate("Wednesday"); - case 4: return locale()->translate("Thursday"); - case 5: return locale()->translate("Friday"); - case 6: return locale()->translate("Saturday"); - case 7: return locale()->translate("Sunday"); - } - - return TQString(); -} - diff --git a/libkdeedu/extdate/extcalendarsystem.h b/libkdeedu/extdate/extcalendarsystem.h deleted file mode 100644 index 4607fc1d..00000000 --- a/libkdeedu/extdate/extcalendarsystem.h +++ /dev/null @@ -1,357 +0,0 @@ -/* - Copyright (c) 2002 Carlos Moro - Copyright (c) 2002-2003 Hans Petter Bieker - Copyright (c) 2004 Jason Harris - - This class has been derived from KCalendarSystem; - the changesd made just replace TQDate objects with ExtDate objects. - These changes by Jason Harris - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef EXTCALENDARSYSTEM_H -#define EXTCALENDARSYSTEM_H - -#include "extdatetime.h" - -class KLocale; - -class ExtCalendarSystemPrivate; - -/** - * CalendarSystem abstract class, default derived kde gregorian class and - * factory class. Provides support for different calendar types for kde - * calendar widget and related stuff. - * - * Derived classes must be created through ExtCalendarFactory class - * - * @author Carlos Moro - * @version $Id$ - * @since 3.2 - */ -class ExtCalendarSystem -{ -public: - /** - * Constructor of abstract calendar class. This will be called by the derived classes. - * - * @param locale It will use this locale for translations, 0 means global. - */ - ExtCalendarSystem(const KLocale * locale = 0); - - /** - * Descructor. - */ - virtual ~ExtCalendarSystem(); - - /** - * Gets specific calendar type year for a given gregorian date - * - * @param date gregorian date - * @return year - */ - virtual int year (const ExtDate & date) const = 0; - - /** - * Converts a date into a year literal - * - * @param pDate The date to convert - * @param bShort If the short version of should be used - * @return The year literal of the date - */ - virtual TQString yearString(const ExtDate & pDate, bool bShort) const; - - /** - * Converts a year literal of a part of a string into a integer starting at the beginning of the string - * - * @param sNum The string to parse - * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string - * @return An integer corresponding to the year - */ - virtual int yearStringToInteger(const TQString & sNum, int & iLength) const; - - /** - * Gets specific calendar type month for a given gregorian date - * - * @param date gregorian date - * @return month number - */ - virtual int month (const ExtDate & date) const = 0; - - /** - * Converts a date into a month literal - * - * @param pDate The date to convert - * @param bShort If the short version of should be used - * @return The month literal of the date - */ - virtual TQString monthString(const ExtDate & pDate, bool bShort) const; - - /** - * Converts a month literal of a part of a string into a integer starting at the beginning of the string - * - * @param sNum The string to parse - * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string - * @return An integer corresponding to the month - */ - virtual int monthStringToInteger(const TQString & sNum, int & iLength) const; - - /** - * Gets specific calendar type day number of month for a given date - * - * @param date gregorian date equivalent to the specific one - * @return day of the month - */ - virtual int day (const ExtDate & date) const = 0; - - /** - * Converts a date into a day literal - * - * @param pDate The date to convert - * @param bShort If the short version of should be used - * @return The day literal of the date - */ - virtual TQString dayString(const ExtDate & pDate, bool bShort) const; - - /** - * Converts a day literal of a part of a string into a integer starting at the beginning of the string - * - * @param sNum The string to parse - * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string - * @return An integer corresponding to the day - */ - virtual int dayStringToInteger(const TQString & sNum, int & iLength) const; - - /** - * Gets specific calendar type number of day of week number for a given - * date - * - * @param date gregorian date - * @return day of week - */ - virtual int dayOfWeek (const ExtDate & date) const = 0; - - /** - * Gets specific calendar type day number of year for a given date - * - * @param date gregorian date equivalent to the specific one - * @return day number - */ - virtual int dayOfYear (const ExtDate & date) const = 0; - - /** - * Changes the date's year, month and day. The range of the year, month - * and day depends on which calendar is being used. - * - * @param date Date to change - * @param y Year - * @param m Month number - * @param d Day of month - * @return true if the date is valid; otherwise returns false. - */ - virtual bool setYMD(ExtDate & date, int y, int m, int d) const = 0; - - /** - * Returns a TQDate object containing a date nyears later. - * - * @param date The old date - * @param nyears The number of years to add - * @return The new date - */ - virtual ExtDate addYears(const ExtDate & date, int nyears) const = 0; - - /** - * Returns a TQDate object containing a date nmonths later. - * - * @param date The old date - * @param nmonths The number of months to add - * @return The new date - */ - virtual ExtDate addMonths(const ExtDate & date, int nmonths) const = 0; - - /** - * Returns a TQDate object containing a date ndays later. - * - * @param date The old date - * @param ndays The number of days to add - * @return The new date - */ - virtual ExtDate addDays(const ExtDate & date, int ndays) const = 0; - - /** - * Gets specific calendar type number of month for a given year - * - * @param date The date whose year to use - * @return The number of months in that year - */ - virtual int monthsInYear (const ExtDate & date) const = 0; - - /** - * Gets the number of days in date whose years specified. - * - * @param date Gregorian date equivalent to the specific one - * @return The number of days in year - */ - virtual int daysInYear (const ExtDate & date) const = 0; - - /** - * Gets specific calendar type number of days in month for a given date - * - * @param date gregorian date - * @return number of days for month in date - */ - virtual int daysInMonth (const ExtDate & date) const = 0; - - /** - * Gets the number of weeks in a specified year - * - * @param year the year - * @return number of weeks in year - */ - virtual int weeksInYear(int year) const = 0; - - /** - * Gets specific calendar type week number for a given date - * - * @param date gregorian date - * @param yearNum The year the date belongs to - * @return week number - */ - virtual int weekNumber(const ExtDate& date, int * yearNum = 0) const = 0; - - /** - * Gets specific calendar type month name for a given month number - * If an invalid month is specified, TQString() is returned. - * - * @param month The month number - * @param year The year the month belongs to - * @param shortName Specifies if the short month name should be used - * @return The name of the month - */ - virtual TQString monthName (int month, int year, bool shortName = false) const = 0; - - /** - * Gets specific calendar type month name for a given gregorian date - * - * @param date Gregorian date - * @param shortName Specifies if the short month name should be used - * @return The name of the month - */ - virtual TQString monthName (const ExtDate & date, bool shortName = false ) const = 0; - - /** - * Returns a string containing the possessive form of the month name. - * ("of January", "of February", etc.) - * It's needed in long format dates in some languages. - * If an invalid month is specified, TQString() is returned. - * - * @param month The month number - * @param year The year the month belongs to - * @param shortName Specifies if the short month name should be used - * - * @return The possessive form of the name of the month - */ - virtual TQString monthNamePossessive(int month, int year, bool shortName = false) const = 0; - - /** - * Returns a string containing the possessive form of the month name. - * ("of January", "of February", etc.) - * It's needed in long format dates in some languages. - * - * @param date Gregorian date - * @param shortName Specifies if the short month name should be used - * - * @return The possessive form of the name of the month - */ - virtual TQString monthNamePossessive(const ExtDate & date, bool shortName = false) const = 0; - - /** - * Gets specific calendar type week day name - * If an invalid week day is specified, TQString() is returned. - * - * @param weekDay number of day in week (1 -> Monday) - * @param shortName short or complete day name - * @return day name - */ - virtual TQString weekDayName (int weekDay, bool shortName = false) const = 0; - - /** - * Gets specific calendar type week day name - * - * @param date the date - * @param shortName short or complete day name - * @return day name - */ - virtual TQString weekDayName (const ExtDate & date, bool shortName = false) const = 0; - - /** - * Gets the first year value supported by specific calendar type - * algorithms. - * - * @return first year supported - */ - virtual int minValidYear () const = 0; - - /** - * Gets the maximum year value supported by specific calendar type - * algorithms (TQDate, 8000) - * - * @return maximum year supported - */ - virtual int maxValidYear () const = 0; - - /** - * Gets the day of the week traditionaly associated with pray - * - * @return day number - */ - virtual int weekDayOfPray () const = 0; - - /** - * Gets the string representing the calendar - */ - virtual TQString calendarName() const = 0; - - /** - * Gets if the calendar is lunar based - * - * @return if the calendar is lunar based - */ - virtual bool isLunar() const = 0; - - /** - * Gets if the calendar is lunisolar based - * - * @return if the calendar is lunisolar based - */ - virtual bool isLunisolar() const = 0; - - /** - * Gets if the calendar is solar based - * - * @return if the calendar is solar based - */ - virtual bool isSolar() const = 0; - -protected: - const KLocale * locale() const; - -private: - ExtCalendarSystemPrivate * d; -}; - -#endif diff --git a/libkdeedu/extdate/extcalendarsystemgregorian.cpp b/libkdeedu/extdate/extcalendarsystemgregorian.cpp deleted file mode 100644 index 0b167ce9..00000000 --- a/libkdeedu/extdate/extcalendarsystemgregorian.cpp +++ /dev/null @@ -1,328 +0,0 @@ -/* - Copyright (c) 2002 Carlos Moro - Copyright (c) 2002-2003 Hans Petter Bieker - Copyright (c) 2004 Jason Harris - - This class has been derived from KCalendarSystemGregorian; - the changesd made just replace TQDate objects with ExtDate objects. - These changes by Jason Harris - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// Derived gregorian kde calendar class -// Just a schema. - - -#include -#include - -#include "extcalendarsystemgregorian.h" - -ExtCalendarSystemGregorian::ExtCalendarSystemGregorian(const KLocale * locale) - : ExtCalendarSystem(locale) -{ -} - -ExtCalendarSystemGregorian::~ExtCalendarSystemGregorian() -{ -} - -int ExtCalendarSystemGregorian::year(const ExtDate& date) const -{ - return date.year(); -} - -int ExtCalendarSystemGregorian::monthsInYear( const ExtDate & date ) const -{ - Q_UNUSED( date ) - - return 12; -} - -int ExtCalendarSystemGregorian::weeksInYear(int year) const -{ - ExtDate temp; - temp.setYMD(year, 12, 31); - - // If the last day of the year is in the first week, we have to check the - // week before - if ( temp.weekNumber() == 1 ) - temp = temp.addDays(-7); - - return temp.weekNumber(); -} - -int ExtCalendarSystemGregorian::weekNumber(const ExtDate& date, - int * yearNum) const -{ - return date.weekNumber(yearNum); -} - -TQString ExtCalendarSystemGregorian::monthName(const ExtDate& date, - bool shortName) const -{ - return monthName(month(date), year(date), shortName); -} - -TQString ExtCalendarSystemGregorian::monthNamePossessive(const ExtDate& date, bool shortName) const -{ - return monthNamePossessive(month(date), year(date), shortName); -} - -TQString ExtCalendarSystemGregorian::monthName(int month, int year, bool shortName) const -{ - Q_UNUSED(year); - - if ( shortName ) - switch ( month ) - { - case 1: - return locale()->translate("January", "Jan"); - case 2: - return locale()->translate("February", "Feb"); - case 3: - return locale()->translate("March", "Mar"); - case 4: - return locale()->translate("April", "Apr"); - case 5: - return locale()->translate("May short", "May"); - case 6: - return locale()->translate("June", "Jun"); - case 7: - return locale()->translate("July", "Jul"); - case 8: - return locale()->translate("August", "Aug"); - case 9: - return locale()->translate("September", "Sep"); - case 10: - return locale()->translate("October", "Oct"); - case 11: - return locale()->translate("November", "Nov"); - case 12: - return locale()->translate("December", "Dec"); - } - else - switch ( month ) - { - case 1: - return locale()->translate("January"); - case 2: - return locale()->translate("February"); - case 3: - return locale()->translate("March"); - case 4: - return locale()->translate("April"); - case 5: - return locale()->translate("May long", "May"); - case 6: - return locale()->translate("June"); - case 7: - return locale()->translate("July"); - case 8: - return locale()->translate("August"); - case 9: - return locale()->translate("September"); - case 10: - return locale()->translate("October"); - case 11: - return locale()->translate("November"); - case 12: - return locale()->translate("December"); - } - - return TQString(); -} - -TQString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year, - bool shortName) const -{ - Q_UNUSED(year); - - if ( shortName ) - switch ( month ) - { - case 1: - return locale()->translate("of January", "of Jan"); - case 2: - return locale()->translate("of February", "of Feb"); - case 3: - return locale()->translate("of March", "of Mar"); - case 4: - return locale()->translate("of April", "of Apr"); - case 5: - return locale()->translate("of May short", "of May"); - case 6: - return locale()->translate("of June", "of Jun"); - case 7: - return locale()->translate("of July", "of Jul"); - case 8: - return locale()->translate("of August", "of Aug"); - case 9: - return locale()->translate("of September", "of Sep"); - case 10: - return locale()->translate("of October", "of Oct"); - case 11: - return locale()->translate("of November", "of Nov"); - case 12: - return locale()->translate("of December", "of Dec"); - } - else - switch ( month ) - { - case 1: - return locale()->translate("of January"); - case 2: - return locale()->translate("of February"); - case 3: - return locale()->translate("of March"); - case 4: - return locale()->translate("of April"); - case 5: - return locale()->translate("of May long", "of May"); - case 6: - return locale()->translate("of June"); - case 7: - return locale()->translate("of July"); - case 8: - return locale()->translate("of August"); - case 9: - return locale()->translate("of September"); - case 10: - return locale()->translate("of October"); - case 11: - return locale()->translate("of November"); - case 12: - return locale()->translate("of December"); - } - - return TQString(); -} - -bool ExtCalendarSystemGregorian::setYMD(ExtDate & date, int y, int m, int d) const -{ - // ExtDate supports gregorian internally - return date.setYMD(y, m, d); -} - -ExtDate ExtCalendarSystemGregorian::addYears(const ExtDate & date, int nyears) const -{ - return date.addYears(nyears); -} - -ExtDate ExtCalendarSystemGregorian::addMonths(const ExtDate & date, int nmonths) const -{ - return date.addMonths(nmonths); -} - -ExtDate ExtCalendarSystemGregorian::addDays(const ExtDate & date, int ndays) const -{ - return date.addDays(ndays); -} - -TQString ExtCalendarSystemGregorian::weekDayName(int col, bool shortName) const -{ - // ### Should this really be different to each calendar system? Or are we - // only going to support weeks with 7 days? - - return ExtCalendarSystem::weekDayName(col, shortName); -} - -TQString ExtCalendarSystemGregorian::weekDayName(const ExtDate& date, bool shortName) const -{ - return weekDayName(dayOfWeek(date), shortName); -} - - -int ExtCalendarSystemGregorian::dayOfWeek(const ExtDate& date) const -{ - return date.dayOfWeek(); -} - -int ExtCalendarSystemGregorian::dayOfYear(const ExtDate & date) const -{ - return date.dayOfYear(); -} - -int ExtCalendarSystemGregorian::daysInMonth(const ExtDate& date) const -{ - return date.daysInMonth(); -} - -int ExtCalendarSystemGregorian::minValidYear() const -{ - return -50000; -} - -int ExtCalendarSystemGregorian::maxValidYear() const -{ - return 50000; -} - -int ExtCalendarSystemGregorian::day(const ExtDate& date) const -{ - return date.day(); -} - -int ExtCalendarSystemGregorian::month(const ExtDate& date) const -{ - return date.month(); -} - -int ExtCalendarSystemGregorian::daysInYear(const ExtDate& date) const -{ - return date.daysInYear(); -} - -int ExtCalendarSystemGregorian::weekDayOfPray() const -{ - return 7; // sunday -} - -TQString ExtCalendarSystemGregorian::calendarName() const -{ - return TQString::tqfromLatin1("gregorian"); -} - -bool ExtCalendarSystemGregorian::isLunar() const -{ - return false; -} - -bool ExtCalendarSystemGregorian::isLunisolar() const -{ - return false; -} - -bool ExtCalendarSystemGregorian::isSolar() const -{ - return true; -} - -int ExtCalendarSystemGregorian::yearStringToInteger(const TQString & sNum, int & iLength) const -{ - int iYear; - iYear = ExtCalendarSystem::yearStringToInteger(sNum, iLength); - - // TQt treats a year in the range 0-100 as 1900-1999. - // It is nicer for the user if we treat 0-68 as 2000-2068 - if (iYear < 69) - iYear += 2000; - else if (iYear < 100) - iYear += 1900; - - return iYear; -} diff --git a/libkdeedu/extdate/extcalendarsystemgregorian.h b/libkdeedu/extdate/extcalendarsystemgregorian.h deleted file mode 100644 index 6d1035c9..00000000 --- a/libkdeedu/extdate/extcalendarsystemgregorian.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - Copyright (c) 2002 Carlos Moro - Copyright (c) 2002 Hans Petter Bieker - Copyright (c) 2004 Jason Harris - - This class has been derived from KCalendarSystemGregorian; - the changesd made just replace TQDate objects with ExtDate objects. - These changes by Jason Harris - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef EXTCALENDARSYSTEMGREGORIAN_H -#define EXTCALENDARSYSTEMGREGORIAN_H - - -#include "extcalendarsystem.h" - -class ExtCalendarSystemGregorianPrivate; - -/** - * @internal - * This is the Gregorian calendar implementation. - * - * The Gregorian calender is the most used calendar today. The first year in - * the calendar is set to the birth of Christ. - * - * @see KLocale,ExtCalendarSystem,ExtCalendarSystemFactory - * - * @author Carlos Moro - * @license GNU-GPL v.2 - * @version $Id$ - * @since 3.2 - */ -class ExtCalendarSystemGregorian: public ExtCalendarSystem -{ -public: - ExtCalendarSystemGregorian (const KLocale * locale = 0); - virtual ~ExtCalendarSystemGregorian (); - - virtual int year (const ExtDate & date) const; - virtual int month (const ExtDate & date) const; - virtual int day (const ExtDate & date) const; - virtual int dayOfWeek (const ExtDate & date) const; - virtual int dayOfYear (const ExtDate & date) const; - - virtual bool setYMD(ExtDate & date, int y, int m, int d) const; - - virtual ExtDate addYears(const ExtDate & date, int nyears) const; - virtual ExtDate addMonths(const ExtDate & date, int nmonths) const; - virtual ExtDate addDays(const ExtDate & date, int ndays) const; - - virtual int monthsInYear (const ExtDate & date) const; - - virtual int daysInYear (const ExtDate & date) const; - virtual int daysInMonth (const ExtDate & date) const; - virtual int weeksInYear(int year) const; - virtual int weekNumber(const ExtDate& date, int * yearNum = 0) const; - - virtual int yearStringToInteger(const TQString & sNum, int & iLength) const; - - virtual TQString monthName (int month, int year, bool shortName = false) const; - virtual TQString monthName (const ExtDate & date, bool shortName = false ) const; - virtual TQString monthNamePossessive(int month, int year, bool shortName = false) const; - virtual TQString monthNamePossessive(const ExtDate & date, bool shortName = false ) const; - virtual TQString weekDayName (int weekDay, bool shortName = false) const; - virtual TQString weekDayName (const ExtDate & date, bool shortName = false) const; - - virtual int minValidYear () const; - virtual int maxValidYear () const; - virtual int weekDayOfPray () const; - - virtual TQString calendarName() const; - - virtual bool isLunar() const; - virtual bool isLunisolar() const; - virtual bool isSolar() const; - -private: - ExtCalendarSystemGregorianPrivate * d; -}; - -#endif diff --git a/libkdeedu/extdate/extdatepicker.cpp b/libkdeedu/extdate/extdatepicker.cpp deleted file mode 100644 index 2b267d8e..00000000 --- a/libkdeedu/extdate/extdatepicker.cpp +++ /dev/null @@ -1,532 +0,0 @@ -/* -*- C++ -*- - This file is part of the KDE libraries - Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) - (C) 1998-2001 Mirko Boehm (mirko@kde.org) - (C) 2004 Jason Harris (jharris@30doradus.org) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "extdatepicker.h" -#include "extdatetbl.h" -#include "extdatepicker.moc" - -// Week numbers are defined by ISO 8601 -// See http://www.merlyn.demon.co.uk/weekinfo.htm for details - -class ExtDatePicker::ExtDatePickerPrivate -{ -public: - ExtDatePickerPrivate() : closeButton(0L), selectWeek(0L), todayButton(0), - navigationLayout(0), calendar(0) {} - - void fillWeeksCombo(const ExtDate &date); - - TQToolButton *closeButton; - TQComboBox *selectWeek; - TQToolButton *todayButton; - TQBoxLayout *navigationLayout; - ExtCalendarSystem *calendar; -}; - -void ExtDatePicker::fillWeeksCombo(const ExtDate &date) -{ - // every year can have a different number of weeks - -//must remain commented unless ExtDate stuff gets added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - // it could be that we had 53,1..52 and now 1..53 which is the same number but different - // so always fill with new values - - d->selectWeek->clear(); - - // We show all week numbers for all weeks between first day of year to last day of year - // This of course can be a list like 53,1,2..52 - - ExtDate day(date.year(), 1, 1); - int lastMonth = d->calendar->monthsInYear(day); - ExtDate lastDay(date.year(), lastMonth, d->calendar->daysInMonth(ExtDate(date.year(), lastMonth, 1))); - - for (; day <= lastDay; day = d->calendar->addDays(day, 7 /*calendar->daysOfWeek()*/) ) - { - int year = 0; - TQString week = i18n("Week %1").tqarg(d->calendar->weekNumber(day, &year)); - if ( year != date.year() ) week += "*"; // show that this is a week from a different year - d->selectWeek->insertItem(week); - } -} - -ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name) - : TQFrame(parent,name) -{ - init( dt ); -} - -ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name, WFlags f) - : TQFrame(parent,name, f) -{ - init( dt ); -} - -ExtDatePicker::ExtDatePicker( TQWidget *parent, const char *name ) - : TQFrame(parent,name) -{ - init( ExtDate::tqcurrentDate() ); -} - -void ExtDatePicker::init( const ExtDate &dt ) -{ - d = new ExtDatePickerPrivate(); - - d->calendar = new ExtCalendarSystemGregorian(); - - TQBoxLayout * topLayout = new TQVBoxLayout(this); - - d->navigationLayout = new TQHBoxLayout(topLayout); - d->navigationLayout->addStretch(); - yearBackward = new TQToolButton(this); - yearBackward->setAutoRaise(true); - d->navigationLayout->addWidget(yearBackward); - monthBackward = new TQToolButton(this); - monthBackward ->setAutoRaise(true); - d->navigationLayout->addWidget(monthBackward); - d->navigationLayout->addSpacing(KDialog::spacingHint()); - - selectMonth = new TQToolButton(this); - selectMonth ->setAutoRaise(true); - d->navigationLayout->addWidget(selectMonth); - selectYear = new TQToolButton(this); - selectYear->setToggleButton(true); - selectYear->setAutoRaise(true); - d->navigationLayout->addWidget(selectYear); - d->navigationLayout->addSpacing(KDialog::spacingHint()); - - monthForward = new TQToolButton(this); - monthForward ->setAutoRaise(true); - d->navigationLayout->addWidget(monthForward); - yearForward = new TQToolButton(this); - yearForward ->setAutoRaise(true); - d->navigationLayout->addWidget(yearForward); - d->navigationLayout->addStretch(); - - line = new KLineEdit(this); - val = new ExtDateValidator(this); - table = new ExtDateTable(this); - fontsize = KGlobalSettings::generalFont().pointSize(); - if (fontsize == -1) - fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize(); - - fontsize++; // Make a little bigger - - d->selectWeek = new TQComboBox(false, this); // read only week selection - d->todayButton = new TQToolButton(this); - d->todayButton->setIconSet(SmallIconSet("today")); - - TQToolTip::add(yearForward, i18n("Next year")); - TQToolTip::add(yearBackward, i18n("Previous year")); - TQToolTip::add(monthForward, i18n("Next month")); - TQToolTip::add(monthBackward, i18n("Previous month")); - TQToolTip::add(d->selectWeek, i18n("Select a week")); - TQToolTip::add(selectMonth, i18n("Select a month")); - TQToolTip::add(selectYear, i18n("Select a year")); - TQToolTip::add(d->todayButton, i18n("Select the current day")); - - // ----- - setFontSize(fontsize); - line->setValidator(val); - line->installEventFilter( this ); - line->setReadOnly( true ); - - if ( TQApplication::reverseLayout() ) - { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); - } - else - { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); - } - connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); - table->setFocus(); - - - topLayout->addWidget(table); - - TQBoxLayout * bottomLayout = new TQHBoxLayout(topLayout); - bottomLayout->addWidget(d->todayButton); - bottomLayout->addWidget(line); - bottomLayout->addWidget(d->selectWeek); - - table->setDate(dt); - dateChangedSlot(dt); // needed because table emits changed only when newDate != oldDate -} - -ExtDatePicker::~ExtDatePicker() -{ - delete d; -} - -bool -ExtDatePicker::eventFilter(TQObject *o, TQEvent *e ) -{ - if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *k = (TQKeyEvent *)e; - - if ( (k->key() == TQt::Key_Prior) || - (k->key() == TQt::Key_Next) || - (k->key() == TQt::Key_Up) || - (k->key() == TQt::Key_Down) ) - { - TQApplication::sendEvent( table, e ); - table->setFocus(); - return true; // eat event - } - } - return TQFrame::eventFilter( o, e ); -} - -void -ExtDatePicker::resizeEvent(TQResizeEvent* e) -{ - TQWidget::resizeEvent(e); -} - -void -ExtDatePicker::dateChangedSlot(const ExtDate &date) -{ - kdDebug(298) << "ExtDatePicker::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - - -//must remain commented unless ExtDate gets added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - -// line->setText(KGlobal::locale()->formatDate(date, true)); - line->setText( date.toString( KGlobal::locale()->dateFormatShort() ) ); - selectMonth->setText(d->calendar->monthName(date, false)); - fillWeeksCombo(date); - - // calculate the item num in the week combo box; normalize selected day so as if 1.1. is the first day of the week - ExtDate firstDay(date.year(), 1, 1); - d->selectWeek->setCurrentItem((d->calendar->dayOfYear(date) + d->calendar->dayOfWeek(firstDay) - 2) / 7/*calendar->daysInWeek()*/); - - selectYear->setText(d->calendar->yearString(date, false)); - - emit(dateChanged(date)); -} - -void -ExtDatePicker::tableClickedSlot() -{ - kdDebug(298) << "ExtDatePicker::tableClickedSlot: table clicked." << endl; - emit(dateSelected(table->getDate())); - emit(tableClicked()); -} - -const ExtDate& -ExtDatePicker::getDate() const -{ - return table->getDate(); -} - -const ExtDate & -ExtDatePicker::date() const -{ - return table->getDate(); -} - -bool -ExtDatePicker::setDate(const ExtDate& date) -{ - if(date.isValid()) - { - table->setDate(date); // this also emits dateChanged() which then calls our dateChangedSlot() - return true; - } - else - { - kdDebug(298) << "ExtDatePicker::setDate: refusing to set invalid date." << endl; - return false; - } -} - -void -ExtDatePicker::monthForwardClicked() -{ - ExtDate temp; -// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); - temp = d->calendar->addMonths( table->getDate(), 1 ); - setDate( temp ); -} - -void -ExtDatePicker::monthBackwardClicked() -{ - ExtDate temp; -// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); - temp = d->calendar->addMonths( table->getDate(), -1 ); - setDate( temp ); -} - -void -ExtDatePicker::yearForwardClicked() -{ - ExtDate temp; -// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); - temp = d->calendar->addYears( table->getDate(), 1 ); - setDate( temp ); -} - -void -ExtDatePicker::yearBackwardClicked() -{ - ExtDate temp; -// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); - temp = d->calendar->addYears( table->getDate(), -1 ); - setDate( temp ); -} - -void ExtDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for binary compatibility - -void -ExtDatePicker::weekSelected(int week) -{ -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - ExtDate date = table->getDate(); - int year = d->calendar->year(date); - - d->calendar->setYMD(date, year, 1, 1); // first day of selected year - - // calculate the first day in the selected week (day 1 is first day of week) - date = d->calendar->addDays(date, week * 7/*calendar->daysOfWeek()*/ -d->calendar->dayOfWeek(date) + 1); - - setDate(date); -} - -void -ExtDatePicker::selectMonthClicked() -{ - // every year can have different month names (in some calendar systems) -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - ExtDate date = table->getDate(); - int i, month, months = d->calendar->monthsInYear(date); - - TQPopupMenu popup(selectMonth); - - for (i = 1; i <= months; i++) - popup.insertItem(d->calendar->monthName(i, d->calendar->year(date)), i); - - popup.setActiveItem(d->calendar->month(date) - 1); - - if ( (month = popup.exec(selectMonth->mapToGlobal(TQPoint(0, 0)), d->calendar->month(date) - 1)) == -1 ) return; // canceled - - int day = d->calendar->day(date); - // ----- construct a valid date in this month: - //date.setYMD(date.year(), month, 1); - //date.setYMD(date.year(), month, TQMIN(day, date.daysInMonth())); - d->calendar->setYMD(date, d->calendar->year(date), month, - TQMIN(day, d->calendar->daysInMonth(date))); - // ----- set this month - setDate(date); -} - -void -ExtDatePicker::selectYearClicked() -{ -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - if (selectYear->state() == TQButton::Off) - { - return; - } - - int year; - KPopupFrame* popup = new KPopupFrame(this); - ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup); - // ----- - picker->resize(picker->tqsizeHint()); - popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); - picker->setFocus(); - if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) - { - ExtDate date; - int day; - // ----- - year=picker->getYear(); - date=table->getDate(); - day=d->calendar->day(date); - // ----- construct a valid date in this month: - //date.setYMD(year, date.month(), 1); - //date.setYMD(year, date.month(), TQMIN(day, date.daysInMonth())); - d->calendar->setYMD(date, year, d->calendar->month(date), - TQMIN(day, d->calendar->daysInMonth(date))); - // ----- set this month - setDate(date); - } else { - KNotifyClient::beep(); - } - delete popup; -} - -void -ExtDatePicker::setEnabled(bool enable) -{ - TQWidget *widgets[]= { - yearForward, yearBackward, monthForward, monthBackward, - selectMonth, selectYear, - line, table, d->selectWeek, d->todayButton }; - const int Size=sizeof(widgets)/sizeof(widgets[0]); - int count; - // ----- - for(count=0; countsetEnabled(enable); - } -} - -void -ExtDatePicker::lineEnterPressed() -{ - ExtDate temp; - // ----- - if(val->date(line->text(), temp)==TQValidator::Acceptable) - { - kdDebug(298) << "ExtDatePicker::lineEnterPressed: valid date entered." << endl; - emit(dateEntered(temp)); - setDate(temp); - } else { - KNotifyClient::beep(); - kdDebug(298) << "ExtDatePicker::lineEnterPressed: invalid date entered." << endl; - } -} - -void -ExtDatePicker::todayButtonClicked() -{ - setDate(ExtDate::tqcurrentDate()); -} - -TQSize -ExtDatePicker::tqsizeHint() const -{ - return TQWidget::tqsizeHint(); -} - -void -ExtDatePicker::setFontSize(int s) -{ - TQWidget *buttons[]= { - // yearBackward, - // monthBackward, - selectMonth, - selectYear, - // monthForward, - // yearForward - }; - const int NoOfButtons=sizeof(buttons)/sizeof(buttons[0]); - int count; - TQFont font; - TQRect r; - // ----- - fontsize=s; - for(count=0; countfont(); - font.setPointSize(s); - buttons[count]->setFont(font); - } - TQFontMetrics metrics(selectMonth->fontMetrics()); - - for (int i = 1; ; ++i) - { - TQString str = d->calendar->monthName(i, - d->calendar->year(table->getDate()), false); - if (str.isNull()) break; - r=metrics.boundingRect(str); - maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); - maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); - } - - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, - selectMonth, - maxMonthRect); - selectMonth->setMinimumSize(metricBound); - - table->setFontSize(s); -} - -void -ExtDatePicker::setCloseButton( bool enable ) -{ - if ( enable == (d->closeButton != 0L) ) - return; - - if ( enable ) { - d->closeButton = new TQToolButton( this ); - d->closeButton->setAutoRaise(true); - d->navigationLayout->addSpacing(KDialog::spacingHint()); - d->navigationLayout->addWidget(d->closeButton); - TQToolTip::add(d->closeButton, i18n("Close")); - d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); - } - else { - delete d->closeButton; - d->closeButton = 0L; - } - - updateGeometry(); -} - -bool ExtDatePicker::hasCloseButton() const -{ - return (d->closeButton != 0L); -} - -void ExtDatePicker::virtual_hook( int /*id*/, void* /*data*/ ) -{ /*BASE::virtual_hook( id, data );*/ } - diff --git a/libkdeedu/extdate/extdatepicker.h b/libkdeedu/extdate/extdatepicker.h deleted file mode 100644 index 794ccea6..00000000 --- a/libkdeedu/extdate/extdatepicker.h +++ /dev/null @@ -1,254 +0,0 @@ -/* -*- C++ -*- - This file is part of the KDE libraries - Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) - (C) 1998-2001 Mirko Boehm (mirko@kde.org) - (C) 2004 Jason Harris (jharris@30doradus.org) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef EXTDATEPICKER_H -#define EXTDATEPICKER_H - - -#include "extdatetime.h" - -class KLineEdit; -class TQToolButton; -class ExtDateValidator; -class ExtDateTable; - -/** - * Provides a widget for calendar date input. - * - * Different from the - * previous versions, it now emits two types of signals, either - * dateSelected() or dateEntered() (see documentation for both - * signals). - * - * A line edit has been added in the newer versions to allow the user - * to select a date directly by entering numbers like 19990101 - * or 990101. - * - * \image html kdatepicker.png "KDE Date Widget" - * - * @version $Id$ - * @author Tim Gilman, Mirko Boehm - * - * @short A date selection widget. - **/ -class KDE_EXPORT ExtDatePicker: public TQFrame -{ - Q_OBJECT - TQ_OBJECT -// TQ_PROPERTY( ExtDate date READ date WRITE setDate) - TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton ) - TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) - -public: - /** The usual constructor. The given date will be displayed - * initially. - **/ - ExtDatePicker(TQWidget *parent=0, - ExtDate=ExtDate::tqcurrentDate(), - const char *name=0); - - /** The usual constructor. The given date will be displayed - * initially. - * @since 3.1 - **/ - ExtDatePicker(TQWidget *parent, - ExtDate, - const char *name, - WFlags f); // ### KDE 4.0: Merge - - /** - * Standard qt widget constructor. The initial date will be the - * current date. - * @since 3.1 - */ - ExtDatePicker( TQWidget *parent, const char *name ); - - /** - * The destructor. - **/ - virtual ~ExtDatePicker(); - - /** The size hint for date pickers. The size hint recommends the - * minimum size of the widget so that all elements may be placed - * without clipping. This sometimes looks ugly, so when using the - * size hint, try adding 28 to each of the reported numbers of - * pixels. - **/ - TQSize tqsizeHint() const; - - /** - * Sets the date. - * - * @returns @p false and does not change anything - * if the date given is invalid. - **/ - bool setDate(const ExtDate&); - - /** - * Returns the selected date. - * @deprecated - **/ - const ExtDate& getDate() const KDE_DEPRECATED; - - /** - * @returns the selected date. - */ - const ExtDate &date() const; - - /** - * Enables or disables the widget. - **/ - void setEnabled(bool); - - /** - * @returns the ExtDateTable widget child of this ExtDatePicker - * widget. - * @since 3.2 - */ - ExtDateTable *dateTable() const { return table; } - - /** - * Sets the font size of the widgets elements. - **/ - void setFontSize(int); - /** - * Returns the font size of the widget elements. - */ - int fontSize() const - { return fontsize; } - - /** - * By calling this method with @p enable = true, ExtDatePicker will show - * a little close-button in the upper button-row. Clicking the - * close-button will cause the ExtDatePicker's tqtopLevelWidget()'s close() - * method being called. This is mostly useful for toplevel datepickers - * without a window manager decoration. - * @see hasCloseButton - * @since 3.1 - */ - void setCloseButton( bool enable ); - - /** - * @returns true if a ExtDatePicker shows a close-button. - * @see setCloseButton - * @since 3.1 - */ - bool hasCloseButton() const; - -protected: - /// to catch move keyEvents when TQLineEdit has keyFocus - virtual bool eventFilter(TQObject *o, TQEvent *e ); - /// the resize event - virtual void resizeEvent(TQResizeEvent*); - /// the year forward button - TQToolButton *yearForward; - /// the year backward button - TQToolButton *yearBackward; - /// the month forward button - TQToolButton *monthForward; - /// the month backward button - TQToolButton *monthBackward; - /// the button for selecting the month directly - TQToolButton *selectMonth; - /// the button for selecting the year directly - TQToolButton *selectYear; - /// the line edit to enter the date directly - KLineEdit *line; - /// the validator for the line edit: - ExtDateValidator *val; - /// the date table - ExtDateTable *table; - /// the size calculated during resize events - // TQSize sizehint; - /// the widest month string in pixels: - TQSize maxMonthRect; -protected slots: - void dateChangedSlot(const ExtDate&); - void tableClickedSlot(); - void monthForwardClicked(); - void monthBackwardClicked(); - void yearForwardClicked(); - void yearBackwardClicked(); - /** - * @since 3.1 - * @deprecated in 3.2 - */ - void selectWeekClicked(); - /** - * @since 3.1 - */ - void selectMonthClicked(); - /** - * @since 3.1 - */ - void selectYearClicked(); - /** - * @since 3.1 - */ - void lineEnterPressed(); - /** - * @since 3.2 - */ - void todayButtonClicked(); - /** - * @since 3.2 - */ - void weekSelected(int); - -signals: - /** This signal is emitted each time the selected date is changed. - * Usually, this does not mean that the date has been entered, - * since the date also changes, for example, when another month is - * selected. - * @see dateSelected - */ - void dateChanged(const ExtDate&); - /** This signal is emitted each time a day has been selected by - * clicking on the table (hitting a day in the current month). It - * has the same meaning as dateSelected() in older versions of - * ExtDatePicker. - */ - void dateSelected(const ExtDate&); - /** This signal is emitted when enter is pressed and a VALID date - * has been entered before into the line edit. Connect to both - * dateEntered() and dateSelected() to receive all events where the - * user really enters a date. - */ - void dateEntered(const ExtDate&); - /** This signal is emitted when the day has been selected by - * clicking on it in the table. - */ - void tableClicked(); - -private: - /// the font size for the widget - int fontsize; - -protected: - virtual void virtual_hook( int id, void* data ); -private: - void init( const ExtDate &dt ); - void fillWeeksCombo(const ExtDate &date); - class ExtDatePickerPrivate; - ExtDatePickerPrivate *d; -}; - -#endif // EXTDATEPICKER_H diff --git a/libkdeedu/extdate/extdatetbl.cpp b/libkdeedu/extdate/extdatetbl.cpp deleted file mode 100644 index 55458417..00000000 --- a/libkdeedu/extdate/extdatetbl.cpp +++ /dev/null @@ -1,968 +0,0 @@ -/* -*- C++ -*- - This file is part of the KDE libraries - Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) - (C) 1998-2001 Mirko Boehm (mirko@kde.org) - (C) 2004 Jason Harris (jharris@30doradus.org) - - These classes has been derived from those in kdatetbl.[h|cpp]. - The only differences are adaptations to use ExtDate instead of TQDate, - to allow for more remote dates. These changes by Jason Harris. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -/////////////////// ExtDateTable widget class ////////////////////// -// -// Copyright (C) 1997 Tim D. Gilman -// (C) 1998-2001 Mirko Boehm -// Written using TQt (http://www.troll.no) for the -// KDE project (http://www.kde.org) -// -// Modified to use ExtDate by Jason Harris, 2004 -// -// This is a support class for the ExtDatePicker class. It just -// draws the calender table without titles, but could theoretically -// be used as a standalone. -// -// When a date is selected by the user, it emits a signal: -// dateSelected(ExtDate) - -//#include "extdatepicker.h" -#include "extdatetbl.h" - -#include -#include -#include -#include "kpopupmenu.h" -#include -#include -#include - - -class ExtDateTable::ExtDateTablePrivate -{ -public: - ExtDateTablePrivate() - { - popupMenuEnabled=false; - useCustomColors=false; - calendar = new ExtCalendarSystemGregorian(); - - } - - ~ExtDateTablePrivate() - { - delete calendar; - } - - bool popupMenuEnabled; - bool useCustomColors; - - struct DatePaintingMode - { - TQColor fgColor; - TQColor bgColor; - BackgroundMode bgMode; - }; - TQDict customPaintingModes; - ExtCalendarSystem *calendar; -}; - - -ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) -{ -} - -TQValidator::State -ExtDateValidator::validate(TQString& text, int&) const -{ - ExtDate temp; - // ----- everything is tested in date(): - return date(text, temp); -} - -TQValidator::State -ExtDateValidator::date(const TQString& text, ExtDate& ed) const -{ - //FIXME: Can't uncomment unless ExtDate is adopted by KDE - //ExtDate tmp = KGlobal::locale()->readDate(text); - ExtDate tmp = ExtDate::fromString( text ); - - if (!tmp.isNull()) - { - ed = tmp; - return Acceptable; - } else - return Valid; -} - -void -ExtDateValidator::fixup( TQString& ) const -{ - -} - -ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WFlags f) - : TQGridView(parent, name, f) -{ - d = new ExtDateTablePrivate; - setFontSize(10); - if(!date_.isValid()) - { - kdDebug() << "ExtDateTable ctor: WARNING: Given date is invalid, using current date." << endl; - date_=ExtDate::tqcurrentDate(); - } - setFocusPolicy( TQ_StrongFocus ); - setNumRows(7); // 6 weeks max + headline - setNumCols(7); // 7 days a week - setHScrollBarMode(AlwaysOff); - setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); - setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth -} - -ExtDateTable::~ExtDateTable() -{ - delete d; -} - -int ExtDateTable::posFromDate( const ExtDate &dt ) -{ -//FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// const int firstWeekDay = KGlobal::locale()->weekStartDay(); - - const int firstWeekDay = 7; - - int pos = d->calendar->day( dt ); - int offset = (firstday - firstWeekDay + 7) % 7; - // make sure at least one day of the previous month is visible. - // adjust this <1 if more days should be forced visible: - if ( offset < 1 ) offset += 7; - return pos + offset; -} - -ExtDate ExtDateTable::dateFromPos( int pos ) -{ - ExtDate pCellDate; - -//FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// int firstWeekDay = KGlobal::locale()->weekStartDay(); - const int firstWeekDay = 7; - - d->calendar->setYMD(pCellDate, d->calendar->year(date), d->calendar->month(date), 1); - - int offset = (firstday - firstWeekDay + 7) % 7; - // make sure at least one day of the previous month is visible. - // adjust this <1 if more days should be forced visible: - if ( offset < 1 ) offset += 7; - pCellDate = d->calendar->addDays( pCellDate, pos - offset ); - - return pCellDate; -} - -void -ExtDateTable::paintCell(TQPainter *painter, int row, int col) -{ -//FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// int firstWeekDay = KGlobal::locale()->weekStartDay(); - const int firstWeekDay = 7; - - TQRect rect; - TQString text; - TQPen pen; - int w=cellWidth(); - int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); - // ----- - - if(row==0) - { // we are drawing the headline - font.setBold(true); - painter->setFont(font); - bool normalday = true; - int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay : - col+firstWeekDay-7; - if ( daynum == d->calendar->weekDayOfPray() || - ( daynum == 6 && d->calendar->calendarName() == "gregorian" ) ) - normalday=false; - - TQBrush brushTitle(); - TQBrush brushInvertTitle(tqcolorGroup().base()); - TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); - TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); - if (!normalday) - { - painter->setPen(textColor); - painter->setBrush(textColor); - painter->drawRect(0, 0, w, h); - painter->setPen(titleColor); - } else { - painter->setPen(titleColor); - painter->setBrush(titleColor); - painter->drawRect(0, 0, w, h); - painter->setPen(textColor); - } - painter->drawText(0, 0, w, h-1, AlignCenter, - d->calendar->weekDayName(daynum, true), -1, &rect); - painter->setPen(tqcolorGroup().text()); - painter->moveTo(0, h-1); - painter->lineTo(w-1, h-1); - // ----- draw the weekday: - } else { - bool paintRect=true; - painter->setFont(font); - int pos=7*(row-1)+col; - - ExtDate pCellDate = dateFromPos( pos ); - // First day of month - text = d->calendar->dayString(pCellDate, true); - if( d->calendar->month(pCellDate) != d->calendar->month(date) ) - { // we are either - // � painting a day of the previous month or - // � painting a day of the following month - // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text. - painter->setPen( tqcolorGroup().mid() ); -// painter->setPen(gray); - } else { // paint a day of the current month - if ( d->useCustomColors ) - { - ExtDateTablePrivate::DatePaintingMode *mode=d->customPaintingModes[pCellDate.toString()]; - if (mode) - { - if (mode->bgMode != NoBgMode) - { - TQBrush oldbrush=painter->brush(); - painter->setBrush( mode->bgColor ); - switch(mode->bgMode) - { - case(CircleMode) : painter->drawEllipse(0,0,w,h);break; - case(RectangleMode) : painter->drawRect(0,0,w,h);break; - case(NoBgMode) : // Should never be here, but just to get one - // less warning when compiling - default: break; - } - painter->setBrush( oldbrush ); - paintRect=false; - } - painter->setPen( mode->fgColor ); - } else - painter->setPen(tqcolorGroup().text()); - } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(tqcolorGroup().text()); - } - - pen=painter->pen(); - int offset=firstday-firstWeekDay; - if(offset<1) - offset+=7; - int dy = d->calendar->day(date); - if( ((offset+dy) == (pos+1)) && hasFocus()) - { - // draw the currently selected date - painter->setPen(tqcolorGroup().highlight()); - painter->setBrush(tqcolorGroup().highlight()); - pen=TQPen(tqcolorGroup().highlightedText()); - } else { - painter->setBrush(paletteBackgroundColor()); - painter->setPen(paletteBackgroundColor()); -// painter->setBrush(tqcolorGroup().base()); -// painter->setPen(tqcolorGroup().base()); - } - - if ( pCellDate == ExtDate::tqcurrentDate() ) - { - painter->setPen(tqcolorGroup().text()); - } - - if ( paintRect ) painter->drawRect(0, 0, w, h); - painter->setPen(pen); - painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect); - } - if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); - if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height()); -} - -void -ExtDateTable::keyPressEvent( TQKeyEvent *e ) -{ -//FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - ExtDate temp = date; - - switch( e->key() ) { - case Key_Prior: - temp = d->calendar->addMonths( date, -1 ); - setDate(temp); - return; - case Key_Next: - temp = d->calendar->addMonths( date, 1 ); - setDate(temp); - return; - case Key_Up: - if ( d->calendar->day(date) > 7 ) { - setDate(date.addDays(-7)); - return; - } - break; - case Key_Down: - if ( d->calendar->day(date) <= d->calendar->daysInMonth(date)-7 ) { - setDate(date.addDays(7)); - return; - } - break; - case Key_Left: - if ( d->calendar->day(date) > 1 ) { - setDate(date.addDays(-1)); - return; - } - break; - case Key_Right: - if ( d->calendar->day(date) < d->calendar->daysInMonth(date) ) { - setDate(date.addDays(1)); - return; - } - break; - case Key_Minus: - setDate(date.addDays(-1)); - return; - case Key_Plus: - setDate(date.addDays(1)); - return; - case Key_N: - setDate(ExtDate::tqcurrentDate()); - return; - case Key_Return: - case Key_Enter: - emit tableClicked(); - return; - default: - break; - } - - KNotifyClient::beep(); -} - -void -ExtDateTable::viewportResizeEvent(TQResizeEvent * e) -{ - TQGridView::viewportResizeEvent(e); - - setCellWidth(viewport()->width()/7); - setCellHeight(viewport()->height()/7); -} - -void -ExtDateTable::setFontSize(int size) -{ -//FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - int count; - TQFontMetrics metrics(fontMetrics()); - TQRect rect; - // ----- store rectangles: - fontsize=size; - // ----- find largest day name: - maxCell.setWidth(0); - maxCell.setHeight(0); - for(count=0; count<7; ++count) - { - rect=metrics.boundingRect(d->calendar->weekDayName(count+1, true)); - maxCell.setWidth(TQMAX(maxCell.width(), rect.width())); - maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); - } - // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); - maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); - maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); -} - -void -ExtDateTable::wheelEvent ( TQWheelEvent * e ) -{ - setDate(date.addMonths( -(int)(e->delta()/120)) ); - e->accept(); -} - -void -ExtDateTable::contentsMousePressEvent(TQMouseEvent *e) -{ - - if(e->type()!=TQEvent::MouseButtonPress) - { // the ExtDatePicker only reacts on mouse press events: - return; - } - if(!isEnabled()) - { - KNotifyClient::beep(); - return; - } - - // ----- - int row, col, pos, temp; - TQPoint mouseCoord; - // ----- - mouseCoord = e->pos(); - row=rowAt(mouseCoord.y()); - col=columnAt(mouseCoord.x()); - if(row<1 || col<0) - { // the user clicked on the frame of the table - return; - } - - // Rows and columns are zero indexed. The (row - 1) below is to avoid counting - // the row with the days of the week in the calculation. - - // old selected date: - temp = posFromDate( date ); - // new position and date - pos = (7 * (row - 1)) + col; - ExtDate clickedDate = dateFromPos( pos ); - - // set the new date. If it is in the previous or next month, the month will - // automatically be changed, no need to do that manually... - setDate( clickedDate ); - - // call updateCell on the old and new selection. If setDate switched to a different - // month, these cells will be painted twice, but that's no problem. - updateCell( temp/7+1, temp%7 ); - updateCell( row, col ); - - emit tableClicked(); - - if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) - { - KPopupMenu *menu = new KPopupMenu(); - -//FIXME: Uncomment the following line (and remove the one after it) -// if ExtDate is added to tdelibs -// menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) ); - menu->insertTitle( clickedDate.toString() ); - - emit aboutToShowContextMenu( menu, clickedDate ); - menu->popup(e->globalPos()); - } -} - -bool -ExtDateTable::setDate(const ExtDate& date_) -{ - bool changed=false; - ExtDate temp; - // ----- - if(!date_.isValid()) - { - kdDebug() << "ExtDateTable::setDate: refusing to set invalid date." << endl; - return false; - } - if(date!=date_) - { - emit(dateChanged(date, date_)); - date=date_; - emit(dateChanged(date)); - changed=true; - } - -//FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); - - d->calendar->setYMD(temp, d->calendar->year(date), d->calendar->month(date), 1); - //temp.setYMD(date.year(), date.month(), 1); - //kdDebug() << "firstDayInWeek: " << temp.toString() << endl; - firstday=temp.dayOfWeek(); - numdays=d->calendar->daysInMonth(date); - - temp = d->calendar->addMonths(temp, -1); - numDaysPrevMonth=d->calendar->daysInMonth(temp); - if(changed) - { - repaintContents(false); - } - return true; -} - -const ExtDate& -ExtDateTable::getDate() const -{ - return date; -} - -// what are those repaintContents() good for? (pfeiffer) -void ExtDateTable::focusInEvent( TQFocusEvent *e ) -{ -// repaintContents(false); - TQGridView::focusInEvent( e ); -} - -void ExtDateTable::focusOutEvent( TQFocusEvent *e ) -{ -// repaintContents(false); - TQGridView::focusOutEvent( e ); -} - -TQSize -ExtDateTable::tqsizeHint() const -{ - if(maxCell.height()>0 && maxCell.width()>0) - { - return TQSize(maxCell.width()*numCols()+2*frameWidth(), - (maxCell.height()+2)*numRows()+2*frameWidth()); - } else { - kdDebug() << "ExtDateTable::tqsizeHint: obscure failure - " << endl; - return TQSize(-1, -1); - } -} - -void ExtDateTable::setPopupMenuEnabled( bool enable ) -{ - d->popupMenuEnabled=enable; -} - -bool ExtDateTable::popupMenuEnabled() const -{ - return d->popupMenuEnabled; -} - -void ExtDateTable::setCustomDatePainting(const ExtDate &date, const TQColor &fgColor, BackgroundMode bgMode, const TQColor &bgColor) -{ - if (!fgColor.isValid()) - { - unsetCustomDatePainting( date ); - return; - } - - ExtDateTablePrivate::DatePaintingMode *mode=new ExtDateTablePrivate::DatePaintingMode; - mode->bgMode=bgMode; - mode->fgColor=fgColor; - mode->bgColor=bgColor; - - d->customPaintingModes.replace( date.toString(), mode ); - d->useCustomColors=true; - update(); -} - -void ExtDateTable::unsetCustomDatePainting( const ExtDate &date ) -{ - d->customPaintingModes.remove( date.toString() ); -} - -ExtDateInternalWeekSelector::ExtDateInternalWeekSelector -(TQWidget* parent, const char* name) - : KLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), - result(0) -{ - TQFont font; - // ----- - font=KGlobalSettings::generalFont(); - setFont(font); - setFrameStyle(TQFrame::NoFrame); - setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); -} - -void -ExtDateInternalWeekSelector::weekEnteredSlot() -{ - bool ok; - int week; - // ----- check if this is a valid week: - week=text().toInt(&ok); - if(!ok) - { - KNotifyClient::beep(); - return; - } - result=week; - emit(closeMe(1)); -} - -int -ExtDateInternalWeekSelector::getWeek() -{ - return result; -} - -void -ExtDateInternalWeekSelector::setWeek(int week) -{ - TQString temp; - // ----- - temp.setNum(week); - setText(temp); -} - -void -ExtDateInternalWeekSelector::setMaxWeek(int max) -{ - val->setRange(1, max); -} - -// ### CFM To avoid binary incompatibility. -// In future releases, remove this and replace by a ExtDate -// private member, needed in ExtDateInternalMonthPicker::paintCell -class ExtDateInternalMonthPicker::ExtDateInternalMonthPrivate { -public: - ExtDateInternalMonthPrivate (int y, int m, int d) - : year(y), month(m), day(d) - { calendar = new ExtCalendarSystemGregorian(); } - ~ExtDateInternalMonthPrivate() - { delete calendar; } - - ExtCalendarSystem *calendar; - int year; - int month; - int day; -}; - -ExtDateInternalMonthPicker::~ExtDateInternalMonthPicker() { - delete d; -} - -ExtDateInternalMonthPicker::ExtDateInternalMonthPicker -(const ExtDate & date, TQWidget* parent, const char* name) - : TQGridView(parent, name), - result(0) // invalid -{ -//FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs -// ExtCalendarSystem *calendar = KGlobal::locale()->calendar(); - - TQRect rect; - TQFont font; - // ----- - activeCol = -1; - activeRow = -1; - font=KGlobalSettings::generalFont(); - setFont(font); - setHScrollBarMode(AlwaysOff); - setVScrollBarMode(AlwaysOff); - setFrameStyle(TQFrame::NoFrame); - setNumCols(3); - d = new ExtDateInternalMonthPrivate(date.year(), date.month(), date.day()); - // For monthsInYear != 12 - setNumRows( (d->calendar->monthsInYear(date) + 2) / 3); - // enable to find drawing failures: - // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker - // ----- find the preferred size - // (this is slow, possibly, but unfortunately it is needed here): - TQFontMetrics metrics(font); - for(int i = 1; ; ++i) - { - TQString str = d->calendar->monthName(i, - d->calendar->year(date), false); - if (str.isNull()) break; - rect=metrics.boundingRect(str); - if(max.width()setPen(KGlobalSettings::textColor()); -} - -void -ExtDateInternalMonthPicker::viewportResizeEvent(TQResizeEvent*) -{ - setCellWidth(width() / numCols()); - setCellHeight(height() / numRows()); -} - -void -ExtDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) -{ - int index; - TQString text; - // ----- find the number of the cell: - index=3*row+col+1; - text=d->calendar->monthName(index, - d->calendar->year(ExtDate(d->year, d->month, - d->day)), false); - painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); - if ( activeCol == col && activeRow == row ) - painter->drawRect( 0, 0, cellWidth(), cellHeight() ); -} - -void -ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) -{ - if(!isEnabled() || e->button() != Qt::LeftButton) - { - KNotifyClient::beep(); - return; - } - // ----- - int row, col; - TQPoint mouseCoord; - // ----- - mouseCoord = e->pos(); - row=rowAt(mouseCoord.y()); - col=columnAt(mouseCoord.x()); - - if(row<0 || col<0) - { // the user clicked on the frame of the table - activeCol = -1; - activeRow = -1; - } else { - activeCol = col; - activeRow = row; - updateCell( row, col /*, false */ ); - } -} - -void -ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) -{ - if (e->state() & Qt::LeftButton) - { - int row, col; - TQPoint mouseCoord; - // ----- - mouseCoord = e->pos(); - row=rowAt(mouseCoord.y()); - col=columnAt(mouseCoord.x()); - int tmpRow = -1, tmpCol = -1; - if(row<0 || col<0) - { // the user clicked on the frame of the table - if ( activeCol > -1 ) - { - tmpRow = activeRow; - tmpCol = activeCol; - } - activeCol = -1; - activeRow = -1; - } else { - bool differentCell = (activeRow != row || activeCol != col); - if ( activeCol > -1 && differentCell) - { - tmpRow = activeRow; - tmpCol = activeCol; - } - if ( differentCell) - { - activeRow = row; - activeCol = col; - updateCell( row, col /*, false */ ); // mark the new active cell - } - } - if ( tmpRow > -1 ) // tqrepaint the former active cell - updateCell( tmpRow, tmpCol /*, true */ ); - } -} - -void -ExtDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) -{ - if(!isEnabled()) - { - return; - } - // ----- - int row, col, pos; - TQPoint mouseCoord; - // ----- - mouseCoord = e->pos(); - row=rowAt(mouseCoord.y()); - col=columnAt(mouseCoord.x()); - if(row<0 || col<0) - { // the user clicked on the frame of the table - emit(closeMe(0)); - } - - pos=3*row+col+1; - result=pos; - emit(closeMe(1)); -} - - - -ExtDateInternalYearSelector::ExtDateInternalYearSelector -(TQWidget* parent, const char* name) - : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), - result(0), - d(new ExtDateInternalYearPrivate()) -{ - TQFont font; - // ----- - font=KGlobalSettings::generalFont(); - setFont(font); - setFrameStyle(TQFrame::NoFrame); - // set year limits (perhaps we should get rid of limits altogether) - //there si also a year limit in ExtCalendarSystemGregorian... - val->setRange(-50000, 50000); - setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); -} - -ExtDateInternalYearSelector::~ExtDateInternalYearSelector() { - delete val; - delete d; -} - -void -ExtDateInternalYearSelector::yearEnteredSlot() -{ - bool ok; - int year; - ExtDate date; - // ----- check if this is a valid year: - year=text().toInt(&ok); - if(!ok) - { - KNotifyClient::beep(); - return; - } - //date.setYMD(year, 1, 1); - d->calendar->setYMD(date, year, 1, 1); - if(!date.isValid()) - { - KNotifyClient::beep(); - return; - } - result=year; - emit(closeMe(1)); -} - -int -ExtDateInternalYearSelector::getYear() -{ - return result; -} - -void -ExtDateInternalYearSelector::setYear(int year) -{ - TQString temp; - // ----- - temp.setNum(year); - setText(temp); -} - -KPopupFrame::KPopupFrame(TQWidget* parent, const char* name) - : TQFrame(parent, name, WType_Popup), - result(0), // rejected - main(0) -{ - setFrameStyle(TQFrame::Box|TQFrame::Raised); - setMidLineWidth(2); -} - -void -KPopupFrame::keyPressEvent(TQKeyEvent* e) -{ - if(e->key()==Key_Escape) - { - result=0; // rejected - tqApp->exit_loop(); - } -} - -void -KPopupFrame::close(int r) -{ - result=r; - tqApp->exit_loop(); -} - -void -KPopupFrame::setMainWidget(TQWidget* m) -{ - main=m; - if(main!=0) - { - resize(main->width()+2*frameWidth(), main->height()+2*frameWidth()); - } -} - -void -KPopupFrame::resizeEvent(TQResizeEvent*) -{ - if(main!=0) - { - main->setGeometry(frameWidth(), frameWidth(), - width()-2*frameWidth(), height()-2*frameWidth()); - } -} - -void -KPopupFrame::popup(const TQPoint &pos) -{ - // Make sure the whole popup is visible. - TQRect d = KGlobalSettings::desktopGeometry(pos); - - int x = pos.x(); - int y = pos.y(); - int w = width(); - int h = height(); - if (x+w > d.x()+d.width()) - x = d.width() - w; - if (y+h > d.y()+d.height()) - y = d.height() - h; - if (x < d.x()) - x = 0; - if (y < d.y()) - y = 0; - - // Pop the thingy up. - move(x, y); - show(); -} - -int -KPopupFrame::exec(TQPoint pos) -{ - popup(pos); - tqrepaint(); - tqApp->enter_loop(); - hide(); - return result; -} - -int -KPopupFrame::exec(int x, int y) -{ - return exec(TQPoint(x, y)); -} - -void KPopupFrame::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - -void ExtDateTable::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - -#include "extdatetbl.moc" diff --git a/libkdeedu/extdate/extdatetbl.h b/libkdeedu/extdate/extdatetbl.h deleted file mode 100644 index fbbc880b..00000000 --- a/libkdeedu/extdate/extdatetbl.h +++ /dev/null @@ -1,432 +0,0 @@ -/* -*- C++ -*- - This file is part of the KDE libraries - Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) - (C) 1998-2001 Mirko Boehm (mirko@kde.org) - (C) 2004 Jason Harris (jharris@30doradus.org) - - These classes has been derived from those in kdatetbl.[h|cpp]. - The only differences are adaptations to use ExtDate instead of TQDate, - to allow for more remote dates. These changes by Jason Harris. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef EXTDATETBL_H -#define EXTDATETBL_H - -#include -#include -#include -#include "extcalendarsystemgregorian.h" - -class KPopupMenu; - -/** Week selection widget. -* @internal -* @version $Id$ -* @author Stephan Binner -*/ -class ExtDateInternalWeekSelector : public KLineEdit -{ - Q_OBJECT - TQ_OBJECT -protected: - TQIntValidator *val; - int result; -public slots: - void weekEnteredSlot(); - void setMaxWeek(int max); -signals: - void closeMe(int); -public: - ExtDateInternalWeekSelector( TQWidget* parent=0, const char* name=0); - int getWeek(); - void setWeek(int week); - -private: - class ExtDateInternalWeekPrivate; - ExtDateInternalWeekPrivate *d; -}; - -/** -* A table containing month names. It is used to pick a month directly. -* @internal -* @version $Id$ -* @author Tim Gilman, Mirko Boehm -*/ -class ExtDateInternalMonthPicker : public TQGridView -{ - Q_OBJECT - TQ_OBJECT -protected: - /** - * Store the month that has been clicked [1..12]. - */ - int result; - /** - * the cell under mouse cursor when LBM is pressed - */ - short int activeCol; - short int activeRow; - /** - * Contains the largest rectangle needed by the month names. - */ - TQRect max; -signals: - /** - * This is send from the mouse click event handler. - */ - void closeMe(int); -public: - /** - * The constructor. - */ - ExtDateInternalMonthPicker(const ExtDate& date, TQWidget* parent, const char* name=0); - /** - * The destructor. - */ - ~ExtDateInternalMonthPicker(); - /** - * The size hint. - */ - TQSize tqsizeHint() const; - /** - * Return the result. 0 means no selection (reject()), 1..12 are the - * months. - */ - int getResult() const; -protected: - /** - * Set up the painter. - */ - void setupPainter(TQPainter *p); - /** - * The resize event. - */ - virtual void viewportResizeEvent(TQResizeEvent*); - /** - * Paint a cell. This simply draws the month names in it. - */ - virtual void paintCell(TQPainter* painter, int row, int col); - /** - * Catch mouse click and move events to paint a rectangle around the item. - */ - virtual void contentsMousePressEvent(TQMouseEvent *e); - virtual void contentsMouseMoveEvent(TQMouseEvent *e); - /** - * Emit monthSelected(int) when a cell has been released. - */ - virtual void contentsMouseReleaseEvent(TQMouseEvent *e); - -private: - class ExtDateInternalMonthPrivate; - ExtDateInternalMonthPrivate *d; -}; - -/** Year selection widget. -* @internal -* @version $Id$ -* @author Tim Gilman, Mirko Boehm -*/ -class ExtDateInternalYearSelector : public TQLineEdit -{ - Q_OBJECT - TQ_OBJECT -protected: - TQIntValidator *val; - int result; -public slots: - void yearEnteredSlot(); -signals: - void closeMe(int); -public: - ExtDateInternalYearSelector( TQWidget* parent=0, const char* name=0); - ~ExtDateInternalYearSelector(); - int getYear(); - void setYear(int year); - -private: - class ExtDateInternalYearPrivate { - public: - ExtDateInternalYearPrivate() { - calendar = new ExtCalendarSystemGregorian(); - } - ~ExtDateInternalYearPrivate() { - delete calendar; - } - ExtCalendarSystem *calendar; - }; - ExtDateInternalYearPrivate *d; - -}; - -/** - * Frame with popup menu behavior. - * @author Tim Gilman, Mirko Boehm - * @version $Id$ - */ -class KPopupFrame : public TQFrame -{ - Q_OBJECT - TQ_OBJECT -protected: - /** - * The result. It is returned from exec() when the popup window closes. - */ - int result; - /** - * Catch key press events. - */ - virtual void keyPressEvent(TQKeyEvent* e); - /** - * The only subwidget that uses the whole dialog window. - */ - TQWidget *main; -public slots: - /** - * Close the popup window. This is called from the main widget, usually. - * @p r is the result returned from exec(). - */ - void close(int r); -public: - /** - * The contructor. Creates a dialog without buttons. - */ - KPopupFrame(TQWidget* parent=0, const char* name=0); - /** - * Set the main widget. You cannot set the main widget from the constructor, - * since it must be a child of the frame itselfes. - * Be careful: the size is set to the main widgets size. It is up to you to - * set the main widgets correct size before setting it as the main - * widget. - */ - void setMainWidget(TQWidget* m); - /** - * The resize event. Simply resizes the main widget to the whole - * widgets client size. - */ - virtual void resizeEvent(TQResizeEvent*); - /** - * Open the popup window at position pos. - */ - void popup(const TQPoint &pos); - /** - * Execute the popup window. - */ - int exec(TQPoint p); - /** - * Dito. - */ - int exec(int x, int y); - -private: - - virtual bool close(bool alsoDelete) { return TQFrame::close(alsoDelete); } -protected: - virtual void virtual_hook( int id, void* data ); -private: - class KPopupFramePrivate; - KPopupFramePrivate *d; -}; - -/** -* Validates user-entered dates. -*/ -class ExtDateValidator : public TQValidator -{ -public: - ExtDateValidator(TQWidget* parent=0, const char* name=0); - virtual State validate(TQString&, int&) const; - virtual void fixup ( TQString & input ) const; - State date(const TQString&, ExtDate&) const; -}; - -/** - * Date selection table. - * This is a support class for the ExtDatePicker class. It just - * draws the calender table without titles, but could theoretically - * be used as a standalone. - * - * When a date is selected by the user, it emits a signal: - * dateSelected(ExtDate) - * - * @internal - * @version $Id$ - * @author Tim Gilman, Mirko Boehm - */ -class ExtDateTable : public TQGridView -{ - Q_OBJECT - TQ_OBJECT - //TQ_PROPERTY( ExtDate date READ getDate WRITE setDate ) - TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled ) - -public: - /** - * The constructor. - */ - ExtDateTable(TQWidget *parent=0, - ExtDate date=ExtDate::tqcurrentDate(), - const char* name=0, WFlags f=0); - - /** - * The destructor. - */ - ~ExtDateTable(); - - /** - * Returns a recommended size for the widget. - * To save some time, the size of the largest used cell content is - * calculated in each paintCell() call, since all calculations have - * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. - */ - virtual TQSize tqsizeHint() const; - /** - * Set the font size of the date table. - */ - void setFontSize(int size); - /** - * Select and display this date. - */ - bool setDate(const ExtDate&); - // ### 4.0 rename to date() - const ExtDate& getDate() const; - - /** - * Enables a popup menu when right clicking on a date. - * - * When it's enabled, this object emits a aboutToShowContextMenu signal - * where you can fill in the menu items. - * - * @since 3.2 - */ - void setPopupMenuEnabled( bool enable ); - - /** - * Returns if the popup menu is enabled or not - */ - bool popupMenuEnabled() const; - - enum BackgroundMode { NoBgMode=0, RectangleMode, CircleMode }; - - /** - * Makes a given date be painted with a given foregroundColor, and background - * (a rectangle, or a circle/ellipse) in a given color. - * - * @since 3.2 - */ - void setCustomDatePainting( const ExtDate &date, const TQColor &fgColor, BackgroundMode bgMode=NoBgMode, const TQColor &bgColor=TQColor()); - - /** - * Unsets the custom painting of a date so that the date is painted as usual. - * - * @since 3.2 - */ - void unsetCustomDatePainting( const ExtDate &date ); - -protected: - /** - * calculate the position of the cell in the matrix for the given date. The result is the 0-based index. - */ - int posFromDate( const ExtDate &date ); // KDE4: make this virtual, so subclasses can reimplement this and use a different default for the start of the matrix - /** - * calculate the date that is displayed at a given cell in the matrix. pos is the - * 0-based index in the matrix. Inverse function to posForDate(). - */ - ExtDate dateFromPos( int pos ); // KDE4: make this virtual - - /** - * Paint a cell. - */ - virtual void paintCell(TQPainter*, int, int); - /** - * Handle the resize events. - */ - virtual void viewportResizeEvent(TQResizeEvent *); - /** - * React on mouse clicks that select a date. - */ - virtual void contentsMousePressEvent(TQMouseEvent *); - virtual void wheelEvent( TQWheelEvent * e ); - virtual void keyPressEvent( TQKeyEvent *e ); - virtual void focusInEvent( TQFocusEvent *e ); - virtual void focusOutEvent( TQFocusEvent *e ); - - // ### KDE 4.0 make the following private and mark as members - - /** - * The font size of the displayed text. - */ - int fontsize; - /** - * The currently selected date. - */ - ExtDate date; - /** - * The day of the first day in the month [1..7]. - */ - int firstday; - /** - * The number of days in the current month. - */ - int numdays; - /** - * The number of days in the previous month. - */ - int numDaysPrevMonth; - /** - * unused - * ### remove in KDE 4.0 - */ - bool unused_hasSelection; - /** - * Save the size of the largest used cell content. - */ - TQRect maxCell; -signals: - /** - * The selected date changed. - */ - void dateChanged(const ExtDate&); - /** - * This function behaves essentially like the one above. - * The selected date changed. - * @param cur The current date - * @param old The date before the date was changed - */ - void dateChanged(const ExtDate& cur, const ExtDate& old); - /** - * A date has been selected by clicking on the table. - */ - void tableClicked(); - - /** - * A popup menu for a given date is about to be shown (as when the user - * right clicks on that date and the popup menu is enabled). Connect - * the slot where you fill the menu to this signal. - * - * @since 3.2 - */ - void aboutToShowContextMenu( KPopupMenu * menu, const ExtDate &date); - -protected: - virtual void virtual_hook( int id, void* data ); -private: - class ExtDateTablePrivate; - ExtDateTablePrivate *d; -}; - -#endif // EXTDATETBL_H diff --git a/libkdeedu/extdate/extdatetime.cpp b/libkdeedu/extdate/extdatetime.cpp deleted file mode 100644 index d8984eee..00000000 --- a/libkdeedu/extdate/extdatetime.cpp +++ /dev/null @@ -1,1150 +0,0 @@ -/************************************************************************* -** Definition of extended range date classe -** (c) 2004 by Michel Guitel -** modifications by Jason Harris -** -** 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 "extdatetime.h" -#include - -#include -#include -#include -#include -#include - -static const uint SECS_PER_DAY = 86400; -static const uint MSECS_PER_DAY = 86400000; -static const uint SECS_PER_HOUR = 3600; -static const uint MSECS_PER_HOUR= 3600000; -static const uint SECS_PER_MIN = 60; -static const uint MSECS_PER_MIN = 60000; - -/***************************************************************************** - ExtDate class - *****************************************************************************/ - -/***************************************************************************** - * - * Concepts : - * a date is represented internally by its Julian Day number, a simple count - * of the number of days since a remote, arbitrary date (01 January, 4713 BC). - * This date has Julian Day number zero. - * - * ***************************************************************************/ - -uint ExtDate::m_monthLength[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -uint ExtDate::m_monthOrigin[] = { 0, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -TQString ExtDate::m_shortMonthNames[12] = { - i18n("Short month name", "Jan"), i18n("Short month name", "Feb"), - i18n("Short month name", "Mar"), i18n("Short month name", "Apr"), - i18n("Short month name", "May"), i18n("Short month name", "Jun"), - i18n("Short month name", "Jul"), i18n("Short month name", "Aug"), - i18n("Short month name", "Sep"), i18n("Short month name", "Oct"), - i18n("Short month name", "Nov"), i18n("Short month name", "Dec") -}; -TQString ExtDate::m_shortDayNames[7] = { - i18n("Short day name", "Mon"), i18n("Short day name", "Tue"), - i18n("Short day name", "Wed"), i18n("Short day name", "Thu"), - i18n("Short day name", "Fri"), i18n("Short day name", "Sat"), - i18n("Short day name", "Sun") -}; -TQString ExtDate::m_longMonthNames[12] = { - i18n("Long month name", "January"), i18n("Long month name", "February"), - i18n("Long month name", "March"), i18n("Long month name", "April"), - i18n("Long month name", "May"), i18n("Long month name", "June"), - i18n("Long month name", "July"), i18n("Long month name", "August"), - i18n("Long month name", "September"), i18n("Long month name", "October"), - i18n("Long month name", "November"), i18n("Long month name", "December") -}; -TQString ExtDate::m_longDayNames[7] = { - i18n("Long day name", "Monday"), i18n("Long day name", "Tuesday"), - i18n("Long day name", "Wednesday"), i18n("Long day name", "Thursday"), - i18n("Long day name", "Friday"), i18n("Long day name", "Saturday"), - i18n("Long day name", "Sunday") -}; - -ExtDate::ExtDate( int y, int m, int d) -{ - if ( !isValid(y,m,d) ) { -#if defined(TQT_CHECK_RANGE) - qWarning( "ExtDate: Invalid date %04d-%02d-%02d", y, m, d ); -#endif - m_year = 0; - m_month = 0; - m_day = 0; - m_jd = INVALID_DAY; - } else { - m_year = y; - m_month = m; - m_day = d; - m_jd = GregorianToJD(y, m, d); - } -} - -ExtDate::ExtDate( long int jd ) { - m_jd = jd; - JDToGregorian( jd, m_year, m_month, m_day ); -} - -long int ExtDate::GregorianToJD( int year, int month, int day ) -{ - int m, y, A, B, C, D; - - if (month > 2) { - m = month; - y = year; - } else { - y = year - 1; - m = month + 12; - } - -/* If the date is after 10/15/1582, then take Pope Gregory's modification - to the Julian calendar into account */ - - if ( ( year >1582 ) || - ( year ==1582 && month >9 ) || - ( year ==1582 && month ==9 && day >15 )) - { - A = int(y/100); - B = 2 - A + int(A/4); - } else { - B = 0; - } - - if (y < 0) { - C = int((365.25*y) - 0.75); - } else { - C = int(365.25*y); - } - - D = int(30.6001*(m+1)); - - long int jd = B + C + D + day + 1720995; - - return jd; -} - -void ExtDate::JDToGregorian( long int jd, int &year, int &month, int &day ) -{ - int a, b, c, d, e, alpha; - - if (jd<2299161) { - a = jd; - } else { - alpha = int ((jd-1867216.25)/ 36524.25); - a = jd + 1 + alpha - int(alpha / 4.0); - } - b = a + 1524; - c = int ((b-122.1)/ 365.25); - d = int (365.25*c); - e = int ((b-d)/ 30.6001); - - day = b-d-int(30.6001*e); - month = (e<14) ? e-1 : e-13; - year = (month>2) ? c-4716 : c-4715; -} - -bool ExtDate::isValid() const -{ - return ( jd() != INVALID_DAY && isValid( year(), month(), day() ) ); -} - -int ExtDate::dayOfWeek() const -{ - //JD 2451545 (01 Jan 2000) was a Saturday, which is dayOfWeek=6. - int a_day = (( jd() - 2451545 + 6 ) % 7); - if ( a_day < 0 ) a_day += 7; - return (a_day == 0) ? 7 : a_day; -} - -int ExtDate::dayOfYear() const -{ - return jd() - GregorianToJD( year(), 1, 1) + 1; -} - -int ExtDate::daysInMonth() const -{ - if ( isValid() ) { - int m = month(); - int d = m_monthLength[m-1]; - if (m==2 && leapYear(year())) d++; - return d; - } else { - return 31; - } -} - -int ExtDate::daysInYear() const -{ - if ( ! isValid() ) return 365; - return (leapYear(year()) ? 366 : 365); -} - -int ExtDate::weekNumber( int *yearNum ) const -{ - //ISO 8601: - //Week 1 is the week containing the first Thursday of the year. - ExtDate day1( year(), 1, 1 ); //First day of the year - - if ( day1.dayOfWeek() > 4 ) { - //Jan 1 is after Thursday, so it's in the previous year's last week. - //Set day1 to be the following Monday, which is the start of week 1 - day1 = day1.addDays( 7 - day1.dayOfWeek() + 1 ); - } else { - //Jan 1 is before Friday, so it is in Week 1. - //Set day1 to be the preceding Monday - day1 = day1.addDays( 1 - day1.dayOfWeek() ); - } - - //Is the target date prior to day1? If so, the target is in the - //last week of the previous year. - if ( day1.daysTo( *this ) < 0 ) { - if ( yearNum ) *yearNum = year() - 1; - - //The last week of the year always contains Dec 28th (ISO 8601) - ExtDate lastDec28( year()-1, 12, 28 ); - return lastDec28.weekNumber(); - } - - //If the target date is after Dec 28th, it's possible that it is in - //Week 1 of the following year. - ExtDate dec28( year(), 12, 28 ); - if ( dayOfYear() > dec28.dayOfYear() && dayOfWeek() < 4 ) { - if ( yearNum ) *yearNum = year() + 1; - return 1; - } - - //If we reach here, the week number will be in this year. - int week = 1 + int( day1.daysTo( *this )/7 ); - - if ( yearNum ) *yearNum = year(); - return week; -} - -#ifndef TQT_NO_TEXTDATE -TQString ExtDate::shortMonthName( int month ) {return m_shortMonthNames[month-1];} -TQString ExtDate::shortDayName( int weekday ) {return m_shortDayNames[weekday-1];} -TQString ExtDate::longMonthName( int month ) {return m_longMonthNames[month-1];} -TQString ExtDate::longDayName( int weekday ) {return m_longDayNames[weekday-1];} -#endif //TQT_NO_TEXTDATE - -#ifndef TQT_NO_TEXTSTRING -#if !defined(TQT_NO_SPRINTF) -TQString ExtDate::toString( Qt::DateFormat f) const -{ - TQString a_format; - - if ( ! isValid() ) return TQString(); - - switch (f) - { - case Qt::TextDate : // Sat May 20 1995 - a_format = "%a %b %e %Y"; - break; - - case Qt::ISODate : // YYYY-MM-DD - a_format = "%Y-%m-%d"; - break; - - case Qt::LocalDate : // local settings - a_format = KGlobal::locale()->dateFormat(); - break; - - default : - a_format = "toString : unknown format"; - break; - - } - return toString(a_format); -} -#endif - -TQString ExtDate::toString( const TQString& format ) const -{ - if ( ! isValid() ) return TQString(); - - //We use the KDE Date format specs. - //Replace occurences of the following tokens with their - //corresponding values: - // - // %Y The year, including centuries prefix (e.g., "1984") - // %y The year, excluding centuries prefix (e.g., "84") - // %n Numerical month value (e.g., "3" for March) - // %m Numerical month value, two digits (e.g., "03" for March) - // %e Numerical day value (e.g., "3" on March 3rd) - // %d Numerical day value, two digits (e.g., "03" on March 3rd) - // %b Month name, short form (e.g., "Mar" for March) - // %B Month name, long form (e.g., "March") - // %a Weekday name, short form (e.g., "Wed" for Wednesday) - // %A Weekday name, long form (e.g., "Wednesday") - - //All other characters are left as-is. - - TQString result( format ); - - result.replace( "%Y", TQString().sprintf( "%d", year() ) ); - result.replace( "%y", TQString().sprintf( "%02d", (year() % 100) ) ); - result.replace( "%n", TQString().sprintf( "%d", month() ) ); - result.replace( "%m", TQString().sprintf( "%02d", month() ) ); - result.replace( "%e", TQString().sprintf( "%d", day() ) ); - result.replace( "%d", TQString().sprintf( "%02d", day() ) ); - result.replace( "%b", shortMonthName( month() ) ); - result.replace( "%B", longMonthName( month() ) ); - result.replace( "%a", shortDayName( dayOfWeek() ) ); - result.replace( "%A", longDayName( dayOfWeek() ) ); - - return result; -} -#endif - -bool ExtDate::setYMD( int y, int m, int d ) -{ - if ( ! isValid(y,m,d) ) { -#if defined(TQT_CHECK_RANGE) - qWarning( "ExtDate: Invalid date %04d-%02d-%02d", y, m, d ); -#endif - m_year = 0; - m_month = 0; - m_day = 0; - m_jd = INVALID_DAY; - return false; - } else { - m_year = y; - m_month = m; - m_day = d; - m_jd = GregorianToJD( y, m, d ); - return true; - } -} - -bool ExtDate::setJD( long int _jd ) { - if ( _jd == INVALID_DAY ) { - m_jd = _jd; - m_year = 0; - m_month = 0; - m_day = 0; - return false; - } else { - m_jd = _jd; - JDToGregorian( _jd, m_year, m_month, m_day ); - return true; - } -} - -ExtDate ExtDate::addDays( int days ) const -{ - ExtDate a_date; - a_date.setJD( jd() + days ); - return a_date; -} - -ExtDate ExtDate::addMonths( int months ) const -{ - int a_month = month() + months%12; - int a_year = year() + int(months/12); - - while ( a_month < 1 ) { - a_month += 12; - a_year--; - } - - while ( a_month > 12 ) { - a_month -= 12; - a_year++; - } - - return ExtDate(a_year, a_month, day()); -} - -ExtDate ExtDate::addYears( int years ) const -{ - return ExtDate(year() + years, month(), day()); -} - -int ExtDate::daysTo( const ExtDate & a_date) const -{ - return a_date.jd() - jd(); -} - -ExtDate ExtDate::tqcurrentDate(Qt::TimeSpec ts) -{ - time_t a_current_time; - struct tm a_current_time_tm; - - time(&a_current_time); - switch (ts) - { - case TQt::LocalTime : - localtime_r(&a_current_time, &a_current_time_tm); - break; - - case TQt::UTC : - gmtime_r(&a_current_time, &a_current_time_tm); - break; - - default : - assert(0); - break; - } - return ExtDate(a_current_time_tm.tm_year + 1900, a_current_time_tm.tm_mon + 1, a_current_time_tm.tm_mday); -} - -#ifndef TQT_NO_DATESTRING -//Try both DateFormat values -ExtDate ExtDate::fromString( const TQString& s ) -{ - ExtDate dResult = ExtDate::fromString( s, Qt::TextDate ); - if ( dResult.isValid() ) return dResult; - - dResult = ExtDate::fromString( s, Qt::ISODate ); - if ( dResult.isValid() ) return dResult; - else return ExtDate(); //invalid -} - -ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) -{ - ExtDate dt = ExtDate(); //initialize invalid date - if ( s.isEmpty() ) { return dt; } - if ( f == Qt::LocalDate ) { //can't use LocalFormat -#if defined(TQT_CHECK_RANGE) - qWarning( "TQDate::fromString: Parameter out of range" ); -#endif - return dt; - } - - switch( f ) { - case Qt::ISODate : - { - int year( s.mid( 0, 4 ).toInt() ); - int month( s.mid( 5, 2 ).toInt() ); - int day( s.mid( 8, 2 ).toInt() ); - - if ( year && month && day ) - return ExtDate( year, month, day ); - } - break; - - default : -#ifndef TQT_NO_TEXTDATE - case Qt::TextDate : - { - //Three possible date formats: - //dd mth yyyy; mth dd yyyy; wkd mth dd yyyy - //"mth" is the word for the month (long or short form) - TQStringList ss = TQStringList::split( " ", s ); - bool ok = false; - int month = -1; - uint imonth = 0; - uint iyear = 0; - - //If neither of the first two words is a number, then we'll assume - //the first word is a superfluous "weekday" string - int day = ss[0].toInt( &ok ); - if ( ! ok ) { - day = ss[1].toInt( &ok ); - if ( ! ok ) { - day = ss[2].toInt( &ok ); - if ( !ok ) return dt; //could not find a valid day number in first three words - imonth = 1; //the month must be the second word - iyear = 3; //the year must be the fourth word - } else { - //the month is either the first word, or the third. - imonth = 0; - iyear = 2; - } - } else { - //month is the second word - imonth = 1; - iyear = 2; - } - - for ( uint i = 0; i < 12; i++ ) { - if ( ss[imonth] == shortMonthName( i+1 ) || ss[imonth] == longMonthName( i+1 ) ) { - month = i + 1; - break; - } - } - - if ( month == -1 && imonth == 0 ) { //try the third word - imonth = 2; - iyear = 3; - for ( uint i = 0; i < 12; i++ ) { - if ( ss[imonth] == shortMonthName( i+1 ) || ss[imonth] == longMonthName( i+1 ) ) { - month = i + 1; - break; - } - } - } - - if ( month > -1 ) ok = true; - if ( ! ok ) return dt; //could not parse month; return invalid - - int year = ss[iyear].toInt( &ok ); - if ( ! ok ) return dt; //could not parse year; return invalid - - return ExtDate( year, month, day ); - - break; - } -#else - break; -#endif //ifndef TQT_NO_TEXTDATE - } - - return dt; -} -#endif //ifndef TQT_NO_DATESTRING - -bool ExtDate::isValid( int y, int m, int d ) -{ - if (m < 1 || m > 12) return false; - if (d < 1) return false; - if (m != 2 && d > (int) m_monthLength[m-1]) return false; - if (m == 2 && d > ( (int) m_monthLength[1] + (leapYear(y) ? 1 : 0))) return false; - return true; -} - -TQDate ExtDate::qdate() const { - TQDate q( year(), month(), day() ); - - if ( q.isValid() ) - return q; - else - return TQDate(); -} - -bool ExtDate::leapYear( int year ) -{ - // year is the year-number where JC birth is 0 - if ((year % 4) != 0) return false; - // multiple of 4 : can be a leap year - // centennial years are NOT leap, but quadri-centennial ARE. - if ((year % 400) == 0) return true; - if ((year % 100) == 0) return false; - // year is multiple of 4 but not centennial so leap year ! - return true; -} - -int ExtDate::dayOfYear(int y, int m, int d) -{ - return m_monthOrigin[m-1] + d + ((m > 1) ? (leapYear(y) ? 1 : 0) : 0); -} - -/***************************************************************************** - ExtDateTime member functions - *****************************************************************************/ - -/*! - \class ExtDateTime extdatetime.h - \brief The ExtDateTime class provides date and time functions. - - \ingroup time - - A ExtDateTime object contains a calendar date and a clock time (a - "datetime"). It is a combination of the ExtDate and TQTime classes. - It can read the current datetime from the system clock. It - provides functions for comparing datetimes and for manipulating a - datetime by adding a number of seconds, days, months or years. - - A ExtDateTime object is typically created either by giving a date - and time explicitly in the constructor, or by using the static - function tqcurrentDateTime(), which returns a ExtDateTime object set - to the system clock's time. The date and time can be changed with - setDate() and setTime(). A datetime can also be set using the - setTime_t() function, which takes a POSIX-standard "number of - seconds since 00:00:00 on January 1, 1970" value. The fromString() - function returns a ExtDateTime given a string and a date format - which is used to interpret the date within the string. - - The date() and time() functions provide access to the date and - time parts of the datetime. The same information is provided in - textual format by the toString() function. - - ExtDateTime provides a full set of operators to compare two - ExtDateTime objects where smaller means earlier and larger means - later. - - You can increment (or decrement) a datetime by a given number of - seconds using addSecs() or days using addDays(). Similarly you can - use addMonths() and addYears(). The daysTo() function returns the - number of days between two datetimes, and secsTo() returns the - number of seconds between two datetimes. - - The range of a datetime object is constrained to the ranges of the - ExtDate and TQTime objects which it embodies. - - Methods in this class are reentrant. - - \sa ExtDate TQTime ExtDateTimeEdit -*/ - - -/*! - \fn ExtDateTime::ExtDateTime() - - Constructs a null datetime (i.e. null date and null time). A null - datetime is invalid, since the date is invalid. - - \sa isValid() -*/ - - -/*! - Constructs a datetime with date \a date and null (but valid) time - (00:00:00.000). -*/ - -ExtDateTime::ExtDateTime( const ExtDate &date ) - : d(date) -{ -} - -/*! - Constructs a datetime with date \a date and time \a time. -*/ - -ExtDateTime::ExtDateTime( const ExtDate &date, const TQTime &time ) - : d(date), t(time) -{ -} - - -/*! - \fn bool ExtDateTime::isNull() const - - Returns TRUE if both the date and the time are null; otherwise - returns FALSE. A null datetime is invalid. - - \sa ExtDate::isNull(), TQTime::isNull() -*/ - -/*! - \fn bool ExtDateTime::isValid() const - - Returns TRUE if both the date and the time are valid; otherwise - returns FALSE. - - \sa ExtDate::isValid(), TQTime::isValid() -*/ - -/*! - \fn ExtDate ExtDateTime::date() const - - Returns the date part of the datetime. - - \sa setDate(), time() -*/ - -/*! - \fn TQTime ExtDateTime::time() const - - Returns the time part of the datetime. - - \sa setTime(), date() -*/ - -/*! - \fn void ExtDateTime::setDate( const ExtDate &date ) - - Sets the date part of this datetime to \a date. - - \sa date(), setTime() -*/ - -/*! - \fn void ExtDateTime::setTime( const TQTime &time ) - - Sets the time part of this datetime to \a time. - - \sa time(), setDate() -*/ - - -/*! - Returns the datetime as the number of seconds that have passed - since 1970-01-01T00:00:00, Coordinated Universal Time (UTC). - - On systems that do not support timezones, this function will - behave as if local time were UTC. - - \sa setTime_t() -*/ - -uint ExtDateTime::toTime_t() const -{ - tm brokenDown; - brokenDown.tm_sec = t.second(); - brokenDown.tm_min = t.minute(); - brokenDown.tm_hour = t.hour(); - brokenDown.tm_mday = d.day(); - brokenDown.tm_mon = d.month() - 1; - brokenDown.tm_year = d.year() - 1900; - brokenDown.tm_isdst = -1; - int secsSince1Jan1970UTC = (int) mktime( &brokenDown ); - if ( secsSince1Jan1970UTC < -1 ) - secsSince1Jan1970UTC = -1; - return (uint) secsSince1Jan1970UTC; -} - -/*! - \overload - - Convenience function that sets the date and time to local time - based on the given UTC time. -*/ - -void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC ) -{ - setTime_t( secsSince1Jan1970UTC, Qt::LocalTime ); -} - -/*! - Sets the date and time to \a ts time (\c TQt::LocalTime or \c - TQt::UTC) given the number of seconds that have passed since - 1970-01-01T00:00:00, Coordinated Universal Time (UTC). On systems - that do not support timezones this function will behave as if - local time were UTC. - - On Windows, only a subset of \a secsSince1Jan1970UTC values are - supported, as Windows starts counting from 1980. - - \sa toTime_t() -*/ -void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) -{ - time_t tmp = (time_t) secsSince1Jan1970UTC; - tm *brokenDown = 0; - -#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) - // posix compliant system - // use the reentrant versions of localtime() and gmtime() where available - tm res; - if ( ts == TQt::LocalTime ) - brokenDown = localtime_r( &tmp, &res ); - if ( !brokenDown ) { - brokenDown = gmtime_r( &tmp, &res ); - if ( !brokenDown ) { - d.setJD( ExtDate::GregorianToJD( 1970, 1, 1 ) ); - t.setHMS(0,0,0); - // t.ds = 0; - return; - } - } -#else - if ( ts == TQt::LocalTime ) - brokenDown = localtime( &tmp ); - if ( !brokenDown ) { - brokenDown = gmtime( &tmp ); - if ( !brokenDown ) { - d.setJD( ExtDate::GregorianToJD( 1970, 1, 1 ) ); -// t.ds = 0; - t.setHMS(0,0,0); - return; - } - } -#endif - - d.setJD( ExtDate::GregorianToJD( brokenDown->tm_year + 1900, - brokenDown->tm_mon + 1, - brokenDown->tm_mday ) ); - t.setHMS( brokenDown->tm_hour, brokenDown->tm_min, brokenDown->tm_sec ); -// t.ds = MSECS_PER_HOUR * brokenDown->tm_hour + -// MSECS_PER_MIN * brokenDown->tm_min + -// 1000 * brokenDown->tm_sec; -} -#ifndef TQT_NO_DATESTRING -#ifndef TQT_NO_SPRINTF -/*! - \overload - - Returns the datetime as a string. The \a f parameter determines - the format of the string. - - If \a f is \c Qt::TextDate, the string format is "Wed May 20 - 03:40:13 1998" (using ExtDate::shortDayName(), ExtDate::shortMonthName(), - and TQTime::toString() to generate the string, so the day and month - names will have localized names). - - If \a f is \c Qt::ISODate, the string format corresponds to the - ISO 8601 extended specification for representations of dates and - times, which is YYYY-MM-DDTHH:MM:SS. - - If \a f is \c Qt::LocalDate, the string format depends on the - locale settings of the system. - - If the format \a f is invalid or the datetime is invalid, toString() - returns a null string. - - \sa ExtDate::toString() TQTime::toString() -*/ - -TQString ExtDateTime::toString( Qt::DateFormat f ) const -{ - if ( !isValid() ) - return TQString(); - - if ( f == Qt::ISODate ) { - return d.toString( Qt::ISODate ) + "T" + t.toString( Qt::ISODate ); - } -#ifndef TQT_NO_TEXTDATE - else if ( f == Qt::TextDate ) { - return toString( "%a %b %e %Y %H:%M:%S" ); - } -#endif - else if ( f == Qt::LocalDate ) { - return toString( KGlobal::locale()->dateFormat() - + " " + KGlobal::locale()->timeFormat() ); - } - - return TQString(); -} -#endif - -TQString ExtDateTime::toString( const TQString& format ) const -{ - if ( !isValid() ) - return TQString(); - - //Parse the date portion of the format string - TQString result = date().toString( format ); - - //For the time format, use the following KDE format specs: - //Replace occurences of the following tokens with their - //corresponding values: - // - // %H Hour in 24h format, 2 digits - // %k Hour in 24h format, 1-2 digits - // %I Hour in 12h format, 2 digits - // %l Hour in 12h format, 1-2 digits - // %M Minute, 2 digits - // %S Seconds, 2 digits - // %p pm/am - - int h = time().hour(); - - result.replace( "%H", TQString().sprintf( "%02d", h ) ); - result.replace( "%k", TQString().sprintf( "%d", h ) ); - result.replace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) ); - result.replace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) ); - result.replace( "%M", TQString().sprintf( "%02d", time().minute() ) ); - result.replace( "%S", TQString().sprintf( "%02d", time().second() ) ); - result.replace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) ); - - return result; -} -#endif //TQT_NO_DATESTRING - -/*! - Returns a ExtDateTime object containing a datetime \a ndays days - later than the datetime of this object (or earlier if \a ndays is - negative). - - \sa daysTo(), addMonths(), addYears(), addSecs() -*/ - -ExtDateTime ExtDateTime::addDays( int ndays ) const -{ - return ExtDateTime( d.addDays(ndays), t ); -} - -/*! - Returns a ExtDateTime object containing a datetime \a nmonths months - later than the datetime of this object (or earlier if \a nmonths - is negative). - - \sa daysTo(), addDays(), addYears(), addSecs() -*/ - -ExtDateTime ExtDateTime::addMonths( int nmonths ) const -{ - return ExtDateTime( d.addMonths(nmonths), t ); -} - -/*! - Returns a ExtDateTime object containing a datetime \a nyears years - later than the datetime of this object (or earlier if \a nyears is - negative). - - \sa daysTo(), addDays(), addMonths(), addSecs() -*/ - -ExtDateTime ExtDateTime::addYears( int nyears ) const -{ - return ExtDateTime( d.addYears(nyears), t ); -} - -/*! - Returns a ExtDateTime object containing a datetime \a nsecs seconds - later than the datetime of this object (or earlier if \a nsecs is - negative). - - \sa secsTo(), addDays(), addMonths(), addYears() -*/ - -ExtDateTime ExtDateTime::addSecs( int nsecs ) const -{ - long int dd = d.jd(); - int tt = MSECS_PER_HOUR*t.hour() + MSECS_PER_MIN*t.minute() + 1000*t.second() + t.msec(); - tt += nsecs*1000; - - while ( tt < 0 ) { - tt += MSECS_PER_DAY; - --dd; - } - - while ( tt > int(MSECS_PER_DAY) ) { - tt -= MSECS_PER_DAY; - ++dd; - } - - ExtDateTime ret; - ret.setTime( TQTime().addMSecs( tt ) ); - ret.setDate( ExtDate( dd ) ); - - return ret; -} - -/*! - Returns the number of days from this datetime to \a dt (which is - negative if \a dt is earlier than this datetime). - - \sa addDays(), secsTo() -*/ - -int ExtDateTime::daysTo( const ExtDateTime &dt ) const -{ - return d.daysTo( dt.d ); -} - -/*! - Returns the number of seconds from this datetime to \a dt (which - is negative if \a dt is earlier than this datetime). - - Example: - \code - ExtDateTime dt = ExtDateTime::tqcurrentDateTime(); - ExtDateTime xmas( ExtDate(dt.date().year(),12,24), TQTime(17,00) ); - kdDebug( ) << "There are " << dt.secsTo(xmas) << " seconds to Christmas" << endl; - \endcode - - \sa addSecs(), daysTo(), TQTime::secsTo() -*/ - -int ExtDateTime::secsTo( const ExtDateTime &dt ) const -{ - return t.secsTo(dt.t) + d.daysTo(dt.d)*SECS_PER_DAY; -} - - -/*! - Returns TRUE if this datetime is equal to \a dt; otherwise returns FALSE. - - \sa operator!=() -*/ - -bool ExtDateTime::operator==( const ExtDateTime &dt ) const -{ - return t == dt.t && d == dt.d; -} - -/*! - Returns TRUE if this datetime is different from \a dt; otherwise - returns FALSE. - - \sa operator==() -*/ - -bool ExtDateTime::operator!=( const ExtDateTime &dt ) const -{ - return t != dt.t || d != dt.d; -} - -/*! - Returns TRUE if this datetime is earlier than \a dt; otherwise - returns FALSE. -*/ - -bool ExtDateTime::operator<( const ExtDateTime &dt ) const -{ - if ( d < dt.d ) - return true; - return d == dt.d ? t < dt.t : false; -} - -/*! - Returns TRUE if this datetime is earlier than or equal to \a dt; - otherwise returns FALSE. -*/ - -bool ExtDateTime::operator<=( const ExtDateTime &dt ) const -{ - if ( d < dt.d ) - return true; - return d == dt.d ? t <= dt.t : false; -} - -/*! - Returns TRUE if this datetime is later than \a dt; otherwise - returns FALSE. -*/ - -bool ExtDateTime::operator>( const ExtDateTime &dt ) const -{ - if ( d > dt.d ) - return true; - return d == dt.d ? t > dt.t : false; -} - -/*! - Returns TRUE if this datetime is later than or equal to \a dt; - otherwise returns FALSE. -*/ - -bool ExtDateTime::operator>=( const ExtDateTime &dt ) const -{ - if ( d > dt.d ) - return true; - return d == dt.d ? t >= dt.t : false; -} - -/*! - \overload - - Returns the current datetime, as reported by the system clock. - - \sa ExtDate::tqcurrentDate(), TQTime::currentTime() -*/ - -ExtDateTime ExtDateTime::tqcurrentDateTime() -{ - return tqcurrentDateTime( Qt::LocalTime ); -} - -/*! - Returns the current datetime, as reported by the system clock, for the - TimeSpec \a ts. The default TimeSpec is LocalTime. - - \sa ExtDate::tqcurrentDate(), TQTime::currentTime(), Qt::TimeSpec -*/ - -ExtDateTime ExtDateTime::tqcurrentDateTime( Qt::TimeSpec ts ) -{ - ExtDateTime dt; - dt.setDate( ExtDate::tqcurrentDate(ts) ); - TQTime t = t.currentTime(ts); - if ( t.hour()==0 && t.minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::tqcurrentDate(ts) ); // fetch date again - dt.setTime( t ); - return dt; -} - -#ifndef TQT_NO_DATESTRING -/*! - Returns the ExtDateTime represented by the string \a s, using the - format \a f, or an invalid datetime if this is not possible. - - Note for \c Qt::TextDate: It is recommended that you use the - English short month names (e.g. "Jan"). Although localized month - names can also be used, they depend on the user's locale settings. - - \warning Note that \c Qt::LocalDate cannot be used here. -*/ -ExtDateTime ExtDateTime::fromString( const TQString& s ) -{ - ExtDateTime dtResult = ExtDateTime::fromString( s, Qt::TextDate ); - if ( dtResult.isValid() ) return dtResult; - - dtResult = ExtDateTime::fromString( s, Qt::ISODate ); - - if ( dtResult.isValid() ) return dtResult; - else return ExtDateTime(); //invalid -} - -ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) -{ - ExtDateTime dt; - - if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { -#if defined(TQT_CHECK_RANGE) - qWarning( "ExtDateTime::fromString: Parameter out of range" ); -#endif - dt.d.setJD( INVALID_DAY ); - return dt; - } - - if ( f == Qt::ISODate ) { - if ( s.length() <= 10 || ! s.contains( ':' ) ) { //no time specified - TQTime t = TQTime(0,0,0); - return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) ); - } else { - return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ), - TQTime::fromString( s.mid(11), Qt::ISODate ) ); - } - } -#if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE) - else if ( f == Qt::TextDate ) { - - //parse the time, if it exists. - TQTime time; - TQString sd = s; - int hour, minute, second; - int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); - if ( pivot != -1 ) { - hour = s.mid( pivot, 2 ).toInt(); - minute = s.mid( pivot+3, 2 ).toInt(); - second = s.mid( pivot+6, 2 ).toInt(); - time.setHMS( hour, minute, second ); - - sd = s.left( pivot - 1 ); - } - - //sd is now just the date string. - ExtDate date = ExtDate::fromString( s, Qt::TextDate ); - return ExtDateTime( date, time ); - } - -#endif //TQT_NO_REGEXP - return ExtDateTime(); -} -#endif //TQT_NO_DATESTRING - - -#ifndef TQT_NO_DATASTREAM -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) -{ - return ostream << (TQ_UINT32)(date.jd()); -} - -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) -{ - TQ_UINT32 julday; - ostream >> julday; - date.setJD( julday ); - return ostream; -} - -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) -{ - ostream << dt.d; - ostream << dt.t; - return ostream; -} - -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) -{ - ostream >> dt.d >> dt.t; - return ostream; -} - -#endif // TQT_NO_DATASTREAM diff --git a/libkdeedu/extdate/extdatetime.h b/libkdeedu/extdate/extdatetime.h deleted file mode 100644 index 0ebe324f..00000000 --- a/libkdeedu/extdate/extdatetime.h +++ /dev/null @@ -1,190 +0,0 @@ -/************************************************************************* -** Definition of extended range date class -** (c) 2004 by Michel Guitel -** modifications by Jason Harris -** -** 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 EXTDATETIME_H -#define EXTDATETIME_H - -#include -#include "tqstring.h" -#include "tqnamespace.h" -#include "tqdatetime.h" -#include - -#define INVALID_DAY LONG_MIN - -class ExtDateTime; - -/***************************************************************************** - ExtDate class - *****************************************************************************/ - -extern void test2_unit(int y, int m, int d); - -class ExtDateTime; - -class KDE_EXPORT ExtDate -{ -public: - ExtDate() : m_jd(INVALID_DAY), m_year(0), m_month(0), m_day(0) {} - ExtDate( int y, int m, int d ); - ExtDate( const TQDate &q ) { ExtDate( q.year(), q.month(), q.day() ); } - ExtDate( long int jd ); - - bool isNull() const { return m_jd == INVALID_DAY; } - bool isValid() const; - - TQDate qdate() const; - - int year() const { return m_year; } - int month() const { return m_month; } - int day() const { return m_day; } - int dayOfWeek() const; - int dayOfYear() const; - int daysInMonth() const; - int daysInYear() const; - int weekNumber( int *yearNum = 0 ) const; - long int jd() const { return m_jd; } - -#ifndef TQT_NO_TEXTDATE -#ifndef TQT_NO_COMPAT - static TQString monthName( int month ) { return shortMonthName( month ); } - static TQString dayName( int weekday ) { return shortDayName( weekday ); } -#endif - static TQString shortMonthName( int month ); - static TQString shortDayName( int weekday ); - static TQString longMonthName( int month ); - static TQString longDayName( int weekday ); -#endif //TQT_NO_TEXTDATE -#ifndef TQT_NO_TEXTSTRING -#if !defined(TQT_NO_SPRINTF) - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; -#endif - TQString toString( const TQString& format ) const; -#endif - bool setYMD( int y, int m, int d ); - bool setJD( long int _jd ); - - ExtDate addDays( int days ) const; - ExtDate addMonths( int months ) const; - ExtDate addYears( int years ) const; - int daysTo( const ExtDate & ) const; - - bool operator==( const ExtDate &d ) const { return m_jd == d.jd(); } - bool operator!=( const ExtDate &d ) const { return m_jd != d.jd(); } - bool operator<( const ExtDate &d ) const { return m_jd < d.jd(); } - bool operator<=( const ExtDate &d ) const { return m_jd <= d.jd(); } - bool operator>( const ExtDate &d ) const { return m_jd > d.jd(); } - bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); } - - static ExtDate tqcurrentDate( Qt::TimeSpec ts = Qt::LocalTime ); -#ifndef TQT_NO_DATESTRING - static ExtDate fromString( const TQString &s ); - static ExtDate fromString( const TQString &s, Qt::DateFormat f ); -#endif - static bool isValid( int y, int m, int d ); - static bool leapYear( int year ); - - static long int GregorianToJD( int y, int m, int d ); - static void JDToGregorian( long int jd, int &y, int &m, int &d ); - -private: - static int dayOfYear(int y, int m, int d); - - long int m_jd; - int m_year, m_month, m_day; - static uint m_monthLength[12]; - static uint m_monthOrigin[12]; - static TQString m_shortMonthNames[12]; - static TQString m_shortDayNames[7]; - static TQString m_longMonthNames[12]; - static TQString m_longDayNames[7]; - - friend class ExtDateTime; - -#ifndef TQT_NO_DATASTREAM - friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); - friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); - friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime & ); - friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); -#endif -}; - -/***************************************************************************** - ExtDateTime class - *****************************************************************************/ - -class KDE_EXPORT ExtDateTime -{ -public: - ExtDateTime() {} // set null date and null time - ExtDateTime( const ExtDate & ); - ExtDateTime( const ExtDate &, const TQTime & ); - - bool isNull() const { return d.isNull() && t.isNull(); } - bool isValid() const { return d.isValid() && t.isValid(); } - - ExtDate date() const { return d; } - TQTime time() const { return t; } - uint toTime_t() const; - void setDate( const ExtDate &date ) { d = date; } - void setTime( const TQTime &time ) { t = time; } - void setTime_t( uint secsSince1Jan1970UTC ); - void setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ); -#ifndef TQT_NO_DATESTRING -#ifndef TQT_NO_SPRINTF - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; -#endif - TQString toString( const TQString& format ) const; -#endif - ExtDateTime addDays( int days ) const; - ExtDateTime addMonths( int months ) const; - ExtDateTime addYears( int years ) const; - ExtDateTime addSecs( int secs ) const; - int daysTo( const ExtDateTime & ) const; - int secsTo( const ExtDateTime & ) const; - - bool operator==( const ExtDateTime &dt ) const; - bool operator!=( const ExtDateTime &dt ) const; - bool operator<( const ExtDateTime &dt ) const; - bool operator<=( const ExtDateTime &dt ) const; - bool operator>( const ExtDateTime &dt ) const; - bool operator>=( const ExtDateTime &dt ) const; - - static ExtDateTime tqcurrentDateTime(); - static ExtDateTime tqcurrentDateTime( Qt::TimeSpec ); -#ifndef TQT_NO_DATESTRING - static ExtDateTime fromString( const TQString &s ); - static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); -#endif -private: - ExtDate d; - TQTime t; -#ifndef TQT_NO_DATASTREAM - friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime &); - friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); -#endif -}; - -/***************************************************************************** - Date and time stream functions - *****************************************************************************/ - -#ifndef TQT_NO_DATASTREAM -TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); -TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); -#endif // TQT_NO_DATASTREAM - -#endif // EXTDATE_H - diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp deleted file mode 100644 index 796bd858..00000000 --- a/libkdeedu/extdate/extdatetimeedit.cpp +++ /dev/null @@ -1,2724 +0,0 @@ -/**************************************************************************** -** -** -** Implementation of date and time edit classes -** -** Created : 001103 -** -** Original qatetimeedit.cpp Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -**>> ExtDate modifications (C) 2004 Jason Harris -** -** 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. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -**********************************************************************/ - -//DEBUG -#include - -#include "extdatetimeedit.h" - -#ifndef TQT_NO_DATETIMEEDIT - -//#include "../kernel/tqinternal_p.h" -//#include "../kernel/tqrichtext_p.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include //need for TQTimeEdit - -#define EXTDATETIMEEDIT_HIDDEN_CHAR '0' - -static TQString *lDateSep = 0; -static TQString *lTimeSep = 0; -static bool lAMPM = FALSE; -static TQString *lAM = 0; -static TQString *lPM = 0; -static ExtDateEdit::Order lOrder = ExtDateEdit::YMD; -static int refcount = 0; - -static void cleanup() -{ - delete lDateSep; - lDateSep = 0; - delete lTimeSep; - lTimeSep = 0; - delete lAM; - lAM = 0; - delete lPM; - lPM = 0; -} - -/*! -\internal -try to get the order of DMY and the date/time separator from the locale settings -*/ -static void readLocaleSettings() -{ - int dpos, mpos, ypos; - cleanup(); - - lDateSep = new TQString(); - lTimeSep = new TQString(); - -#if defined(TQ_WS_WIN) - TQT_WA( { - TCHAR data[10]; - GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10 ); - *lDateSep = TQString::fromUcs2( (ushort*)data ); - GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_STIME, data, 10 ); - *lTimeSep = TQString::fromUcs2( (ushort*)data ); - GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_ITIME, data, 10 ); - lAMPM = TQString::fromUcs2( (ushort*)data ).toInt()==0; - GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_S1159, data, 10 ); - TQString am = TQString::fromUcs2( (ushort*)data ); - if ( !am.isEmpty() ) - lAM = new TQString( am ); - GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_S2359, data, 10 ); - TQString pm = TQString::fromUcs2( (ushort*)data ); - if ( !pm.isEmpty() ) - lPM = new TQString( pm ); - } , { - char data[10]; - GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_SDATE, (char*)&data, 10 ); - *lDateSep = TQString::fromLocal8Bit( data ); - GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_STIME, (char*)&data, 10 ); - *lTimeSep = TQString::fromLocal8Bit( data ); - GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_ITIME, (char*)&data, 10 ); - lAMPM = TQString::fromLocal8Bit( data ).toInt()==0; - GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_S1159, (char*)&data, 10 ); - TQString am = TQString::fromLocal8Bit( data ); - if ( !am.isEmpty() ) - lAM = new TQString( am ); - GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_S2359, (char*)&data, 10 ); - TQString pm = TQString::fromLocal8Bit( data ); - if ( !pm.isEmpty() ) - lPM = new TQString( pm ); - } ); -#else - *lDateSep = "-"; - *lTimeSep = ":"; -#endif - TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate ); - dpos = d.find( "22" ); - mpos = d.find( "11" ); - ypos = d.find( "99" ); - if ( dpos > -1 && mpos > -1 && ypos > -1 ) { - // test for DMY, MDY, YMD, YDM - if ( dpos < mpos && mpos < ypos ) { - lOrder = ExtDateEdit::DMY; - } else if ( mpos < dpos && dpos < ypos ) { - lOrder = ExtDateEdit::MDY; - } else if ( ypos < mpos && mpos < dpos ) { - lOrder = ExtDateEdit::YMD; - } else if ( ypos < dpos && dpos < mpos ) { - lOrder = ExtDateEdit::YDM; - } else { - // cannot determine the dateformat - use the default - return; - } - - // this code needs to change if new formats are added - -#ifndef TQ_WS_WIN - TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 ); - if ( d.contains( sep ) == 2 ) { - *lDateSep = sep; - } -#endif - } - -#ifndef TQ_WS_WIN - TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate ); - dpos = t.find( "11" ); - mpos = t.find( "22" ); - ypos = t.find( "33" ); - // We only allow hhmmss - if ( dpos > -1 && dpos < mpos && mpos < ypos ) { - TQString sep = t.mid( dpos + 2, mpos - dpos - 2 ); - if ( sep == t.mid( mpos + 2, ypos - mpos - 2 ) ) { - *lTimeSep = sep; - } - } -#endif -} - -static ExtDateEdit::Order localOrder() { - if ( !lDateSep ) { - readLocaleSettings(); - } - return lOrder; -} - -static TQString localDateSep() { - if ( !lDateSep ) { - readLocaleSettings(); - } - return *lDateSep; -} - -static TQString localTimeSep() { - if ( !lTimeSep ) { - readLocaleSettings(); - } - return *lTimeSep; -} - -class ExtDateTimeEditorPrivate -{ -public: - ExtDateTimeEditorPrivate() - : frm( TRUE ), - parag( new TQTextParagraph( 0, 0, 0, FALSE ) ), - focusSec(0) - { - parag->formatter()->setWrapEnabled( FALSE ); - cursor = new TQTextCursor( 0 ); - cursor->setParagraph( parag ); - offset = 0; - sep = localDateSep(); - refcount++; - } - ~ExtDateTimeEditorPrivate() - { - delete parag; - delete cursor; - if ( !--refcount ) - cleanup(); - } - - void appendSection( const TQNumberSection& sec ) - { - sections.append( sec ); - - } - void clearSections() - { - sections.clear(); - } - void setSectionSelection( int sec, int selstart, int selend ) - { - if ( sec < 0 || sec > (int)sections.count() ) - return; - sections[sec].setSelectionStart( selstart ); - sections[sec].setSelectionEnd( selend ); - } - uint sectionCount() const { return (uint)sections.count(); } - void setSeparator( const TQString& s ) { sep = s; } - TQString separator() const { return sep; } - - void setFrame( bool f ) { frm = f; } - bool frame() const { return frm; } - - int focusSection() const { return focusSec; } - int section( const TQPoint& p ) - { - cursor->place( p + TQPoint( offset, 0 ), parag ); - int idx = cursor->index(); - for ( uint i = 0; i < sections.count(); ++i ) { - if ( idx >= sections[i].selectionStart() && - idx <= sections[i].selectionEnd() ) - return i; - } - return -1; - } - TQNumberSection section( int idx ) const - { - return sections[idx]; - } - bool setFocusSection( int idx ) - { - if ( idx > (int)sections.count()-1 || idx < 0 ) - return FALSE; - if ( idx != focusSec ) { - focusSec = idx; - applyFocusSelection(); - return TRUE; - } - return FALSE; - } - - bool inSectionSelection( int idx ) - { - for ( uint i = 0; i < sections.count(); ++i ) { - if ( idx >= sections[i].selectionStart() && - idx <= sections[i].selectionEnd() ) - return TRUE; - } - return FALSE; - } - - void paint( const TQString& txt, bool focus, TQPainter& p, - const TQColorGroup& cg, const TQRect& rect, TQStyle& style ) - { - int fw = 0; - if ( frm ) - fw = style.tqpixelMetric(TQStyle::PM_DefaultFrameWidth); - - parag->truncate( 0 ); - parag->append( txt ); - if ( !focus ) - parag->removeSelection( TQTextDocument::Standard ); - else { - applyFocusSelection(); - } - - /* color all EXTDATETIMEEDIT_HIDDEN_CHAR chars to background color */ - TQTextFormat *fb = parag->formatCollection()->format( p.font(), - cg.base() ); - TQTextFormat *nf = parag->formatCollection()->format( p.font(), - cg.text() ); - for ( uint i = 0; i < txt.length(); ++i ) { - parag->setFormat( i, 1, nf ); - if ( inSectionSelection( i ) ) - continue; - if ( txt.at(i) == EXTDATETIMEEDIT_HIDDEN_CHAR ) - parag->setFormat( i, 1, fb ); - else - parag->setFormat( i, 1, nf ); - } - fb->removeRef(); - nf->removeRef(); - - TQRect r( rect.x(), rect.y(), rect.width() - 2 * ( 2 + fw ), rect.height() ); - parag->pseudoDocument()->docRect = r; - parag->tqinvalidate(0); - parag->format(); - - int xoff = 2 + fw - offset; - int yoff = ( rect.height() - parag->rect().height() + 1 ) / 2; - if ( yoff < 0 ) - yoff = 0; - - p.translate( xoff, yoff ); - parag->paint( p, cg, 0, TRUE ); - if ( frm ) - p.translate( -xoff, -yoff ); - } - - void resize( const TQSize& size ) { sz = size; } - - int mapSection( int sec ) - { - return sections[sec].index(); - } - -protected: - void applyFocusSelection() - { - if ( focusSec > -1 ) { - int selstart = sections[ focusSec ].selectionStart(); - int selend = sections[ focusSec ].selectionEnd(); - parag->setSelection( TQTextDocument::Standard, selstart, selend ); - parag->format(); - if ( parag->at( selstart )->x < offset || - parag->at( selend )->x + parag->string()->width( selend ) > offset + sz.width() ) { - offset = parag->at( selstart )->x; - } - } - } -private: - bool frm; - TQTextParagraph *parag; - TQTextCursor *cursor; - TQSize sz; - int focusSec; - TQValueList< TQNumberSection > sections; - TQString sep; - int offset; -}; - -/*! - Constructs an empty datetime editor with parent \a parent and - called \a name. -*/ -ExtDateTimeEditor::ExtDateTimeEditor( ExtDateTimeEditBase * parent, - const char * name ) - : TQWidget( parent, name, WNoAutoErase ) -{ - d = new ExtDateTimeEditorPrivate(); - cw = parent; - init(); -} - -/*! - Destroys the object and frees any allocated resources. -*/ - -ExtDateTimeEditor::~ExtDateTimeEditor() -{ - delete d; -} - -/*! \internal - -*/ - -void ExtDateTimeEditor::init() -{ - setBackgroundMode( PaletteBase ); - setFocusSection( -1 ); - installEventFilter( this ); - setFocusPolicy( TQ_WheelFocus ); -} - - -/*! \reimp - -*/ - -bool ExtDateTimeEditor::event( TQEvent *e ) -{ - if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { - if ( e->type() == TQEvent::FocusOut ) - tqApp->sendEvent( cw, e ); - update( rect() ); - } else if ( e->type() == TQEvent::AccelOverride ) { - TQKeyEvent* ke = (TQKeyEvent*) e; - switch ( ke->key() ) { - case Key_Delete: - case Key_Backspace: - case Key_Up: - case Key_Down: - case Key_Left: - case Key_Right: - ke->accept(); - default: - break; - } - } - return TQWidget::event( e ); -} - -/*! \reimp - -*/ - -void ExtDateTimeEditor::resizeEvent( TQResizeEvent *e ) -{ - d->resize( e->size() ); - TQWidget::resizeEvent( e ); -} - - -/*! \reimp - -*/ - -void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) -{ - TQString txt; - for ( uint i = 0; i < d->sectionCount(); ++i ) { - txt += cw->sectionFormattedText( i ); - if ( i < d->sectionCount()-1 ) { - if ( d->section( i+1 ).separator() ) - txt += d->separator(); - else - txt += " "; - } - } - - TQSharedDoubleBuffer buffer( this ); - const TQBrush &bg = - tqcolorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); - buffer.painter()->fillRect( 0, 0, width(), height(), bg ); - d->paint( txt, hasFocus(), *buffer.painter(), tqcolorGroup(), rect(), - tqstyle() ); - buffer.end(); -} - - -/*! - Returns the section index at point \a p. -*/ -int ExtDateTimeEditor::sectionAt( const TQPoint &p ) -{ - return d->section( p ); -} - -int ExtDateTimeEditor::mapSection( int sec ) -{ - return d->mapSection( sec ); -} - - -/*! \reimp - -*/ - -void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) -{ - TQPoint p( e->pos().x(), 0 ); - int sec = sectionAt( p ); - if ( sec != -1 ) { - cw->setFocusSection( sec ); - tqrepaint( rect(), FALSE ); - } -} - -/*! \reimp - -*/ -bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) -{ - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { - if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *ke = (TQKeyEvent*)e; - switch ( ke->key() ) { - case Key_Right: - if ( d->focusSection() < (int)d->sectionCount()-1 ) { - if ( cw->setFocusSection( focusSection()+1 ) ) - tqrepaint( rect(), FALSE ); - } - return TRUE; - case Key_Left: - if ( d->focusSection() > 0 ) { - if ( cw->setFocusSection( focusSection()-1 ) ) - tqrepaint( rect(), FALSE ); - } - return TRUE; - case Key_Up: - cw->stepUp(); - return TRUE; - case Key_Down: - cw->stepDown(); - return TRUE; - case Key_Backspace: - if ( ::tqqt_cast(cw) ) - ((ExtDateEdit*)cw)->removeFirstNumber( d->focusSection() ); - else if ( ::tqqt_cast(cw) ) - ((TQTimeEdit*)cw)->removeFirstNumber( d->focusSection() ); - return TRUE; - case Key_Delete: - cw->removeLastNumber( d->focusSection() ); - return TRUE; - case Key_Tab: - case Key_BackTab: { - if ( ke->state() == TQt::ControlButton ) - return FALSE; - - TQWidget *w = this; - bool hadDateEdit = FALSE; - while ( w ) { - if ( ::tqqt_cast(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || - ::tqqt_cast(w) ) - break; - hadDateEdit = hadDateEdit || ::tqqt_cast(w); - w = w->parentWidget(); - } - - if ( w ) { - if ( !::tqqt_cast(w) ) { - w = w->parentWidget(); - } else { - ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; - if ( hadDateEdit && ke->key() == Key_Tab ) { - ed->timeEdit()->setFocus(); - return TRUE; - } else if ( !hadDateEdit && ke->key() == Key_BackTab ) { - ed->dateEdit()->setFocus(); - return TRUE; - } else { - while ( w && !::tqqt_cast(w) ) - w = w->parentWidget(); - } - } - - tqApp->sendEvent( w, e ); - return TRUE; - } - } break; - default: - TQString txt = TQString(ke->text()).lower(); - if ( !txt.isEmpty() && !separator().isEmpty() && txt[0] == separator()[0] ) { - // do the same thing as KEY_RIGHT when the user presses the separator key - if ( d->focusSection() < 2 ) { - if ( cw->setFocusSection( focusSection()+1 ) ) - tqrepaint( rect(), FALSE ); - } - return TRUE; - } else if ( !txt.isEmpty() && ::tqqt_cast(cw) && focusSection() == (int) d->sectionCount()-1 ) { - // the first character of the AM/PM indicator toggles if the section has focus - TQTimeEdit *te = (TQTimeEdit*)cw; - TQTime time = te->time(); - if ( lAMPM && lAM && lPM && (te->display()&TQTimeEdit::AMPM) ) { - if ( txt[0] == (*lAM).lower()[0] && time.hour() >= 12 ) { - time.setHMS( time.hour()-12, time.minute(), time.second(), time.msec() ); - te->setTime( time ); - } else if ( txt[0] == (*lPM).lower()[0] && time.hour() < 12 ) { - time.setHMS( time.hour()+12, time.minute(), time.second(), time.msec() ); - te->setTime( time ); - } - } - } - - int num = txt[0].digitValue(); - if ( num != -1 ) { - cw->addNumber( d->focusSection(), num ); - return TRUE; - } - } - } - } - return FALSE; -} - - -/*! - Appends the number section \a sec to the editor. -*/ - -void ExtDateTimeEditor::appendSection( const TQNumberSection& sec ) -{ - d->appendSection( sec ); -} - -/*! - Removes all sections from the editor. -*/ - -void ExtDateTimeEditor::clearSections() -{ - d->clearSections(); -} - -/*! - Sets the selection of \a sec to start at \a selstart and end at \a - selend. -*/ - -void ExtDateTimeEditor::setSectionSelection( int sec, int selstart, int selend ) -{ - d->setSectionSelection( sec, selstart, selend ); -} - -/*! - Sets the separator for all numbered sections to \a s. Note that - currently, only the first character of \a s is used. -*/ - -void ExtDateTimeEditor::setSeparator( const TQString& s ) -{ - d->setSeparator( s ); - update(); -} - - -/*! - Returns the editor's separator. -*/ - -TQString ExtDateTimeEditor::separator() const -{ - return d->separator(); -} - -/*! - Returns the number of the section that has focus. -*/ - -int ExtDateTimeEditor::focusSection() const -{ - return d->focusSection(); -} - - -/*! - Sets the focus to section \a sec. If \a sec does not exist, - nothing happens. -*/ - -bool ExtDateTimeEditor::setFocusSection( int sec ) -{ - return d->setFocusSection( sec ); -} - -/*! \class ExtDateTimeEditBase ExtDatetimeedit.h - \brief The ExtDateTimeEditBase class provides an abstraction for date and edit editors. - \internal - - Small abstract class that provides some functions that are common - for both ExtDateEdit and TQTimeEdit. Its used internally by - ExtDateTimeEditor. -*/ - -/*! \fn TQString ExtDateTimeEditBase::sectionFormattedText( int sec ) - \internal - - Pure virtual function which returns the formatted text of section \a - sec. - -*/ - -/*! \fn void ExtDateTimeEditBase::stepUp() - \internal - - Pure virtual slot which is called whenever the user increases the - number in a section by pressing the widget's arrow buttons or the - keyboard's arrow keys. -*/ - -/*! \fn void ExtDateTimeEditBase::stepDown() - \internal - - Pure virtual slot which is called whenever the user decreases the - number in a section by pressing the widget's arrow buttons or the - keyboard's arrow keys. - -*/ - -/*! \fn void ExtDateTimeEditBase::addNumber( int sec, int num ) - \internal - - Pure virtual function which is called whenever the user types a number. - \a sec indicates the section where the number should be added. \a - num is the number that was pressed. -*/ - -/*! \fn void ExtDateTimeEditBase::removeLastNumber( int sec ) - \internal - - Pure virtual function which is called whenever the user tries to - remove the last number from \a sec by pressing the delete key. -*/ - -//////////////// - -class ExtDateEditPrivate -{ -public: - int y; - int m; - int d; - // remebers the last entry for the day. - // if the day is 31 and you cycle through the months, - // the day will be 31 again if you reach a month with 31 days - // otherwise it will be the highest day in the month - int dayCache; - int yearSection; - int monthSection; - int daySection; - ExtDateEdit::Order ord; - bool overwrite; - bool adv; - int timerId; - bool typing; - ExtDate min; - ExtDate max; - bool changed; - ExtDateTimeEditor *ed; - TQSpinWidget *controls; -}; - - -/*! - \class ExtDateEdit ExtDatetimeedit.h - \brief The ExtDateEdit class provides a date editor. - - \ingroup advanced - \ingroup time - - ExtDateEdit allows the user to edit dates by using the keyboard or - the arrow keys to increase/decrease date values. The arrow keys - can be used to move from section to section within the ExtDateEdit - box. Dates appear in accordance with the local date/time settings - or in year, month, day order if the system doesn't provide this - information. It is recommended that the ExtDateEdit be initialised - with a date, e.g. - - \code - ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::tqcurrentDate(), this ); - dateEdit->setRange( ExtDate::tqcurrentDate().addDays( -365 ), - ExtDate::tqcurrentDate().addDays( 365 ) ); - dateEdit->setOrder( ExtDateEdit::MDY ); - dateEdit->setAutoAdvance( TRUE ); - \endcode - - Here we've created a new ExtDateEdit object initialised with today's - date and restricted the valid date range to today plus or minus - 365 days. We've set the order to month, day, year. If the auto - advance property is TRUE (as we've set it here) when the user - completes a section of the date, e.g. enters two digits for the - month, they are automatically taken to the next section. - - The maximum and minimum values for a date value in the date editor - default to the maximum and minimum values for a ExtDate. You can - change this by calling setMinValue(), setMaxValue() or setRange(). - - Terminology: A ExtDateEdit widget comprises three 'sections', one - each for the year, month and day. You can change the separator - character using ExtDateTimeEditor::setSeparator(), by default the - separator will be taken from the systems settings. If that is - not possible, it defaults to "-". - - \image html datetimewidgets.png "Date Time Widgets" - - \sa ExtDate TQTimeEdit ExtDateTimeEdit -*/ - -/*! - \enum ExtDateEdit::Order - - This enum defines the order in which the sections that comprise a - date appear. - -*/ - - -/*! - \enum TQTimeEdit::Display - - This enum defines the sections that comprise a time - - \value Hours The hours section - \value Minutes The minutes section - \value Seconds The seconds section - \value AMPM The AM/PM section - - The values can be or'ed together to show any combination. -*/ - -/*! - Constructs an empty date editor which is a child of \a parent and - called name \a name. -*/ - -ExtDateEdit::ExtDateEdit( TQWidget * parent, const char * name ) - : ExtDateTimeEditBase( parent, name ) -{ - init(); - updateButtons(); -} - -/*! - \overload - - Constructs a date editor with the initial value \a date, parent \a - parent and called \a name. - - The date editor is initialized with \a date. -*/ - -ExtDateEdit::ExtDateEdit( const ExtDate& date, TQWidget * parent, const char * name ) - : ExtDateTimeEditBase( parent, name ) -{ - init(); - setDate( date ); -} - -/*! \internal -*/ -void ExtDateEdit::init() -{ - d = new ExtDateEditPrivate(); - d->controls = new ExtDateTimeSpinWidget( this, - qstrcmp( name(), "qt_datetime_dateedit" ) == 0 ? - "qt_spin_widget" : "date edit controls" ); - d->ed = new ExtDateTimeEditor( this, "date editor" ); - d->controls->setEditWidget( d->ed ); - setFocusProxy( d->ed ); - connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); - connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); - connect( this, TQT_SIGNAL( valueChanged(const ExtDate&) ), - TQT_SLOT( updateButtons() ) ); - d->ed->appendSection( TQNumberSection( 0,4 ) ); - d->ed->appendSection( TQNumberSection( 5,7 ) ); - d->ed->appendSection( TQNumberSection( 8,10 ) ); - - d->yearSection = -1; - d->monthSection = -1; - d->daySection = -1; - - d->y = 0; - d->m = 0; - d->d = 0; - d->dayCache = 0; - setOrder( localOrder() ); - setFocusSection( 0 ); - d->overwrite = TRUE; - d->adv = FALSE; - d->timerId = 0; - d->typing = FALSE; - d->min = ExtDate( -50000, 1, 1 ); - d->max = ExtDate( 50000, 12, 31 ); - d->changed = FALSE; - - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); - - refcount++; -} - -/*! - Destroys the object and frees any allocated resources. -*/ - -ExtDateEdit::~ExtDateEdit() -{ - delete d; - if ( !--refcount ) - cleanup(); -} - -/*! - \property ExtDateEdit::minValue - - \brief the editor's minimum value - - Setting the minimum date value is equivalent to calling - ExtDateEdit::setRange( \e d, maxValue() ), where \e d is the minimum - date. The default minimum date is 1752-09-14. - - \sa maxValue setRange() -*/ - -ExtDate ExtDateEdit::minValue() const -{ - return d->min; -} - -/*! - \property ExtDateEdit::maxValue - - \brief the editor's maximum value - - Setting the maximum date value for the editor is equivalent to - calling ExtDateEdit::setRange( minValue(), \e d ), where \e d is the - maximum date. The default maximum date is 8000-12-31. - - \sa minValue setRange() -*/ - -ExtDate ExtDateEdit::maxValue() const -{ - return d->max; -} - - -/*! - Sets the valid input range for the editor to be from \a min to \a - max inclusive. If \a min is invalid no minimum date will be set. - Similarly, if \a max is invalid no maximum date will be set. -*/ - -void ExtDateEdit::setRange( const ExtDate& min, const ExtDate& max ) -{ - if ( min.isValid() ) - d->min = min; - if ( max.isValid() ) - d->max = max; -} - -/*! - Sets the separator to \a s. Note that currently only the first - character of \a s is used. -*/ - -void ExtDateEdit::setSeparator( const TQString& s ) -{ - d->ed->setSeparator( s ); -} - -/*! - Returns the editor's separator. -*/ - -TQString ExtDateEdit::separator() const -{ - return d->ed->separator(); -} - - -/*! - Enables/disables the push buttons according to the min/max date - for this widget. -*/ - -void ExtDateEdit::updateButtons() -{ - if ( !isEnabled() ) - return; - - fix(); - - bool upEnabled = date() < maxValue(); - bool downEnabled = date() > minValue(); - - d->controls->setUpEnabled( upEnabled ); - d->controls->setDownEnabled( downEnabled ); -} - -/*! \reimp - */ -void ExtDateEdit::resizeEvent( TQResizeEvent * ) -{ - d->controls->resize( width(), height() ); -} - -/*! \reimp - -*/ -TQSize ExtDateEdit::tqsizeHint() const -{ - constPolish(); - TQFontMetrics fm( font() ); - int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); - int h = TQMAX( fm.lineSpacing(), 14 ) + 2; - int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 - + d->controls->upRect().width() + fw * 4; - - return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); -} - -/*! \reimp - -*/ -TQSize ExtDateEdit::tqminimumSizeHint() const -{ - return tqsizeHint(); -} - - -/*! - Returns the formatted number for section \a sec. This will - correspond to either the year, month or day section, depending on - the current display order. - - \sa setOrder() -*/ - -TQString ExtDateEdit::sectionFormattedText( int sec ) -{ - TQString txt; - txt = sectionText( sec ); - if ( d->typing && sec == d->ed->focusSection() ) - d->ed->setSectionSelection( sec, sectionOffsetEnd( sec ) - txt.length(), - sectionOffsetEnd( sec ) ); - else - d->ed->setSectionSelection( sec, sectionOffsetEnd( sec ) - sectionLength( sec ), - sectionOffsetEnd( sec ) ); - - txt = txt.rightJustify( sectionLength( sec ), EXTDATETIMEEDIT_HIDDEN_CHAR ); - return txt; -} - - -/*! - Returns the desired length (number of digits) of section \a sec. - This will correspond to either the year, month or day section, - depending on the current display order. - - \sa setOrder() -*/ - -int ExtDateEdit::sectionLength( int sec ) const -{ - int val = 0; - if ( sec == d->yearSection ) - val = 4; - else if ( sec == d->monthSection ) - val = 2; - else if ( sec == d->daySection ) - val = 2; - - return val; -} - -/*! - Returns the text of section \a sec. This will correspond to either - the year, month or day section, depending on the current display - order. - - \sa setOrder() -*/ - -TQString ExtDateEdit::sectionText( int sec ) const -{ - int val = 0; - if ( sec == d->yearSection ) - val = d->y; - else if ( sec == d->monthSection ) - val = d->m; - else if ( sec == d->daySection ) - val = d->d; - - return TQString::number( val ); -} - -/*! \internal - - Returns the end of the section offset \a sec. - -*/ - -int ExtDateEdit::sectionOffsetEnd( int sec ) const -{ - if ( sec == d->yearSection ) { - switch( d->ord ) { - case DMY: - case MDY: - return sectionOffsetEnd( sec-1) + separator().length() + sectionLength( sec ); - case YMD: - case YDM: - return sectionLength( sec ); - } - } else if ( sec == d->monthSection ) { - switch( d->ord ) { - case DMY: - case YDM: - case YMD: - return sectionOffsetEnd( sec-1) + separator().length() + sectionLength( sec ); - case MDY: - return sectionLength( sec ); - } - } else if ( sec == d->daySection ) { - switch( d->ord ) { - case DMY: - return sectionLength( sec ); - case YMD: - case MDY: - case YDM: - return sectionOffsetEnd( sec-1 ) + separator().length() + sectionLength( sec ); - } - } - return 0; -} - - -/*! - \property ExtDateEdit::order - \brief the order in which the year, month and day appear - - The default order is locale dependent. - - \sa Order -*/ - -void ExtDateEdit::setOrder( ExtDateEdit::Order order ) -{ - d->ord = order; - switch( d->ord ) { - case DMY: - d->yearSection = 2; - d->monthSection = 1; - d->daySection = 0; - break; - case MDY: - d->yearSection = 2; - d->monthSection = 0; - d->daySection = 1; - break; - case YMD: - d->yearSection = 0; - d->monthSection = 1; - d->daySection = 2; - break; - case YDM: - d->yearSection = 0; - d->monthSection = 2; - d->daySection = 1; - break; - } - - if ( isVisible() ) - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - - -ExtDateEdit::Order ExtDateEdit::order() const -{ - return d->ord; -} - - -/*! \reimp - -*/ -void ExtDateEdit::stepUp() -{ - int sec = d->ed->focusSection(); - bool accepted = FALSE; - if ( sec == d->yearSection ) { - if ( !outOfRange( d->y+1, d->m, d->d ) ) { - accepted = TRUE; - setYear( d->y+1 ); - } - } else if ( sec == d->monthSection ) { - if ( !outOfRange( d->y, d->m+1, d->d ) ) { - accepted = TRUE; - setMonth( d->m+1 ); - } - } else if ( sec == d->daySection ) { - if ( !outOfRange( d->y, d->m, d->d+1 ) ) { - accepted = TRUE; - setDay( d->d+1 ); - } - } - if ( accepted ) { - d->changed = TRUE; - emit valueChanged( date() ); - } - - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - - - -/*! \reimp - -*/ - -void ExtDateEdit::stepDown() -{ - int sec = d->ed->focusSection(); - bool accepted = FALSE; - if ( sec == d->yearSection ) { - if ( !outOfRange( d->y-1, d->m, d->d ) ) { - accepted = TRUE; - setYear( d->y-1 ); - } - } else if ( sec == d->monthSection ) { - if ( !outOfRange( d->y, d->m-1, d->d ) ) { - accepted = TRUE; - setMonth( d->m-1 ); - } - } else if ( sec == d->daySection ) { - if ( !outOfRange( d->y, d->m, d->d-1 ) ) { - accepted = TRUE; - setDay( d->d-1 ); - } - } - if ( accepted ) { - d->changed = TRUE; - emit valueChanged( date() ); - } - - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - -/*! - Sets the year to \a year, which must be a valid year. The range - currently supported is from 1752 to 8000. - - \sa ExtDate -*/ - -void ExtDateEdit::setYear( int year ) -{ - if ( !outOfRange( year, d->m, d->d ) ) { - d->y = year; - setMonth( d->m ); - } -} - - -/*! - Sets the month to \a month, which must be a valid month, i.e. - between 1 and 12. -*/ - -void ExtDateEdit::setMonth( int month ) -{ - if ( month < 1 ) - month = 1; - if ( month > 12 ) - month = 12; - if ( !outOfRange( d->y, month, d->d ) ) { - d->m = month; - setDay( d->d ); - } -} - - -/*! - Sets the day to \a day, which must be a valid day. The function - will ensure that the \a day set is valid for the month and year. -*/ - -void ExtDateEdit::setDay( int day ) -{ - ExtDate test = ExtDate( d->y, d->m, 1 ); - - if ( day < 1 ) - day = 1; - if ( day > test.daysInMonth() ) - day = test.daysInMonth(); - - d->dayCache = d->d; - d->d = day; -} - - -/*! - \property ExtDateEdit::date - \brief the editor's date value. - - If the date property is not valid, the editor displays all zeroes - and ExtDateEdit::date() will return an invalid date. It is strongly - recommended that the editor is given a default date value (e.g. - tqcurrentDate()). That way, attempts to set the date property to an - invalid date will fail. - - When changing the date property, if the date is less than - minValue(), or is greater than maxValue(), nothing happens. -*/ - -void ExtDateEdit::setDate( const ExtDate& date ) -{ - if ( !date.isValid() ) { - d->y = 0; - d->m = 0; - d->d = 0; - d->dayCache = 0; - } else { - if ( date > maxValue() || date < minValue() ) - return; - d->y = date.year(); - d->m = date.month(); - d->d = date.day(); - d->dayCache = d->d; - emit valueChanged( date ); - } - d->changed = FALSE; - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - -ExtDate ExtDateEdit::date() const -{ - if ( ExtDate::isValid( d->y, d->m, d->d ) ) - return ExtDate( d->y, d->m, d->d ); - return ExtDate(); -} - -/*! \internal - - Returns TRUE if \a y, \a m, \a d is out of range, otherwise returns - FALSE. - - \sa setRange() - -*/ - -bool ExtDateEdit::outOfRange( int y, int m, int d ) const -{ - if ( ExtDate::isValid( y, m, d ) ) { - ExtDate tqcurrentDate( y, m, d ); - if ( tqcurrentDate > maxValue() || tqcurrentDate < minValue() ) { - //## outOfRange should set overwrite? - return TRUE; - } - return FALSE; - } - return FALSE; /* assume ok */ -} - -/*! \reimp - -*/ - -void ExtDateEdit::addNumber( int sec, int num ) -{ - if ( sec == -1 ) - return; - killTimer( d->timerId ); - bool overwrite = FALSE; - bool accepted = FALSE; - d->typing = TRUE; - TQString txt; - if ( sec == d->yearSection ) { - if ( d->overwrite ) { - d->y = num; - d->overwrite = FALSE; - accepted = TRUE; - } else { - txt = TQString::number( 10*d->y + num ); - if ( txt.length() > 5 ) txt = txt.mid(1); - d->y = txt.toInt(); - accepted = TRUE; - } -/* - txt = TQString::number( d->y ); - if ( d->overwrite || txt.length() == 4 ) { - accepted = TRUE; - d->y = num; - } else { - txt += TQString::number( num ); - if ( txt.length() == 4 ) { - int val = txt.toInt(); - if ( val < 1792 ) - d->y = 1792; - else if ( val > 8000 ) - d->y = 8000; - else if ( outOfRange( val, d->m, d->d ) ) - txt = TQString::number( d->y ); - else { - accepted = TRUE; - d->y = val; - } - } else { - accepted = TRUE; - d->y = txt.toInt(); - } - if ( d->adv && txt.length() == 4 ) { - d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; - } - } -*/ - } else if ( sec == d->monthSection ) { - txt = TQString::number( d->m ); - if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; - d->m = num; - } else { - txt += TQString::number( num ); - int temp = txt.toInt(); - if ( temp > 12 ) - temp = num; - if ( outOfRange( d->y, temp, d->d ) ) - txt = TQString::number( d->m ); - else { - accepted = TRUE; - d->m = temp; - } - if ( d->adv && txt.length() == 2 ) { - d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; - } - } - } else if ( sec == d->daySection ) { - txt = TQString::number( d->d ); - if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; - d->d = num; - d->dayCache = d->d; - } else { - txt += TQString::number( num ); - int temp = txt.toInt(); - if ( temp > 31 ) - temp = num; - if ( outOfRange( d->y, d->m, temp ) ) - txt = TQString::number( d->d ); - else { - accepted = TRUE; - d->d = temp; - d->dayCache = d->d; - } - if ( d->adv && txt.length() == 2 ) { - d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; - } - } - } - if ( accepted ) { - d->changed = TRUE; - emit valueChanged( date() ); - } - d->overwrite = overwrite; - d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - - -/*! \reimp - -*/ - -bool ExtDateEdit::setFocusSection( int s ) -{ - if ( s != d->ed->focusSection() ) { - killTimer( d->timerId ); - d->overwrite = TRUE; - d->typing = FALSE; - fix(); // will emit valueChanged if necessary - } - return d->ed->setFocusSection( s ); -} - - -/*! - Attempts to fix any invalid date entries. - - The rules applied are as follows: - - - if the day is larger than the number of days in the month, - - it is reset to that number - - If the year has four digits it is left unchanged. - - If the year has two digits, the year will be changed to four - digits in the range current year - 70 to current year + 29. - - If the year has three digits in the range 100..999, the - current millennium, i.e. 2000, will be added giving a year - in the range 2100..2999. - -*/ - -void ExtDateEdit::fix() -{ - bool changed = FALSE; - - ExtDate test = ExtDate( d->y, d->m, 1 ); - if ( d->d > test.daysInMonth() ) { - - d->d = test.daysInMonth(); - changed = TRUE; - } - - int currentYear = ExtDate::tqcurrentDate().year(); - int year = d->y; -/* No longer valid for extended dates - if ( year < 100 ) { - int currentCentury = currentYear / 100; - year += currentCentury * 100; - if ( currentYear > year ) { - if ( currentYear > year + 70 ) - year += 100; - } else { - if ( year >= currentYear + 30 ) - year -= 100; - } - changed = TRUE; - } else if ( year < 1000 ) { - int currentMillennium = currentYear / 10; - year += currentMillennium * 10; - changed = TRUE; - } -*/ - if ( changed && outOfRange( year, d->m, d->d ) ) { - if ( minValue().isValid() && date() < minValue() ) { - d->d = minValue().day(); - d->dayCache = d->d; - d->m = minValue().month(); - d->y = minValue().year(); - } - if ( date() > maxValue() ) { - d->d = maxValue().day(); - d->dayCache = d->d; - d->m = maxValue().month(); - d->y = maxValue().year(); - } - } else if ( changed ) - setYear( year ); - - if ( changed ) { -// emit valueChanged( date() ); -// d->changed = FALSE; - } -} - - -/*! \reimp - -*/ - -bool ExtDateEdit::event( TQEvent *e ) -{ - if( e->type() == TQEvent::FocusOut ) { - d->typing = FALSE; - d->overwrite = TRUE; - // the following can't be done in fix() because fix() called - // from all over the place and it will break the old behaviour - if ( !ExtDate::isValid( d->y, d->m, d->d ) ) { - d->dayCache = d->d; - int i = d->d; - for ( ; i > 0; i-- ) { - d->d = i; - if ( ExtDate::isValid( d->y, d->m, d->d ) ) - break; - } - d->changed = TRUE; - } - if ( d->changed ) { - fix(); - emit valueChanged( date() ); - d->changed = FALSE; - } - } else if ( e->type() == TQEvent::LocaleChange ) { - readLocaleSettings(); - d->ed->setSeparator( localDateSep() ); - setOrder( localOrder() ); - } - - bool result = ExtDateTimeEditBase::event( e ); - - return result; -} - -/*! - \internal - - Function which is called whenever the user tries to - remove the first number from \a sec by pressing the backspace key. -*/ - -void ExtDateEdit::removeFirstNumber( int sec ) -{ - if ( sec == -1 ) - return; - TQString txt; - if ( sec == d->yearSection ) { - txt = TQString::number( d->y ); - txt = txt.mid( 1, txt.length() ) + "0"; - d->y = txt.toInt(); - } else if ( sec == d->monthSection ) { - txt = TQString::number( d->m ); - txt = txt.mid( 1, txt.length() ) + "0"; - d->m = txt.toInt(); - } else if ( sec == d->daySection ) { - txt = TQString::number( d->d ); - txt = txt.mid( 1, txt.length() ) + "0"; - d->d = txt.toInt(); - d->dayCache = d->d; - } - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - -/*! \reimp - -*/ - -void ExtDateEdit::removeLastNumber( int sec ) -{ - if ( sec == -1 ) - return; - TQString txt; - if ( sec == d->yearSection ) { - txt = TQString::number( d->y ); - txt = txt.mid( 0, txt.length()-1 ); - d->y = txt.toInt(); - } else if ( sec == d->monthSection ) { - txt = TQString::number( d->m ); - txt = txt.mid( 0, txt.length()-1 ); - d->m = txt.toInt(); - } else if ( sec == d->daySection ) { - txt = TQString::number( d->d ); - txt = txt.mid( 0, txt.length()-1 ); - d->d = txt.toInt(); - d->dayCache = d->d; - } - d->ed->tqrepaint( d->ed->rect(), FALSE ); -} - -/*! - \property ExtDateEdit::autoAdvance - \brief whether the editor automatically advances to the next - section - - If autoAdvance is TRUE, the editor will automatically advance - focus to the next date section if a user has completed a section. - The default is FALSE. -*/ - -void ExtDateEdit::setAutoAdvance( bool advance ) -{ - d->adv = advance; -} - - -bool ExtDateEdit::autoAdvance() const -{ - return d->adv; -} - -/*! \reimp -*/ - -void ExtDateEdit::timerEvent( TQTimerEvent * ) -{ - d->overwrite = TRUE; -} - -/*! - \fn void ExtDateEdit::valueChanged( const ExtDate& date ) - - This signal is emitted whenever the editor's value changes. The \a - date parameter is the new value. -*/ - -/////////// - -class TQTimeEditPrivate -{ -public: - int h; - int m; - int s; - uint display; - bool adv; - bool overwrite; - int timerId; - bool typing; - TQTime min; - TQTime max; - bool changed; - ExtDateTimeEditor *ed; - TQSpinWidget *controls; -}; - -/*! - \class TQTimeEdit ExtDatetimeedit.h - \brief The TQTimeEdit class provides a time editor. - - \ingroup advanced - \ingroup time - \mainclass - - TQTimeEdit allows the user to edit times by using the keyboard or - the arrow keys to increase/decrease time values. The arrow keys - can be used to move from section to section within the TQTimeEdit - box. The user can automatically be moved to the next section once - they complete a section using setAutoAdvance(). Times appear in - hour, minute, second order. It is recommended that the TQTimeEdit - is initialised with a time, e.g. - \code - TQTime timeNow = TQTime::currentTime(); - TQTimeEdit *timeEdit = new TQTimeEdit( timeNow, this ); - timeEdit->setRange( timeNow, timeNow.addSecs( 60 * 60 ) ); - \endcode - Here we've created a TQTimeEdit widget set to the current time. - We've also set the minimum value to the current time and the - maximum time to one hour from now. - - The maximum and minimum values for a time value in the time editor - default to the maximum and minimum values for a TQTime. You can - change this by calling setMinValue(), setMaxValue() or setRange(). - - Terminology: A TQTimeWidget consists of three sections, one each - for the hour, minute and second. You can change the separator - character using setSeparator(), by default the separator is read - from the system's settings. - - \img datetimewidgets.png Date Time Widgets - - \sa TQTime ExtDateEdit ExtDateTimeEdit -*/ - - -// /*! -// Constructs an empty time edit with parent \a parent and called \a -// name. -// */ -// -// TQTimeEdit::TQTimeEdit( TQWidget * parent, const char * name ) -// : ExtDateTimeEditBase( parent, name ) -// { -// init(); -// } -// -// /*! -// \overload -// -// Constructs a time edit with the initial time value, \a time, -// parent \a parent and called \a name. -// */ -// -// TQTimeEdit::TQTimeEdit( const TQTime& time, TQWidget * parent, const char * name ) -// : ExtDateTimeEditBase( parent, name ) -// { -// init(); -// setTime( time ); -// } -// -// /*! \internal -// */ -// -// void TQTimeEdit::init() -// { -// d = new TQTimeEditPrivate(); -// d->ed = new ExtDateTimeEditor( this, "time edit base" ); -// d->controls = new ExtDateTimeSpinWidget( this, qstrcmp( name(), "qt_datetime_timeedit" ) == 0 ? "qt_spin_widget" : "time edit controls" ); -// d->controls->setEditWidget( d->ed ); -// setFocusProxy( d->ed ); -// connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); -// connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); -// -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); -// d->ed->setSeparator( localTimeSep() ); -// -// d->h = 0; -// d->m = 0; -// d->s = 0; -// d->display = Hours | Minutes | Seconds; -// if ( lAMPM ) { -// d->display |= AMPM; -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); -// } -// d->adv = FALSE; -// d->overwrite = TRUE; -// d->timerId = 0; -// d->typing = FALSE; -// d->min = TQTime( 0, 0, 0 ); -// d->max = TQTime( 23, 59, 59 ); -// d->changed = FALSE; -// -// tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); -// -// refcount++; -// } -// -// /*! -// Destroys the object and frees any allocated resources. -// */ -// -// TQTimeEdit::~TQTimeEdit() -// { -// delete d; -// if ( !--refcount ) -// cleanup(); -// } -// -// /*! -// \property TQTimeEdit::minValue -// \brief the minimum time value -// -// Setting the minimum time value is equivalent to calling -// TQTimeEdit::setRange( \e t, maxValue() ), where \e t is the minimum -// time. The default minimum time is 00:00:00. -// -// \sa maxValue setRange() -// */ -// -// TQTime TQTimeEdit::minValue() const -// { -// return d->min; -// } -// -// /*! -// \property TQTimeEdit::maxValue -// \brief the maximum time value -// -// Setting the maximum time value is equivalent to calling -// TQTimeEdit::setRange( minValue(), \e t ), where \e t is the maximum -// time. The default maximum time is 23:59:59. -// -// \sa minValue setRange() -// */ -// -// TQTime TQTimeEdit::maxValue() const -// { -// return d->max; -// } -// -// -// /*! -// Sets the valid input range for the editor to be from \a min to \a -// max inclusive. If \a min is invalid no minimum time is set. -// Similarly, if \a max is invalid no maximum time is set. -// */ -// -// void TQTimeEdit::setRange( const TQTime& min, const TQTime& max ) -// { -// if ( min.isValid() ) -// d->min = min; -// if ( max.isValid() ) -// d->max = max; -// } -// -// /*! -// \property TQTimeEdit::display -// \brief the sections that are displayed in the time edit -// -// The value can be any combination of the values in the Display enum. -// By default, the widget displays hours, minutes and seconds. -// */ -// void TQTimeEdit::setDisplay( uint display ) -// { -// if ( d->display == display ) -// return; -// -// d->ed->clearSections(); -// d->display = display; -// if ( d->display & Hours ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); -// if ( d->display & Minutes ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); -// if ( d->display & Seconds ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); -// if ( d->display & AMPM ) -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); -// -// d->ed->setFocusSection( 0 ); -// d->ed->update(); -// } -// -// uint TQTimeEdit::display() const -// { -// return d->display; -// } -// -// /*! -// \property TQTimeEdit::time -// \brief the editor's time value. -// -// When changing the time property, if the time is less than -// minValue(), or is greater than maxValue(), nothing happens. -// */ -// -// void TQTimeEdit::setTime( const TQTime& time ) -// { -// if ( !time.isValid() ) { -// d->h = 0; -// d->m = 0; -// d->s = 0; -// } else { -// if ( time > maxValue() || time < minValue() ) -// return; -// d->h = time.hour(); -// d->m = time.minute(); -// d->s = time.second(); -// emit valueChanged( time ); -// } -// d->changed = FALSE; -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// TQTime TQTimeEdit::time() const -// { -// if ( TQTime::isValid( d->h, d->m, d->s ) ) -// return TQTime( d->h, d->m, d->s ); -// return TQTime(); -// } -// -// /*! -// \property TQTimeEdit::autoAdvance -// \brief whether the editor automatically advances to the next -// section -// -// If autoAdvance is TRUE, the editor will automatically advance -// focus to the next time section if a user has completed a section. -// The default is FALSE. -// */ -// -// void TQTimeEdit::setAutoAdvance( bool advance ) -// { -// d->adv = advance; -// } -// -// bool TQTimeEdit::autoAdvance() const -// { -// return d->adv; -// } -// -// /*! -// Sets the separator to \a s. Note that currently only the first -// character of \a s is used. -// */ -// -// void TQTimeEdit::setSeparator( const TQString& s ) -// { -// d->ed->setSeparator( s ); -// } -// -// /*! -// Returns the editor's separator. -// */ -// -// TQString TQTimeEdit::separator() const -// { -// return d->ed->separator(); -// } -// -// -// /*! -// \fn void TQTimeEdit::valueChanged( const TQTime& time ) -// -// This signal is emitted whenever the editor's value changes. The \a -// time parameter is the new value. -// */ -// -// /*! \reimp -// -// */ -// -// bool TQTimeEdit::event( TQEvent *e ) -// { -// if ( e->type() == TQEvent::FocusOut ) { -// d->typing = FALSE; -// if ( d->changed ) { -// emit valueChanged( time() ); -// d->changed = FALSE; -// } -// } else if ( e->type() == TQEvent::LocaleChange ) { -// readLocaleSettings(); -// d->ed->setSeparator( localTimeSep() ); -// } -// return ExtDateTimeEditBase::event( e ); -// } -// -// /*! \reimp -// -// */ -// -// void TQTimeEdit::timerEvent( TQTimerEvent * ) -// { -// d->overwrite = TRUE; -// } -// -// -// /*! \reimp -// -// */ -// -// void TQTimeEdit::stepUp() -// { -// int sec = d->ed->mapSection( d->ed->focusSection() ); -// bool accepted = TRUE; -// switch( sec ) { -// case 0: -// if ( !outOfRange( d->h+1, d->m, d->s ) ) -// setHour( d->h+1 ); -// else -// setHour( d->min.hour() ); -// break; -// case 1: -// if ( !outOfRange( d->h, d->m+1, d->s ) ) -// setMinute( d->m+1 ); -// else -// setMinute( d->min.minute() ); -// break; -// case 2: -// if ( !outOfRange( d->h, d->m, d->s+1 ) ) -// setSecond( d->s+1 ); -// else -// setSecond( d->min.second() ); -// break; -// case 3: -// if ( d->h < 12 ) -// setHour( d->h+12 ); -// else -// setHour( d->h-12 ); -// break; -// default: -// accepted = FALSE; -// #ifdef TQT_CHECK_RANGE -// qWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); -// #endif -// break; -// } -// if ( accepted ) { -// d->changed = TRUE; -// emit valueChanged( time() ); -// } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// -// /*! \reimp -// -// */ -// -// void TQTimeEdit::stepDown() -// { -// int sec = d->ed->mapSection( d->ed->focusSection() ); -// -// bool accepted = TRUE; -// switch( sec ) { -// case 0: -// if ( !outOfRange( d->h-1, d->m, d->s ) ) -// setHour( d->h-1 ); -// else -// setHour( d->max.hour() ); -// break; -// case 1: -// if ( !outOfRange( d->h, d->m-1, d->s ) ) -// setMinute( d->m-1 ); -// else -// setMinute( d->max.minute() ); -// break; -// case 2: -// if ( !outOfRange( d->h, d->m, d->s-1 ) ) -// setSecond( d->s-1 ); -// else -// setSecond( d->max.second() ); -// break; -// case 3: -// if ( d->h > 11 ) -// setHour( d->h-12 ); -// else -// setHour( d->h+12 ); -// break; -// default: -// accepted = FALSE; -// #ifdef TQT_CHECK_RANGE -// qWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); -// #endif -// break; -// } -// if ( accepted ) { -// d->changed = TRUE; -// emit valueChanged( time() ); -// } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// -// /*! -// Returns the formatted number for section \a sec. This will -// correspond to either the hour, minute or second section, depending -// on \a sec. -// */ -// -// TQString TQTimeEdit::sectionFormattedText( int sec ) -// { -// TQString txt; -// txt = sectionText( sec ); -// txt = txt.rightJustify( 2, EXTDATETIMEEDIT_HIDDEN_CHAR ); -// int offset = sec*2+sec*separator().length() + txt.length(); -// if ( d->typing && sec == d->ed->focusSection() ) -// d->ed->setSectionSelection( sec, offset - txt.length(), offset ); -// else -// d->ed->setSectionSelection( sec, offset - txt.length(), offset ); -// -// return txt; -// } -// -// -// /*! \reimp -// -// */ -// -// bool TQTimeEdit::setFocusSection( int sec ) -// { -// if ( sec != d->ed->focusSection() ) { -// killTimer( d->timerId ); -// d->overwrite = TRUE; -// d->typing = FALSE; -// TQString txt = sectionText( sec ); -// txt = txt.rightJustify( 2, EXTDATETIMEEDIT_HIDDEN_CHAR ); -// int offset = sec*2+sec*separator().length() + txt.length(); -// d->ed->setSectionSelection( sec, offset - txt.length(), offset ); -// if ( d->changed ) { -// emit valueChanged( time() ); -// d->changed = FALSE; -// } -// } -// return d->ed->setFocusSection( sec ); -// } -// -// -// /*! -// Sets the hour to \a h, which must be a valid hour, i.e. in the -// range 0..24. -// */ -// -// void TQTimeEdit::setHour( int h ) -// { -// if ( h < 0 ) -// h = 0; -// if ( h > 23 ) -// h = 23; -// d->h = h; -// } -// -// -// /*! -// Sets the minute to \a m, which must be a valid minute, i.e. in the -// range 0..59. -// */ -// -// void TQTimeEdit::setMinute( int m ) -// { -// if ( m < 0 ) -// m = 0; -// if ( m > 59 ) -// m = 59; -// d->m = m; -// } -// -// -// /*! -// Sets the second to \a s, which must be a valid second, i.e. in the -// range 0..59. -// */ -// -// void TQTimeEdit::setSecond( int s ) -// { -// if ( s < 0 ) -// s = 0; -// if ( s > 59 ) -// s = 59; -// d->s = s; -// } -// -// -// /*! \internal -// -// Returns the text of section \a sec. -// -// */ -// -// TQString TQTimeEdit::sectionText( int sec ) -// { -// sec = d->ed->mapSection( sec ); -// -// TQString txt; -// switch( sec ) { -// case 0: -// if ( !(d->display & AMPM) || ( d->h < 13 && d->h ) ) { // I wished the day stared at 0:00 for everybody -// txt = TQString::number( d->h ); -// } else { -// if ( d->h ) -// txt = TQString::number( d->h - 12 ); -// else -// txt = "12"; -// } -// break; -// case 1: -// txt = TQString::number( d->m ); -// break; -// case 2: -// txt = TQString::number( d->s ); -// break; -// case 3: -// if ( d->h < 12 ) { -// if ( lAM ) -// txt = *lAM; -// else -// txt = TQString::tqfromLatin1( "AM" ); -// } else { -// if ( lPM ) -// txt = *lPM; -// else -// txt = TQString::tqfromLatin1( "PM" ); -// } -// break; -// default: -// break; -// } -// return txt; -// } -// -// -// /*! \internal -// Returns TRUE if \a h, \a m, and \a s are out of range. -// */ -// -// bool TQTimeEdit::outOfRange( int h, int m, int s ) const -// { -// if ( TQTime::isValid( h, m, s ) ) { -// TQTime currentTime( h, m, s ); -// if ( currentTime > maxValue() || -// currentTime < minValue() ) -// return TRUE; -// else -// return FALSE; -// } -// return TRUE; -// } -// -// /*! \reimp -// -// */ -// -// void TQTimeEdit::addNumber( int sec, int num ) -// { -// if ( sec == -1 ) -// return; -// sec = d->ed->mapSection( sec ); -// killTimer( d->timerId ); -// bool overwrite = FALSE; -// bool accepted = FALSE; -// d->typing = TRUE; -// TQString txt; -// -// switch( sec ) { -// case 0: -// txt = ( d->display & AMPM && d->h > 12 ) ? -// TQString::number( d->h - 12 ) : TQString::number( d->h ); -// -// if ( d->overwrite || txt.length() == 2 ) { -// if ( d->display & AMPM && num == 0 ) -// break; // Don't process 0 in 12 hour clock mode -// if ( d->display & AMPM && d->h > 11 ) -// num += 12; -// if ( !outOfRange( num, d->m, d->s ) ) { -// accepted = TRUE; -// d->h = num; -// } -// } else { -// txt += TQString::number( num ); -// int temp = txt.toInt(); -// -// if ( d->display & AMPM ) { -// if ( temp == 12 ) { -// if ( d->h < 12 ) { -// temp = 0; -// } -// accepted = TRUE; -// } else if ( outOfRange( temp + 12, d->m, d->s ) ) { -// txt = TQString::number( d->h ); -// } else { -// if ( d->h > 11 ) { -// temp += 12; -// } -// accepted = TRUE; -// } -// } else if ( !(d->display & AMPM) && outOfRange( temp, d->m, d->s ) ) { -// txt = TQString::number( d->h ); -// } else { -// accepted = TRUE; -// } -// -// if ( accepted ) -// d->h = temp; -// -// if ( d->adv && txt.length() == 2 ) { -// setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; -// } -// } -// break; -// -// case 1: -// txt = TQString::number( d->m ); -// if ( d->overwrite || txt.length() == 2 ) { -// if ( !outOfRange( d->h, num, d->s ) ) { -// accepted = TRUE; -// d->m = num; -// } -// } else { -// txt += TQString::number( num ); -// int temp = txt.toInt(); -// if ( temp > 59 ) -// temp = num; -// if ( outOfRange( d->h, temp, d->s ) ) -// txt = TQString::number( d->m ); -// else { -// accepted = TRUE; -// d->m = temp; -// } -// if ( d->adv && txt.length() == 2 ) { -// setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; -// } -// } -// break; -// -// case 2: -// txt = TQString::number( d->s ); -// if ( d->overwrite || txt.length() == 2 ) { -// if ( !outOfRange( d->h, d->m, num ) ) { -// accepted = TRUE; -// d->s = num; -// } -// } else { -// txt += TQString::number( num ); -// int temp = txt.toInt(); -// if ( temp > 59 ) -// temp = num; -// if ( outOfRange( d->h, d->m, temp ) ) -// txt = TQString::number( d->s ); -// else { -// accepted = TRUE; -// d->s = temp; -// } -// if ( d->adv && txt.length() == 2 ) { -// setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; -// } -// } -// break; -// -// case 3: -// break; -// -// default: -// break; -// } -// d->changed = accepted; -// if ( accepted ) -// emit valueChanged( time() ); -// d->overwrite = overwrite; -// d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// -// /*! -// \internal -// -// Function which is called whenever the user tries to -// remove the first number from \a sec by pressing the backspace key. -// */ -// -// void TQTimeEdit::removeFirstNumber( int sec ) -// { -// if ( sec == -1 ) -// return; -// sec = d->ed->mapSection( sec ); -// TQString txt; -// switch( sec ) { -// case 0: -// txt = TQString::number( d->h ); -// break; -// case 1: -// txt = TQString::number( d->m ); -// break; -// case 2: -// txt = TQString::number( d->s ); -// break; -// } -// txt = txt.mid( 1, txt.length() ) + "0"; -// switch( sec ) { -// case 0: -// d->h = txt.toInt(); -// break; -// case 1: -// d->m = txt.toInt(); -// break; -// case 2: -// d->s = txt.toInt(); -// break; -// } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// /*! \reimp -// -// */ -// void TQTimeEdit::removeLastNumber( int sec ) -// { -// if ( sec == -1 ) -// return; -// sec = d->ed->mapSection( sec ); -// TQString txt; -// switch( sec ) { -// case 0: -// txt = TQString::number( d->h ); -// break; -// case 1: -// txt = TQString::number( d->m ); -// break; -// case 2: -// txt = TQString::number( d->s ); -// break; -// } -// txt = txt.mid( 0, txt.length()-1 ); -// switch( sec ) { -// case 0: -// d->h = txt.toInt(); -// break; -// case 1: -// d->m = txt.toInt(); -// break; -// case 2: -// d->s = txt.toInt(); -// break; -// } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); -// } -// -// /*! \reimp -// */ -// void TQTimeEdit::resizeEvent( TQResizeEvent * ) -// { -// d->controls->resize( width(), height() ); -// } -// -// /*! \reimp -// */ -// TQSize TQTimeEdit::tqsizeHint() const -// { -// constPolish(); -// TQFontMetrics fm( font() ); -// int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); -// int h = fm.lineSpacing() + 2; -// int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 + -// d->controls->upRect().width() + fw * 4; -// if ( d->display & AMPM ) { -// if ( lAM ) -// w += fm.width( *lAM ) + 4; -// else -// w += fm.width( TQString::tqfromLatin1( "AM" ) ) + 4; -// } -// -// return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); -// } -// -// /*! \reimp -// */ -// TQSize TQTimeEdit::tqminimumSizeHint() const -// { -// return tqsizeHint(); -// } -// -// /*! -// \internal -// Enables/disables the push buttons according to the min/max time -// for this widget. -// */ -// -// // ### Remove in 4.0? -// -// void TQTimeEdit::updateButtons() -// { -// if ( !isEnabled() ) -// return; -// -// bool upEnabled = time() < maxValue(); -// bool downEnabled = time() > minValue(); -// -// d->controls->setUpEnabled( upEnabled ); -// d->controls->setDownEnabled( downEnabled ); -// } - - -class ExtDateTimeEditPrivate -{ -public: - bool adv; -}; - -/*! - \class ExtDateTimeEdit ExtDatetimeedit.h - \brief The ExtDateTimeEdit class combines a ExtDateEdit and TQTimeEdit - widget into a single widget for editing datetimes. - - \ingroup advanced - \ingroup time - - ExtDateTimeEdit consists of a ExtDateEdit and TQTimeEdit widget placed - side by side and offers the functionality of both. The user can - edit the date and time by using the keyboard or the arrow keys to - increase/decrease date or time values. The Tab key can be used to - move from section to section within the ExtDateTimeEdit widget, and - the user can be moved automatically when they complete a section - using setAutoAdvance(). The datetime can be set with - setDateTime(). - - The date format is read from the system's locale settings. It is - set to year, month, day order if that is not possible. See - ExtDateEdit::setOrder() to change this. Times appear in the order - hours, minutes, seconds using the 24 hour clock. - - It is recommended that the ExtDateTimeEdit is initialised with a - datetime, e.g. - \code - ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::tqcurrentDateTime(), this ); - dateTimeEdit->dateEdit()->setRange( ExtDateTime::tqcurrentDate(), - ExtDateTime::tqcurrentDate().addDays( 7 ) ); - \endcode - Here we've created a new ExtDateTimeEdit set to the current date and - time, and set the date to have a minimum date of now and a maximum - date of a week from now. - - Terminology: A ExtDateEdit widget consists of three 'sections', one - each for the year, month and day. Similarly a TQTimeEdit consists - of three sections, one each for the hour, minute and second. The - character that separates each date section is specified with - setDateSeparator(); similarly setTimeSeparator() is used for the - time sections. - - \image html datetimewidgets.png "Date Time Widgets" - - \sa ExtDateEdit TQTimeEdit -*/ - -/*! - Constructs an empty datetime edit with parent \a parent and called - \a name. -*/ -ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) -{ - init(); -} - - -/*! - \overload - - Constructs a datetime edit with the initial value \a datetime, - parent \a parent and called \a name. -*/ -ExtDateTimeEdit::ExtDateTimeEdit( const ExtDateTime& datetime, - TQWidget * parent, const char * name ) - : TQWidget( parent, name ) -{ - init(); - setDateTime( datetime ); -} - - - -/*! - Destroys the object and frees any allocated resources. -*/ - -ExtDateTimeEdit::~ExtDateTimeEdit() -{ - delete d; -} - - -/*! - \reimp - - Intercepts and handles resize events which have special meaning - for the ExtDateTimeEdit. -*/ - -void ExtDateTimeEdit::resizeEvent( TQResizeEvent * ) -{ - int dw = de->tqsizeHint().width(); - int tw = te->tqsizeHint().width(); - int w = width(); - int h = height(); - int extra = w - ( dw + tw ); - - if ( tw + extra < 0 ) { - dw = w; - } else { - dw += 9 * extra / 16; - } - tw = w - dw; - - de->setGeometry( 0, 0, dw, h ); - te->setGeometry( dw, 0, tw, h ); -} - -/*! \reimp -*/ - -TQSize ExtDateTimeEdit::tqminimumSizeHint() const -{ - TQSize dsh = de->tqminimumSizeHint(); - TQSize tsh = te->tqminimumSizeHint(); - return TQSize( dsh.width() + tsh.width(), - TQMAX( dsh.height(), tsh.height() ) ); -} - -/*! \internal - */ - -void ExtDateTimeEdit::init() -{ - d = new ExtDateTimeEditPrivate(); - de = new ExtDateEdit( this, "qt_datetime_dateedit" ); - te = new TQTimeEdit( this, "qt_datetime_timeedit" ); - d->adv = FALSE; - connect( de, TQT_SIGNAL( valueChanged( const ExtDate& ) ), - this, TQT_SLOT( newValue( const ExtDate& ) ) ); - connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( newValue( const TQTime& ) ) ); - setFocusProxy( de ); - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); -} - -/*! \reimp - */ - -TQSize ExtDateTimeEdit::tqsizeHint() const -{ - constPolish(); - TQSize dsh = de->tqsizeHint(); - TQSize tsh = te->tqsizeHint(); - return TQSize( dsh.width() + tsh.width(), - TQMAX( dsh.height(), tsh.height() ) ); -} - -/*! - \property ExtDateTimeEdit::dateTime - \brief the editor's datetime value - - The datetime edit's datetime which may be an invalid datetime. -*/ - -void ExtDateTimeEdit::setDateTime( const ExtDateTime & dt ) -{ - if ( dt.isValid() ) { - de->setDate( dt.date() ); - te->setTime( dt.time() ); - emit valueChanged( dt ); - } -} - -ExtDateTime ExtDateTimeEdit::dateTime() const -{ - return ExtDateTime( de->date(), te->time() ); -} - -/*! - \fn void ExtDateTimeEdit::valueChanged( const ExtDateTime& datetime ) - - This signal is emitted every time the date or time changes. The \a - datetime argument is the new datetime. -*/ - - -/*! \internal - - Re-emits the value \a d. - */ - -void ExtDateTimeEdit::newValue( const ExtDate& ) -{ - ExtDateTime dt = dateTime(); - emit valueChanged( dt ); -} - -/*! \internal - \overload - Re-emits the value \a t. - */ - -void ExtDateTimeEdit::newValue( const TQTime& ) -{ - ExtDateTime dt = dateTime(); - emit valueChanged( dt ); -} - - -/*! - Sets the auto advance property of the editor to \a advance. If set - to TRUE, the editor will automatically advance focus to the next - date or time section if the user has completed a section. -*/ - -void ExtDateTimeEdit::setAutoAdvance( bool advance ) -{ - de->setAutoAdvance( advance ); - te->setAutoAdvance( advance ); -} - -/*! - Returns TRUE if auto-advance is enabled, otherwise returns FALSE. - - \sa setAutoAdvance() -*/ - -bool ExtDateTimeEdit::autoAdvance() const -{ - return de->autoAdvance(); -} - -/*! - \fn ExtDateEdit* ExtDateTimeEdit::dateEdit() - - Returns the internal widget used for editing the date part of the - datetime. -*/ - -/*! - \fn TQTimeEdit* ExtDateTimeEdit::timeEdit() - - Returns the internal widget used for editing the time part of the - datetime. -*/ - -#include "extdatetimeedit.moc" - -#endif diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h deleted file mode 100644 index 4a2aaa16..00000000 --- a/libkdeedu/extdate/extdatetimeedit.h +++ /dev/null @@ -1,374 +0,0 @@ -/**************************************************************************** -** -** -** Definition of date and time edit classes -** -** Created : 001103 -** -** Original TQDateTimeEdit Copyright (C) 2000 Trolltech AS. All rights reserved. -** -** >> modifications to introduce ExtDate (C) 2004 Jason Harris -** >> ExtDate modifications are licensed under the GPL: http://www.gnu.org/licenses/gpl.html -** -** 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. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -**********************************************************************/ - -#ifndef EXTDATETIMEEDIT_H -#define EXTDATETIMEEDIT_H - -#include -#include -#include - -#include "extdatetime.h" - -#ifndef TQT_NO_DATETIMEEDIT - -class TQTimeEdit; - -class ExtDateTimeEditBase : public TQWidget -{ - Q_OBJECT - TQ_OBJECT -public: - ExtDateTimeEditBase( TQWidget* parent=0, const char* name=0 ) - : TQWidget( parent, name ) {} - - virtual bool setFocusSection( int sec ) = 0; - virtual TQString sectionFormattedText( int sec ) = 0; - virtual void addNumber( int sec, int num ) = 0; - virtual void removeLastNumber( int sec ) = 0; - -public slots: - virtual void stepUp() = 0; - virtual void stepDown() = 0; - -private: -#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator= - ExtDateTimeEditBase( const ExtDateTimeEditBase & ); - ExtDateTimeEditBase &operator=( const ExtDateTimeEditBase & ); -#endif -}; - -class ExtDateEditPrivate; - -class KDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase -{ - Q_OBJECT - TQ_OBJECT - Q_ENUMS( Order ) - TQ_PROPERTY( Order order READ order WRITE setOrder ) -// TQ_PROPERTY( ExtDate date READ date WRITE setDate ) - TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) -// TQ_PROPERTY( ExtDate maxValue READ maxValue WRITE setMaxValue ) -// TQ_PROPERTY( ExtDate minValue READ minValue WRITE setMinValue ) - -public: - ExtDateEdit( TQWidget* parent=0, const char* name=0 ); - ExtDateEdit( const ExtDate& date, TQWidget* parent=0, const char* name=0 ); - ~ExtDateEdit(); - - enum Order { DMY /**< Day-Month-Year */, - MDY /**< Month-Day-Year */, - YMD /**< Year-Month-Day, also the default */, - YDM /**< Year-Day-Month @deprecated Included for completeness. */ }; - - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; - -public slots: - virtual void setDate( const ExtDate& date ); - -public: - ExtDate date() const; - virtual void setOrder( Order order ); - Order order() const; - virtual void setAutoAdvance( bool advance ); - bool autoAdvance() const; - - virtual void setMinValue( const ExtDate& d ) { setRange( d, maxValue() ); } - ExtDate minValue() const; - virtual void setMaxValue( const ExtDate& d ) { setRange( minValue(), d ); } - ExtDate maxValue() const; - virtual void setRange( const ExtDate& min, const ExtDate& max ); - TQString separator() const; - virtual void setSeparator( const TQString& s ); - - // Make removeFirstNumber() virtual in ExtDateTimeEditBase in 4.0 - void removeFirstNumber( int sec ); - -signals: - void valueChanged( const ExtDate& date ); - -protected: - bool event( TQEvent *e ); - void timerEvent( TQTimerEvent * ); - void resizeEvent( TQResizeEvent * ); - void stepUp(); - void stepDown(); - TQString sectionFormattedText( int sec ); - void addNumber( int sec, int num ); - - void removeLastNumber( int sec ); - bool setFocusSection( int s ); - - virtual void setYear( int year ); - virtual void setMonth( int month ); - virtual void setDay( int day ); - virtual void fix(); - virtual bool outOfRange( int y, int m, int d ) const; - -protected slots: - void updateButtons(); - -private: - void init(); - int sectionOffsetEnd( int sec ) const; - int sectionLength( int sec ) const; - TQString sectionText( int sec ) const; - ExtDateEditPrivate* d; - -#if defined(TQ_DISABLE_COPY) - ExtDateEdit( const ExtDateEdit & ); - ExtDateEdit &operator=( const ExtDateEdit & ); -#endif -}; - -// class TQTimeEditPrivate; -// -// class TQ_EXPORT TQTimeEdit : public ExtDateTimeEditBase -// { -// Q_OBJECT -// TQ_OBJECT -// TQ_SETS( Display ) -// TQ_PROPERTY( TQTime time READ time WRITE setTime ) -// TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) -// TQ_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue ) -// TQ_PROPERTY( TQTime minValue READ minValue WRITE setMinValue ) -// TQ_PROPERTY( Display display READ display WRITE setDisplay ) -// -// public: -// enum Display { -// Hours = 0x01, -// Minutes = 0x02, -// Seconds = 0x04, -// /*Reserved = 0x08,*/ -// AMPM = 0x10 -// }; -// -// TQTimeEdit( TQWidget* parent=0, const char* name=0 ); -// TQTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 ); -// ~TQTimeEdit(); -// -// TQSize tqsizeHint() const; -// TQSize tqminimumSizeHint() const; -// -// public slots: -// virtual void setTime( const TQTime& time ); -// -// public: -// TQTime time() const; -// virtual void setAutoAdvance( bool advance ); -// bool autoAdvance() const; -// -// virtual void setMinValue( const TQTime& d ) { setRange( d, maxValue() ); } -// TQTime minValue() const; -// virtual void setMaxValue( const TQTime& d ) { setRange( minValue(), d ); } -// TQTime maxValue() const; -// virtual void setRange( const TQTime& min, const TQTime& max ); -// TQString separator() const; -// virtual void setSeparator( const TQString& s ); -// -// uint display() const; -// void setDisplay( uint disp ); -// -// // Make removeFirstNumber() virtual in ExtDateTimeEditBase in 4.0 -// void removeFirstNumber( int sec ); -// -// signals: -// void valueChanged( const TQTime& time ); -// -// protected: -// bool event( TQEvent *e ); -// void timerEvent( TQTimerEvent *e ); -// void resizeEvent( TQResizeEvent * ); -// void stepUp(); -// void stepDown(); -// TQString sectionFormattedText( int sec ); -// void addNumber( int sec, int num ); -// void removeLastNumber( int sec ); -// bool setFocusSection( int s ); -// -// virtual bool outOfRange( int h, int m, int s ) const; -// virtual void setHour( int h ); -// virtual void setMinute( int m ); -// virtual void setSecond( int s ); -// -// protected slots: -// void updateButtons(); -// -// private: -// void init(); -// TQString sectionText( int sec ); -// TQTimeEditPrivate* d; -// -// #if defined(TQ_DISABLE_COPY) -// TQTimeEdit( const TQTimeEdit & ); -// TQTimeEdit &operator=( const TQTimeEdit & ); -// #endif -// }; -// - -class ExtDateTimeEditPrivate; - -class KDE_EXPORT ExtDateTimeEdit : public TQWidget -{ - Q_OBJECT - TQ_OBJECT -// TQ_PROPERTY( ExtDateTime dateTime READ dateTime WRITE setDateTime ) - -public: - ExtDateTimeEdit( TQWidget* parent=0, const char* name=0 ); - ExtDateTimeEdit( const ExtDateTime& datetime, TQWidget* parent=0, - const char* name=0 ); - ~ExtDateTimeEdit(); - - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; - -public slots: - virtual void setDateTime( const ExtDateTime & dt ); - -public: - ExtDateTime dateTime() const; - - ExtDateEdit* dateEdit() { return de; } - TQTimeEdit* timeEdit() { return te; } - - virtual void setAutoAdvance( bool advance ); - bool autoAdvance() const; - -signals: - void valueChanged( const ExtDateTime& datetime ); - -protected: - // ### make init() private in TQt 4.0 - void init(); - void resizeEvent( TQResizeEvent * ); - -protected slots: - // ### make these two functions private in TQt 4.0, - // and merge them into one with no parameter - void newValue( const ExtDate& d ); - void newValue( const TQTime& t ); - -private: - ExtDateEdit* de; - TQTimeEdit* te; - ExtDateTimeEditPrivate* d; - -#if defined(TQ_DISABLE_COPY) - ExtDateTimeEdit( const ExtDateTimeEdit & ); - ExtDateTimeEdit &operator=( const ExtDateTimeEdit & ); -#endif -}; - -class TQNumberSection -{ -public: - TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) - : selstart( selStart ), selend( selEnd ), act( actual ), sep( separat ) - {} - int selectionStart() const { return selstart; } - void setSelectionStart( int s ) { selstart = s; } - int selectionEnd() const { return selend; } - void setSelectionEnd( int s ) { selend = s; } - int width() const { return selend - selstart; } - int index() const { return act; } - bool separator() const { return sep; } - TQ_DUMMY_COMPARISON_OPERATOR( TQNumberSection ) -private: - int selstart :12; - int selend :12; - int act :7; - bool sep :1; -}; - -class ExtDateTimeEditorPrivate; - -class ExtDateTimeEditor : public TQWidget -{ - Q_OBJECT - TQ_OBJECT -public: - ExtDateTimeEditor( ExtDateTimeEditBase * parent=0, - const char * name=0 ); - ~ExtDateTimeEditor(); - -// void setControlWidget( ExtDateTimeEditBase * widget ); -// ExtDateTimeEditBase * controlWidget() const; - - void setSeparator( const TQString& s ); - TQString separator() const; - - int focusSection() const; - bool setFocusSection( int s ); - void appendSection( const TQNumberSection& sec ); - void clearSections(); - void setSectionSelection( int sec, int selstart, int selend ); - bool eventFilter( TQObject *o, TQEvent *e ); - int sectionAt( const TQPoint &p ); - int mapSection( int sec ); - -protected: - void init(); - bool event( TQEvent *e ); - void resizeEvent( TQResizeEvent * ); - void paintEvent( TQPaintEvent * ); - void mousePressEvent( TQMouseEvent *e ); - -private: - ExtDateTimeEditBase* cw; - ExtDateTimeEditorPrivate* d; -}; - -class ExtDateTimeSpinWidget : public TQSpinWidget -{ - Q_OBJECT - TQ_OBJECT -public: - ExtDateTimeSpinWidget( TQWidget *parent, const char *name ) - : TQSpinWidget( parent, name ) - { - } - -protected: -#ifndef TQT_NO_WHEELEVENT - void wheelEvent( TQWheelEvent *e ) - { - ExtDateTimeEditor *editor = (ExtDateTimeEditor*)editWidget()->qt_cast( "ExtDateTimeEditor" ); - Q_ASSERT( editor ); - if ( !editor ) - return; - - int section = editor->sectionAt( e->pos() ); - editor->setFocusSection( section ); - - if ( section == -1 ) - return; - TQSpinWidget::wheelEvent( e ); - } -#endif -}; - -#endif -#endif diff --git a/libkdeedu/extdate/extdatewidget.cpp b/libkdeedu/extdate/extdatewidget.cpp deleted file mode 100644 index f1c7269b..00000000 --- a/libkdeedu/extdate/extdatewidget.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2001 Waldo Bastian (bastian@kde.org) - - Modified to use ExtDate instead of TQDate. Modifications - Copyright (C) 2004 Jason Harris (jharris@30doradus.org) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -#include -#include -#include - -#include -#include - -#include "extdatewidget.h" -#include "extcalendarsystemgregorian.h" - -class ExtDateWidgetSpinBox : public TQSpinBox -{ -public: - ExtDateWidgetSpinBox(int min, int max, TQWidget *parent) - : TQSpinBox(min, max, 1, parent) - { - editor()->tqsetAlignment(AlignRight); - } -}; - -class ExtDateWidget::ExtDateWidgetPrivate -{ -public: - ExtDateWidgetPrivate() { calendar = new ExtCalendarSystemGregorian(); } - ~ExtDateWidgetPrivate() { delete calendar; } - ExtDateWidgetSpinBox *m_day; - TQComboBox *m_month; - ExtDateWidgetSpinBox *m_year; - ExtDate m_dat; - ExtCalendarSystemGregorian *calendar; -}; - - -ExtDateWidget::ExtDateWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) -{ - init(ExtDate::tqcurrentDate()); - setDate(ExtDate()); -} - -ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, - const char *name ) - : TQWidget( parent, name ) -{ - init(date); - setDate(date); -} - -// // ### CFM Repaced by init(const ExtDate&). Can be safely removed -// // when no risk of BIC -// void ExtDateWidget::init() -// { -// d = new ExtDateWidgetPrivate; -// KLocale *locale = KGlobal::locale(); -// TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); -// d->m_day = new ExtDateWidgetSpinBox(1, 1, this); -// d->m_month = new TQComboBox(false, this); -// for (int i = 1; ; ++i) -// { -// TQString str = d->calendar->monthName(i, -// d->calendar->year(ExtDate())); -// if (str.isNull()) break; -// d->m_month->insertItem(str); -// } -// -// d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), -// d->calendar->maxValidYear(), this); -// -// connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); -// } - -void ExtDateWidget::init(const ExtDate& date) -{ - d = new ExtDateWidgetPrivate; - //KLocale *locale = KGlobal::locale(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); - d->m_day = new ExtDateWidgetSpinBox(1, 1, this); - d->m_month = new TQComboBox(false, this); - for (int i = 1; ; ++i) - { - TQString str = d->calendar->monthName(i, - d->calendar->year(date)); - if (str.isNull()) break; - d->m_month->insertItem(str); - } - - d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), - d->calendar->maxValidYear(), this); - - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); -} - -ExtDateWidget::~ExtDateWidget() -{ - delete d; -} - -void ExtDateWidget::setDate( const ExtDate &date ) -{ -// const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - - d->m_day->blockSignals(true); - d->m_month->blockSignals(true); - d->m_year->blockSignals(true); - - d->m_day->setMaxValue(d->calendar->daysInMonth(date)); - d->m_day->setValue(d->calendar->day(date)); - d->m_month->setCurrentItem(d->calendar->month(date)-1); - d->m_year->setValue(d->calendar->year(date)); - - d->m_day->blockSignals(false); - d->m_month->blockSignals(false); - d->m_year->blockSignals(false); - - d->m_dat = date; - emit changed(d->m_dat); -} - -ExtDate ExtDateWidget::date() const -{ - return d->m_dat; -} - -void ExtDateWidget::slotDateChanged( ) -{ -// const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - - ExtDate date; - int y,m,day; - - y = d->m_year->value(); - y = TQMIN(TQMAX(y, d->calendar->minValidYear()), d->calendar->maxValidYear()); - - d->calendar->setYMD(date, y, 1, 1); - m = d->m_month->currentItem()+1; - m = TQMIN(TQMAX(m,1), d->calendar->monthsInYear(date)); - - d->calendar->setYMD(date, y, m, 1); - day = d->m_day->value(); - day = TQMIN(TQMAX(day,1), d->calendar->daysInMonth(date)); - - d->calendar->setYMD(date, y, m, day); - setDate(date); -} - -void ExtDateWidget::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - -#include "extdatewidget.moc" diff --git a/libkdeedu/extdate/extdatewidget.h b/libkdeedu/extdate/extdatewidget.h deleted file mode 100644 index 4df9931a..00000000 --- a/libkdeedu/extdate/extdatewidget.h +++ /dev/null @@ -1,90 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2001 Waldo Bastian (bastian@kde.org) - - Modified to use ExtDate instead of TQDate. Modifications - Copyright (C) 2004 Jason Harris (jharris@30doradus.org) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef __EXTDATEWIDGET_H__ -#define __EXTDATEWIDGET_H__ - -#include "extdatetime.h" - -/** -* This widget can be used to display or allow user selection of a date. -* -* @see ExtDatePicker -* -* @short A pushbutton to display or allow user selection of a date. -* @version $Id$ -*/ -class KDE_EXPORT ExtDateWidget : public TQWidget -{ - Q_OBJECT - TQ_OBJECT -// TQ_PROPERTY( ExtDate date READ date WRITE setDate ) - -public: - /** - * Constructs a date selection widget, initialized to the current CPU date. - */ - ExtDateWidget( TQWidget *parent=0, const char *name=0 ); - - /** - * Constructs a date selection widget with the initial date set to @p date. - */ - ExtDateWidget( const ExtDate &date, TQWidget *parent=0, const char *name=0 ); - - /** - * Destructs the date selection widget. - */ - virtual ~ExtDateWidget(); - - /** - * Returns the currently selected date. - */ - ExtDate date() const; - - /** - * Changes the selected date to @p date. - */ - void setDate(const ExtDate &date); - - -signals: - /** - * Emitted whenever the date of the widget - * is changed, either with setDate() or via user selection. - */ - void changed(ExtDate); - -protected: - void init(); - void init(const ExtDate&); - -protected slots: - void slotDateChanged(); - -protected: - virtual void virtual_hook( int id, void* data ); -private: - class ExtDateWidgetPrivate; - ExtDateWidgetPrivate *d; -}; - -#endif - diff --git a/libkdeedu/extdate/main.cpp b/libkdeedu/extdate/main.cpp deleted file mode 100644 index bcc68a1f..00000000 --- a/libkdeedu/extdate/main.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "testwidget.h" -#include -#include -#include - -static const char description[] = I18N_NOOP("ExtDatePicker test program"); -static const char notice[] = I18N_NOOP("Compares KDatePicker and ExtDatePicker"); - -static KCmdLineOptions options[] = -{ - KCmdLineLastOption -}; - -int main( int argc, char *argv[] ) -{ - KAboutData aboutData( "test_extdatepicker", I18N_NOOP("Test ExtDatePicker"), - "0.1", description, KAboutData::License_GPL, - I18N_NOOP("(c) 2004, Jason Harris"), notice, - "http://30doradus.org"); - aboutData.addAuthor("Jason Harris", 0, - "jharris@30doradus.org", "http://www.30doradus.org"); - - KCmdLineArgs::init( argc, argv, &aboutData ); - - KApplication a; - TestWidget *t = new TestWidget(0,0); - t->show(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); - return a.exec(); -} diff --git a/libkdeedu/extdate/test_extdate.cc b/libkdeedu/extdate/test_extdate.cc deleted file mode 100644 index 63b2120b..00000000 --- a/libkdeedu/extdate/test_extdate.cc +++ /dev/null @@ -1,334 +0,0 @@ -#include -#include -#include "extdatetime.h" - - -void test1_unit(int a_year) -{ - std::cout << a_year << " (TQDate|ExtDate): " << ((TQDate::leapYear(a_year)) ? "yes" : "no") - <<"|"<< ((ExtDate::leapYear(a_year)) ? "yes" : "no") << std::endl; -} - -void test1() -{ - int a_set_of_years[] = - { - 1996, - 1997, - 1998, - 2000, - 1999, - 2001, - 1900, - 1800, - 1700, - 1600, - 2100, - 2200, - 2300, - 0, - -1, - -4, - -100, - -200, - -300, - -400, - -500 - }; - uint i; - std::cout << "Checking Leap Years:\n" << std::endl; - for (i = 0 ; i < sizeof(a_set_of_years)/sizeof(a_set_of_years[0]) ; i++) - { - test1_unit(a_set_of_years[i]); - } - std::cout << "--------------------" << std::endl; -} - -void test2_unit(int y, int m, int d) -{ - TQDate q(y, m, d); - ExtDate e(y, m, d); - int q_week_number = q.dayOfWeek(); - int e_week_number = e.dayOfWeek(); - int q_day_of_year = q.dayOfYear(); - int e_day_of_year = e.dayOfYear(); - std::cout << "(" << y << ", " << m << ", " << d << ") :: " - << q.toString("dd.MMM.yyyy").local8Bit() << " : " - << q.dayOfWeek() << " : " << q_week_number << " : " << q_day_of_year << " :: " - << e.toString("%d.%b.%Y").local8Bit() << " : " - << e.dayOfWeek() << " : " << e_week_number << " : " << e_day_of_year << std::endl; -} - -void test2() -{ - int a_set_of_dates[][3] = - { - {0, 1, 1}, - {1, 1, 1}, - {2, 1, 1}, - {3, 1, 1}, - {4, 1, 1}, - {5, 1, 1}, - {99, 1, 1}, - {100, 1, 1}, - {100, 12, 31}, - {101, 1, 1}, - {102, 1, 1}, - {103, 1, 1}, - {104, 1, 1}, - {399, 1, 1}, - {400, 1, 1}, - {401, 1, 1}, - {402, 1, 1}, - {403, 1, 1}, - {404, 1, 1}, - {2003, 1, 1}, - {2003, 1, 2}, - {2003, 1, 3}, - {2003, 1, 4}, - {2003, 1, 5}, - {2003, 1, 6}, - {2003, 1, 7}, - {2003, 1, 8}, - {2003, 1, 9}, - {2003, 1, 10}, - {2003, 1, 11}, - {2003, 1, 12}, - {2003, 1, 13}, - {2003, 1, 14}, - {2003, 1, 15}, - {2003, 1, 16}, - {2003, 1, 17}, - {2003, 1, 18}, - {2003, 12, 19}, - {2003, 12, 20}, - {2003, 12, 21}, - {2003, 12, 22}, - {2003, 12, 23}, - {2003, 12, 24}, - {2003, 12, 25}, - {2003, 12, 26}, - {2003, 12, 27}, - {2003, 12, 28}, - {2003, 12, 29}, - {2003, 12, 30}, - {2003, 12, 31}, - {2004, 1, 1}, - {2003, 11, 2} - }; - uint i; - std::cout << "(y, m, d) :: TQDate : Q.dayOfWeek() : Q.weekNumber() : Q.dayOfYear() :: ExtDate : E.dayOfWeek() : E.weekNumber() : E.dayOfYear()\n" << std::endl; - - for (i = 0 ; i < sizeof(a_set_of_dates)/sizeof(a_set_of_dates[0]) ; i++) - { - test2_unit(a_set_of_dates[i][0], a_set_of_dates[i][1], a_set_of_dates[i][2]); - } - std::cout << "--------------------" << std::endl; -} - -void test3_unit(int y, int m, int d, int dm) -{ - TQDate q(y, m, d); - ExtDate e(y, m, d); - TQDate q2 = q.addMonths(dm); - ExtDate e2 = e.addMonths(dm); - std::cout << e.toString("%d.%b.%Y").local8Bit() << " + " << dm - << " months :: ExtDate : " << e2.toString("%d.%b.%Y").local8Bit() - << " TQDate : " << q2.toString("dd.MMM.yyyy").local8Bit() << std::endl; -} - -void test3() -{ - int a_set_of_dates_delta[][4] = - { - {2003, 11, 5, 0}, - {2003, 11, 5, 1}, - {2003, 11, 5, -1}, - {2003, 11, 5, 2}, - {2003, 11, 5, 3} - }; - uint i; - std::cout << "Adding Months:\n" << std::endl; - for (i = 0 ; i < sizeof(a_set_of_dates_delta)/sizeof(a_set_of_dates_delta[0]) ; i++) - { - test3_unit(a_set_of_dates_delta[i][0], a_set_of_dates_delta[i][1], a_set_of_dates_delta[i][2], a_set_of_dates_delta[i][3]); - } - std::cout << "--------------------" << std::endl; -} -void test4_unit(int y, int m, int d, int dy) -{ - TQDate q(y, m, d); - ExtDate e(y, m, d); - TQDate q2 = q.addYears(dy); - ExtDate e2 = e.addYears(dy); - std::cout << e.toString("%d.%m.%Y").local8Bit() << " + " << dy << " years :: ExtDate : " - << e2.toString().local8Bit() << " TQDate : " - << q2.toString().local8Bit() << std::endl; -} - -void test4() -{ - int a_set_of_dates_delta[][4] = - { - {-1, 11, 5, 0}, - {-1, 11, 5, 1}, - {-1, 11, 5, 2}, - {2003, 11, 5, 1}, - {2003, 11, 5, -1}, - {2003, 11, 5, 2}, - {2003, 11, 5, 3} - }; - uint i; - std::cout << "Adding years:\n" << std::endl; - for (i = 0 ; i < sizeof(a_set_of_dates_delta)/sizeof(a_set_of_dates_delta[0]) ; i++) - { - test4_unit(a_set_of_dates_delta[i][0], a_set_of_dates_delta[i][1], a_set_of_dates_delta[i][2], a_set_of_dates_delta[i][3]); - } - std::cout << "--------------------" << std::endl; -} - -void test5_unit(int y, int m, int d, const char *qformat, const char *eformat) -{ - TQDate q(y, m, d); - ExtDate e(y, m, d); - - if ( TQString(qformat) == "" ) - std::cout << eformat << " : " << e.toString().local8Bit() << " :: " - << qformat << " : " << q.toString().local8Bit() << std::endl; - else - std::cout << eformat << " : " << e.toString(eformat).local8Bit() << " :: " - << qformat << " : " << q.toString(qformat).local8Bit() << std::endl; -} - -void test5() -{ - const char *q_set_of_formats[7] = - { - "d.M.yy", - "dd.MM.yy", - "ddd.MMM.yy", - "ddd dd.MMM.yy", - "dddd.MMMM.yy", - ">dd.M.yyyy<", - "" - }; - const char *e_set_of_formats[7] = - { - "%e.%n.%y", - "%d.%m.%y", - "%d.%b.%y", - "%a %d.%b.%y", - "%A.%B.%y", - ">%d.%n.%Y<", - "" - }; - - uint i; - std::cout << "Date.toString(\"...\")" << std::endl; - std::cout << "Ext Format : ExtDate :: Q Format : TQDate\n" << std::endl; - - for (i = 0 ; i < sizeof(q_set_of_formats)/sizeof(q_set_of_formats[0]) ; i++) - { - test5_unit(2003, 11, 5, q_set_of_formats[i], e_set_of_formats[i]); - } - std::cout << "--------------------" << std::endl; -} - -void test6_unit(int y, int m, int d) -{ - std::cout << d << "/" << m << "/" << y << " :: " - << ( ExtDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << " : " - << ( TQDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << std::endl; -} - -void test6() -{ - int a_set_of_dates[][3] = - { - {-1, 11, 5}, - {-1, 11, 5}, - {-1, 11, 5}, - {2003, 11, 5}, - {2003, -1, 5}, - {2003, 0, 5}, - {2003, 12, 5}, - {2003, 13, 5}, - {2003, 11, -2}, - {2003, 11, 0}, - {2003, 11, 40}, - {2004, 2, 28}, - {2004, 2, 29}, - {2004, 2, 30}, - {2003, 2, 28}, - {2003, 2, 29}, - {2003, 2, 30} - }; - uint i; - std::cout << "Date.isValid()" << std::endl; - std::cout << "d/m/y :: ExtDate.isValid() : TQDate.isValid()\n" << std::endl; - - for (i = 0 ; i < sizeof(a_set_of_dates)/sizeof(a_set_of_dates[0]) ; i++) - { - test6_unit(a_set_of_dates[i][0], a_set_of_dates[i][1], a_set_of_dates[i][2]); - } - std::cout << "--------------------" << std::endl; -} - -void test7() -{ - std::cout << "Express the current date:\n" << std::endl; - TQDate q = TQDate::tqcurrentDate(TQt::LocalTime); - ExtDate e = ExtDate::tqcurrentDate(TQt::TimeSpec(TQt::LocalTime)); - std::cout << "TQt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : " - << q.toString().local8Bit() << std::endl; - q = TQDate::tqcurrentDate(TQt::UTC); - e = ExtDate::tqcurrentDate(TQt::UTC); - std::cout << "TQt::UTC :: ExtDate : " << e.toString().local8Bit() << " TQDate : " - << q.toString().local8Bit() << std::endl; - q = TQDate::tqcurrentDate(); - e = ExtDate::tqcurrentDate(); - std::cout << " :: ExtDate : " << e.toString().local8Bit() << " TQDate : " - << q.toString().local8Bit() << std::endl; - std::cout << "--------------------" << std::endl; -} - -void test8() { - std::cout << "Set dates using days 1-32 for Jan and Feb (some will be invalid): \n" << std::endl; - std::cout << " TQDate : ExtDate" << std::endl; - - for ( uint m=1; m<=2; ++m ) { - for ( uint d=1; d<=32; ++d ) { - - TQDate test1( 2004, m, d ); - ExtDate test2( 2004, m, d ); - std::cout << test1.toString( "ddd dd.MMM.yy" ).local8Bit() << " : " - << test2.toString( "%a %d.%b.%y" ).local8Bit() << std::endl; - } - } - - std::cout << "--------------------" << std::endl; -} - -void test9() { - std::cout << "TQDateTime : ExtDateTime: \n" << std::endl; - TQDateTime q = TQDateTime::tqcurrentDateTime(); - ExtDateTime e = ExtDateTime::tqcurrentDateTime(); - - std::cout << q.toString().local8Bit() << " : " << e.toString().local8Bit() << std::endl; - std::cout << "--------------------" << std::endl; -} - -int main(int argc, char *argv[]) -{ - test1(); - test2(); - test3(); - test4(); - test5(); - test6(); - test7(); - test8(); - test9(); - exit(0); -} - diff --git a/libkdeedu/extdate/testwidget.cpp b/libkdeedu/extdate/testwidget.cpp deleted file mode 100644 index a6489cce..00000000 --- a/libkdeedu/extdate/testwidget.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/*************************************************************************** - testwidget.h - description - ------------------- - begin : Sun Apr 11 2004 - copyright : (C) 2004 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#include -#include -#include -#include -#include - -#include "extdatepicker.h" -#include "extdatewidget.h" -#include "testwidget.h" - -TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : KMainWindow( p, name ) { - TQWidget *w = new TQWidget(this); - - glay = new TQGridLayout(w, 3, 2); - - TQLabel *kdpLabel = new TQLabel( TQString("KDatePicker"), w ); - TQLabel *edpLabel = new TQLabel( TQString("ExtDatePicker"), w ); - kdp = new KDatePicker(w); - edp = new ExtDatePicker(w); - kdpEdit = new KLineEdit(w); - kdpEdit->setReadOnly( TRUE ); - edpEdit = new KLineEdit(w); - edpEdit->setReadOnly( TRUE ); - - kdw = new KDateWidget( TQDate::tqcurrentDate(), w ); - edw = new ExtDateWidget( ExtDate::tqcurrentDate(), w ); - - glay->addWidget( kdpLabel, 0, 0 ); - glay->addWidget( edpLabel, 0, 1 ); - glay->addWidget( kdp, 1, 0 ); - glay->addWidget( edp, 1, 1 ); - glay->addWidget( kdpEdit, 2, 0 ); - glay->addWidget( edpEdit, 2, 1 ); - glay->addWidget( kdw, 3, 0 ); - glay->addWidget( edw, 3, 1 ); - - setCentralWidget(w); - - connect( kdp, TQT_SIGNAL( dateChanged(TQDate) ), this, TQT_SLOT( slotKDateChanged(TQDate) ) ); - connect( edp, TQT_SIGNAL( dateChanged(const ExtDate&) ), this, TQT_SLOT( slotExtDateChanged(const ExtDate&) ) ); -} - -void TestWidget::slotKDateChanged(TQDate d) { - kdpEdit->setText( d.toString() ); -} - -void TestWidget::slotExtDateChanged(const ExtDate &d) { - edpEdit->setText( d.toString() ); -} - -#include "testwidget.moc" diff --git a/libkdeedu/extdate/testwidget.h b/libkdeedu/extdate/testwidget.h deleted file mode 100644 index a6ced942..00000000 --- a/libkdeedu/extdate/testwidget.h +++ /dev/null @@ -1,52 +0,0 @@ -/*************************************************************************** - testwidget.cpp - description - ------------------- - begin : Sun Apr 11 2004 - copyright : (C) 2004 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#ifndef TESTWIDGET_H -#define TESTWIDGET_H - -#include - -class KDatePicker; -class KLineEdit; -class KDateWidget; -class ExtDatePicker; -class ExtDateWidget; -class TQGridLayout; -class TQDate; -class ExtDate; - -class TestWidget : public KMainWindow { - Q_OBJECT - TQ_OBJECT - public: - TestWidget( TQWidget *parent, const char *name ); - ~TestWidget() {} - - public slots: - void slotKDateChanged(TQDate); - void slotExtDateChanged(const ExtDate&); - - private: - TQGridLayout *glay; - KDatePicker *kdp; - ExtDatePicker *edp; - ExtDateWidget *edw; - KDateWidget *kdw; - KLineEdit *kdpEdit, *edpEdit; -}; - -#endif //ifndef TESTWIDGET_H diff --git a/libkdeedu/ideas/README b/libkdeedu/ideas/README deleted file mode 100644 index a9277dd9..00000000 --- a/libkdeedu/ideas/README +++ /dev/null @@ -1,10 +0,0 @@ -$Id$ - -This directory is about the coming kde edu libraries. - -Approved issues are located in "TODO". - -"Unofficial" and unsorted items go into the subdirectory "unsorted". -- Select a file describing your topic or create an appropriate new one. -- Write it there and add your name/email/date for in case of questions. - diff --git a/libkdeedu/ideas/TODO b/libkdeedu/ideas/TODO deleted file mode 100644 index c127573e..00000000 --- a/libkdeedu/ideas/TODO +++ /dev/null @@ -1,3 +0,0 @@ -$Id$ - -This file describes the roadmap for the kde edu libraries. diff --git a/libkdeedu/kdeeducore/Makefile.am b/libkdeedu/kdeeducore/Makefile.am deleted file mode 100644 index 70907966..00000000 --- a/libkdeedu/kdeeducore/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDES= $(all_includes) -# there's nothing in tests for the moment, so I'm removing it from the compilation -#SUBDIRS = . tests -SUBDIRS = . - -lib_LTLIBRARIES = libtdeeducore.la - -libtdeeducore_la_SOURCES = keduvocdata.cpp -libtdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 - -libtdeeducode_includedir = $(includedir)/libtdeedu -libtdeeducode_include_HEADERS = keduvocdata.h - -libtdeeducore_la_LIBADD = $(LIB_TDECORE) - -METASOURCES = AUTO - diff --git a/libkdeedu/kdeeducore/kdeeducore.kdevprj b/libkdeedu/kdeeducore/kdeeducore.kdevprj deleted file mode 100644 index 5cd1dc62..00000000 --- a/libkdeedu/kdeeducore/kdeeducore.kdevprj +++ /dev/null @@ -1,84 +0,0 @@ -[./Makefile.am] -files=./tdeeducore.kdevprj, -sub_dirs= -type=normal - -[./tdeeducore.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=tdeeducore -cflags= -cppflags= -cxxflags=\s-O0 -ldadd= -ldflags=\s -libtool_dir= -path_to_bin_program=. - -[General] -author=earnold -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s -dir_where_make_will_be_called= -email=earnold@venus -kdevprj_version=1.3 -lfv_open_groups= -make_options=\s-j1 all\s -makefiles=./Makefile.am,Makefile.am,tests/Makefile.am -modifyMakefiles=false -project_name=tdeeducore -project_type=normal_empty -short_info= -sub_dir= -version=1.0 -version_control=CVS -workspace=1 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Others - -[Makefile.am] -dist=true -files=Makefile.am,kedudata.cpp,kedudata.h -install=false -install_location= -sub_dirs=tests -type=static_library - -[kedudata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kedudata.h] -dist=true -install=false -install_location= -type=HEADER - -[tests/Makefile.am] -dist=true -files=tests/loader.cpp,tests/Makefile.am -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=tests -sub_dirs= -type=DATA - -[tests/loader.cpp] -dist=true -install=false -install_location= -type=SOURCE diff --git a/libkdeedu/kdeeducore/keduvocdata.cpp b/libkdeedu/kdeeducore/keduvocdata.cpp deleted file mode 100644 index ca289f7d..00000000 --- a/libkdeedu/kdeeducore/keduvocdata.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* This file is part of the KDE Edu Library - Copyright (C) 2002 Scott Wheeler - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "keduvocdata.h" - -#include - -#include - -//////////////////////////////////////////////////////////////////////////////// -// class KEduVocDataItem -//////////////////////////////////////////////////////////////////////////////// - -// public methods - -KEduVocDataItem::KEduVocDataItem() -{ - -} - -KEduVocDataItem::KEduVocDataItem(TQDomElement &entry) -{ - domElement = entry; -} - -KEduVocDataItem::~KEduVocDataItem() -{ - -} - -TQString KEduVocDataItem::originalText() const -{ - return getText("o"); -} - -TQString KEduVocDataItem::translatedText() const -{ - return getText("t"); -} - -// protected methods - -TQString KEduVocDataItem::getText(const TQString &tagName) const -{ - if(!domElement.isNull()) { - - TQDomNodeList list = domElement.elementsByTagName(tagName); - - if(list.count() > 0) { - - TQDomElement element = list.item(0).toElement(); - - if(!element.isNull()) { - return element.text(); - } - else - return TQString(); - } - else - return TQString(); - } - else - return TQString(); -} - -//////////////////////////////////////////////////////////////////////////////// -// class KEduVocData -//////////////////////////////////////////////////////////////////////////////// - -// public static methods - -KEduVocDataItemList KEduVocData::parse(const TQString &fileName) -{ - KEduVocDataItemList list; - - TQDomDocument document; - TQFile file(fileName); - document.setContent(&file); - - TQDomNodeList entries = document.elementsByTagName("e"); - - // loop through the "e" (entry) tags looking for data - for(uint i = 0 ; i < entries.count() ; i++) { - - // get an entry to operate on - TQDomElement entry = entries.item(i).toElement(); - - // if the "node" is in fact an element -- i.e. not null - if(!entry.isNull()) { - KEduVocDataItem item(entry); - list.append(item); - } - } - - return list; -} diff --git a/libkdeedu/kdeeducore/keduvocdata.h b/libkdeedu/kdeeducore/keduvocdata.h deleted file mode 100644 index b8ac6676..00000000 --- a/libkdeedu/kdeeducore/keduvocdata.h +++ /dev/null @@ -1,51 +0,0 @@ -/* This file is part of the KDE Edu Library - Copyright (C) 2002 Scott Wheeler - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KEDUVOCDATA_H -#define KEDUVOCDATA_H - -#include -#include -#include - -class KDE_EXPORT KEduVocDataItem -{ -public: - KEduVocDataItem(); - KEduVocDataItem(TQDomElement &entry); - virtual ~KEduVocDataItem(); - - TQString originalText() const; - TQString translatedText() const; - -protected: - TQString getText(const TQString &tagName) const; - -private: - TQDomElement domElement; -}; - -typedef TQValueList KEduVocDataItemList; - -class KDE_EXPORT KEduVocData -{ -public: - static KEduVocDataItemList parse(const TQString &fileName); -}; - -#endif // KEDUVOCDATA_H diff --git a/libkdeedu/kdeeducore/tests/Makefile.am b/libkdeedu/kdeeducore/tests/Makefile.am deleted file mode 100644 index df1a67b8..00000000 --- a/libkdeedu/kdeeducore/tests/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS = . -INCLUDES = -I. -I$(top_srcdir)/tdeeducore $(all_includes) - -check_PROGRAMS = loader - -#all: check - -loader_SOURCES = loader.cpp -loader_LDFLAGS = $(all_libraries) -loader_LDADD = ../libtdeeducore.la diff --git a/libkdeedu/kdeeducore/tests/loader.cpp b/libkdeedu/kdeeducore/tests/loader.cpp deleted file mode 100644 index 8d793ca4..00000000 --- a/libkdeedu/kdeeducore/tests/loader.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -int main (void) -{ - - - return 0; -} diff --git a/libkdeedu/kdeeduplot/Makefile.am b/libkdeedu/kdeeduplot/Makefile.am deleted file mode 100644 index 21b84f2a..00000000 --- a/libkdeedu/kdeeduplot/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES= $(all_includes) -SUBDIRS = . - -lib_LTLIBRARIES = libtdeeduplot.la - -libtdeeduplotincludedir = $(includedir)/libtdeedu -libtdeeduplotinclude_HEADERS = kplotobject.h kplotaxis.h kplotwidget.h - -libtdeeduplot_la_SOURCES = kplotobject.cpp kplotaxis.cpp kplotwidget.cpp - -libtdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -libtdeeduplot_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) - -METASOURCES = AUTO - diff --git a/libkdeedu/kdeeduplot/README b/libkdeedu/kdeeduplot/README deleted file mode 100644 index ab695f9a..00000000 --- a/libkdeedu/kdeeduplot/README +++ /dev/null @@ -1,23 +0,0 @@ -This library provides KPlotWidget and KPlotObject classes. - -KPlotWidget is a QWidget-derived class that provides a virtual baseclass -for easy data-plotting. The idea behind KPlotWidget is that you only have -to specify information in "data units"; i.e., the natural units of the -data being plotted. KPlotWidget automatically converts everything -to screen pixel units. - -KPlotWidget draws X and Y axes with tickmarks and tick labels. It -automatically determines how many tickmarks to use and where they should -be, based on the data limits specified for the plot. You change the limits -by calling setLimits( double x1, double x2, double y1, double y2 ), and -then calling updateTickmarks() to recompute the positions of tickmarks -and ticklabels. - -Data to be plotted are stored using the KPlotObject class. KPlotObject -consists of a QPtrList of DPoints, each specifying the X,Y coordinates -of a data point (DPoint is like QPoint, but the X and Y values are doubles -instead of ints). KPlotObject also specifies the "type" of data to be -plotted (POINTS or CURVE or POLYGON or LABEL). - -Jason Harris -kstars@30doradus.org diff --git a/libkdeedu/kdeeduplot/kplotaxis.cpp b/libkdeedu/kdeeduplot/kplotaxis.cpp deleted file mode 100644 index 69af4673..00000000 --- a/libkdeedu/kdeeduplot/kplotaxis.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/*************************************************************************** - kplotaxis.cpp - An axis for the plot widget - ------------------- - begin : 16 June 2005 - copyright : (C) 2005 by Andreas Nicolai - email : Andreas.Nicolai@gmx.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#include -#include -#include -#include "kplotaxis.h" - -KPlotAxis::KPlotAxis() : m_visible(true), m_labelFieldWidth(0), m_labelFmt('g'), - m_labelPrec(2) -{ -} - -KPlotAxis::KPlotAxis(const TQString& label) : m_visible(true), m_label(label), - m_labelFieldWidth(0), m_labelFmt('g'), m_labelPrec(2) -{ -} - diff --git a/libkdeedu/kdeeduplot/kplotaxis.h b/libkdeedu/kdeeduplot/kplotaxis.h deleted file mode 100644 index 3209b18c..00000000 --- a/libkdeedu/kdeeduplot/kplotaxis.h +++ /dev/null @@ -1,86 +0,0 @@ -/*************************************************************************** - kplotaxis.h - An axis for the plot widget - ------------------- - begin : 16 June 2005 - copyright : (C) 2005 by Andreas Nicolai - email : Andreas.Nicolai@gmx.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#ifndef KPLOTAXIS_H -#define KPLOTAXIS_H - -#include - -#include - -/**class KPlotAxis - *@short Contains all data for drawing an axis including format specification axis labels. - *@author Andreas Nicolai - *@version 1.0 - */ -class KDE_EXPORT KPlotAxis { -public: - - /**@short Default constructor, creates a default axis. */ - KPlotAxis(); - - /**@short Constructor, constructs a labeled axis. */ - KPlotAxis(const TQString& label); - - /**@short Destructor. */ - virtual ~KPlotAxis() {} - - /**@short Returns whether the axis is visible or not. */ - virtual bool isVisible() const { return m_visible; } - - /**@short Sets the "visible" property of the axis. */ - virtual void setVisible(bool visible) { m_visible = visible; } - - /**@short Shows the axis (axis will be shown at next update of plot widget). */ - virtual void show() { m_visible = true; } - - /**@short Hides the axis (axis will be hidden at next update of plot widget). */ - virtual void hide() { m_visible = false; } - - /**@short Sets the axis label. - *@param label A short string describing the data plotted on the axis. - *Set the label to an empty string to omit the axis label. - */ - virtual void setLabel( const TQString& label ) { m_label = label; } - - /**@short Returns the axis label. */ - virtual TQString label() const { return m_label; } - - /**@short Set the number format for the tick labels, see TQString::arg() for - description of arguments. - */ - virtual void setLabelFormat(int fieldWidth, char fmt = 'g', int prec=-1) { - m_labelFieldWidth = fieldWidth; m_labelFmt = fmt; m_labelPrec = prec; } - - /**@short Returns the field width of the tick labels. */ - virtual int labelFieldWidth() const { return m_labelFieldWidth; } - - /**@short Returns the number format of the tick labels. */ - virtual char labelFmt() const { return m_labelFmt; } - - /**@short Returns the number precision of the tick labels. */ - virtual int labelPrec() const { return m_labelPrec; } - -private: - bool m_visible; ///< Property "visible" defines if Axis is drawn or not. - TQString m_label; ///< The label of the axis. - int m_labelFieldWidth; ///< Field width for number labels, see TQString::arg(). - char m_labelFmt; ///< Number format for number labels, see TQString::arg(). - int m_labelPrec; ///< Number precision for number labels, see TQString::arg(). -}; - -#endif // KPLOTAXIS_H diff --git a/libkdeedu/kdeeduplot/kplotobject.cpp b/libkdeedu/kdeeduplot/kplotobject.cpp deleted file mode 100644 index b5aaf8d8..00000000 --- a/libkdeedu/kdeeduplot/kplotobject.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/*************************************************************************** - kplotobject.cpp - A list of points to be plotted - ------------------- - begin : Sun 18 May 2003 - copyright : (C) 2003 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#include -#include -#include "kplotobject.h" - -KPlotObject::KPlotObject() { - KPlotObject( "", "white", POINTS ); -} - -KPlotObject::KPlotObject( const TQString &n, const TQString &c, PTYPE t, unsigned int s, unsigned int p ) { - //We use the set functions because they may include data validation - setName( n ); - setColor( c ); - setType( t ); - setSize( s ); - setParam( p ); - - pList.setAutoDelete( true ); -} - -KPlotObject::~KPlotObject() -{ -} - -void KPlotObject::removePoint( unsigned int index ) { - if ( index > pList.count() - 1 ) { - kdWarning() << "Ignoring attempt to remove non-existent plot object" << endl; - return; - } - - pList.remove( index ); -} - diff --git a/libkdeedu/kdeeduplot/kplotobject.h b/libkdeedu/kdeeduplot/kplotobject.h deleted file mode 100644 index f1074cb6..00000000 --- a/libkdeedu/kdeeduplot/kplotobject.h +++ /dev/null @@ -1,205 +0,0 @@ -/*************************************************************************** - kplotobject.h - A list of points to be plotted - ------------------- - begin : Sun 18 May 2003 - copyright : (C) 2003 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#ifndef KPLOTOBJECT_H -#define KPLOTOBJECT_H - - -class TQString; -class TQPainter; - -#include - -/**class DRect - *@short equivalent of TQRect with double x,y coordinates - *@author Jason Harris - *@version 1.0 - */ -class KDE_EXPORT DRect { -public: - DRect() { DRect( 0.0, 0.0, 1.0, 1.0 ); } - DRect( double x, double y, double w, double h ) { X = x; Y = y; W = w; H = h; } - ~DRect() {} - - double x() const { return X; } - double y() const { return Y; } - double x2() const { return X + W; } - double y2() const { return Y + H; } - double width() const { return W; } - double height() const { return H; } - - void setX( double x ) { X = x; } - void setY( double y ) { Y = y; } - void setWidth( double w ) { W = w; } - void setHeight( double h ) { H = h; } - -private: - double X,Y,W,H; -}; - -/**class DPoint - *@short equivalent of TQPoint with double x,y coordinates - *@author Jason Harris - *@version 1.0 - */ -class KDE_EXPORT DPoint { -public: - DPoint() { DPoint( 0.0, 0.0 ); } - DPoint( double x, double y ) { setX( x ); setY( y ); } - ~DPoint() {} - - double x() const { return X; } - double y() const { return Y; } - - TQPoint qpoint( TQRect pb, DRect db ) { - int px = pb.left() + int( pb.width()*( x() - db.x() )/db.width() ); - int py = pb.top() + int( pb.height()*( db.y2() - y() )/db.height() ); - return TQPoint( px, py ); - } - - void setX( double x ) { X = x; } - void setY( double y ) { Y = y; } - -private: - double X, Y; -}; - -/**@class KPlotObject - *@short Encapsulates an object to be plotted in a KPlotWidget. - *@author Jason Harris - *@version 1.0 - *Each KPlotObject consists of a list of TQPoints, an object type, a color, a size, - *and a TQString name. An additional integer (param) specifies something further - *about the object's appearance, depending on its type. There is a draw function - *for plotting the object on a KPlotWidget's TQPainter. - */ -class KDE_EXPORT KPlotObject{ -public: -/**@enum PTYPE - *The Type classification of the KPlotObject - */ - enum PTYPE { POINTS=0, CURVE=1, LABEL=2, POLYGON=3, UNKNOWN_TYPE }; - -/**@enum PPARAM - *Parameter specifying the kind of points - */ - enum PPARAM { DOT=0, CIRCLE=1, SQUARE=2, LETTER=3, UNKNOWN_POINT }; - -/**@enum CPARAM - *Parameter specifying the kind of line. These are numerically equal to - *the TQt::PenStyle enum values. - */ - enum CPARAM { NO_LINE=0, SOLID=1, DASHED=2, DOTTED=3, DASHDOTTED=4, DASHDOTDOTTED=5, UNKNOWN_CURVE }; - -/**Default constructor. Create a POINTS-type object with an empty list of points. - */ - KPlotObject(); - -/**Constructor. Create a KPlotObject according to the arguments. - */ - KPlotObject( const TQString &name, const TQString &color, PTYPE otype, unsigned int size=2, unsigned int param=0 ); - -/**Destructor (empty) - */ - ~KPlotObject(); - -/**@return the KPlotObject's Name - */ - TQString name() const { return Name; } - -/**@short set the KPlotObject's Name - *@param n the new name - */ - void setName( const TQString &n ) { Name = n; } - -/**@return the KPlotObject's Color - */ - TQString color() const { return Color; } - -/**@short set the KPlotObject's Color - *@param c the new color - */ - void setColor( const TQString &c ) { Color = c; } - -/**@return the KPlotObject's Type - */ - PTYPE type() const { return Type; } - -/**@short set the KPlotObject's Type - *@param t the new type - */ - void setType( PTYPE t ) { Type = t; } - -/**@return the KPlotObject's Size - */ - unsigned int size() const { return Size; } - -/**@short set the KPlotObject's Size - *@param s the new size - */ - void setSize( unsigned int s ) { Size = s; } - -/**@return the KPlotObject's type-specific Parameter - *Parameter is an unsigned int because it can either be a PPARAM or a CPARAM enum. - */ - unsigned int param() const { return Parameter; } - -/**@short set the KPlotObject's type-specific Parameter - *@param p the new parameter - *Parameter is an unsigned int because it can either be a PPARAM or a CPARAM enum. - */ - void setParam( unsigned int p ) { Parameter = p; } - -/**@return a pointer to the DPoint at position i - *@param i the index of the desired point. - */ - DPoint* point( unsigned int i ) { return pList.at(i); } - - TQPtrList* points() { return &pList; } - -/**@short Add a point to the object's list. - *@param p the DPoint to add. - */ - void addPoint( const DPoint &p ) { pList.append( new DPoint( p.x(), p.y() ) ); } - -/**@short Add a point to the object's list. This is an overloaded function, - *provided for convenience. It behaves essentially like the above function. - *@param p pointer to the DPoint to add. - */ - void addPoint( DPoint *p ) { pList.append( p ); } - -/**@short remove the TQPoint at position index from the list of points - *@param index the index of the point to be removed. - */ - void removePoint( unsigned int index ); - -/**@return the number of TQPoints currently in the list - */ - unsigned int count() const { return pList.count(); } - -/**@short clear the Object's points list - */ - void clearPoints() { pList.clear(); } - -private: - TQPtrList pList; - PTYPE Type; - unsigned int Size, Parameter; - TQString Color, Name; -}; - -#endif diff --git a/libkdeedu/kdeeduplot/kplotwidget.cpp b/libkdeedu/kdeeduplot/kplotwidget.cpp deleted file mode 100644 index 5f13de6e..00000000 --- a/libkdeedu/kdeeduplot/kplotwidget.cpp +++ /dev/null @@ -1,405 +0,0 @@ -/*************************************************************************** - kplotwidget.cpp - A widget for plotting in KStars - ------------------- - begin : Sun 18 May 2003 - copyright : (C) 2003 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#include //for log10(), pow(), modf() -#include -#include -#include - -#include "kplotwidget.h" -#include "kplotwidget.moc" - -KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) - : TQWidget( parent, name, WNoAutoErase ), - dXtick(0.0), dYtick(0.0), - nmajX(0), nminX(0), nmajY(0), nminY(0), - ShowTickMarks( true ), ShowTickLabels( true ), ShowGrid( false ) - { - setBackgroundMode( TQWidget::NoBackground ); - - //set DataRect - setLimits( x1, x2, y1, y2 ); - setDefaultPadding(); - - //Set PixRect (starts at (0,0) because we will translate by leftPadding(), topPadding() ) - PixRect = TQRect( 0, 0, width() - leftPadding() - rightPadding(), - height() - topPadding() - bottomPadding() ); - - buffer = new TQPixmap(); - - //default colors: - setBGColor( TQColor( "black" ) ); - setFGColor( TQColor( "white" ) ); - setGridColor( TQColor( "grey" ) ); - - ObjectList.setAutoDelete( true ); -} - -KPlotWidget::~KPlotWidget() -{ - delete (buffer); -} - -void KPlotWidget::setLimits( double x1, double x2, double y1, double y2 ) { - double XA1, XA2, YA1, YA2; - if (x2resize( width(), height() ); -} - -void KPlotWidget::paintEvent( TQPaintEvent* /* e */ ) { - TQPainter p; - - p.begin( buffer ); - p.fillRect( 0, 0, width(), height(), bgColor() ); - p.translate( leftPadding(), topPadding() ); - - drawObjects( &p ); - drawBox( &p ); - - p.end(); - bitBlt( this, 0, 0, buffer ); -} - -void KPlotWidget::drawObjects( TQPainter *p ) { - for ( KPlotObject *po = ObjectList.first(); po; po = ObjectList.next() ) { - - if ( po->points()->count() ) { - //draw the plot object - p->setPen( TQColor( po->color() ) ); - - switch ( po->type() ) { - case KPlotObject::POINTS : - { - p->setBrush( TQColor( po->color() ) ); - - for ( DPoint *dp = po->points()->first(); dp; dp = po->points()->next() ) { - TQPoint q = dp->qpoint( PixRect, DataRect ); - int x1 = q.x() - po->size()/2; - int y1 = q.y() - po->size()/2; - - switch( po->param() ) { - case KPlotObject::CIRCLE : p->drawEllipse( x1, y1, po->size(), po->size() ); break; - case KPlotObject::SQUARE : p->drawRect( x1, y1, po->size(), po->size() ); break; - case KPlotObject::LETTER : p->drawText( q, po->name().left(1) ); break; - default: p->drawPoint( q ); - } - } - - p->setBrush( TQt::NoBrush ); - break; - } - - case KPlotObject::CURVE : - { - p->setPen( TQPen( TQColor( po->color() ), po->size(), (TQPen::PenStyle)po->param() ) ); - DPoint *dp = po->points()->first(); - p->moveTo( dp->qpoint( PixRect, DataRect ) ); - for ( dp = po->points()->next(); dp; dp = po->points()->next() ) - p->lineTo( dp->qpoint( PixRect, DataRect ) ); - break; - } - - case KPlotObject::LABEL : //draw label centered at point in x, and slightly below point in y. - { - TQPoint q = po->points()->first()->qpoint( PixRect, DataRect ); - p->drawText( q.x()-20, q.y()+6, 40, 10, TQt::AlignCenter | TQt::DontClip, po->name() ); - break; - } - - case KPlotObject::POLYGON : - { - p->setPen( TQPen( TQColor( po->color() ), po->size(), (TQPen::PenStyle)po->param() ) ); - p->setBrush( TQColor( po->color() ) ); - - TQPointArray a( po->count() ); - - unsigned int i=0; - for ( DPoint *dp = po->points()->first(); dp; dp = po->points()->next() ) - a.setPoint( i++, dp->qpoint( PixRect, DataRect ) ); - - p->drawPolygon( a ); - break; - } - - case KPlotObject::UNKNOWN_TYPE : break; - } - } - } -} - -double KPlotWidget::dmod( double a, double b ) { return ( b * ( ( a / b ) - int( a / b ) ) ); } - -void KPlotWidget::drawBox( TQPainter *p ) { - //First, fill in padding region with bgColor() to mask out-of-bounds plot data - p->setPen( bgColor() ); - p->setBrush( bgColor() ); - - //left padding ( don't forget: we have translated by XPADDING, YPADDING ) - p->drawRect( -leftPadding(), -topPadding(), leftPadding(), height() ); - - //right padding - p->drawRect( PixRect.width(), -topPadding(), rightPadding(), height() ); - - //top padding - p->drawRect( 0, -topPadding(), PixRect.width(), topPadding() ); - - //bottom padding - p->drawRect( 0, PixRect.height(), PixRect.width(), bottomPadding() ); - - if ( ShowGrid ) { - //Grid lines are placed at locations of primary axes' major tickmarks - p->setPen( gridColor() ); - - //vertical grid lines - double x0 = x() - dmod( x(), dXtick ); //zeropoint; x(i) is this plus i*dXtick1 - for ( int ix = 0; ix <= nmajX+1; ix++ ) { - int px = int( PixRect.width() * ( (x0 + ix*dXtick - x())/dataWidth() ) ); - p->drawLine( px, 0, px, PixRect.height() ); - } - - //horizontal grid lines - double y0 = y() - dmod( y(), dYtick ); //zeropoint; y(i) is this plus i*mX - for ( int iy = 0; iy <= nmajY+1; iy++ ) { - int py = PixRect.height() - int( PixRect.height() * ( (y0 + iy*dYtick - y())/dataHeight() ) ); - p->drawLine( 0, py, PixRect.width(), py ); - } - } - - p->setPen( fgColor() ); - p->setBrush( TQt::NoBrush ); - - if (BottomAxis.isVisible() || LeftAxis.isVisible()) p->drawRect( PixRect ); //box outline - - if ( ShowTickMarks ) { - //spacing between minor tickmarks (in data units) - double dminX = dXtick/nminX; - double dminY = dYtick/nminY; - - //set small font for tick labels - TQFont f = p->font(); - int s = f.pointSize(); - f.setPointSize( s - 2 ); - p->setFont( f ); - - //--- Draw bottom X Axis ---// - if (BottomAxis.isVisible()) { - // Draw X tickmarks - double x0 = x() - dmod( x(), dXtick ); //zeropoint; tickmark i is this plus i*dXtick (in data units) - if ( x() < 0.0 ) x0 -= dXtick; - - for ( int ix = 0; ix <= nmajX+1; ix++ ) { - //position of tickmark i (in screen units) - int px = int( PixRect.width() * ( (x0 + ix*dXtick - x() )/dataWidth() ) ); - - if ( px > 0 && px < PixRect.width() ) { - p->drawLine( px, PixRect.height() - 2, px, PixRect.height() - BIGTICKSIZE - 2 ); - p->drawLine( px, 0, px, BIGTICKSIZE ); - } - - //tick label - if ( ShowTickLabels ) { - double lab = x0 + ix*dXtick; - if ( fabs(lab)/dXtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - - TQString str = TQString( "%1" ).tqarg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() ); - if ( px > 0 && px < PixRect.width() ) { - TQRect r( px - BIGTICKSIZE, PixRect.height()+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); - } - } - - //draw minor ticks - for ( int j=0; j < nminX; j++ ) { - //position of minor tickmark j (in screen units) - int pmin = int( px + PixRect.width()*j*dminX/dataWidth() ); - - if ( pmin > 0 && pmin < PixRect.width() ) { - p->drawLine( pmin, PixRect.height() - 2, pmin, PixRect.height() - SMALLTICKSIZE - 2 ); - p->drawLine( pmin, 0, pmin, SMALLTICKSIZE ); - } - } - } // end draw X tickmarks - - // Draw X Axis Label - if ( ! BottomAxis.label().isEmpty() ) { - TQRect r( 0, PixRect.height() + 2*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, TQt::AlignCenter, BottomAxis.label() ); - } - - } - - //--- Draw left Y Axis ---// - if (LeftAxis.isVisible()) { - // Draw Y tickmarks - double y0 = y() - dmod( y(), dYtick ); //zeropoint; tickmark i is this plus i*dYtick1 (in data units) - if ( y() < 0.0 ) y0 -= dYtick; - - for ( int iy = 0; iy <= nmajY+1; iy++ ) { - //position of tickmark i (in screen units) - int py = PixRect.height() - int( PixRect.height() * ( (y0 + iy*dYtick - y())/dataHeight() ) ); - if ( py > 0 && py < PixRect.height() ) { - p->drawLine( 0, py, BIGTICKSIZE, py ); - p->drawLine( PixRect.width()-2, py, PixRect.width()-BIGTICKSIZE-2, py ); - } - - //tick label - if ( ShowTickLabels ) { - double lab = y0 + iy*dYtick; - if ( fabs(lab)/dYtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - - TQString str = TQString( "%1" ).tqarg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() ); - if ( py > 0 && py < PixRect.height() ) { - TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); - } - } - - //minor ticks - for ( int j=0; j < nminY; j++ ) { - //position of minor tickmark j (in screen units) - int pmin = int( py - PixRect.height()*j*dminY/dataHeight() ); - if ( pmin > 0 && pmin < PixRect.height() ) { - p->drawLine( 0, pmin, SMALLTICKSIZE, pmin ); - p->drawLine( PixRect.width()-2, pmin, PixRect.width()-SMALLTICKSIZE-2, pmin ); - } - } - } // end draw Y tickmarks - - //Draw Y Axis Label. We need to draw the text sideways. - if ( ! LeftAxis.label().isEmpty() ) { - //store current painter translation/rotation state - p->save(); - - //translate coord sys to left corner of axis label rectangle, then rotate 90 degrees. - p->translate( -3*XPADDING, PixRect.height() ); - p->rotate( -90.0 ); - - TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, TQt::AlignCenter, LeftAxis.label() ); //draw the label, now that we are sideways - - p->restore(); //restore translation/rotation state - } - } - - } //end if ( ShowTickMarks ) - - -} - -int KPlotWidget::leftPadding() const { - if ( LeftPadding >= 0 ) return LeftPadding; - if ( ! LeftAxis.label().isEmpty() && ShowTickLabels ) return 3*XPADDING; - if ( ! LeftAxis.label().isEmpty() || ShowTickLabels ) return 2*XPADDING; - return XPADDING; -} - -int KPlotWidget::rightPadding() const { - if ( RightPadding >= 0 ) return RightPadding; - return XPADDING; -} - -int KPlotWidget::topPadding() const { - if ( TopPadding >= 0 ) return TopPadding; - return YPADDING; -} - -int KPlotWidget::bottomPadding() const { - if ( BottomPadding >= 0 ) return BottomPadding; - if ( ! BottomAxis.label().isEmpty() && ShowTickLabels ) return 3*YPADDING; - if ( ! BottomAxis.label().isEmpty() || ShowTickLabels ) return 2*YPADDING; - return YPADDING; -} - diff --git a/libkdeedu/kdeeduplot/kplotwidget.h b/libkdeedu/kdeeduplot/kplotwidget.h deleted file mode 100644 index c886bbaf..00000000 --- a/libkdeedu/kdeeduplot/kplotwidget.h +++ /dev/null @@ -1,264 +0,0 @@ -/*************************************************************************** - kplotwidget.h - A generic data-plotting widget - ------------------- - begin : Sun 18 May 2003 - copyright : (C) 2003 by Jason Harris - email : kstars@30doradus.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#ifndef _KPLOTWIDGET_H_ -#define _KPLOTWIDGET_H_ - -#include -#include "kplotobject.h" -#include "kplotaxis.h" - -#define BIGTICKSIZE 10 -#define SMALLTICKSIZE 4 -#define XPADDING 20 -#define YPADDING 20 - -class TQColor; -class TQPixmap; - -/**@class KPlotWidget - *@short Genric data plotting widget. - *@author Jason Harris - *@version 1.1 - *Widget for drawing plots. Includes adjustable axes (KPlotAxis) with - *tickmarks and labels and a list of KPlotObjects to be drawn. - */ - -class KDE_EXPORT KPlotWidget : public TQWidget { - Q_OBJECT - TQ_OBJECT -public: - /**@short Constructor. Sets the primary x and y limits in data units. - *@param x1 the minimum X value in data units - *@param x2 the maximum X value in data units - *@param y1 the minimum Y value in data units - *@param y2 the maximum Y value in data units - *@param parent the parent widget - *@param name name label for the KPlotWidget - */ - KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); - - /**Destructor (empty) - */ - virtual ~KPlotWidget(); - - /**@short Determine the placement of major and minor tickmarks, - *based on the current Limit settings - */ - virtual void updateTickmarks(); - - /**@short Reset the data limits. - *@param x1 the minimum X value in data units - *@param x2 the maximum X value in data units - *@param y1 the minimum Y value in data units - *@param y2 the maximum Y value in data units - */ - virtual void setLimits( double x1, double x2, double y1, double y2 ); - - /**@return the minimum X value in data units*/ - virtual double x() const { return DataRect.x(); } - - /**@return the maximum X value in data units*/ - virtual double x2() const { return DataRect.x2(); } - - /**@return the minimum Y value in data units*/ - virtual double y() const { return DataRect.y(); } - - /**@return the maximum Y value in data units*/ - virtual double y2() const { return DataRect.y2(); } - - /**@return the width in data units*/ - virtual double dataWidth() const { return DataRect.width(); } - - /**@return the height in data units*/ - virtual double dataHeight() const { return DataRect.height(); } - - /**@short Add an item to the list of KPlotObjects to be plotted. - *@param o pointer to the KPlotObject to be added - */ - virtual void addObject( KPlotObject *o ) { ObjectList.append( o ); } - - /**@short Remove all items from the list of KPlotObjects - */ - virtual void clearObjectList() { ObjectList.clear(); update(); } - - /**@short replace an item in the KPlotObject list. - *@param i the index of th item to be replaced - *@param o pointer to the replacement KPlotObject - */ - virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.replace( i, o ); } - - /**@return the number of KPlotObjects in the list - */ - virtual int objectCount() const { return ObjectList.count(); } - - /**@return a pointer to a specific KPlotObject in the list - *@param i the index of the desired KPlotObject - */ - virtual KPlotObject *object( int i ) { return ObjectList.at(i); } - - /**@return the background color */ - virtual TQColor bgColor() const { return cBackground; } - - /**@return the foreground color */ - virtual TQColor fgColor() const { return cForeground; } - - /**@return the grid color */ - virtual TQColor gridColor() const { return cGrid; } - - /**@short set the background color - *@param bg the new background color - */ - virtual void setBGColor( const TQColor &bg ) { cBackground = bg; setBackgroundColor( bg ); } - - /**@short set the foreground color - *@param fg the new foreground color - */ - virtual void setFGColor( const TQColor &fg ) { cForeground = fg; } - - /**@short set the grid color - *@param gc the new grid color - */ - virtual void setGridColor( const TQColor &gc ) { cGrid = gc; } - - /**@short toggle whether plot axes are drawn. - *@param show if true, axes will be drawn. - *The axes are just a box outline around the plot. - */ - virtual void setShowAxes( bool show ) { BottomAxis.setVisible(show); LeftAxis.setVisible(show); } - /**@short toggle whether tick marks are drawn along the axes. - *@param show if true, tick marks will be drawn. - */ - virtual void setShowTickMarks( bool show ) { ShowTickMarks = show; } - /**@short toggle whether tick labels are drawn at major tickmarks. - *@param show if true, tick labels will be drawn. - */ - virtual void setShowTickLabels( bool show ) { ShowTickLabels = show; } - /**@short toggle whether grid lines are drawn at major tickmarks. - *@param show if true, grid lines will be drawn. - */ - virtual void setShowGrid( bool show ) { ShowGrid = show; } - - /**@short (Deprecated) Sets the X-axis label - *@param xlabel a short string describing the data plotted on the x-axis. - *Set the label to an empty string to omit the axis label. - *This function is deprecated, set the label property in the BottomAxis directly. - */ - virtual void setXAxisLabel( TQString xlabel ) { BottomAxis.setLabel(xlabel); } - /**@short (Deprecated) Sets the Y-axis label - *@param ylabel a short string describing the data plotted on the y-axis. - *Set the label to an empty string to omit the axis label. - *This function is deprecated, set the label property in the LeftAxis directly. - */ - virtual void setYAxisLabel( TQString ylabel ) { LeftAxis.setLabel(ylabel); } - - /**@returns the number of pixels to the left of the plot area. Padding values - *are set to -1 by default; if unchanged, this function will try to guess - *a good value, based on whether ticklabels and/or axis labels are to be drawn. - */ - virtual int leftPadding() const; - /**@returns the number of pixels to the right of the plot area. - *Padding values are set to -1 by default; if unchanged, this function will try to guess - *a good value, based on whether ticklabels and/or axis labels are to be drawn. - */ - virtual int rightPadding() const; - /**@returns the number of pixels above the plot area. - *Padding values are set to -1 by default; if unchanged, this function will try to guess - *a good value, based on whether ticklabels and/or axis labels are to be drawn. - */ - virtual int topPadding() const; - /**@returns the number of pixels below the plot area. - *Padding values are set to -1 by default; if unchanged, this function will try to guess - *a good value, based on whether ticklabels and/or axis labels are to be drawn. - */ - virtual int bottomPadding() const; - - /**@short set the number of pixels to the left of the plot area. - *Set this to -1 to revert to automatic determination of padding values. - */ - virtual void setLeftPadding( int pad ) { LeftPadding = pad; } - /**@short set the number of pixels to the right of the plot area. - *Set this to -1 to revert to automatic determination of padding values. - */ - virtual void setRightPadding( int pad ) { RightPadding = pad; } - /**@short set the number of pixels above the plot area. - *Set this to -1 to revert to automatic determination of padding values. - */ - virtual void setTopPadding( int pad ) { TopPadding = pad; } - /**@short set the number of pixels below the plot area. - *Set this to -1 to revert to automatic determination of padding values. - */ - virtual void setBottomPadding( int pad ) { BottomPadding = pad; } - - /**@short revert all four padding values to be automatically determined. */ - virtual void setDefaultPadding() { LeftPadding = -1; RightPadding = -1; TopPadding = -1; BottomPadding = -1; } - - /**@short The bottom X axis. */ - KPlotAxis BottomAxis; - /**@short The left Y axis. */ - KPlotAxis LeftAxis; - -protected: - /**@short the paint event handler, executed when update() or tqrepaint() is called. - */ - virtual void paintEvent( TQPaintEvent* /* e */ ); - - /**@short the resize event handler, called when the widget is resized. - */ - virtual void resizeEvent( TQResizeEvent* /* e */ ); - - /**@short draws all of the objects onto the widget. Internal use only; one should simply call update() - *to draw the widget with axes and all objects. - *@param p pointer to the painter on which we are drawing - */ - virtual void drawObjects( TQPainter *p ); - - /**@short draws the plot axes and axis labels. Internal use only; one should simply call update() - *to draw the widget with axes and all objects. - *@param p pointer to the painter on which we are drawing - */ - virtual void drawBox( TQPainter *p ); - - /**@short modulus function for double variables. - *For example, dmod( 17.0, 7.0 ) returns 3.0 - *@return the remainder after dividing b into a. - */ - double dmod( double a, double b ); - - //The distance between major tickmarks in data units - double dXtick, dYtick; - //The number of major and minor tickmarks to be plotted in X and Y - int nmajX, nminX, nmajY, nminY; - - //Limits of the plot area in pixel units - TQRect PixRect; - //Limits of the plot area in data units - DRect DataRect; - //List of KPlotObjects - TQPtrList ObjectList; - - //Colors - TQColor cBackground, cForeground, cGrid; - //draw options - bool ShowTickMarks, ShowTickLabels, ShowGrid; - //padding - int LeftPadding, RightPadding, TopPadding, BottomPadding; - - TQPixmap *buffer; -}; - -#endif diff --git a/libkdeedu/kdeeduui/Makefile.am b/libkdeedu/kdeeduui/Makefile.am deleted file mode 100644 index 9ebedbab..00000000 --- a/libkdeedu/kdeeduui/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES= $(all_includes) -SUBDIRS = . tests - -lib_LTLIBRARIES = libtdeeduui.la - -libtdeeduui_la_SOURCES = \ - kedusimpleentrydlg.cpp kedusimpleentrydlgForm.ui tdeeduglossary.cpp - -libtdeeduuiincludedir = $(includedir)/libtdeedu -libtdeeduuiinclude_HEADERS = tdeeduglossary.h - -libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0 -libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) - -METASOURCES = AUTO - diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp deleted file mode 100644 index 1e405abf..00000000 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ /dev/null @@ -1,406 +0,0 @@ -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - -#include "tdeeduglossary.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -Glossary::Glossary() -{ - // setting a generic name for a new glossary - m_name = i18n( "Glossary" ); -} - -Glossary::~Glossary() -{ -} - -bool Glossary::loadLayout( TQDomDocument &Document, const KURL& url ) -{ - TQFile layoutFile( url.path() ); - - if (!layoutFile.exists()) - { - kdDebug() << "no such file: " << layoutFile.name() << endl; - return false; - } - - if (!layoutFile.open(IO_ReadOnly)) - return false; - - ///Check if document is well-formed - if (!Document.setContent(&layoutFile)) - { - kdDebug() << "wrong xml" << endl; - layoutFile.close(); - return false; - } - layoutFile.close(); - - return true; -} - -bool Glossary::isEmpty() const -{ - return m_itemlist.count() == 0; -} - - -Glossary* Glossary::readFromXML( const KURL& url, const TQString& path ) -{ - TQDomDocument doc( "document" ); - - Glossary *glossary = new Glossary(); - - glossary->setPicturePath( path ); - - if ( glossary->loadLayout( doc, url ) ) - { - TQValueList itemList; - itemList = glossary->readItems( doc ); - glossary->setItemlist( itemList ); - glossary->fixImagePath(); - } - - return glossary; -} - -void Glossary::fixImagePath() -{ - kdDebug() << "Glossary::fixImagePath()" << endl; - TQValueList::iterator it = m_itemlist.begin(); - const TQValueList::iterator itEnd = m_itemlist.end(); - TQString path = m_picturepath; - TQString firstpart = "setDesc( ( *it )->desc().replace("[img]", firstpart ) ); - ( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) ); - } -} - -TQValueList Glossary::readItems( TQDomDocument &itemDocument ) -{ - TQValueList list; - - TQDomNodeList itemList; - TQDomNodeList refNodeList; - TQDomElement itemElement; - TQStringList reflist; - - itemList = itemDocument.elementsByTagName( "item" ); - - const uint num = itemList.count(); - for ( uint i = 0; i < num; ++i ) - { - reflist.clear(); - GlossaryItem *item = new GlossaryItem(); - - itemElement = ( const TQDomElement& ) itemList.item( i ).toElement(); - - TQDomNode nameNode = itemElement.namedItem( "name" ); - TQDomNode descNode = itemElement.namedItem( "desc" ); - - TQString picName = itemElement.namedItem( "picture" ).toElement().text(); - TQDomElement refNode = ( const TQDomElement& ) itemElement.namedItem( "references" ).toElement(); - - TQString desc = i18n( descNode.toElement().text().utf8() ); - if ( !picName.isEmpty() ) - desc.prepend("[img]"+picName +"[/img]" ); - - item->setName( i18n( nameNode.toElement( ).text().utf8() ) ); - - item->setDesc( desc.replace("[b]", "" ) ); - item->setDesc( item->desc().replace("[/b]", "" ) ); - item->setDesc( item->desc().replace("[i]", "" ) ); - item->setDesc( item->desc().replace("[/i]", "" ) ); - item->setDesc( item->desc().replace("[sub]", "" ) ); - item->setDesc( item->desc().replace("[/sub]", "" ) ); - item->setDesc( item->desc().replace("[sup]", "" ) ); - item->setDesc( item->desc().replace("[/sup]", "" ) ); - item->setDesc( item->desc().replace("[br]", "
" ) ); - - refNodeList = refNode.elementsByTagName( "refitem" ); - for ( uint it = 0; it < refNodeList.count(); it++ ) - { - reflist << i18n( refNodeList.item( it ).toElement().text().utf8() ); - } - reflist.sort(); - item->setRef( reflist ); - - list.append( item ); - } - - return list; -} - - - -GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name) - : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, name, false ) -{ - //this string will be used for all items. If a backgroundpicture should - //be used call Glossary::setBackgroundPicture(). - m_htmlbasestring = "" ; - - m_folded = folded; - - TQVBoxLayout *vbox = new TQVBoxLayout( plainPage(), 0, KDialog::spacingHint() ); - vbox->activate(); - - TQHBoxLayout *hbox = new TQHBoxLayout( 0L, 0, KDialog::spacingHint() ); - hbox->activate(); - - TQToolButton *clear = new TQToolButton( plainPage() ); - clear->setIconSet( SmallIconSet( "locationbar_erase" ) ); - hbox->addWidget( clear ); - - TQLabel *lbl = new TQLabel( plainPage() ); - lbl->setText( i18n( "Search:" ) ); - hbox->addWidget( lbl ); - - m_search = new KListViewSearchLine( plainPage(), 0, "search-line" ); - hbox->addWidget( m_search ); - vbox->addLayout( hbox ); - setFocusProxy(m_search); - - TQSplitter *vs = new TQSplitter( plainPage() ); - vbox->addWidget( vs ); - - m_glosstree = new KListView( vs, "treeview" ); - m_glosstree->addColumn( "entries" ); - m_glosstree->header()->hide(); - m_glosstree->setFullWidth( true ); - m_glosstree->setRootIsDecorated( true ); - - m_search->setListView( m_glosstree ); - - m_htmlpart = new KHTMLPart( vs, "html-part" ); - - connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * ))); - connect( clear, TQT_SIGNAL(clicked()), m_search, TQT_SLOT(clear())); - - resize( 600, 400 ); -} - -GlossaryDialog::~GlossaryDialog() -{ -} - -void GlossaryDialog::keyPressEvent(TQKeyEvent* e) -{ - if (e->key() == TQt::Key_Return) { - e->ignore(); - } - KDialogBase::keyPressEvent(e); -} - -void GlossaryDialog::displayItem( const KURL& url, const KParts::URLArgs& ) -{ - // using the "host" part of a kurl as reference - TQString myurl = url.host().lower(); - m_search->setText( "" ); - m_search->updateSearch( "" ); - TQListViewItem *found = 0; - TQListViewItemIterator it( m_glosstree ); - TQListViewItem *item; - while ( it.current() ) - { - item = it.current(); - if ( item->text(0).lower() == myurl ) - { - found = item; - break; - } - ++it; - } - if ( found ) - { - m_glosstree->ensureItemVisible( found ); - m_glosstree->setCurrentItem( found ); - slotClicked( found ); - } -} - -void GlossaryDialog::updateTree() -{ - m_glosstree->clear(); - - TQValueList::const_iterator itGl = m_glossaries.begin(); - const TQValueList::const_iterator itGlEnd = m_glossaries.end(); - - for ( ; itGl != itGlEnd ; ++itGl ) - { - TQValueList items = ( *itGl )->itemlist(); - TQValueList::iterator it = items.begin(); - const TQValueList::iterator itEnd = items.end(); - - TQListViewItem *main = new TQListViewItem( m_glosstree, ( *itGl )->name() ); - main->setExpandable( true ); - main->setSelectable( false ); - //XXX TMP!!! - bool foldinsubtrees = m_folded; - - for ( ; it != itEnd ; ++it ) - { - if ( foldinsubtrees ) - { - TQChar thisletter = ( *it )->name().upper()[0]; - TQListViewItem *thisletteritem = findTreeWithLetter( thisletter, main ); - if ( !thisletteritem ) - { - thisletteritem = new TQListViewItem( main, thisletter ); - thisletteritem->setExpandable( true ); - thisletteritem->setSelectable( false ); - } - new TQListViewItem( thisletteritem, ( *it )->name() ); - } - else - new TQListViewItem( main, ( *it )->name() ); - } - main->sort(); - } -} - -void GlossaryDialog::addGlossary( Glossary* newgloss ) -{ - if ( !newgloss ) return; - if ( newgloss->isEmpty() ) return; - m_glossaries.append( newgloss ); - - kdDebug() << "Count of the new glossary: " << newgloss->itemlist().count() << endl; - kdDebug() << "Number of glossaries: " << m_glossaries.count() << endl; - - updateTree(); -} - -TQListViewItem* GlossaryDialog::findTreeWithLetter( const TQChar& l, TQListViewItem* i ) -{ - TQListViewItem *it = i->firstChild(); - while ( it ) - { - if ( it->text(0)[0] == l ) - return it; - it = it->nextSibling(); - } - return 0; -} - -void GlossaryDialog::slotClicked( TQListViewItem *item ) -{ - if ( !item ) - return; - - /** - * The next lines are searching for the correct KnowledgeItem - * in the m_itemList. When it is found the HTML will be - * generated - */ - TQValueList::iterator itGl = m_glossaries.begin(); - const TQValueList::iterator itGlEnd = m_glossaries.end(); - bool found = false; - GlossaryItem *i = 0; - - TQString bg_picture; - - while ( !found && itGl != itGlEnd ) - { - TQValueList items = ( *itGl )->itemlist(); - TQValueList::const_iterator it = items.begin(); - const TQValueList::const_iterator itEnd = items.end(); - while ( !found && it != itEnd ) - { - if ( ( *it )->name() == item->text( 0 ) ) - { - i = *it; - bg_picture = ( *itGl )->backgroundPicture(); - found = true; - } - ++it; - } - ++itGl; - } - if ( found && i ) - { - TQString html; - if ( !bg_picture.isEmpty() ) - { - html = ""); - }else - html = m_htmlbasestring; - - html += i->toHtml() + ""; - m_htmlpart->begin(); - m_htmlpart->write( html ); - - m_htmlpart->end(); - return; - } -} - -void GlossaryDialog::slotClose() -{ - emit closed(); - accept(); -} - -TQString GlossaryItem::toHtml() const -{ - TQString code = "

" + m_name + "

" + m_desc; - - if ( !m_ref.isEmpty() ) - { - TQString refcode = parseReferences(); - code += refcode; - } - return code; -} - -TQString GlossaryItem::parseReferences() const -{ - TQString htmlcode = "

" + i18n( "References" ) + "

"; - - bool first = true; - for ( uint i = 0; i < m_ref.size(); i++ ) - { - if ( !first ) - htmlcode += "
"; - else - first = false; - htmlcode += TQString( "%2" ).tqarg( m_ref[i], m_ref[i] ); - } - - return htmlcode; -} - - -#include "tdeeduglossary.moc" diff --git a/libkdeedu/kdeeduui/kdeeduglossary.h b/libkdeedu/kdeeduui/kdeeduglossary.h deleted file mode 100644 index e5d29ba0..00000000 --- a/libkdeedu/kdeeduui/kdeeduglossary.h +++ /dev/null @@ -1,293 +0,0 @@ -#ifndef KDEEDUGLOSSARY_H -#define KDEEDUGLOSSARY_H -/*************************************************************************** - - copyright : (C) 2005 by Carsten Niehaus - email : cniehaus@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program 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. * - * * - ***************************************************************************/ - - -#include -#include - -class TQChar; -class TQDomDocument; -class TQListViewItem; -class KListView; -class KListViewSearchLine; -class KActionCollection; -class GlossaryItem; - -/** - * @class Glossary - * @author Carsten Niehaus - * - * This class stores all items to be displayed. It also - * has access-methods to the items - */ -class Glossary -{ - public: - Glossary(); - virtual ~Glossary(); - - /** - * add the item @p item to the glossary - */ - void addItem( GlossaryItem* item ){ - m_itemlist.append( item ); - } - - TQValueList itemlist()const{ - return m_itemlist; - } - - /** - * clear the Glossary - */ - void clear(){ - m_itemlist.clear(); - } - - /** - * does this glossary have items? - */ - bool isEmpty() const; - - /** - * Every glossary can have a name. It will be - * set to @p name - */ - void setName( const TQString& name ){ - m_name = name; - } - - /** - * @returns the name of the glossary - */ - TQString name()const{ - return m_name; - } - - /** - * sets the internal list of items to @p list - */ - void setItemlist( TQValueList list ){ - m_itemlist = list; - } - - /** - * Read a glossary from an XML file. - * - * @param url The path of the file to load - * @param path The path of the pictures. Will be used as m_picturepath - * - * @return a pointer to the loaded glossary. Even in case of - * error, this won't return 0 but an empty Glossary. - */ - static Glossary* readFromXML( const KURL& url, const TQString& path = 0 ); - - /** - * Every glossaryitem can show pictures. [img src="foo.png] - * will look for the file foo.png in the path defined be - * @p path - */ - void setPicturePath( const TQString& path ){ - m_picturepath = path; - } - - TQString picturePath()const{ - return m_picturepath; - } - - /** - * defines which picture to use as the background - * of the htmlview. The dialog - * will use the file specifiec by the @p filename - */ - void setBackgroundPicture( const TQString& filename ){ - m_backgroundpicture = filename; - } - - /** - * @return the picuture used as the background in - * this background - */ - TQString backgroundPicture()const{ - return m_backgroundpicture; - } - - private: - /** - * This methods parses the given xml-code. It will extract - * the information of the items and return them as a - * TQValueList - */ - virtual TQValueList readItems( TQDomDocument &itemDocument ); - - TQString m_backgroundpicture; - - /** - * replaces the [img]-pseudocode with valid html. The path where - * the pictures are stored will be used for pictures - */ - void fixImagePath(); - - /** - * the path in which pictures of the glossary will be searched - */ - TQString m_picturepath; - - /** - * Load the tqlayout from an XML file. - * - * @param doc The TQDomDocument which will contain the read XML - * contents. - * @param url The path of the file to load - * - * @return a bool indicating whether the loading of the XML was - * successfull or not - */ - bool loadLayout( TQDomDocument& doc, const KURL& url ); - - TQValueList m_itemlist; - - /** - * the name of the glossary - */ - TQString m_name; -}; - -/** - * @class GlossaryItem - * @author Carsten Niehaus - * - * A GlossaryItem stores the information of the content of - * the item and its name. Furthermore, every item can have - * a number of pictures or references associated to it. - * These are stored as TQStringLists. - */ -class GlossaryItem -{ - public: - GlossaryItem(){} - ~GlossaryItem(){} - - void setName( const TQString& s ){ - m_name = s; - } - - void setDesc( const TQString& s){ - m_desc = s; - } - - void setRef( const TQStringList& s){ - m_ref = s; - } - - void setPictures( const TQString& s ){ - m_pic = s; - } - - TQString name() const { - return m_name; - } - - TQString desc() const { - return m_desc; - } - - TQStringList ref() const { - return m_ref; - } - - TQStringList pictures() const { - return m_pic; - } - - /** - * @return the formated HTML code for current item. - **/ - TQString toHtml() const; - - /** - * This method parses the references. - * @return the HTML code with the references as HTML links - */ - TQString parseReferences() const; - - private: - TQString m_name; - TQString m_desc; - TQStringList m_ref; - TQStringList m_pic; -}; - -/** - * @class GlossaryDialog - * @author Pino Toscano - * @author Carsten Niehaus - */ -class GlossaryDialog : public KDialogBase -{ - Q_OBJECT - TQ_OBJECT - - public: - GlossaryDialog( bool folded = true, TQWidget *parent=0, const char *name=0); - ~GlossaryDialog(); - - void keyPressEvent(TQKeyEvent*); - - /** - * add a new glossary - * - * @param newgloss the new glossary to add - */ - void addGlossary( Glossary* newgloss ); - - private: - TQValueList m_glossaries; - - /** - * if true the items will be displayed folded - */ - bool m_folded; - - void updateTree(); - - KHTMLPart *m_htmlpart; - KListView *m_glosstree; - TQString m_htmlbasestring; - - KActionCollection* m_actionCollection; - - TQListViewItem* findTreeWithLetter( const TQChar&, TQListViewItem* ); - - KListViewSearchLine *m_search; - - private slots: - void slotClicked( TQListViewItem * ); - /** - * The user clicked on a href. Emit the corresponding item - */ - void displayItem( const KURL& url, const KParts::URLArgs& args ); - - protected slots: - virtual void slotClose(); - - signals: - void closed(); -}; - -#endif // KDEEDUGLOSSARY_H - diff --git a/libkdeedu/kdeeduui/kdeeduui.kdevprj b/libkdeedu/kdeeduui/kdeeduui.kdevprj deleted file mode 100644 index 1fa59784..00000000 --- a/libkdeedu/kdeeduui/kdeeduui.kdevprj +++ /dev/null @@ -1,92 +0,0 @@ -[./Makefile.am] -files=./tdeeduui.kdevprj, -sub_dirs= -type=normal - -[./tdeeduui.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=tdeeduui -cflags= -cppflags= -cxxflags=\s-O0 -ldadd= -ldflags=\s \s -libtool_dir= -path_to_bin_program=. - -[General] -author=earnold -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s -dir_where_make_will_be_called=\s -email=earnold@venus -kdevprj_version=1.3 -lfv_open_groups=Others -make_options=\s-j1 all\s -makefiles=./Makefile.am,Makefile.am,tests/Makefile.am -modifyMakefiles=false -project_name=tdeeduui -project_type=normal_empty -short_info= -sub_dir= -version=1.0 -version_control=CVS -workspace=1 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Others - -[Makefile.am] -dist=true -files=Makefile.am,kedusimpleentrydlg.h,kedusimpleentrydlgForm.ui,kedusimpleentrydlg.cpp -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=. -sub_dirs=tests -type=static_library - -[kedusimpleentrydlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kedusimpleentrydlg.h] -dist=true -install=false -install_location= -type=HEADER - -[kedusimpleentrydlgForm.ui] -dist=true -install=false -install_location= -type=SOURCE - -[tests/Makefile.am] -dist=true -files=tests/entrydialogs.cpp,tests/Makefile.am -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=tests -sub_dirs= -type=DATA - -[tests/entrydialogs.cpp] -dist=true -install=false -install_location= -type=SOURCE diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlg.cpp b/libkdeedu/kdeeduui/kedusimpleentrydlg.cpp deleted file mode 100644 index 89f8412c..00000000 --- a/libkdeedu/kdeeduui/kedusimpleentrydlg.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "kedusimpleentrydlg.h" - -#include "kedusimpleentrydlg.moc" diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlg.h b/libkdeedu/kdeeduui/kedusimpleentrydlg.h deleted file mode 100644 index d84fe00c..00000000 --- a/libkdeedu/kdeeduui/kedusimpleentrydlg.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef kedusimpleentrydlg_included -#define kedusimpleentrydlg_included - - -#include "kedusimpleentrydlgForm.h" - -class KEduSimpleEntryDlg : public KEduSimpleEntryDlgForm -{ - Q_OBJECT - TQ_OBJECT - - public: - - - - - -}; - -#endif // kedusimpleentrydlg_included diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui deleted file mode 100644 index 45ab6c3f..00000000 --- a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui +++ /dev/null @@ -1,110 +0,0 @@ - -KEduSimpleEntryDlgForm - - - Simple_entry_dialog - - - - 0 - 0 - 592 - 480 - - - - Simple Entry Dialog - - - - e_original - - - - 40 - 80 - 511 - 40 - - - - - - e_translation - - - - 40 - 180 - 511 - 40 - - - - - - PushButton1 - - - - 50 - 360 - 91 - 41 - - - - &OK - - - - - PushButton1_2 - - - - 460 - 360 - 91 - 41 - - - - C&ancel - - - - - TextLabel1 - - - - 40 - 50 - 171 - 21 - - - - Original: - - - - - TextLabel1_2 - - - - 40 - 150 - 171 - 21 - - - - Translation: - - - - - diff --git a/libkdeedu/kdeeduui/tests/Makefile.am b/libkdeedu/kdeeduui/tests/Makefile.am deleted file mode 100644 index 6fcb251b..00000000 --- a/libkdeedu/kdeeduui/tests/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS = . -INCLUDES = -I. -I$(top_srcdir)/tdeeduui $(all_includes) - -check_PROGRAMS = entrydialogs - -#all: check - -entrydialogs_SOURCES = entrydialogs.cpp -entrydialogs_LDADD = ../libtdeeduui.la -entrydialogs_LDFLAGS = $(all_libraries) - diff --git a/libkdeedu/kdeeduui/tests/entrydialogs.cpp b/libkdeedu/kdeeduui/tests/entrydialogs.cpp deleted file mode 100644 index 781b32e1..00000000 --- a/libkdeedu/kdeeduui/tests/entrydialogs.cpp +++ /dev/null @@ -1,6 +0,0 @@ - -int main() -{ - - return 0; -} \ No newline at end of file -- cgit v1.2.1