summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
authorzautrix <zautrix>2005-06-27 00:49:23 (UTC)
committer zautrix <zautrix>2005-06-27 00:49:23 (UTC)
commit2e566a307bb50ac595fe729ebed0f5336f2af5a8 (patch) (side-by-side diff)
tree926a9346f1a3c3389e314e170da5cfa64811f9b6 /korganizer/mainwindow.cpp
parent72721fd5da5bc08f595cda85bc260112764b2bd8 (diff)
downloadkdepimpi-2e566a307bb50ac595fe729ebed0f5336f2af5a8.zip
kdepimpi-2e566a307bb50ac595fe729ebed0f5336f2af5a8.tar.gz
kdepimpi-2e566a307bb50ac595fe729ebed0f5336f2af5a8.tar.bz2
fixesss
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b9d8742..68233e8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -174,5 +174,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
setCaption("KO/Pi");
KOPrefs *p = KOPrefs::instance();
- KPimGlobalPrefs::instance()->setGlobalConfig();
+ //KPimGlobalPrefs::instance()->setGlobalConfig();
p->mCurrentDisplayedView = 0;
if ( p->mHourSize > 22 )
@@ -1724,5 +1724,5 @@ void MainWindow::importOL()
void MainWindow::importBday()
{
- int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
+ int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
i18n("Import!"), i18n("Cancel"), 0,
@@ -2311,5 +2311,4 @@ void MainWindow::configureAgenda( int item )
void MainWindow::saveCalendar()
{
-
QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
@@ -2320,4 +2319,8 @@ void MainWindow::saveCalendar()
bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)");
if ( KMessageBox::warningContinueCancel( this, i18n("This will <b>backup all calendar files</b> to the directory %1 %2").arg(bupDir).arg(bupHint),i18n("Information") ) != KMessageBox::Continue ) return;
+ bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled;
+ KPimGlobalPrefs::instance()->mBackupEnabled = false;
+ save();
+ KPimGlobalPrefs::instance()->mBackupEnabled = enabled;
backupAllFiles();
}