* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 6 deletions

diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index c6bc41768..05d624a58 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -58,14 +58,16 @@ class NavigatorBar: public QWidget
     void selectDates( const KCal::DateList & );
 
   signals:
-    void goNextMonth();
-    void goPrevMonth();
-    void goNextYear();
-    void goPrevYear();
-    void goMonth(int month);
+    void nextMonthClicked();
+    void prevMonthClicked();
+    void nextYearClicked();
+    void prevYearClicked();
+    void monthSelected( int month );
+    void yearSelected( int year );
 
   private slots:
-    void selectMonth();
+    void selectMonthFromMenu();
+    void selectYearFromMenu();
 
   private:
     bool mHasMinWidth;
@@ -75,6 +77,7 @@ class NavigatorBar: public QWidget
     TQPushButton *mPrevYear;
     TQPushButton *mPrevMonth;
     ActiveLabel *mMonth;
+    ActiveLabel *mYear;
     TQPushButton *mNextMonth;
     TQPushButton *mNextYear;
 };