diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:33:48 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:42:29 +0100 |
commit | be1be797b24acb5d78ad55502dd9bd7306482c0d (patch) | |
tree | 89b53978c457d63591a1d9238ed859b93c0cc10f /rbutil | |
parent | 2509def164ee7f4aecbe6a786df57140f19e35f2 (diff) | |
download | rockbox-be1be797b24acb5d78ad55502dd9bd7306482c0d.tar.gz rockbox-be1be797b24acb5d78ad55502dd9bd7306482c0d.zip |
rbutil: Rework player configuration.
Rename config entries and remove now unnecessary default value handling.
Change-Id: I5c60ef9769fc01f45f45290dafffb80c1962e674
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 72 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 24 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/talkgenerator.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 22 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 16 | ||||
-rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 2 |
14 files changed, 84 insertions, 88 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 7c69b3a59b..8c800607c3 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -108,7 +108,7 @@ void Autodetection::detectUsb() | |||
108 | LOG_WARNING() << "[USB] detected problem with player" << d.device; | 108 | LOG_WARNING() << "[USB] detected problem with player" << d.device; |
109 | } | 109 | } |
110 | QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0')); | 110 | QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0')); |
111 | if(!SystemInfo::platformValue(SystemInfo::CurName, idstring).toString().isEmpty()) { | 111 | if(!SystemInfo::platformValue(SystemInfo::Name, idstring).toString().isEmpty()) { |
112 | struct Detected d; | 112 | struct Detected d; |
113 | d.status = PlayerIncompatible; | 113 | d.status = PlayerIncompatible; |
114 | d.device = idstring; | 114 | d.device = idstring; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp index bd7ed6492d..013abb2f5e 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | |||
@@ -409,7 +409,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallS5l::installed(void) | |||
409 | + "/.rockbox/rbutil.log"; | 409 | + "/.rockbox/rbutil.log"; |
410 | QSettings s(logfile, QSettings::IniFormat, this); | 410 | QSettings s(logfile, QSettings::IniFormat, this); |
411 | QString section = SystemInfo::platformValue( | 411 | QString section = SystemInfo::platformValue( |
412 | SystemInfo::CurBootloaderName).toString().section('/', -1); | 412 | SystemInfo::BootloaderName).toString().section('/', -1); |
413 | rbblInstalled = s.contains("Bootloader/" + section); | 413 | rbblInstalled = s.contains("Bootloader/" + section); |
414 | 414 | ||
415 | if (rbblInstalled) { | 415 | if (rbblInstalled) { |
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 4167a8659c..512341b84c 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp | |||
@@ -194,7 +194,7 @@ QString RbSettings::constructSettingPath(QString path, QString substitute) | |||
194 | } | 194 | } |
195 | else { | 195 | else { |
196 | path.replace(":tts:", userSettings->value("tts").toString()); | 196 | path.replace(":tts:", userSettings->value("tts").toString()); |
197 | path.replace(":encoder:", SystemInfo::platformValue(SystemInfo::CurEncoder, platform).toString()); | 197 | path.replace(":encoder:", SystemInfo::platformValue(SystemInfo::Encoder, platform).toString()); |
198 | } | 198 | } |
199 | path.replace(":platform:", platform); | 199 | path.replace(":platform:", platform); |
200 | } | 200 | } |
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 505689847d..5a0719f375 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -136,9 +136,9 @@ void ServerInfo::readBuildInfo(QString file) | |||
136 | QString manualZipUrl = manualBaseUrl; | 136 | QString manualZipUrl = manualBaseUrl; |
137 | 137 | ||
138 | QString buildservermodel = SystemInfo::platformValue( | 138 | QString buildservermodel = SystemInfo::platformValue( |
139 | SystemInfo::CurBuildserverModel, platforms.at(i)).toString(); | 139 | SystemInfo::BuildserverModel, platforms.at(i)).toString(); |
140 | QString modelman = SystemInfo::platformValue( | 140 | QString modelman = SystemInfo::platformValue( |
141 | SystemInfo::CurManual, platforms.at(i)).toString(); | 141 | SystemInfo::Manual, platforms.at(i)).toString(); |
142 | QString manualBaseName = "rockbox-"; | 142 | QString manualBaseName = "rockbox-"; |
143 | 143 | ||
144 | if(modelman.isEmpty()) manualBaseName += buildservermodel; | 144 | if(modelman.isEmpty()) manualBaseName += buildservermodel; |
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index b12a437c34..7588521b09 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h | |||
@@ -49,8 +49,6 @@ class ServerInfo : public QObject | |||
49 | static QVariant platformValue(enum ServerInfos setting, QString platform = ""); | 49 | static QVariant platformValue(enum ServerInfos setting, QString platform = ""); |
50 | 50 | ||
51 | private: | 51 | private: |
52 | //! set a server info value | ||
53 | static void setValue(enum ServerInfos setting, QVariant value); | ||
54 | //! set a value for a server info for a named platform. | 52 | //! set a value for a server info for a named platform. |
55 | static void setPlatformValue(enum ServerInfos setting, QString platform, QVariant value); | 53 | static void setPlatformValue(enum ServerInfos setting, QString platform, QVariant value); |
56 | //! you shouldnt call this, its a fully static class | 54 | //! you shouldnt call this, its a fully static class |
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index c9e29a8325..d14c3f5436 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -26,29 +26,28 @@ | |||
26 | const static struct { | 26 | const static struct { |
27 | SystemInfo::SystemInfos info; | 27 | SystemInfo::SystemInfos info; |
28 | const char* name; | 28 | const char* name; |
29 | const char* def; | ||
30 | } SystemInfosList[] = { | 29 | } SystemInfosList[] = { |
31 | { SystemInfo::ManualUrl, "manual_url", "" }, | 30 | { SystemInfo::ManualUrl, "manual_url" }, |
32 | { SystemInfo::BleedingUrl, "bleeding_url", "" }, | 31 | { SystemInfo::BleedingUrl, "bleeding_url" }, |
33 | { SystemInfo::BootloaderUrl, "bootloader_url", "" }, | 32 | { SystemInfo::BootloaderUrl, "bootloader_url" }, |
34 | { SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" }, | 33 | { SystemInfo::BootloaderInfoUrl, "bootloader_info_url" }, |
35 | { SystemInfo::ReleaseFontUrl, "release_font_url", "" }, | 34 | { SystemInfo::ReleaseFontUrl, "release_font_url" }, |
36 | { SystemInfo::DailyFontUrl, "daily_font_url", "" }, | 35 | { SystemInfo::DailyFontUrl, "daily_font_url" }, |
37 | { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" }, | 36 | { SystemInfo::DailyVoiceUrl, "daily_voice_url" }, |
38 | { SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" }, | 37 | { SystemInfo::ReleaseVoiceUrl, "release_voice_url" }, |
39 | { SystemInfo::DoomUrl, "doom_url", "" }, | 38 | { SystemInfo::DoomUrl, "doom_url" }, |
40 | { SystemInfo::Duke3DUrl, "duke3d_url", "" }, | 39 | { SystemInfo::Duke3DUrl, "duke3d_url" }, |
41 | { SystemInfo::PuzzFontsUrl, "puzzfonts_url", "" }, | 40 | { SystemInfo::PuzzFontsUrl, "puzzfonts_url" }, |
42 | { SystemInfo::QuakeUrl, "quake_url", "" }, | 41 | { SystemInfo::QuakeUrl, "quake_url" }, |
43 | { SystemInfo::Wolf3DUrl, "wolf3d_url", "" }, | 42 | { SystemInfo::Wolf3DUrl, "wolf3d_url" }, |
44 | { SystemInfo::XWorldUrl, "xworld_url", "" }, | 43 | { SystemInfo::XWorldUrl, "xworld_url" }, |
45 | { SystemInfo::ReleaseUrl, "release_url", "" }, | 44 | { SystemInfo::ReleaseUrl, "release_url" }, |
46 | { SystemInfo::DailyUrl, "daily_url", "" }, | 45 | { SystemInfo::DailyUrl, "daily_url" }, |
47 | { SystemInfo::BuildInfoUrl, "build_info_url", "" }, | 46 | { SystemInfo::BuildInfoUrl, "build_info_url" }, |
48 | { SystemInfo::GenlangUrl, "genlang_url", "" }, | 47 | { SystemInfo::GenlangUrl, "genlang_url" }, |
49 | { SystemInfo::ThemesUrl, "themes_url", "" }, | 48 | { SystemInfo::ThemesUrl, "themes_url" }, |
50 | { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, | 49 | { SystemInfo::ThemesInfoUrl, "themes_info_url" }, |
51 | { SystemInfo::RbutilUrl, "rbutil_url", "" }, | 50 | { SystemInfo::RbutilUrl, "rbutil_url" }, |
52 | }; | 51 | }; |
53 | 52 | ||
54 | const static struct { | 53 | const static struct { |
@@ -56,18 +55,18 @@ const static struct { | |||
56 | const char* name; | 55 | const char* name; |
57 | const char* def; | 56 | const char* def; |
58 | } PlatformInfosList[] = { | 57 | } PlatformInfosList[] = { |
59 | { SystemInfo::CurPlatformName, ":platform:/name", "" }, | 58 | { SystemInfo::PlatformName, ":platform:/name", "" }, |
60 | { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, | 59 | { SystemInfo::Manual, ":platform:/manualname","rockbox-:platform:" }, |
61 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, | 60 | { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" }, |
62 | { SystemInfo::CurBootloaderName, ":platform:/bootloadername", "" }, | 61 | { SystemInfo::BootloaderName, ":platform:/bootloadername", "" }, |
63 | { SystemInfo::CurBootloaderFile, ":platform:/bootloaderfile", "" }, | 62 | { SystemInfo::BootloaderFile, ":platform:/bootloaderfile", "" }, |
64 | { SystemInfo::CurBootloaderFilter, ":platform:/bootloaderfilter", "" }, | 63 | { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" }, |
65 | { SystemInfo::CurEncoder, ":platform:/encoder", "" }, | 64 | { SystemInfo::Encoder, ":platform:/encoder", "" }, |
66 | { SystemInfo::CurBrand, ":platform:/brand", "" }, | 65 | { SystemInfo::Brand, ":platform:/brand", "" }, |
67 | { SystemInfo::CurName, ":platform:/name", "" }, | 66 | { SystemInfo::Name, ":platform:/name", "" }, |
68 | { SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, | 67 | { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" }, |
69 | { SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" }, | 68 | { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" }, |
70 | { SystemInfo::CurPlayerPicture, ":platform:/playerpic", "" }, | 69 | { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, |
71 | }; | 70 | }; |
72 | 71 | ||
73 | //! pointer to setting object to NULL | 72 | //! pointer to setting object to NULL |
@@ -93,9 +92,8 @@ QVariant SystemInfo::value(enum SystemInfos info) | |||
93 | while(SystemInfosList[i].info != info) | 92 | while(SystemInfosList[i].info != info) |
94 | i++; | 93 | i++; |
95 | QString s = SystemInfosList[i].name; | 94 | QString s = SystemInfosList[i].name; |
96 | QString d = SystemInfosList[i].def; | 95 | LOG_INFO() << "GET:" << s << systemInfos->value(s).toString(); |
97 | LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString(); | 96 | return systemInfos->value(s); |
98 | return systemInfos->value(s, d); | ||
99 | } | 97 | } |
100 | 98 | ||
101 | QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform) | 99 | QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform) |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index b5380f1af5..52b50ec4d7 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -60,18 +60,18 @@ class SystemInfo : public QObject | |||
60 | }; | 60 | }; |
61 | 61 | ||
62 | enum PlatformInfo { | 62 | enum PlatformInfo { |
63 | CurPlatformName, | 63 | PlatformName, |
64 | CurManual, | 64 | Manual, |
65 | CurBootloaderMethod, | 65 | BootloaderMethod, |
66 | CurBootloaderName, | 66 | BootloaderName, |
67 | CurBootloaderFile, | 67 | BootloaderFile, |
68 | CurBootloaderFilter, | 68 | BootloaderFilter, |
69 | CurEncoder, | 69 | Encoder, |
70 | CurBrand, | 70 | Brand, |
71 | CurName, | 71 | Name, |
72 | CurBuildserverModel, | 72 | BuildserverModel, |
73 | CurConfigureModel, | 73 | ConfigureModel, |
74 | CurPlayerPicture, | 74 | PlayerPicture, |
75 | }; | 75 | }; |
76 | 76 | ||
77 | enum PlatformType { | 77 | enum PlatformType { |
diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/rbutil/rbutilqt/base/talkgenerator.cpp index ee57686037..951bf0e804 100644 --- a/rbutil/rbutilqt/base/talkgenerator.cpp +++ b/rbutil/rbutilqt/base/talkgenerator.cpp | |||
@@ -57,7 +57,7 @@ TalkGenerator::Status TalkGenerator::process(QList<TalkEntry>* list,int wavtrimt | |||
57 | // Encoder | 57 | // Encoder |
58 | emit logItem(tr("Starting Encoder Engine"),LOGINFO); | 58 | emit logItem(tr("Starting Encoder Engine"),LOGINFO); |
59 | m_enc = EncoderBase::getEncoder( | 59 | m_enc = EncoderBase::getEncoder( |
60 | this, SystemInfo::platformValue(SystemInfo::CurEncoder).toString()); | 60 | this, SystemInfo::platformValue(SystemInfo::Encoder).toString()); |
61 | if(!m_enc->start()) | 61 | if(!m_enc->start()) |
62 | { | 62 | { |
63 | emit logItem(tr("Init of Encoder engine failed"),LOGERROR); | 63 | emit logItem(tr("Init of Encoder engine failed"),LOGERROR); |
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index a3a3e98fcc..60b55068e1 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -381,12 +381,12 @@ QString Utils::checkEnvironment(bool permission) | |||
381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); | 381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); |
382 | QString installed = rbinfo.target(); | 382 | QString installed = rbinfo.target(); |
383 | if(!installed.isEmpty() && installed != | 383 | if(!installed.isEmpty() && installed != |
384 | SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()) | 384 | SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()) |
385 | { | 385 | { |
386 | text += tr("<li>Target mismatch detected.<br/>" | 386 | text += tr("<li>Target mismatch detected.<br/>" |
387 | "Installed target: %1<br/>Selected target: %2.</li>") | 387 | "Installed target: %1<br/>Selected target: %2.</li>") |
388 | .arg(SystemInfo::platformValue(SystemInfo::CurPlatformName, installed).toString(), | 388 | .arg(SystemInfo::platformValue(SystemInfo::PlatformName, installed).toString(), |
389 | SystemInfo::platformValue(SystemInfo::CurPlatformName).toString()); | 389 | SystemInfo::platformValue(SystemInfo::PlatformName).toString()); |
390 | } | 390 | } |
391 | 391 | ||
392 | if(!text.isEmpty()) | 392 | if(!text.isEmpty()) |
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 182001e3b8..d18f438801 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -356,7 +356,7 @@ void Config::setDevices() | |||
356 | for(int it = 0; it < platformList.size(); it++) | 356 | for(int it = 0; it < platformList.size(); it++) |
357 | { | 357 | { |
358 | QString curbrand = SystemInfo::platformValue( | 358 | QString curbrand = SystemInfo::platformValue( |
359 | SystemInfo::CurBrand, platformList.at(it)).toString(); | 359 | SystemInfo::Brand, platformList.at(it)).toString(); |
360 | manuf.insert(curbrand, platformList.at(it)); | 360 | manuf.insert(curbrand, platformList.at(it)); |
361 | } | 361 | } |
362 | 362 | ||
@@ -385,7 +385,7 @@ void Config::setDevices() | |||
385 | continue; | 385 | continue; |
386 | // construct display name | 386 | // construct display name |
387 | QString curname = SystemInfo::platformValue( | 387 | QString curname = SystemInfo::platformValue( |
388 | SystemInfo::CurName, platformList.at(it)).toString() + | 388 | SystemInfo::Name, platformList.at(it)).toString() + |
389 | " (" +ServerInfo::platformValue( | 389 | " (" +ServerInfo::platformValue( |
390 | ServerInfo::CurStatus, platformList.at(it)).toString() +")"; | 390 | ServerInfo::CurStatus, platformList.at(it)).toString() +")"; |
391 | LOG_INFO() << "add supported device:" << brands.at(c) << curname; | 391 | LOG_INFO() << "add supported device:" << brands.at(c) << curname; |
@@ -472,9 +472,9 @@ void Config::updateEncState() | |||
472 | 472 | ||
473 | QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); | 473 | QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); |
474 | QString encoder = SystemInfo::platformValue( | 474 | QString encoder = SystemInfo::platformValue( |
475 | SystemInfo::CurEncoder, devname).toString(); | 475 | SystemInfo::Encoder, devname).toString(); |
476 | ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( | 476 | ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( |
477 | SystemInfo::CurEncoder, devname).toString())); | 477 | SystemInfo::Encoder, devname).toString())); |
478 | 478 | ||
479 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); | 479 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); |
480 | 480 | ||
@@ -743,7 +743,7 @@ void Config::autodetect() | |||
743 | } | 743 | } |
744 | msg += QString("<li>%1</li>").arg(tr("%1 at %2").arg( | 744 | msg += QString("<li>%1</li>").arg(tr("%1 at %2").arg( |
745 | SystemInfo::platformValue( | 745 | SystemInfo::platformValue( |
746 | SystemInfo::CurPlatformName, detected.at(i).device).toString(), | 746 | SystemInfo::PlatformName, detected.at(i).device).toString(), |
747 | QDir::toNativeSeparators(mp))); | 747 | QDir::toNativeSeparators(mp))); |
748 | } | 748 | } |
749 | msg += "</ul>"; | 749 | msg += "</ul>"; |
@@ -769,21 +769,21 @@ void Config::autodetect() | |||
769 | msg += tr("Detected an unsupported player:\n%1\n" | 769 | msg += tr("Detected an unsupported player:\n%1\n" |
770 | "Sorry, Rockbox doesn't run on your player.") | 770 | "Sorry, Rockbox doesn't run on your player.") |
771 | .arg(SystemInfo::platformValue( | 771 | .arg(SystemInfo::platformValue( |
772 | SystemInfo::CurName, detected.at(0).device).toString()); | 772 | SystemInfo::Name, detected.at(0).device).toString()); |
773 | break; | 773 | break; |
774 | case Autodetection::PlayerMtpMode: | 774 | case Autodetection::PlayerMtpMode: |
775 | msg = tr("%1 in MTP mode found!\n" | 775 | msg = tr("%1 in MTP mode found!\n" |
776 | "You need to change your player to MSC mode for installation. ") | 776 | "You need to change your player to MSC mode for installation. ") |
777 | .arg(SystemInfo::platformValue( | 777 | .arg(SystemInfo::platformValue( |
778 | SystemInfo::CurName, detected.at(0).device).toString()); | 778 | SystemInfo::Name, detected.at(0).device).toString()); |
779 | break; | 779 | break; |
780 | case Autodetection::PlayerWrongFilesystem: | 780 | case Autodetection::PlayerWrongFilesystem: |
781 | if(SystemInfo::platformValue( | 781 | if(SystemInfo::platformValue( |
782 | SystemInfo::CurBootloaderMethod, detected.at(0).device) == "ipod") { | 782 | SystemInfo::BootloaderMethod, detected.at(0).device) == "ipod") { |
783 | msg = tr("%1 \"MacPod\" found!\n" | 783 | msg = tr("%1 \"MacPod\" found!\n" |
784 | "Rockbox needs a FAT formatted Ipod (so-called \"WinPod\") " | 784 | "Rockbox needs a FAT formatted Ipod (so-called \"WinPod\") " |
785 | "to run. ").arg(SystemInfo::platformValue( | 785 | "to run. ").arg(SystemInfo::platformValue( |
786 | SystemInfo::CurName, detected.at(0).device).toString()); | 786 | SystemInfo::Name, detected.at(0).device).toString()); |
787 | } | 787 | } |
788 | else { | 788 | else { |
789 | msg = tr("The player contains an incompatible filesystem.\n" | 789 | msg = tr("The player contains an incompatible filesystem.\n" |
@@ -963,9 +963,9 @@ void Config::configEnc() | |||
963 | 963 | ||
964 | QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); | 964 | QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); |
965 | QString encoder = SystemInfo::platformValue( | 965 | QString encoder = SystemInfo::platformValue( |
966 | SystemInfo::CurEncoder, devname).toString(); | 966 | SystemInfo::Encoder, devname).toString(); |
967 | ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( | 967 | ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( |
968 | SystemInfo::CurEncoder, devname).toString())); | 968 | SystemInfo::Encoder, devname).toString())); |
969 | 969 | ||
970 | 970 | ||
971 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); | 971 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); |
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 23adc3cf46..063facf3a1 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp | |||
@@ -65,9 +65,9 @@ void ManualWidget::downloadManual(void) | |||
65 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { | 65 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | QString manual = SystemInfo::platformValue(SystemInfo::CurManual).toString(); | 68 | QString manual = SystemInfo::platformValue(SystemInfo::Manual).toString(); |
69 | if(manual.isEmpty()) { | 69 | if(manual.isEmpty()) { |
70 | manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::CurBuildserverModel).toString(); | 70 | manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::BuildserverModel).toString(); |
71 | } | 71 | } |
72 | 72 | ||
73 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); | 73 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 5baf774fc3..065a139436 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -82,7 +82,7 @@ void SelectiveInstallWidget::updateVersion(void) | |||
82 | m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 82 | m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
83 | m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); | 83 | m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); |
84 | m_blmethod = SystemInfo::platformValue( | 84 | m_blmethod = SystemInfo::platformValue( |
85 | SystemInfo::CurBootloaderMethod, m_target).toString(); | 85 | SystemInfo::BootloaderMethod, m_target).toString(); |
86 | 86 | ||
87 | if(m_logger != NULL) { | 87 | if(m_logger != NULL) { |
88 | delete m_logger; | 88 | delete m_logger; |
@@ -237,7 +237,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
237 | // create installer | 237 | // create installer |
238 | BootloaderInstallBase *bl = | 238 | BootloaderInstallBase *bl = |
239 | BootloaderInstallHelper::createBootloaderInstaller(this, | 239 | BootloaderInstallHelper::createBootloaderInstaller(this, |
240 | SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); | 240 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); |
241 | if(bl == NULL) { | 241 | if(bl == NULL) { |
242 | m_logger->addItem(tr("No install method known."), LOGERROR); | 242 | m_logger->addItem(tr("No install method known."), LOGERROR); |
243 | m_logger->setFinished(); | 243 | m_logger->setFinished(); |
@@ -254,7 +254,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
254 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 254 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
255 | 255 | ||
256 | // set bootloader filename. Do this now as installed() needs it. | 256 | // set bootloader filename. Do this now as installed() needs it. |
257 | QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); | 257 | QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).toStringList(); |
258 | QStringList blfilepath; | 258 | QStringList blfilepath; |
259 | for(int a = 0; a < blfile.size(); a++) { | 259 | for(int a = 0; a < blfile.size(); a++) { |
260 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() | 260 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() |
@@ -262,7 +262,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
262 | } | 262 | } |
263 | bl->setBlFile(blfilepath); | 263 | bl->setBlFile(blfilepath); |
264 | QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() | 264 | QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() |
265 | + SystemInfo::platformValue(SystemInfo::CurBootloaderName).toString()); | 265 | + SystemInfo::platformValue(SystemInfo::BootloaderName).toString()); |
266 | bl->setBlUrl(url); | 266 | bl->setBlUrl(url); |
267 | bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() | 267 | bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() |
268 | + "/.rockbox/rbutil.log"); | 268 | + "/.rockbox/rbutil.log"); |
@@ -282,7 +282,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
282 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther | 282 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther |
283 | && bl->capabilities() & BootloaderInstallBase::Backup) | 283 | && bl->capabilities() & BootloaderInstallBase::Backup) |
284 | { | 284 | { |
285 | QString targetFolder = SystemInfo::platformValue(SystemInfo::CurPlatformName).toString() | 285 | QString targetFolder = SystemInfo::platformValue(SystemInfo::PlatformName).toString() |
286 | + " Firmware Backup"; | 286 | + " Firmware Backup"; |
287 | // remove invalid character(s) | 287 | // remove invalid character(s) |
288 | targetFolder.remove(QRegExp("[:/]")); | 288 | targetFolder.remove(QRegExp("[:/]")); |
@@ -319,7 +319,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
319 | // open dialog to browse to of file | 319 | // open dialog to browse to of file |
320 | QString offile; | 320 | QString offile; |
321 | QString filter | 321 | QString filter |
322 | = SystemInfo::platformValue(SystemInfo::CurBootloaderFilter).toString(); | 322 | = SystemInfo::platformValue(SystemInfo::BootloaderFilter).toString(); |
323 | if(!filter.isEmpty()) { | 323 | if(!filter.isEmpty()) { |
324 | filter = tr("Bootloader files (%1)").arg(filter) + ";;"; | 324 | filter = tr("Bootloader files (%1)").arg(filter) + ";;"; |
325 | } | 325 | } |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 6f8bfb37af..ae28ee4e70 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -390,11 +390,11 @@ void RbUtilQt::updateDevice() | |||
390 | 390 | ||
391 | /* Enable bootloader installation, if possible */ | 391 | /* Enable bootloader installation, if possible */ |
392 | bool bootloaderInstallable = | 392 | bool bootloaderInstallable = |
393 | SystemInfo::platformValue(SystemInfo::CurBootloaderMethod) != "none"; | 393 | SystemInfo::platformValue(SystemInfo::BootloaderMethod) != "none"; |
394 | 394 | ||
395 | /* Enable bootloader uninstallation, if possible */ | 395 | /* Enable bootloader uninstallation, if possible */ |
396 | bool bootloaderUninstallable = bootloaderInstallable && | 396 | bool bootloaderUninstallable = bootloaderInstallable && |
397 | SystemInfo::platformValue(SystemInfo::CurBootloaderMethod) != "fwpatcher"; | 397 | SystemInfo::platformValue(SystemInfo::BootloaderMethod) != "fwpatcher"; |
398 | ui.labelRemoveBootloader->setEnabled(bootloaderUninstallable); | 398 | ui.labelRemoveBootloader->setEnabled(bootloaderUninstallable); |
399 | ui.buttonRemoveBootloader->setEnabled(bootloaderUninstallable); | 399 | ui.buttonRemoveBootloader->setEnabled(bootloaderUninstallable); |
400 | ui.actionRemove_bootloader->setEnabled(bootloaderUninstallable); | 400 | ui.actionRemove_bootloader->setEnabled(bootloaderUninstallable); |
@@ -405,9 +405,9 @@ void RbUtilQt::updateDevice() | |||
405 | ui.menuA_ctions->setEnabled(configurationValid); | 405 | ui.menuA_ctions->setEnabled(configurationValid); |
406 | 406 | ||
407 | // displayed device info | 407 | // displayed device info |
408 | QString brand = SystemInfo::platformValue(SystemInfo::CurBrand).toString(); | 408 | QString brand = SystemInfo::platformValue(SystemInfo::Brand).toString(); |
409 | QString name | 409 | QString name |
410 | = QString("%1 (%2)").arg(SystemInfo::platformValue(SystemInfo::CurName).toString(), | 410 | = QString("%1 (%2)").arg(SystemInfo::platformValue(SystemInfo::Name).toString(), |
411 | ServerInfo::platformValue(ServerInfo::CurStatus).toString()); | 411 | ServerInfo::platformValue(ServerInfo::CurStatus).toString()); |
412 | ui.labelDevice->setText(QString("<b>%1 %2</b>").arg(brand, name)); | 412 | ui.labelDevice->setText(QString("<b>%1 %2</b>").arg(brand, name)); |
413 | 413 | ||
@@ -423,7 +423,7 @@ void RbUtilQt::updateDevice() | |||
423 | } | 423 | } |
424 | 424 | ||
425 | QPixmap pm; | 425 | QPixmap pm; |
426 | QString m = SystemInfo::platformValue(SystemInfo::CurPlayerPicture).toString(); | 426 | QString m = SystemInfo::platformValue(SystemInfo::PlayerPicture).toString(); |
427 | pm.load(":/icons/players/" + m + "-small.png"); | 427 | pm.load(":/icons/players/" + m + "-small.png"); |
428 | pm = pm.scaledToHeight(QFontMetrics(QApplication::font()).height() * 3); | 428 | pm = pm.scaledToHeight(QFontMetrics(QApplication::font()).height() * 3); |
429 | ui.labelPlayerPic->setPixmap(pm); | 429 | ui.labelPlayerPic->setPixmap(pm); |
@@ -491,7 +491,7 @@ void RbUtilQt::installVoice() | |||
491 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) | 491 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) |
492 | return; | 492 | return; |
493 | 493 | ||
494 | QString model = SystemInfo::platformValue(SystemInfo::CurBuildserverModel).toString(); | 494 | QString model = SystemInfo::platformValue(SystemInfo::BuildserverModel).toString(); |
495 | // replace placeholder in voice url | 495 | // replace placeholder in voice url |
496 | voiceurl.replace("%MODEL%", model); | 496 | voiceurl.replace("%MODEL%", model); |
497 | voiceurl.replace("%RELVERSION%", relversion); | 497 | voiceurl.replace("%RELVERSION%", relversion); |
@@ -560,14 +560,14 @@ void RbUtilQt::uninstallBootloader(void) | |||
560 | // create installer | 560 | // create installer |
561 | BootloaderInstallBase *bl | 561 | BootloaderInstallBase *bl |
562 | = BootloaderInstallHelper::createBootloaderInstaller(this, | 562 | = BootloaderInstallHelper::createBootloaderInstaller(this, |
563 | SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); | 563 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); |
564 | 564 | ||
565 | if(bl == NULL) { | 565 | if(bl == NULL) { |
566 | logger->addItem(tr("No uninstall method for this target known."), LOGERROR); | 566 | logger->addItem(tr("No uninstall method for this target known."), LOGERROR); |
567 | logger->setFinished(); | 567 | logger->setFinished(); |
568 | return; | 568 | return; |
569 | } | 569 | } |
570 | QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); | 570 | QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).toStringList(); |
571 | QStringList blfilepath; | 571 | QStringList blfilepath; |
572 | for(int a = 0; a < blfile.size(); a++) { | 572 | for(int a = 0; a < blfile.size(); a++) { |
573 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() | 573 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() |
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 1377607438..6ad7c9bcae 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -86,7 +86,7 @@ void ThemesInstallWindow::downloadInfo() | |||
86 | 86 | ||
87 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); | 87 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); |
88 | infoUrl.replace("%TARGET%", | 88 | infoUrl.replace("%TARGET%", |
89 | SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()); | 89 | SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()); |
90 | infoUrl.replace("%REVISION%", installInfo.revision()); | 90 | infoUrl.replace("%REVISION%", installInfo.revision()); |
91 | infoUrl.replace("%RELEASE%", installInfo.release()); | 91 | infoUrl.replace("%RELEASE%", installInfo.release()); |
92 | infoUrl.replace("%RBUTILVER%", VERSION); | 92 | infoUrl.replace("%RBUTILVER%", VERSION); |