author | eilers <eilers> | 2003-08-01 14:19:44 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 14:19:44 (UTC) |
commit | 34991bac7d96b1c17601be6a5607819342571e0c (patch) (unidiff) | |
tree | 65d0bc2db22bcc1dc1b5eafdafd53b9cb08a6395 /core/pim/datebook/repeatentry.cpp | |
parent | 5346424fc26bde232a15aa34fbb720f86218b26f (diff) | |
download | opie-34991bac7d96b1c17601be6a5607819342571e0c.zip opie-34991bac7d96b1c17601be6a5607819342571e0c.tar.gz opie-34991bac7d96b1c17601be6a5607819342571e0c.tar.bz2 |
Merging changes from BRANCH_1_0 to HEAD..
Diffstat (limited to 'core/pim/datebook/repeatentry.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/repeatentry.cpp | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp index 5637c4d..b1a162d 100644 --- a/core/pim/datebook/repeatentry.cpp +++ b/core/pim/datebook/repeatentry.cpp | |||
@@ -30,25 +30,42 @@ | |||
30 | #include <qspinbox.h> | 30 | #include <qspinbox.h> |
31 | #include <qtoolbutton.h> | 31 | #include <qtoolbutton.h> |
32 | 32 | ||
33 | #include <time.h> | 33 | #include <time.h> |
34 | 34 | ||
35 | // Global Templates for use in setting up the repeat label... | 35 | // Global Templates for use in setting up the repeat label... |
36 | const QString strDayTemplate = QObject::tr("Every"); | 36 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke |
37 | const QString strYearTemplate = QObject::tr("%1 %2 every "); | 37 | namespace { |
38 | const QString strMonthDateTemplate = QObject::tr("The %1 every "); | 38 | QString strDayTemplate; |
39 | const QString strMonthDayTemplate = QObject::tr("The %1 %1 of every"); | 39 | QString strYearTemplate; |
40 | const QString strWeekTemplate = QObject::tr("Every "); | 40 | QString strMonthDateTemplate; |
41 | const QString dayLabel[] = { QObject::tr("Monday"), | 41 | QString strMonthDayTemplate; |
42 | QObject::tr("Tuesday"), | 42 | QString strWeekTemplate; |
43 | QObject::tr("Wednesday"), | 43 | QString dayLabel[7]; |
44 | QObject::tr("Thursday"), | 44 | } |
45 | QObject::tr("Friday"), | 45 | |
46 | QObject::tr("Saturday"), | 46 | /* |
47 | QObject::tr("Sunday") }; | 47 | * static linkage to not polute the symbol table... |
48 | 48 | * The problem is that const and static linkage are resolved prior to installing a translator | |
49 | * leading to that the above strings are translted but to the original we delay the init of these strings... | ||
50 | * -zecke | ||
51 | */ | ||
52 | static void fillStrings() { | ||
53 | strDayTemplate = QObject::tr("Every"); | ||
54 | strYearTemplate = QObject::tr("%1 %2 every "); | ||
55 | strMonthDateTemplate = QObject::tr("The %1 every "); | ||
56 | strMonthDayTemplate = QObject::tr("The %1 %1 of every"); | ||
57 | strWeekTemplate = QObject::tr("Every "); | ||
58 | dayLabel[0] = QObject::tr("Monday"); | ||
59 | dayLabel[1] = QObject::tr("Tuesday"); | ||
60 | dayLabel[2] = QObject::tr("Wednesday"); | ||
61 | dayLabel[3] = QObject::tr("Thursday"); | ||
62 | dayLabel[4] = QObject::tr("Friday"); | ||
63 | dayLabel[5] = QObject::tr("Saturday"); | ||
64 | dayLabel[6] = QObject::tr("Sunday"); | ||
65 | } | ||
49 | 66 | ||
50 | static QString numberPlacing( int x );// return the proper word format for | 67 | static QString numberPlacing( int x );// return the proper word format for |
51 | // x (1st, 2nd, etc) | 68 | // x (1st, 2nd, etc) |
52 | static int week( const QDate &dt ); // what week in the month is dt? | 69 | static int week( const QDate &dt ); // what week in the month is dt? |
53 | 70 | ||
54 | RepeatEntry::RepeatEntry( bool startOnMonday, | 71 | RepeatEntry::RepeatEntry( bool startOnMonday, |
@@ -56,12 +73,15 @@ RepeatEntry::RepeatEntry( bool startOnMonday, | |||
56 | const char *name, bool modal, WFlags fl ) | 73 | const char *name, bool modal, WFlags fl ) |
57 | : RepeatEntryBase( parent, name, modal, fl ), | 74 | : RepeatEntryBase( parent, name, modal, fl ), |
58 | start( newStart ), | 75 | start( newStart ), |
59 | currInterval( NONE ), | 76 | currInterval( NONE ), |
60 | startWeekOnMonday( startOnMonday ) | 77 | startWeekOnMonday( startOnMonday ) |
61 | { | 78 | { |
79 | if (strDayTemplate.isEmpty() ) | ||
80 | fillStrings(); | ||
81 | |||
62 | init(); | 82 | init(); |
63 | fraType->setButton( currInterval ); | 83 | fraType->setButton( currInterval ); |
64 | chkNoEnd->setChecked( TRUE ); | 84 | chkNoEnd->setChecked( TRUE ); |
65 | setupNone(); | 85 | setupNone(); |
66 | } | 86 | } |
67 | 87 | ||
@@ -71,12 +91,14 @@ RepeatEntry::RepeatEntry( bool startOnMonday, const Event::RepeatPattern &rp, | |||
71 | WFlags fl ) | 91 | WFlags fl ) |
72 | : RepeatEntryBase( parent, name, modal, fl ), | 92 | : RepeatEntryBase( parent, name, modal, fl ), |
73 | start( startDate ), | 93 | start( startDate ), |
74 | end( rp.endDate() ), | 94 | end( rp.endDate() ), |
75 | startWeekOnMonday( startOnMonday ) | 95 | startWeekOnMonday( startOnMonday ) |
76 | { | 96 | { |
97 | if (strDayTemplate.isEmpty() ) | ||
98 | fillStrings(); | ||
77 | // do some stuff with the repeat pattern | 99 | // do some stuff with the repeat pattern |
78 | init(); | 100 | init(); |
79 | switch ( rp.type ) { | 101 | switch ( rp.type ) { |
80 | default: | 102 | default: |
81 | case Event::NoRepeat: | 103 | case Event::NoRepeat: |
82 | currInterval = NONE; | 104 | currInterval = NONE; |
@@ -497,13 +519,13 @@ void RepeatEntry::slotWeekLabel() | |||
497 | if ( bNeedCarriage ) | 519 | if ( bNeedCarriage ) |
498 | str += ",\n" + *itStr; | 520 | str += ",\n" + *itStr; |
499 | else | 521 | else |
500 | str += ", " + *itStr; | 522 | str += ", " + *itStr; |
501 | } | 523 | } |
502 | } | 524 | } |
503 | str = str.prepend( "on " ); | 525 | str = str.prepend( tr("on ") ); |
504 | lblWeekVar->setText( str ); | 526 | lblWeekVar->setText( str ); |
505 | } | 527 | } |
506 | 528 | ||
507 | void RepeatEntry::slotMonthLabel( int type ) | 529 | void RepeatEntry::slotMonthLabel( int type ) |
508 | { | 530 | { |
509 | QString str; | 531 | QString str; |