Commit graph

263 commits

Author SHA1 Message Date
Dominik Riebeling
a455f5901a Fix nano2g bootloader uninstallation.
Check the correct image when looking for the Ipod firmware version. On nano2g
this is a different image.

Change-Id: Ic7981363399d44e03247a81277522bc1d271090a
2012-07-01 12:34:59 +02:00
Dominik Riebeling
fa17cb904c Rework Installation and remove Quick Start tab.
The Quick Start tab turned out to be used a lot but not explaining what its
functionality actually does, leading to various amount of confusion. The Quick
Start tab and its functionality have been completely removed.

As replacement the reworked Installation tab now includes both the entries from
the old Installation tab (Bootloader and Rockbox) and the Extras tab (Fonts,
Themes, Game files). Each of the items can be enabled or disabled individually,
and the selection is saved in the configuration. The only exception is the
bootloader option, since installing the bootloader is only needed once. To help
with this the bootloader checkbox is automatically enabled if no Rockbox
installation is found, and disabled if one is found. While it would be nicer to
check if the bootloader is actually installed this is not possible for various
players so the implementation simply relies on a Rockbox installation.

This should also make it much easier to update an existing installation.

Current limitations:
- the selected themes are not saved.
- it is not possible to detect if the target has the plugins that require
  additional game files prior to installation. Thus the "Game files" option is
  available for all targets but simply skipped if the plugins are not found.

Change-Id: I1929bb7045e382fcbba431cca057d3121607d3a9
2012-06-26 20:11:41 +02:00
Dominik Riebeling
f419128a6b Show player picture left of device configuration.
After shrinking the size of the Rockbox logo shown and making the selected
device display two lines there is now enough room to also show an icon of the
player. The icon is scaled depending on the application font size, so for
setups configured with a larger font it still should show up in a reasonable
size.

Change-Id: I8f62f3292c62f820309157db73741b57fd6371ef
2012-06-26 18:30:27 +02:00
Dominik Riebeling
362f447ede Create dedicated backup dialog.
The "Installation" dialog allows backing up the current installation by
creating a zip file from the .rockbox folder since quite a while. However, this
has the drawback that you need to update your build to create a backup, but
creating a backup might be desireable in other cases as well (before updating
themes, or just for backup reasons). Since the functionality is somewhat hidden
it's also not obvious to users such a functionality exists (most users are
likely to use the "Quick Start" instead).

Implement backup functionality as dedicated dialog placed on the Uninstall tab.
Rename the Uninstall tab to accommodate this.

Change-Id: I1d2c6c8f646672d1b66bb442408fbfc2eeec700d
2012-06-26 18:30:27 +02:00
Dominik Riebeling
388014567f Add missing class name to System Trace log.
To identify the source for System Trace entries qDebug() calls usually add the
class name at the beginning. Add some missing ones and remove some trailing
spaces.

Change-Id: I3179bb206e96de8b5a1c05c0fc0958936e4513f3
2012-06-25 00:04:44 +02:00
Dominik Riebeling
e359202aa1 Fix bootloader zip extraction filename case sensitivity.
When searching for the bootloader file in a zip archive the filename in the
archive might use a different casing than the one we're looking after. Make the
search case-insensitive to not fail to find the file in this case.

Change-Id: I05ffc67421e67fae045eabb7851cd99a3757b6d7
2012-06-23 12:10:56 +02:00
Dominik Riebeling
4f4e1d1f0e Move constructing manual URL to ServerInfo class.
Change-Id: I4d2605b2389b4378e8311fc82057974e0eb238e6
2012-06-18 23:18:32 +02:00
Dominik Riebeling
9760d4155f Make ServerInfo parsing slightly more robust.
- Don't assume the list of release targets to be the same as the list of
  release-candidate targets.
- Don't try to construct a download URL for releases with an empty release
  version.

