author | zautrix <zautrix> | 2004-09-15 11:10:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-15 11:10:41 (UTC) |
commit | 12091abdaa7e60e408fc248e286f37e12cb10a23 (patch) (unidiff) | |
tree | ea180ecc6687978492e4040d4efc9c8793f178af /korganizer/mainwindow.cpp | |
parent | d4adafe41cf399585b8e35cb600ff35706d55ae0 (diff) | |
download | kdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.zip kdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.tar.gz kdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.tar.bz2 |
Close kopi fix
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index aa30b52..3bc6081 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -62,24 +62,25 @@ using namespace KCal; | |||
62 | #endif | 62 | #endif |
63 | #include "mainwindow.h" | 63 | #include "mainwindow.h" |
64 | 64 | ||
65 | int globalFlagBlockStartup; | 65 | int globalFlagBlockStartup; |
66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
67 | QMainWindow( parent, name ) | 67 | QMainWindow( parent, name ) |
68 | { | 68 | { |
69 | 69 | ||
70 | #ifdef DESKTOP_VERSION | 70 | #ifdef DESKTOP_VERSION |
71 | setFont( QFont("Arial"), 14 ); | 71 | setFont( QFont("Arial"), 14 ); |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | mClosed = false; | ||
74 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 75 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
75 | QString confFile = locateLocal("config","korganizerrc"); | 76 | QString confFile = locateLocal("config","korganizerrc"); |
76 | QFileInfo finf ( confFile ); | 77 | QFileInfo finf ( confFile ); |
77 | bool showWarning = !finf.exists(); | 78 | bool showWarning = !finf.exists(); |
78 | setIcon(SmallIcon( "ko24" ) ); | 79 | setIcon(SmallIcon( "ko24" ) ); |
79 | mBlockAtStartup = true; | 80 | mBlockAtStartup = true; |
80 | mFlagKeyPressed = false; | 81 | mFlagKeyPressed = false; |
81 | setCaption("KOrganizer/Pi"); | 82 | setCaption("KOrganizer/Pi"); |
82 | KOPrefs *p = KOPrefs::instance(); | 83 | KOPrefs *p = KOPrefs::instance(); |
83 | // if ( QApplication::desktop()->height() > 480 ) { | 84 | // if ( QApplication::desktop()->height() > 480 ) { |
84 | // if ( p->mHourSize == 4 ) | 85 | // if ( p->mHourSize == 4 ) |
85 | // p->mHourSize = 6; | 86 | // p->mHourSize = 6; |
@@ -212,46 +213,50 @@ MainWindow::~MainWindow() | |||
212 | //save toolbar location | 213 | //save toolbar location |
213 | 214 | ||
214 | delete mCalendar; | 215 | delete mCalendar; |
215 | delete KOPrefs::instance(); | 216 | delete KOPrefs::instance(); |
216 | delete KIncidenceFormatter::instance(); | 217 | delete KIncidenceFormatter::instance(); |
217 | 218 | ||
218 | 219 | ||
219 | } | 220 | } |
220 | void MainWindow::showMaximized () | 221 | void MainWindow::showMaximized () |
221 | { | 222 | { |
222 | #ifndef DESKTOP_VERSION | 223 | #ifndef DESKTOP_VERSION |
223 | if ( ! globalFlagBlockStartup ) | 224 | if ( ! globalFlagBlockStartup ) |
224 | mView->goToday(); | 225 | if ( mClosed ) |
226 | mView->goToday(); | ||
225 | #endif | 227 | #endif |
226 | QWidget::showMaximized () ; | 228 | QWidget::showMaximized () ; |
229 | mClosed = false; | ||
227 | } | 230 | } |
228 | void MainWindow::closeEvent( QCloseEvent* ce ) | 231 | void MainWindow::closeEvent( QCloseEvent* ce ) |
229 | { | 232 | { |
230 | 233 | ||
231 | 234 | ||
232 | 235 | ||
233 | if ( ! KOPrefs::instance()->mAskForQuit ) { | 236 | if ( ! KOPrefs::instance()->mAskForQuit ) { |
234 | saveOnClose(); | 237 | saveOnClose(); |
238 | mClosed = true; | ||
235 | ce->accept(); | 239 | ce->accept(); |
236 | return; | 240 | return; |
237 | 241 | ||
238 | } | 242 | } |
239 | 243 | ||
240 | switch( QMessageBox::information( this, "KO/Pi", | 244 | switch( QMessageBox::information( this, "KO/Pi", |
241 | i18n("Do you really want\nto close KO/Pi?"), | 245 | i18n("Do you really want\nto close KO/Pi?"), |
242 | i18n("Close"), i18n("No"), | 246 | i18n("Close"), i18n("No"), |
243 | 0, 0 ) ) { | 247 | 0, 0 ) ) { |
244 | case 0: | 248 | case 0: |
245 | saveOnClose(); | 249 | saveOnClose(); |
250 | mClosed = true; | ||
246 | ce->accept(); | 251 | ce->accept(); |
247 | break; | 252 | break; |
248 | case 1: | 253 | case 1: |
249 | ce->ignore(); | 254 | ce->ignore(); |
250 | break; | 255 | break; |
251 | case 2: | 256 | case 2: |
252 | 257 | ||
253 | default: | 258 | default: |
254 | break; | 259 | break; |
255 | } | 260 | } |
256 | 261 | ||
257 | 262 | ||