summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a93d8e5..c3c4c26 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1422,261 +1422,259 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
1422 mView->viewManager()->showMonthView(); 1422 mView->viewManager()->showMonthView();
1423 showSelectedDates = true; 1423 showSelectedDates = true;
1424 break; 1424 break;
1425 case Qt::Key_Insert: 1425 case Qt::Key_Insert:
1426 mView->newEvent(); 1426 mView->newEvent();
1427 break; 1427 break;
1428 case Qt::Key_S : 1428 case Qt::Key_S :
1429 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 1429 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
1430 mView->newSubTodo(); 1430 mView->newSubTodo();
1431 else 1431 else
1432 mView->dialogManager()->showSearchDialog(); 1432 mView->dialogManager()->showSearchDialog();
1433 break; 1433 break;
1434 case Qt::Key_Y : 1434 case Qt::Key_Y :
1435 case Qt::Key_Z : 1435 case Qt::Key_Z :
1436 mView->viewManager()->showWorkWeekView(); 1436 mView->viewManager()->showWorkWeekView();
1437 showSelectedDates = true; 1437 showSelectedDates = true;
1438 break; 1438 break;
1439 case Qt::Key_U : 1439 case Qt::Key_U :
1440 mView->viewManager()->showWeekView(); 1440 mView->viewManager()->showWeekView();
1441 showSelectedDates = true; 1441 showSelectedDates = true;
1442 break; 1442 break;
1443 case Qt::Key_H : 1443 case Qt::Key_H :
1444 keyBindings(); 1444 keyBindings();
1445 break; 1445 break;
1446 case Qt::Key_W: 1446 case Qt::Key_W:
1447 mView->viewManager()->showWhatsNextView(); 1447 mView->viewManager()->showWhatsNextView();
1448 break; 1448 break;
1449 case Qt::Key_L: 1449 case Qt::Key_L:
1450 mView->viewManager()->showListView(); 1450 mView->viewManager()->showListView();
1451 break; 1451 break;
1452 case Qt::Key_N: 1452 case Qt::Key_N:
1453 mView->viewManager()->showNextXView(); 1453 mView->viewManager()->showNextXView();
1454 showSelectedDates = true; 1454 showSelectedDates = true;
1455 break; 1455 break;
1456 case Qt::Key_V: 1456 case Qt::Key_V:
1457 mView->viewManager()->showTodoView(); 1457 mView->viewManager()->showTodoView();
1458 break; 1458 break;
1459 case Qt::Key_C: 1459 case Qt::Key_C:
1460 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); 1460 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
1461 break; 1461 break;
1462 case Qt::Key_P: 1462 case Qt::Key_P:
1463 mView->showDatePicker( ); 1463 mView->showDatePicker( );
1464 break; 1464 break;
1465 case Qt::Key_F: 1465 case Qt::Key_F:
1466 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1466 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1467 mView->editFilters(); 1467 mView->editFilters();
1468 else 1468 else
1469 mView->toggleFilter(); 1469 mView->toggleFilter();
1470 break; 1470 break;
1471 case Qt::Key_X: 1471 case Qt::Key_X:
1472 mView->toggleDateNavigatorWidget(); 1472 mView->toggleDateNavigatorWidget();
1473 break; 1473 break;
1474 case Qt::Key_Space: 1474 case Qt::Key_Space:
1475 mView->toggleExpand(); 1475 mView->toggleExpand();
1476 break; 1476 break;
1477 case Qt::Key_A: 1477 case Qt::Key_A:
1478 mView->toggleAllDaySize(); 1478 mView->toggleAllDaySize();
1479 break; 1479 break;
1480 case Qt::Key_T: 1480 case Qt::Key_T:
1481 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1481 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1482 mView->newTodo(); 1482 mView->newTodo();
1483 else { 1483 else {
1484 mView->goToday(); 1484 mView->goToday();
1485 showSelectedDates = true; 1485 showSelectedDates = true;
1486 } 1486 }
1487 break; 1487 break;
1488 case Qt::Key_J: 1488 case Qt::Key_J:
1489 mView->viewManager()->showJournalView(); 1489 mView->viewManager()->showJournalView();
1490 break; 1490 break;
1491 case Qt::Key_B: 1491 case Qt::Key_B:
1492 mView->editIncidenceDescription();; 1492 mView->editIncidenceDescription();;
1493 break; 1493 break;
1494 // case Qt::Key_Return: 1494 // case Qt::Key_Return:
1495 case Qt::Key_E: 1495 case Qt::Key_E:
1496 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1496 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1497 mView->newEvent(); 1497 mView->newEvent();
1498 else 1498 else
1499 mView->editIncidence(); 1499 mView->editIncidence();
1500 break; 1500 break;
1501 case Qt::Key_Plus: 1501 case Qt::Key_Plus:
1502 size = p->mHourSize +2; 1502 size = p->mHourSize +2;
1503 if ( size <= 18 ) 1503 if ( size <= 18 )
1504 configureAgenda( size ); 1504 configureAgenda( size );
1505 break; 1505 break;
1506 case Qt::Key_Minus: 1506 case Qt::Key_Minus:
1507 size = p->mHourSize - 2; 1507 size = p->mHourSize - 2;
1508 if ( size >= 4 ) 1508 if ( size >= 4 )
1509 configureAgenda( size ); 1509 configureAgenda( size );
1510 break; 1510 break;
1511 1511
1512 1512
1513 default: 1513 default:
1514 e->ignore(); 1514 e->ignore();
1515 } 1515 }
1516 if ( pro > 0 ) { 1516 if ( pro > 0 ) {
1517 mView->selectFilter( pro-1 ); 1517 mView->selectFilter( pro-1 );
1518 } 1518 }
1519 if ( showSelectedDates ) { 1519 if ( showSelectedDates ) {
1520 ;// setCaptionToDates(); 1520 ;// setCaptionToDates();
1521 } 1521 }
1522 1522
1523} 1523}
1524 1524
1525void MainWindow::fillFilterMenu() 1525void MainWindow::fillFilterMenu()
1526{ 1526{
1527 selectFilterMenu->clear(); 1527 selectFilterMenu->clear();
1528 bool disable = false; 1528 bool disable = false;
1529 if ( mView->filterView()->filtersEnabled() ) { 1529 if ( mView->filterView()->filtersEnabled() ) {
1530 selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); 1530 selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 );
1531 } 1531 }
1532 else { 1532 else {
1533 selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); 1533 selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 );
1534 disable = true; 1534 disable = true;
1535 } 1535 }
1536 selectFilterMenu->insertSeparator(); 1536 selectFilterMenu->insertSeparator();
1537 QPtrList<CalFilter> fili = mView->filters(); 1537 QPtrList<CalFilter> fili = mView->filters();
1538 CalFilter *curfilter = mView->filterView()->selectedFilter(); 1538 CalFilter *curfilter = mView->filterView()->selectedFilter();
1539 CalFilter *filter = fili.first(); 1539 CalFilter *filter = fili.first();
1540 int iii = 1; 1540 int iii = 1;
1541 while(filter) { 1541 while(filter) {
1542 selectFilterMenu->insertItem( filter->name(), iii ); 1542 selectFilterMenu->insertItem( filter->name(), iii );
1543 if ( filter == curfilter) 1543 if ( filter == curfilter)
1544 selectFilterMenu->setItemChecked( iii, true ); 1544 selectFilterMenu->setItemChecked( iii, true );
1545 if ( disable ) 1545 if ( disable )
1546 selectFilterMenu->setItemEnabled( iii, false ); 1546 selectFilterMenu->setItemEnabled( iii, false );
1547 filter = fili.next(); 1547 filter = fili.next();
1548 ++iii; 1548 ++iii;
1549 } 1549 }
1550 qDebug("rettich ");
1551} 1550}
1552void MainWindow::selectFilter( int fil ) 1551void MainWindow::selectFilter( int fil )
1553{ 1552{
1554 qDebug("selectFilter %d ", fil);
1555 if ( fil == 0 ) { 1553 if ( fil == 0 ) {
1556 mView->toggleFilerEnabled( ); 1554 mView->toggleFilerEnabled( );
1557 } else { 1555 } else {
1558 mView->selectFilter( fil-1 ); 1556 mView->selectFilter( fil-1 );
1559 } 1557 }
1560} 1558}
1561void MainWindow::configureToolBar( int item ) 1559void MainWindow::configureToolBar( int item )
1562{ 1560{
1563 1561
1564 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 1562 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
1565 KOPrefs *p = KOPrefs::instance(); 1563 KOPrefs *p = KOPrefs::instance();
1566 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 1564 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
1567 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 1565 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
1568 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 1566 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
1569 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 1567 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
1570 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 1568 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
1571 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 1569 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
1572 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 1570 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
1573 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 1571 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
1574 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 1572 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
1575 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 1573 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
1576 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 1574 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
1577 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 1575 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
1578 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 1576 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
1579 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 1577 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
1580 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 1578 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
1581 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 1579 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
1582 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 1580 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
1583 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 1581 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
1584 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 1582 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
1585 // initActions(); 1583 // initActions();
1586} 1584}
1587 1585
1588void MainWindow::setCaptionToDates() 1586void MainWindow::setCaptionToDates()
1589{ 1587{
1590 QString selDates; 1588 QString selDates;
1591 selDates = KGlobal::locale()->formatDate(mView->startDate(), true); 1589 selDates = KGlobal::locale()->formatDate(mView->startDate(), true);
1592 if (mView->startDate() < mView->endDate() ) 1590 if (mView->startDate() < mView->endDate() )
1593 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 1591 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
1594 setCaption( i18n("Dates: ") + selDates ); 1592 setCaption( i18n("Dates: ") + selDates );
1595 1593
1596} 1594}
1597// parameter item == 0: reinit 1595// parameter item == 0: reinit
1598void MainWindow::configureAgenda( int item ) 1596void MainWindow::configureAgenda( int item )
1599{ 1597{
1600 1598
1601 KOPrefs *p = KOPrefs::instance(); 1599 KOPrefs *p = KOPrefs::instance();
1602 1600
1603 int i; 1601 int i;
1604 if ( item == 1 ) { 1602 if ( item == 1 ) {
1605 mView->toggleAllDaySize(); 1603 mView->toggleAllDaySize();
1606 return; 1604 return;
1607 } 1605 }
1608 // do not allow 4 for widgets higher than 480 1606 // do not allow 4 for widgets higher than 480
1609 // if ( QApplication::desktop()->height() > 480 ) { 1607 // if ( QApplication::desktop()->height() > 480 ) {
1610// if ( item == 4 ) 1608// if ( item == 4 )
1611// item = 6; 1609// item = 6;
1612// } 1610// }
1613 for ( i = 4; i <= 18; i= i+2 ) 1611 for ( i = 4; i <= 18; i= i+2 )
1614 configureAgendaMenu->setItemChecked( i, false ); 1612 configureAgendaMenu->setItemChecked( i, false );
1615 configureAgendaMenu->setItemChecked( item, true ); 1613 configureAgendaMenu->setItemChecked( item, true );
1616 if ( p->mHourSize == item ) 1614 if ( p->mHourSize == item )
1617 return; 1615 return;
1618 p->mHourSize=item; 1616 p->mHourSize=item;
1619 mView->viewManager()->agendaView()->updateConfig(); 1617 mView->viewManager()->agendaView()->updateConfig();
1620} 1618}
1621 1619
1622void MainWindow::saveCalendar() 1620void MainWindow::saveCalendar()
1623{ 1621{
1624 QString fn = KOPrefs::instance()->mLastSaveFile; 1622 QString fn = KOPrefs::instance()->mLastSaveFile;
1625 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this ); 1623 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
1626 1624
1627 if ( fn == "" ) 1625 if ( fn == "" )
1628 return; 1626 return;
1629 QFileInfo info; 1627 QFileInfo info;
1630 info.setFile( fn ); 1628 info.setFile( fn );
1631 QString mes; 1629 QString mes;
1632 bool createbup = true; 1630 bool createbup = true;
1633 if ( info. exists() ) { 1631 if ( info. exists() ) {
1634 mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ; 1632 mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ;
1635 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, 1633 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
1636 i18n("Overwrite!"), i18n("Cancel"), 0, 1634 i18n("Overwrite!"), i18n("Cancel"), 0,
1637 0, 1 ); 1635 0, 1 );
1638 if ( result != 0 ) { 1636 if ( result != 0 ) {
1639 createbup = false; 1637 createbup = false;
1640 } 1638 }
1641 } 1639 }
1642 if ( createbup ) { 1640 if ( createbup ) {
1643 mView->saveCalendar( fn ); 1641 mView->saveCalendar( fn );
1644 mes = i18n("KO/Pi:Saved %1").arg(fn); 1642 mes = i18n("KO/Pi:Saved %1").arg(fn);
1645 KOPrefs::instance()->mLastSaveFile = fn; 1643 KOPrefs::instance()->mLastSaveFile = fn;
1646 setCaption(mes); 1644 setCaption(mes);
1647 } 1645 }
1648} 1646}
1649void MainWindow::loadCalendar() 1647void MainWindow::loadCalendar()
1650{ 1648{
1651 1649
1652 QString fn = KOPrefs::instance()->mLastLoadFile; 1650 QString fn = KOPrefs::instance()->mLastLoadFile;
1653 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this ); 1651 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
1654 1652
1655 if ( fn == "" ) 1653 if ( fn == "" )
1656 return; 1654 return;
1657 QFileInfo info; 1655 QFileInfo info;
1658 info.setFile( fn ); 1656 info.setFile( fn );
1659 QString mess; 1657 QString mess;
1660 bool loadbup = true; 1658 bool loadbup = true;
1661 if ( info. exists() ) { 1659 if ( info. exists() ) {
1662 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 1660 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
1663 int result = QMessageBox::warning( this, "KO/Pi: Warning!", 1661 int result = QMessageBox::warning( this, "KO/Pi: Warning!",
1664 mess, 1662 mess,
1665 i18n("Load!"), i18n("Cancel"), 0, 1663 i18n("Load!"), i18n("Cancel"), 0,
1666 0, 1 ); 1664 0, 1 );
1667 if ( result != 0 ) { 1665 if ( result != 0 ) {
1668 loadbup = false; 1666 loadbup = false;
1669 } 1667 }
1670 } else { 1668 } else {
1671 QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1669 QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1672 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, 1670 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
1673 0, 1 ); 1671 0, 1 );
1674 1672
1675 return; 1673 return;
1676 } 1674 }
1677 if ( loadbup ) { 1675 if ( loadbup ) {
1678 mView->openCalendar( fn ); 1676 mView->openCalendar( fn );
1679 KOPrefs::instance()->mLastLoadFile = fn; 1677 KOPrefs::instance()->mLastLoadFile = fn;
1680 mess = i18n("KO/Pi:Loaded %1").arg(fn) ; 1678 mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
1681 setCaption(mess); 1679 setCaption(mess);
1682 } 1680 }