-rw-r--r-- | korganizer/calendarview.cpp | 7 | ||||
-rw-r--r-- | korganizer/calendarview.h | 3 | ||||
-rw-r--r-- | korganizer/koagenda.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 5 | ||||
-rw-r--r-- | microkde/kdeui/kbuttonbox.cpp | 2 | ||||
-rw-r--r-- | microkde/kdeui/kpopupmenu.cpp | 19 | ||||
-rw-r--r-- | microkde/kdeui/kpopupmenu.h | 22 | ||||
-rw-r--r-- | microkde/microkde.pro | 2 | ||||
-rw-r--r-- | microkde/microkdeE.pro | 2 |
10 files changed, 64 insertions, 15 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5a2482e..17f1659 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -642,32 +642,39 @@ void CalendarView::init() | |||
642 | #endif | 642 | #endif |
643 | mDateNavigator->setCalendar( mCalendar ); | 643 | mDateNavigator->setCalendar( mCalendar ); |
644 | } | 644 | } |
645 | 645 | ||
646 | 646 | ||
647 | CalendarView::~CalendarView() | 647 | CalendarView::~CalendarView() |
648 | { | 648 | { |
649 | // kdDebug() << "~CalendarView()" << endl; | 649 | // kdDebug() << "~CalendarView()" << endl; |
650 | //qDebug("CalendarView::~CalendarView() "); | 650 | //qDebug("CalendarView::~CalendarView() "); |
651 | delete mDialogManager; | 651 | delete mDialogManager; |
652 | delete mViewManager; | 652 | delete mViewManager; |
653 | delete mStorage; | 653 | delete mStorage; |
654 | delete mDateFrame ; | 654 | delete mDateFrame ; |
655 | delete mEventViewerDialog; | 655 | delete mEventViewerDialog; |
656 | //kdDebug() << "~CalendarView() done" << endl; | 656 | //kdDebug() << "~CalendarView() done" << endl; |
657 | } | 657 | } |
658 | |||
659 | void CalendarView::slotResetFocus() | ||
660 | { | ||
661 | qDebug(" CalendarView::slotResetFocus() %x", qApp->focusWidget()); | ||
662 | |||
663 | } | ||
664 | |||
658 | void CalendarView::nextConflict( bool all, bool allday ) | 665 | void CalendarView::nextConflict( bool all, bool allday ) |
659 | { | 666 | { |
660 | 667 | ||
661 | QPtrList<Event> testlist = mCalendar->events(); | 668 | QPtrList<Event> testlist = mCalendar->events(); |
662 | Event * test = testlist.first(); | 669 | Event * test = testlist.first(); |
663 | while ( test ) { | 670 | while ( test ) { |
664 | test->setTagged( false ); | 671 | test->setTagged( false ); |
665 | test = testlist.next(); | 672 | test = testlist.next(); |
666 | } | 673 | } |
667 | QTime st ( 0,0,0); | 674 | QTime st ( 0,0,0); |
668 | if ( mViewManager->currentView() == mViewManager->agendaView() ) | 675 | if ( mViewManager->currentView() == mViewManager->agendaView() ) |
669 | st = mViewManager->agendaView()->agenda()->getEndTime(); | 676 | st = mViewManager->agendaView()->agenda()->getEndTime(); |
670 | //qDebug("time %s ", st.toString().latin1()); | 677 | //qDebug("time %s ", st.toString().latin1()); |
671 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); | 678 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); |
672 | QDateTime conflict; | 679 | QDateTime conflict; |
673 | QDateTime retVal; | 680 | QDateTime retVal; |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 799c297..456c2d7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -187,33 +187,34 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
187 | void pasteEnabled(bool); | 187 | void pasteEnabled(bool); |
188 | 188 | ||
189 | /** Emitted, when the number of incoming messages has changed. */ | 189 | /** Emitted, when the number of incoming messages has changed. */ |
190 | void numIncomingChanged(int); | 190 | void numIncomingChanged(int); |
191 | 191 | ||
192 | /** Emitted, when the number of outgoing messages has changed. */ | 192 | /** Emitted, when the number of outgoing messages has changed. */ |
193 | void numOutgoingChanged(int); | 193 | void numOutgoingChanged(int); |
194 | 194 | ||
195 | /** Send status message, which can e.g. be displayed in the status bar. */ | 195 | /** Send status message, which can e.g. be displayed in the status bar. */ |
196 | void statusMessage(const QString &); | 196 | void statusMessage(const QString &); |
197 | 197 | ||
198 | void calendarViewExpanded( bool ); | 198 | void calendarViewExpanded( bool ); |
199 | void updateSearchDialog(); | 199 | void updateSearchDialog(); |
200 | void filtersUpdated(); | 200 | void filtersUpdated(); |
201 | 201 | ||
202 | 202 | ||
203 | public slots: | 203 | public slots: |
204 | void slotResetFocus(); | ||
204 | void nextConflict( bool all, bool allday ); | 205 | void nextConflict( bool all, bool allday ); |
205 | void conflictAll(); | 206 | void conflictAll(); |
206 | void conflictAllday(); | 207 | void conflictAllday(); |
207 | void conflictNotAll(); | 208 | void conflictNotAll(); |
208 | void setCalReadOnly( int id, bool readO ); | 209 | void setCalReadOnly( int id, bool readO ); |
209 | void checkAlarms(); | 210 | void checkAlarms(); |
210 | void checkFiles(); | 211 | void checkFiles(); |
211 | void slotprintSelInc(); | 212 | void slotprintSelInc(); |
212 | void showNextAlarms(); | 213 | void showNextAlarms(); |
213 | void showOpenError(); | 214 | void showOpenError(); |
214 | void watchSavedFile(); | 215 | void watchSavedFile(); |
215 | void recheckTimerAlarm(); | 216 | void recheckTimerAlarm(); |
216 | void checkNextTimerAlarm(); | 217 | void checkNextTimerAlarm(); |
217 | void addAlarm(const QDateTime &qdt, const QString ¬i ); | 218 | void addAlarm(const QDateTime &qdt, const QString ¬i ); |
218 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); | 219 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); |
219 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); | 220 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); |
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 779f12e..0dd5ef5 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -1622,33 +1622,36 @@ QTime KOAgenda::gyToTime(int gy) | |||
1622 | if ( timeSeconds < 24 * 60 * 60 ) { | 1622 | if ( timeSeconds < 24 * 60 * 60 ) { |
1623 | time = time.addSecs(timeSeconds); | 1623 | time = time.addSecs(timeSeconds); |
1624 | } else { | 1624 | } else { |
1625 | time.setHMS( 23, 59, 59 ); | 1625 | time.setHMS( 23, 59, 59 ); |
1626 | } | 1626 | } |
1627 | 1627 | ||
1628 | return time; | 1628 | return time; |
1629 | } | 1629 | } |
1630 | 1630 | ||
1631 | void KOAgenda::setStartHour(int startHour) | 1631 | void KOAgenda::setStartHour(int startHour) |
1632 | { | 1632 | { |
1633 | int startCell = startHour * mRows / 24; | 1633 | int startCell = startHour * mRows / 24; |
1634 | setContentsPos(0,startCell * gridSpacingY()); | 1634 | setContentsPos(0,startCell * gridSpacingY()); |
1635 | } | 1635 | } |
1636 | QTime KOAgenda::getEndTime() | 1636 | QTime KOAgenda::getEndTime() |
1637 | { | 1637 | { |
1638 | return QTime ( (contentsY ()+viewport()->height())*24/contentsHeight ()+1,0,0); | 1638 | int tim = (contentsY ()+viewport()->height())*24/contentsHeight (); |
1639 | if ( tim > 23 ) | ||
1640 | return QTime ( 23,59,59); | ||
1641 | return QTime ( tim,0,0); | ||
1639 | } | 1642 | } |
1640 | void KOAgenda::hideUnused() | 1643 | void KOAgenda::hideUnused() |
1641 | { | 1644 | { |
1642 | // experimental only | 1645 | // experimental only |
1643 | // return; | 1646 | // return; |
1644 | KOAgendaItem *item; | 1647 | KOAgendaItem *item; |
1645 | for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) { | 1648 | for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) { |
1646 | item->hide(); | 1649 | item->hide(); |
1647 | } | 1650 | } |
1648 | } | 1651 | } |
1649 | 1652 | ||
1650 | 1653 | ||
1651 | KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view) | 1654 | KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view) |
1652 | { | 1655 | { |
1653 | 1656 | ||
1654 | KOAgendaItem *fi; | 1657 | KOAgendaItem *fi; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 4bedb61..21d5a35 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -8,41 +8,39 @@ | |||
8 | #include <qmessagebox.h> | 8 | #include <qmessagebox.h> |
9 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
10 | #include <qtextcodec.h> | 10 | #include <qtextcodec.h> |
11 | #include <qfile.h> | 11 | #include <qfile.h> |
12 | #include <qdir.h> | 12 | #include <qdir.h> |
13 | #include <qapp.h> | 13 | #include <qapp.h> |
14 | #include <qfileinfo.h> | 14 | #include <qfileinfo.h> |
15 | #include <qlabel.h> | 15 | #include <qlabel.h> |
16 | #include <qspinbox.h> | 16 | #include <qspinbox.h> |
17 | #include <qcheckbox.h> | 17 | #include <qcheckbox.h> |
18 | #include <qmap.h> | 18 | #include <qmap.h> |
19 | #include <qwmatrix.h> | 19 | #include <qwmatrix.h> |
20 | #include <qtextbrowser.h> | 20 | #include <qtextbrowser.h> |
21 | #include <qtextstream.h> | 21 | #include <qtextstream.h> |
22 | #ifndef DESKTOP_VERSION | 22 | #ifndef DESKTOP_VERSION |
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | #include <qpe/qpemenubar.h> | ||
25 | #include <qpe/qpetoolbar.h> | 24 | #include <qpe/qpetoolbar.h> |
26 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
27 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
28 | #include <qtopia/alarmserver.h> | 27 | #include <qtopia/alarmserver.h> |
29 | #include <qtopia/qcopenvelope_qws.h> | 28 | #include <qtopia/qcopenvelope_qws.h> |
30 | #include <unistd.h> // for sleep | 29 | #include <unistd.h> // for sleep |
31 | #else | 30 | #else |
32 | #include <qmenubar.h> | ||
33 | #include <qtoolbar.h> | 31 | #include <qtoolbar.h> |
34 | #include <qapplication.h> | 32 | #include <qapplication.h> |
35 | //#include <resource.h> | 33 | //#include <resource.h> |
36 | 34 | ||
37 | #endif | 35 | #endif |
38 | #include <libkcal/calendarlocal.h> | 36 | #include <libkcal/calendarlocal.h> |
39 | #include <libkcal/todo.h> | 37 | #include <libkcal/todo.h> |
40 | #include <libkcal/phoneformat.h> | 38 | #include <libkcal/phoneformat.h> |
41 | #include <libkdepim/ksyncprofile.h> | 39 | #include <libkdepim/ksyncprofile.h> |
42 | #include <libkdepim/phoneaccess.h> | 40 | #include <libkdepim/phoneaccess.h> |
43 | #include <libkcal/kincidenceformatter.h> | 41 | #include <libkcal/kincidenceformatter.h> |
44 | #include <libkdepim/kpimglobalprefs.h> | 42 | #include <libkdepim/kpimglobalprefs.h> |
45 | 43 | ||
46 | #include "calendarview.h" | 44 | #include "calendarview.h" |
47 | #include "koviewmanager.h" | 45 | #include "koviewmanager.h" |
48 | #include "datenavigator.h" | 46 | #include "datenavigator.h" |
@@ -212,33 +210,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
212 | #endif | 210 | #endif |
213 | 211 | ||
214 | { | 212 | { |
215 | if ( p->mToolBarHorF ) { | 213 | if ( p->mToolBarHorF ) { |
216 | if ( p->mToolBarUpF ) | 214 | if ( p->mToolBarUpF ) |
217 | tbd = Bottom; | 215 | tbd = Bottom; |
218 | else | 216 | else |
219 | tbd = Top; | 217 | tbd = Top; |
220 | } | 218 | } |
221 | else { | 219 | else { |
222 | if ( p->mToolBarUpF ) | 220 | if ( p->mToolBarUpF ) |
223 | tbd = Right; | 221 | tbd = Right; |
224 | else | 222 | else |
225 | tbd = Left; | 223 | tbd = Left; |
226 | } | 224 | } |
227 | filterToolBar = new QPEToolBar ( this ); | 225 | filterToolBar = new QPEToolBar ( this ); |
228 | filterMenubar = new QMenuBar( 0 ); | 226 | filterMenubar = new KMenuBar( 0 ); |
229 | QFontMetrics fm ( filterMenubar->font() ); | 227 | QFontMetrics fm ( filterMenubar->font() ); |
230 | 228 | ||
231 | filterPopupMenu = new QPopupMenu( this ); | 229 | filterPopupMenu = new QPopupMenu( this ); |
232 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 230 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
233 | QString addTest = "A"; | 231 | QString addTest = "A"; |
234 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); | 232 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); |
235 | #ifdef DESKTOP_VERSION | 233 | #ifdef DESKTOP_VERSION |
236 | addTest = "AAABBBCCCx"; | 234 | addTest = "AAABBBCCCx"; |
237 | #else | 235 | #else |
238 | addTest = "AAx"; | 236 | addTest = "AAx"; |
239 | #endif | 237 | #endif |
240 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); | 238 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); |
241 | addToolBar (filterToolBar , tbd ); | 239 | addToolBar (filterToolBar , tbd ); |
242 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); | 240 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); |
243 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); | 241 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); |
244 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) | 242 | if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) |
@@ -669,68 +667,68 @@ void MainWindow::initActions() | |||
669 | syncMenu = new QPopupMenu( this ); | 667 | syncMenu = new QPopupMenu( this ); |
670 | configureAgendaMenu = new QPopupMenu( this ); | 668 | configureAgendaMenu = new QPopupMenu( this ); |
671 | configureToolBarMenu = new QPopupMenu( this ); | 669 | configureToolBarMenu = new QPopupMenu( this ); |
672 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 670 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
673 | QIconSet icon; | 671 | QIconSet icon; |
674 | int pixWid = 22, pixHei = 22; | 672 | int pixWid = 22, pixHei = 22; |
675 | QString pathString = ""; | 673 | QString pathString = ""; |
676 | if ( !p->mToolBarMiniIcons ) { | 674 | if ( !p->mToolBarMiniIcons ) { |
677 | if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { | 675 | if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { |
678 | pathString += "icons16/"; | 676 | pathString += "icons16/"; |
679 | pixWid = 18; pixHei = 16; | 677 | pixWid = 18; pixHei = 16; |
680 | } | 678 | } |
681 | } else { | 679 | } else { |
682 | pathString += "iconsmini/"; | 680 | pathString += "iconsmini/"; |
683 | pixWid = 18; pixHei = 16; | 681 | pixWid = 18; pixHei = 16; |
684 | } | 682 | } |
683 | KMenuBar *menuBar1; | ||
685 | if ( KOPrefs::instance()->mShowFullMenu ) { | 684 | if ( KOPrefs::instance()->mShowFullMenu ) { |
686 | QMenuBar *menuBar1; | 685 | menuBar1 = new KMenuBar( this );//menuBar(); |
687 | menuBar1 = menuBar(); | ||
688 | menuBar1->insertItem( i18n("File"), importMenu ); | 686 | menuBar1->insertItem( i18n("File"), importMenu ); |
689 | menuBar1->insertItem( i18n("View"), viewMenu ); | 687 | menuBar1->insertItem( i18n("View"), viewMenu ); |
690 | menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); | 688 | menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); |
691 | menuBar1->insertItem( i18n("Action"), actionMenu ); | 689 | menuBar1->insertItem( i18n("Action"), actionMenu ); |
692 | #ifdef DESKTOP_VERSION | 690 | #ifdef DESKTOP_VERSION |
693 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 691 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
694 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 692 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
695 | #else | 693 | #else |
696 | menuBar1->insertItem( i18n("Sync"), syncMenu ); | 694 | menuBar1->insertItem( i18n("Sync"), syncMenu ); |
697 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); | 695 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); |
698 | #endif | 696 | #endif |
699 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 697 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
700 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); | 698 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); |
701 | menuBar1->insertItem( i18n("Help"), helpMenu ); | 699 | menuBar1->insertItem( i18n("Help"), helpMenu ); |
702 | } else { | 700 | } else { |
703 | QPEMenuBar *menuBar1; | 701 | menuBar1 = new KMenuBar( iconToolBar ); |
704 | menuBar1 = new QPEMenuBar( iconToolBar ); | ||
705 | QPopupMenu *menuBar = new QPopupMenu( this ); | 702 | QPopupMenu *menuBar = new QPopupMenu( this ); |
706 | icon = loadPixmap( pathString + "z_menu" ); | 703 | icon = loadPixmap( pathString + "z_menu" ); |
707 | menuBar1->insertItem( icon.pixmap(), menuBar); | 704 | menuBar1->insertItem( icon.pixmap(), menuBar); |
708 | //menuBar1->insertItem( i18n("ME"), menuBar); | 705 | //menuBar1->insertItem( i18n("ME"), menuBar); |
709 | menuBar->insertItem( i18n("File"), importMenu ); | 706 | menuBar->insertItem( i18n("File"), importMenu ); |
710 | menuBar->insertItem( i18n("View"), viewMenu ); | 707 | menuBar->insertItem( i18n("View"), viewMenu ); |
711 | menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); | 708 | menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); |
712 | menuBar->insertItem( i18n("Action"), actionMenu ); | 709 | menuBar->insertItem( i18n("Action"), actionMenu ); |
713 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 710 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
714 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 711 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
715 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 712 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
716 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); | 713 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); |
717 | menuBar->insertItem( i18n("Help"), helpMenu ); | 714 | menuBar->insertItem( i18n("Help"), helpMenu ); |
718 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 715 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
719 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); | 716 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); |
720 | } | 717 | } |
718 | connect ( menuBar1, SIGNAL( lostFocus () ), mView, SLOT ( slotResetFocus() ) ); | ||
721 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); | 719 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |
722 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); | 720 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |
723 | 721 | ||
724 | 722 | ||
725 | mWeekBgColor = iconToolBar->backgroundColor(); | 723 | mWeekBgColor = iconToolBar->backgroundColor(); |
726 | mWeekPixmap.resize( pixWid , pixHei ); | 724 | mWeekPixmap.resize( pixWid , pixHei ); |
727 | mWeekPixmap.fill( mWeekBgColor ); | 725 | mWeekPixmap.fill( mWeekBgColor ); |
728 | icon = mWeekPixmap; | 726 | icon = mWeekPixmap; |
729 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); | 727 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); |
730 | if ( p-> mShowIconWeekNum ) | 728 | if ( p-> mShowIconWeekNum ) |
731 | mWeekAction->addTo( iconToolBar ); | 729 | mWeekAction->addTo( iconToolBar ); |
732 | mWeekFont = font(); | 730 | mWeekFont = font(); |
733 | 731 | ||
734 | int fontPoint = mWeekFont.pointSize(); | 732 | int fontPoint = mWeekFont.pointSize(); |
735 | QFontMetrics f( mWeekFont ); | 733 | QFontMetrics f( mWeekFont ); |
736 | int fontWid = f.width( "30" ); | 734 | int fontWid = f.width( "30" ); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index d648f14..e2de3ba 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -1,42 +1,41 @@ | |||
1 | #ifndef KORGE_MAINWINDOW_H | 1 | #ifndef KORGE_MAINWINDOW_H |
2 | #define KORGE_MAINWINDOW_H | 2 | #define KORGE_MAINWINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include <qtimer.h> | 5 | #include <qtimer.h> |
6 | #include <qdict.h> | 6 | #include <qdict.h> |
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | #include <qmenubar.h> | 8 | #include <qmenubar.h> |
9 | #include <qtextstream.h> | 9 | #include <qtextstream.h> |
10 | #include <qregexp.h> | 10 | #include <qregexp.h> |
11 | 11 | ||
12 | #include <libkcal/incidence.h> | 12 | #include <libkcal/incidence.h> |
13 | #include <ksyncmanager.h> | 13 | #include <ksyncmanager.h> |
14 | #include <kpopupmenu.h> | ||
14 | #ifndef DESKTOP_VERSION | 15 | #ifndef DESKTOP_VERSION |
15 | #include <qcopchannel_qws.h> | 16 | #include <qcopchannel_qws.h> |
16 | #endif | 17 | #endif |
17 | class QAction; | 18 | class QAction; |
18 | class CalendarView; | 19 | class CalendarView; |
19 | class KSyncProfile; | 20 | class KSyncProfile; |
20 | #ifdef DESKTOP_VERSION | 21 | #ifdef DESKTOP_VERSION |
21 | 22 | ||
22 | #define QPEToolBar QToolBar | 23 | #define QPEToolBar QToolBar |
23 | #define QPEMenuBar QMenuBar | ||
24 | #endif | 24 | #endif |
25 | class QPEToolBar; | 25 | class QPEToolBar; |
26 | class QPEMenuBar; | ||
27 | 26 | ||
28 | 27 | ||
29 | namespace KCal { | 28 | namespace KCal { |
30 | class CalendarLocal; | 29 | class CalendarLocal; |
31 | } | 30 | } |
32 | 31 | ||
33 | using namespace KCal; | 32 | using namespace KCal; |
34 | 33 | ||
35 | class MainWindow : public QMainWindow | 34 | class MainWindow : public QMainWindow |
36 | { | 35 | { |
37 | Q_OBJECT | 36 | Q_OBJECT |
38 | public: | 37 | public: |
39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); | 38 | MainWindow( QWidget *parent = 0, const char *name = 0 ); |
40 | ~MainWindow(); | 39 | ~MainWindow(); |
41 | bool beamReceiveEnabled(); | 40 | bool beamReceiveEnabled(); |
42 | static QString defaultFileName(); | 41 | static QString defaultFileName(); |
@@ -115,33 +114,33 @@ class MainWindow : public QMainWindow | |||
115 | 114 | ||
116 | private: | 115 | private: |
117 | bool mBRdisabled; | 116 | bool mBRdisabled; |
118 | #ifndef DESKTOP_VERSION | 117 | #ifndef DESKTOP_VERSION |
119 | QCopChannel* infrared; | 118 | QCopChannel* infrared; |
120 | #endif | 119 | #endif |
121 | QAction* brAction; | 120 | QAction* brAction; |
122 | KSyncManager* mSyncManager; | 121 | KSyncManager* mSyncManager; |
123 | bool mClosed; | 122 | bool mClosed; |
124 | void saveOnClose(); | 123 | void saveOnClose(); |
125 | bool mFlagKeyPressed; | 124 | bool mFlagKeyPressed; |
126 | bool mBlockAtStartup; | 125 | bool mBlockAtStartup; |
127 | QPEToolBar *iconToolBar; | 126 | QPEToolBar *iconToolBar; |
128 | QPEToolBar *viewToolBar; | 127 | QPEToolBar *viewToolBar; |
129 | QPEToolBar *navigatorToolBar; | 128 | QPEToolBar *navigatorToolBar; |
130 | QPEToolBar *filterToolBar; | 129 | QPEToolBar *filterToolBar; |
131 | QMenuBar *filterMenubar; | 130 | KMenuBar *filterMenubar; |
132 | QPopupMenu * filterPopupMenu; | 131 | QPopupMenu * filterPopupMenu; |
133 | QPopupMenu * mCurrentItemMenu; | 132 | QPopupMenu * mCurrentItemMenu; |
134 | void initActions(); | 133 | void initActions(); |
135 | void setDefaultPreferences(); | 134 | void setDefaultPreferences(); |
136 | void resizeEvent( QResizeEvent* e); | 135 | void resizeEvent( QResizeEvent* e); |
137 | void keyPressEvent ( QKeyEvent * ) ; | 136 | void keyPressEvent ( QKeyEvent * ) ; |
138 | void keyReleaseEvent ( QKeyEvent * ) ; | 137 | void keyReleaseEvent ( QKeyEvent * ) ; |
139 | QPopupMenu *configureToolBarMenu; | 138 | QPopupMenu *configureToolBarMenu; |
140 | QPopupMenu *selectFilterMenu; | 139 | QPopupMenu *selectFilterMenu; |
141 | QPopupMenu *selectFilterMenuTB; | 140 | QPopupMenu *selectFilterMenuTB; |
142 | QPopupMenu *configureAgendaMenu, *syncMenu; | 141 | QPopupMenu *configureAgendaMenu, *syncMenu; |
143 | CalendarLocal *mCalendar; | 142 | CalendarLocal *mCalendar; |
144 | CalendarView *mView; | 143 | CalendarView *mView; |
145 | QAction *mNewSubTodoAction; | 144 | QAction *mNewSubTodoAction; |
146 | QAction *mWeekAction; | 145 | QAction *mWeekAction; |
147 | QFont mWeekFont; | 146 | QFont mWeekFont; |
diff --git a/microkde/kdeui/kbuttonbox.cpp b/microkde/kdeui/kbuttonbox.cpp index 16206e8..83d622a 100644 --- a/microkde/kdeui/kbuttonbox.cpp +++ b/microkde/kdeui/kbuttonbox.cpp | |||
@@ -33,33 +33,33 @@ | |||
33 | * Now in Qt 1.4x motif default buttons have no extra width/height anymore. | 33 | * Now in Qt 1.4x motif default buttons have no extra width/height anymore. |
34 | * So the KButtonBox doesn't add this width/height to default buttons anymore | 34 | * So the KButtonBox doesn't add this width/height to default buttons anymore |
35 | * which makes the buttons look better. | 35 | * which makes the buttons look better. |
36 | * | 36 | * |
37 | * 01/17/98 Mario Weilguni <mweilguni@sime.com> | 37 | * 01/17/98 Mario Weilguni <mweilguni@sime.com> |
38 | * Fixed a bug in sizeHint() | 38 | * Fixed a bug in sizeHint() |
39 | * Improved the handling of Motif default buttons | 39 | * Improved the handling of Motif default buttons |
40 | * | 40 | * |
41 | * 01/09/98 Mario Weilguni <mweilguni@sime.com> | 41 | * 01/09/98 Mario Weilguni <mweilguni@sime.com> |
42 | * The last button was to far right away from the right/bottom border. | 42 | * The last button was to far right away from the right/bottom border. |
43 | * Fixed this. Removed old code. Buttons get now a minimum width. | 43 | * Fixed this. Removed old code. Buttons get now a minimum width. |
44 | * Programmer may now override minimum width and height of a button. | 44 | * Programmer may now override minimum width and height of a button. |
45 | * | 45 | * |
46 | */ | 46 | */ |
47 | 47 | ||
48 | //US #include "kbuttonbox.moc" | 48 | //US #include "kbuttonbox.moc" |
49 | 49 | ||
50 | #include <kbuttonbox.h> | 50 | #include <kbuttonbox.h> |
51 | #include <qpushbutton.h> | 51 | #include <qpushbutton.h> |
52 | #include <qptrlist.h> | 52 | #include <qptrlist.h> |
53 | #include <assert.h> | 53 | #include <assert.h> |
54 | 54 | ||
55 | #define minButtonWidth 50 | 55 | #define minButtonWidth 50 |
56 | 56 | ||
57 | class KButtonBox::Item { | 57 | class KButtonBox::Item { |
58 | public: | 58 | public: |
59 | QPushButton *button; | 59 | QPushButton *button; |
60 | bool noexpand; | 60 | bool noexpand; |
61 | unsigned short stretch; | 61 | unsigned short stretch; |
62 | unsigned short actual_size; | 62 | unsigned short actual_size; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | template class QPtrList<KButtonBox::Item>; | 65 | template class QPtrList<KButtonBox::Item>; |
diff --git a/microkde/kdeui/kpopupmenu.cpp b/microkde/kdeui/kpopupmenu.cpp new file mode 100644 index 0000000..96d2a87 --- a/dev/null +++ b/microkde/kdeui/kpopupmenu.cpp | |||
@@ -0,0 +1,19 @@ | |||
1 | |||
2 | #include <kpopupmenu.h> | ||
3 | #include <qtimer.h> | ||
4 | |||
5 | |||
6 | KPopupMenu::KPopupMenu ( QWidget * parent, const char * name ) | ||
7 | : QPopupMenu ( parent, name ) {;} | ||
8 | |||
9 | |||
10 | |||
11 | KMenuBar::KMenuBar ( QWidget * parent, const char * name ) | ||
12 | : QPEMenuBar ( parent, name ) {} | ||
13 | |||
14 | void KMenuBar::focusOutEvent ( QFocusEvent * e) | ||
15 | { | ||
16 | QPEMenuBar::focusOutEvent( e ); | ||
17 | QTimer::singleShot( 100, this, SIGNAL ( lostFocus() ) ); | ||
18 | |||
19 | } | ||
diff --git a/microkde/kdeui/kpopupmenu.h b/microkde/kdeui/kpopupmenu.h index 1352429..f16ce77 100644 --- a/microkde/kdeui/kpopupmenu.h +++ b/microkde/kdeui/kpopupmenu.h | |||
@@ -1,14 +1,32 @@ | |||
1 | #ifndef KPOPUPMENU_H | 1 | #ifndef KPOPUPMENU_H |
2 | #define KPOPUPMENU_H | 2 | #define KPOPUPMENU_H |
3 | 3 | ||
4 | #include <qpopupmenu.h> | 4 | #include <qpopupmenu.h> |
5 | #ifdef DESKTOP_VERSION | ||
6 | #include <qmenubar.h> | ||
7 | #define QPEMenuBar QMenubar | ||
8 | #else | ||
9 | #include <qpe/qpemenubar.h> | ||
10 | #endif | ||
5 | 11 | ||
6 | class KPopupMenu : public QPopupMenu | 12 | class KPopupMenu : public QPopupMenu |
7 | { | 13 | { |
14 | Q_OBJECT | ||
8 | public: | 15 | public: |
9 | KPopupMenu ( QWidget * parent=0, const char * name=0 ) | 16 | KPopupMenu ( QWidget * parent=0, const char * name=0 ); |
10 | : QPopupMenu ( parent, name ) {} | 17 | |
18 | }; | ||
11 | 19 | ||
20 | |||
21 | class KMenuBar : public QPEMenuBar | ||
22 | { | ||
23 | Q_OBJECT | ||
24 | public: | ||
25 | KMenuBar ( QWidget * parent=0, const char * name=0 ); | ||
26 | signals: | ||
27 | void lostFocus(); | ||
28 | protected: | ||
29 | void focusOutEvent ( QFocusEvent * e); | ||
12 | }; | 30 | }; |
13 | 31 | ||
14 | #endif | 32 | #endif |
diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 44e5f9d..7120bdd 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro | |||
@@ -90,32 +90,33 @@ KDGanttMinimizeSplitter.h \ | |||
90 | kdecore/kconfigbase.h \ | 90 | kdecore/kconfigbase.h \ |
91 | kdecore/klocale.h \ | 91 | kdecore/klocale.h \ |
92 | kdecore/kcatalogue.h \ | 92 | kdecore/kcatalogue.h \ |
93 | kdecore/ksharedptr.h \ | 93 | kdecore/ksharedptr.h \ |
94 | kdecore/kshell.h \ | 94 | kdecore/kshell.h \ |
95 | kdecore/kstandarddirs.h \ | 95 | kdecore/kstandarddirs.h \ |
96 | kdecore/kstringhandler.h \ | 96 | kdecore/kstringhandler.h \ |
97 | kdecore/kshortcut.h \ | 97 | kdecore/kshortcut.h \ |
98 | kutils/kcmultidialog.h \ | 98 | kutils/kcmultidialog.h \ |
99 | kdeui/kxmlguiclient.h \ | 99 | kdeui/kxmlguiclient.h \ |
100 | kdeui/kstdaction.h \ | 100 | kdeui/kstdaction.h \ |
101 | kdeui/kmainwindow.h \ | 101 | kdeui/kmainwindow.h \ |
102 | kdeui/ktoolbar.h \ | 102 | kdeui/ktoolbar.h \ |
103 | kdeui/ktoolbarbutton.h \ | 103 | kdeui/ktoolbarbutton.h \ |
104 | kdeui/ktoolbarhandler.h \ | 104 | kdeui/ktoolbarhandler.h \ |
105 | kdeui/kaction.h \ | 105 | kdeui/kaction.h \ |
106 | kdeui/kpopupmenu.h \ | ||
106 | kdeui/kactionclasses.h \ | 107 | kdeui/kactionclasses.h \ |
107 | kdeui/kactioncollection.h \ | 108 | kdeui/kactioncollection.h \ |
108 | kdecore/kprefs.h \ | 109 | kdecore/kprefs.h \ |
109 | kdecore/klibloader.h \ | 110 | kdecore/klibloader.h \ |
110 | kidmanager.h | 111 | kidmanager.h |
111 | 112 | ||
112 | 113 | ||
113 | # kdecore/klibloader.h \ | 114 | # kdecore/klibloader.h \ |
114 | 115 | ||
115 | 116 | ||
116 | SOURCES = \ | 117 | SOURCES = \ |
117 | KDGanttMinimizeSplitter.cpp \ | 118 | KDGanttMinimizeSplitter.cpp \ |
118 | kapplication.cpp \ | 119 | kapplication.cpp \ |
119 | kcalendarsystem.cpp \ | 120 | kcalendarsystem.cpp \ |
120 | kcalendarsystemgregorian.cpp \ | 121 | kcalendarsystemgregorian.cpp \ |
121 | kcolorbutton.cpp \ | 122 | kcolorbutton.cpp \ |
@@ -152,27 +153,28 @@ KDGanttMinimizeSplitter.cpp \ | |||
152 | kdeui/knuminput.cpp \ | 153 | kdeui/knuminput.cpp \ |
153 | kdeui/knumvalidator.cpp \ | 154 | kdeui/knumvalidator.cpp \ |
154 | kdeui/kseparator.cpp \ | 155 | kdeui/kseparator.cpp \ |
155 | kdeui/ksqueezedtextlabel.cpp \ | 156 | kdeui/ksqueezedtextlabel.cpp \ |
156 | kio/kio/kdirwatch.cpp \ | 157 | kio/kio/kdirwatch.cpp \ |
157 | kio/kfile/kurlrequester.cpp \ | 158 | kio/kfile/kurlrequester.cpp \ |
158 | kresources/configpage.cpp \ | 159 | kresources/configpage.cpp \ |
159 | kresources/configdialog.cpp \ | 160 | kresources/configdialog.cpp \ |
160 | kresources/configwidget.cpp \ | 161 | kresources/configwidget.cpp \ |
161 | kresources/factory.cpp \ | 162 | kresources/factory.cpp \ |
162 | kresources/kcmkresources.cpp \ | 163 | kresources/kcmkresources.cpp \ |
163 | kresources/managerimpl.cpp \ | 164 | kresources/managerimpl.cpp \ |
164 | kresources/resource.cpp \ | 165 | kresources/resource.cpp \ |
165 | kresources/selectdialog.cpp \ | 166 | kresources/selectdialog.cpp \ |
166 | kutils/kcmultidialog.cpp \ | 167 | kutils/kcmultidialog.cpp \ |
167 | kdeui/kaction.cpp \ | 168 | kdeui/kaction.cpp \ |
169 | kdeui/kpopupmenu.cpp \ | ||
168 | kdeui/kactionclasses.cpp \ | 170 | kdeui/kactionclasses.cpp \ |
169 | kdeui/kactioncollection.cpp \ | 171 | kdeui/kactioncollection.cpp \ |
170 | kdeui/kmainwindow.cpp \ | 172 | kdeui/kmainwindow.cpp \ |
171 | kdeui/ktoolbar.cpp \ | 173 | kdeui/ktoolbar.cpp \ |
172 | kdeui/ktoolbarbutton.cpp \ | 174 | kdeui/ktoolbarbutton.cpp \ |
173 | kdeui/ktoolbarhandler.cpp \ | 175 | kdeui/ktoolbarhandler.cpp \ |
174 | kdeui/kstdaction.cpp \ | 176 | kdeui/kstdaction.cpp \ |
175 | kdeui/kxmlguiclient.cpp \ | 177 | kdeui/kxmlguiclient.cpp \ |
176 | kdecore/kprefs.cpp \ | 178 | kdecore/kprefs.cpp \ |
177 | kdecore/klibloader.cpp \ | 179 | kdecore/klibloader.cpp \ |
178 | kidmanager.cpp | 180 | kidmanager.cpp |
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro index 335fcd0..8fe2bd5 100644 --- a/microkde/microkdeE.pro +++ b/microkde/microkdeE.pro | |||
@@ -43,32 +43,33 @@ KDGanttMinimizeSplitter.h \ | |||
43 | knotifyclient.h \ | 43 | knotifyclient.h \ |
44 | kprinter.h \ | 44 | kprinter.h \ |
45 | kprocess.h \ | 45 | kprocess.h \ |
46 | krestrictedline.h \ | 46 | krestrictedline.h \ |
47 | krun.h \ | 47 | krun.h \ |
48 | ksimpleconfig.h \ | 48 | ksimpleconfig.h \ |
49 | kstaticdeleter.h \ | 49 | kstaticdeleter.h \ |
50 | ksystemtray.h \ | 50 | ksystemtray.h \ |
51 | ktempfile.h \ | 51 | ktempfile.h \ |
52 | ktextedit.h \ | 52 | ktextedit.h \ |
53 | kunload.h \ | 53 | kunload.h \ |
54 | kurl.h \ | 54 | kurl.h \ |
55 | ofileselector_p.h \ | 55 | ofileselector_p.h \ |
56 | ofontselector.h \ | 56 | ofontselector.h \ |
57 | kdeui/kguiitem.h \ | 57 | kdeui/kguiitem.h \ |
58 | kdeui/kaction.h \ | 58 | kdeui/kaction.h \ |
59 | kdeui/kpopupmenu.h \ | ||
59 | kdeui/kactionclasses.h \ | 60 | kdeui/kactionclasses.h \ |
60 | kdeui/kactioncollection.h \ | 61 | kdeui/kactioncollection.h \ |
61 | kdeui/kcmodule.h \ | 62 | kdeui/kcmodule.h \ |
62 | kdeui/kstdaction.h \ | 63 | kdeui/kstdaction.h \ |
63 | kdeui/kbuttonbox.h \ | 64 | kdeui/kbuttonbox.h \ |
64 | kdeui/klistbox.h \ | 65 | kdeui/klistbox.h \ |
65 | kdeui/klistview.h \ | 66 | kdeui/klistview.h \ |
66 | kdeui/kjanuswidget.h \ | 67 | kdeui/kjanuswidget.h \ |
67 | kdeui/kseparator.h \ | 68 | kdeui/kseparator.h \ |
68 | kdeui/kmainwindow.h \ | 69 | kdeui/kmainwindow.h \ |
69 | kdeui/knuminput.h \ | 70 | kdeui/knuminput.h \ |
70 | kdeui/knumvalidator.h \ | 71 | kdeui/knumvalidator.h \ |
71 | kdeui/ksqueezedtextlabel.h \ | 72 | kdeui/ksqueezedtextlabel.h \ |
72 | kdeui/ktoolbar.h \ | 73 | kdeui/ktoolbar.h \ |
73 | kdeui/ktoolbarbutton.h \ | 74 | kdeui/ktoolbarbutton.h \ |
74 | kdeui/ktoolbarhandler.h \ | 75 | kdeui/ktoolbarhandler.h \ |
@@ -126,32 +127,33 @@ KDGanttMinimizeSplitter.cpp fncolordialog.cpp \ | |||
126 | krun.cpp \ | 127 | krun.cpp \ |
127 | ksystemtray.cpp \ | 128 | ksystemtray.cpp \ |
128 | ktempfile.cpp \ | 129 | ktempfile.cpp \ |
129 | kurl.cpp \ | 130 | kurl.cpp \ |
130 | ktextedit.cpp \ | 131 | ktextedit.cpp \ |
131 | ofileselector_p.cpp \ | 132 | ofileselector_p.cpp \ |
132 | ofontselector.cpp \ | 133 | ofontselector.cpp \ |
133 | kdecore/kcatalogue.cpp \ | 134 | kdecore/kcatalogue.cpp \ |
134 | kdecore/klibloader.cpp \ | 135 | kdecore/klibloader.cpp \ |
135 | kdecore/klocale.cpp \ | 136 | kdecore/klocale.cpp \ |
136 | kdecore/kmdcodec.cpp \ | 137 | kdecore/kmdcodec.cpp \ |
137 | kdecore/kprefs.cpp \ | 138 | kdecore/kprefs.cpp \ |
138 | kdecore/kshell.cpp \ | 139 | kdecore/kshell.cpp \ |
139 | kdecore/kstandarddirs.cpp \ | 140 | kdecore/kstandarddirs.cpp \ |
140 | kdecore/kstringhandler.cpp \ | 141 | kdecore/kstringhandler.cpp \ |
141 | kdeui/kaction.cpp \ | 142 | kdeui/kaction.cpp \ |
143 | kdeui/kpopupmenu.cpp \ | ||
142 | kdeui/kactionclasses.cpp \ | 144 | kdeui/kactionclasses.cpp \ |
143 | kdeui/kactioncollection.cpp \ | 145 | kdeui/kactioncollection.cpp \ |
144 | kdeui/kbuttonbox.cpp \ | 146 | kdeui/kbuttonbox.cpp \ |
145 | kdeui/kcmodule.cpp \ | 147 | kdeui/kcmodule.cpp \ |
146 | kdeui/kguiitem.cpp \ | 148 | kdeui/kguiitem.cpp \ |
147 | kdeui/kjanuswidget.cpp \ | 149 | kdeui/kjanuswidget.cpp \ |
148 | kdeui/klistbox.cpp \ | 150 | kdeui/klistbox.cpp \ |
149 | kdeui/klistview.cpp \ | 151 | kdeui/klistview.cpp \ |
150 | kdeui/kmainwindow.cpp \ | 152 | kdeui/kmainwindow.cpp \ |
151 | kdeui/knuminput.cpp \ | 153 | kdeui/knuminput.cpp \ |
152 | kdeui/knumvalidator.cpp \ | 154 | kdeui/knumvalidator.cpp \ |
153 | kdeui/kseparator.cpp \ | 155 | kdeui/kseparator.cpp \ |
154 | kdeui/kstdaction.cpp \ | 156 | kdeui/kstdaction.cpp \ |
155 | kdeui/ksqueezedtextlabel.cpp \ | 157 | kdeui/ksqueezedtextlabel.cpp \ |
156 | kdeui/ktoolbar.cpp \ | 158 | kdeui/ktoolbar.cpp \ |
157 | kdeui/ktoolbarbutton.cpp \ | 159 | kdeui/ktoolbarbutton.cpp \ |