Change-Id: Icc3098a9db9e3d00261c32f4b9c2999ecc716380
2012-06-17 13:02:22 +02:00
Dominik Riebeling
a3d9ace41e Support release-candidate entry format for releases.
The release-candiate entries provide both version and URL instead of only a
version entry and requiring the URL to be constructed separately. Since it's
easy to identify the format support both for release entries for improved
flexibility -- if the server URLs ever change the server only needs to get
updated to use the extended format.

Change-Id: If5c669b72d7acd6ac648c5f42dd844ae36904df6
2012-06-17 11:25:11 +02:00
Dominik Riebeling
d3ddad95be Read release candidate information from build-info.
Change-Id: I73ac0922f25dd247588f945eba1e78f4026d747d
2012-06-17 11:21:04 +02:00
Dominik Riebeling
94555a0b08 Move download URL construction to ServerInfo.
Centralize creating the URLs so it's not duplicated in two places. This also
allows to change the representation on the server more easily, since it only
requires changes in one place.

Currently only changes URLs for Rockbox builds.

Change-Id: I87277cd61f8b164bdbcd914c9873d674661a786c
2012-06-17 10:30:19 +02:00
Dominik Riebeling
537dfe482f Save all settings in talkfile dialog.
Save settings that haven't been and rename the configuration file value for the
talked folder. Since the folder was replaced with a list we can't use the old
value anymore so there's no need to keep a name that's not really suitable
anymore.

Solves FS#12634.

Change-Id: I8db2a536409b94c45f28db9418a11f11f57dfacb
2012-06-14 22:54:30 +02:00
Dominik Riebeling
da08e5059a Talkfile: show folder to talk.
Currently it's not possible to pass multiple folders for talking. Show the
folder to talk to give a useful feedback when calling it multiple times.

Change-Id: I0f3d1014ee3867cc81122e485fc36353ec0f55ff
2012-06-13 23:01:57 +02:00
Dominik Riebeling
4ea3f9ff2a Move include to proper place and do some code police.
Change-Id: I74a32e44ead18651a22a3a5038415808cbde6c39
2012-06-12 20:11:20 +02:00
Dominik Riebeling
14ffde1239 flite: indicate end of options on command line.
As with espeak, a string starting with - is wrongly interpreted as command line
option. Explicitly end options using -- to fix this.

Change-Id: I47b2f1c4ba236638b1f625e5bcf3262f47071c9c
2012-06-10 18:20:39 +02:00
Dominik Riebeling
900cf6d52b Rockbox Utility: support reading voice strings from target.
If the Rockbox installation has voice strings included use them when generating
voice files. Fall back to querying the server if no voice strings are found or
the found strings are incompatible.

Change-Id: I9883829ab1757e55b1da9a434221a8dbfc702dd4
2012-06-09 23:39:57 +02:00
Dominik Riebeling
551ea5eaa4 espeak: indicate end of options.
When calling espeak via command line explicitly indicate the end of options.
Fixes the voice string "-inf" getting recognized as unrecognized command line
option, breaking speaking.

Change-Id: I4d1be2e6c8ae23a72028919593c5a94990333a9c
2012-06-09 23:36:24 +02:00
Dominik Riebeling
1e2c6506fb Fix crash in mkimxboot bootloader installation.
mkimxboot requires passing a structure which got extended with another field.
This wasn't adjusted in Rockbox Utility, causing an out of bound access to an
array, which results in a segfault.

Change-Id: I0252849ed0b41f1d8804537c053debc9b0ecd08d
2012-06-09 22:08:54 +02:00
Dominik Riebeling
b2380b535e voicefont: make format version a parameter.
Make hardcoded format version a parameter to allow adjusting depending on the
installed Rockbox version. Rockbox Utility will read the version from the
installed version. Since the command line voicefont tool is only intended for
use in the current tree it uses a fixed version.

