-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 | |||
@@ -136,50 +136,52 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL | |||
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; |