44 files changed, 4 insertions, 1 deletions

diff --git a/bin/kdepim/kaddressbook/icons22/1downarrow.png b/bin/kdepim/kaddressbook/icons22/1downarrow.png
new file mode 100644
index 0000000..6dce81c
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1downarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/1leftarrow.png b/bin/kdepim/kaddressbook/icons22/1leftarrow.png
new file mode 100644
index 0000000..3e8f12f
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1leftarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/1leftarrowB.png b/bin/kdepim/kaddressbook/icons22/1leftarrowB.png
new file mode 100644
index 0000000..7e3fda7
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1leftarrowB.png
diff --git a/bin/kdepim/kaddressbook/icons22/1rightarrow.png b/bin/kdepim/kaddressbook/icons22/1rightarrow.png
new file mode 100644
index 0000000..64e126b
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1rightarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/1rightarrowB.png b/bin/kdepim/kaddressbook/icons22/1rightarrowB.png
new file mode 100644
index 0000000..3264e13
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1rightarrowB.png
diff --git a/bin/kdepim/kaddressbook/icons22/1uparrow.png b/bin/kdepim/kaddressbook/icons22/1uparrow.png
new file mode 100644
index 0000000..2db1ce6
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/1uparrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/2downarrow.png b/bin/kdepim/kaddressbook/icons22/2downarrow.png
new file mode 100644
index 0000000..2a5fcc5
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2downarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/2leftarrow.png b/bin/kdepim/kaddressbook/icons22/2leftarrow.png
new file mode 100644
index 0000000..327abae
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2leftarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/2leftarrowB.png b/bin/kdepim/kaddressbook/icons22/2leftarrowB.png
new file mode 100644
index 0000000..4506c40
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2leftarrowB.png
diff --git a/bin/kdepim/kaddressbook/icons22/2rightarrow.png b/bin/kdepim/kaddressbook/icons22/2rightarrow.png
new file mode 100644
index 0000000..29585b0
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2rightarrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/2rightarrowB.png b/bin/kdepim/kaddressbook/icons22/2rightarrowB.png
new file mode 100644
index 0000000..7210438
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2rightarrowB.png
diff --git a/bin/kdepim/kaddressbook/icons22/2uparrow.png b/bin/kdepim/kaddressbook/icons22/2uparrow.png
new file mode 100644
index 0000000..795162b
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/2uparrow.png
diff --git a/bin/kdepim/kaddressbook/icons22/configure.png b/bin/kdepim/kaddressbook/icons22/configure.png
new file mode 100644
index 0000000..96ba433
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/configure.png
diff --git a/bin/kdepim/kaddressbook/icons22/configure_resources.png b/bin/kdepim/kaddressbook/icons22/configure_resources.png
new file mode 100644
index 0000000..0c95c52
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/configure_resources.png
diff --git a/bin/kdepim/kaddressbook/icons22/configure_shortcuts.png b/bin/kdepim/kaddressbook/icons22/configure_shortcuts.png
new file mode 100644
index 0000000..400f342
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/configure_shortcuts.png
diff --git a/bin/kdepim/kaddressbook/icons22/edit.png b/bin/kdepim/kaddressbook/icons22/edit.png
new file mode 100644
index 0000000..ce8b226
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/edit.png
diff --git a/bin/kdepim/kaddressbook/icons22/editcopy.png b/bin/kdepim/kaddressbook/icons22/editcopy.png
new file mode 100644
index 0000000..eac4d8c
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/editcopy.png
diff --git a/bin/kdepim/kaddressbook/icons22/editcut.png b/bin/kdepim/kaddressbook/icons22/editcut.png
new file mode 100644
index 0000000..192b575
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/editcut.png
diff --git a/bin/kdepim/kaddressbook/icons22/editdelete.png b/bin/kdepim/kaddressbook/icons22/editdelete.png
new file mode 100644
index 0000000..6fb193f
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/editdelete.png
diff --git a/bin/kdepim/kaddressbook/icons22/editpaste.png b/bin/kdepim/kaddressbook/icons22/editpaste.png
new file mode 100644
index 0000000..52b992a
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/editpaste.png
diff --git a/bin/kdepim/kaddressbook/icons22/edittrash.png b/bin/kdepim/kaddressbook/icons22/edittrash.png
new file mode 100644
index 0000000..eea039d
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/edittrash.png
diff --git a/bin/kdepim/kaddressbook/icons22/exit.png b/bin/kdepim/kaddressbook/icons22/exit.png
new file mode 100644
index 0000000..119e5ef
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/exit.png
diff --git a/bin/kdepim/kaddressbook/icons22/filenew.png b/bin/kdepim/kaddressbook/icons22/filenew.png
new file mode 100755
index 0000000..78ec0f8
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/filenew.png
diff --git a/bin/kdepim/kaddressbook/icons22/fileopen.png b/bin/kdepim/kaddressbook/icons22/fileopen.png
new file mode 100644
index 0000000..a79982e
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/fileopen.png
diff --git a/bin/kdepim/kaddressbook/icons22/fileprint.png b/bin/kdepim/kaddressbook/icons22/fileprint.png
new file mode 100644
index 0000000..6ddf8ea
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/fileprint.png
diff --git a/bin/kdepim/kaddressbook/icons22/filesave.png b/bin/kdepim/kaddressbook/icons22/filesave.png
new file mode 100644
index 0000000..3bc2a37
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/filesave.png
diff --git a/bin/kdepim/kaddressbook/icons22/filter.png b/bin/kdepim/kaddressbook/icons22/filter.png
new file mode 100644
index 0000000..80187fc
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/filter.png
diff --git a/bin/kdepim/kaddressbook/icons22/gohome.png b/bin/kdepim/kaddressbook/icons22/gohome.png
new file mode 100644
index 0000000..37a5231
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/gohome.png
diff --git a/bin/kdepim/kaddressbook/icons22/kaddressbook.png b/bin/kdepim/kaddressbook/icons22/kaddressbook.png
new file mode 100644
index 0000000..ff5cfdf
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/kaddressbook.png
diff --git a/bin/kdepim/kaddressbook/icons22/mail_post_to.png b/bin/kdepim/kaddressbook/icons22/mail_post_to.png
new file mode 100644
index 0000000..384cbf3
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/mail_post_to.png
diff --git a/bin/kdepim/kaddressbook/icons22/mail_send.png b/bin/kdepim/kaddressbook/icons22/mail_send.png
new file mode 100644
index 0000000..a802f04
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/mail_send.png
diff --git a/bin/kdepim/kaddressbook/icons22/next.png b/bin/kdepim/kaddressbook/icons22/next.png
new file mode 100644
index 0000000..cfab7cf
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/next.png
diff --git a/bin/kdepim/kaddressbook/icons22/package_network.png b/bin/kdepim/kaddressbook/icons22/package_network.png
new file mode 100644
index 0000000..3f7323c
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/package_network.png
diff --git a/bin/kdepim/kaddressbook/icons22/package_toys.png b/bin/kdepim/kaddressbook/icons22/package_toys.png
new file mode 100644
index 0000000..eea4fc7
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/package_toys.png
diff --git a/bin/kdepim/kaddressbook/icons22/redo.png b/bin/kdepim/kaddressbook/icons22/redo.png
new file mode 100644
index 0000000..6aacd4f
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/redo.png
diff --git a/bin/kdepim/kaddressbook/icons22/reload.png b/bin/kdepim/kaddressbook/icons22/reload.png
new file mode 100644
index 0000000..3fa8db7
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/reload.png
diff --git a/bin/kdepim/kaddressbook/icons22/smallcal.png b/bin/kdepim/kaddressbook/icons22/smallcal.png
new file mode 100644
index 0000000..ea7af8e
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/smallcal.png
diff --git a/bin/kdepim/kaddressbook/icons22/undo.png b/bin/kdepim/kaddressbook/icons22/undo.png
new file mode 100644
index 0000000..d4b682b
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/undo.png
diff --git a/bin/kdepim/kaddressbook/icons22/vcard.png b/bin/kdepim/kaddressbook/icons22/vcard.png
new file mode 100644
index 0000000..a8b9429
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/vcard.png
diff --git a/bin/kdepim/kaddressbook/icons22/view_detailed.png b/bin/kdepim/kaddressbook/icons22/view_detailed.png
new file mode 100644
index 0000000..19ab36e
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/view_detailed.png
diff --git a/bin/kdepim/kaddressbook/icons22/view_remove.png b/bin/kdepim/kaddressbook/icons22/view_remove.png
new file mode 100644
index 0000000..02511b7
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/view_remove.png
diff --git a/bin/kdepim/kaddressbook/icons22/window_new.png b/bin/kdepim/kaddressbook/icons22/window_new.png
new file mode 100644
index 0000000..4d0a40a
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/window_new.png
diff --git a/bin/kdepim/kaddressbook/icons22/world.png b/bin/kdepim/kaddressbook/icons22/world.png
new file mode 100644
index 0000000..e515bdd
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/world.png
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index b7d6b2b..c127601 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,170 +1,173 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h> 
 #include <qplatinumstyle.h> 
 #include <qmainwindow.h> 
 #endif
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kaddressbookmain.h"
 
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv ); 
   QApplication::setStyle( new QPlatinumStyle ());
 #endif
   
   bool exitHelp = false;
   if ( argc > 1 ) {
       QString command = argv[1];
       if (  command == "-help" ){
           printf("KA/E command line commands:\n");
           printf("  no command: Start KA/E in usual way\n");
           printf("  -help: This output\n");  
           printf(" KA/E is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
 
     KGlobal::setAppName( "kaddressbook" );
 #ifndef DESKTOP_VERSION
-      KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
+    if ( QApplication::desktop()->width() > 320 )
+        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/");
+    else
+        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
 #else
       QString fileName ;
       fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 
 #endif 
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
        KAddressBookMain* m = new KAddressBookMain();
 //US      MainWindow m;
 //US      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
 
 #ifndef DESKTOP_VERSION
        a.showMainWidget(m );
        m->showMaximized();
 #else
       a.setMainWidget(m );
       m->show();
       //m->resize( 640, 480 );
 #endif
       a.exec();
       
   }
   qDebug("KA: Bye! ");
 }
 
 /*
 #include <stdlib.h>
 
 #include <qstring.h>
 
 #include <kabc/stdaddressbook.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstartupinfo.h>
 #include <kuniqueapplication.h>
 #include <kwin.h>
 
 #include "kaddressbookmain.h"
 #include "kabcore.h"
 
 extern "C" {
 
 void crashHandler( int )
 {
   KABC::StdAddressBook::handleCrash();
   ::exit( 0 );
 }
 
 }
 
 class KAddressBookApp : public KUniqueApplication {
   public:
     KAddressBookApp() : mMainWin( 0 ) {}
     ~KAddressBookApp() {}
 
     int newInstance();
 
   private:
     KAddressBookMain *mMainWin;
 };
 
 int KAddressBookApp::newInstance()
 {
   if ( isRestored() ) {
     // There can only be one main window
     if ( KMainWindow::canBeRestored( 1 ) ) {
       mMainWin = new KAddressBookMain;
       mMainWin->show();
       mMainWin->restore( 1 );
     }
   } else {
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     QCString addrStr = args->getOption( "addr" );
     QCString uidStr = args->getOption( "uid" );
     QString addr;
     QString uid;
     if ( !addrStr.isEmpty() )
       addr = QString::fromLocal8Bit( addrStr );
     if ( !uidStr.isEmpty() )
       uid = QString::fromLocal8Bit( uidStr );
 
 
     if ( args->isSet( "editor-only" ) ) {
       if ( !mMainWin )
         mMainWin = new KAddressBookMain;
         KStartupInfo::appStarted();
         mMainWin->hide();
     } else {
       if ( mMainWin ) {
         mMainWin->show();
         KWin::setActiveWindow( mMainWin->winId() );
       } else {
         mMainWin = new KAddressBookMain;
         mMainWin->show();
       }
     }
     // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do
     if ( !addr.isEmpty() )
       mMainWin->addEmail( addr );
 
     if ( !uid.isEmpty() )
       mMainWin->showContactEditor( uid );
     if ( args->isSet( "new-contact" ) ) {
       mMainWin->newContact();
     }
   }
 
   KCrash::setEmergencySaveFunction( crashHandler );
 
   return 0;
 }
 
 // the dummy argument is required, because KMail apparently sends an empty
 // argument.
 static KCmdLineOptions kmoptions[] =
 {
   { "a", 0 , 0 },
   { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
   { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 },
   { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 },
   { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
   { "+[argument]", I18N_NOOP( "dummy argument" ), 0},
   { 0, 0, 0}
 };