Remove "daily builds" from Rockbox Utility.

Since Rockbox Utility could only install the most recent "daily build" there is
not much difference to the most recent development build so the option was not
really useful.

Additionally update naming. Former "daily" builds are now "archived builds" and
can get installed manually (if necessary), and "current" builds are renamed to
"development build".

Change-Id: I748688d544b6d9868f7495f30933637bf9ff5e50

rbutil/rbutilqt/base/serverinfo.cpp

@@ -32,7 +32,6 @@ const static struct {
 } ServerInfoList[] = {
     { ServerInfo::CurReleaseVersion,    ":platform:/releaseversion", "" },
     { ServerInfo::CurStatus,            ":platform:/status",         "Unknown" },
-    { ServerInfo::DailyRevision,        "dailyrev",                  "" },
     { ServerInfo::DailyDate,            "dailydate",                 "" },
     { ServerInfo::BleedingRevision,     "bleedingrev",               "" },
     { ServerInfo::BleedingDate,         "bleedingdate",              "" },
@@ -44,7 +43,6 @@ void ServerInfo::readBuildInfo(QString file)
 {
     QSettings info(file, QSettings::IniFormat);
     
-    setValue(ServerInfo::DailyRevision,info.value("dailies/rev"));
     QDate date = QDate::fromString(info.value("dailies/date").toString(), "yyyyMMdd");
     setValue(ServerInfo::DailyDate,date.toString(Qt::ISODate));
    

rbutil/rbutilqt/base/serverinfo.h

@@ -32,7 +32,6 @@ class ServerInfo : public QObject
         enum ServerInfos {
             CurReleaseVersion,
             CurStatus,
-            DailyRevision,
             DailyDate,
             BleedingRevision,
             BleedingDate,

rbutil/rbutilqt/installwindow.cpp

@@ -32,7 +32,6 @@ InstallWindow::InstallWindow(QWidget *parent) : QDialog(parent)
 
     connect(ui.radioStable, SIGNAL(toggled(bool)), this, SLOT(setDetailsStable(bool)));
     connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool)));
-    connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool)));
     connect(ui.changeBackup, SIGNAL(pressed()), this, SLOT(changeBackupPath()));
     connect(ui.backup, SIGNAL(stateChanged(int)), this, SLOT(backupCheckboxChanged(int)));
 
@@ -56,10 +55,6 @@ InstallWindow::InstallWindow(QWidget *parent) : QDialog(parent)
     backupCheckboxChanged(Qt::Unchecked);
 
 
-    if(ServerInfo::value(ServerInfo::DailyRevision).toString().isEmpty()) {
-        ui.radioArchived->setEnabled(false);
-        qDebug() << "[Install] no information about archived version available!";
-    }
     if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) {
         ui.radioStable->setEnabled(false);
     }
@@ -69,24 +64,16 @@ InstallWindow::InstallWindow(QWidget *parent) : QDialog(parent)
     if(RbSettings::value(RbSettings::Build).toString() == "stable"
         && !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty())
         ui.radioStable->setChecked(true);
-    else if(RbSettings::value(RbSettings::Build).toString() == "archived")
-        ui.radioArchived->setChecked(true);
     else if(RbSettings::value(RbSettings::Build).toString() == "current")
         ui.radioCurrent->setChecked(true);
     else if(!ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) {
         ui.radioStable->setChecked(true);
         ui.radioStable->setEnabled(true);
-        QFont font;
-        font.setBold(true);
-        ui.radioStable->setFont(font);
     }
     else {
         ui.radioCurrent->setChecked(true);
         ui.radioStable->setEnabled(false);
         ui.radioStable->setChecked(false);
-        QFont font;
-        font.setBold(true);
-        ui.radioCurrent->setFont(font);
     }
 
 }
@@ -146,12 +133,6 @@ void InstallWindow::accept()
         RbSettings::setValue(RbSettings::Build, "stable");
         myversion = ServerInfo::value(ServerInfo::CurReleaseVersion).toString();
     }
