summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt7
-rw-r--r--bin/kdepim/korganizer/featuresKOPI.txt27
-rw-r--r--korganizer/komonthview.cpp33
-rw-r--r--korganizer/komonthview.h2
-rw-r--r--korganizer/koviewmanager.cpp4
5 files changed, 43 insertions, 30 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4f8fcc7..ac70a55 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -10,5 +10,6 @@ Added WhatsThis support for the todo view and the list view.
-Added a quite useful and quite hidden feature (to KO/Pi).
-Who does find it first?
-Hint: You have to click somewhere in the views ...
+Added a quite useful feature to the montview.
+Just click on the week numbers on the left.
+And on top of the week numbers there is now a "week view quick selector".
+(Click on the black triangle).
diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt
index 052680e..c056dca 100644
--- a/bin/kdepim/korganizer/featuresKOPI.txt
+++ b/bin/kdepim/korganizer/featuresKOPI.txt
@@ -142,7 +142,6 @@ B) Useful features, that are not straighforward to see
3) Creating exceptions for recurring events
-4) Accessing the week in agenda view from the Month view
-5) Navigation in month view
-6) Navigation in agenda view
-7) Monthview as week view
-8) Switching display mode in date edit
+4) Navigation in month view
+5) Navigation in agenda view
+6) Monthview as week view
+7) Switching display mode in date edit
@@ -178,7 +177,2 @@ and then move it back and cancel it.
4)
-Accessing the week in agenda view from the month view:
-In the month view there are on the left week numbers displayed.
-Click on a week number to see this week in the agenda view.
-
-5)
Navigation in month view:
@@ -196,3 +190,3 @@ complete next month as date range.
-6)
+5)
Navigation in agenda view:
@@ -220,10 +214,11 @@ If you click this button, the month view is shown.
-7)
+6)
Monthview as week view:
On the left side of the monthview are the week number labels displayed.
-On top of these labels is a "W" displayed.
-If you click on this button the month view mode will switch to week view mode.
-To switch back, please click the button, which now displays a "M".
+If you click on these labels, the month view will show this week zoomed.
+To go back to monthly view click the left label again.
+You can quickly select a week number by clicking the black triangle
+on top of the week number labels.
-8)
+7)
Switching display mode in date edit:
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 00b1e92..f2cfb75 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -800,5 +800,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
label->setFont(bfont);
- connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int )) );
+ connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) );
label->setFlat(true);
- QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view"));
+ QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
//label->setFrameStyle(QFrame::Panel|QFrame::Raised);
@@ -808,5 +808,10 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
}
- mWeekLabels[mNumWeeks]->setText( i18n("W"));
- QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nswitch to week mode view"));
+ mWeekLabels[mNumWeeks]->setText( i18n(""));
+ QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
int row, col;
+ QPopupMenu * wpo = new QPopupMenu (this);
+ wpo->insertItem( i18n("W#"), 0 );
+ for ( i = 1; i < 54; i++ )
+ wpo->insertItem( i18n("%1").arg(i), i );
+ mWeekLabels[mNumWeeks]->setPopup( wpo );
mCells.resize( mNumCells );
@@ -826,4 +831,4 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
- connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ),
- SLOT( switchView() ) );
+ //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
+ connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) );
mContextMenu = eventPopup();
@@ -838,2 +843,12 @@ KOMonthView::~KOMonthView()
}
+void KOMonthView::selectDateWeekNum ( int )
+{
+
+}
+void KOMonthView::selectInternalWeekNum ( int n )
+{
+ emit selectWeekNum ( n );
+ switchView();
+}
+
void KOMonthView::switchView()
@@ -844,3 +859,3 @@ void KOMonthView::switchView()
KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
- emit showNavigator( !mShowWeekView );
+ //emit showNavigator( !mShowWeekView );
computeLayout();
@@ -1224,3 +1239,3 @@ void KOMonthView::computeLayoutWeek()
updatePossible = true;
- mWeekLabels[mNumWeeks]->setText( i18n("M"));
+ //mWeekLabels[mNumWeeks]->setText( i18n("M"));
if ( forceUpdate )
@@ -1333,3 +1348,3 @@ void KOMonthView::computeLayout()
updatePossible = true;
- mWeekLabels[mNumWeeks]->setText( i18n("W"));
+ //mWeekLabels[mNumWeeks]->setText( i18n("W"));
if ( forceUpdate )
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 0bc3743..1ed200b 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -242,2 +242,4 @@ class KOMonthView: public KOEventView
protected slots:
+ void selectDateWeekNum ( int );
+ void selectInternalWeekNum ( int );
void switchView();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 8aa0697..ca3de59 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -224,3 +224,3 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
if ( mCurrentView == mMonthView ) {
- if ( !KOPrefs::instance()->mMonthViewWeek ) {
+ if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
mMainView->navigatorBar()->show();
@@ -520,3 +520,3 @@ void KOViewManager::showMonthView()
connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
- mMainView, SLOT ( selectWeekNum( int ) ) );
+ mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),