4 files changed, 6 insertions, 5 deletions

diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 5e7783b..af64b99 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,84 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.24
+Version: 2.0.25
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7aa3b60..9505d06 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2247,201 +2247,201 @@ void  MainWindow::loadCalendar()
         QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                               i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
                               0, 1 );
 
         return;
     }
     if ( loadbup ) {
         mView->openCalendar( fn );
         KOPrefs::instance()->mLastLoadFile = fn;
         mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
         setCaption(mess);
     }
 
 }
 void  MainWindow::quickImportIcal()
 {
     importFile( KOPrefs::instance()->mLastImportFile, false );
 }
 void MainWindow::importFile( QString  fn, bool quick )
 {
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            mess );
         return;
     }
     int result = 0;
     if ( !quick ) {
         mess = i18n(  "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                        mess,
                                        "Import", "Cancel", 0,
                                        0, 1 );
     }
     if ( result == 0 ) {
         if ( mView->openCalendar( fn, true )) {
             KOPrefs::instance()->mLastImportFile = fn;
             setCaption(i18n("Imported file successfully"));
         } else {
             setCaption(i18n("Error importing file"));
         }
     }
 }
 
 void   MainWindow::importIcal()
 {
 
     QString fn =KOPrefs::instance()->mLastImportFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     importFile(  fn, true );
 
 }
 
 void MainWindow::exportVCalendar()
 {
     QString fn =  KOPrefs::instance()->mLastVcalFile;
     fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
         if ( mView->exportVCalendar( fn ) ) {
             KOPrefs::instance()->mLastVcalFile = fn;
             if ( fn.length() > 20 )
                 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
 QString MainWindow::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysynccal.ics" );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif 
 }
 
 void MainWindow::syncFileRequest()
 {
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
 
     setCaption(i18n("Saving Data to temp file ..." ));
     mView->saveCalendar( sentSyncFile() );
     setCaption(i18n("Data saved to temp file!" ));
 
 }
 void MainWindow::getFile( bool success )
 {
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mView->openCalendar( sentSyncFile() ); 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
     setCaption( i18n("Pi-Sync successful!") );
 } 
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
 
 #include "libkdepim/kdatepicker.h"
 #include <kdatetbl.h>
 
 void MainWindow::weekAction()
 {
     int month;
     KPopupFrame* popup = new KPopupFrame(this);
     KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
     // -----
     picker->resize(picker->sizeHint());
     popup->setMainWidget(picker);
     picker->setFocus();
     connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
     int x = 0;
     int y = iconToolBar->height();
     int dX = 0;
     int dY = 0;
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         if ( iconToolBar->y() > height()/2 ) {
             dY = picker->sizeHint().height()+8;
             y = 0;
         }
     } else {
         if ( iconToolBar->x() > width()/2 ) { // right side
             x=0;
             dX= picker->sizeHint().width()+8;
             y = 0;
         } else {
             x= iconToolBar->width();
             y = 0;
         }
     }
     //qDebug("dax %d  dy %d         %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
     if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
         {
             month = picker->getResult();
             emit selectWeek ( month );
             //qDebug("weekSelected %d ", month);
         }
     delete popup;
 }
   
 void  MainWindow::hideEvent ( QHideEvent * )
 {
     QString message; 
     QDateTime nextA = mCalendar->nextAlarmEventDateTime();
     if ( nextA.isValid() ) {
         QString sum = mCalendar->nextSummary();   
         
         message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
         setCaption( message );
     } 
 }
 
 void MainWindow::resizeEvent( QResizeEvent* e)
 {
 #ifndef DESKTOP_VERSION
-    if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar ) {
-        if (QApplication::desktop()->width() > QApplication::desktop()->height() )
+    if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
+        if (QApplication::desktop()->width() > QApplication::desktop()->height()  )
             filterToolBar->hide();
         else
             filterToolBar->show();
     }
 #endif
     QMainWindow::resizeEvent( e);
 }
