summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt5
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt5
-rw-r--r--korganizer/mainwindow.cpp5
-rw-r--r--microkde/kapplication.cpp13
4 files changed, 18 insertions, 10 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 85aed43..50056c4 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -757,8 +757,13 @@
757{ "Mobile (work)","Handy (Privat)" }, 757{ "Mobile (work)","Handy (Privat)" },
758{ "Def.Formatted Name","Def. Format. Name" }, 758{ "Def.Formatted Name","Def. Format. Name" },
759{ "Colors","Farben" }, 759{ "Colors","Farben" },
760{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 760{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
761{ "Backup enabled","Backup angeschaltet" },
762{ "Use standard backup dir","Standard Backupverzeichnis" },
763{ "Number of Backups:","Anzahl der Backups" },
764{ "Make backup every ","Mache ein Backup alle " },
765{ " days"," Tage" },
761{ "","" }, 766{ "","" },
762{ "","" }, 767{ "","" },
763{ "","" }, 768{ "","" },
764{ "","" }, \ No newline at end of file 769{ "","" }, \ No newline at end of file
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index a50dd04..38896fb 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -352,8 +352,13 @@
352{ "Category:","Kategorie:" }, 352{ "Category:","Kategorie:" },
353{ "LOCKED","GESPERRT" }, 353{ "LOCKED","GESPERRT" },
354{ "Colors","Farben" }, 354{ "Colors","Farben" },
355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
356{ "Backup enabled","Backup angeschaltet" },
357{ "Use standard backup dir","Standard Backupverzeichnis" },
358{ "Number of Backups:","Anzahl der Backups" },
359{ "Make backup every ","Mache ein Backup alle " },
360{ " days"," Tage" },
356{ "","" }, 361{ "","" },
357{ "","" }, 362{ "","" },
358{ "","" }, 363{ "","" },
359{ "","" }, 364{ "","" },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9ad0694..eed023c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1766,12 +1766,11 @@ void MainWindow::saveOnClose()
1766 p->mToolBarUpF = filterToolBar->x() > width()/2 ; 1766 p->mToolBarUpF = filterToolBar->x() > width()/2 ;
1767 } 1767 }
1768#endif 1768#endif
1769 1769
1770
1771 mView->writeSettings();
1772 if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) 1770 if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
1773 save(); 1771 save();
1772 mView->writeSettings();
1774} 1773}
1775void MainWindow::slotModifiedChanged( bool changed ) 1774void MainWindow::slotModifiedChanged( bool changed )
1776{ 1775{
1777 if ( mBlockAtStartup ) 1776 if ( mBlockAtStartup )
@@ -1811,9 +1810,9 @@ void MainWindow::save()
1811 // we need the file path, the backup dir and the number of bups as param 1810 // we need the file path, the backup dir and the number of bups as param
1812 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; 1811 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
1813 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) 1812 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
1814 bupDir = KGlobalSettings::backupDataDir(); 1813 bupDir = KGlobalSettings::backupDataDir();
1815 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );//55;//call backup 1814 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
1816 if ( retval == 0 ) { 1815 if ( retval == 0 ) {
1817 qDebug("KO: Backup cancelled. Will try again tomorrow "); 1816 qDebug("KO: Backup cancelled. Will try again tomorrow ");
1818 // retval == 0 : backup skipped for today, try again tomorrow 1817 // retval == 0 : backup skipped for today, try again tomorrow
1819 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1; 1818 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 566bb41..2c9e3b6 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -169,9 +169,9 @@ private:
169int KApplication::createBackup( QString fn, QString dp, int numBup ) 169int KApplication::createBackup( QString fn, QString dp, int numBup )
170{ 170{
171 if ( numBup < 1) return 3; 171 if ( numBup < 1) return 3;
172 int ret = 3; 172 int ret = 3;
173 qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); 173 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup);
174 QDir bupDir ( dp ); 174 QDir bupDir ( dp );
175 bool tryAgain = true; 175 bool tryAgain = true;
176 while ( tryAgain ) { 176 while ( tryAgain ) {
177 if ( !bupDir.exists() ) { 177 if ( !bupDir.exists() ) {
@@ -199,9 +199,9 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
199 QString fi = allFileList[i]; 199 QString fi = allFileList[i];
200 if ( fi. find( fName ) > -1 ) 200 if ( fi. find( fName ) > -1 )
201 fileList.append( fi ); 201 fileList.append( fi );
202 } 202 }
203 qDebug("%d backup files exist ", fileList.count()); 203 qDebug("KApp: %d backup files exist ", fileList.count());
204 int count = fileList.count(); 204 int count = fileList.count();
205 fileList.sort(); 205 fileList.sort();
206 int remCount = 0; 206 int remCount = 0;
207 while ( count >= numBup ) { 207 while ( count >= numBup ) {
@@ -214,22 +214,21 @@ int KApplication::createBackup( QString fn, QString dp, int numBup )
214 QString file = "%1%2%3-%4%5%6-"; 214 QString file = "%1%2%3-%4%5%6-";
215 file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); 215 file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 );
216 file.replace ( QRegExp (" "), "0" ); 216 file.replace ( QRegExp (" "), "0" );
217 file += fName ; 217 file += fName ;
218 file = dp + "/"+file; 218 file = dp + file;
219 QString command; 219 QString command;
220 int res = 0; 220 int res = 0;
221#ifdef _WIN32_ 221#ifdef _WIN32_
222 command = "xcopy "+ fn+ " "+file; 222 command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" ";
223 command = QDir::convertSeparators( command );
224#else 223#else
225 command = "cp "+ fn+ " "+file; 224 command = "cp "+ fn+ " "+file;
226#endif 225#endif
227 qDebug("command %s ",command.latin1() ); 226 //qDebug("command %s ",command.latin1() );
228 tryAgain = true; 227 tryAgain = true;
229 while ( tryAgain ) { 228 while ( tryAgain ) {
230 res = system ( command.latin1() ); 229 res = system ( command.latin1() );
231 qDebug("copy result %d ", res); 230 qDebug("KApp: Copy result %d ", res);
232 if ( res != 0 ) { 231 if ( res != 0 ) {
233 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>")); 232 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>"));
234 if ( !noDir.exec() ) return 3; 233 if ( !noDir.exec() ) return 3;
235 if ( noDir.againTomorrow() ) { 234 if ( noDir.againTomorrow() ) {