summaryrefslogtreecommitdiff
path: root/rbutil
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/install.cpp11
-rw-r--r--rbutil/rbutilqt/install.h1
2 files changed, 8 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp
index a505b85d68..c6221e8975 100644
--- a/rbutil/rbutilqt/install.cpp
+++ b/rbutil/rbutilqt/install.cpp
@@ -40,7 +40,8 @@ Install::Install(RbSettings *sett,QWidget *parent) : QDialog(parent)
40 if(version != "") 40 if(version != "")
41 { 41 {
42 ui.Backupgroup->show(); 42 ui.Backupgroup->show();
43 ui.backupLocation->setText(settings->mountpoint() + "/.backup/rockbox-backup-"+version+".zip"); 43 m_backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+version+".zip";
44 ui.backupLocation->setText(fontMetrics().elidedText(m_backupName,Qt::ElideMiddle,200));
44 } 45 }
45 else 46 else
46 { 47 {
@@ -154,8 +155,9 @@ void Install::accept()
154 if(!settings->cacheDisabled() 155 if(!settings->cacheDisabled()
155 && !ui.radioCurrent->isChecked() 156 && !ui.radioCurrent->isChecked()
156 && !ui.checkBoxCache->isChecked()) 157 && !ui.checkBoxCache->isChecked())
157 installer->setCache(settings->cachePath()); 158 {
158 159 installer->setCache(true);
160 }
159 installer->setLogVersion(myversion); 161 installer->setLogVersion(myversion);
160 installer->setMountPoint(mountPoint); 162 installer->setMountPoint(mountPoint);
161 163
@@ -167,7 +169,8 @@ void Install::accept()
167 169
168void Install::changeBackupPath() 170void Install::changeBackupPath()
169{ 171{
170 ui.backupLocation->setText(QFileDialog::getSaveFileName(this,"Select Backup Filename",ui.backupLocation->text())); 172 m_backupName = QFileDialog::getSaveFileName(this,"Select Backup Filename",ui.backupLocation->text());
173 ui.backupLocation->setText(QWidget::fontMetrics().elidedText(m_backupName,Qt::ElideMiddle,200));
171} 174}
172 175
173void Install::updateDataReadProgress(int read, int total) 176void Install::updateDataReadProgress(int read, int total)
diff --git a/rbutil/rbutilqt/install.h b/rbutil/rbutilqt/install.h
index f1d649ab61..37fac4f8b7 100644
--- a/rbutil/rbutilqt/install.h
+++ b/rbutil/rbutilqt/install.h
@@ -47,6 +47,7 @@ class Install : public QDialog
47 QString fileName; 47 QString fileName;
48 ZipInstaller* installer; 48 ZipInstaller* installer;
49 QMap<QString, QString> version; 49 QMap<QString, QString> version;
50 QString m_backupName;
50 51
51 private slots: 52 private slots:
52 void setCached(bool); 53 void setCached(bool);