From f419128a6b371d2752553ef3850f10c2cdf46912 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 20 Jun 2012 21:00:43 +0200 Subject: 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 --- rbutil/rbutilqt/base/systeminfo.cpp | 1 + rbutil/rbutilqt/base/systeminfo.h | 1 + .../icons/players/archosfmrecorder-small.png | Bin 0 -> 7028 bytes .../rbutilqt/icons/players/archosondiofm-small.png | Bin 0 -> 4902 bytes .../rbutilqt/icons/players/archosondiosp-small.png | Bin 0 -> 4896 bytes .../rbutilqt/icons/players/archosplayer-small.png | Bin 0 -> 4760 bytes .../icons/players/archosrecorder-small.png | Bin 0 -> 5252 bytes .../icons/players/archosrecorderv2-small.png | Bin 0 -> 7028 bytes rbutil/rbutilqt/icons/players/cowond2-small.png | Bin 0 -> 2944 bytes rbutil/rbutilqt/icons/players/fonts-small.png | Bin 0 -> 4908 bytes rbutil/rbutilqt/icons/players/gigabeatfx-small.png | Bin 0 -> 2264 bytes rbutil/rbutilqt/icons/players/gigabeats-small.png | Bin 0 -> 3388 bytes .../rbutilqt/icons/players/gogearhdd1630-small.png | Bin 0 -> 2567 bytes .../rbutilqt/icons/players/gogearhdd6330-small.png | Bin 0 -> 2226 bytes .../rbutilqt/icons/players/gogearsa9200-small.png | Bin 0 -> 2181 bytes .../rbutilqt/icons/players/hifimanhm60x-small.png | Bin 0 -> 4605 bytes .../rbutilqt/icons/players/hifimanhm801-small.png | Bin 0 -> 7125 bytes rbutil/rbutilqt/icons/players/iaudiom3-small.png | Bin 0 -> 2261 bytes rbutil/rbutilqt/icons/players/iaudiom5-small.png | Bin 0 -> 2843 bytes rbutil/rbutilqt/icons/players/iaudiox5-small.png | Bin 0 -> 2845 bytes rbutil/rbutilqt/icons/players/ipod1g2g-small.png | Bin 0 -> 5243 bytes rbutil/rbutilqt/icons/players/ipod3g-small.png | Bin 0 -> 3377 bytes rbutil/rbutilqt/icons/players/ipod4g-small.png | Bin 0 -> 2581 bytes rbutil/rbutilqt/icons/players/ipodcolor-small.png | Bin 0 -> 2520 bytes rbutil/rbutilqt/icons/players/ipodmini1g-small.png | Bin 0 -> 2316 bytes rbutil/rbutilqt/icons/players/ipodnano1g-small.png | Bin 0 -> 2190 bytes rbutil/rbutilqt/icons/players/ipodnano2g-small.png | Bin 0 -> 2270 bytes rbutil/rbutilqt/icons/players/ipodvideo-small.png | Bin 0 -> 2771 bytes rbutil/rbutilqt/icons/players/iriverh10-small.png | Bin 0 -> 3182 bytes rbutil/rbutilqt/icons/players/iriverh100-small.png | Bin 0 -> 3606 bytes .../rbutilqt/icons/players/iriverh10_5gb-small.png | Bin 0 -> 2631 bytes rbutil/rbutilqt/icons/players/iriverh300-small.png | Bin 0 -> 3180 bytes rbutil/rbutilqt/icons/players/mpiohd200-small.png | Bin 0 -> 16883 bytes rbutil/rbutilqt/icons/players/mpiohd300-small.png | Bin 0 -> 14701 bytes rbutil/rbutilqt/icons/players/mrobe100-small.png | Bin 0 -> 1987 bytes rbutil/rbutilqt/icons/players/mrobe500-small.png | Bin 0 -> 3075 bytes .../rbutilqt/icons/players/samsungyh820-small.png | Bin 0 -> 3225 bytes .../rbutilqt/icons/players/samsungyh920-small.png | Bin 0 -> 3358 bytes .../rbutilqt/icons/players/samsungyh925-small.png | Bin 0 -> 3447 bytes .../rbutilqt/icons/players/samsungypr0-small.png | Bin 0 -> 3038 bytes rbutil/rbutilqt/icons/players/sansac200-small.png | Bin 0 -> 3625 bytes rbutil/rbutilqt/icons/players/sansaclip-small.png | Bin 0 -> 5843 bytes .../rbutilqt/icons/players/sansaclipplus-small.png | Bin 0 -> 4542 bytes .../rbutilqt/icons/players/sansaclipzip-small.png | Bin 0 -> 7640 bytes .../rbutilqt/icons/players/sansaconnect-small.png | Bin 0 -> 6603 bytes rbutil/rbutilqt/icons/players/sansae200-small.png | Bin 0 -> 3901 bytes rbutil/rbutilqt/icons/players/sansafuze-small.png | Bin 0 -> 4937 bytes .../rbutilqt/icons/players/sansafuzeplus-small.png | Bin 0 -> 6753 bytes rbutil/rbutilqt/icons/players/source-small.png | Bin 0 -> 4908 bytes rbutil/rbutilqt/icons/players/vibe500-small.png | Bin 0 -> 2891 bytes rbutil/rbutilqt/icons/players/vx747-small.png | Bin 0 -> 2732 bytes rbutil/rbutilqt/icons/players/vx777-small.png | Bin 0 -> 2445 bytes rbutil/rbutilqt/rbutil.ini | 55 +++++++++++++++++++++ rbutil/rbutilqt/rbutilqt.cpp | 30 ++++++----- rbutil/rbutilqt/rbutilqt.qrc | 50 +++++++++++++++++++ rbutil/rbutilqt/rbutilqtfrm.ui | 12 ++++- 56 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 rbutil/rbutilqt/icons/players/archosfmrecorder-small.png create mode 100644 rbutil/rbutilqt/icons/players/archosondiofm-small.png create mode 100644 rbutil/rbutilqt/icons/players/archosondiosp-small.png create mode 100644 rbutil/rbutilqt/icons/players/archosplayer-small.png create mode 100644 rbutil/rbutilqt/icons/players/archosrecorder-small.png create mode 100644 rbutil/rbutilqt/icons/players/archosrecorderv2-small.png create mode 100644 rbutil/rbutilqt/icons/players/cowond2-small.png create mode 100644 rbutil/rbutilqt/icons/players/fonts-small.png create mode 100644 rbutil/rbutilqt/icons/players/gigabeatfx-small.png create mode 100644 rbutil/rbutilqt/icons/players/gigabeats-small.png create mode 100644 rbutil/rbutilqt/icons/players/gogearhdd1630-small.png create mode 100644 rbutil/rbutilqt/icons/players/gogearhdd6330-small.png create mode 100644 rbutil/rbutilqt/icons/players/gogearsa9200-small.png create mode 100644 rbutil/rbutilqt/icons/players/hifimanhm60x-small.png create mode 100644 rbutil/rbutilqt/icons/players/hifimanhm801-small.png create mode 100644 rbutil/rbutilqt/icons/players/iaudiom3-small.png create mode 100644 rbutil/rbutilqt/icons/players/iaudiom5-small.png create mode 100644 rbutil/rbutilqt/icons/players/iaudiox5-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipod1g2g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipod3g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipod4g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipodcolor-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipodmini1g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipodnano1g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipodnano2g-small.png create mode 100644 rbutil/rbutilqt/icons/players/ipodvideo-small.png create mode 100644 rbutil/rbutilqt/icons/players/iriverh10-small.png create mode 100644 rbutil/rbutilqt/icons/players/iriverh100-small.png create mode 100644 rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png create mode 100644 rbutil/rbutilqt/icons/players/iriverh300-small.png create mode 100644 rbutil/rbutilqt/icons/players/mpiohd200-small.png create mode 100644 rbutil/rbutilqt/icons/players/mpiohd300-small.png create mode 100644 rbutil/rbutilqt/icons/players/mrobe100-small.png create mode 100644 rbutil/rbutilqt/icons/players/mrobe500-small.png create mode 100644 rbutil/rbutilqt/icons/players/samsungyh820-small.png create mode 100644 rbutil/rbutilqt/icons/players/samsungyh920-small.png create mode 100644 rbutil/rbutilqt/icons/players/samsungyh925-small.png create mode 100644 rbutil/rbutilqt/icons/players/samsungypr0-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansac200-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansaclip-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansaclipplus-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansaclipzip-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansaconnect-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansae200-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansafuze-small.png create mode 100644 rbutil/rbutilqt/icons/players/sansafuzeplus-small.png create mode 100644 rbutil/rbutilqt/icons/players/source-small.png create mode 100644 rbutil/rbutilqt/icons/players/vibe500-small.png create mode 100644 rbutil/rbutilqt/icons/players/vx747-small.png create mode 100644 rbutil/rbutilqt/icons/players/vx777-small.png diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index eddfb26b34..fde43d27dd 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp @@ -59,6 +59,7 @@ const static struct { { SystemInfo::CurName, ":platform:/name", "" }, { SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, { SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" }, + { SystemInfo::CurPlayerPicture, ":platform:/playerpic", "" }, }; //! pointer to setting object to NULL diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 9eddd5ed38..0e603f865e 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h @@ -63,6 +63,7 @@ class SystemInfo : public QObject CurName, CurBuildserverModel, CurConfigureModel, + CurPlayerPicture, }; enum PlatformType { diff --git a/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png b/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png new file mode 100644 index 0000000000..e9e1e6a982 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png differ diff --git a/rbutil/rbutilqt/icons/players/archosondiofm-small.png b/rbutil/rbutilqt/icons/players/archosondiofm-small.png new file mode 100644 index 0000000000..8ac3f16ae4 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosondiofm-small.png differ diff --git a/rbutil/rbutilqt/icons/players/archosondiosp-small.png b/rbutil/rbutilqt/icons/players/archosondiosp-small.png new file mode 100644 index 0000000000..c96c0cb9bb Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosondiosp-small.png differ diff --git a/rbutil/rbutilqt/icons/players/archosplayer-small.png b/rbutil/rbutilqt/icons/players/archosplayer-small.png new file mode 100644 index 0000000000..87d6cec6a5 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosplayer-small.png differ diff --git a/rbutil/rbutilqt/icons/players/archosrecorder-small.png b/rbutil/rbutilqt/icons/players/archosrecorder-small.png new file mode 100644 index 0000000000..9e4f5b7d92 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosrecorder-small.png differ diff --git a/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png b/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png new file mode 100644 index 0000000000..e9e1e6a982 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png differ diff --git a/rbutil/rbutilqt/icons/players/cowond2-small.png b/rbutil/rbutilqt/icons/players/cowond2-small.png new file mode 100644 index 0000000000..b365fc36b0 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/cowond2-small.png differ diff --git a/rbutil/rbutilqt/icons/players/fonts-small.png b/rbutil/rbutilqt/icons/players/fonts-small.png new file mode 100644 index 0000000000..4c7cdcb426 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/fonts-small.png differ diff --git a/rbutil/rbutilqt/icons/players/gigabeatfx-small.png b/rbutil/rbutilqt/icons/players/gigabeatfx-small.png new file mode 100644 index 0000000000..6d3744f106 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/gigabeatfx-small.png differ diff --git a/rbutil/rbutilqt/icons/players/gigabeats-small.png b/rbutil/rbutilqt/icons/players/gigabeats-small.png new file mode 100644 index 0000000000..48e905bcb7 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/gigabeats-small.png differ diff --git a/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png b/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png new file mode 100644 index 0000000000..ff7b097942 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png differ diff --git a/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png b/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png new file mode 100644 index 0000000000..5b7af846b1 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png differ diff --git a/rbutil/rbutilqt/icons/players/gogearsa9200-small.png b/rbutil/rbutilqt/icons/players/gogearsa9200-small.png new file mode 100644 index 0000000000..5d8f70a220 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/gogearsa9200-small.png differ diff --git a/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png b/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png new file mode 100644 index 0000000000..1220a5c46d Binary files /dev/null and b/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png differ diff --git a/rbutil/rbutilqt/icons/players/hifimanhm801-small.png b/rbutil/rbutilqt/icons/players/hifimanhm801-small.png new file mode 100644 index 0000000000..1a9751661d Binary files /dev/null and b/rbutil/rbutilqt/icons/players/hifimanhm801-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iaudiom3-small.png b/rbutil/rbutilqt/icons/players/iaudiom3-small.png new file mode 100644 index 0000000000..b72cb7dcc2 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iaudiom3-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iaudiom5-small.png b/rbutil/rbutilqt/icons/players/iaudiom5-small.png new file mode 100644 index 0000000000..40cfff4f01 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iaudiom5-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iaudiox5-small.png b/rbutil/rbutilqt/icons/players/iaudiox5-small.png new file mode 100644 index 0000000000..e95e434fd5 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iaudiox5-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipod1g2g-small.png b/rbutil/rbutilqt/icons/players/ipod1g2g-small.png new file mode 100644 index 0000000000..a573751c2f Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipod1g2g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipod3g-small.png b/rbutil/rbutilqt/icons/players/ipod3g-small.png new file mode 100644 index 0000000000..3efc1de071 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipod3g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipod4g-small.png b/rbutil/rbutilqt/icons/players/ipod4g-small.png new file mode 100644 index 0000000000..76cd554090 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipod4g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipodcolor-small.png b/rbutil/rbutilqt/icons/players/ipodcolor-small.png new file mode 100644 index 0000000000..8d530137c8 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipodcolor-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipodmini1g-small.png b/rbutil/rbutilqt/icons/players/ipodmini1g-small.png new file mode 100644 index 0000000000..39f91bdde5 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipodmini1g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipodnano1g-small.png b/rbutil/rbutilqt/icons/players/ipodnano1g-small.png new file mode 100644 index 0000000000..71be0b8ed2 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipodnano1g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipodnano2g-small.png b/rbutil/rbutilqt/icons/players/ipodnano2g-small.png new file mode 100644 index 0000000000..413c041f7b Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipodnano2g-small.png differ diff --git a/rbutil/rbutilqt/icons/players/ipodvideo-small.png b/rbutil/rbutilqt/icons/players/ipodvideo-small.png new file mode 100644 index 0000000000..40155ba14f Binary files /dev/null and b/rbutil/rbutilqt/icons/players/ipodvideo-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iriverh10-small.png b/rbutil/rbutilqt/icons/players/iriverh10-small.png new file mode 100644 index 0000000000..8ffe9162d3 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iriverh10-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iriverh100-small.png b/rbutil/rbutilqt/icons/players/iriverh100-small.png new file mode 100644 index 0000000000..cc13ecf4c6 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iriverh100-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png b/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png new file mode 100644 index 0000000000..c034586398 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png differ diff --git a/rbutil/rbutilqt/icons/players/iriverh300-small.png b/rbutil/rbutilqt/icons/players/iriverh300-small.png new file mode 100644 index 0000000000..3c5657bf00 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/iriverh300-small.png differ diff --git a/rbutil/rbutilqt/icons/players/mpiohd200-small.png b/rbutil/rbutilqt/icons/players/mpiohd200-small.png new file mode 100644 index 0000000000..d82ba6c015 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/mpiohd200-small.png differ diff --git a/rbutil/rbutilqt/icons/players/mpiohd300-small.png b/rbutil/rbutilqt/icons/players/mpiohd300-small.png new file mode 100644 index 0000000000..744dfc09c0 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/mpiohd300-small.png differ diff --git a/rbutil/rbutilqt/icons/players/mrobe100-small.png b/rbutil/rbutilqt/icons/players/mrobe100-small.png new file mode 100644 index 0000000000..3ab6206a73 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/mrobe100-small.png differ diff --git a/rbutil/rbutilqt/icons/players/mrobe500-small.png b/rbutil/rbutilqt/icons/players/mrobe500-small.png new file mode 100644 index 0000000000..6c08b15495 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/mrobe500-small.png differ diff --git a/rbutil/rbutilqt/icons/players/samsungyh820-small.png b/rbutil/rbutilqt/icons/players/samsungyh820-small.png new file mode 100644 index 0000000000..27702e5c61 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/samsungyh820-small.png differ diff --git a/rbutil/rbutilqt/icons/players/samsungyh920-small.png b/rbutil/rbutilqt/icons/players/samsungyh920-small.png new file mode 100644 index 0000000000..0188b4186a Binary files /dev/null and b/rbutil/rbutilqt/icons/players/samsungyh920-small.png differ diff --git a/rbutil/rbutilqt/icons/players/samsungyh925-small.png b/rbutil/rbutilqt/icons/players/samsungyh925-small.png new file mode 100644 index 0000000000..733bc6fbbd Binary files /dev/null and b/rbutil/rbutilqt/icons/players/samsungyh925-small.png differ diff --git a/rbutil/rbutilqt/icons/players/samsungypr0-small.png b/rbutil/rbutilqt/icons/players/samsungypr0-small.png new file mode 100644 index 0000000000..2183eec0ba Binary files /dev/null and b/rbutil/rbutilqt/icons/players/samsungypr0-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansac200-small.png b/rbutil/rbutilqt/icons/players/sansac200-small.png new file mode 100644 index 0000000000..4678c607c1 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansac200-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansaclip-small.png b/rbutil/rbutilqt/icons/players/sansaclip-small.png new file mode 100644 index 0000000000..a4e1c4a69b Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansaclip-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansaclipplus-small.png b/rbutil/rbutilqt/icons/players/sansaclipplus-small.png new file mode 100644 index 0000000000..edb7691ae8 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansaclipplus-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansaclipzip-small.png b/rbutil/rbutilqt/icons/players/sansaclipzip-small.png new file mode 100644 index 0000000000..bc1f2a3fd0 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansaclipzip-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansaconnect-small.png b/rbutil/rbutilqt/icons/players/sansaconnect-small.png new file mode 100644 index 0000000000..af348466ee Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansaconnect-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansae200-small.png b/rbutil/rbutilqt/icons/players/sansae200-small.png new file mode 100644 index 0000000000..530456be1c Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansae200-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansafuze-small.png b/rbutil/rbutilqt/icons/players/sansafuze-small.png new file mode 100644 index 0000000000..8cef62abc6 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansafuze-small.png differ diff --git a/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png b/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png new file mode 100644 index 0000000000..6d7336f1ec Binary files /dev/null and b/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png differ diff --git a/rbutil/rbutilqt/icons/players/source-small.png b/rbutil/rbutilqt/icons/players/source-small.png new file mode 100644 index 0000000000..4c7cdcb426 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/source-small.png differ diff --git a/rbutil/rbutilqt/icons/players/vibe500-small.png b/rbutil/rbutilqt/icons/players/vibe500-small.png new file mode 100644 index 0000000000..901ac676e9 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/vibe500-small.png differ diff --git a/rbutil/rbutilqt/icons/players/vx747-small.png b/rbutil/rbutilqt/icons/players/vx747-small.png new file mode 100644 index 0000000000..940babd485 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/vx747-small.png differ diff --git a/rbutil/rbutilqt/icons/players/vx777-small.png b/rbutil/rbutilqt/icons/players/vx777-small.png new file mode 100644 index 0000000000..2466b9d504 Binary files /dev/null and b/rbutil/rbutilqt/icons/players/vx777-small.png differ diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 6f620f382a..547da12845 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini @@ -116,6 +116,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosplayer +playerpic=archosplayer encoder=lame [archosrecorder] @@ -126,6 +127,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosrecorder +playerpic=archosrecorder encoder=lame [archosrecorder.8mb] @@ -136,6 +138,7 @@ bootloadername= manualname=recorder brand=Archos configure_modelname=archosrecorder +playerpic=archosrecorder encoder=lame [archosrecorderv2] @@ -146,6 +149,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosrecorderv2 +playerpic=archosrecorderv2 encoder=lame [archosfmrecorder] @@ -156,6 +160,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosfmrecorder +playerpic=archosfmrecorder encoder=lame [archosfmrecorder.8mb] @@ -166,6 +171,7 @@ bootloadername= manualname=archosfmrecorder brand=Archos configure_modelname=archosfmrecorder +playerpic=archosfmrecorder encoder=lame [archosondiosp] @@ -176,6 +182,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosondiosp +playerpic=archosondiosp encoder=lame [archosondiofm] @@ -186,6 +193,7 @@ bootloadername= manualname= brand=Archos configure_modelname=archosondiofm +playerpic=archosondiofm encoder=lame [iriverh100] @@ -199,6 +207,7 @@ manualname=iriverh100 brand=Iriver usbid=0x10063001 configure_modelname=iriverh100 +playerpic=iriverh100 encoder=rbspeex [iriverh120] @@ -212,6 +221,7 @@ manualname=iriverh100 brand=Iriver usbid=0x10063002 configure_modelname=iriverh120 +playerpic=iriverh100 encoder=rbspeex [iriverh300] @@ -225,6 +235,7 @@ manualname=iriverh300 brand=Iriver usbid=0x10063003 configure_modelname=iriverh300 +playerpic=iriverh300 encoder=rbspeex [iriverh10_5gb] @@ -237,6 +248,7 @@ manualname= brand=Iriver usbid=0x41022002 configure_modelname=iriverh10_5gb +playerpic=iriverh10_5gb encoder=rbspeex [iriverh10_5gb.mtp] @@ -249,6 +261,7 @@ manualname= brand=Iriver usbid=0x41022105, 0x41022102 configure_modelname=iriverh10_5gb +playerpic=iriverh10_5gb encoder=rbspeex [iriverh10] @@ -262,6 +275,7 @@ brand=Iriver usbid=0x0b7000ba usberror=0x41022101 configure_modelname=iriverh10 +playerpic=iriverh10 encoder=rbspeex [ipod1g2g] @@ -272,6 +286,7 @@ bootloadername=/ipod/bootloader-ipod1g2g.ipod manualname= brand=Apple configure_modelname=ipod1g2g +playerpic=ipod1g2g encoder=rbspeex [ipodcolor] @@ -282,6 +297,7 @@ bootloadername=/ipod/bootloader-ipodcolor.ipod manualname= brand=Apple configure_modelname=ipodcolor +playerpic=ipodcolor encoder=rbspeex [ipodnano1g] @@ -292,6 +308,7 @@ bootloadername=/ipod/bootloader-ipodnano1g.ipod manualname= brand=Apple configure_modelname=ipodnano1g +playerpic=ipodnano1g encoder=rbspeex [ipodnano2g] @@ -302,6 +319,7 @@ bootloadername=/ipod/bootloader-ipodnano2g.ipodx manualname= brand=Apple configure_modelname=ipodnano2g +playerpic=ipodnano2g encoder=rbspeex [ipod4g] @@ -312,6 +330,7 @@ bootloadername=/ipod/bootloader-ipod4g.ipod manualname= brand=Apple configure_modelname=ipod4g +playerpic=ipod4g encoder=rbspeex [ipodvideo] @@ -322,6 +341,7 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod manualname= brand=Apple configure_modelname=ipodvideo +playerpic=ipodvideo encoder=rbspeex [ipodclassic] @@ -344,6 +364,7 @@ manualname= brand=Apple usbid=0x05ac1201 configure_modelname=ipod3g +playerpic=ipod3g encoder=rbspeex [ipodmini1g] @@ -353,6 +374,7 @@ bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodmini1g.ipod brand=Apple configure_modelname=ipodmini1g +playerpic=ipodmini1g encoder=rbspeex [ipodmini2g] @@ -363,6 +385,7 @@ bootloadername=/ipod/bootloader-ipodmini2g.ipod manualname=ipodmini1g brand=Apple configure_modelname=ipodmini2g +playerpic=ipodmini1g encoder=rbspeex [iaudiox5] @@ -375,6 +398,7 @@ manualname= brand=Cowon usbid=0x0e210510, 0x0e210513 configure_modelname=iaudiox5 +playerpic=iaudiox5 encoder=rbspeex [iaudiox5.v] @@ -386,6 +410,7 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin manualname= brand=Cowon configure_modelname=iaudiox5 +playerpic=iaudiox5 encoder=rbspeex [iaudiom5] @@ -398,6 +423,7 @@ manualname= brand=Cowon usbid=0x0e210520 configure_modelname=iaudiom5 +playerpic=iaudiom5 encoder=rbspeex [iaudiom3] @@ -410,6 +436,7 @@ manualname= brand=Cowon usbid=0x0e210500 configure_modelname=iaudiom3 +playerpic=iaudiom3 encoder=rbspeex [gigabeatfx] @@ -422,6 +449,7 @@ manualname= brand=Toshiba usbid=0x09300009 configure_modelname=gigabeatfx +playerpic=gigabeatfx encoder=rbspeex [gigabeats] @@ -432,6 +460,7 @@ manualname= brand=Toshiba usbid=0x09300010 configure_modelname=gigabeats +playerpic=gigabeats encoder=rbspeex status=disabled @@ -445,6 +474,7 @@ brand=Sandisk usbid=0x07817421 usberror=0x07817420 configure_modelname=sansae200 +playerpic=sansae200 encoder=rbspeex [sansac200] @@ -456,6 +486,7 @@ manualname= brand=Sandisk usbid=0x07817450, 0x07817451 configure_modelname=sansac200 +playerpic=sansac200 encoder=rbspeex [sansae200v2] @@ -470,6 +501,7 @@ brand=Sandisk usbid=0x07817423 usberror=0x07817422 configure_modelname=sansae200v2 +playerpic=sansae200 encoder=rbspeex [sansac200v2] @@ -484,6 +516,7 @@ brand=Sandisk usbid=0x07817452 usberror=0x07817451 configure_modelname=sansac200v2 +playerpic=sansac200 encoder=rbspeex [sansafuze] @@ -498,6 +531,7 @@ brand=Sandisk usbid=0x078174c1 usberror=0x078174c0 configure_modelname=sansafuze +playerpic=sansafuze encoder=rbspeex [sansafuzev2] @@ -512,6 +546,7 @@ brand=Sandisk usbid=0x078174c3 usberror=0x078174c2 configure_modelname=sansafuzev2 +playerpic=sansafuze encoder=rbspeex [sansafuzeplus] @@ -526,6 +561,7 @@ brand=Sandisk usbid=0x078174e1 usberror= configure_modelname=sansafuzeplus +playerpic=sansafuzeplus encoder=rbspeex [sansam200v4] @@ -540,6 +576,7 @@ brand=Sandisk usbid= usberror= configure_modelname=sansam200v4 +playerpic=sansam200v4 encoder=rbspeex status=disabled @@ -555,6 +592,7 @@ brand=Sandisk usbid=0x07817433 usberror=0x07817432 configure_modelname=sansaclip +playerpic=sansaclip encoder=rbspeex [sansaclipv2] @@ -569,6 +607,7 @@ brand=Sandisk usbid=0x07817435 usberror=0x07817434 configure_modelname=sansaclipv2 +playerpic=sansaclip encoder=rbspeex [sansaclipplus] @@ -583,6 +622,7 @@ brand=Sandisk usbid=0x078174d1 usberror=0x078174d0 configure_modelname=sansaclipplus +playerpic=sansaclipplus encoder=rbspeex [sansaclipzip] @@ -597,6 +637,7 @@ brand=Sandisk usbid=0x078174e5 usberror=0x078174e4 configure_modelname=sansaclipzip +playerpic=sansaclipzip encoder=rbspeex [mrobe100] @@ -609,6 +650,7 @@ manualname= brand=Olympus usbid=0x07b40280 configure_modelname=mrobe100 +playerpic=mrobe100 encoder=rbspeex [ondavx747] @@ -622,6 +664,7 @@ manualname= brand=Onda usbid=0x07c4a4a5 configure_modelname=ondavx747 +playerpic=vx747 encoder=rbspeex status=disabled @@ -636,6 +679,7 @@ manualname= brand=Onda usbid=0x07c4a4a5 configure_modelname=ondavx747p +playerpic=vx747 encoder=rbspeex status=disabled @@ -650,6 +694,7 @@ manualname= brand=Onda usbid=0x07c4a4a5 configure_modelname=ondavx777 +playerpic=vx777 encoder=rbspeex status=disabled @@ -663,6 +708,7 @@ manualname= brand=Samsung usbid=0x04e85023 configure_modelname=samsungyh820 +playerpic=samsungyh820 encoder=rbspeex [samsungyh920] @@ -675,6 +721,7 @@ manualname= brand=Samsung usbid=0x04e85022, 0x04e8501d configure_modelname=samsungyh920 +playerpic=samsungyh920 encoder=rbspeex [samsungyh925] @@ -687,6 +734,7 @@ manualname= brand=Samsung usbid=0x04e85024 configure_modelname=samsungyh925 +playerpic=samsungyh925 encoder=rbspeex [cowond2] @@ -701,6 +749,7 @@ brand=Cowon usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891 configure_modelname=cowond2 +playerpic=cowond2 encoder=rbspeex status=disabled @@ -715,6 +764,7 @@ brand=Packard Bell usbid=0x04098038 usberror=0x04098039 configure_modelname=vibe500 +playerpic=vibe500 encoder=rbspeex [mpiohd200] @@ -728,6 +778,7 @@ manualname= brand=MPIO usbid=0x27351004 configure_modelname=mpiohd200 +playerpic=mpiohd200 encoder=rbspeex [mpiohd300] @@ -741,6 +792,7 @@ manualname= brand=MPIO usbid=0x27351005 configure_modelname=mpiohd300 +playerpic=mpiohd300 encoder=rbspeex [gogearhdd1630] @@ -753,6 +805,7 @@ manualname= brand=Philips usbid=0x0471014c configure_modelname=gogearhdd1630 +playerpic=gogearhdd1630 encoder=rbspeex [gogearhdd6330] @@ -765,6 +818,7 @@ manualname= brand=Philips usbid=0x0471014b configure_modelname=gogearhdd6330 +playerpic=gogearhdd6330 encoder=rbspeex [gogearsa9200] @@ -776,6 +830,7 @@ manualname= brand=Philips usbid=0x0471014f configure_modelname=gogearsa9200 +playerpic=gogearsa9200 encoder=rbspeex status=disabled diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 27efcea6db..575859fd46 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -364,20 +364,28 @@ void RbUtilQt::updateDevice() ui.menuA_ctions->setEnabled(configurationValid); // displayed device info - QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); QString brand = SystemInfo::value(SystemInfo::CurBrand).toString(); - QString name = SystemInfo::value(SystemInfo::CurName).toString() + - " (" + ServerInfo::value(ServerInfo::CurStatus).toString() + ")"; + QString name + = QString("%1 (%2)").arg(SystemInfo::value(SystemInfo::CurName).toString(), + ServerInfo::value(ServerInfo::CurStatus).toString()); + ui.labelDevice->setText(tr("%1 %2").arg(brand, name)); + + QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); QString mountdisplay = QDir::toNativeSeparators(mountpoint); - QString label = Utils::filesystemName(mountpoint); - if(!label.isEmpty()) - mountdisplay += " (" + label + ")"; + if(!mountdisplay.isEmpty()) { + QString label = Utils::filesystemName(mountpoint); + if(!label.isEmpty()) mountdisplay += QString(" (%1)").arg(label); + ui.labelMountpoint->setText(tr("%1").arg(mountdisplay)); + } + else { + mountdisplay = "(unknown)"; + } - if(name.isEmpty()) name = "<none>"; - if(mountpoint.isEmpty()) - mountpoint = "<invalid>"; - ui.labelDevice->setText(tr("%1 %2").arg(brand, name)); - ui.labelMountpoint->setText(tr("%1").arg(mountdisplay)); + QPixmap pm; + QString m = SystemInfo::value(SystemInfo::CurPlayerPicture).toString(); + pm.load(":/icons/players/" + m + "-small.png"); + pm = pm.scaledToHeight(QFontMetrics(QApplication::font()).height() * 3); + ui.labelPlayerPic->setPixmap(pm); // hide quickstart buttons if no release available bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 2dd317032e..5305a98434 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc @@ -42,6 +42,56 @@ icons/wizard.jpg ../../docs/logo/rockbox-clef.svg + + icons/players/archosfmrecorder-small.png + icons/players/archosondiofm-small.png + icons/players/archosondiosp-small.png + icons/players/archosplayer-small.png + icons/players/archosrecorder-small.png + icons/players/archosrecorderv2-small.png + icons/players/cowond2-small.png + icons/players/gigabeatfx-small.png + icons/players/gigabeats-small.png + icons/players/gogearhdd1630-small.png + icons/players/gogearhdd6330-small.png + icons/players/gogearsa9200-small.png + icons/players/hifimanhm60x-small.png + icons/players/hifimanhm801-small.png + icons/players/iaudiom3-small.png + icons/players/iaudiom5-small.png + icons/players/iaudiox5-small.png + icons/players/ipod1g2g-small.png + icons/players/ipod3g-small.png + icons/players/ipod4g-small.png + icons/players/ipodcolor-small.png + icons/players/ipodmini1g-small.png + icons/players/ipodnano1g-small.png + icons/players/ipodnano2g-small.png + icons/players/ipodvideo-small.png + icons/players/iriverh100-small.png + icons/players/iriverh10_5gb-small.png + icons/players/iriverh10-small.png + icons/players/iriverh300-small.png + icons/players/mpiohd200-small.png + icons/players/mpiohd300-small.png + icons/players/mrobe100-small.png + icons/players/mrobe500-small.png + icons/players/samsungyh820-small.png + icons/players/samsungyh920-small.png + icons/players/samsungyh925-small.png + icons/players/samsungypr0-small.png + icons/players/sansac200-small.png + icons/players/sansaclipplus-small.png + icons/players/sansaclip-small.png + icons/players/sansaclipzip-small.png + icons/players/sansaconnect-small.png + icons/players/sansae200-small.png + icons/players/sansafuzeplus-small.png + icons/players/sansafuze-small.png + icons/players/vibe500-small.png + icons/players/vx747-small.png + icons/players/vx777-small.png + rbutil.ini diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui index 3ee52d6f7b..561a9aa3ae 100644 --- a/rbutil/rbutilqt/rbutilqtfrm.ui +++ b/rbutil/rbutilqt/rbutilqtfrm.ui @@ -97,7 +97,17 @@ - + + + + + + + true + + + + &Change -- cgit v1.2.3