-rw-r--r-- | korganizer/mainwindow.h | 5 |
1 files changed, 2 insertions, 3 deletions
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; |