-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 81d7ed3..358f663 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -112,98 +112,100 @@ BackupAndRestore::~BackupAndRestore(){ | |||
112 | 112 | ||
113 | int count = 0; | 113 | int count = 0; |
114 | for(uint i = 0; i < list.count(); i++){ | 114 | for(uint i = 0; i < list.count(); i++){ |
115 | if(list.at(i)->text(HEADER_BACKUP) == ""){ | 115 | if(list.at(i)->text(HEADER_BACKUP) == ""){ |
116 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); | 116 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); |
117 | count++; | 117 | count++; |
118 | } | 118 | } |
119 | } | 119 | } |
120 | config.writeEntry("Total", count); | 120 | config.writeEntry("Total", count); |
121 | } | 121 | } |
122 | 122 | ||
123 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){ | 123 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){ |
124 | while(item){ | 124 | while(item){ |
125 | if(item->childCount() > 0) | 125 | if(item->childCount() > 0) |
126 | getAllItems(item->firstChild(), list); | 126 | getAllItems(item->firstChild(), list); |
127 | list.append(item); | 127 | list.append(item); |
128 | item = item->nextSibling(); | 128 | item = item->nextSibling(); |
129 | } | 129 | } |
130 | return list; | 130 | return list; |
131 | } | 131 | } |
132 | 132 | ||
133 | /** | 133 | /** |
134 | * Selects and unselects the item by setting the HEADER_BACKUP to B or !. | 134 | * Selects and unselects the item by setting the HEADER_BACKUP to B or !. |
135 | * and changing the icon to match | 135 | * and changing the icon to match |
136 | * @param currentItem the item to swich the selection choice. | 136 | * @param currentItem the item to swich the selection choice. |
137 | */ | 137 | */ |
138 | void BackupAndRestore::selectItem(QListViewItem *currentItem){ | 138 | void BackupAndRestore::selectItem(QListViewItem *currentItem){ |
139 | if(!currentItem) | 139 | if(!currentItem) |
140 | return; | 140 | return; |
141 | 141 | ||
142 | if(currentItem->text(HEADER_BACKUP) == "B"){ | 142 | if(currentItem->text(HEADER_BACKUP) == "B"){ |
143 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null")); | 143 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null")); |
144 | currentItem->setText(HEADER_BACKUP, ""); | 144 | currentItem->setText(HEADER_BACKUP, ""); |
145 | } | 145 | } |
146 | else{ | 146 | else{ |
147 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); | 147 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); |
148 | currentItem->setText(HEADER_BACKUP, "B"); | 148 | currentItem->setText(HEADER_BACKUP, "B"); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | void BackupAndRestore::scanForApplicationSettings(){ | 152 | void BackupAndRestore::scanForApplicationSettings(){ |
153 | QDir d(applicationSettings->text(BACKUP_LOCATION)); | 153 | QDir d(applicationSettings->text(BACKUP_LOCATION)); |
154 | d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); | 154 | d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); |
155 | const QFileInfoList *list = d.entryInfoList(); | 155 | const QFileInfoList *list = d.entryInfoList(); |
156 | QFileInfoListIterator it( *list ); | 156 | QFileInfoListIterator it( *list ); |
157 | QFileInfo *fi; | 157 | QFileInfo *fi; |
158 | while ( (fi=it.current()) ) { | 158 | while ( (fi=it.current()) ) { |
159 | // qDebug((d.path()+fi->fileName()).latin1()); | 159 | // qDebug((d.path()+fi->fileName()).latin1()); |
160 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); | 160 | if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) { |
161 | selectItem(newItem); | 161 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); |
162 | selectItem(newItem); | ||
163 | } | ||
162 | ++it; | 164 | ++it; |
163 | } | 165 | } |
164 | } | 166 | } |
165 | 167 | ||
166 | /** | 168 | /** |
167 | * The "Backup" button has been pressed. Get a list of all of the files that | 169 | * The "Backup" button has been pressed. Get a list of all of the files that |
168 | * should be backed up. If there are no files, emit and error and exit. | 170 | * should be backed up. If there are no files, emit and error and exit. |
169 | * Determine the file name to store the backup in. Backup the file(s) using | 171 | * Determine the file name to store the backup in. Backup the file(s) using |
170 | * tar and gzip --best. Report failure or success | 172 | * tar and gzip --best. Report failure or success |
171 | */ | 173 | */ |
172 | void BackupAndRestore::backupPressed(){ | 174 | void BackupAndRestore::backupPressed(){ |
173 | QString backupFiles; | 175 | QString backupFiles; |
174 | if(getBackupFiles(backupFiles, NULL) == 0){ | 176 | if(getBackupFiles(backupFiles, NULL) == 0){ |
175 | QMessageBox::critical(this, "Message", | 177 | QMessageBox::critical(this, "Message", |
176 | "No items selected.",QString("Ok") ); | 178 | "No items selected.",QString("Ok") ); |
177 | return; | 179 | return; |
178 | } | 180 | } |
179 | 181 | ||
180 | setCaption(tr("Backup and Restore... working...")); | 182 | setCaption(tr("Backup and Restore... working...")); |
181 | QString outputFile = backupLocations[storeToLocation->currentText()]; | 183 | QString outputFile = backupLocations[storeToLocation->currentText()]; |
182 | 184 | ||
183 | QDateTime time = QDateTime::currentDateTime(); | 185 | QDateTime time = QDateTime::currentDateTime(); |
184 | QString dateString = time.date().toString().replace(QRegExp(" "), ""); | 186 | QString dateString = time.date().toString().replace(QRegExp(" "), ""); |
185 | outputFile += "/" + dateString; | 187 | outputFile += "/" + dateString; |
186 | 188 | ||
187 | QString t = outputFile; | 189 | QString t = outputFile; |
188 | int c = 1; | 190 | int c = 1; |
189 | while(QFile::exists(outputFile + EXTENSION)){ | 191 | while(QFile::exists(outputFile + EXTENSION)){ |
190 | outputFile = t + QString("%1").arg(c); | 192 | outputFile = t + QString("%1").arg(c); |
191 | c++; | 193 | c++; |
192 | } | 194 | } |
193 | 195 | ||
194 | qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1()); | 196 | qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1()); |
195 | outputFile += EXTENSION; | 197 | outputFile += EXTENSION; |
196 | 198 | ||
197 | int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); | 199 | int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); |
198 | 200 | ||
199 | 201 | ||
200 | 202 | ||
201 | if(r != 0){ | 203 | if(r != 0){ |
202 | perror("Error: "); | 204 | perror("Error: "); |
203 | QString errorMsg="Error\n"+(QString)strerror(errno); | 205 | QString errorMsg="Error\n"+(QString)strerror(errno); |
204 | 206 | ||
205 | QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") ); | 207 | QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") ); |
206 | return; | 208 | return; |
207 | } | 209 | } |
208 | else{ | 210 | else{ |
209 | QMessageBox::information(this, "Message", "Backup Successfull.",QString("Ok") ); | 211 | QMessageBox::information(this, "Message", "Backup Successfull.",QString("Ok") ); |