-rw-r--r-- | korganizer/mainwindow.cpp | 18 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
2 files changed, 16 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 468fd5b..18a4b12 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -244,49 +244,49 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
244 | 244 | ||
245 | 245 | ||
246 | connect( mView, SIGNAL( tempDisableBR(bool) ), | 246 | connect( mView, SIGNAL( tempDisableBR(bool) ), |
247 | SLOT( disableBR(bool) ) ); | 247 | SLOT( disableBR(bool) ) ); |
248 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 248 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
249 | mView->setModified( false ); | 249 | mView->setModified( false ); |
250 | mBlockAtStartup = false; | 250 | mBlockAtStartup = false; |
251 | mView->setModified( false ); | 251 | mView->setModified( false ); |
252 | setCentralWidget( mView ); | 252 | setCentralWidget( mView ); |
253 | globalFlagBlockStartup = 0; | 253 | globalFlagBlockStartup = 0; |
254 | mView->show(); | 254 | mView->show(); |
255 | delete splash; | 255 | delete splash; |
256 | if ( newFile ) | 256 | if ( newFile ) |
257 | mView->updateConfig(); | 257 | mView->updateConfig(); |
258 | // qApp->processEvents(); | 258 | // qApp->processEvents(); |
259 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 259 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
260 | //fillSyncMenu(); | 260 | //fillSyncMenu(); |
261 | 261 | ||
262 | 262 | ||
263 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 263 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
264 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 264 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
265 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); | 265 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); |
266 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 266 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
267 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 267 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
268 | mSyncManager->setDefaultFileName( defaultFileName()); | 268 | mSyncManager->setDefaultFileName( sentSyncFile()); |
269 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 269 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
270 | mSyncManager->fillSyncMenu(); | 270 | mSyncManager->fillSyncMenu(); |
271 | 271 | ||
272 | 272 | ||
273 | 273 | ||
274 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 274 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
275 | if ( showWarning ) { | 275 | if ( showWarning ) { |
276 | KMessageBox::information( this, | 276 | KMessageBox::information( this, |
277 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 277 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
278 | qApp->processEvents(); | 278 | qApp->processEvents(); |
279 | mView->dialogManager()->showSyncOptions(); | 279 | mView->dialogManager()->showSyncOptions(); |
280 | } | 280 | } |
281 | 281 | ||
282 | //US listen for result adressed from Ka/Pi | 282 | //US listen for result adressed from Ka/Pi |
283 | #ifndef DESKTOP_VERSION | 283 | #ifndef DESKTOP_VERSION |
284 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 284 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
285 | #endif | 285 | #endif |
286 | #ifndef DESKTOP_VERSION | 286 | #ifndef DESKTOP_VERSION |
287 | infrared = 0; | 287 | infrared = 0; |
288 | #endif | 288 | #endif |
289 | updateWeek( mView->startDate() ); | 289 | updateWeek( mView->startDate() ); |
290 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 290 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
291 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 291 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
292 | mBRdisabled = false; | 292 | mBRdisabled = false; |
@@ -1971,63 +1971,75 @@ void MainWindow::exportVCalendar() | |||
1971 | info.setFile( fn ); | 1971 | info.setFile( fn ); |
1972 | QString mes; | 1972 | QString mes; |
1973 | bool createbup = true; | 1973 | bool createbup = true; |
1974 | if ( info. exists() ) { | 1974 | if ( info. exists() ) { |
1975 | mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); | 1975 | mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); |
1976 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, | 1976 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, |
1977 | i18n("Overwrite!"), i18n("Cancel"), 0, | 1977 | i18n("Overwrite!"), i18n("Cancel"), 0, |
1978 | 0, 1 ); | 1978 | 0, 1 ); |
1979 | if ( result != 0 ) { | 1979 | if ( result != 0 ) { |
1980 | createbup = false; | 1980 | createbup = false; |
1981 | } | 1981 | } |
1982 | } | 1982 | } |
1983 | if ( createbup ) { | 1983 | if ( createbup ) { |
1984 | if ( mView->exportVCalendar( fn ) ) { | 1984 | if ( mView->exportVCalendar( fn ) ) { |
1985 | KOPrefs::instance()->mLastVcalFile = fn; | 1985 | KOPrefs::instance()->mLastVcalFile = fn; |
1986 | if ( fn.length() > 20 ) | 1986 | if ( fn.length() > 20 ) |
1987 | mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; | 1987 | mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; |
1988 | else | 1988 | else |
1989 | mes = i18n("KO/Pi:Exported to %1").arg(fn ); | 1989 | mes = i18n("KO/Pi:Exported to %1").arg(fn ); |
1990 | setCaption(mes); | 1990 | setCaption(mes); |
1991 | } | 1991 | } |
1992 | } | 1992 | } |
1993 | 1993 | ||
1994 | } | 1994 | } |
1995 | QString MainWindow::sentSyncFile() | ||
1996 | { | ||
1997 | #ifdef DESKTOP_VERSION | ||
1998 | return locateLocal( "tmp", "copysynccal.ics" ); | ||
1999 | #else | ||
2000 | return QString( "/tmp/copysynccal.ics" ); | ||
2001 | #endif | ||
2002 | } | ||
1995 | 2003 | ||
1996 | void MainWindow::syncFileRequest() | 2004 | void MainWindow::syncFileRequest() |
1997 | { | 2005 | { |
1998 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2006 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
1999 | mSyncManager->slotSyncMenu( 999 ); | 2007 | mSyncManager->slotSyncMenu( 999 ); |
2000 | } | 2008 | } |
2001 | save(); | 2009 | |
2010 | setCaption(i18n("Saving Data to temp file ..." )); | ||
2011 | mView->saveCalendar( sentSyncFile() ); | ||
2012 | setCaption(i18n("Data saved to temp file!" )); | ||
2013 | |||
2002 | } | 2014 | } |
2003 | void MainWindow::getFile( bool success ) | 2015 | void MainWindow::getFile( bool success ) |
2004 | { | 2016 | { |
2005 | if ( ! success ) { | 2017 | if ( ! success ) { |
2006 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2018 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2007 | return; | 2019 | return; |
2008 | } | 2020 | } |
2009 | mView->openCalendar( defaultFileName() ); | 2021 | mView->openCalendar( sentSyncFile() ); |
2010 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2022 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2011 | mSyncManager->slotSyncMenu( 999 ); | 2023 | mSyncManager->slotSyncMenu( 999 ); |
2012 | } | 2024 | } |
2013 | setCaption( i18n("Pi-Sync successful!") ); | 2025 | setCaption( i18n("Pi-Sync successful!") ); |
2014 | } | 2026 | } |
2015 | 2027 | ||
2016 | void MainWindow::printSel( ) | 2028 | void MainWindow::printSel( ) |
2017 | { | 2029 | { |
2018 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2030 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2019 | } | 2031 | } |
2020 | 2032 | ||
2021 | void MainWindow::printCal() | 2033 | void MainWindow::printCal() |
2022 | { | 2034 | { |
2023 | mView->print();//mCp->showDialog(); | 2035 | mView->print();//mCp->showDialog(); |
2024 | } | 2036 | } |
2025 | 2037 | ||
2026 | 2038 | ||
2027 | #include "libkdepim/kdatepicker.h" | 2039 | #include "libkdepim/kdatepicker.h" |
2028 | #include <kdatetbl.h> | 2040 | #include <kdatetbl.h> |
2029 | void MainWindow::weekAction() | 2041 | void MainWindow::weekAction() |
2030 | { | 2042 | { |
2031 | int month; | 2043 | int month; |
2032 | KPopupFrame* popup = new KPopupFrame(this); | 2044 | KPopupFrame* popup = new KPopupFrame(this); |
2033 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); | 2045 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 5b9f903..5808700 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -82,48 +82,49 @@ class MainWindow : public QMainWindow | |||
82 | 82 | ||
83 | void slotModifiedChanged( bool ); | 83 | void slotModifiedChanged( bool ); |
84 | 84 | ||
85 | void save(); | 85 | void save(); |
86 | void saveStopTimer(); | 86 | void saveStopTimer(); |
87 | void configureToolBar( int ); | 87 | void configureToolBar( int ); |
88 | void printSel(); | 88 | void printSel(); |
89 | void printCal(); | 89 | void printCal(); |
90 | void saveCalendar(); | 90 | void saveCalendar(); |
91 | void loadCalendar(); | 91 | void loadCalendar(); |
92 | void exportVCalendar(); | 92 | void exportVCalendar(); |
93 | void fillFilterMenu(); | 93 | void fillFilterMenu(); |
94 | void selectFilter( int ); | 94 | void selectFilter( int ); |
95 | void exportToPhone( int ); | 95 | void exportToPhone( int ); |
96 | void toggleBeamReceive(); | 96 | void toggleBeamReceive(); |
97 | void disableBR(bool); | 97 | void disableBR(bool); |
98 | signals: | 98 | signals: |
99 | void selectWeek ( int ); | 99 | void selectWeek ( int ); |
100 | private slots: | 100 | private slots: |
101 | void showConfigureAgenda(); | 101 | void showConfigureAgenda(); |
102 | void getFile( bool ); | 102 | void getFile( bool ); |
103 | void syncFileRequest(); | 103 | void syncFileRequest(); |
104 | 104 | ||
105 | protected: | 105 | protected: |
106 | QString sentSyncFile(); | ||
106 | void displayText( QString, QString); | 107 | void displayText( QString, QString); |
107 | void enableIncidenceActions( bool ); | 108 | void enableIncidenceActions( bool ); |
108 | 109 | ||
109 | private: | 110 | private: |
110 | bool mBRdisabled; | 111 | bool mBRdisabled; |
111 | #ifndef DESKTOP_VERSION | 112 | #ifndef DESKTOP_VERSION |
112 | QCopChannel* infrared; | 113 | QCopChannel* infrared; |
113 | #endif | 114 | #endif |
114 | QAction* brAction; | 115 | QAction* brAction; |
115 | KSyncManager* mSyncManager; | 116 | KSyncManager* mSyncManager; |
116 | bool mClosed; | 117 | bool mClosed; |
117 | void saveOnClose(); | 118 | void saveOnClose(); |
118 | bool mFlagKeyPressed; | 119 | bool mFlagKeyPressed; |
119 | bool mBlockAtStartup; | 120 | bool mBlockAtStartup; |
120 | QPEToolBar *iconToolBar; | 121 | QPEToolBar *iconToolBar; |
121 | void initActions(); | 122 | void initActions(); |
122 | void setDefaultPreferences(); | 123 | void setDefaultPreferences(); |
123 | void keyPressEvent ( QKeyEvent * ) ; | 124 | void keyPressEvent ( QKeyEvent * ) ; |
124 | void keyReleaseEvent ( QKeyEvent * ) ; | 125 | void keyReleaseEvent ( QKeyEvent * ) ; |
125 | QPopupMenu *configureToolBarMenu; | 126 | QPopupMenu *configureToolBarMenu; |
126 | QPopupMenu *selectFilterMenu; | 127 | QPopupMenu *selectFilterMenu; |
127 | QPopupMenu *configureAgendaMenu, *syncMenu; | 128 | QPopupMenu *configureAgendaMenu, *syncMenu; |
128 | CalendarLocal *mCalendar; | 129 | CalendarLocal *mCalendar; |
129 | CalendarView *mView; | 130 | CalendarView *mView; |