-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 4bedb61..21d5a35 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1,56 +1,54 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | 2 | ||
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qpopupmenu.h> | 4 | #include <qpopupmenu.h> |
5 | #include <qpainter.h> | 5 | #include <qpainter.h> |
6 | #include <qwhatsthis.h> | 6 | #include <qwhatsthis.h> |
7 | #include <qpushbutton.h> | 7 | #include <qpushbutton.h> |
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" |
49 | #include "koagendaview.h" | 47 | #include "koagendaview.h" |
50 | #include "kojournalview.h" | 48 | #include "kojournalview.h" |
51 | #include "koagenda.h" | 49 | #include "koagenda.h" |
52 | #include "kodialogmanager.h" | 50 | #include "kodialogmanager.h" |
53 | #include "kdialogbase.h" | 51 | #include "kdialogbase.h" |
54 | #include "kapplication.h" | 52 | #include "kapplication.h" |
55 | #include "kofilterview.h" | 53 | #include "kofilterview.h" |
56 | #include "kstandarddirs.h" | 54 | #include "kstandarddirs.h" |
@@ -204,49 +202,49 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
204 | globalFlagBlockStartup = 1; | 202 | globalFlagBlockStartup = 1; |
205 | iconToolBar = new QPEToolBar( this ); | 203 | iconToolBar = new QPEToolBar( this ); |
206 | addToolBar (iconToolBar , tbd ); | 204 | addToolBar (iconToolBar , tbd ); |
207 | 205 | ||
208 | #ifdef DESKTOP_VERSION | 206 | #ifdef DESKTOP_VERSION |
209 | if ( KOPrefs::instance()->mShowIconFilter ) | 207 | if ( KOPrefs::instance()->mShowIconFilter ) |
210 | #else | 208 | #else |
211 | if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) | 209 | if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) |
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 ) |
245 | filterToolBar->hide(); | 243 | filterToolBar->hide(); |
246 | } else { | 244 | } else { |
247 | filterToolBar = 0; | 245 | filterToolBar = 0; |
248 | filterMenubar = 0; | 246 | filterMenubar = 0; |
249 | filterPopupMenu = 0; | 247 | filterPopupMenu = 0; |
250 | } | 248 | } |
251 | if ( p->mShowIconOnetoolbar ) { | 249 | if ( p->mShowIconOnetoolbar ) { |
252 | viewToolBar = iconToolBar ; | 250 | viewToolBar = iconToolBar ; |
@@ -661,84 +659,84 @@ void MainWindow::initActions() | |||
661 | mCurrentItemMenu = new QPopupMenu ( this ); | 659 | mCurrentItemMenu = new QPopupMenu ( this ); |
662 | QPopupMenu *nextConflictMenu = new QPopupMenu ( this ); | 660 | QPopupMenu *nextConflictMenu = new QPopupMenu ( this ); |
663 | QPopupMenu *importMenu = new QPopupMenu( this ); | 661 | QPopupMenu *importMenu = new QPopupMenu( this ); |
664 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | 662 | QPopupMenu *importMenu_X = new QPopupMenu( this ); |
665 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | 663 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); |
666 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | 664 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); |
667 | selectFilterMenu = new QPopupMenu( this ); | 665 | selectFilterMenu = new QPopupMenu( this ); |
668 | selectFilterMenu->setCheckable( true ); | 666 | selectFilterMenu->setCheckable( true ); |
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" ); |
737 | while ( fontWid > pixWid ) { | 735 | while ( fontWid > pixWid ) { |
738 | --fontPoint; | 736 | --fontPoint; |
739 | mWeekFont.setPointSize( fontPoint ); | 737 | mWeekFont.setPointSize( fontPoint ); |
740 | QFontMetrics f( mWeekFont ); | 738 | QFontMetrics f( mWeekFont ); |
741 | fontWid = f.width( "30" ); | 739 | fontWid = f.width( "30" ); |
742 | //qDebug("dec-- "); | 740 | //qDebug("dec-- "); |
743 | } | 741 | } |
744 | 742 | ||