summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-15 11:10:41 (UTC)
committer zautrix <zautrix>2004-09-15 11:10:41 (UTC)
commit12091abdaa7e60e408fc248e286f37e12cb10a23 (patch) (unidiff)
treeea180ecc6687978492e4040d4efc9c8793f178af
parentd4adafe41cf399585b8e35cb600ff35706d55ae0 (diff)
downloadkdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.zip
kdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.tar.gz
kdepimpi-12091abdaa7e60e408fc248e286f37e12cb10a23.tar.bz2
Close kopi fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp7
-rw-r--r--korganizer/mainwindow.h1
2 files changed, 7 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
@@ -66,16 +66,17 @@ int globalFlagBlockStartup;
66MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : 66MainWindow::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");
@@ -216,38 +217,42 @@ MainWindow::~MainWindow()
216 delete KIncidenceFormatter::instance(); 217 delete KIncidenceFormatter::instance();
217 218
218 219
219} 220}
220void MainWindow::showMaximized () 221void 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}
228void MainWindow::closeEvent( QCloseEvent* ce ) 231void 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:
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 3e854cb..47a7a90 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -84,16 +84,17 @@ class MainWindow : public QMainWindow
84 84
85 protected: 85 protected:
86 void displayText( QString, QString); 86 void displayText( QString, QString);
87 void displayFile( QString, QString); 87 void displayFile( QString, QString);
88 88
89 void enableIncidenceActions( bool ); 89 void enableIncidenceActions( bool );
90 90
91 private: 91 private:
92 bool mClosed;
92 void saveOnClose(); 93 void saveOnClose();
93 int mCurrentSyncProfile; 94 int mCurrentSyncProfile;
94 void syncRemote( KSyncProfile* , bool ask = true); 95 void syncRemote( KSyncProfile* , bool ask = true);
95 void fillSyncMenu(); 96 void fillSyncMenu();
96 bool mFlagKeyPressed; 97 bool mFlagKeyPressed;
97 bool mBlockAtStartup; 98 bool mBlockAtStartup;
98 QPEToolBar *iconToolBar; 99 QPEToolBar *iconToolBar;
99 void initActions(); 100 void initActions();