fixxx

1 files changed, 5 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eac2f29..d25f632 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3933,193 +3933,197 @@ void CalendarView::processIncidenceSelection( Incidence *incidence )
                 emit groupEventsSelected( true );
             } else {
                 emit groupEventsSelected(false);
             }
             return;
         } else {
             emit todoSelected( false );
             emit organizerEventsSelected(false);
             emit groupEventsSelected(false);
         }
         return;
     }
 
     /*  if  ( incidence && incidence->typeID() == todoID ) {
         emit todoSelected( true );
         } else {
         emit todoSelected( false );
         }*/
 }
 
 
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
     if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
         emit pasteEnabled(true);
     } else {
         emit pasteEnabled(false);
     }
 #endif
 }
 
 void CalendarView::showDates(const DateList &selectedDates)
 {
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
 
     if ( !mBlockShowDates ) {
         if ( mViewManager->currentView() ) {
             updateView( selectedDates.first(), selectedDates.last() );
         } else {
             mViewManager->showAgendaView();
         }
     }
 
     QDate date = selectedDates.first();
     if ( ! date.isValid() ) {
         topLevelWidget()->setCaption("");
         return;
     }
 
     QString selDates;
     selDates = KGlobal::locale()->formatDate( date, true);
     if  (selectedDates.first() < selectedDates.last() )
         selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
     else {
         QString addString;
         if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
         else if (  date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
         else if ( date  == QDateTime::currentDateTime().date().addDays(-1) )
             addString = i18n("Yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(-2) )
             addString = i18n("Day before yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(2) )
             addString = i18n("Day after tomorrow");
         if ( !addString.isEmpty() ) {
             topLevelWidget()->setCaption( addString+", " + selDates );
             return;
         }
     }
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
 }
 
 QPtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
     //  kdDebug() << "CalendarView::editFilters()" << endl;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         kdDebug() << " Filter: " << filter->name() << endl;
         filter = mFilters.next();
     }
 
     mDialogManager->showFilterEditDialog(&mFilters);
     updateFilter();
 }
 void CalendarView::toggleFilter()
 {
-    showFilter(! mCalEditView->isVisible());
+    if ( mLeftFrame->isHidden() ) {
+        toggleExpand();
+        showFilter( true );
+    } else 
+        showFilter(! mCalEditView->isVisible());
 }
 
 KOFilterView *CalendarView::filterView()
 {
     return mFilterView;
 }
 void CalendarView::selectFilter( int fil )
 {
     mFilterView->setSelectedFilter( fil );
 }
 void CalendarView::showFilter(bool visible)
 {
 #if 1
     if (visible)  {
         mCalEditView->readConfig(); 
         mCalEditView->show(); 
         QValueList<int> sizes;
         sizes = mLeftFrame->sizes();
         if ( sizes.count() == 4 &&  sizes[3] < 20 ) {
             sizes.clear();
             sizes << 100;
             sizes << 0;
             sizes << 0;
             sizes << 100;
             mLeftFrame->setSizes(sizes);
         }
 #if 0
         sizes = mLeftFrame->sizes();
         int ccc = 0;
         while ( ccc < sizes.count()) {
             qDebug("size %d %d ", ccc, sizes[ccc]);
             ++ccc;    
         }
 #endif
         
     }
     else {
         mCalEditView->hide();
     }
 #else
     if (visible) mFilterView->show();
     else mFilterView->hide();
 #endif
 }
 void CalendarView::toggleFilerEnabled( )
 {
     mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled()  );
     if ( !mFilterView->filtersEnabled()   ) 
         topLevelWidget()->setCaption( i18n("Filter disabled ") );
         
 }
 void CalendarView::updateFilter()
 {
     CalFilter *filter = mFilterView->selectedFilter();
     if (filter) {
         QString mess;
         if (mFilterView->filtersEnabled()) {
             mess =  i18n("Filter selected: ")+filter->name();
             filter->setEnabled(true);
         }
         else filter->setEnabled(false);
         mCalendar->setFilter(filter);
         updateView();
         if ( !mess.isEmpty() )
             topLevelWidget()->setCaption( mess );
             
     }
     emit filtersUpdated();
 }
 
 void CalendarView::filterEdited()
 {
     mFilterView->updateFilters();
     updateFilter();
     writeSettings();
 }
 
 
 void CalendarView::takeOverEvent()
 {
     Incidence *incidence = currentSelection();
 
     if (!incidence) return;
 
     incidence->setOrganizer(KOPrefs::instance()->email());
     incidence->recreate();
     incidence->setReadOnly(false);
 
     updateView();
 }
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
     clearAllViews();