-rw-r--r-- | core/pim/datebook/datebook.cpp | 15 | ||||
-rw-r--r-- | core/pim/datebook/datebookdayallday.cpp | 10 | ||||
-rw-r--r-- | core/pim/datebook/datebookdayheaderimpl.cpp | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebooksettings.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/datebookweekheaderimpl.cpp | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 11 | ||||
-rw-r--r-- | core/pim/datebook/main.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/noteentryimpl.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/repeatentry.cpp | 4 |
10 files changed, 0 insertions, 53 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 24affd0..af26302 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -11,78 +11,63 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | ** $Id$ | 19 | ** $Id$ |
20 | ** | 20 | ** |
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #define QTOPIA_INTERNAL_FD | 23 | #define QTOPIA_INTERNAL_FD |
24 | 24 | ||
25 | #include "datebook.h" | 25 | #include "datebook.h" |
26 | #include "datebookday.h" | 26 | #include "datebookday.h" |
27 | #include "datebooksettings.h" | 27 | #include "datebooksettings.h" |
28 | #include "datebookweek.h" | 28 | #include "datebookweek.h" |
29 | #include "datebookweeklst.h" | 29 | #include "datebookweeklst.h" |
30 | #include "dateentryimpl.h" | 30 | #include "dateentryimpl.h" |
31 | 31 | ||
32 | #include <qpe/datebookmonth.h> | 32 | #include <qpe/datebookmonth.h> |
33 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/qpedebug.h> | ||
36 | #include <qpe/event.h> | ||
37 | #include <qpe/finddialog.h> | 35 | #include <qpe/finddialog.h> |
38 | #include <qpe/ir.h> | 36 | #include <qpe/ir.h> |
39 | #include <qmenubar.h> | ||
40 | #include <qpe/qpemessagebox.h> | 37 | #include <qpe/qpemessagebox.h> |
41 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
42 | #include <qpe/sound.h> | 39 | #include <qpe/sound.h> |
43 | #include <qpe/timestring.h> | ||
44 | #include <qtoolbar.h> | 40 | #include <qtoolbar.h> |
45 | #include <qpe/tzselect.h> | 41 | #include <qpe/tzselect.h> |
46 | #include <qpe/xmlreader.h> | ||
47 | 42 | ||
48 | #include <qaction.h> | 43 | #include <qaction.h> |
49 | #include <qcopchannel_qws.h> | 44 | #include <qcopchannel_qws.h> |
50 | #include <qdatetime.h> | ||
51 | #include <qdialog.h> | ||
52 | #include <qfile.h> | ||
53 | #include <qlabel.h> | ||
54 | #include <qlayout.h> | 45 | #include <qlayout.h> |
55 | #include <qmessagebox.h> | 46 | #include <qmessagebox.h> |
56 | #include <qpopupmenu.h> | ||
57 | #include <qpushbutton.h> | ||
58 | #include <qregexp.h> | ||
59 | #include <qtextcodec.h> | ||
60 | #include <qtextstream.h> | ||
61 | #include <qtimer.h> | 47 | #include <qtimer.h> |
62 | #include <qtl.h> | 48 | #include <qtl.h> |
63 | #include <qwidgetstack.h> | 49 | #include <qwidgetstack.h> |
64 | #include <qwindowsystem_qws.h> | ||
65 | 50 | ||
66 | #include <sys/stat.h> | 51 | #include <sys/stat.h> |
67 | #include <sys/types.h> | 52 | #include <sys/types.h> |
68 | #include <fcntl.h> | 53 | #include <fcntl.h> |
69 | #include <unistd.h> | 54 | #include <unistd.h> |
70 | 55 | ||
71 | #include <stdlib.h> | 56 | #include <stdlib.h> |
72 | 57 | ||
73 | DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | 58 | DateBook::DateBook( QWidget *parent, const char *, WFlags f ) |
74 | : QMainWindow( parent, "datebook", f ), | 59 | : QMainWindow( parent, "datebook", f ), |
75 | aPreset( FALSE ), | 60 | aPreset( FALSE ), |
76 | presetTime( -1 ), | 61 | presetTime( -1 ), |
77 | startTime( 8 ), // an acceptable default | 62 | startTime( 8 ), // an acceptable default |
78 | rowStyle( 0 ), | 63 | rowStyle( 0 ), |
79 | bJumpToCurTime(FALSE), | 64 | bJumpToCurTime(FALSE), |
80 | syncing(FALSE), | 65 | syncing(FALSE), |
81 | inSearch(FALSE), | 66 | inSearch(FALSE), |
82 | alarmCounter(0) | 67 | alarmCounter(0) |
83 | { | 68 | { |
84 | bool needEvilHack= false; // if we need an Evil Hack | 69 | bool needEvilHack= false; // if we need an Evil Hack |
85 | QTime t; | 70 | QTime t; |
86 | t.start(); | 71 | t.start(); |
87 | db = new DateBookDBHack; | 72 | db = new DateBookDBHack; |
88 | qDebug("loading db t=%d", t.elapsed() ); | 73 | qDebug("loading db t=%d", t.elapsed() ); |
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp index 1244fd3..d43d31a 100644 --- a/core/pim/datebook/datebookdayallday.cpp +++ b/core/pim/datebook/datebookdayallday.cpp | |||
@@ -1,48 +1,38 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** GPL by Rajko Albrecht | 2 | ** GPL by Rajko Albrecht |
3 | ** | 3 | ** |
4 | ** | 4 | ** |
5 | ** | 5 | ** |
6 | ** | 6 | ** |
7 | ** | 7 | ** |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "datebookdayallday.h" | 9 | #include "datebookdayallday.h" |
10 | 10 | ||
11 | #include <qpushbutton.h> | ||
12 | #include <qlayout.h> | 11 | #include <qlayout.h> |
13 | #include <qvariant.h> | ||
14 | #include <qtooltip.h> | ||
15 | #include <qwhatsthis.h> | ||
16 | #include <qobjectlist.h> | ||
17 | #include <qpe/event.h> | ||
18 | #include <qpe/ir.h> | 12 | #include <qpe/ir.h> |
19 | #include <qpe/datebookdb.h> | ||
20 | #include <qpe/resource.h> | ||
21 | #include <qpopupmenu.h> | 13 | #include <qpopupmenu.h> |
22 | #include <qtimer.h> | 14 | #include <qtimer.h> |
23 | #include <qregexp.h> | ||
24 | #include <qdatetime.h> | ||
25 | 15 | ||
26 | #include "datebookday.h" | 16 | #include "datebookday.h" |
27 | 17 | ||
28 | /* | 18 | /* |
29 | * Constructs a DatebookdayAllday which is a child of 'parent', with the | 19 | * Constructs a DatebookdayAllday which is a child of 'parent', with the |
30 | * name 'name' and widget flags set to 'f' | 20 | * name 'name' and widget flags set to 'f' |
31 | */ | 21 | */ |
32 | DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent, const char* name, WFlags ) | 22 | DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent, const char* name, WFlags ) |
33 | : QScrollView( parent, name ),item_count(0),dateBook(db) | 23 | : QScrollView( parent, name ),item_count(0),dateBook(db) |
34 | { | 24 | { |
35 | if ( !name ) | 25 | if ( !name ) |
36 | setName( "DatebookdayAllday" ); | 26 | setName( "DatebookdayAllday" ); |
37 | setMinimumSize( QSize( 0, 0 ) ); | 27 | setMinimumSize( QSize( 0, 0 ) ); |
38 | setMaximumHeight(3* (QFontMetrics(font()).height()+4) ); | 28 | setMaximumHeight(3* (QFontMetrics(font()).height()+4) ); |
39 | 29 | ||
40 | m_MainFrame = new QFrame(viewport()); | 30 | m_MainFrame = new QFrame(viewport()); |
41 | m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain); | 31 | m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain); |
42 | setFrameStyle(QFrame::NoFrame|QFrame::Plain); | 32 | setFrameStyle(QFrame::NoFrame|QFrame::Plain); |
43 | setResizePolicy( QScrollView::Default ); | 33 | setResizePolicy( QScrollView::Default ); |
44 | setHScrollBarMode( AlwaysOff ); | 34 | setHScrollBarMode( AlwaysOff ); |
45 | addChild(m_MainFrame); | 35 | addChild(m_MainFrame); |
46 | 36 | ||
47 | datebookdayalldayLayout = new QVBoxLayout( m_MainFrame ); | 37 | datebookdayalldayLayout = new QVBoxLayout( m_MainFrame ); |
48 | datebookdayalldayLayout->setSpacing( 0 ); | 38 | datebookdayalldayLayout->setSpacing( 0 ); |
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp index 3e965f5..213c843 100644 --- a/core/pim/datebook/datebookdayheaderimpl.cpp +++ b/core/pim/datebook/datebookdayheaderimpl.cpp | |||
@@ -1,53 +1,49 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "datebookdayheaderimpl.h" | 20 | #include "datebookdayheaderimpl.h" |
21 | 21 | ||
22 | #include <qpe/datebookmonth.h> | 22 | #include <qpe/datebookmonth.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/timestring.h> | ||
25 | 24 | ||
26 | #include <qbuttongroup.h> | 25 | #include <qbuttongroup.h> |
27 | #include <qpopupmenu.h> | ||
28 | #include <qstringlist.h> | ||
29 | #include <qtimer.h> | ||
30 | #include <qtoolbutton.h> | 26 | #include <qtoolbutton.h> |
31 | 27 | ||
32 | 28 | ||
33 | /* | 29 | /* |
34 | * Constructs a DateBookDayHeader which is a child of 'parent', with the | 30 | * Constructs a DateBookDayHeader which is a child of 'parent', with the |
35 | * name 'name' and widget flags set to 'f' | 31 | * name 'name' and widget flags set to 'f' |
36 | * | 32 | * |
37 | * The dialog will by default be modeless, unless you set 'modal' to | 33 | * The dialog will by default be modeless, unless you set 'modal' to |
38 | * TRUE to construct a modal dialog. | 34 | * TRUE to construct a modal dialog. |
39 | */ | 35 | */ |
40 | DateBookDayHeader::DateBookDayHeader( bool useMonday, | 36 | DateBookDayHeader::DateBookDayHeader( bool useMonday, |
41 | QWidget* parent, const char* name ) | 37 | QWidget* parent, const char* name ) |
42 | : DateBookDayHeaderBase( parent, name ), | 38 | : DateBookDayHeaderBase( parent, name ), |
43 | bUseMonday( useMonday ) | 39 | bUseMonday( useMonday ) |
44 | { | 40 | { |
45 | connect(date,SIGNAL(pressed()),this,SLOT(pickDate())); | 41 | connect(date,SIGNAL(pressed()),this,SLOT(pickDate())); |
46 | 42 | ||
47 | setupNames(); | 43 | setupNames(); |
48 | 44 | ||
49 | forward->setPixmap( Resource::loadPixmap( "forward" ) ); | 45 | forward->setPixmap( Resource::loadPixmap( "forward" ) ); |
50 | back->setPixmap( Resource::loadPixmap( "back" ) ); | 46 | back->setPixmap( Resource::loadPixmap( "back" ) ); |
51 | forwardweek->setPixmap( Resource::loadPixmap( "fastforward" ) ); | 47 | forwardweek->setPixmap( Resource::loadPixmap( "fastforward" ) ); |
52 | backweek->setPixmap( Resource::loadPixmap( "fastback" ) ); | 48 | backweek->setPixmap( Resource::loadPixmap( "fastback" ) ); |
53 | 49 | ||
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp index 675b17f..a6d04ba 100644 --- a/core/pim/datebook/datebooksettings.cpp +++ b/core/pim/datebook/datebooksettings.cpp | |||
@@ -3,49 +3,48 @@ | |||
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "datebooksettings.h" | 21 | #include "datebooksettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qcombobox.h> | ||
28 | 27 | ||
29 | DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent, | 28 | DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent, |
30 | const char *name, bool modal, WFlags fl ) | 29 | const char *name, bool modal, WFlags fl ) |
31 | : DateBookSettingsBase( parent, name, modal, fl ), | 30 | : DateBookSettingsBase( parent, name, modal, fl ), |
32 | ampm( whichClock ) | 31 | ampm( whichClock ) |
33 | { | 32 | { |
34 | init(); | 33 | init(); |
35 | QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) ); | 34 | QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) ); |
36 | QArray<int> categories; | 35 | QArray<int> categories; |
37 | comboCategory->setCategories( categories, "Calendar", tr("Calendar") ); | 36 | comboCategory->setCategories( categories, "Calendar", tr("Calendar") ); |
38 | } | 37 | } |
39 | 38 | ||
40 | DateBookSettings::~DateBookSettings() | 39 | DateBookSettings::~DateBookSettings() |
41 | { | 40 | { |
42 | } | 41 | } |
43 | 42 | ||
44 | void DateBookSettings::setStartTime( int newStartViewTime ) | 43 | void DateBookSettings::setStartTime( int newStartViewTime ) |
45 | { | 44 | { |
46 | if ( ampm ) { | 45 | if ( ampm ) { |
47 | if ( newStartViewTime >= 12 ) { | 46 | if ( newStartViewTime >= 12 ) { |
48 | newStartViewTime %= 12; | 47 | newStartViewTime %= 12; |
49 | if ( newStartViewTime == 0 ) | 48 | if ( newStartViewTime == 0 ) |
50 | newStartViewTime = 12; | 49 | newStartViewTime = 12; |
51 | spinStart->setSuffix( tr(":00 PM") ); | 50 | spinStart->setSuffix( tr(":00 PM") ); |
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp index 84b4f1b..eaa9730 100644 --- a/core/pim/datebook/datebookweekheaderimpl.cpp +++ b/core/pim/datebook/datebookweekheaderimpl.cpp | |||
@@ -1,49 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "datebookweekheaderimpl.h" | 20 | #include "datebookweekheaderimpl.h" |
21 | #include "datebookweekheader.h" | ||
22 | #include "datebookweek.h" | 21 | #include "datebookweek.h" |
23 | #include <qlabel.h> | ||
24 | #include <qspinbox.h> | ||
25 | #include <qdatetime.h> | ||
26 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
27 | #include <qpe/datebookmonth.h> | 23 | #include <qpe/datebookmonth.h> |
28 | 24 | ||
29 | #include <qtoolbutton.h> | 25 | #include <qtoolbutton.h> |
30 | 26 | ||
31 | /* | 27 | /* |
32 | * Constructs a DateBookWeekHeader which is a child of 'parent', with the | 28 | * Constructs a DateBookWeekHeader which is a child of 'parent', with the |
33 | * name 'name' and widget flags set to 'f' | 29 | * name 'name' and widget flags set to 'f' |
34 | */ | 30 | */ |
35 | DateBookWeekHeader::DateBookWeekHeader( bool startOnMonday, QWidget* parent, const char* name, WFlags fl ) | 31 | DateBookWeekHeader::DateBookWeekHeader( bool startOnMonday, QWidget* parent, const char* name, WFlags fl ) |
36 | : DateBookWeekHeaderBase( parent, name, fl ), | 32 | : DateBookWeekHeaderBase( parent, name, fl ), |
37 | bStartOnMonday( startOnMonday ) | 33 | bStartOnMonday( startOnMonday ) |
38 | { | 34 | { |
39 | setBackgroundMode( PaletteButton ); | 35 | setBackgroundMode( PaletteButton ); |
40 | labelDate->setBackgroundMode( PaletteButton ); | 36 | labelDate->setBackgroundMode( PaletteButton ); |
41 | backmonth->setPixmap( Resource::loadPixmap("fastback") ); | 37 | backmonth->setPixmap( Resource::loadPixmap("fastback") ); |
42 | backweek->setPixmap( Resource::loadPixmap("back") ); | 38 | backweek->setPixmap( Resource::loadPixmap("back") ); |
43 | forwardweek->setPixmap( Resource::loadPixmap("forward") ); | 39 | forwardweek->setPixmap( Resource::loadPixmap("forward") ); |
44 | forwardmonth->setPixmap( Resource::loadPixmap("fastforward") ); | 40 | forwardmonth->setPixmap( Resource::loadPixmap("fastforward") ); |
45 | } | 41 | } |
46 | 42 | ||
47 | /* | 43 | /* |
48 | * Destroys the object and frees any allocated resources | 44 | * Destroys the object and frees any allocated resources |
49 | */ | 45 | */ |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 24fb0ba..42a1753 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -1,33 +1,32 @@ | |||
1 | #include "datebookweeklst.h" | 1 | #include "datebookweeklst.h" |
2 | 2 | ||
3 | 3 | ||
4 | #include "datebook.h" | 4 | #include "datebook.h" |
5 | 5 | ||
6 | #include <qpe/datebookmonth.h> | 6 | #include <qpe/datebookmonth.h> |
7 | #include <qpe/config.h> | 7 | #include <qpe/config.h> |
8 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qpe/calendar.h> | ||
10 | 9 | ||
11 | #include <qlayout.h> | 10 | #include <qlayout.h> |
12 | #include <qtoolbutton.h> | 11 | #include <qtoolbutton.h> |
13 | #include <qtl.h> | 12 | #include <qtl.h> |
14 | 13 | ||
15 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); | 14 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); |
16 | 15 | ||
17 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) | 16 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) |
18 | : DateBookWeekLstHeaderBase(parent, name, fl) | 17 | : DateBookWeekLstHeaderBase(parent, name, fl) |
19 | { | 18 | { |
20 | setBackgroundMode( PaletteButton ); | 19 | setBackgroundMode( PaletteButton ); |
21 | labelDate->setBackgroundMode( PaletteButton ); | 20 | labelDate->setBackgroundMode( PaletteButton ); |
22 | forwardweek->setBackgroundMode( PaletteButton ); | 21 | forwardweek->setBackgroundMode( PaletteButton ); |
23 | forwardweek->setPixmap( Resource::loadPixmap("forward") ); | 22 | forwardweek->setPixmap( Resource::loadPixmap("forward") ); |
24 | forwardmonth->setBackgroundMode( PaletteButton ); | 23 | forwardmonth->setBackgroundMode( PaletteButton ); |
25 | forwardmonth->setPixmap( Resource::loadPixmap("fastforward") ); | 24 | forwardmonth->setPixmap( Resource::loadPixmap("fastforward") ); |
26 | backweek->setBackgroundMode( PaletteButton ); | 25 | backweek->setBackgroundMode( PaletteButton ); |
27 | backweek->setPixmap( Resource::loadPixmap("back") ); | 26 | backweek->setPixmap( Resource::loadPixmap("back") ); |
28 | backmonth->setBackgroundMode( PaletteButton ); | 27 | backmonth->setBackgroundMode( PaletteButton ); |
29 | backmonth->setPixmap( Resource::loadPixmap("fastback") ); | 28 | backmonth->setPixmap( Resource::loadPixmap("fastback") ); |
30 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); | 29 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); |
31 | DateBookWeekLstHeaderBaseLayout->setMargin(0); | 30 | DateBookWeekLstHeaderBaseLayout->setMargin(0); |
32 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); | 31 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); |
33 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); | 32 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 856837c..018bb5a 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -3,63 +3,52 @@ | |||
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "dateentryimpl.h" | 21 | #include "dateentryimpl.h" |
22 | #include "repeatentry.h" | 22 | #include "repeatentry.h" |
23 | 23 | ||
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/categoryselect.h> | 25 | #include <qpe/categoryselect.h> |
26 | #include <qpe/datebookmonth.h> | 26 | #include <qpe/datebookmonth.h> |
27 | #include <qpe/global.h> | ||
28 | #include <qpe/timeconversion.h> | ||
29 | #include <qpe/timestring.h> | ||
30 | #include <qpe/tzselect.h> | 27 | #include <qpe/tzselect.h> |
31 | 28 | ||
32 | #include <qevent.h> | ||
33 | #include <qcheckbox.h> | ||
34 | #include <qcombobox.h> | ||
35 | #include <qlayout.h> | ||
36 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
37 | #include <qmultilineedit.h> | ||
38 | #include <qpopupmenu.h> | ||
39 | #include <qscrollview.h> | ||
40 | #include <qspinbox.h> | 30 | #include <qspinbox.h> |
41 | #include <qtoolbutton.h> | ||
42 | 31 | ||
43 | #include <opie/otimepicker.h> | 32 | #include <opie/otimepicker.h> |
44 | #include "onoteedit.h" | 33 | #include "onoteedit.h" |
45 | 34 | ||
46 | #include <stdlib.h> | 35 | #include <stdlib.h> |
47 | #include <stdio.h> | 36 | #include <stdio.h> |
48 | 37 | ||
49 | /* | 38 | /* |
50 | * Constructs a DateEntry which is a child of 'parent', with the | 39 | * Constructs a DateEntry which is a child of 'parent', with the |
51 | * name 'name' and widget flags set to 'f' | 40 | * name 'name' and widget flags set to 'f' |
52 | * | 41 | * |
53 | * The dialog will by default be modeless, unless you set 'modal' to | 42 | * The dialog will by default be modeless, unless you set 'modal' to |
54 | * TRUE to construct a modal dialog. | 43 | * TRUE to construct a modal dialog. |
55 | */ | 44 | */ |
56 | 45 | ||
57 | DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, | 46 | DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, |
58 | const QDateTime &end, bool whichClock, QWidget* parent, | 47 | const QDateTime &end, bool whichClock, QWidget* parent, |
59 | const char* name ) | 48 | const char* name ) |
60 | : DateEntryBase( parent, name ), | 49 | : DateEntryBase( parent, name ), |
61 | ampm( whichClock ), | 50 | ampm( whichClock ), |
62 | startWeekOnMonday( startOnMonday ), | 51 | startWeekOnMonday( startOnMonday ), |
63 | m_showStart(true) | 52 | m_showStart(true) |
64 | { | 53 | { |
65 | init(); | 54 | init(); |
diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp index 8004690..421e457 100644 --- a/core/pim/datebook/main.cpp +++ b/core/pim/datebook/main.cpp | |||
@@ -1,25 +1,24 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "datebook.h" | 21 | #include "datebook.h" |
22 | #include <qpe/qpeapplication.h> | ||
23 | #include <opie/oapplicationfactory.h> | 22 | #include <opie/oapplicationfactory.h> |
24 | 23 | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) |
diff --git a/core/pim/datebook/noteentryimpl.cpp b/core/pim/datebook/noteentryimpl.cpp index 0e45985..14fe98e 100644 --- a/core/pim/datebook/noteentryimpl.cpp +++ b/core/pim/datebook/noteentryimpl.cpp | |||
@@ -1,17 +1,15 @@ | |||
1 | #include "noteentryimpl.h" | 1 | #include "noteentryimpl.h" |
2 | #include "qstring.h" | ||
3 | #include "qmultilinedit.h" | ||
4 | #include "qlabel.h" | 2 | #include "qlabel.h" |
5 | #include "onoteedit.h" | 3 | #include "onoteedit.h" |
6 | 4 | ||
7 | NoteEntry::NoteEntry(const QString &title, const QString ¬eStr, | 5 | NoteEntry::NoteEntry(const QString &title, const QString ¬eStr, |
8 | QWidget* parent, const char* name, bool modal, | 6 | QWidget* parent, const char* name, bool modal, |
9 | WFlags fl) : | 7 | WFlags fl) : |
10 | NoteEntryBase(parent, name, modal, fl) { | 8 | NoteEntryBase(parent, name, modal, fl) { |
11 | 9 | ||
12 | 10 | ||
13 | eventLabel->setText(title); | 11 | eventLabel->setText(title); |
14 | note->setText(noteStr); | 12 | note->setText(noteStr); |
15 | int l=note->length(); | 13 | int l=note->length(); |
16 | note->setCursorPosition(l,l,false); | 14 | note->setCursorPosition(l,l,false); |
17 | } | 15 | } |
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp index b1a162d..7cf36da 100644 --- a/core/pim/datebook/repeatentry.cpp +++ b/core/pim/datebook/repeatentry.cpp | |||
@@ -1,55 +1,51 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "repeatentry.h" | 21 | #include "repeatentry.h" |
22 | 22 | ||
23 | #include <qpe/datebookmonth.h> | 23 | #include <qpe/datebookmonth.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/timestring.h> | ||
26 | 25 | ||
27 | #include <qbuttongroup.h> | ||
28 | #include <qlabel.h> | 26 | #include <qlabel.h> |
29 | #include <qpopupmenu.h> | ||
30 | #include <qspinbox.h> | 27 | #include <qspinbox.h> |
31 | #include <qtoolbutton.h> | ||
32 | 28 | ||
33 | #include <time.h> | 29 | #include <time.h> |
34 | 30 | ||
35 | // Global Templates for use in setting up the repeat label... | 31 | // Global Templates for use in setting up the repeat label... |
36 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke | 32 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke |
37 | namespace { | 33 | namespace { |
38 | QString strDayTemplate; | 34 | QString strDayTemplate; |
39 | QString strYearTemplate; | 35 | QString strYearTemplate; |
40 | QString strMonthDateTemplate; | 36 | QString strMonthDateTemplate; |
41 | QString strMonthDayTemplate; | 37 | QString strMonthDayTemplate; |
42 | QString strWeekTemplate; | 38 | QString strWeekTemplate; |
43 | QString dayLabel[7]; | 39 | QString dayLabel[7]; |
44 | } | 40 | } |
45 | 41 | ||
46 | /* | 42 | /* |
47 | * static linkage to not polute the symbol table... | 43 | * static linkage to not polute the symbol table... |
48 | * The problem is that const and static linkage are resolved prior to installing a translator | 44 | * 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... | 45 | * leading to that the above strings are translted but to the original we delay the init of these strings... |
50 | * -zecke | 46 | * -zecke |
51 | */ | 47 | */ |
52 | static void fillStrings() { | 48 | static void fillStrings() { |
53 | strDayTemplate = QObject::tr("Every"); | 49 | strDayTemplate = QObject::tr("Every"); |
54 | strYearTemplate = QObject::tr("%1 %2 every "); | 50 | strYearTemplate = QObject::tr("%1 %2 every "); |
55 | strMonthDateTemplate = QObject::tr("The %1 every "); | 51 | strMonthDateTemplate = QObject::tr("The %1 every "); |