-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 9 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 3 |
4 files changed, 25 insertions, 4 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index bc5cbb7..a5e2597 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1469,28 +1469,37 @@ | |||
1469 | { "Edit category list...","Ändere Kategorieliste..." }, | 1469 | { "Edit category list...","Ändere Kategorieliste..." }, |
1470 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, | 1470 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, |
1471 | { "Filepath: ","Dateipfad: " }, | 1471 | { "Filepath: ","Dateipfad: " }, |
1472 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, | 1472 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, |
1473 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, | 1473 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, |
1474 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, | 1474 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, |
1475 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, | 1475 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, |
1476 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, | 1476 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, |
1477 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, | 1477 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, |
1478 | { "Alarm Options","Alarm Einstellungen" }, | 1478 | { "Alarm Options","Alarm Einstellungen" }, |
1479 | { "Delete selected...","Lösche Ausgewählte..." }, | 1479 | { "Delete selected...","Lösche Ausgewählte..." }, |
1480 | { "None","Nichts" }, | 1480 | { "None","Nichts" }, |
1481 | { "Selection","Auswahl" }, | 1481 | { "Selection","Auswahl" }, |
1482 | { "Set categories","Setze Kategorien" }, | 1482 | { "Set categories","Setze Kategorien" }, |
1483 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, | 1483 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, |
1484 | { "Reset","Neu setzen" }, | 1484 | { "Reset","Neu setzen" }, |
1485 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1485 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1486 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, | 1486 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1487 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1487 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1488 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, | 1488 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1489 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, | 1489 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, |
1490 | { "Edit","Edit" }, | 1490 | { "Edit","Edit" }, |
1491 | { "Last Modified","Zuletzt geändert" }, | 1491 | { "Last Modified","Zuletzt geändert" }, |
1492 | { "Journal viewer","Journal Anzeige" }, | 1492 | { "Journal viewer","Journal Anzeige" }, |
1493 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, | ||
1494 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, | ||
1495 | { "","" }, | ||
1496 | { "","" }, | ||
1497 | { "","" }, | ||
1498 | { "","" }, | ||
1499 | { "","" }, | ||
1500 | { "","" }, | ||
1501 | { "","" }, | ||
1493 | { "","" }, | 1502 | { "","" }, |
1494 | { "","" }, | 1503 | { "","" }, |
1495 | { "","" }, | 1504 | { "","" }, |
1496 | { "","" }, | 1505 | { "","" }, |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ef5c4dd..131a345 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -815,49 +815,52 @@ void KOAgendaView::createDayLabels() | |||
815 | case 5: | 815 | case 5: |
816 | str = dayName.left( 2 ) + " " +QString::number( date.day()); | 816 | str = dayName.left( 2 ) + " " +QString::number( date.day()); |
817 | 817 | ||
818 | break; | 818 | break; |
819 | case 6: | 819 | case 6: |
820 | str = dayName.left( 3 ) + " " +QString::number( date.day()); | 820 | str = dayName.left( 3 ) + " " +QString::number( date.day()); |
821 | break; | 821 | break; |
822 | 822 | ||
823 | default: | 823 | default: |
824 | break; | 824 | break; |
825 | } | 825 | } |
826 | if ( oneday ) { | 826 | if ( oneday ) { |
827 | QString addString; | 827 | QString addString; |
828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | 828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) |
829 | addString = i18n("Today"); | 829 | addString = i18n("Today"); |
830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | 830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) |
831 | addString = i18n("Tomorrow"); | 831 | addString = i18n("Tomorrow"); |
832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | 832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) |
833 | addString = i18n("Yesterday"); | 833 | addString = i18n("Yesterday"); |
834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | 834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) |
835 | addString = i18n("Day before yesterday"); | 835 | addString = i18n("Day before yesterday"); |
836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | 836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) |
837 | addString = i18n("Day after tomorrow"); | 837 | addString = i18n("Day after tomorrow"); |
838 | if ( !addString.isEmpty() ) { | 838 | if ( !addString.isEmpty() ) { |
839 | str = addString+", " + str; | 839 | if ( QApplication::desktop()->width() < 640 ) |
840 | str = addString+", " + str; | ||
841 | else | ||
842 | str = addString+", "+ KGlobal::locale()->formatDate( date, false); | ||
840 | } else { | 843 | } else { |
841 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); | 844 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); |
842 | } | 845 | } |
843 | } | 846 | } |
844 | dayLabel->setText(str); | 847 | dayLabel->setText(str); |
845 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 848 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
846 | if (date == QDate::currentDate()) { | 849 | if (date == QDate::currentDate()) { |
847 | QFont bFont = dlf; | 850 | QFont bFont = dlf; |
848 | bFont.setBold( true ); | 851 | bFont.setBold( true ); |
849 | dayLabel->setFont(bFont); | 852 | dayLabel->setFont(bFont); |
850 | } | 853 | } |
851 | //dayLayout->addWidget(dayLabel); | 854 | //dayLayout->addWidget(dayLabel); |
852 | 855 | ||
853 | #ifndef KORG_NOPLUGINS | 856 | #ifndef KORG_NOPLUGINS |
854 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); | 857 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); |
855 | CalendarDecoration *it; | 858 | CalendarDecoration *it; |
856 | for(it = cds.first(); it; it = cds.next()) { | 859 | for(it = cds.first(); it; it = cds.next()) { |
857 | QString text = it->shortText( date ); | 860 | QString text = it->shortText( date ); |
858 | if ( !text.isEmpty() ) { | 861 | if ( !text.isEmpty() ) { |
859 | QLabel *label = new QLabel(text,mDayLabels); | 862 | QLabel *label = new QLabel(text,mDayLabels); |
860 | label->setAlignment(AlignCenter); | 863 | label->setAlignment(AlignCenter); |
861 | dayLayout->addWidget(label); | 864 | dayLayout->addWidget(label); |
862 | } | 865 | } |
863 | } | 866 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index cbf6096..e960424 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -998,49 +998,52 @@ void MainWindow::initActions() | |||
998 | 998 | ||
999 | 999 | ||
1000 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); | 1000 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); |
1001 | 1001 | ||
1002 | 1002 | ||
1003 | 1003 | ||
1004 | actionMenu->insertSeparator(); | 1004 | actionMenu->insertSeparator(); |
1005 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, | 1005 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, |
1006 | this ); | 1006 | this ); |
1007 | action->addTo( actionMenu ); | 1007 | action->addTo( actionMenu ); |
1008 | connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); | 1008 | connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); |
1009 | 1009 | ||
1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1011 | this ); | 1011 | this ); |
1012 | action->addTo( actionMenu ); | 1012 | action->addTo( actionMenu ); |
1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1014 | 1014 | ||
1015 | 1015 | ||
1016 | actionMenu->insertSeparator(); | 1016 | actionMenu->insertSeparator(); |
1017 | icon = loadPixmap( pathString + "configure" ); | 1017 | icon = loadPixmap( pathString + "configure" ); |
1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | 1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); |
1019 | action->addTo( actionMenu ); | 1019 | action->addTo( actionMenu ); |
1020 | connect( action, SIGNAL( activated() ), | 1020 | connect( action, SIGNAL( activated() ), |
1021 | mView, SLOT( edit_options() ) ); | 1021 | mView, SLOT( edit_options() ) ); |
1022 | icon = loadPixmap( pathString + "configure" ); | 1022 | action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); |
1023 | action->addTo( actionMenu ); | ||
1024 | connect( action, SIGNAL( activated() ), | ||
1025 | this, SLOT( calHint() ) ); | ||
1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1026 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1024 | action->addTo( actionMenu ); | 1027 | action->addTo( actionMenu ); |
1025 | connect( action, SIGNAL( activated() ), | 1028 | connect( action, SIGNAL( activated() ), |
1026 | mView, SLOT( edit_global_options() ) ); | 1029 | mView, SLOT( edit_global_options() ) ); |
1027 | if ( KOPrefs::instance()->mShowFullMenu ) { | 1030 | if ( KOPrefs::instance()->mShowFullMenu ) { |
1028 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 1031 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
1029 | 1032 | ||
1030 | } | 1033 | } |
1031 | // actionMenu->insertSeparator(); | 1034 | // actionMenu->insertSeparator(); |
1032 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1035 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1033 | this ); | 1036 | this ); |
1034 | action->addTo( importMenu_X ); | 1037 | action->addTo( importMenu_X ); |
1035 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 1038 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
1036 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 1039 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
1037 | this ); | 1040 | this ); |
1038 | action->addTo( importMenu_X ); | 1041 | action->addTo( importMenu_X ); |
1039 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 1042 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
1040 | importMenu_X->insertSeparator(); | 1043 | importMenu_X->insertSeparator(); |
1041 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 1044 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
1042 | this ); | 1045 | this ); |
1043 | action->addTo( importMenu_X ); | 1046 | action->addTo( importMenu_X ); |
1044 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 1047 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
1045 | //#ifndef DESKTOP_VERSION | 1048 | //#ifndef DESKTOP_VERSION |
1046 | importMenu_X->insertSeparator(); | 1049 | importMenu_X->insertSeparator(); |
@@ -1339,49 +1342,54 @@ void MainWindow::initActions() | |||
1339 | } | 1342 | } |
1340 | else { | 1343 | else { |
1341 | iconToolBar->setHorizontalStretchable (true ); | 1344 | iconToolBar->setHorizontalStretchable (true ); |
1342 | viewToolBar->setHorizontalStretchable (true ); | 1345 | viewToolBar->setHorizontalStretchable (true ); |
1343 | navigatorToolBar->setHorizontalStretchable (true ); | 1346 | navigatorToolBar->setHorizontalStretchable (true ); |
1344 | iconToolBar->setVerticalStretchable (true ); | 1347 | iconToolBar->setVerticalStretchable (true ); |
1345 | viewToolBar->setVerticalStretchable (true ); | 1348 | viewToolBar->setVerticalStretchable (true ); |
1346 | navigatorToolBar->setVerticalStretchable (true ); | 1349 | navigatorToolBar->setVerticalStretchable (true ); |
1347 | configureToolBarMenu->setItemChecked( 5, true ); | 1350 | configureToolBarMenu->setItemChecked( 5, true ); |
1348 | } | 1351 | } |
1349 | if (p-> mShowIconFilter) | 1352 | if (p-> mShowIconFilter) |
1350 | configureToolBarMenu->setItemChecked( 7, true ); | 1353 | configureToolBarMenu->setItemChecked( 7, true ); |
1351 | if (p-> mShowIconOnetoolbar) | 1354 | if (p-> mShowIconOnetoolbar) |
1352 | configureToolBarMenu->setItemChecked( 6, true ); | 1355 | configureToolBarMenu->setItemChecked( 6, true ); |
1353 | 1356 | ||
1354 | 1357 | ||
1355 | if ( filterMenubar ) { | 1358 | if ( filterMenubar ) { |
1356 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | 1359 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); |
1357 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); | 1360 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); |
1358 | } | 1361 | } |
1359 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1362 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1360 | configureAgenda( p->mHourSize ); | 1363 | configureAgenda( p->mHourSize ); |
1361 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1364 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1362 | } | 1365 | } |
1363 | 1366 | void MainWindow::calHint() | |
1367 | { | ||
1368 | QString message = i18n("You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>."); | ||
1369 | |||
1370 | KMessageBox::information( this, message); | ||
1371 | } | ||
1364 | void MainWindow::exportToPhone( int mode ) | 1372 | void MainWindow::exportToPhone( int mode ) |
1365 | { | 1373 | { |
1366 | 1374 | ||
1367 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1375 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1368 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1376 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1369 | KOex2phonePrefs ex2phone; | 1377 | KOex2phonePrefs ex2phone; |
1370 | 1378 | ||
1371 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 1379 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
1372 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 1380 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
1373 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1381 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
1374 | if ( mode == 1 ) | 1382 | if ( mode == 1 ) |
1375 | ex2phone.setCaption(i18n("Export complete calendar")); | 1383 | ex2phone.setCaption(i18n("Export complete calendar")); |
1376 | if ( mode == 2 ) | 1384 | if ( mode == 2 ) |
1377 | ex2phone.setCaption(i18n("Export filtered calendar")); | 1385 | ex2phone.setCaption(i18n("Export filtered calendar")); |
1378 | 1386 | ||
1379 | if ( !ex2phone.exec() ) { | 1387 | if ( !ex2phone.exec() ) { |
1380 | return; | 1388 | return; |
1381 | } | 1389 | } |
1382 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 1390 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
1383 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 1391 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
1384 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 1392 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
1385 | 1393 | ||
1386 | int inFuture = 0; | 1394 | int inFuture = 0; |
1387 | if ( ex2phone.mWriteBackFuture->isChecked() ) | 1395 | if ( ex2phone.mWriteBackFuture->isChecked() ) |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index a948a52..adab95d 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -30,49 +30,50 @@ namespace KCal { | |||
30 | class CalendarLocal; | 30 | class CalendarLocal; |
31 | } | 31 | } |
32 | 32 | ||
33 | using namespace KCal; | 33 | using namespace KCal; |
34 | 34 | ||
35 | class MainWindow : public QMainWindow | 35 | class MainWindow : public QMainWindow |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); | 39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); |
40 | ~MainWindow(); | 40 | ~MainWindow(); |
41 | bool beamReceiveEnabled(); | 41 | bool beamReceiveEnabled(); |
42 | static QString defaultFileName(); | 42 | static QString defaultFileName(); |
43 | static QString syncFileName(); | 43 | static QString syncFileName(); |
44 | static QString resourcePath(); | 44 | static QString resourcePath(); |
45 | public slots: | 45 | public slots: |
46 | void setUsesBigPixmaps ( bool ); | 46 | void setUsesBigPixmaps ( bool ); |
47 | void setCaption ( const QString & ); | 47 | void setCaption ( const QString & ); |
48 | void updateWeekNum(const KCal::DateList &); | 48 | void updateWeekNum(const KCal::DateList &); |
49 | void updateWeek(QDate); | 49 | void updateWeek(QDate); |
50 | void updateFilterToolbar(); | 50 | void updateFilterToolbar(); |
51 | virtual void showMaximized (); | 51 | virtual void showMaximized (); |
52 | void configureAgenda( int ); | 52 | void configureAgenda( int ); |
53 | void recieve( const QCString& msg, const QByteArray& data ); | 53 | void recieve( const QCString& msg, const QByteArray& data ); |
54 | protected slots: | 54 | protected slots: |
55 | void calHint(); | ||
55 | void startMultiSync(); | 56 | void startMultiSync(); |
56 | void setCaptionToDates(); | 57 | void setCaptionToDates(); |
57 | void weekAction(); | 58 | void weekAction(); |
58 | void about(); | 59 | void about(); |
59 | void licence(); | 60 | void licence(); |
60 | void faq(); | 61 | void faq(); |
61 | void usertrans(); | 62 | void usertrans(); |
62 | void features(); | 63 | void features(); |
63 | void synchowto(); | 64 | void synchowto(); |
64 | void storagehowto(); | 65 | void storagehowto(); |
65 | void timetrackinghowto(); | 66 | void timetrackinghowto(); |
66 | void kdesynchowto(); | 67 | void kdesynchowto(); |
67 | void multisynchowto(); | 68 | void multisynchowto(); |
68 | void whatsNew(); | 69 | void whatsNew(); |
69 | void keyBindings(); | 70 | void keyBindings(); |
70 | void aboutAutoSaving();; | 71 | void aboutAutoSaving();; |
71 | void aboutKnownBugs(); | 72 | void aboutKnownBugs(); |
72 | 73 | ||
73 | void processIncidenceSelection( Incidence * ); | 74 | void processIncidenceSelection( Incidence * ); |
74 | 75 | ||
75 | void importQtopia(); | 76 | void importQtopia(); |
76 | void importBday(); | 77 | void importBday(); |
77 | void importOL(); | 78 | void importOL(); |
78 | void importIcal(); | 79 | void importIcal(); |