diff --git a/microkde/ofontselector.cpp b/microkde/ofontselector.cpp
index c8471cc..05095f3 100644
--- a/microkde/ofontselector.cpp
+++ b/microkde/ofontselector.cpp
@@ -1,332 +1,333 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library 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 library 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 <qlayout.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qfont.h>
 #include <qmultilineedit.h>
 
 #include <qpe/fontdatabase.h>
 
 #include "ofontselector.h"
 
 class OFontSelectorPrivate {
 public:
         QListBox *      m_font_family_list;
         QComboBox *     m_font_style_list;
         QComboBox *     m_font_size_list;
         QMultiLineEdit *m_preview;
 
         bool            m_pointbug : 1;
 
         FontDatabase    m_fdb;
 };
 
 namespace {
 
 class FontListItem : public QListBoxText {
 public:
         FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText ( )
         {
                 m_name = t;
                 m_styles = styles;
                 m_sizes = sizes;
 
                 QString str = t;
                 str [0] = str [0]. upper ( );
                 setText ( str );
         }
 
         QString family ( ) const
         {
                 return m_name;
         }
 
         const QStringList &styles ( ) const
         {
                 return m_styles;
         }
 
         const QValueList<int> &sizes ( ) const
         {
                 return m_sizes;
         }
 
 private:
         QStringList m_styles;
         QValueList<int> m_sizes;
         QString m_name;
 };
 
 
 static int findItemCB ( QComboBox *box, const QString &str )
 {
         for ( int i = 0; i < box-> count ( ); i++ ) {
                 if ( box-> text ( i ) == str )
                         return i;
         }
         return -1;
 }
 
 }
 /* static same as anon. namespace */
 static int qt_version ( )
 {
         const char *qver = qVersion ( );
 
         return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
 }
 
 /**
  * Constructs the Selector object
  * @param withpreview If a font preview should be given
  * @param parent The parent of the Font Selector
  * @param name The name of the object
  * @param fl WidgetFlags
  */
 OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl )
 {
         d = new OFontSelectorPrivate ( );
 
         QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 );
         gridLayout->setRowStretch ( 4, 10 );
 
         d-> m_font_family_list = new QListBox( this, "FontListBox" );
         gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 );
         connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) );
 
         QLabel *label = new QLabel( tr( "Style" ), this );
         gridLayout->addWidget( label, 0, 1 );
 
         d-> m_font_style_list = new QComboBox( this, "StyleListBox" );
         connect( d-> m_font_style_list, SIGNAL(  activated( int ) ), this, SLOT( fontStyleClicked( int ) ) );
         gridLayout->addWidget( d-> m_font_style_list, 1, 1 );
 
         label = new QLabel( tr( "Size" ), this );
         gridLayout->addWidget( label, 2, 1 );
 
         d-> m_font_size_list = new QComboBox( this, "SizeListBox" );
         connect( d-> m_font_size_list, SIGNAL(  activated( int ) ),
                          this, SLOT( fontSizeClicked( int ) ) );
         gridLayout->addWidget( d-> m_font_size_list, 3, 1 );
 
