2 files changed, 10 insertions, 4 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 739949d..5fc3f2f 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -1,240 +1,241 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     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 General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 //
 // Journal Entry
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktextedit.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include "koprefs.h"
 #include <klineedit.h>
 #include <kdialog.h>
 #include "kolocationbox.h"
 
 #include <libkcal/journal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include "journalentry.h"
 //#include "journalentry.moc"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QFrame(parent)
 {
 
     int fac = 5;
     heiHint = QApplication::desktop()->height();
     if ( heiHint > 800 )
         fac += 2;
     heiHint = heiHint / fac;
 
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   visibleMode = true;
   QHBox * vb = new QHBox ( this );
   QPixmap iconp;
   vb->setMargin ( KDialog::marginHint()-1 );
   QPushButton * toggleJournal = new QPushButton( vb );
   iconp = SmallIcon("1updownarrow");
   toggleJournal->setPixmap (iconp ) ;
   QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
-  vb->setStretchFactor (textLabel,1);
-  vb->setStretchFactor( toggleJournal, 1 );
   mTitle = new KOLocationBox(TRUE, vb, 30);
   mTitle->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred ,QSizePolicy::Fixed  ,FALSE) );
   mCalendarBox = new QComboBox(vb);
   mCalendarBox->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred ,QSizePolicy::Fixed  ,FALSE) );
 #ifndef DESKTOP_VERSION
   mTitle->setSizeLimit( 8 );
   mCalendarBox->setSizeLimit( 8 );
 #endif
   vb->setStretchFactor ( mTitle, 8 );
   int limit = 3;
   if ( QApplication::desktop()->width() < 640 )
       limit = 6;
   vb->setStretchFactor ( mCalendarBox, limit ); 
   //mTitleLabel->setMargin(0);
   //mTitleLabel->setAlignment(AlignCenter);
   QPushButton * loadTemplate = new QPushButton( vb );
   QPushButton * saveTemplate = new QPushButton( vb );
   if ( QApplication::desktop()->width() < 321 ) 
       iconp = SmallIcon("fileexport16");
   else
       iconp = SmallIcon("fileexport");
   saveTemplate->setPixmap (iconp ) ;
   int size = saveTemplate->sizeHint().height();
   if ( QApplication::desktop()->width() < 321 ) 
       iconp = SmallIcon("fileimport16");
   else
       iconp = SmallIcon("fileimport");
   loadTemplate->setPixmap (iconp ) ;
   loadTemplate->setFixedSize(  size, size );
   saveTemplate->setFixedSize(  size, size );
