summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp12
-rw-r--r--korganizer/mainwindow.h1
2 files changed, 11 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 481eab4..20f8b57 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1022,69 +1022,74 @@ void MainWindow::initActions()
1022 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1022 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1023 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1023 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1024 1024
1025 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1025 importMenu->insertItem( i18n("Export"), exportMenu_X );
1026#ifndef DESKTOP_VERSION 1026#ifndef DESKTOP_VERSION
1027 //importMenu->insertSeparator(); 1027 //importMenu->insertSeparator();
1028 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1028 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1029 this ); 1029 this );
1030 brAction->addTo( beamMenu_X ); 1030 brAction->addTo( beamMenu_X );
1031 brAction->setToggleAction (true ) ; 1031 brAction->setToggleAction (true ) ;
1032 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1032 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1033 1033
1034 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1034 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1035 this ); 1035 this );
1036 action->addTo( beamMenu_X ); 1036 action->addTo( beamMenu_X );
1037 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1037 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
1038 1038
1039 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 1039 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
1040 this ); 1040 this );
1041 action->addTo( beamMenu_X ); 1041 action->addTo( beamMenu_X );
1042 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1042 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1043 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1043 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1044#else 1044#else
1045 //importMenu->insertSeparator(); 1045 //importMenu->insertSeparator();
1046 icon = loadPixmap( pathString + "print" ); 1046 icon = loadPixmap( pathString + "print" );
1047 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1047 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1048 action->addTo( beamMenu_X ); 1048 action->addTo( beamMenu_X );
1049 connect( action, SIGNAL( activated() ), 1049 connect( action, SIGNAL( activated() ),
1050 this, SLOT( printCal() ) ); 1050 this, SLOT( printCal() ) );
1051 1051
1052 icon = loadPixmap( pathString + "print" ); 1052 icon = loadPixmap( pathString + "print" );
1053 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1053 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1054 action->addTo( beamMenu_X ); 1054 action->addTo( beamMenu_X );
1055 connect( action, SIGNAL( activated() ), 1055 connect( action, SIGNAL( activated() ),
1056 this, SLOT( printSel() ) ); 1056 this, SLOT( printSel() ) );
1057 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1057 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1058 action->addTo( beamMenu_X ); 1058 action->addTo( beamMenu_X );
1059 connect( action, SIGNAL( activated() ), 1059 connect( action, SIGNAL( activated() ),
1060 mView->viewManager(), SLOT( slotprintWNV() ) ); 1060 mView->viewManager(), SLOT( slotprintWNV() ) );
1061 1061
1062 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1062 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1063 action->addTo( beamMenu_X ); 1063 action->addTo( beamMenu_X );
1064 connect( action, SIGNAL( activated() ), 1064 connect( action, SIGNAL( activated() ),
1065 mView, SLOT( slotprintSelInc() ) ); 1065 mView, SLOT( slotprintSelInc() ) );
1066 1066
1067 icon = loadPixmap( pathString + "print" );
1068 action = new QAction( i18n("Print list view..."),icon,i18n("Print list view..."), 0, this );
1069 action->addTo( beamMenu_X );
1070 connect( action, SIGNAL( activated() ),
1071 this, SLOT( printListView() ) );
1067 1072
1068 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1073 importMenu->insertItem( i18n("Print"), beamMenu_X );
1069#endif 1074#endif
1070 importMenu->insertSeparator(); 1075 importMenu->insertSeparator();
1071 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1076 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1072 this ); 1077 this );
1073 action->addTo( importMenu ); 1078 action->addTo( importMenu );
1074 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1079 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1075 importMenu->insertSeparator(); 1080 importMenu->insertSeparator();
1076 action = new QAction( "beam all", i18n("Save"), 0, 1081 action = new QAction( "beam all", i18n("Save"), 0,
1077 this ); 1082 this );
1078 action->addTo( importMenu ); 1083 action->addTo( importMenu );
1079 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1084 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1080 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1085 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1081 this ); 1086 this );
1082 action->addTo( importMenu ); 1087 action->addTo( importMenu );
1083 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1088 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1084 1089
1085 //menuBar->insertItem( "Configure",configureMenu ); 1090 //menuBar->insertItem( "Configure",configureMenu );
1086 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1091 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1087 icon = loadPixmap( "korganizer/korganizer" ); 1092 icon = loadPixmap( "korganizer/korganizer" );
1088 1093
1089 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1094 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1090 action->addTo( helpMenu ); 1095 action->addTo( helpMenu );
@@ -2399,49 +2404,52 @@ QString MainWindow::sentSyncFile()
2399 2404
2400void MainWindow::syncFileRequest() 2405void MainWindow::syncFileRequest()
2401{ 2406{
2402 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2407 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2403 mSyncManager->slotSyncMenu( 999 ); 2408 mSyncManager->slotSyncMenu( 999 );
2404 } 2409 }
2405 2410
2406 setCaption(i18n("Saving Data to temp file ..." )); 2411 setCaption(i18n("Saving Data to temp file ..." ));
2407 mView->saveCalendar( sentSyncFile() ); 2412 mView->saveCalendar( sentSyncFile() );
2408 setCaption(i18n("Data saved to temp file!" )); 2413 setCaption(i18n("Data saved to temp file!" ));
2409 2414
2410} 2415}
2411void MainWindow::getFile( bool success ) 2416void MainWindow::getFile( bool success )
2412{ 2417{
2413 if ( ! success ) { 2418 if ( ! success ) {
2414 setCaption( i18n("Error receiving file. Nothing changed!") ); 2419 setCaption( i18n("Error receiving file. Nothing changed!") );
2415 return; 2420 return;
2416 } 2421 }
2417 mView->openCalendar( sentSyncFile() ); 2422 mView->openCalendar( sentSyncFile() );
2418 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2423 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2419 mSyncManager->slotSyncMenu( 999 ); 2424 mSyncManager->slotSyncMenu( 999 );
2420 } 2425 }
2421 setCaption( i18n("Pi-Sync successful!") ); 2426 setCaption( i18n("Pi-Sync successful!") );
2422} 2427}
2423 2428void MainWindow::printListView()
2429{
2430 qDebug("MainWindow::printListView() ");
2431}
2424void MainWindow::printSel( ) 2432void MainWindow::printSel( )
2425{ 2433{
2426 mView->viewManager()->agendaView()->agenda()->printSelection(); 2434 mView->viewManager()->agendaView()->agenda()->printSelection();
2427} 2435}
2428 2436
2429void MainWindow::printCal() 2437void MainWindow::printCal()
2430{ 2438{
2431 mView->print();//mCp->showDialog(); 2439 mView->print();//mCp->showDialog();
2432} 2440}
2433 2441
2434 2442
2435#include "libkdepim/kdatepicker.h" 2443#include "libkdepim/kdatepicker.h"
2436#include <kdatetbl.h> 2444#include <kdatetbl.h>
2437 2445
2438void MainWindow::weekAction() 2446void MainWindow::weekAction()
2439{ 2447{
2440 int month; 2448 int month;
2441 KPopupFrame* popup = new KPopupFrame(this); 2449 KPopupFrame* popup = new KPopupFrame(this);
2442 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); 2450 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
2443 // ----- 2451 // -----
2444 picker->resize(picker->sizeHint()); 2452 picker->resize(picker->sizeHint());
2445 popup->setMainWidget(picker); 2453 popup->setMainWidget(picker);
2446 picker->setFocus(); 2454 picker->setFocus();
2447 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 2455 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 6895e36..1105783 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -64,48 +64,49 @@ class MainWindow : public QMainWindow
64 void timetrackinghowto(); 64 void timetrackinghowto();
65 void kdesynchowto(); 65 void kdesynchowto();
66 void multisynchowto(); 66 void multisynchowto();
67 void whatsNew(); 67 void whatsNew();
68 void keyBindings(); 68 void keyBindings();
69 void aboutAutoSaving();; 69 void aboutAutoSaving();;
70 void aboutKnownBugs(); 70 void aboutKnownBugs();
71 71
72 void processIncidenceSelection( Incidence * ); 72 void processIncidenceSelection( Incidence * );
73 73
74 void importQtopia(); 74 void importQtopia();
75 void importBday(); 75 void importBday();
76 void importOL(); 76 void importOL();
77 void importIcal(); 77 void importIcal();
78 void importFile( QString, bool ); 78 void importFile( QString, bool );
79 void quickImportIcal(); 79 void quickImportIcal();
80 80
81 void slotModifiedChanged( bool ); 81 void slotModifiedChanged( bool );
82 82
83 void save(); 83 void save();
84 void saveStopTimer(); 84 void saveStopTimer();
85 void configureToolBar( int ); 85 void configureToolBar( int );
86 void printSel(); 86 void printSel();
87 void printCal(); 87 void printCal();
88 void printListView();
88 void saveCalendar(); 89 void saveCalendar();
89 void loadCalendar(); 90 void loadCalendar();
90 void exportVCalendar(); 91 void exportVCalendar();
91 void fillFilterMenu(); 92 void fillFilterMenu();
92 void fillFilterMenuTB(); 93 void fillFilterMenuTB();
93 void selectFilter( int ); 94 void selectFilter( int );
94 void fillFilterMenuPopup(); 95 void fillFilterMenuPopup();
95 void selectFilterPopup( int ); 96 void selectFilterPopup( int );
96 void exportToPhone( int ); 97 void exportToPhone( int );
97 void toggleBeamReceive(); 98 void toggleBeamReceive();
98 void disableBR(bool); 99 void disableBR(bool);
99 signals: 100 signals:
100 void selectWeek ( int ); 101 void selectWeek ( int );
101 private slots: 102 private slots:
102 void showConfigureAgenda(); 103 void showConfigureAgenda();
103 void getFile( bool ); 104 void getFile( bool );
104 void syncFileRequest(); 105 void syncFileRequest();
105 106
106 protected: 107 protected:
107 void hideEvent ( QHideEvent * ); 108 void hideEvent ( QHideEvent * );
108 QString sentSyncFile(); 109 QString sentSyncFile();
109 void displayText( QString, QString); 110 void displayText( QString, QString);
110 void enableIncidenceActions( bool ); 111 void enableIncidenceActions( bool );
111 112