13 files changed, 338 insertions, 305 deletions

diff --git a/noncore/settings/netsystemtime/formattabwidget.cpp b/noncore/settings/netsystemtime/formattabwidget.cpp
index 982305b..7d01bff 100644
--- a/noncore/settings/netsystemtime/formattabwidget.cpp
+++ b/noncore/settings/netsystemtime/formattabwidget.cpp
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "formattabwidget.h"
 
 #include <qpe/config.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qtimer.h>
 
 FormatTabWidget::FormatTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
 	tmpvb->addWidget( sv, 0, 0 );
 	sv->setResizePolicy( QScrollView::AutoOneFit );
 	sv->setFrameStyle( QFrame::NoFrame );
 	QWidget *container = new QWidget( sv->viewport() );
 	sv->addChild( container );
     
 	QGridLayout *layout = new QGridLayout( container );
 	layout->setMargin( 2 );
 	layout->setSpacing( 4 );
 
 	// Time format selector
diff --git a/noncore/settings/netsystemtime/formattabwidget.h b/noncore/settings/netsystemtime/formattabwidget.h
index e4073e7..171cd5f 100644
--- a/noncore/settings/netsystemtime/formattabwidget.h
+++ b/noncore/settings/netsystemtime/formattabwidget.h
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef FORMATTABWIDGET_H
 #define FORMATTABWIDGET_H
 
 #include <qpe/timestring.h>
 
 #include <qwidget.h>
 
 class QComboBox;
 
 class FormatTabWidget : public QWidget
 {
 	Q_OBJECT
 
 public:
 	FormatTabWidget( QWidget * = 0x0 );
 	~FormatTabWidget();
 
 	void saveSettings( bool );
 
 private:
 	QComboBox *cbAmpm;
 	QComboBox *cbWeekStart;
 	QComboBox *cbDateFormat;
 	QComboBox *cbAppletFormat;
     DateFormat date_formats[4];
 
 signals:
 	void show12HourTime( int );
 	void dateFormatChanged( const DateFormat & );
 	void weekStartChanged( int );
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp
index dbcdc17..ef1bc8e 100644
--- a/noncore/settings/netsystemtime/main.cpp
+++ b/noncore/settings/netsystemtime/main.cpp
@@ -1,34 +1,36 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
 using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 1f9f8c3..35d4105 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -1,58 +1,60 @@
 /*
-                     This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-      .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-     .>+-=
-_;:,   .>  :=|.         This file is free software; you can
-.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,   .._         License as published by the Free Software
-- .  .-<_>   .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
-  .%`+i>    _;_.
-  .i_,=:_.   -<s.       This file 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 General
-..}^=.=    =    ;      Public License for more details.
-++=  -.   .`   .:
-:   = ...= . :.=-        You should have received a copy of the GNU
--.  .:....=;==+<;          General Public License along with this file;
- -_. . .  )=. =           see the file COPYING. If not, write to the
-  --    :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "mainwindow.h"
 #include "timetabwidget.h"
 #include "formattabwidget.h"
 #include "settingstabwidget.h"
 #include "ntptabwidget.h"
 #include "predicttabwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qsocket.h>
 #include <qstring.h>
 #include <qtimer.h>
 
 using namespace Opie::Ui;
 using namespace Opie::Core;
 MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
     : QDialog( parent, name, modal, f )
 {
     setCaption( tr( "SystemTime" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h
index 8701803..0ef24e0 100644
--- a/noncore/settings/netsystemtime/mainwindow.h
+++ b/noncore/settings/netsystemtime/mainwindow.h
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qdialog.h>
 
 #include <opie2/oprocess.h>
 #include <opie2/otabwidget.h>
 
 class TimeTabWidget;
 class FormatTabWidget;
 class SettingsTabWidget;
 class NTPTabWidget;
 class PredictTabWidget;
 
 
 class QDateTime;
 class QSocket;
 class QTimer;
 
 class MainWindow : public QDialog
 {
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0);
     ~MainWindow();
     static QString appName() { return QString::fromLatin1("systemtime"); }
 
 protected:
     void accept();
diff --git a/noncore/settings/netsystemtime/ntptabwidget.cpp b/noncore/settings/netsystemtime/ntptabwidget.cpp
index 616bc22..16d21cc 100644
--- a/noncore/settings/netsystemtime/ntptabwidget.cpp
+++ b/noncore/settings/netsystemtime/ntptabwidget.cpp
@@ -1,111 +1,116 @@
 /*
-                     This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-      .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-     .>+-=
-_;:,   .>  :=|.         This file is free software; you can
-.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,   .._         License as published by the Free Software
-- .  .-<_>   .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
-  .%`+i>    _;_.
-  .i_,=:_.   -<s.       This file 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 General
-..}^=.=    =    ;      Public License for more details.
-++=  -.   .`   .:
-:   = ...= . :.=-        You should have received a copy of the GNU
--.  .:....=;==+<;          General Public License along with this file;
- -_. . .  )=. =           see the file COPYING. If not, write to the
-  --    :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "ntptabwidget.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 
 NTPTabWidget::NTPTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
 	tmpvb->addWidget( sv, 0, 0 );
 	sv->setResizePolicy( QScrollView::AutoOneFit );
 	sv->setFrameStyle( QFrame::NoFrame );
 	QWidget *container = new QWidget( sv->viewport() );
 	sv->addChild( container );
 
 	QGridLayout *layout = new QGridLayout( container );
 	layout->setMargin( 2 );
 	layout->setSpacing( 4 );
 
 	// Start time
 	layout->addWidget( new QLabel( tr( "Start time" ), container ), 0, 0 );
 	lblStartTime = new QLabel( tr( "n/a" ), container );
 	layout->addWidget( lblStartTime, 0, 1 );
 
 	// Time shift
 	layout->addWidget( new QLabel( tr( "Time shift" ), container ), 1, 0 );
 	lblTimeShift = new QLabel( tr( "n/a" ), container );
 	layout->addWidget( lblTimeShift, 1, 1 );
 
 	// New time
 	layout->addWidget( new QLabel( tr( "New time" ), container ), 2, 0 );
 	lblNewTime = new QLabel( tr( "n/a" ), container );
 	layout->addWidget( lblNewTime, 2, 1 );
 
 	// NTP output display
 	mleNtpOutput = new QMultiLineEdit( container );
 	QFont font(  mleNtpOutput->font() );
 	font.setPointSize( 7 );
 	mleNtpOutput->setFont( font );
 	mleNtpOutput->setWordWrap( QMultiLineEdit::WidgetWidth );
 	layout->addMultiCellWidget( mleNtpOutput, 3, 3, 0, 1 );
 
 	// Set NTP time button
-    m_ntpBtn = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ),
+    m_ntpBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "netsystemtime/ntptab", Opie::Core::OResource::SmallIcon ),
                                 tr( "Get time from the network" ), container );
+    m_ntpBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
 	connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) );
 	layout->addMultiCellWidget( m_ntpBtn, 4, 4, 0, 1 );
 }
 
 NTPTabWidget::~NTPTabWidget()
 {
 }
 
 void NTPTabWidget::setStartTime( const QString &str )
 {
 	lblStartTime->setText( str );
 }
 
 void NTPTabWidget::setTimeShift( const QString &str )
 {
 	lblTimeShift->setText( str );
 }
 
 void NTPTabWidget::setNewTime( const QString &str )
 {
 	lblNewTime->setText( str );
 }
 
 void NTPTabWidget::addNtpOutput( const QString &str )
 {
 	mleNtpOutput->append( str );
 	mleNtpOutput->setCursorPosition( mleNtpOutput->numLines() + 1, 0, FALSE );
 }
 
 void NTPTabWidget::setNTPBtnEnabled( bool enabled )
 {
     m_ntpBtn->setEnabled( enabled );
diff --git a/noncore/settings/netsystemtime/ntptabwidget.h b/noncore/settings/netsystemtime/ntptabwidget.h
index f05482e..a7dd02e 100644
--- a/noncore/settings/netsystemtime/ntptabwidget.h
+++ b/noncore/settings/netsystemtime/ntptabwidget.h
@@ -1,58 +1,60 @@
 /*
-                     This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-      .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-     .>+-=
-_;:,   .>  :=|.         This file is free software; you can
-.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,   .._         License as published by the Free Software
-- .  .-<_>   .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
-  .%`+i>    _;_.
-  .i_,=:_.   -<s.       This file 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 General
-..}^=.=    =    ;      Public License for more details.
-++=  -.   .`   .:
-:   = ...= . :.=-        You should have received a copy of the GNU
--.  .:....=;==+<;          General Public License along with this file;
- -_. . .  )=. =           see the file COPYING. If not, write to the
-  --    :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef NTPTABWIDGET_H
 #define NTPTABWIDGET_H
 
 #include <qwidget.h>
 
 class QLabel;
 class QMultiLineEdit;
 class QPushButton;
 
 class NTPTabWidget : public QWidget
 {
 	Q_OBJECT
 
 public:
 	NTPTabWidget( QWidget * = 0x0 );
 	~NTPTabWidget();
 
 	void setStartTime( const QString & );
 	void setTimeShift( const QString & );
 	void setNewTime( const QString & );
 	void addNtpOutput( const QString & );
     void setNTPBtnEnabled( bool enabled );
 
 private:
 	QLabel         *lblStartTime;
 	QLabel         *lblTimeShift;
 	QLabel         *lblNewTime;
 	QMultiLineEdit *mleNtpOutput;
     QPushButton    *m_ntpBtn;
 
diff --git a/noncore/settings/netsystemtime/predicttabwidget.cpp b/noncore/settings/netsystemtime/predicttabwidget.cpp
index c706add..98e0afd 100644
--- a/noncore/settings/netsystemtime/predicttabwidget.cpp
+++ b/noncore/settings/netsystemtime/predicttabwidget.cpp
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "predicttabwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/timeconversion.h>
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 #include <qtable.h>
 
 #include <stdlib.h>
 
 PredictTabWidget::PredictTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 /*
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
 	tmpvb->addWidget( sv, 0, 0 );
 	sv->setResizePolicy( QScrollView::AutoOneFit );
 	sv->setFrameStyle( QFrame::NoFrame );
 	QWidget *container = new QWidget( sv->viewport() );
 	sv->addChild( container );
 */
 
 	QGridLayout *layout = new QGridLayout( this );
 	layout->setMargin( 2 );
 	layout->setSpacing( 4 );
 
diff --git a/noncore/settings/netsystemtime/predicttabwidget.h b/noncore/settings/netsystemtime/predicttabwidget.h
index da1d8ed..a0f1073 100644
--- a/noncore/settings/netsystemtime/predicttabwidget.h
+++ b/noncore/settings/netsystemtime/predicttabwidget.h
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef PREDICTTABWIDGET_H
 #define PREDICTTABWIDGET_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qwidget.h>
 
 class QLabel;
 class QTable;
 
 class PredictTabWidget : public QWidget
 {
 	Q_OBJECT
 
 public:
 	PredictTabWidget( QWidget * = 0x0 );
 	~PredictTabWidget();
 
 	void setShiftPerSec( int );
 
 private:
 	QTable *tblLookups;
 	QLabel *lblDrift;
 	QLabel *lblDiff;
 	QLabel *lblPredicted;
 
 	float     _shiftPerSec;
 	QString   tz;
 	QDateTime predictedTime;
 
diff --git a/noncore/settings/netsystemtime/settingstabwidget.cpp b/noncore/settings/netsystemtime/settingstabwidget.cpp
index 9315d2e..3bb0ec3 100644
--- a/noncore/settings/netsystemtime/settingstabwidget.cpp
+++ b/noncore/settings/netsystemtime/settingstabwidget.cpp
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "settingstabwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qspinbox.h>
 
 SettingsTabWidget::SettingsTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
 	tmpvb->addWidget( sv, 0, 0 );
 	sv->setResizePolicy( QScrollView::AutoOneFit );
 	sv->setFrameStyle( QFrame::NoFrame );
 	QWidget *container = new QWidget( sv->viewport() );
 	sv->addChild( container );
     
 	QGridLayout *layout = new QGridLayout( container );
 	layout->setMargin( 2 );
 	layout->setSpacing( 4 );
 
 	// Time server selector
 	layout->addWidget( new QLabel( tr( "Time server" ), container ), 0, 0 );
 	cbTimeServer = new QComboBox( TRUE, container );
diff --git a/noncore/settings/netsystemtime/settingstabwidget.h b/noncore/settings/netsystemtime/settingstabwidget.h
index 2901bb3..9578245 100644
--- a/noncore/settings/netsystemtime/settingstabwidget.h
+++ b/noncore/settings/netsystemtime/settingstabwidget.h
@@ -1,58 +1,60 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef SETTINGSTABWIDGET_H
 #define SETTINGSTABWIDGET_H
 
 #include <qwidget.h>
 
 class QCheckBox;
 class QComboBox;
 class QSpinBox;
 
 class SettingsTabWidget : public QWidget
 {
 	Q_OBJECT
 
 public:
 	SettingsTabWidget( QWidget * = 0x0 );
 	~SettingsTabWidget();
 
 	void saveSettings();
 	QString ntpServer();
 
 private:
 	QComboBox *cbTimeServer;
 	QSpinBox  *sbNtpDelay;
 	QSpinBox  *sbPredictDelay;
 	QCheckBox *chNtpTab;
 	QCheckBox *chPredictTab;
 
 signals:
 	void ntpDelayChanged( int );
 	void displayNTPTab( bool );
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp
index 905461f..bcfbdf7 100644
--- a/noncore/settings/netsystemtime/timetabwidget.cpp
+++ b/noncore/settings/netsystemtime/timetabwidget.cpp
@@ -1,66 +1,70 @@
 /*
-                     This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-      .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-     .>+-=
-_;:,   .>  :=|.         This file is free software; you can
-.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,   .._         License as published by the Free Software
-- .  .-<_>   .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
-  .%`+i>    _;_.
-  .i_,=:_.   -<s.       This file 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 General
-..}^=.=    =    ;      Public License for more details.
-++=  -.   .`   .:
-:   = ...= . :.=-        You should have received a copy of the GNU
--.  .:....=;==+<;          General Public License along with this file;
- -_. . .  )=. =           see the file COPYING. If not, write to the
-  --    :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "timetabwidget.h"
 
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/global.h>
-#include <qpe/resource.h>
 #include <qpe/tzselect.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 #include <qspinbox.h>
 
 #include <stdlib.h>
 #include <sys/time.h>
 
 static const int ValueAM = 0;
 static const int ValuePM = 1;
 
 TimeTabWidget::TimeTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 	// Synchronize HW clock to systemtime
 	// This app will update systemtime
 	//  - if Cancel is clicked, will reset systemtime to HW clock's time
 	//  - if Ok is clicked, will leave systemtime as is
 	system("/sbin/hwclock --systohc --utc");
 
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
@@ -80,72 +84,74 @@ TimeTabWidget::TimeTabWidget( QWidget *parent )
 	sbHour->setWrapping( TRUE );
 	layout->addMultiCellWidget( sbHour, 2, 2, 0, 1 );
 
 	// Minutes
 	layout->addMultiCellWidget( new QLabel( tr( "Minute" ), container ), 1, 1, 2, 3 );
 	sbMin = new QSpinBox( container );
 	sbMin->setWrapping( TRUE );
 	sbMin->setMinValue( 0 );
 	sbMin->setMaxValue( 59 );
 	layout->addMultiCellWidget( sbMin, 2, 2, 2, 3 );
 
 	// AM/PM
 	cbAmpm = new QComboBox( container );
 	cbAmpm->insertItem( tr( "AM" ), ValueAM );
 	cbAmpm->insertItem( tr( "PM" ), ValuePM );
 	layout->addMultiCellWidget( cbAmpm, 2, 2, 4, 5 );
 
 	// Date
 	layout->addWidget( new QLabel( tr( "Date" ), container ), 4, 0 );
 	btnDate = new DateButton( TRUE, container );
 	layout->addMultiCellWidget( btnDate, 4, 4, 1, 5 );
 
 	// Timezone
 	layout->addMultiCellWidget( new QLabel( tr( "Time zone" ), container ), 6, 6, 0, 1 );
 	selTimeZone = new TimeZoneSelector( container );
 	connect( selTimeZone, SIGNAL(signalNewTz(const QString&)), this, SLOT(slotTZChanged(const QString&)) );
 	layout->addMultiCellWidget( selTimeZone, 6, 6, 2, 5 );
 
 	// Space filler
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 7, 0 );
 
 	// Set NTP time button
-    m_ntpBtn = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ),
+    m_ntpBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "netsystemtime/ntptab", Opie::Core::OResource::SmallIcon ),
                                 tr( "Get time from the network" ), container );
+    m_ntpBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
 	connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) );
 	layout->addMultiCellWidget( m_ntpBtn, 8, 8, 0, 5 );
 
 	// Set predicted time button
-	QPushButton *pb = new QPushButton( Resource::loadPixmap( "netsystemtime/predicttab" ), tr( "Set predicted time" ),
-						  container );
+	QPushButton *pb = new QPushButton( Opie::Core::OResource::loadPixmap( "netsystemtime/predicttab", Opie::Core::OResource::SmallIcon ),
+                                       tr( "Set predicted time" ), container );
+    pb->setMinimumHeight( AppLnk::smallIconSize()+4 );
 	connect( pb, SIGNAL(clicked()), this, SIGNAL(getPredictedTime()) );
 	layout->addMultiCellWidget( pb, 9, 9, 0, 5 );
 
 	// Space filler at bottom of widget
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 0 );
 
 	// Initialize values
 	Config config( "locale" );
 	config.setGroup( "Location" );
 	selTimeZone->setCurrentZone( config.readEntry( "Timezone", "America/New_York" ) );
 	use12HourTime = FALSE;
 	setDateTime( QDateTime::currentDateTime() );
 }
 
 TimeTabWidget::~TimeTabWidget()
 {
 }
 
 void TimeTabWidget::saveSettings( bool commit )
 {
 	if ( commit )
 	{
 		// Set timezone and announce to world
 		QString tz = selTimeZone->currentZone();
 		Config config("locale");
 		config.setGroup( "Location" );
 		config.writeEntry( "Timezone", tz );
 		setenv( "TZ", tz, 1 );
 		QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
 		setTimeZone << tz;
 
 		// If controls have a valid date & time, update systemtime
diff --git a/noncore/settings/netsystemtime/timetabwidget.h b/noncore/settings/netsystemtime/timetabwidget.h
index 949535d..4674c5c8 100644
--- a/noncore/settings/netsystemtime/timetabwidget.h
+++ b/noncore/settings/netsystemtime/timetabwidget.h
@@ -1,58 +1,60 @@
 /*
-                     This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
+                             Copyright (C) Opie Team <opie-devel@handhelds.org>
                =.
-      .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
-     .>+-=
-_;:,   .>  :=|.         This file is free software; you can
-.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,   .._         License as published by the Free Software
-- .  .-<_>   .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
-  .%`+i>    _;_.
-  .i_,=:_.   -<s.       This file 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 General
-..}^=.=    =    ;      Public License for more details.
-++=  -.   .`   .:
-:   = ...= . :.=-        You should have received a copy of the GNU
--.  .:....=;==+<;          General Public License along with this file;
- -_. . .  )=. =           see the file COPYING. If not, write to the
-  --    :-=`           Free Software Foundation, Inc.,
-                             59 Temple Place - Suite 330,
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program 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., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef TIMETABWIDGET_H
 #define TIMETABWIDGET_H
 
 #include <qwidget.h>
 
 class DateButton;
 class DateFormat;
 class QComboBox;
 class QDateTime;
 class QPushButton;
 class QSpinBox;
 class TimeZoneSelector;
 
 class TimeTabWidget : public QWidget
 {
 	Q_OBJECT
 
 public:
 	TimeTabWidget( QWidget * = 0l );
 	~TimeTabWidget();
 
 	void saveSettings( bool );
 	void setDateTime( const QDateTime & );
     void setNTPBtnEnabled( bool enabled );
 
 private:
 	QSpinBox         *sbHour;
 	QSpinBox         *sbMin;
 	QComboBox        *cbAmpm;
 	DateButton       *btnDate;