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
@@ -28,116 +28,143 @@
 #include <kiconloader.h>
 
 #include <libkcal/event.h>
 
 #include "koeventpopupmenu.h"
 #include "koprefs.h"
 
 KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
 {
   mCurrentIncidence = 0;
   mHasAdditionalItems = false;
 
   
   mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
   mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
   mEditOnlyItems.append(insertItem (i18n("&Delete"),
       this,SLOT(popupDelete())));
   mEditOnlyItems.append(insertItem (i18n("&Clone..."),
       this,SLOT(popupClone())));
   mEditOnlyItems.append(insertItem (i18n("&Move..."),
       this,SLOT(popupMove())));
 #ifndef DESKTOP_VERSION
   mEditOnlyItems.append(insertItem (i18n("&Beam..."),
       this,SLOT(popupBeam())));
 #endif
   mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
       this,SLOT(popupCancel())));
    isDisabled = false;  
    mCatPopup = new QPopupMenu ( this );
    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);
    }
 
 }
 void KOEventPopupMenu::enableDefault( bool enable )
 {
     isDisabled = !enable;
     QValueList<int>::Iterator it;
     for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
         setItemEnabled(*it,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 ();
          it != KOPrefs::instance()->mCustomCategories.end ();
          ++it) {
         mCatPopup->insertItem (*it, index );
         if (checkedCategories.find (*it) != checkedCategories.end ()) {
             mCatPopup->setItemChecked (index, true);
         }
         ++index;
     }
 }
 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 ())
       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 );
         }
     }
      mCurrentIncidence->setCategories( categories );
     emit categoryChanged( mCurrentIncidence );
 }
 void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
+    if ( !incidence) return;
   mCurrentIncidence = incidence;
   
   if (mCurrentIncidence) {
     // Enable/Disabled menu items only valid for editable events.
       if ( !isDisabled  ) {
           QValueList<int>::Iterator it;
           for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
               setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
           }
       }
     popup(QCursor::pos());
   }
 }
 
 void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
                                     const QObject *receiver, const char *member,
                                     bool editOnly)
 {
   if (!mHasAdditionalItems) {
     mHasAdditionalItems = true;
     insertSeparator();
   }
   int id = insertItem(icon,text,receiver,member);
   if (editOnly) mEditOnlyItems.append(id);
 }
 
 void KOEventPopupMenu::popupShow()
 {
   if (mCurrentIncidence) emit showIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupEdit()
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 3d8b595..e28745b 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -27,54 +27,57 @@
 //
 
 #include <qpopupmenu.h>
 
 #include <libkcal/incidence.h>
 
 using namespace KCal;
 
 class KOEventPopupMenu : public QPopupMenu {
     Q_OBJECT
   public:
     KOEventPopupMenu();
   
     void addAdditionalItem(const QIconSet &icon,const QString &text,
                            const QObject *receiver, const char *member,
                            bool editOnly=false);
 
 
   public slots:
     void showIncidencePopup(Incidence *);
     void enableDefault( bool );
 
   protected slots:
     void popupShow();
     void popupEdit();
     void popupDelete();
     void popupClone();
     void popupCancel();
     void popupMove();
     void popupBeam();
     void fillCatPopup();
     void computeCatPopup( int );
+    void fillCalPopup();
+    void computeCalPopup( int );
 
   signals:
     void editIncidenceSignal(Incidence *);
     void showIncidenceSignal(Incidence *);
     void deleteIncidenceSignal(Incidence *);
     void cloneIncidenceSignal(Incidence *);
     void cancelIncidenceSignal(Incidence *);
     void moveIncidenceSignal(Incidence *);
     void beamIncidenceSignal(Incidence *);
     void categoryChanged( Incidence * );
     
   private:
     Incidence *mCurrentIncidence;
     
     bool mHasAdditionalItems;
     QValueList<int> mEditOnlyItems;
     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
@@ -275,105 +275,115 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
     mListView->setColumnAlignment(11,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
     for ( iii = 0; iii< 12 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     QPopupMenu* selPopup = new QPopupMenu ( this );
     mPopupMenu->insertSeparator();
     
     selPopup->insertItem(i18n("All"),this,
                                   SLOT(allSelection()));
     selPopup->insertItem(i18n("None"),this,
                                   SLOT(clearSelection()));
     selPopup->insertItem(i18n("Delete selected..."),this,
                                   SLOT(deleteAll()));
     mPopupMenu->insertItem(i18n("Selection"), selPopup );
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   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,
                      SLOT( setCalendar( int ) ));
     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,
                                   SLOT(saveToFileVCS()));
     exportPO->insertItem( i18n("Journal/Details..."),this,
                                   SLOT(saveDescriptionToFile()));
     // mPopupMenu->insertSeparator();
     // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
     //                            i18n("Add Categ. to selected..."),this,
     //                            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,
       SLOT (editEvent()));
       mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
       SLOT (deleteEvent()));
       mPopupMenu->insertSeparator();
       mPopupMenu->insertItem(i18n("Show Dates"), this,
       SLOT(showDates()));
       mPopupMenu->insertItem(i18n("Hide Dates"), this,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      this,SIGNAL(signalNewEvent()));
     QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                      this,SLOT(defaultItemAction(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
                                                            const QPoint &, int )),
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 #if QT_VERSION >= 0x030000
 
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index d0865c3..efe8774 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -95,65 +95,67 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
     incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
     //mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
     mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
 
     subjectGroup = new QHBox( topFrame );
     layout->addWidget(subjectGroup);
 
     mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
     mSummaryCheck->setChecked(true);
     mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
 
     attendeeGroup = new QHBox( topFrame );
     layout->addWidget(attendeeGroup );
     new QLabel( i18n("Attendee:"),attendeeGroup );
     mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
     mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
     // Date range
     // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
     //                                    topFrame);
     // 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);
     rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
     mEndDate = new KDateEdit(rangeWidget);
     mEndDate->setDate(QDate::currentDate().addDays(365));
     rangeLayout->addWidget(mEndDate);
     QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
     rangeLayout->addWidget( (QWidget*)wt );
     layout->addWidget(rangeWidget);
     // Results list view
     listView = new KOListView(mCalendar,topFrame);
     layout->addWidget(listView);
     listView->showCompletedTodos();
     //layout->setStretchFactor( listView, 333 );
     //listView->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Expanding) );
     //listView->setMaximumHeight( 50 );
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
     connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
     setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
     OkButton = new QPushButton(  i18n("Close"), this  );
     connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 
 SearchDialog::~SearchDialog()
 {
   
 }
 void SearchDialog::slot_add( bool b )