Change-Id: I1ec935d47c71961e93b3c6bc6c5d816cd9fc83ff
2012-06-05 23:24:54 +02:00
Dominik Riebeling
f4b0e316c3 Update for single build-info file.
The server now provides a single build-info file (instead of two separate ones
for development builds and stable releases). Update to use the new file, since
it simplifies things.

Change-Id: If3b949f4d78eecb54e47622da887f51005f6d155
2012-06-03 00:50:01 +02:00
Dominik Riebeling
f494c3c325 ZipUtil: check zip file external attributes for folder.
Folders in a zip file usually but not necessarily have their filename ending
with a slash. In these cases recognizing a folder entry by the last character
fails. Check the external attributes as well, which also contain the FAT file
attributes.

Change-Id: I81b039b3774b803b2b528bc83846aafd208e5571
2012-05-31 20:44:45 +02:00
Dominik Riebeling
112b80b0c2 VoiceCreator: Factor out creation to separate function.
Change-Id: I83d1a08745acc88aa673d07e469a0a854ef97050
2012-05-27 22:57:17 +02:00
Dominik Riebeling
042314b440 Remove leftover debugging output.
Change-Id: Ifcc34224e7ee7703d8b7290e308dc4b116050a2a
2012-05-25 23:15:11 +02:00
Dominik Riebeling
9b5d6679b8 Use full version string for voicefile version.
Change-Id: If9a179b0fcb707efb32590c8914eccdb81ee27df
2012-05-23 22:59:56 +02:00
Dominik Riebeling
6de59442a5 Use Rockbox version for created voicefile version.
Instead of using the date the voice file was created use the version of Rockbox
the voice file was created for. That way it is possible to see from the
installation log if the installed voice matches the current Rockbox version.

Change-Id: I9fd7d40d718febafbc20579f049b9b94cfa5d573
2012-05-23 22:48:09 +02:00
Dominik Riebeling
968448c9cd ZipIntaller: use file timestamp if version string is missing.
Instead of using some arbitrary and not really useful string use the timestamp
of the downloaded file if version string is provided by the caller. This also
makes it possible to check if the downloaded file is actually a different one.

Use it for manual and game file downloads, as this gives more reasonable values
than using the date transmitted for daily (archived) build and as support for
archived builds will be removed shortly.

Change-Id: I0c751fabe7bb516edca93a5f73f077a611d4ef87
2012-05-23 21:10:38 +02:00
Dominik Riebeling
733eb9af40 Show nicer language names in voice creation dialog.
Instead of showing the internal language names show some more human friendly
string. Currently only applies to the voice creation dialog, the language
configuration dialog needs further adjustments to support display strings
differing from values.

Change-Id: Ic94838f1079c1d09a666d7dbd9682c577f686b3f
2012-05-19 16:52:58 +02:00
Dominik Riebeling
45782df278 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
2012-05-19 16:37:45 +02:00
Dominik Riebeling
4b5348ba04 Don't try to resolve an empty path.
An empty path is not resolvable, so immediately return an empty result. Fixes
an empty path resolve to "/" on Linux / OS X.

Change-Id: I22c26a7716becbf46850a04e18ee581084546263
2012-05-11 22:07:34 +02:00
Dominik Riebeling
9b363c6ced Bootloader installation: set file filter.
When requesting an original firmware file from the user set the filter for the
file chooser dialog to only show files with matching file extension to simplify
selection. Allow the user to select "all files" in case the file for whatever
reason has the wrong extension.

Change-Id: Ic3643c3601f6d849e6563f8753ae80a168ec0a45
2012-05-01 10:49:48 +02:00
Dominik Riebeling
92ef7bd328 Move bootloader class initialiation into helper.
Create a BootloaderInstallHelper class for handling post installation hints and
creating the installation instance depending on the player model. This removes
the base class handling its derived classes which always has been weird, and
removes the need to change the base class when adding a new installation
method, since the base shouldn't be affected.

