diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 20 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.h | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/installfrm.ui | 54 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 2 |
4 files changed, 64 insertions, 17 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index e9f1f61837..a505b85d68 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -32,6 +32,7 @@ Install::Install(RbSettings *sett,QWidget *parent) : QDialog(parent) | |||
32 | connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool))); | 32 | connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool))); |
33 | connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool))); | 33 | connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool))); |
34 | connect(ui.changeBackup,SIGNAL(pressed()),this,SLOT(changeBackupPath())); | 34 | connect(ui.changeBackup,SIGNAL(pressed()),this,SLOT(changeBackupPath())); |
35 | connect(ui.backup,SIGNAL(stateChanged(int)),this,SLOT(backupCheckboxChanged(int))); | ||
35 | 36 | ||
36 | //! check if rockbox is already installed | 37 | //! check if rockbox is already installed |
37 | QString version = installedVersion(settings->mountpoint()); | 38 | QString version = installedVersion(settings->mountpoint()); |
@@ -39,12 +40,29 @@ Install::Install(RbSettings *sett,QWidget *parent) : QDialog(parent) | |||
39 | if(version != "") | 40 | if(version != "") |
40 | { | 41 | { |
41 | ui.Backupgroup->show(); | 42 | ui.Backupgroup->show(); |
42 | ui.backupLocation->setText(settings->mountpoint() + ".backup/rockbox-backup-"+version+".zip"); | 43 | ui.backupLocation->setText(settings->mountpoint() + "/.backup/rockbox-backup-"+version+".zip"); |
43 | } | 44 | } |
44 | else | 45 | else |
45 | { | 46 | { |
46 | ui.Backupgroup->hide(); | 47 | ui.Backupgroup->hide(); |
47 | } | 48 | } |
49 | backupCheckboxChanged(Qt::Unchecked); | ||
50 | } | ||
51 | |||
52 | void Install::backupCheckboxChanged(int state) | ||
53 | { | ||
54 | if(state == Qt::Checked) | ||
55 | { | ||
56 | ui.backupLabel->show(); | ||
57 | ui.backupLocation->show(); | ||
58 | ui.changeBackup->show(); | ||
59 | } | ||
60 | else | ||
61 | { | ||
62 | ui.backupLabel->hide(); | ||
63 | ui.backupLocation->hide(); | ||
64 | ui.changeBackup->hide(); | ||
65 | } | ||
48 | } | 66 | } |
49 | 67 | ||
50 | 68 | ||
diff --git a/rbutil/rbutilqt/install.h b/rbutil/rbutilqt/install.h index 9c4705697e..f1d649ab61 100644 --- a/rbutil/rbutilqt/install.h +++ b/rbutil/rbutilqt/install.h | |||
@@ -36,8 +36,6 @@ class Install : public QDialog | |||
36 | 36 | ||
37 | public slots: | 37 | public slots: |
38 | void accept(void); | 38 | void accept(void); |
39 | void updateDataReadProgress(int read, int total); | ||
40 | void changeBackupPath(); | ||
41 | 39 | ||
42 | private: | 40 | private: |
43 | Ui::InstallFrm ui; | 41 | Ui::InstallFrm ui; |
@@ -56,6 +54,9 @@ class Install : public QDialog | |||
56 | void setDetailsStable(bool); | 54 | void setDetailsStable(bool); |
57 | void setDetailsArchived(bool); | 55 | void setDetailsArchived(bool); |
58 | void done(bool); | 56 | void done(bool); |
57 | void updateDataReadProgress(int read, int total); | ||
58 | void changeBackupPath(); | ||
59 | void backupCheckboxChanged(int state); | ||
59 | 60 | ||
60 | }; | 61 | }; |
61 | 62 | ||
diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui index 6a2a541f64..c1a6b82a1e 100644 --- a/rbutil/rbutilqt/installfrm.ui +++ b/rbutil/rbutilqt/installfrm.ui | |||
@@ -8,8 +8,8 @@ | |||
8 | <rect> | 8 | <rect> |
9 | <x>0</x> | 9 | <x>0</x> |
10 | <y>0</y> | 10 | <y>0</y> |
11 | <width>600</width> | 11 | <width>644</width> |
12 | <height>450</height> | 12 | <height>500</height> |
13 | </rect> | 13 | </rect> |
14 | </property> | 14 | </property> |
15 | <property name="windowTitle" > | 15 | <property name="windowTitle" > |
@@ -163,17 +163,6 @@ | |||
163 | </property> | 163 | </property> |
164 | </widget> | 164 | </widget> |
165 | </item> | 165 | </item> |
166 | <item row="1" column="0" > | ||
167 | <widget class="QLabel" name="label_3" > | ||
168 | <property name="text" > | ||
169 | <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> | ||
170 | <html><head><meta name="qrichtext" content="1" /><style type="text/css"> | ||
171 | p, li { white-space: pre-wrap; } | ||
172 | </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> | ||
173 | <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Backup Location:</span></p></body></html></string> | ||
174 | </property> | ||
175 | </widget> | ||
176 | </item> | ||
177 | <item row="1" column="1" > | 166 | <item row="1" column="1" > |
178 | <widget class="QLabel" name="backupLocation" > | 167 | <widget class="QLabel" name="backupLocation" > |
179 | <property name="text" > | 168 | <property name="text" > |
@@ -183,12 +172,51 @@ p, li { white-space: pre-wrap; } | |||
183 | </item> | 172 | </item> |
184 | <item row="1" column="2" > | 173 | <item row="1" column="2" > |
185 | <widget class="QPushButton" name="changeBackup" > | 174 | <widget class="QPushButton" name="changeBackup" > |
175 | <property name="sizePolicy" > | ||
176 | <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > | ||
177 | <horstretch>0</horstretch> | ||
178 | <verstretch>0</verstretch> | ||
179 | </sizepolicy> | ||
180 | </property> | ||
181 | <property name="maximumSize" > | ||
182 | <size> | ||
183 | <width>60</width> | ||
184 | <height>16777215</height> | ||
185 | </size> | ||
186 | </property> | ||
186 | <property name="text" > | 187 | <property name="text" > |
187 | <string>Change</string> | 188 | <string>Change</string> |
188 | </property> | 189 | </property> |
189 | </widget> | 190 | </widget> |
190 | </item> | 191 | </item> |
192 | <item row="1" column="0" > | ||
193 | <widget class="QLabel" name="backupLabel" > | ||
194 | <property name="sizePolicy" > | ||
195 | <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > | ||
196 | <horstretch>0</horstretch> | ||
197 | <verstretch>0</verstretch> | ||
198 | </sizepolicy> | ||
199 | </property> | ||
200 | <property name="maximumSize" > | ||
201 | <size> | ||
202 | <width>120</width> | ||
203 | <height>16777215</height> | ||
204 | </size> | ||
205 | </property> | ||
206 | <property name="text" > | ||
207 | <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> | ||
208 | <html><head><meta name="qrichtext" content="1" /><style type="text/css"> | ||
209 | p, li { white-space: pre-wrap; } | ||
210 | </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> | ||
211 | <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Backup Location:</span></p></body></html></string> | ||
212 | </property> | ||
213 | </widget> | ||
214 | </item> | ||
191 | </layout> | 215 | </layout> |
216 | <zorder>backup</zorder> | ||
217 | <zorder>backupLocation</zorder> | ||
218 | <zorder>changeBackup</zorder> | ||
219 | <zorder>backupLabel</zorder> | ||
192 | </widget> | 220 | </widget> |
193 | </item> | 221 | </item> |
194 | <item row="5" column="1" > | 222 | <item row="5" column="1" > |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 187e369d32..25bc1a3b8e 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -473,7 +473,7 @@ bool RbUtilQt::installAuto() | |||
473 | QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) | 473 | QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) |
474 | { | 474 | { |
475 | logger->addItem(tr("Beginning Backup..."),LOGINFO); | 475 | logger->addItem(tr("Beginning Backup..."),LOGINFO); |
476 | QString backupName = settings->mountpoint() + ".backup/rockbox-backup-"+rbVersion+".zip"; | 476 | QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; |
477 | 477 | ||
478 | //! create dir, if it doesnt exist | 478 | //! create dir, if it doesnt exist |
479 | QFileInfo backupFile(backupName); | 479 | QFileInfo backupFile(backupName); |