summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-12-19 21:43:22 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-12-19 21:43:22 +0000
commit19b6fbfd1e916a23d830914303919cda92686869 (patch)
tree23363c79bc98923af12523286fc7e45badacbfba /rbutil
parent12dc494c9adc1f70f0f7ff4d4f5822b578b270c1 (diff)
downloadrockbox-19b6fbfd1e916a23d830914303919cda92686869.tar.gz
rockbox-19b6fbfd1e916a23d830914303919cda92686869.tar.bz2
rockbox-19b6fbfd1e916a23d830914303919cda92686869.zip
Default automatic install to the latest release instead of the most recent build.
Rename small install to minimal install. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19490 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp41
-rw-r--r--rbutil/rbutilqt/rbutilqtfrm.ui6
2 files changed, 23 insertions, 24 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 5e68abc8ea..a3923fcfb4 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -356,11 +356,13 @@ void RbUtilQt::completeInstall()
{
if(chkConfig(true)) return;
if(QMessageBox::question(this, tr("Confirm Installation"),
- tr("Do you really want to make a complete Installation? "
- "This will install the latest build available, not the latest "
- "released version."),
- QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return;
-
+ tr("Do you really want to perform a complete installation?\n\n"
+ "This will install Rockbox %1. To install the most recent "
+ "development build available press \"Cancel\" and "
+ "use the \"Installation\" tab.")
+ .arg(settings->lastRelease(settings->curPlatform())),
+ QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok)
+ return;
// create logger
logger = new ProgressLoggerGui(this);
logger->show();
@@ -410,10 +412,15 @@ void RbUtilQt::smallInstall()
{
if(chkConfig(true)) return;
if(QMessageBox::question(this, tr("Confirm Installation"),
- tr("Do you really want to make a small Installation? "
- "This will install the latest build available, not the latest "
- "released version."),
- QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return;
+ tr("Do you really want to perform a minimal installation? "
+ "A minimal installation will contain only the absolutely "
+ "necessary parts to run Rockbox.\n\n"
+ "This will install Rockbox %1. To install the most recent "
+ "development build available press \"Cancel\" and "
+ "use the \"Installation\" tab.")
+ .arg(settings->lastRelease(settings->curPlatform())),
+ QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok)
+ return;
// create logger
logger = new ProgressLoggerGui(this);
@@ -481,22 +488,14 @@ void RbUtilQt::installBtn()
bool RbUtilQt::installAuto()
{
- QString file = QString("%1%2/rockbox.zip")
- .arg(settings->bleedingUrl(), settings->curPlatformName());
+ QString file = QString("%1/%2/rockbox-%3-%4.zip")
+ .arg(settings->releaseUrl(), settings->lastRelease(settings->curPlatform()),
+ settings->curPlatform(), settings->lastRelease(settings->curPlatform()));
buildInfo.open();
QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
buildInfo.close();
- if(settings->curReleased()) {
- // only set the keys if needed -- querying will yield an empty string
- // if not set.
- versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform()));
- versmap.insert("rel_date", ""); // FIXME: provide the release timestamp
- }
-
- QString myversion = "r" + versmap.value("bleed_rev");
-
// check installed Version and Target
QString rbVersion = Detect::installedVersion(settings->mountpoint());
QString warning = Detect::check(settings, false, settings->curTargetId());
@@ -551,7 +550,7 @@ bool RbUtilQt::installAuto()
ZipInstaller* installer = new ZipInstaller(this);
installer->setUrl(file);
installer->setLogSection("Rockbox (Base)");
- installer->setLogVersion(myversion);
+ installer->setLogVersion(settings->lastRelease(settings->curPlatform()));
if(!settings->cacheDisabled())
installer->setCache(true);
installer->setMountPoint(settings->mountpoint());
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 071471ce3c..ba94259557 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -169,7 +169,7 @@
<item row="1" column="0" >
<widget class="QToolButton" name="buttonSmall" >
<property name="text" >
- <string>Small Installation</string>
+ <string>Minimal Installation</string>
</property>
<property name="icon" >
<iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
@@ -185,7 +185,7 @@
<item row="1" column="1" >
<widget class="QLabel" name="labelSmall" >
<property name="text" >
- <string>&lt;b>Small installation&lt;/b>&lt;br/>This installs bootloader and the current build of Rockbox. If you don't want the extras package, choose this option.</string>
+ <string>&lt;b>Minimal installation&lt;/b>&lt;br/>This installs bootloader and the current build of Rockbox. If you don't want the extras package, choose this option.</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -914,7 +914,7 @@
<iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
</property>
<property name="text" >
- <string>&amp;Small Installation</string>
+ <string>&amp;Minimal Installation</string>
</property>
</action>
<action name="actionInstall_Bootloader" >