4 files changed, 48 insertions, 6 deletions

diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 90caaf4..41d331a 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -57,7 +57,12 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
    mCatPopup->setCheckable (true);
    connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
    connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
+    mCalPopup = new QPopupMenu ( this );
+    mCalPopup->setCheckable (true);
+    connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
+    connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
    mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
+    mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
    QValueList<int>::Iterator it;
    for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
        mSingleOnlyItems.append(*it);
@@ -74,9 +79,29 @@ void KOEventPopupMenu::enableDefault( bool enable )
     
 }
 
+void KOEventPopupMenu::fillCalPopup() // CAL
+{
+    mCalPopup->clear();
+    if (!mCurrentIncidence) return;
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly )
+            mCalPopup->setItemEnabled( index, false );
+        mCalPopup->setItemChecked (index, kkf->mCalNumber == mCurrentIncidence->calID());
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+}
+void KOEventPopupMenu::computeCalPopup( int index ) // CAL
+{
+    if (!mCurrentIncidence) return;
+    mCurrentIncidence->setCalID( index );
+    emit categoryChanged( mCurrentIncidence );
+}
 void KOEventPopupMenu::fillCatPopup()
 {
     mCatPopup->clear(); 
+    if (!mCurrentIncidence) return;
     QStringList checkedCategories = mCurrentIncidence->categories();
     int index = 0;
     for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
@@ -91,6 +116,7 @@ void KOEventPopupMenu::fillCatPopup()
 }
 void KOEventPopupMenu::computeCatPopup( int index )
 {
+    if (!mCurrentIncidence) return;
     QStringList categories =  mCurrentIncidence->categories();
     QString colcat = categories.first();
     if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ())
@@ -109,6 +135,7 @@ void KOEventPopupMenu::computeCatPopup( int index )
 }
 void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
+    if ( !incidence) return;
   mCurrentIncidence = incidence;
   
   if (mCurrentIncidence) {
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 3d8b595..e28745b 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -56,6 +56,8 @@ class KOEventPopupMenu : public QPopupMenu {
     void popupBeam();
     void fillCatPopup();
     void computeCatPopup( int );
+    void fillCalPopup();
+    void computeCalPopup( int );
 
   signals:
     void editIncidenceSignal(Incidence *);
@@ -75,6 +77,7 @@ class KOEventPopupMenu : public QPopupMenu {
     QValueList<int> mSingleOnlyItems;
     bool isDisabled;
     QPopupMenu *mCatPopup;
+    QPopupMenu *mCalPopup;
 };
 
 #endif
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index db3f802..cdcbbf0 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -304,22 +304,28 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
 
-    mPopupMenu->insertSeparator();
+    selPopup->insertSeparator();
 #ifdef DESKTOP_VERSION
+    mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Print complete list"),this,
                                   SLOT(printList()),true);
-    mPopupMenu->insertSeparator();
 #endif
     mCalPopup = new QPopupMenu ( this );
-    mPopupMenu->insertItem( i18n("Set Calendar"),  mCalPopup );
+    selPopup->insertItem( i18n("Set Calendar"),  mCalPopup );
 
+    selPopup->insertItem(i18n("Set categories")+"...",this,
+                         SLOT(setCat()) );
+    selPopup->insertItem( i18n("Set alarm..."),this,
+                          SLOT(setAlarm()));
+#if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set categories")+"...",this,
                                   SLOT(setCat()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set alarm..."),this,
                                   SLOT(setAlarm()),true); 
+#endif
     QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
                      SLOT( populateCalPopup() ));
     QObject::connect(mCalPopup,SIGNAL(activated( int )),this,
@@ -327,7 +333,7 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     QObject::connect(mPopupMenu,SIGNAL(categoryChanged( Incidence * )),this,
                      SLOT( catChanged( Incidence * ) ));
     QPopupMenu * exportPO = new QPopupMenu ( this );
-    mPopupMenu->insertItem( i18n("Export"),  exportPO );
+    selPopup->insertItem( i18n("Export"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
@@ -340,11 +346,15 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     //                            SLOT(addCat()),true);
     //mPopupMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
-    mPopupMenu->insertSeparator();
+    selPopup->insertSeparator();
+    selPopup->insertItem( i18n("Beam via IR"),this,
+                          SLOT(beamSelected()));
+#if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Beam via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
+#endif
     /*
       mPopupMenu = new QPopupMenu;
       mPopupMenu->insertItem(i18n("Edit Event"), this,
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index d0865c3..efe8774 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -124,7 +124,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     // layout->addWidget(rangeGroup);
 
     QWidget *rangeWidget = new QWidget(topFrame);
-    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()-3);
+    int space = KDialog::spacingHint();
+    if ( QApplication::desktop()->width() <= 240 ) space = 1;
+    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,space);
     rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
     mStartDate = new KDateEdit(rangeWidget);
     rangeLayout->addWidget(mStartDate);