-    else if(ui.radioArchived->isChecked()) {
-        file = SystemInfo::value(SystemInfo::DailyUrl).toString();
-        RbSettings::setValue(RbSettings::Build, "archived");
-        myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString()
-            + "-" + ServerInfo::value(ServerInfo::DailyDate).toString();
-    }
     else if(ui.radioCurrent->isChecked()) {
         file = SystemInfo::value(SystemInfo::BleedingUrl).toString();
         RbSettings::setValue(RbSettings::Build, "current");
@@ -163,7 +144,6 @@ void InstallWindow::accept()
     }
     file.replace("%MODEL%", buildname);
     file.replace("%RELVERSION%", ServerInfo::value(ServerInfo::CurReleaseVersion).toString());
-    file.replace("%REVISION%", ServerInfo::value(ServerInfo::DailyRevision).toString());
     file.replace("%DATE%", ServerInfo::value(ServerInfo::DailyDate).toString());
 
     RbSettings::sync();
@@ -274,14 +254,10 @@ void InstallWindow::setDetailsCurrent(bool show)
 {
     if(show) {
         ui.labelDetails->setText(tr("This is the absolute up to the minute "
-                "Rockbox built. A current build will get updated every time "
+                "Rockbox built. The development version will get updated every time "
-                "a change is made. Latest version is %1 (%2).")
+                "a change is made. Latest development version is %1 (%2).")
                 .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(),
                     ServerInfo::value(ServerInfo::BleedingDate).toString()));
-        if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty())
-            ui.labelNote->setText(tr("<b>This is the recommended version.</b>"));
-        else
-            ui.labelNote->setText("");
     }
 }
 
@@ -294,28 +270,13 @@ void InstallWindow::setDetailsStable(bool show)
 
         if(!ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty())
             ui.labelNote->setText(tr("<b>Note:</b> "
-            "The lastest released version is %1. "
+            "The lastest stable version is %1.")
-            "<b>This is the recommended version.</b>")
                     .arg(ServerInfo::value(ServerInfo::CurReleaseVersion).toString()));
         else ui.labelNote->setText("");
     }
 }
 
 
-void InstallWindow::setDetailsArchived(bool show)
-{
-    if(show) {
-        ui.labelDetails->setText(tr("These are automatically built each day "
-        "from the current development source code. This generally has more "
-        "features than the last stable release but may be much less stable. "
-        "Features may change regularly."));
-        ui.labelNote->setText(tr("<b>Note:</b> archived version is %1 (%2).")
-            .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(),
-                ServerInfo::value(ServerInfo::DailyDate).toString()));
-    }
-}
-
-
 void InstallWindow::changeEvent(QEvent *e)
 {
     if(e->type() == QEvent::LanguageChange) {

rbutil/rbutilqt/installwindow.h

@@ -53,7 +53,6 @@ class InstallWindow : public QDialog
     private slots:
         void setDetailsCurrent(bool);
         void setDetailsStable(bool);
-        void setDetailsArchived(bool);
         void done(bool);
         void changeBackupPath(void);
         void backupCheckboxChanged(int state);

rbutil/rbutilqt/installwindowfrm.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <class>InstallWindowFrm</class>
  <widget class="QDialog" name="InstallWindowFrm" >
@@ -16,7 +17,7 @@
    <string>Install Rockbox</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" >
-   <item rowspan="9" row="0" column="0" >
+   <item row="0" column="0" rowspan="9" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string/>
@@ -48,21 +49,14 @@
       <item>
        <widget class="QRadioButton" name="radioStable" >
         <property name="text" >
-         <string>Rockbox &amp;stable</string>
+         <string>&amp;Stable release</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioArchived" >
-        <property name="text" >
-         <string>&amp;Archived Build</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="radioCurrent" >
         <property name="text" >
-         <string>&amp;Current Build</string>
+         <string>&amp;Development build</string>
         </property>
        </widget>
       </item>
@@ -173,7 +167,7 @@
       <item row="1" column="2" >
        <widget class="QPushButton" name="changeBackup" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>