-        d-> m_pointbug = ( qt_version ( ) <= 233 );
+        //d-> m_pointbug = ( qt_version ( ) <= 233 );
+        d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2
 
         if ( withpreview ) {
                 d-> m_preview = new QMultiLineEdit ( this, "Preview" );
                 d-> m_preview-> setAlignment ( AlignCenter );
                 d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth );
                 d-> m_preview-> setMargin ( 3 );
                 d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ));
                 gridLayout-> addRowSpacing ( 5, 4 );
                 gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 );
                 gridLayout-> setRowStretch ( 6, 5 );
         }
         else
                 d-> m_preview = 0;
 
         loadFonts ( d-> m_font_family_list );
 }
 
 OFontSelector::~OFontSelector ( )
 {
         delete d;
 }
 
 /**
  * This methods tries to set the font
  * @param f The wishes font
  * @return success or failure
  */
 bool OFontSelector::setSelectedFont ( const QFont &f )
 {
         return setSelectedFont ( f. family ( ), d-> m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( )));
 }
 
 
 /**
  * This is an overloaded method @see setSelectedFont
  * @param familyStr The family of the font
  * @param styleStr The style of the font
  * @param sizeVal The size of font
  * @param charset The charset to be used. Will be deprecated by QT3
  */
 bool OFontSelector::setSelectedFont ( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset )
 {
         QString sizeStr = QString::number ( sizeVal );
 
         QListBoxItem *family = d-> m_font_family_list-> findItem ( familyStr );
         if ( !family )
                 family = d-> m_font_family_list-> findItem ( "Helvetica" );
         if ( !family )
                 family = d-> m_font_family_list-> firstItem ( );
             d-> m_font_family_list-> setCurrentItem ( family );
         fontFamilyClicked ( d-> m_font_family_list-> index ( family ));
 
         int style = findItemCB ( d-> m_font_style_list, styleStr );
         if ( style < 0 )
                 style = findItemCB ( d-> m_font_style_list, "Regular" );
         if ( style < 0 && d-> m_font_style_list-> count ( ) > 0 )
                 style = 0;
         d-> m_font_style_list-> setCurrentItem ( style );
         fontStyleClicked ( style );
 
         int size = findItemCB ( d-> m_font_size_list, sizeStr );
         if ( size < 0 )
                 size = findItemCB ( d-> m_font_size_list, "10" );
         if ( size < 0 && d-> m_font_size_list-> count ( ) > 0 )
                 size = 0;
         d-> m_font_size_list-> setCurrentItem ( size );
         fontSizeClicked ( size );
 
         return (( family ) && ( style >= 0 ) && ( size >= 0 ));
 }
 
 /**
  * This method returns the name, style and size of the currently selected
  * font or false if no font is selected
  * @param family The font family will be written there
  * @param style The style will be written there
  * @param size The size will be written there
  * @return success or failure
  */
 bool OFontSelector::selectedFont ( QString &family, QString &style, int &size )
 {
         QString dummy;
         return selectedFont ( family, style, size, dummy );
 }
 
 
 /**
  * This method does return the font family or QString::null if there is
  * no font item selected
  * @return the font family
  */
 QString OFontSelector::fontFamily ( ) const
 {
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( ));
 
         return fli ? fli-> family ( ) : QString::null;
 }
 
 /**
  * This method will return the style of the font or QString::null
  * @return the style of the font
  */
 QString OFontSelector::fontStyle ( ) const
 {
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( ));
         int fst = d-> m_font_style_list-> currentItem ( );
 
         return ( fli && fst >= 0 ) ? fli-> styles ( ) [fst] : QString::null;
 }
 
 /**
  * This method will return the font size or 10 if no font size is available
  */
 int OFontSelector::fontSize ( ) const
 {
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( ));
         int fsi = d-> m_font_size_list-> currentItem ( );
 
         return ( fli && fsi >= 0 ) ? fli-> sizes ( ) [fsi] : 10;
 }
 
 /**
  * returns the charset of the font or QString::null
  */
 QString OFontSelector::fontCharSet ( ) const
 {
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( ));
 
         return fli ? d-> m_fdb. charSets ( fli-> family ( )) [0] : QString::null;
 }
 
 /**
  * Overloaded member function see above
  * @see selectedFont
  */
 bool OFontSelector::selectedFont ( QString &family, QString &style, int &size, QString &charset )
 {
         int ffa = d-> m_font_family_list-> currentItem ( );
         int fst = d-> m_font_style_list-> currentItem ( );
         int fsi = d-> m_font_size_list-> currentItem ( );
 
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( ffa );
 
         if ( fli ) {
                 family = fli-> family ( );
                 style = fst >= 0 ? fli-> styles ( ) [fst] : QString::null;
                 size = fsi >= 0 ? fli-> sizes ( ) [fsi] : 10;
                 charset = d-> m_fdb. charSets ( fli-> family ( )) [0];
 
                 return true;
         }
         else
                 return false;
 }
 
 
 
 
 void OFontSelector::loadFonts ( QListBox *list )
 {
         QStringList f = d-> m_fdb. families ( );
 
         for ( QStringList::ConstIterator it = f. begin ( ); it != f. end ( ); ++it ) {
                 QValueList <int> ps = d-> m_fdb. pointSizes ( *it );
 
                 if ( d-> m_pointbug ) {
                         for ( QValueList <int>::Iterator it = ps. begin ( ); it != ps. end ( ); it++ )
                                 *it /= 10;
                 }
 
                 list-> insertItem ( new FontListItem ( *it, d-> m_fdb. styles ( *it ), ps ));
         }
 }
 
 void OFontSelector::fontFamilyClicked ( int index )
 {
         QString oldstyle = d-> m_font_style_list-> currentText ( );
         QString oldsize  = d-> m_font_size_list-> currentText ( );
 
         FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( index );
 
         d-> m_font_style_list-> clear ( );
         d-> m_font_style_list-> insertStringList ( fli-> styles ( ));
         d-> m_font_style_list-> setEnabled ( !fli-> styles ( ). isEmpty ( ));
 
         int i;
 
         i = findItemCB ( d-> m_font_style_list, oldstyle );
         if ( i < 0 )
                 i = findItemCB ( d-> m_font_style_list, "Regular" );
         if (( i < 0 ) && ( d-> m_font_style_list-> count ( ) > 0 ))
                 i = 0;
diff --git a/version b/version
index f601af0..1065c0d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.24";
+version = "2.0.25";