-rw-r--r-- | core/pim/datebook/datebook.cpp | 6 | ||||
-rw-r--r-- | core/pim/datebook/datebookweekheaderimpl.cpp | 7 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 41 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 1 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 10 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 14 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginconfig.cpp | 8 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginwidget.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 10 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 7 | ||||
-rw-r--r-- | core/settings/security/security.cpp | 13 | ||||
-rw-r--r-- | noncore/apps/confedit/main.cpp | 15 | ||||
-rw-r--r-- | noncore/games/tictac/main.cpp | 24 |
14 files changed, 92 insertions, 70 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 10a9b59..07d7164 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -194,2 +194,4 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
194 | 194 | ||
195 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | ||
196 | connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) ); | ||
195 | /* | 197 | /* |
@@ -404,2 +406,4 @@ void DateBook::insertEvent( const Event &e ) | |||
404 | Event dupEvent=e; | 406 | Event dupEvent=e; |
407 | if(!dupEvent.isValidUid() ) // tkcRom seems to be different | ||
408 | dupEvent.assignUid(); | ||
405 | dupEvent.setLocation(defaultLocation); | 409 | dupEvent.setLocation(defaultLocation); |
@@ -454,2 +458,4 @@ void DateBook::duplicateEvent( const Event &e ) | |||
454 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... | 458 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... |
459 | if( newEv.uid() == e.uid() || !newEv.isValidUid() ) | ||
460 | newEv.assignUid(); | ||
455 | 461 | ||
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp index 770410e..84b4f1b 100644 --- a/core/pim/datebook/datebookweekheaderimpl.cpp +++ b/core/pim/datebook/datebookweekheaderimpl.cpp | |||
@@ -103,3 +103,3 @@ void DateBookWeekHeader::setDate(const QDate &d) { | |||
103 | else if( dayofweek == 7 ) | 103 | else if( dayofweek == 7 ) |
104 | /* we already have the right day -7 would lead to the current week..*/ | 104 | // we already have the right day -7 would lead to the current week.. |
105 | dayofweek = 0; | 105 | dayofweek = 0; |
@@ -111,6 +111,7 @@ void DateBookWeekHeader::setDate(const QDate &d) { | |||
111 | labelDate->setText( QString::number(start.day()) + "." + | 111 | labelDate->setText( QString::number(start.day()) + "." + |
112 | start.monthName(start.month()) + "-" + | 112 | Calendar::nameOfMonth( start.month()) + "-" + |
113 | QString::number(stop.day()) + "." + | 113 | QString::number(stop.day()) + "." + |
114 | start.monthName(stop.month()) +" ("+ | 114 | Calendar::nameOfMonth( stop.month()) +" ("+ |
115 | tr("w")+":"+QString::number( week ) +")"); | 115 | tr("w")+":"+QString::number( week ) +")"); |
116 | date = d; // bugfix: 0001126 - date has to be the selected date, not monday! | ||
116 | emit dateChanged(date); | 117 | emit dateChanged(date); |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index aad1f3a..24fb0ba 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -2,3 +2,2 @@ | |||
2 | 2 | ||
3 | #include "datebookweekheaderimpl.h" | ||
4 | 3 | ||
@@ -6,7 +5,2 @@ | |||
6 | 5 | ||
7 | #include <qpe/calendar.h> | ||
8 | #include <qpe/datebookdb.h> | ||
9 | #include <qpe/event.h> | ||
10 | #include <qpe/qpeapplication.h> | ||
11 | #include <qpe/timestring.h> | ||
12 | #include <qpe/datebookmonth.h> | 6 | #include <qpe/datebookmonth.h> |
@@ -14,15 +8,6 @@ | |||
14 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qpe/calendar.h> | ||
15 | 10 | ||
16 | #include <qdatetime.h> | ||
17 | #include <qheader.h> | ||
18 | #include <qlabel.h> | ||
19 | #include <qlayout.h> | 11 | #include <qlayout.h> |
20 | #include <qpainter.h> | ||
21 | #include <qpopupmenu.h> | ||
22 | #include <qtimer.h> | ||
23 | #include <qstyle.h> | ||
24 | #include <qtoolbutton.h> | 12 | #include <qtoolbutton.h> |
25 | #include <qvbox.h> | ||
26 | #include <qsizepolicy.h> | ||
27 | #include <qabstractlayout.h> | ||
28 | #include <qtl.h> | 13 | #include <qtl.h> |
@@ -75,6 +60,7 @@ void DateBookWeekLstHeader::setDate(const QDate &d) { | |||
75 | labelDate->setText( QString::number(start.day()) + "." + | 60 | labelDate->setText( QString::number(start.day()) + "." + |
76 | start.monthName(start.month()) + "-" + | 61 | Calendar::nameOfMonth( start.month() ) + "-" + |
77 | QString::number(stop.day()) + "." + | 62 | QString::number(stop.day()) + "." + |
78 | start.monthName(stop.month()) +" ("+ | 63 | Calendar::nameOfMonth( stop.month()) +" ("+ |
79 | tr("w")+":"+QString::number( week ) +")"); | 64 | tr("w")+":"+QString::number( week ) +")"); |
65 | date = d; // bugfix: 0001126 - date has to be the selected date, not monday! | ||
80 | emit dateChanged(date); | 66 | emit dateChanged(date); |
@@ -127,3 +113,5 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */, | |||
127 | 113 | ||
114 | //dont use dayOfWeek() to save space ! | ||
128 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); | 115 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); |
116 | |||
129 | add->setText("+"); | 117 | add->setText("+"); |
@@ -343,4 +331,19 @@ QDate DateBookWeekLst::date() { | |||
343 | 331 | ||
332 | // return the date at the beginning of the week... | ||
333 | // copied from DateBookWeek | ||
334 | QDate DateBookWeekLst::weekDate() const | ||
335 | { | ||
336 | QDate d=bdate; | ||
337 | |||
338 | // Calculate offset to first day of week. | ||
339 | int dayoffset=d.dayOfWeek(); | ||
340 | if(bStartOnMonday) dayoffset--; | ||
341 | else if( dayoffset == 7 ) | ||
342 | dayoffset = 0; | ||
343 | |||
344 | return d.addDays(-dayoffset); | ||
345 | } | ||
346 | |||
344 | void DateBookWeekLst::getEvents() { | 347 | void DateBookWeekLst::getEvents() { |
345 | QDate start = date(); | 348 | QDate start = weekDate(); //date(); |
346 | QDate stop = start.addDays(6); | 349 | QDate stop = start.addDays(6); |
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index 0bfbcda..f683ce7 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
@@ -122,2 +122,3 @@ public: | |||
122 | QDate date(); | 122 | QDate date(); |
123 | QDate weekDate() const; | ||
123 | 124 | ||
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index be2bf25..5da7ae9 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -78,3 +78,3 @@ void DatebookSearch::insertItem( void *rec ) | |||
78 | ) return; | 78 | ) return; |
79 | (void)new EventItem( this, ev ); | 79 | new EventItem( this, ev ); |
80 | _resultCount++; | 80 | _resultCount++; |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index aa52061..f768d81 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -84,7 +84,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
84 | 84 | ||
85 | searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); | 85 | searches.append( new AppLnkSearch( resultsList, tr("Applications") ) ); |
86 | searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); | 86 | searches.append( new DocLnkSearch( resultsList, tr("Documents") ) ); |
87 | searches.append( new TodoSearch( resultsList, tr("todo") ) ); | 87 | searches.append( new TodoSearch( resultsList, tr("Todo List") ) ); |
88 | searches.append( new DatebookSearch( resultsList, tr("datebook") ) ); | 88 | searches.append( new DatebookSearch( resultsList, tr("Calendar") ) ); |
89 | searches.append( new AdressSearch( resultsList, tr("adressbook") ) ); | 89 | searches.append( new AdressSearch( resultsList, tr("Contacts") ) ); |
90 | 90 | ||
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 1f5c4bb..75054f0 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h | |||
@@ -9,3 +9,3 @@ | |||
9 | 9 | ||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
@@ -15,4 +15,9 @@ | |||
15 | #include <qmainwindow.h> | 15 | #include <qmainwindow.h> |
16 | #include <qdialog.h> | ||
17 | #include <qaction.h> | ||
16 | #include <qlist.h> | 18 | #include <qlist.h> |
19 | |||
17 | #include <qmap.h> | 20 | #include <qmap.h> |
21 | #include <qtimer.h> | ||
22 | #include <qpopupmenu.h> | ||
18 | 23 | ||
@@ -28,4 +33,7 @@ class QListViewItem; | |||
28 | class QPopupMenu; | 33 | class QPopupMenu; |
29 | class QSignalMapper; | ||
30 | class QTimer; | 34 | class QTimer; |
35 | |||
36 | class QSignalMapper; | ||
37 | class QButton; | ||
38 | |||
31 | class SearchGroup; | 39 | class SearchGroup; |
@@ -40,3 +48,3 @@ public: | |||
40 | ~MainWindow(); | 48 | ~MainWindow(); |
41 | 49 | static QString appName() { return QString::fromLatin1("osearch"); } | |
42 | 50 | ||
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index b79c679..8863192 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp | |||
@@ -80,2 +80,8 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
80 | 80 | ||
81 | // QHBox *box4 = new QHBox( this ); | ||
82 | |||
83 | // QLabel* colorLabel = new QLabel( box4, "" ); | ||
84 | // colorLabel->setText( tr( "To activate settings: Restart application !" ) ); | ||
85 | |||
86 | |||
81 | QHBox *box5 = new QHBox( this ); | 87 | QHBox *box5 = new QHBox( this ); |
@@ -106,3 +112,3 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
106 | 112 | ||
107 | layout->addWidget( b_group ); | 113 | //layout->addWidget( box4 ); |
108 | layout->addWidget( box1 ); | 114 | layout->addWidget( box1 ); |
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index dad09db..d47bc0b 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp | |||
@@ -118,2 +118,6 @@ void AddressBookPluginWidget::getAddress() { | |||
118 | lookAheadDate.toString().latin1() ); | 118 | lookAheadDate.toString().latin1() ); |
119 | } | ||
120 | |||
121 | if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | ||
122 | |||
119 | 123 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index bc412dd..2d303fc 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -25,2 +25,4 @@ | |||
25 | 25 | ||
26 | #include "datebookpluginconfigbase.h" | ||
27 | |||
26 | class DatebookPluginConfig : public TodayConfigWidget { | 28 | class DatebookPluginConfig : public TodayConfigWidget { |
@@ -29,2 +31,3 @@ class DatebookPluginConfig : public TodayConfigWidget { | |||
29 | 31 | ||
32 | |||
30 | public: | 33 | public: |
@@ -41,9 +44,4 @@ private: | |||
41 | 44 | ||
42 | QCheckBox* CheckBox2; | ||
43 | QCheckBox* CheckBox1; | ||
44 | QCheckBox* CheckBox3; | ||
45 | QSpinBox* SpinBox1; | ||
46 | QSpinBox* SpinBox2; | ||
47 | |||
48 | 45 | ||
46 | DatebookPluginConfigBase *m_gui; | ||
49 | // how many lines should be showed in the datebook section | 47 | // how many lines should be showed in the datebook section |
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index e09251c..54d35cf 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
@@ -19,3 +19,2 @@ | |||
19 | 19 | ||
20 | //#include <qwidget.h> | ||
21 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
@@ -24,2 +23,4 @@ | |||
24 | 23 | ||
24 | #include "todopluginconfigbase.h" | ||
25 | |||
25 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
@@ -41,4 +42,4 @@ private: | |||
41 | 42 | ||
42 | QSpinBox* SpinBox2; | 43 | TodoPluginConfigBase *m_gui; |
43 | QSpinBox* SpinBoxClip; | 44 | |
44 | 45 | ||
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index c4726b3..00ea105 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -113,3 +113,3 @@ void Security::show() | |||
113 | { | 113 | { |
114 | valid=FALSE; | 114 | //valid=FALSE; |
115 | setEnabled(FALSE); | 115 | setEnabled(FALSE); |
@@ -122,2 +122,5 @@ void Security::show() | |||
122 | } else { | 122 | } else { |
123 | |||
124 | if (!valid) // security passcode was not asked yet, so ask now | ||
125 | { | ||
123 | QString pc = enterPassCode(tr("Enter passcode")); | 126 | QString pc = enterPassCode(tr("Enter passcode")); |
@@ -130,2 +133,3 @@ void Security::show() | |||
130 | } | 133 | } |
134 | } | ||
131 | setEnabled(TRUE); | 135 | setEnabled(TRUE); |
@@ -215,2 +219,3 @@ void Security::loadUsers ( void ) | |||
215 | } | 219 | } |
220 | |||
216 | void Security::toggleAutoLogin(bool val) | 221 | void Security::toggleAutoLogin(bool val) |
@@ -222,2 +227,6 @@ void Security::toggleAutoLogin(bool val) | |||
222 | } | 227 | } |
228 | |||
229 | |||
230 | |||
231 | |||
223 | void Security::setSyncNet(const QString& sn) | 232 | void Security::setSyncNet(const QString& sn) |
@@ -232,2 +241,3 @@ void Security::applySecurity() | |||
232 | if ( valid ) { | 241 | if ( valid ) { |
242 | <<<<<<< security.cpp | ||
233 | Config cfg("Security"); | 243 | Config cfg("Security"); |
@@ -264,2 +274,3 @@ void Security::applySecurity() | |||
264 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | 274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); |
275 | |||
265 | } | 276 | } |
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp index 7e7f064..74923c8 100644 --- a/noncore/apps/confedit/main.cpp +++ b/noncore/apps/confedit/main.cpp | |||
@@ -3,11 +3,6 @@ | |||
3 | 3 | ||
4 | #include <opie2/oapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | 5 | #include <opie/oapplicationfactory.h> | |
6 | int main( int argc, char ** argv ) | 6 | |
7 | { | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
8 | OApplication a( argc, argv, "confedit" ); | 8 | |
9 | MainWindow mw; | ||
10 | mw.showMaximized(); | ||
11 | a.showMainDocumentWidget( &mw ); | ||
12 | return a.exec(); | ||
13 | } | ||
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index 78fb3b7..0185b8c 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp | |||
@@ -1,3 +1,7 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | <<<<<<< main.cpp | ||
2 | ** $Id$ | 3 | ** $Id$ |
4 | ======= | ||
5 | ** $Id$ | ||
6 | >>>>>>> 1.1.8.1.2.1 | ||
3 | ** | 7 | ** |
@@ -11,21 +15,5 @@ | |||
11 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
12 | #include <stdlib.h> | 16 | #include <opie/oapplicationfactory.h> |
13 | #include "tictac.h" | 17 | #include "tictac.h" |
14 | 18 | ||
15 | 19 | OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> ) | |
16 | int main( int argc, char **argv ) | ||
17 | { | ||
18 | QPEApplication a( argc, argv ); | ||
19 | int n = 3; | ||
20 | if ( argc == 2 ) // get board size n | ||
21 | n = atoi(argv[1]); | ||
22 | if ( n < 3 || n > 10 ) { // out of range | ||
23 | qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] ); | ||
24 | return 1; | ||
25 | } | ||
26 | TicTacToe ttt( n ); // create game | ||
27 | a.setMainWidget( &ttt ); | ||
28 | ttt.setCaption( QObject::tr("TicTac") ); | ||
29 | ttt.show(); // show widget | ||
30 | return a.exec(); // go | ||
31 | } | ||