1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 79fb305..7c16aeb 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -85,24 +85,25 @@ class MainWindow : public QMainWindow
    
    void slotModifiedChanged( bool );
    
    void save();
    void saveStopTimer();
    void configureToolBar( int );
    void printSel();
    void printCal();
    void saveCalendar();
    void loadCalendar();
    void exportVCalendar();
    void fillFilterMenu();
+    void fillFilterMenuTB();
    void selectFilter( int );
    void fillFilterMenuPopup();
    void selectFilterPopup( int );
    void exportToPhone( int );
    void toggleBeamReceive();
    void disableBR(bool);
 signals:
    void selectWeek ( int ); 
  private slots:
    void showConfigureAgenda();
    void getFile( bool );
    void syncFileRequest();
@@ -127,44 +128,45 @@ class MainWindow : public QMainWindow
    QPEToolBar *iconToolBar;
    QPEToolBar *viewToolBar;
    QPEToolBar *navigatorToolBar;
    QPEToolBar *filterToolBar;
    QPEMenuBar *filterMenubar;
    QPopupMenu * filterPopupMenu;
    void initActions();
    void setDefaultPreferences(); 
    void keyPressEvent ( QKeyEvent * ) ;
    void keyReleaseEvent ( QKeyEvent * ) ;
    QPopupMenu *configureToolBarMenu;
    QPopupMenu *selectFilterMenu;
+    QPopupMenu *selectFilterMenuTB;
    QPopupMenu *configureAgendaMenu, *syncMenu;
    CalendarLocal *mCalendar;
    CalendarView *mView;
    QAction *mNewSubTodoAction;
    QAction *mWeekAction;
    QFont mWeekFont;
    QPixmap mWeekPixmap;
    QColor mWeekBgColor;
    
    QAction *mShowAction;
    QAction *mEditAction;
    QAction *mDeleteAction;
    QAction *mCloneAction;
    QAction *mMoveAction;
    QAction *mBeamAction;
    QAction *mCancelAction;
    QAction *mToggleNav;
    QAction *mToggleFilter;
    QAction *mToggleAllday;
+    QAction *actionFilterMenuTB;
    void closeEvent( QCloseEvent* ce );
    SimpleAlarmClient mAlarmClient;
    QTimer mSaveTimer;
    //bool mBlockSaveFlag;
    bool mCalendarModifiedFlag;
    QPixmap loadPixmap( QString );
 };
 #endif

diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 79fb305..7c16aeb 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h
@@ -85,24 +85,25 @@ class MainWindow : public QMainWindow
85		85
86	void slotModifiedChanged( bool );	86	void slotModifiedChanged( bool );
87		87
88	void save();	88	void save();
89	void saveStopTimer();	89	void saveStopTimer();
90	void configureToolBar( int );	90	void configureToolBar( int );
91	void printSel();	91	void printSel();
92	void printCal();	92	void printCal();
93	void saveCalendar();	93	void saveCalendar();
94	void loadCalendar();	94	void loadCalendar();
95	void exportVCalendar();	95	void exportVCalendar();
96	void fillFilterMenu();	96	void fillFilterMenu();
		97	void fillFilterMenuTB();
97	void selectFilter( int );	98	void selectFilter( int );
98	void fillFilterMenuPopup();	99	void fillFilterMenuPopup();
99	void selectFilterPopup( int );	100	void selectFilterPopup( int );
100	void exportToPhone( int );	101	void exportToPhone( int );
101	void toggleBeamReceive();	102	void toggleBeamReceive();
102	void disableBR(bool);	103	void disableBR(bool);
103	signals:	104	signals:
104	void selectWeek ( int );	105	void selectWeek ( int );
105	private slots:	106	private slots:
106	void showConfigureAgenda();	107	void showConfigureAgenda();
107	void getFile( bool );	108	void getFile( bool );
108	void syncFileRequest();	109	void syncFileRequest();
@@ -127,44 +128,45 @@ class MainWindow : public QMainWindow
127	QPEToolBar *iconToolBar;	128	QPEToolBar *iconToolBar;
128	QPEToolBar *viewToolBar;	129	QPEToolBar *viewToolBar;
129	QPEToolBar *navigatorToolBar;	130	QPEToolBar *navigatorToolBar;
130	QPEToolBar *filterToolBar;	131	QPEToolBar *filterToolBar;
131	QPEMenuBar *filterMenubar;	132	QPEMenuBar *filterMenubar;
132	QPopupMenu * filterPopupMenu;	133	QPopupMenu * filterPopupMenu;
133	void initActions();	134	void initActions();
134	void setDefaultPreferences();	135	void setDefaultPreferences();
135	void keyPressEvent ( QKeyEvent * ) ;	136	void keyPressEvent ( QKeyEvent * ) ;
136	void keyReleaseEvent ( QKeyEvent * ) ;	137	void keyReleaseEvent ( QKeyEvent * ) ;
137	QPopupMenu *configureToolBarMenu;	138	QPopupMenu *configureToolBarMenu;
138	QPopupMenu *selectFilterMenu;	139	QPopupMenu *selectFilterMenu;
		140	QPopupMenu *selectFilterMenuTB;
139	QPopupMenu configureAgendaMenu, syncMenu;	141	QPopupMenu configureAgendaMenu, syncMenu;
140	CalendarLocal *mCalendar;	142	CalendarLocal *mCalendar;
141	CalendarView *mView;	143	CalendarView *mView;
142	QAction *mNewSubTodoAction;	144	QAction *mNewSubTodoAction;
143	QAction *mWeekAction;	145	QAction *mWeekAction;
144	QFont mWeekFont;	146	QFont mWeekFont;
145	QPixmap mWeekPixmap;	147	QPixmap mWeekPixmap;
146	QColor mWeekBgColor;	148	QColor mWeekBgColor;
147		149
148	QAction *mShowAction;	150	QAction *mShowAction;
149	QAction *mEditAction;	151	QAction *mEditAction;
150	QAction *mDeleteAction;	152	QAction *mDeleteAction;
151	QAction *mCloneAction;	153	QAction *mCloneAction;
152	QAction *mMoveAction;	154	QAction *mMoveAction;
153	QAction *mBeamAction;	155	QAction *mBeamAction;
154	QAction *mCancelAction;	156	QAction *mCancelAction;
155		157
156	QAction *mToggleNav;	158	QAction *mToggleNav;
157	QAction *mToggleFilter;	159	QAction *mToggleFilter;
158	QAction *mToggleAllday;	160	QAction *mToggleAllday;
159		161	QAction *actionFilterMenuTB;
160		162
161	void closeEvent( QCloseEvent* ce );	163	void closeEvent( QCloseEvent* ce );
162	SimpleAlarmClient mAlarmClient;	164	SimpleAlarmClient mAlarmClient;
163	QTimer mSaveTimer;	165	QTimer mSaveTimer;
164	//bool mBlockSaveFlag;	166	//bool mBlockSaveFlag;
165	bool mCalendarModifiedFlag;	167	bool mCalendarModifiedFlag;
166	QPixmap loadPixmap( QString );	168	QPixmap loadPixmap( QString );
167	};	169	};
168		170
169		171
170	#endif	172	#endif