-  toggleJournal->setFixedSize( size  , size );
+  int widwid = size;
+  if ( QApplication::desktop()->width() < 320 )
+      widwid = size/2+1;
+  toggleJournal->setFixedSize( widwid , size );
   mTitle->setFixedHeight( size+4);
   mCalendarBox->setFixedHeight( size+4);
   mEditor = new KTextEdit(this);
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
   mMaxWidDiff = 3*size - 2*frameWidth() - textLabel->sizeHint().width();
   mDeskWid = QApplication::desktop()->width();
   int maxwid = mDeskWid - mMaxWidDiff;
   if ( QApplication::desktop()->width() < 640 ) {
       mTitle->setMaximumWidth( maxwid/2 +20 );
       mCalendarBox->setMaximumWidth( maxwid/2 -20);
   } else {
       mTitle->setMaximumWidth( (maxwid/4)*3);
       mCalendarBox->setMaximumWidth( maxwid/2 );
   }
   //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
   QBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
   mTitle->load( KOLocationBox::SUMMARYJOURNAL );
   mTitle->lineEdit ()->setText("");
 }
 
 JournalEntry::~JournalEntry()
 {
     //qDebug("JournalEntry::~JournalEntry() ");
 }
 void JournalEntry::resizeEvent(QResizeEvent* e ) 
 {
 #ifndef DESKTOP_VERSION
 
     if ( mDeskWid != QApplication::desktop()->width() ) {
         mDeskWid == QApplication::desktop()->width();
         int maxwid = mDeskWid - mMaxWidDiff;
         if ( QApplication::desktop()->width() < 640 ) {
             mTitle->setMaximumWidth( maxwid/2 +20 );
             mCalendarBox->setMaximumWidth( maxwid/2 -20);
         }
         else {
             mTitle->setMaximumWidth( (maxwid/4)*3);
             mCalendarBox->setMaximumWidth( maxwid/2 );
         }
         //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
     }
     //setMaximumWidth( QApplication::desktop()->width() );
     //qDebug("MAXXX %d ", QApplication::desktop()->width());
 #endif
     QFrame::resizeEvent( e ); 
 }
 QSize JournalEntry::sizeHint() const
 {
     return QSize ( 240, heiHint );
 }
 void JournalEntry::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );
     if ( fileName.length() == 0 )
         return;
 
     QFile fileIn( fileName );
     if (!fileIn.open( IO_WriteOnly ) ) {
         KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
                             .arg( fileName ) );
         return;
     } 
     // QString text;
     QTextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     tsIn << mEditor->text();
     fileIn.close();  
 }
 void JournalEntry::slotLoadTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getOpenFileName(  fileName , i18n("Insert Journal template"), this );
     if ( fileName.length() == 0 )
         return;
     QFile fileIn( fileName );
     if (!fileIn.open( IO_ReadOnly ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return;
     }
     QTextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     QString text =  tsIn.read();
     fileIn.close();  
     int line, col;
     mEditor->getCursorPosition (& line, & col );
     mEditor-> insertAt ( text, line, col, true ); 
     //mEditor->setIgnoreMark( true );
 }
 void JournalEntry::setDate(const QDate &date)
 {
     showOnlyMode = false;
   writeJournal();
   mDate = date;
   fillCalendar( mCalendar->defaultCalendar() );
 }
 void JournalEntry::fillCalendar( int setToID )
 {
     mCalendarBox->clear();
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int std = 0;
     int count = 0;
     while ( kkf ) {
         if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) ||  setToID == kkf->mCalNumber ) {
             if ( setToID ) {
                 if ( kkf->mCalNumber == setToID ) 
                     std = count;
             } else {
                 if ( kkf->isStandard ) {
                     std = count;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index aa55d82..e601eef 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -1,256 +1,261 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     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 General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qwidget.h>
 #include <qtooltip.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qbuttongroup.h>
 #include <qvgroupbox.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qregexp.h>
 
 
 #include <kglobal.h>
 #include <kdialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 #include <kstandarddirs.h>
 
 #include <libkcal/todo.h>
 #include <libkcal/event.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kdateedit.h>
 
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koeditorgeneral.h"
 #include "kolocationbox.h"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
 KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) :
     QObject( parent, name)
 {
     mNextFocus = 0;
 }
 
 KOEditorGeneral::~KOEditorGeneral()
 {
 }
 
 void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
 {
     QGridLayout *headerLayout = new QGridLayout(topLayout);
 
 #if 0
     mOwnerLabel = new QLabel(i18n("Owner:"),parent);
     headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1);
 #endif
     // 1 on pda
     // 11 on desktop
     headerLayout->setSpacing( (KDialog::spacingHint()-3)*2+1 );
     QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent);
     headerLayout->addWidget(summaryLabel,0,0);
 
     mSummaryEdit = new KOLocationBox(TRUE,parent, 50);
     mSummaryEdit->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
     //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) );
     //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() );
     int hei =  (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2;
     if ( QApplication::desktop()->width() > 320 ) 
         mSummaryEdit->setMaximumHeight( hei +6 );
     //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed ,  QSizePolicy::Minimum ,   QSizePolicy:: Maximum ,   QSizePolicy:: Preferred  ,    QSizePolicy::  MinimumExpanding , QSizePolicy::Expanding   );
     // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }
     //   mSummaryEdit = new QLineEdit(parent);
     if ( QApplication::desktop()->height() < 320 ) 
         headerLayout->addWidget(mSummaryEdit,0,1);
     else
         headerLayout->addMultiCellWidget(mSummaryEdit,0,0,1,2);
     connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
   
     QLabel *locationLabel = new QLabel(i18n("Location:"),parent);
     if ( QApplication::desktop()->height() < 320 ) 
         headerLayout->addWidget(locationLabel,0,2);
     else
         headerLayout->addWidget(locationLabel,1,0);
 
     mLocationEdit = new KOLocationBox(TRUE,parent,30); 
     mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding ,FALSE) );
     if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) 
         mLocationEdit->setMaximumHeight( hei + 6);
 
     //   mLocationEdit = new QLineEdit(parent);
     connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
 
     mCalendarBox = new QComboBox ( parent );
     mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding ,FALSE) );
     if ( QApplication::desktop()->height() < 320 ) {
         headerLayout->addWidget(mLocationEdit,0,3);
         headerLayout->addWidget(mCalendarBox,0,4);
         headerLayout->setColStretch( 1, 10);
         headerLayout->setColStretch( 3, 10);
         mCalendarBox->setMaximumWidth( 64 );
     }
     else {
         headerLayout->addWidget(mLocationEdit,1,1);
         headerLayout->addWidget(mCalendarBox,1,2);
-        headerLayout->setColStretch( 1, 3);
+        int str = 3;
+        if ( QApplication::desktop()->width() < 320 ) {
+            --str;
+            --str;
+        }
+        headerLayout->setColStretch( 1, str);
         headerLayout->setColStretch( 2, 1);
     }
     
 }
 void KOEditorGeneral::setFocusOn( int i )
 {
     mNextFocus = i;
     QTimer::singleShot( 0, this, SLOT ( slotSetFocusOn() ));
 }
 void KOEditorGeneral::slotSetFocusOn()
 {
     mNextFocus;
     if ( mNextFocus == 1 ) {
         mDescriptionEdit->setFocus();
         mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333);
     } 
     if ( mNextFocus == 2 ) {
         mSummaryEdit->setFocus();
     }
 }
 void KOEditorGeneral::editCategories()
 {
     // qDebug("KOEditorGeneral::editCategories() ");
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     connect(csd,SIGNAL(categoriesSelected(const QString &)), this ,SLOT(setCategories(const QString &)));
     //KOGlobals::fitDialogToScreen( csd );
     csd->setColorEnabled();
     csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) );
     csd->exec();
     delete csd;
 }
 
 void KOEditorGeneral::showCatPopup()
 {
     mCatPopup->clear(); 
     QStringList checkedCategories = QStringList::split (",", mCategoriesLabel->text());
     int index = 0;
     for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
          it != KOPrefs::instance()->mCustomCategories.end ();
          ++it) {
         mCatPopup->insertItem (*it, index );
         //mCategory[index] = *it;
         if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true);
         ++index;
     }
 }
 void KOEditorGeneral::selectedCatPopup( int index )
 {
     QStringList categories =  QStringList::split (",", mCategoriesLabel->text());
     QString colcat = categories.first();
     if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ())
       categories.remove (KOPrefs::instance()->mCustomCategories[index]);
     else
         categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]);
     categories.sort ();
     if ( !colcat.isEmpty() ) {
         if ( categories.find ( colcat ) != categories.end () ) {
             categories.remove( colcat );
             categories.prepend( colcat );
         }
     }
     setCategories( categories.join(",") );
 }
 
 void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
 {
     QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
     mCatPopup = new QPopupMenu ( parent );
     mCatPopup->setCheckable (true);
     connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
     connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
     mCategoriesButton = new QPushButton(parent);
     mCategoriesButton->setText(i18n("Categories..."));
     connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
     //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
     categoriesLayout->addWidget(mCategoriesButton);
     mCategoriesLabel = new QPushButton(parent);//new QLabel(parent);
     mCategoriesLabel->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
     mCategoriesLabel->setPopup( mCatPopup );
     //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
     categoriesLayout->addWidget(mCategoriesLabel,1);
 }
 
 void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
 {
     QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
 
     QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
     mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
     secrecyLayout->addWidget(mCancelBox);
     secrecyLayout->addWidget(secrecyLabel);
 
     mSecrecyCombo = new QComboBox(parent);
     mSecrecyCombo->insertStringList(Incidence::secrecyList());
     secrecyLayout->addWidget(mSecrecyCombo);
 }
 
 void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
 {
     mDescriptionEdit = new KTextEdit(parent);
     mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont );
     mDescriptionEdit->append("");
     mDescriptionEdit->setReadOnly(false);
     mDescriptionEdit->setOverwriteMode(false);
     mDescriptionEdit->setWordWrap( KTextEdit::WidgetWidth ); 
     topLayout->addWidget(mDescriptionEdit); 
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mDescriptionEdit, QPEApplication::RightOnHold );
 #endif
  
 }
 
 void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
 {
     QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
 
     //mAlarmBell = new QLabel(parent);
     //mAlarmBell->setPixmap(SmallIcon("bell"));
     //alarmLayout->addWidget(mAlarmBell);
     if ( QApplication::desktop()->width() < 320 ) 
         mAlarmButton = new QCheckBox(i18n("Rem."),parent);
     else
         mAlarmButton = new QCheckBox(i18n("Reminder:"),parent);
       
     connect(mAlarmButton, SIGNAL(toggled(bool)), SLOT(enableAlarmEdit(bool)));
     alarmLayout->addWidget(mAlarmButton);
 
     mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit  "  ) ;