-rw-r--r-- | korganizer/mainwindow.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 95b836c..7a4275b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -581,25 +581,25 @@ void MainWindow::initActions() | |||
581 | if ( p-> mShowIconWeekNum ) | 581 | if ( p-> mShowIconWeekNum ) |
582 | mWeekAction->addTo( iconToolBar ); | 582 | mWeekAction->addTo( iconToolBar ); |
583 | mWeekFont = font(); | 583 | mWeekFont = font(); |
584 | 584 | ||
585 | int fontPoint = mWeekFont.pointSize(); | 585 | int fontPoint = mWeekFont.pointSize(); |
586 | QFontMetrics f( mWeekFont ); | 586 | QFontMetrics f( mWeekFont ); |
587 | int fontWid = f.width( "30" ); | 587 | int fontWid = f.width( "30" ); |
588 | while ( fontWid > pixWid ) { | 588 | while ( fontWid > pixWid ) { |
589 | --fontPoint; | 589 | --fontPoint; |
590 | mWeekFont.setPointSize( fontPoint ); | 590 | mWeekFont.setPointSize( fontPoint ); |
591 | QFontMetrics f( mWeekFont ); | 591 | QFontMetrics f( mWeekFont ); |
592 | fontWid = f.width( "30" ); | 592 | fontWid = f.width( "30" ); |
593 | qDebug("dec-- "); | 593 | //qDebug("dec-- "); |
594 | } | 594 | } |
595 | 595 | ||
596 | connect( mWeekAction, SIGNAL( activated() ), | 596 | connect( mWeekAction, SIGNAL( activated() ), |
597 | this, SLOT( weekAction() ) ); | 597 | this, SLOT( weekAction() ) ); |
598 | 598 | ||
599 | connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); | 599 | connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); |
600 | 600 | ||
601 | //#endif | 601 | //#endif |
602 | // ****************** | 602 | // ****************** |
603 | QAction *action; | 603 | QAction *action; |
604 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); | 604 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); |
605 | configureToolBarMenu->setCheckable( true ); | 605 | configureToolBarMenu->setCheckable( true ); |
@@ -1739,25 +1739,28 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1739 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1739 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1740 | mView->editFilters(); | 1740 | mView->editFilters(); |
1741 | else | 1741 | else |
1742 | mView->toggleFilter(); | 1742 | mView->toggleFilter(); |
1743 | break; | 1743 | break; |
1744 | case Qt::Key_X: | 1744 | case Qt::Key_X: |
1745 | mView->toggleDateNavigatorWidget(); | 1745 | mView->toggleDateNavigatorWidget(); |
1746 | break; | 1746 | break; |
1747 | case Qt::Key_Space: | 1747 | case Qt::Key_Space: |
1748 | mView->toggleExpand(); | 1748 | mView->toggleExpand(); |
1749 | break; | 1749 | break; |
1750 | case Qt::Key_A: | 1750 | case Qt::Key_A: |
1751 | mView->toggleAllDaySize(); | 1751 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) |
1752 | mView->showNextAlarms(); | ||
1753 | else | ||
1754 | mView->toggleAllDaySize(); | ||
1752 | break; | 1755 | break; |
1753 | case Qt::Key_T: | 1756 | case Qt::Key_T: |
1754 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1757 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1755 | mView->newTodo(); | 1758 | mView->newTodo(); |
1756 | else { | 1759 | else { |
1757 | mView->goToday(); | 1760 | mView->goToday(); |
1758 | showSelectedDates = true; | 1761 | showSelectedDates = true; |
1759 | } | 1762 | } |
1760 | break; | 1763 | break; |
1761 | case Qt::Key_J: | 1764 | case Qt::Key_J: |
1762 | mView->viewManager()->showJournalView(); | 1765 | mView->viewManager()->showJournalView(); |
1763 | break; | 1766 | break; |
@@ -2124,12 +2127,24 @@ void MainWindow::weekAction() | |||
2124 | y = 0; | 2127 | y = 0; |
2125 | } | 2128 | } |
2126 | } | 2129 | } |
2127 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); | 2130 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); |
2128 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) | 2131 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) |
2129 | { | 2132 | { |
2130 | month = picker->getResult(); | 2133 | month = picker->getResult(); |
2131 | emit selectWeek ( month ); | 2134 | emit selectWeek ( month ); |
2132 | //qDebug("weekSelected %d ", month); | 2135 | //qDebug("weekSelected %d ", month); |
2133 | } | 2136 | } |
2134 | delete popup; | 2137 | delete popup; |
2135 | } | 2138 | } |
2139 | |||
2140 | void MainWindow::hideEvent ( QHideEvent * ) | ||
2141 | { | ||
2142 | QString message; | ||
2143 | QDateTime nextA = mCalendar->nextAlarmEventDateTime(); | ||
2144 | if ( nextA.isValid() ) { | ||
2145 | QString sum = mCalendar->nextSummary(); | ||
2146 | |||
2147 | message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); | ||
2148 | setCaption( message ); | ||
2149 | } | ||
2150 | } | ||