Index: rbutil/rbutilqt/base/rbsettings.cpp =================================================================== --- rbutil/rbutilqt/base/rbsettings.cpp (revision 24320) +++ rbutil/rbutilqt/base/rbsettings.cpp (working copy) @@ -94,24 +94,9 @@ { RbSettings::EncoderVolume, ":encoder:/volume", "1.0" }, }; -// server settings -const static struct { - RbSettings::ServerSettings setting; - const char* name; - const char* def; -} ServerSettingsList[] = { - { RbSettings::CurReleaseVersion, ":platform:/releaseversion", "" }, - { RbSettings::CurStatus, ":platform:/status", "" }, - { RbSettings::DailyRevision, "dailyrev", "" }, - { RbSettings::DailyDate, "dailydate", "" }, - { RbSettings::BleedingRevision, "bleedingrev", "" }, - { RbSettings::BleedingDate, "bleedingdate", "" }, -}; - //! pointer to setting object to NULL QSettings* RbSettings::systemSettings = NULL; QSettings* RbSettings::userSettings = NULL; -QMap RbSettings::serverSettings; void RbSettings::ensureRbSettingsExists() { @@ -215,20 +200,6 @@ return userSettings->value(s, UserSettingsList[i].def); } -QVariant RbSettings::value(enum ServerSettings setting) -{ - ensureRbSettingsExists(); - - // locate setting item - int i = 0; - while(ServerSettingsList[i].setting != setting) - i++; - - QString s = constructSettingPath(ServerSettingsList[i].name); - qDebug() << "[Settings] GET SERV:" << s << serverSettings.value(s, ServerSettingsList[i].def).toString(); - return serverSettings.value(s); -} - void RbSettings::setValue(enum UserSettings setting , QVariant value) { QString empty; @@ -249,28 +220,6 @@ qDebug() << "[Settings] SET U:" << s << userSettings->value(s).toString(); } -void RbSettings::setValue(enum ServerSettings setting, QVariant value) -{ - QString empty; - return setPlatformValue(empty, setting, value); -} - -void RbSettings::setPlatformValue(QString platform, enum ServerSettings setting, QVariant value) -{ - ensureRbSettingsExists(); - - // locate setting item - int i = 0; - while(ServerSettingsList[i].setting != setting) - i++; - - QString s = ServerSettingsList[i].name; - s.replace(":platform:", platform); - serverSettings.insert(s, value); - qDebug() << "[Settings] SET SERV:" << s << serverSettings.value(s).toString(); -} - - QVariant RbSettings::platformValue(QString platform, enum SystemSettings setting) { ensureRbSettingsExists(); @@ -288,7 +237,6 @@ return systemSettings->value(s, d); } - QStringList RbSettings::platforms() { ensureRbSettingsExists(); Index: rbutil/rbutilqt/base/rbsettings.h =================================================================== --- rbutil/rbutilqt/base/rbsettings.h (revision 24320) +++ rbutil/rbutilqt/base/rbsettings.h (working copy) @@ -96,17 +96,7 @@ CurBuildserverModel, CurConfigureModel, }; - - //! All Server settings - enum ServerSettings { - CurReleaseVersion, - CurStatus, - DailyRevision, - DailyDate, - BleedingRevision, - BleedingDate, - }; - + //! call this to flush the user Settings static void sync(); //! returns the filename of the usersettings file @@ -125,20 +115,14 @@ static QVariant value(enum SystemSettings setting); //! get a value from user settings static QVariant value(enum UserSettings setting); - //! get a value from server settings - static QVariant value(enum ServerSettings setting); //! set a user setting value static void setValue(enum UserSettings setting , QVariant value); - //! set a server setting value - static void setValue(enum ServerSettings setting , QVariant value); //! get a user setting from a subvalue (ie for encoders and tts engines) static QVariant subValue(QString sub, enum UserSettings setting); //! set a user setting from a subvalue (ie for encoders and tts engines) static void setSubValue(QString sub, enum UserSettings setting, QVariant value); - //! set a value for a server settings for a named platform. - static void setPlatformValue(QString platform, enum ServerSettings setting, QVariant value); //! get a value from system settings for a named platform. - static QVariant platformValue(QString platform, enum SystemSettings setting); + static QVariant platformValue(QString platform, enum SystemSettings setting); private: //! you shouldnt call this, its a fully static calls @@ -151,7 +135,6 @@ //! pointers to our setting objects static QSettings *systemSettings; static QSettings *userSettings; - static QMap serverSettings; }; #endif Index: rbutil/rbutilqt/base/serverinfo.cpp =================================================================== --- rbutil/rbutilqt/base/serverinfo.cpp (revision 0) +++ rbutil/rbutilqt/base/serverinfo.cpp (revision 0) @@ -0,0 +1,150 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2010 by Dominik Wenger + * $Id$ + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "serverinfo.h" +#include "rbsettings.h" + +#include + +#if defined(Q_OS_LINUX) +#include +#endif + +// server infos +const static struct { + ServerInfo::ServerInfos info; + const char* name; + const char* def; +} ServerInfoList[] = { + { ServerInfo::CurReleaseVersion, ":platform:/releaseversion", "" }, + { ServerInfo::CurStatus, ":platform:/status", "unknown" }, + { ServerInfo::DailyRevision, "dailyrev", "" }, + { ServerInfo::DailyDate, "dailydate", "" }, + { ServerInfo::BleedingRevision, "bleedingrev", "" }, + { ServerInfo::BleedingDate, "bleedingdate", "" }, +}; + +QMap ServerInfo::serverInfos; + +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)); + + info.beginGroup("release"); + QStringList keys = info.allKeys(); + for(int i=0; i < keys.size(); i++) + { + setAllConfigPlatformValue(keys[i],ServerInfo::CurReleaseVersion,info.value(keys[i])); + } + info.endGroup(); + + info.beginGroup("status"); + keys = info.allKeys(); + for(int i=0; i < keys.size(); i++) + { + switch(info.value(keys[i]).toInt()) + { + case 1: + ServerInfo::setAllConfigPlatformValue(keys[i],ServerInfo::CurStatus,tr("Unusable")); + break; + case 2: + ServerInfo::setAllConfigPlatformValue(keys[i],ServerInfo::CurStatus,tr("Unstable")); + break; + case 3: + ServerInfo::setAllConfigPlatformValue(keys[i],ServerInfo::CurStatus,tr("Stable")); + break; + default: + ServerInfo::setAllConfigPlatformValue(keys[i],ServerInfo::CurStatus,tr("Unknown")); + break; + } + } + info.endGroup(); +} + +void ServerInfo::readBleedingInfo(QString file) +{ + QSettings info(file, QSettings::IniFormat); + + setValue(ServerInfo::BleedingRevision,info.value("bleeding/rev")); + QDateTime date = QDateTime::fromString(info.value("bleeding/timestamp").toString(), "yyyyMMddThhmmssZ"); + setValue(ServerInfo::BleedingDate,date.toString(Qt::ISODate)); +} + +QVariant ServerInfo::value(enum ServerInfos info) +{ + // locate info item + int i = 0; + while(ServerInfoList[i].info != info) + i++; + + QString s = ServerInfoList[i].name; + s.replace(":platform:", RbSettings::value(RbSettings::CurrentPlatform).toString()); + qDebug() << "[ServerIndo] GET:" << s << serverInfos.value(s, ServerInfoList[i].def).toString(); + return serverInfos.value(s, ServerInfoList[i].def); +} + +void ServerInfo::setValue(enum ServerInfos setting, QVariant value) +{ + QString empty; + return setPlatformValue(empty, setting, value); +} + +void ServerInfo::setPlatformValue(QString platform, enum ServerInfos info, QVariant value) +{ + // locate setting item + int i = 0; + while(ServerInfoList[i].info != info) + i++; + + QString s = ServerInfoList[i].name; + s.replace(":platform:", platform); + serverInfos.insert(s, value); + qDebug() << "[ServerInfo] SET:" << s << serverInfos.value(s).toString(); +} + +void ServerInfo::setAllConfigPlatformValue(QString configplatform, ServerInfos info, QVariant value) +{ + // insert intp all platforms where configurename matches + QStringList platforms = RbSettings::platforms(); + for(int i =0; i < platforms.size(); i++) + { + if(RbSettings::platformValue(platforms.at(i),RbSettings::CurConfigureModel) == configplatform) + setPlatformValue(platforms.at(i),info,value); + } +} + +QVariant ServerInfo::platformValue(QString platform, enum ServerInfos info) +{ + // locate setting item + int i = 0; + while(ServerInfoList[i].info != info) + i++; + + QString s = ServerInfoList[i].name; + s.replace(":platform:", platform); + QString d = ServerInfoList[i].def; + d.replace(":platform:", platform); + qDebug() << "[ServerInfo] GET" << s << serverInfos.value(s, d).toString(); + return serverInfos.value(s, d); +} + Property changes on: rbutil\rbutilqt\base\serverinfo.cpp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Index: rbutil/rbutilqt/base/serverinfo.h =================================================================== --- rbutil/rbutilqt/base/serverinfo.h (revision 0) +++ rbutil/rbutilqt/base/serverinfo.h (revision 0) @@ -0,0 +1,69 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2010 by Dominik Wenger + * $Id$ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef SERVERINFO_H +#define SERVERINFO_H + +#include + +class QSettings; + +class ServerInfo : public QObject +{ + Q_OBJECT + public: + + //! All Server infos + enum ServerInfos { + CurReleaseVersion, + CurStatus, + DailyRevision, + DailyDate, + BleedingRevision, + BleedingDate, + }; + + //! read in buildinfo file + static void readBuildInfo(QString file); + //! read in bleeding info file + static void readBleedingInfo(QString file); + //! get a value from server info + static QVariant value(enum ServerInfos setting); + //! get a value from server info for a named platform. + static QVariant platformValue(QString platform, enum ServerInfos setting); + + private: + //! set a server info to all platforms where configurename matches + static void setAllConfigPlatformValue(QString configplatform,ServerInfos info, QVariant value); + //! set a server info value + static void setValue(enum ServerInfos setting , QVariant value); + //! set a value for a server info for a named platform. + static void setPlatformValue(QString platform, enum ServerInfos setting, QVariant value); + //! you shouldnt call this, its a fully static class + ServerInfo() {} + + //! map of server infos + static QMap serverInfos; + +}; + +#endif + Property changes on: rbutil\rbutilqt\base\serverinfo.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Index: rbutil/rbutilqt/configure.cpp =================================================================== --- rbutil/rbutilqt/configure.cpp (revision 24320) +++ rbutil/rbutilqt/configure.cpp (working copy) @@ -29,6 +29,7 @@ #include "system.h" #include "encttscfggui.h" #include "rbsettings.h" +#include "serverinfo.h" #include "utils.h" #include #if defined(Q_OS_WIN32) @@ -292,7 +293,8 @@ QMap devcs; for(int it = 0; it < platformList.size(); it++) { - QString curname = RbSettings::name(platformList.at(it)); + QString curname = RbSettings::name(platformList.at(it)) + + " (" +ServerInfo::platformValue(platformList.at(it),ServerInfo::CurStatus).toString() + ")"; QString curbrand = RbSettings::brand(platformList.at(it)); manuf.insertMulti(curbrand, platformList.at(it)); devcs.insert(platformList.at(it), curname); @@ -321,7 +323,8 @@ // go through platforms again for sake of order for(int it = 0; it < platformList.size(); it++) { - QString curname = RbSettings::name(platformList.at(it)); + QString curname = RbSettings::name(platformList.at(it)) + + " (" +ServerInfo::platformValue(platformList.at(it),ServerInfo::CurStatus).toString() +")"; QString curbrand = RbSettings::brand(platformList.at(it)); if(curbrand != brands.at(c)) continue; Index: rbutil/rbutilqt/installwindow.cpp =================================================================== --- rbutil/rbutilqt/installwindow.cpp (revision 24320) +++ rbutil/rbutilqt/installwindow.cpp (working copy) @@ -22,6 +22,7 @@ #include "rbzip.h" #include "system.h" #include "rbsettings.h" +#include "serverinfo.h" #include "utils.h" InstallWindow::InstallWindow(QWidget *parent) : QDialog(parent) @@ -54,24 +55,24 @@ backupCheckboxChanged(Qt::Unchecked); - if(RbSettings::value(RbSettings::DailyRevision).toString().isEmpty()) { + if(ServerInfo::value(ServerInfo::DailyRevision).toString().isEmpty()) { ui.radioArchived->setEnabled(false); qDebug() << "[Install] no information about archived version available!"; } - if(RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty()) { + if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) { ui.radioStable->setEnabled(false); } // try to use the old selection first. If no selection has been made // in the past, use a preselection based on released status. if(RbSettings::value(RbSettings::Build).toString() == "stable" - && !RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty()) + && !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(!RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty()) { + else if(!ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) { ui.radioStable->setChecked(true); ui.radioStable->setEnabled(true); QFont font; @@ -142,26 +143,26 @@ if(ui.radioStable->isChecked()) { file = RbSettings::value(RbSettings::ReleaseUrl).toString(); RbSettings::setValue(RbSettings::Build, "stable"); - myversion = RbSettings::value(RbSettings::CurReleaseVersion).toString(); + myversion = ServerInfo::value(ServerInfo::CurReleaseVersion).toString(); } else if(ui.radioArchived->isChecked()) { file = RbSettings::value(RbSettings::DailyUrl).toString(); RbSettings::setValue(RbSettings::Build, "archived"); - myversion = "r" + RbSettings::value(RbSettings::DailyRevision).toString() + "-" + RbSettings::value(RbSettings::DailyDate).toString(); + myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString() + "-" + ServerInfo::value(ServerInfo::DailyDate).toString(); } else if(ui.radioCurrent->isChecked()) { file = RbSettings::value(RbSettings::BleedingUrl).toString(); RbSettings::setValue(RbSettings::Build, "current"); - myversion = "r" + RbSettings::value(RbSettings::BleedingRevision).toString(); + myversion = "r" + ServerInfo::value(ServerInfo::BleedingRevision).toString(); } else { qDebug() << "[Install] no build selected -- this shouldn't happen"; return; } file.replace("%MODEL%", buildname); - file.replace("%RELVERSION%", RbSettings::value(RbSettings::CurReleaseVersion).toString()); - file.replace("%REVISION%", RbSettings::value(RbSettings::DailyRevision).toString()); - file.replace("%DATE%", RbSettings::value(RbSettings::DailyDate).toString()); + 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(); @@ -268,8 +269,8 @@ ui.labelDetails->setText(tr("This is the absolute up to the minute " "Rockbox built. A current build will get updated every time " "a change is made. Latest version is r%1 (%2).") - .arg(RbSettings::value(RbSettings::BleedingRevision).toString(),RbSettings::value(RbSettings::BleedingDate).toString())); - if(RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty()) + .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(),ServerInfo::value(ServerInfo::BleedingDate).toString())); + if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) ui.labelNote->setText(tr("This is the recommended version.")); else ui.labelNote->setText(""); @@ -283,11 +284,11 @@ ui.labelDetails->setText( tr("This is the last released version of Rockbox.")); - if(!RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty()) + if(!ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) ui.labelNote->setText(tr("Note: " "The lastest released version is %1. " "This is the recommended version.") - .arg(RbSettings::value(RbSettings::CurReleaseVersion).toString())); + .arg(ServerInfo::value(ServerInfo::CurReleaseVersion).toString())); else ui.labelNote->setText(""); } } @@ -301,7 +302,7 @@ "features than the last stable release but may be much less stable. " "Features may change regularly.")); ui.labelNote->setText(tr("Note: archived version is r%1 (%2).") - .arg(RbSettings::value(RbSettings::DailyRevision).toString(),RbSettings::value(RbSettings::DailyDate).toString())); + .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(),ServerInfo::value(ServerInfo::DailyDate).toString())); } } Index: rbutil/rbutilqt/rbutil.ini =================================================================== --- rbutil/rbutilqt/rbutil.ini (revision 24320) +++ rbutil/rbutilqt/rbutil.ini (working copy) @@ -301,7 +301,7 @@ bootloadername=/ipod/bootloader-ipodmini1g.ipod manualname=rockbox-ipodmini2g brand=Apple -configure_modelname=ipodmini +configure_modelname=ipodmini1g encoder=rbspeex [ipodmini2g] @@ -358,19 +358,19 @@ manualname= brand=Cowon usbid=0x0e210500 -configure_modelname=m3 +configure_modelname=iaudiom3 encoder=rbspeex [gigabeatf] name="Gigabeat F / X" -buildserver_modelname=gigabeatf +buildserver_modelname=gigabeatfx bootloadermethod=file bootloadername=/toshiba/gigabeat-fx/FWIMG01.DAT bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT manualname= brand=Toshiba usbid=0x09300009 -configure_modelname=gigabeatf +configure_modelname=gigabeatfx encoder=rbspeex [sansae200] @@ -437,7 +437,7 @@ status=disabled [sansaclip] -name="Sansa Clip (Unstable)" +name="Sansa Clip" buildserver_modelname=sansaclip bootloadermethod=ams bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa @@ -501,43 +501,43 @@ status=disabled [smsgyh820] -name="YH-820 (Unstable)" -buildserver_modelname=yh820 +name="YH-820" +buildserver_modelname=samsungyh820 bootloadermethod=mi4 bootloadername=/samsung/yh820/FW_YH820.mi4 bootloaderfile=/SYSTEM/FW_YH820.mi4 manualname= brand=Samsung usbid=0x04e85023 -configure_modelname=yh820 +configure_modelname=samsungyh820 encoder=rbspeex [smsgyh920] -name="YH-920 (Unstable)" -buildserver_modelname=yh920 +name="YH-920" +buildserver_modelname=samsungyh920 bootloadermethod=mi4 bootloadername=/samsung/yh920/PP5020.mi4 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4 manualname= brand=Samsung usbid=0x04e85022, 0x04e8501d -configure_modelname=yh920 +configure_modelname=samsungyh920 encoder=rbspeex [smsgyh925] -name="YH-925 (Unstable)" -buildserver_modelname=yh925 +name="YH-925" +buildserver_modelname=samsungyh925 bootloadermethod=mi4 bootloadername=/samsung/yh925/FW_YH925.mi4 bootloaderfile=/SYSTEM/FW_YH925.mi4 manualname= brand=Samsung usbid=0x04e85024 -configure_modelname=yh925 +configure_modelname=samsungyh925 encoder=rbspeex [cowond2] -name="D2 (Unstable)" +name="D2" buildserver_modelname=cowond2 bootloadermethod=tcc bootloadername=/cowon/d2/bootloader-cowond2.bin Index: rbutil/rbutilqt/rbutilqt.cpp =================================================================== --- rbutil/rbutilqt/rbutilqt.cpp (revision 24320) +++ rbutil/rbutilqt/rbutilqt.cpp (working copy) @@ -36,6 +36,7 @@ #include "system.h" #include "systrace.h" #include "rbsettings.h" +#include "serverinfo.h" #include "progressloggerinterface.h" @@ -194,30 +195,10 @@ } qDebug() << "[RbUtil] network status:" << daily->error(); - // read info into settings object + // read info into ServerInfo object buildInfo.open(); - QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); + ServerInfo::readBuildInfo(buildInfo.fileName()); buildInfo.close(); - RbSettings::setValue(RbSettings::DailyRevision,info.value("dailies/rev")); - QDate date = QDate::fromString(info.value("dailies/date").toString(), "yyyyMMdd"); - RbSettings::setValue(RbSettings::DailyDate,date.toString()); - - info.beginGroup("release"); - QStringList keys = info.allKeys(); - for(int i=0; i < keys.size(); i++) - { - RbSettings::setPlatformValue(keys[i],RbSettings::CurReleaseVersion,info.value(keys[i])); - } - info.endGroup(); - - info.beginGroup("status"); - keys = info.allKeys(); - for(int i=0; i < keys.size(); i++) - { - RbSettings::setPlatformValue(keys[i],RbSettings::CurStatus,info.value(keys[i])); - } - info.endGroup(); - //start bleeding info download bleeding = new HttpGet(this); @@ -240,12 +221,9 @@ } else { bleedingInfo.open(); - QSettings info(bleedingInfo.fileName(), QSettings::IniFormat, this); + ServerInfo::readBleedingInfo(bleedingInfo.fileName()); bleedingInfo.close(); - RbSettings::setValue(RbSettings::BleedingRevision,info.value("bleeding/rev")); - QDateTime date = QDateTime::fromString(info.value("bleeding/timestamp").toString(), "yyyyMMddThhmmssZ"); - RbSettings::setValue(RbSettings::BleedingDate,date.toString()); - + ui.statusbar->showMessage(tr("Download build information finished."), 5000); updateSettings(); m_gotInfo = true; @@ -376,14 +354,15 @@ // displayed device info QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); QString brand = RbSettings::value(RbSettings::CurBrand).toString(); - QString name = RbSettings::value(RbSettings::CurName).toString(); + QString name = RbSettings::value(RbSettings::CurName).toString() + + " (" + ServerInfo::value(ServerInfo::CurStatus).toString() + ")"; if(name.isEmpty()) name = "<none>"; if(mountpoint.isEmpty()) mountpoint = "<invalid>"; ui.labelDevice->setText(tr("%1 %2 at %3") .arg(brand, name, QDir::toNativeSeparators(mountpoint))); // hide quickstart buttons if no release available - bool installable = !RbSettings::value(RbSettings::CurReleaseVersion).toString().isEmpty(); + bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); ui.buttonSmall->setEnabled(installable); ui.buttonComplete->setEnabled(installable); ui.actionSmall_Installation->setEnabled(installable); @@ -426,7 +405,7 @@ "This will install Rockbox %1. To install the most recent " "development build available press \"Cancel\" and " "use the \"Installation\" tab.") - .arg(RbSettings::value(RbSettings::CurReleaseVersion).toString()), + .arg(ServerInfo::value(ServerInfo::CurReleaseVersion).toString()), QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) return; // create logger @@ -484,7 +463,7 @@ "This will install Rockbox %1. To install the most recent " "development build available press \"Cancel\" and " "use the \"Installation\" tab.") - .arg(RbSettings::value(RbSettings::CurReleaseVersion).toString()), + .arg(ServerInfo::value(ServerInfo::CurReleaseVersion).toString()), QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) return; @@ -558,7 +537,7 @@ { QString file = RbSettings::value(RbSettings::ReleaseUrl).toString(); file.replace("%MODEL%", RbSettings::value(RbSettings::CurBuildserverModel).toString()); - file.replace("%RELVERSION%", RbSettings::value(RbSettings::CurReleaseVersion).toString()); + file.replace("%RELVERSION%", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); // check installed Version and Target QString warning = check(false); @@ -615,7 +594,7 @@ ZipInstaller* installer = new ZipInstaller(this); installer->setUrl(file); installer->setLogSection("Rockbox (Base)"); - installer->setLogVersion(RbSettings::value(RbSettings::CurReleaseVersion).toString()); + installer->setLogVersion(ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); @@ -849,7 +828,7 @@ installer->setUrl(RbSettings::value(RbSettings::FontUrl).toString()); installer->setLogSection("Fonts"); - installer->setLogVersion(RbSettings::value(RbSettings::DailyDate).toString()); + installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); @@ -888,12 +867,12 @@ QString voiceurl = RbSettings::value(RbSettings::VoiceUrl).toString(); voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" + - RbSettings::value(RbSettings::DailyDate).toString() + "-english.zip"; + ServerInfo::value(ServerInfo::DailyDate).toString() + "-english.zip"; qDebug() << "[RbUtil] voicefile URL:" << voiceurl; installer->setUrl(voiceurl); installer->setLogSection("Voice"); - installer->setLogVersion(RbSettings::value(RbSettings::DailyDate).toString()); + installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); @@ -943,7 +922,7 @@ installer->setUrl(RbSettings::value(RbSettings::DoomUrl).toString()); installer->setLogSection("Game Addons"); - installer->setLogVersion(RbSettings::value(RbSettings::DailyDate).toString()); + installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); @@ -968,8 +947,6 @@ { if(chkConfig(true)) return; InstallTalkWindow *installWindow = new InstallTalkWindow(this); - - connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); installWindow->show(); @@ -980,7 +957,6 @@ if(chkConfig(true)) return; CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); - connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); installWindow->show(); } @@ -1062,7 +1038,7 @@ if(manual.isEmpty()) manual = "rockbox-" + RbSettings::value(RbSettings::Platform).toString(); - QString date = RbSettings::value(RbSettings::DailyDate).toString(); + QString date = ServerInfo::value(ServerInfo::DailyDate).toString(); QString manualurl; QString target; Index: rbutil/rbutilqt/rbutilqt.pro =================================================================== --- rbutil/rbutilqt/rbutilqt.pro (revision 24320) +++ rbutil/rbutilqt/rbutilqt.pro (working copy) @@ -97,6 +97,7 @@ base/voicefile.cpp \ createvoicewindow.cpp \ base/rbsettings.cpp \ + base/serverinfo.cpp \ base/rbunzip.cpp \ base/rbzip.cpp \ base/system.cpp \ @@ -158,6 +159,7 @@ base/voicefile.h \ createvoicewindow.h \ base/rbsettings.h \ + base/serverinfo.h \ base/rbunzip.h \ base/rbzip.h \ sysinfo.h \