diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/gui/comboboxviewdelegate.cpp (renamed from rbutil/rbutilqt/comboboxviewdelegate.cpp) | 0 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/comboboxviewdelegate.h (renamed from rbutil/rbutilqt/comboboxviewdelegate.h) | 0 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/infowidgetfrm.ui | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidgetfrm.ui | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pri | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/rbutil/rbutilqt/comboboxviewdelegate.cpp b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp index 189f71c95e..189f71c95e 100644 --- a/rbutil/rbutilqt/comboboxviewdelegate.cpp +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp | |||
diff --git a/rbutil/rbutilqt/comboboxviewdelegate.h b/rbutil/rbutilqt/gui/comboboxviewdelegate.h index 40f6b07d02..40f6b07d02 100644 --- a/rbutil/rbutilqt/comboboxviewdelegate.h +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.h | |||
diff --git a/rbutil/rbutilqt/gui/infowidgetfrm.ui b/rbutil/rbutilqt/gui/infowidgetfrm.ui index 41ac46f8dc..8c7fdb30f7 100644 --- a/rbutil/rbutilqt/gui/infowidgetfrm.ui +++ b/rbutil/rbutilqt/gui/infowidgetfrm.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | </rect> | 11 | </rect> |
12 | </property> | 12 | </property> |
13 | <property name="windowTitle"> | 13 | <property name="windowTitle"> |
14 | <string>Form</string> | 14 | <string>Info</string> |
15 | </property> | 15 | </property> |
16 | <layout class="QGridLayout" name="gridLayout"> | 16 | <layout class="QGridLayout" name="gridLayout"> |
17 | <item row="0" column="0"> | 17 | <item row="0" column="0"> |
@@ -31,7 +31,7 @@ | |||
31 | <widget class="QTreeWidget" name="treeInfo"> | 31 | <widget class="QTreeWidget" name="treeInfo"> |
32 | <column> | 32 | <column> |
33 | <property name="text"> | 33 | <property name="text"> |
34 | <string>1</string> | 34 | <string>Package</string> |
35 | </property> | 35 | </property> |
36 | </column> | 36 | </column> |
37 | </widget> | 37 | </widget> |
diff --git a/rbutil/rbutilqt/gui/manualwidgetfrm.ui b/rbutil/rbutilqt/gui/manualwidgetfrm.ui index 8757c4569e..add26736c9 100644 --- a/rbutil/rbutilqt/gui/manualwidgetfrm.ui +++ b/rbutil/rbutilqt/gui/manualwidgetfrm.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | </rect> | 11 | </rect> |
12 | </property> | 12 | </property> |
13 | <property name="windowTitle"> | 13 | <property name="windowTitle"> |
14 | <string>Form</string> | 14 | <string>Manual</string> |
15 | </property> | 15 | </property> |
16 | <layout class="QGridLayout" name="gridLayout"> | 16 | <layout class="QGridLayout" name="gridLayout"> |
17 | <item row="0" column="0"> | 17 | <item row="0" column="0"> |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index dbbe4afb4d..ec8ce1cc64 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -63,7 +63,7 @@ void SelectiveInstallWidget::selectedVersionChanged(int index) | |||
63 | if(current == "release") | 63 | if(current == "release") |
64 | ui.selectedDescription->setText(tr("This is the latest stable " | 64 | ui.selectedDescription->setText(tr("This is the latest stable " |
65 | "release available.")); | 65 | "release available.")); |
66 | if(current == "current") | 66 | if(current == "development") |
67 | ui.selectedDescription->setText(tr("The development version is " | 67 | ui.selectedDescription->setText(tr("The development version is " |
68 | "updated on every code change. Last update was on %1").arg( | 68 | "updated on every code change. Last update was on %1").arg( |
69 | ServerInfo::value(ServerInfo::BleedingDate).toString())); | 69 | ServerInfo::value(ServerInfo::BleedingDate).toString())); |
@@ -89,7 +89,7 @@ void SelectiveInstallWidget::updateVersion(void) | |||
89 | // re-populate all version items | 89 | // re-populate all version items |
90 | m_versions.clear(); | 90 | m_versions.clear(); |
91 | m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); | 91 | m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); |
92 | m_versions.insert("current", ServerInfo::value(ServerInfo::BleedingRevision).toString()); | 92 | m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString()); |
93 | m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); | 93 | m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); |
94 | 94 | ||
95 | ui.selectedVersion->clear(); | 95 | ui.selectedVersion->clear(); |
@@ -97,9 +97,9 @@ void SelectiveInstallWidget::updateVersion(void) | |||
97 | ui.selectedVersion->addItem(tr("Stable Release (Version %1)").arg( | 97 | ui.selectedVersion->addItem(tr("Stable Release (Version %1)").arg( |
98 | m_versions["release"]), "release"); | 98 | m_versions["release"]), "release"); |
99 | } | 99 | } |
100 | if(!m_versions["current"].isEmpty()) { | 100 | if(!m_versions["development"].isEmpty()) { |
101 | ui.selectedVersion->addItem(tr("Development Version (Revison %1)").arg( | 101 | ui.selectedVersion->addItem(tr("Development Version (Revison %1)").arg( |
102 | m_versions["current"]), "current"); | 102 | m_versions["development"]), "development"); |
103 | } | 103 | } |
104 | if(!m_versions["rc"].isEmpty()) { | 104 | if(!m_versions["rc"].isEmpty()) { |
105 | ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg( | 105 | ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg( |
@@ -116,7 +116,7 @@ void SelectiveInstallWidget::updateVersion(void) | |||
116 | ui.selectedVersion->setCurrentIndex(index); | 116 | ui.selectedVersion->setCurrentIndex(index); |
117 | } | 117 | } |
118 | else { | 118 | else { |
119 | index = ui.selectedVersion->findData("current"); | 119 | index = ui.selectedVersion->findData("development"); |
120 | ui.selectedVersion->setCurrentIndex(index); | 120 | ui.selectedVersion->setCurrentIndex(index); |
121 | } | 121 | } |
122 | // check if Rockbox is installed. If it is untick the bootloader option, as | 122 | // check if Rockbox is installed. If it is untick the bootloader option, as |
@@ -377,7 +377,7 @@ void SelectiveInstallWidget::installRockbox(void) | |||
377 | 377 | ||
378 | if(selected == "release") url = ServerInfo::platformValue(m_target, | 378 | if(selected == "release") url = ServerInfo::platformValue(m_target, |
379 | ServerInfo::CurReleaseUrl).toString(); | 379 | ServerInfo::CurReleaseUrl).toString(); |
380 | else if(selected == "current") url = ServerInfo::platformValue(m_target, | 380 | else if(selected == "development") url = ServerInfo::platformValue(m_target, |
381 | ServerInfo::CurDevelUrl).toString(); | 381 | ServerInfo::CurDevelUrl).toString(); |
382 | else if(selected == "rc") url = ServerInfo::platformValue(m_target, | 382 | else if(selected == "rc") url = ServerInfo::platformValue(m_target, |
383 | ServerInfo::RelCandidateUrl).toString(); | 383 | ServerInfo::RelCandidateUrl).toString(); |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui index 25cf44ba90..65a6f18620 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui +++ b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui | |||
@@ -17,7 +17,7 @@ | |||
17 | </sizepolicy> | 17 | </sizepolicy> |
18 | </property> | 18 | </property> |
19 | <property name="windowTitle"> | 19 | <property name="windowTitle"> |
20 | <string>Form</string> | 20 | <string>Selective Installation</string> |
21 | </property> | 21 | </property> |
22 | <layout class="QGridLayout" name="gridLayout_3"> | 22 | <layout class="QGridLayout" name="gridLayout_3"> |
23 | <item row="0" column="0"> | 23 | <item row="0" column="0"> |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 76c8497a5b..62a4f583f7 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -353,14 +353,14 @@ void RbUtilQt::updateDevice() | |||
353 | QString name | 353 | QString name |
354 | = QString("%1 (%2)").arg(SystemInfo::value(SystemInfo::CurName).toString(), | 354 | = QString("%1 (%2)").arg(SystemInfo::value(SystemInfo::CurName).toString(), |
355 | ServerInfo::value(ServerInfo::CurStatus).toString()); | 355 | ServerInfo::value(ServerInfo::CurStatus).toString()); |
356 | ui.labelDevice->setText(tr("<b>%1 %2</b>").arg(brand, name)); | 356 | ui.labelDevice->setText(QString("<b>%1 %2</b>").arg(brand, name)); |
357 | 357 | ||
358 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 358 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
359 | QString mountdisplay = QDir::toNativeSeparators(mountpoint); | 359 | QString mountdisplay = QDir::toNativeSeparators(mountpoint); |
360 | if(!mountdisplay.isEmpty()) { | 360 | if(!mountdisplay.isEmpty()) { |
361 | QString label = Utils::filesystemName(mountpoint); | 361 | QString label = Utils::filesystemName(mountpoint); |
362 | if(!label.isEmpty()) mountdisplay += QString(" (%1)").arg(label); | 362 | if(!label.isEmpty()) mountdisplay += QString(" (%1)").arg(label); |
363 | ui.labelMountpoint->setText(tr("<b>%1</b>").arg(mountdisplay)); | 363 | ui.labelMountpoint->setText(QString("<b>%1</b>").arg(mountdisplay)); |
364 | } | 364 | } |
365 | else { | 365 | else { |
366 | mountdisplay = "(unknown)"; | 366 | mountdisplay = "(unknown)"; |
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index ebb49f09ec..141c5eea75 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri | |||
@@ -76,7 +76,7 @@ SOURCES += \ | |||
76 | quazip/zip.c \ | 76 | quazip/zip.c \ |
77 | quazip/ioapi.c \ | 77 | quazip/ioapi.c \ |
78 | base/ziputil.cpp \ | 78 | base/ziputil.cpp \ |
79 | comboboxviewdelegate.cpp \ | 79 | gui/comboboxviewdelegate.cpp \ |
80 | gui/selectiveinstallwidget.cpp \ | 80 | gui/selectiveinstallwidget.cpp \ |
81 | gui/backupdialog.cpp \ | 81 | gui/backupdialog.cpp \ |
82 | 82 | ||
@@ -148,7 +148,7 @@ HEADERS += \ | |||
148 | quazip/zip.h \ | 148 | quazip/zip.h \ |
149 | base/ziputil.h \ | 149 | base/ziputil.h \ |
150 | lame/lame.h \ | 150 | lame/lame.h \ |
151 | comboboxviewdelegate.h \ | 151 | gui/comboboxviewdelegate.h \ |
152 | gui/selectiveinstallwidget.h \ | 152 | gui/selectiveinstallwidget.h \ |
153 | gui/backupdialog.h \ | 153 | gui/backupdialog.h \ |
154 | 154 | ||