SVN commit 837187 by pradeepto: Merged revisions 794734 via svnmerge from svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r794734 | ahartmetz | 2008-04-08 18:48:28 +0530 (Tue, 08 Apr 2008) | 1 line Do not respond to any mouse events on the Gantt header widget as it may confuse the vertical scrollbar or something (Kolab issue 2272). ........ _M . (directory) M +1 -1 kdgantt/KDGanttView.h M +13 -0 korganizer/koeditorfreebusy.cpp M +1 -0 korganizer/koeditorfreebusy.h ** branches/KDE/3.5/kdepim #property svnmerge-integrated - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780251,781595,782647-783127,783129-783243,783245,783248-783477,783479-783847,784129,784547,785316-785317,787827,788634,789925,790349-790352,793296,817568,817604,817710-818288,818312-819076,819078-820073,820075-821035,821037-821124,821126-821378,821380-821648,821650-821813,821815-821835,821837-822268,822270-823864,823866-824217,824219-824277,824279-824285,824287-824288,824290-824805,824807-825075,825077-825083,825085-826354,826356-827491,830100,830443 + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780251,781595,782647-783127,783129-783243,783245,783248-783477,783479-783847,784129,784547,785316-785317,787827,788634,789925,790349-790352,793296,794734,817568,817604,817710-818288,818312-819076,819078-820073,820075-821035,821037-821124,821126-821378,821380-821648,821650-821813,821815-821835,821837-822268,822270-823864,823866-824217,824219-824277,824279-824285,824287-824288,824290-824805,824807-825075,825077-825083,825085-826354,826356-827491,830100,830443 --- branches/KDE/3.5/kdepim/kdgantt/KDGanttView.h #837186:837187 @@ -411,7 +411,7 @@ void slotSelectionChanged( QListViewItem* item ); void slotCurrentChanged ( QListViewItem * item ); void slotItemRenamed ( QListViewItem * item, int col, const QString & text ); - void slotMouseButtonPressed ( int button, QListViewItem * item, const QPoint & pos, int c ); + void slotMouseButtonPressed ( int button, QListViewItem * item, const QPoint & pos, int c ); void slotmouseButtonClicked ( int button, QListViewItem * item, const QPoint & pos, int c ); void slotcontextMenuRequested ( QListViewItem * item, const QPoint & pos, int col ); void slotHeaderSizeChanged(); --- branches/KDE/3.5/kdepim/korganizer/koeditorfreebusy.cpp #837186:837187 @@ -343,6 +343,9 @@ slotOrganizerChanged( mOrganizerCombo->currentText() ); connect( mOrganizerCombo, SIGNAL( activated(const QString&) ), this, SLOT( slotOrganizerChanged(const QString&) ) ); + + //suppress the buggy consequences of clicks on the time header widget + mGanttView->timeHeaderWidget()->installEventFilter( this ); } KOEditorFreeBusy::~KOEditorFreeBusy() @@ -915,4 +918,14 @@ mCurrentOrganizer = newOrganizer; } +bool KOEditorFreeBusy::eventFilter( QObject *watched, QEvent *event ) +{ + if ( watched == mGanttView->timeHeaderWidget() && + event->type() >= QEvent::MouseButtonPress && event->type() <= QEvent::MouseMove ) { + return true; + } else { + return KOAttendeeEditor::eventFilter( watched, event ); + } +} + #include "koeditorfreebusy.moc" --- branches/KDE/3.5/kdepim/korganizer/koeditorfreebusy.h #837186:837187 @@ -96,6 +96,7 @@ void updateCurrentItem(); void clearSelection() const; void changeStatusForMe( KCal::Attendee::PartStat status ); + virtual bool eventFilter( QObject *watched, QEvent *event ); private slots: void slotOrganizerChanged( const QString &newOrganizer );