fax

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
@@ -59,3 +59,8 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
    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;
@@ -76,2 +81,21 @@ 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()
@@ -79,2 +103,3 @@ void KOEventPopupMenu::fillCatPopup()
     mCatPopup->clear(); 
+    if (!mCurrentIncidence) return;
     QStringList checkedCategories = mCurrentIncidence->categories();
@@ -93,2 +118,3 @@ void KOEventPopupMenu::computeCatPopup( int index )
 {
+    if (!mCurrentIncidence) return;
     QStringList categories =  mCurrentIncidence->categories();
@@ -111,2 +137,3 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
+    if ( !incidence) return;
   mCurrentIncidence = incidence;
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 3d8b595..e28745b 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -58,2 +58,4 @@ class KOEventPopupMenu : public QPopupMenu {
     void computeCatPopup( int );
+    void fillCalPopup();
+    void computeCalPopup( int );
 
@@ -77,2 +79,3 @@ class KOEventPopupMenu : public QPopupMenu {
     QPopupMenu *mCatPopup;
+    QPopupMenu *mCalPopup;
 };
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index db3f802..cdcbbf0 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -306,4 +306,5 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 
-    mPopupMenu->insertSeparator();
+    selPopup->insertSeparator();
 #ifdef DESKTOP_VERSION
+    mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
@@ -311,7 +312,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                   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()),
@@ -322,2 +327,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                   SLOT(setAlarm()),true); 
+#endif
     QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
@@ -329,3 +335,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     QPopupMenu * exportPO = new QPopupMenu ( this );
-    mPopupMenu->insertItem( i18n("Export"),  exportPO );
+    selPopup->insertItem( i18n("Export"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
@@ -342,3 +348,6 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 #ifndef DESKTOP_VERSION
-    mPopupMenu->insertSeparator();
+    selPopup->insertSeparator();
+    selPopup->insertItem( i18n("Beam via IR"),this,
+                          SLOT(beamSelected()));
+#if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
@@ -347,2 +356,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 #endif
+#endif
     /*
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index d0865c3..efe8774 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -126,3 +126,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     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));