summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (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
@@ -70,8 +70,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
#ifdef DESKTOP_VERSION
setFont( QFont("Arial"), 14 );
#endif
+ mClosed = false;
//QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
QString confFile = locateLocal("config","korganizerrc");
QFileInfo finf ( confFile );
bool showWarning = !finf.exists();
@@ -220,19 +221,22 @@ MainWindow::~MainWindow()
void MainWindow::showMaximized ()
{
#ifndef DESKTOP_VERSION
if ( ! globalFlagBlockStartup )
- mView->goToday();
+ if ( mClosed )
+ mView->goToday();
#endif
QWidget::showMaximized () ;
+ mClosed = false;
}
void MainWindow::closeEvent( QCloseEvent* ce )
{
if ( ! KOPrefs::instance()->mAskForQuit ) {
saveOnClose();
+ mClosed = true;
ce->accept();
return;
}
@@ -242,8 +246,9 @@ void MainWindow::closeEvent( QCloseEvent* ce )
i18n("Close"), i18n("No"),
0, 0 ) ) {
case 0:
saveOnClose();
+ mClosed = true;
ce->accept();
break;
case 1:
ce->ignore();
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 3e854cb..47a7a90 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -88,8 +88,9 @@ class MainWindow : public QMainWindow
void enableIncidenceActions( bool );
private:
+ bool mClosed;
void saveOnClose();
int mCurrentSyncProfile;
void syncRemote( KSyncProfile* , bool ask = true);
void fillSyncMenu();