Change-Id: I2a156d70fd1cff6c48bdd46d10c33d75c953ea90
2012-05-01 10:49:48 +02:00
Dominik Riebeling
7f9bb7b823 MI4 bootloader: check for copy result.
As for BootloaderInstallFile check if copying the bootloader file to the player
did actually work or if an already present file caused the copy operation to
fail.

Change-Id: I2e889610b4cb9f57f73cffc473c6230be0d11e24
2012-04-26 22:01:33 +02:00
Dominik Riebeling
b623b97d40 Check for bootloader file on device before copying.
QFile::copy() doesn't overwrite an already existing file. This can lead to
bootloader installation trying to place a new file on the player but failing to
do the actual copy if the file already exists. Since overwriting an already
existing file might be unexpected by the user error out in this case and notify
the user.

Change-Id: I5ffaf2f1344271ea2bad9e3232234826552385ec
2012-04-26 21:19:56 +02:00
Dominik Riebeling
51f1fcbe26 Voicefile: remove < and > from voice strings before speaking.
Some language files have the < and > characters the original string (like "<All
tracks>") has included in the voice strings. These characters cause the
generated wave file to not contain any samples with SAPI, causing an error when
Rockbox Utility tries to encode the file.

Since those characters don't make much sense in the voice string remove them
prior to speaking. Currently affected languages are basque, chinese-simp, and
russian, for which this fixes voicefile creation.

Change-Id: Iac7ccd7921ccfb5ddc33645239a1f8f7e639e5aa
2012-04-26 21:19:56 +02:00
Dominik Riebeling
debe77a567 Check for existing firmware file on H100 / H300.
Show an error if copying the firmware file to the player failed. Also, check if
there is already a firmware file present on the player. If so abort and tell
the user about it, since QFile::copy() doesn't overwrite existing files and the
user might not expect the file to get overwritten.

Change-Id: Ie63963289965900a4ab519ddf128246f89d81c6c
2012-04-10 20:37:29 +02:00
Dominik Riebeling
0c4bd3a9c4 libmp3lame encoder: don't retrieve settings for each run.
Retrieve the encoder settings only when creating the object or when saving.
Avoids unnecessary overhead by accessing the settings object on each encoder
call, which also clutters the system trace log.

Change-Id: If64e5d1d5ac8f1d4b0afd1bc4851e455fc7e64c2
2012-04-06 17:00:48 +02:00
Dominik Riebeling
fe756b65de Drop empty voice strings when building list of strings.
Instead of skipping empty voice strings when trying to voice the list of
strings drop them immediately when building the list of strings.

Change-Id: Ib2627fb4b5061916cf04d67b6b78f457122ed2cd
2012-04-06 16:18:46 +02:00
Dominik Riebeling
eb6c6581bd Remove espeak from TTS list on Windows.
On Windows espeak installs itself as command line program as well as as SAPI
voice. Using the SAPI voice is simpler, so there is no need to keep the command
line option for it.

Change-Id: I44fbd806572d5c14b976aa5d58a91935f04c6338
2012-04-02 20:09:32 +02:00
Dominik Riebeling
674bbbaf83 Fix false positive in version detection.
Some git revisions are falsely detected as release version. Extend test and fix
the wrong regexp. Corrects font download trying to get the wrong file for some
current builds.

Change-Id: Ia779896c927385ec0d7ba68ee3d953f3c6e4494c
2012-03-12 22:16:14 +01:00
Thomas Jarosch
e8c7d10e46 Fix mismatching C++ new[] / delete calls
cppcheck report:
[rbutil/rbutilqt/base/encoderlame.cpp:273]: (error) Mismatching allocation and deallocation: mp3buf
[rbutil/rbutilqt/base/encoderlame.cpp:282]: (error) Mismatching allocation and deallocation: mp3buf
[rbutil/rbutilqt/base/encoderlame.cpp:289]: (error) Mismatching allocation and deallocation: mp3buf

[rbutil/rbutilqt/base/encoderlame.cpp:274]: (error) Mismatching allocation and deallocation: wavbuf
[rbutil/rbutilqt/base/encoderlame.cpp:283]: (error) Mismatching allocation and deallocation: wavbuf
[rbutil/rbutilqt/base/encoderlame.cpp:290]: (error) Mismatching allocation and deallocation: wavbuf

[rbutil/rbutilqt/base/encoderlame.cpp:184]: (error) Mismatching allocation and deallocation: buf

Change-Id: I9fd54b6e02817eb900ec6e24d967da6d4beaeb27
2012-02-29 20:13:17 +01:00
Dominik Riebeling
f9bf62e3ad Fix post installation hint for h100 / h300 players.
Change-Id: I7af8883253281c85fef52001b291fcd942772e3d
2012-02-22 23:19:58 +01:00
Dominik Riebeling
dc9bd859fe Remove duplicate entry from postinstall hint.
The Fuze+ has its own "disconnect player" message, so don't show the generic
one here.

Change-Id: Ibecac46d2434cb2c2b0369ff87649093252594ef
2012-02-22 23:09:59 +01:00
Dominik Riebeling
1a4a934d5e Don't poll SAPI script output.
Wait for the process to signal new data available instead of polling its
output. Fixes synchronisation issues with sapi_voice.vbs that were causing
FS#12595.

Change-Id: I86e844e837ed20f32005fdccf7ec9e8c1efbe983
2012-02-22 22:34:37 +01:00
Dominik Riebeling
cfae625a73 Implement findProcess() on OS X.
Change-Id: Iec5e91f1c8c08a58a19f79339d03247148347d45
2012-02-21 20:02:48 +01:00
Dominik Riebeling
2d7a4e9dfa Fix RockboxInfo() not handling git hashes correctly.
With the transition to git the assumption of the version starting with "r"
isn't true anymore for non-release builds. This caused the wrong strings to be
used when constructing various download URLs.

Remove the test binary which was never intended to be added and fix some
warnings in the test implementation.

Change-Id: I879fdff201cb85f3c89cca73ab6a0514edb5a2df
2012-02-19 17:44:35 +01:00
Dominik Riebeling
a56f4425c6 Allow overriding filename for rockbox-info.txt.
This allows testing the class by using temporary files without the need of
constructing a special path.

Change-Id: Id5ccd37f05219f246b9bf9f8a26ec81342654f89
2012-02-19 14:12:22 +01:00
Dominik Riebeling
f1eedb80a2 Don't try to save settings if none available.
Fixes a crash when leaving the encoder settings dialog with the Ok button but
the dynamically loaded library missing, in which case no settings will be
available.

Change-Id: I889a0bbcde6bed2df658b5df57341edf6802daad
2012-02-06 22:35:08 +01:00
Dominik Riebeling
3e0f2b3e1c Use relative paths to quazip includes.
Shorten the include list a bit by using relative paths.

Change-Id: I91fa7b292179c9f8cd0c257ef9b8d26bca34963b
2012-01-29 22:55:18 +01:00
Dominik Riebeling
7d8db0a6ff findExecutable(): cleanup log output a bit.
Change-Id: I217bddc91ff9ea43a5cfc018818f5a19b1555dd9
2012-01-29 22:55:18 +01:00
Dominik Riebeling
4105c82e6b Centralize settings for executable based TTS systems.
The configuration values for executable based TTS systems is stored in member
variables. Instead of reading them multiple times provide a function for that
and move searching the executable to the loading function.

Previously the executable was only searched in the path when opening the TTS
configuration. Having this in the loading function removes that unnecessary
step in case the TTS is in the path (and doesn't require additional
configuration).

Change-Id: I06799b55545dcb719ee3c916795b20e01c248a15
2012-01-29 22:55:18 +01:00