diff options
author | louis <louis.braun@gmx.de> | 2013-01-27 13:57:07 +0100 |
---|---|---|
committer | louis <louis.braun@gmx.de> | 2013-01-27 13:57:07 +0100 |
commit | de9bc2df7e2418269e86abbf452d212a75cdb201 (patch) | |
tree | fa2577c4e57ae31d8b56ac76dc5c12d5f5f09b96 | |
parent | c145a916766969c9e3fef7166d09b5d95fe29c02 (diff) | |
download | skin-nopacity-de9bc2df7e2418269e86abbf452d212a75cdb201.tar.gz skin-nopacity-de9bc2df7e2418269e86abbf452d212a75cdb201.tar.bz2 |
Using theme specific icons, added new theme 'green' with appropriate icons
-rw-r--r-- | HISTORY | 5 | ||||
-rw-r--r-- | icons/default/Administrative Aufgaben.png | bin | 0 -> 23314 bytes | |||
-rw-r--r-- | icons/default/CAM.png | bin | 0 -> 17598 bytes | |||
-rw-r--r-- | icons/default/Channels.png | bin | 0 -> 20699 bytes | |||
-rw-r--r-- | icons/default/Channelseparator.png | bin | 0 -> 15388 bytes | |||
-rw-r--r-- | icons/default/Commands.png | bin | 0 -> 17893 bytes | |||
-rw-r--r-- | icons/default/DVB.png | bin | 0 -> 11742 bytes | |||
-rw-r--r-- | icons/default/DiskUsage.png | bin | 0 -> 24156 bytes | |||
-rw-r--r-- | icons/default/EPG.png | bin | 0 -> 11190 bytes | |||
-rw-r--r-- | icons/default/LNB.png | bin | 0 -> 14553 bytes | |||
-rw-r--r-- | icons/default/Miscellaneous.png | bin | 0 -> 22604 bytes | |||
-rw-r--r-- | icons/default/OSD.png | bin | 0 -> 9733 bytes | |||
-rw-r--r-- | icons/default/Plugins.png | bin | 0 -> 15480 bytes | |||
-rw-r--r-- | icons/default/Recording.png | bin | 0 -> 19676 bytes | |||
-rw-r--r-- | icons/default/Recordings.png | bin | 0 -> 22050 bytes | |||
-rw-r--r-- | icons/default/Replay.png | bin | 0 -> 19060 bytes | |||
-rw-r--r-- | icons/default/Restart.png | bin | 0 -> 15427 bytes | |||
-rw-r--r-- | icons/default/Schedule.png | bin | 0 -> 21843 bytes | |||
-rw-r--r-- | icons/default/Setup.png | bin | 0 -> 20218 bytes | |||
-rw-r--r-- | icons/default/Timers.png | bin | 0 -> 21615 bytes | |||
-rw-r--r-- | icons/default/Tvguide.png | bin | 0 -> 22966 bytes | |||
-rw-r--r-- | icons/default/Videotext.png | bin | 0 -> 14735 bytes | |||
-rw-r--r-- | icons/default/activetimer.png | bin | 0 -> 5553 bytes | |||
-rw-r--r-- | icons/default/activetimersmall.png | bin | 0 -> 2093 bytes | |||
-rw-r--r-- | icons/default/channelsymbols.png | bin | 0 -> 4414 bytes | |||
-rw-r--r-- | icons/default/daydelimiter.png | bin | 0 -> 23206 bytes | |||
-rw-r--r-- | icons/default/encrypted.png | bin | 0 -> 3543 bytes | |||
-rw-r--r-- | icons/default/fwd.png | bin | 0 -> 18838 bytes | |||
-rw-r--r-- | icons/default/hd1080i.png | bin | 0 -> 6268 bytes | |||
-rw-r--r-- | icons/default/hd720p.png | bin | 0 -> 6105 bytes | |||
-rw-r--r-- | icons/default/newrecording.png | bin | 0 -> 3071 bytes | |||
-rw-r--r-- | icons/default/pause.png | bin | 0 -> 15668 bytes | |||
-rw-r--r-- | icons/default/play.png | bin | 0 -> 17112 bytes | |||
-rw-r--r-- | icons/default/radio.png | bin | 0 -> 6506 bytes | |||
-rw-r--r-- | icons/default/recordingcutted.png | bin | 0 -> 4976 bytes | |||
-rw-r--r-- | icons/default/recordingdatetime.png | bin | 0 -> 9137 bytes | |||
-rw-r--r-- | icons/default/recordingfolder.png | bin | 0 -> 23322 bytes | |||
-rw-r--r-- | icons/default/rew.png | bin | 0 -> 18552 bytes | |||
-rw-r--r-- | icons/default/sd576i.png | bin | 0 -> 6717 bytes | |||
-rw-r--r-- | icons/default/signal.png | bin | 0 -> 2436 bytes | |||
-rw-r--r-- | icons/default/tracks.png | bin | 0 -> 29537 bytes | |||
-rw-r--r-- | icons/default/vdrlogo.png | bin | 0 -> 10150 bytes | |||
-rw-r--r-- | icons/default/vdrlogo_gen2vdr.png | bin | 0 -> 22710 bytes | |||
-rw-r--r-- | icons/green/Administrative Aufgaben.png | bin | 0 -> 24309 bytes | |||
-rw-r--r-- | icons/green/CAM.png | bin | 0 -> 18857 bytes | |||
-rw-r--r-- | icons/green/Channels.png | bin | 0 -> 21923 bytes | |||
-rw-r--r-- | icons/green/Commands.png | bin | 0 -> 19176 bytes | |||
-rw-r--r-- | icons/green/DVB.png | bin | 0 -> 13195 bytes | |||
-rw-r--r-- | icons/green/DiskUsage.png | bin | 0 -> 24797 bytes | |||
-rw-r--r-- | icons/green/EPG.png | bin | 0 -> 12566 bytes | |||
-rw-r--r-- | icons/green/LNB.png | bin | 0 -> 16340 bytes | |||
-rw-r--r-- | icons/green/Miscellaneous.png | bin | 0 -> 22602 bytes | |||
-rw-r--r-- | icons/green/OSD.png | bin | 0 -> 11173 bytes | |||
-rw-r--r-- | icons/green/Plugins.png | bin | 0 -> 17179 bytes | |||
-rw-r--r-- | icons/green/Recording.png | bin | 0 -> 20196 bytes | |||
-rw-r--r-- | icons/green/Recordings.png | bin | 0 -> 21341 bytes | |||
-rw-r--r-- | icons/green/Replay.png | bin | 0 -> 19573 bytes | |||
-rw-r--r-- | icons/green/Restart.png | bin | 0 -> 17197 bytes | |||
-rw-r--r-- | icons/green/Schedule.png | bin | 0 -> 23350 bytes | |||
-rw-r--r-- | icons/green/Setup.png | bin | 0 -> 22272 bytes | |||
-rw-r--r-- | icons/green/Timers.png | bin | 0 -> 23373 bytes | |||
-rw-r--r-- | icons/green/Tvguide.png | bin | 0 -> 21895 bytes | |||
-rw-r--r-- | icons/green/Videotext.png | bin | 0 -> 15387 bytes | |||
-rw-r--r-- | icons/green/activetimer.png | bin | 0 -> 5477 bytes | |||
-rw-r--r-- | icons/green/activetimersmall.png | bin | 0 -> 2085 bytes | |||
-rw-r--r-- | icons/green/daydelimiter.png | bin | 0 -> 24430 bytes | |||
-rw-r--r-- | icons/green/fwd.png | bin | 0 -> 20142 bytes | |||
-rw-r--r-- | icons/green/newrecording.png | bin | 0 -> 3115 bytes | |||
-rw-r--r-- | icons/green/pause.png | bin | 0 -> 17060 bytes | |||
-rw-r--r-- | icons/green/play.png | bin | 0 -> 18711 bytes | |||
-rw-r--r-- | icons/green/recordingcutted.png | bin | 0 -> 5008 bytes | |||
-rw-r--r-- | icons/green/recordingdatetime.png | bin | 0 -> 9158 bytes | |||
-rw-r--r-- | icons/green/recordingfolder.png | bin | 0 -> 22710 bytes | |||
-rw-r--r-- | icons/green/rew.png | bin | 0 -> 20000 bytes | |||
-rw-r--r-- | icons/green/tracks.png | bin | 0 -> 29986 bytes | |||
-rw-r--r-- | imageloader.c | 24 | ||||
-rw-r--r-- | menuitem.c | 22 | ||||
-rw-r--r-- | nopacity.c | 2 | ||||
-rw-r--r-- | themes/nOpacity-green.theme | 64 |
79 files changed, 99 insertions, 18 deletions
@@ -104,3 +104,8 @@ Version 0.0.6 - Fixed a possible division by zero in DisplayChannel - Fixed a segfault with newer ImageMagick Versions - Added display of Timer Conflicts with epgsearch in Main Menu +- Changed makefile to work also with newer ImageMagick versions +- Introduced Theme specific icons. These icons have to be placed + in a subdirectory in icons directory, this subdirectory has to + be named exactly as the theme (without "nOpacity-"). +- Added Theme "green" and appropriate icons diff --git a/icons/default/Administrative Aufgaben.png b/icons/default/Administrative Aufgaben.png Binary files differnew file mode 100644 index 0000000..17f3758 --- /dev/null +++ b/icons/default/Administrative Aufgaben.png diff --git a/icons/default/CAM.png b/icons/default/CAM.png Binary files differnew file mode 100644 index 0000000..ef3f66a --- /dev/null +++ b/icons/default/CAM.png diff --git a/icons/default/Channels.png b/icons/default/Channels.png Binary files differnew file mode 100644 index 0000000..faf8126 --- /dev/null +++ b/icons/default/Channels.png diff --git a/icons/default/Channelseparator.png b/icons/default/Channelseparator.png Binary files differnew file mode 100644 index 0000000..906d35d --- /dev/null +++ b/icons/default/Channelseparator.png diff --git a/icons/default/Commands.png b/icons/default/Commands.png Binary files differnew file mode 100644 index 0000000..bebbe49 --- /dev/null +++ b/icons/default/Commands.png diff --git a/icons/default/DVB.png b/icons/default/DVB.png Binary files differnew file mode 100644 index 0000000..7c6cb4e --- /dev/null +++ b/icons/default/DVB.png diff --git a/icons/default/DiskUsage.png b/icons/default/DiskUsage.png Binary files differnew file mode 100644 index 0000000..f9f8a35 --- /dev/null +++ b/icons/default/DiskUsage.png diff --git a/icons/default/EPG.png b/icons/default/EPG.png Binary files differnew file mode 100644 index 0000000..9bfaf90 --- /dev/null +++ b/icons/default/EPG.png diff --git a/icons/default/LNB.png b/icons/default/LNB.png Binary files differnew file mode 100644 index 0000000..a275f3a --- /dev/null +++ b/icons/default/LNB.png diff --git a/icons/default/Miscellaneous.png b/icons/default/Miscellaneous.png Binary files differnew file mode 100644 index 0000000..e32b6c5 --- /dev/null +++ b/icons/default/Miscellaneous.png diff --git a/icons/default/OSD.png b/icons/default/OSD.png Binary files differnew file mode 100644 index 0000000..076e066 --- /dev/null +++ b/icons/default/OSD.png diff --git a/icons/default/Plugins.png b/icons/default/Plugins.png Binary files differnew file mode 100644 index 0000000..a7f3437 --- /dev/null +++ b/icons/default/Plugins.png diff --git a/icons/default/Recording.png b/icons/default/Recording.png Binary files differnew file mode 100644 index 0000000..4467dfc --- /dev/null +++ b/icons/default/Recording.png diff --git a/icons/default/Recordings.png b/icons/default/Recordings.png Binary files differnew file mode 100644 index 0000000..9d23ff4 --- /dev/null +++ b/icons/default/Recordings.png diff --git a/icons/default/Replay.png b/icons/default/Replay.png Binary files differnew file mode 100644 index 0000000..450e754 --- /dev/null +++ b/icons/default/Replay.png diff --git a/icons/default/Restart.png b/icons/default/Restart.png Binary files differnew file mode 100644 index 0000000..de21eaa --- /dev/null +++ b/icons/default/Restart.png diff --git a/icons/default/Schedule.png b/icons/default/Schedule.png Binary files differnew file mode 100644 index 0000000..396bb74 --- /dev/null +++ b/icons/default/Schedule.png diff --git a/icons/default/Setup.png b/icons/default/Setup.png Binary files differnew file mode 100644 index 0000000..0746ae7 --- /dev/null +++ b/icons/default/Setup.png diff --git a/icons/default/Timers.png b/icons/default/Timers.png Binary files differnew file mode 100644 index 0000000..1d43872 --- /dev/null +++ b/icons/default/Timers.png diff --git a/icons/default/Tvguide.png b/icons/default/Tvguide.png Binary files differnew file mode 100644 index 0000000..6c756b2 --- /dev/null +++ b/icons/default/Tvguide.png diff --git a/icons/default/Videotext.png b/icons/default/Videotext.png Binary files differnew file mode 100644 index 0000000..0419706 --- /dev/null +++ b/icons/default/Videotext.png diff --git a/icons/default/activetimer.png b/icons/default/activetimer.png Binary files differnew file mode 100644 index 0000000..8637ce3 --- /dev/null +++ b/icons/default/activetimer.png diff --git a/icons/default/activetimersmall.png b/icons/default/activetimersmall.png Binary files differnew file mode 100644 index 0000000..c6d78b1 --- /dev/null +++ b/icons/default/activetimersmall.png diff --git a/icons/default/channelsymbols.png b/icons/default/channelsymbols.png Binary files differnew file mode 100644 index 0000000..5d78bf1 --- /dev/null +++ b/icons/default/channelsymbols.png diff --git a/icons/default/daydelimiter.png b/icons/default/daydelimiter.png Binary files differnew file mode 100644 index 0000000..85e2640 --- /dev/null +++ b/icons/default/daydelimiter.png diff --git a/icons/default/encrypted.png b/icons/default/encrypted.png Binary files differnew file mode 100644 index 0000000..81b26d9 --- /dev/null +++ b/icons/default/encrypted.png diff --git a/icons/default/fwd.png b/icons/default/fwd.png Binary files differnew file mode 100644 index 0000000..13b4751 --- /dev/null +++ b/icons/default/fwd.png diff --git a/icons/default/hd1080i.png b/icons/default/hd1080i.png Binary files differnew file mode 100644 index 0000000..21351ce --- /dev/null +++ b/icons/default/hd1080i.png diff --git a/icons/default/hd720p.png b/icons/default/hd720p.png Binary files differnew file mode 100644 index 0000000..1d91b7d --- /dev/null +++ b/icons/default/hd720p.png diff --git a/icons/default/newrecording.png b/icons/default/newrecording.png Binary files differnew file mode 100644 index 0000000..38f6030 --- /dev/null +++ b/icons/default/newrecording.png diff --git a/icons/default/pause.png b/icons/default/pause.png Binary files differnew file mode 100644 index 0000000..e6577cf --- /dev/null +++ b/icons/default/pause.png diff --git a/icons/default/play.png b/icons/default/play.png Binary files differnew file mode 100644 index 0000000..b0c8a18 --- /dev/null +++ b/icons/default/play.png diff --git a/icons/default/radio.png b/icons/default/radio.png Binary files differnew file mode 100644 index 0000000..3a90a3e --- /dev/null +++ b/icons/default/radio.png diff --git a/icons/default/recordingcutted.png b/icons/default/recordingcutted.png Binary files differnew file mode 100644 index 0000000..3000f72 --- /dev/null +++ b/icons/default/recordingcutted.png diff --git a/icons/default/recordingdatetime.png b/icons/default/recordingdatetime.png Binary files differnew file mode 100644 index 0000000..9a42a93 --- /dev/null +++ b/icons/default/recordingdatetime.png diff --git a/icons/default/recordingfolder.png b/icons/default/recordingfolder.png Binary files differnew file mode 100644 index 0000000..687b149 --- /dev/null +++ b/icons/default/recordingfolder.png diff --git a/icons/default/rew.png b/icons/default/rew.png Binary files differnew file mode 100644 index 0000000..7055823 --- /dev/null +++ b/icons/default/rew.png diff --git a/icons/default/sd576i.png b/icons/default/sd576i.png Binary files differnew file mode 100644 index 0000000..85c3657 --- /dev/null +++ b/icons/default/sd576i.png diff --git a/icons/default/signal.png b/icons/default/signal.png Binary files differnew file mode 100644 index 0000000..4f03c7a --- /dev/null +++ b/icons/default/signal.png diff --git a/icons/default/tracks.png b/icons/default/tracks.png Binary files differnew file mode 100644 index 0000000..cf19b7e --- /dev/null +++ b/icons/default/tracks.png diff --git a/icons/default/vdrlogo.png b/icons/default/vdrlogo.png Binary files differnew file mode 100644 index 0000000..33294b0 --- /dev/null +++ b/icons/default/vdrlogo.png diff --git a/icons/default/vdrlogo_gen2vdr.png b/icons/default/vdrlogo_gen2vdr.png Binary files differnew file mode 100644 index 0000000..3abbd2f --- /dev/null +++ b/icons/default/vdrlogo_gen2vdr.png diff --git a/icons/green/Administrative Aufgaben.png b/icons/green/Administrative Aufgaben.png Binary files differnew file mode 100644 index 0000000..6989268 --- /dev/null +++ b/icons/green/Administrative Aufgaben.png diff --git a/icons/green/CAM.png b/icons/green/CAM.png Binary files differnew file mode 100644 index 0000000..e41154d --- /dev/null +++ b/icons/green/CAM.png diff --git a/icons/green/Channels.png b/icons/green/Channels.png Binary files differnew file mode 100644 index 0000000..c3d9972 --- /dev/null +++ b/icons/green/Channels.png diff --git a/icons/green/Commands.png b/icons/green/Commands.png Binary files differnew file mode 100644 index 0000000..86bf018 --- /dev/null +++ b/icons/green/Commands.png diff --git a/icons/green/DVB.png b/icons/green/DVB.png Binary files differnew file mode 100644 index 0000000..64df32d --- /dev/null +++ b/icons/green/DVB.png diff --git a/icons/green/DiskUsage.png b/icons/green/DiskUsage.png Binary files differnew file mode 100644 index 0000000..5120eaf --- /dev/null +++ b/icons/green/DiskUsage.png diff --git a/icons/green/EPG.png b/icons/green/EPG.png Binary files differnew file mode 100644 index 0000000..b3a7b7b --- /dev/null +++ b/icons/green/EPG.png diff --git a/icons/green/LNB.png b/icons/green/LNB.png Binary files differnew file mode 100644 index 0000000..ab377e8 --- /dev/null +++ b/icons/green/LNB.png diff --git a/icons/green/Miscellaneous.png b/icons/green/Miscellaneous.png Binary files differnew file mode 100644 index 0000000..e070f9e --- /dev/null +++ b/icons/green/Miscellaneous.png diff --git a/icons/green/OSD.png b/icons/green/OSD.png Binary files differnew file mode 100644 index 0000000..2a5efe9 --- /dev/null +++ b/icons/green/OSD.png diff --git a/icons/green/Plugins.png b/icons/green/Plugins.png Binary files differnew file mode 100644 index 0000000..85e03ef --- /dev/null +++ b/icons/green/Plugins.png diff --git a/icons/green/Recording.png b/icons/green/Recording.png Binary files differnew file mode 100644 index 0000000..e1b0707 --- /dev/null +++ b/icons/green/Recording.png diff --git a/icons/green/Recordings.png b/icons/green/Recordings.png Binary files differnew file mode 100644 index 0000000..bbc63ef --- /dev/null +++ b/icons/green/Recordings.png diff --git a/icons/green/Replay.png b/icons/green/Replay.png Binary files differnew file mode 100644 index 0000000..8994794 --- /dev/null +++ b/icons/green/Replay.png diff --git a/icons/green/Restart.png b/icons/green/Restart.png Binary files differnew file mode 100644 index 0000000..598f71a --- /dev/null +++ b/icons/green/Restart.png diff --git a/icons/green/Schedule.png b/icons/green/Schedule.png Binary files differnew file mode 100644 index 0000000..c6b97c1 --- /dev/null +++ b/icons/green/Schedule.png diff --git a/icons/green/Setup.png b/icons/green/Setup.png Binary files differnew file mode 100644 index 0000000..0abeda0 --- /dev/null +++ b/icons/green/Setup.png diff --git a/icons/green/Timers.png b/icons/green/Timers.png Binary files differnew file mode 100644 index 0000000..242f8ee --- /dev/null +++ b/icons/green/Timers.png diff --git a/icons/green/Tvguide.png b/icons/green/Tvguide.png Binary files differnew file mode 100644 index 0000000..6ed25dc --- /dev/null +++ b/icons/green/Tvguide.png diff --git a/icons/green/Videotext.png b/icons/green/Videotext.png Binary files differnew file mode 100644 index 0000000..1beab83 --- /dev/null +++ b/icons/green/Videotext.png diff --git a/icons/green/activetimer.png b/icons/green/activetimer.png Binary files differnew file mode 100644 index 0000000..6958d49 --- /dev/null +++ b/icons/green/activetimer.png diff --git a/icons/green/activetimersmall.png b/icons/green/activetimersmall.png Binary files differnew file mode 100644 index 0000000..5ac3afe --- /dev/null +++ b/icons/green/activetimersmall.png diff --git a/icons/green/daydelimiter.png b/icons/green/daydelimiter.png Binary files differnew file mode 100644 index 0000000..cd17d09 --- /dev/null +++ b/icons/green/daydelimiter.png diff --git a/icons/green/fwd.png b/icons/green/fwd.png Binary files differnew file mode 100644 index 0000000..e54ab87 --- /dev/null +++ b/icons/green/fwd.png diff --git a/icons/green/newrecording.png b/icons/green/newrecording.png Binary files differnew file mode 100644 index 0000000..51211ff --- /dev/null +++ b/icons/green/newrecording.png diff --git a/icons/green/pause.png b/icons/green/pause.png Binary files differnew file mode 100644 index 0000000..a3d7b8a --- /dev/null +++ b/icons/green/pause.png diff --git a/icons/green/play.png b/icons/green/play.png Binary files differnew file mode 100644 index 0000000..fcd91c9 --- /dev/null +++ b/icons/green/play.png diff --git a/icons/green/recordingcutted.png b/icons/green/recordingcutted.png Binary files differnew file mode 100644 index 0000000..41c952f --- /dev/null +++ b/icons/green/recordingcutted.png diff --git a/icons/green/recordingdatetime.png b/icons/green/recordingdatetime.png Binary files differnew file mode 100644 index 0000000..4a9243a --- /dev/null +++ b/icons/green/recordingdatetime.png diff --git a/icons/green/recordingfolder.png b/icons/green/recordingfolder.png Binary files differnew file mode 100644 index 0000000..dd75881 --- /dev/null +++ b/icons/green/recordingfolder.png diff --git a/icons/green/rew.png b/icons/green/rew.png Binary files differnew file mode 100644 index 0000000..1983cfe --- /dev/null +++ b/icons/green/rew.png diff --git a/icons/green/tracks.png b/icons/green/tracks.png Binary files differnew file mode 100644 index 0000000..7565c0d --- /dev/null +++ b/icons/green/tracks.png diff --git a/imageloader.c b/imageloader.c index 1676175..058affa 100644 --- a/imageloader.c +++ b/imageloader.c @@ -38,10 +38,18 @@ bool cImageLoader::LoadIcon(const char *cIcon, int size) { return false; bool success = false; if (config.iconPathSet) { - success = LoadImage(cString(cIcon), config.iconPath, "png"); + cString iconThemePath = cString::sprintf("%s%s/", *config.iconPath, Setup.OSDTheme); + success = LoadImage(cString(cIcon), iconThemePath, "png"); + if (!success) { + success = LoadImage(cString(cIcon), config.iconPath, "png"); + } } if (!success) { - success = LoadImage(cString(cIcon), config.iconPathDefault, "png"); + cString iconThemePath = cString::sprintf("%s%s/", *config.iconPathDefault, Setup.OSDTheme); + success = LoadImage(cString(cIcon), iconThemePath, "png"); + if (!success) { + success = LoadImage(cString(cIcon), config.iconPathDefault, "png"); + } } if (!success) return false; @@ -55,10 +63,18 @@ bool cImageLoader::LoadIcon(const char *cIcon, int width, int height) { return false; bool success = false; if (config.iconPathSet) { - success = LoadImage(cString(cIcon), config.iconPath, "png"); + cString iconThemePath = cString::sprintf("%s%s/", *config.iconPath, Setup.OSDTheme); + success = LoadImage(cString(cIcon), iconThemePath, "png"); + if (!success) { + success = LoadImage(cString(cIcon), config.iconPath, "png"); + } } if (!success) { - success = LoadImage(cString(cIcon), config.iconPathDefault, "png"); + cString iconThemePath = cString::sprintf("%s%s/", *config.iconPathDefault, Setup.OSDTheme); + success = LoadImage(cString(cIcon), iconThemePath, "png"); + if (!success) { + success = LoadImage(cString(cIcon), config.iconPathDefault, "png"); + } } if (!success) return false; @@ -82,7 +82,7 @@ void cNopacityMenuItem::SetBackgrounds(int *handleBackgrounds) { } void cNopacityMenuItem::DrawDelimiter(const char *del, const char *icon, int handleBgrd) { - pixmap->Fill(Theme.Color(clrMenuItem)); + pixmap->Fill(Theme.Color(clrSeparatorBorder)); pixmap->DrawImage(cPoint(1, 1), handleBgrd); cImageLoader imgLoader; if (!drawn) { @@ -380,19 +380,17 @@ int cNopacityScheduleMenuItem::CheckScrollable(bool hasIcon) { } void cNopacityScheduleMenuItem::SetTextFull(void) { + tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem); pixmapTextScroller->Fill(clrTransparent); - if (scrollTitle) - pixmapTextScroller->DrawText(cPoint(5, titleY), strTitleFull.c_str(), Theme.Color(clrMenuFontMenuItemTitle), clrTransparent, font); - if (scrollSubTitle) - pixmapTextScroller->DrawText(cPoint(5, titleY + font->Height() - 2), strSubTitleFull.c_str(), Theme.Color(clrMenuFontMenuItem), clrTransparent, fontSmall); + pixmapTextScroller->DrawText(cPoint(5, titleY), strTitleFull.c_str(), clrFont, clrTransparent, font); + pixmapTextScroller->DrawText(cPoint(5, titleY + font->Height() - 2), strSubTitleFull.c_str(), clrFont, clrTransparent, fontSmall); } void cNopacityScheduleMenuItem::SetTextShort(void) { + tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem); pixmapTextScroller->Fill(clrTransparent); - if (scrollTitle) - pixmapTextScroller->DrawText(cPoint(5, titleY), strTitle.c_str(), Theme.Color(clrMenuFontMenuItemTitle), clrTransparent, font); - if (scrollSubTitle) - pixmapTextScroller->DrawText(cPoint(5, titleY + font->Height() - 2), strSubTitle.c_str(), Theme.Color(clrMenuFontMenuItem), clrTransparent, fontSmall); + pixmapTextScroller->DrawText(cPoint(5, titleY), strTitle.c_str(), clrFont, clrTransparent, font); + pixmapTextScroller->DrawText(cPoint(5, titleY + font->Height() - 2), strSubTitle.c_str(), clrFont, clrTransparent, fontSmall); } void cNopacityScheduleMenuItem::Render() { @@ -408,9 +406,9 @@ void cNopacityScheduleMenuItem::Render() { DrawRemaining(textLeft, height*7/8, width - textLeft - 10); if (!drawn) { DrawLogo(logoWidth, logoHeight); - SetTextShort(); drawn = true; } + SetTextShort(); if (current && scrollable && !Running() && config.menuScrollSpeed) { Start(); } @@ -455,10 +453,6 @@ void cNopacityScheduleMenuItem::DrawBackground(int textLeft) { pixmapIcon->DrawImage(cPoint(width - 34, 2), imgLoader.GetImage()); } } - if (!scrollTitle) - pixmap->DrawText(cPoint(textLeft, titleY), strTitle.c_str(), Theme.Color(clrMenuFontMenuItemTitle), clrTransparent, font); - if (!scrollSubTitle) - pixmap->DrawText(cPoint(textLeft, titleY + font->Height() - 2), strSubTitle.c_str(), Theme.Color(clrMenuFontMenuItem), clrTransparent, fontSmall); } void cNopacityScheduleMenuItem::DrawLogo(int logoWidth, int logoHeight) { @@ -30,6 +30,7 @@ static cTheme Theme; #define CLR_MENUITEM 0xEE444444 #define CLR_MENUITEMBLEND 0x90000000 #define CLR_MENUITEMHIGHBLEND 0xEE0033FF +#define CLR_SEPARATORBORDER 0xEE444444 #define CLR_DISKALERT 0xDDFF0000 //BUTTONS @@ -86,6 +87,7 @@ THEME_CLR(Theme, clrMenuItem, CLR_MENUITEM); THEME_CLR(Theme, clrMenuItemBlend, CLR_MENUITEMBLEND); THEME_CLR(Theme, clrMenuItemHigh, CLR_TRANSBLACK); THEME_CLR(Theme, clrMenuItemHighBlend, CLR_MENUITEMHIGHBLEND); +THEME_CLR(Theme, clrSeparatorBorder, CLR_SEPARATORBORDER); THEME_CLR(Theme, clrDiskAlert, CLR_DISKALERT); THEME_CLR(Theme, clrMenuFontHeader, CLR_WHITE); THEME_CLR(Theme, clrMenuFontDate, CLR_WHITE); diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme new file mode 100644 index 0000000..5e969d1 --- /dev/null +++ b/themes/nOpacity-green.theme @@ -0,0 +1,64 @@ +Description = Green +clrChannelBackground = B0000000 +clrChannelBackBlend = DD006600 +clrChannelHead = FFFFCC00 +clrChannelEPG = FFFFFFFF +clrChannelEPGInfo = FF858585 +clrProgressBar = DDFFCC00 +clrProgressBarBack = DD858585 +clrProgressBarBlend = DD006600 +clrChannelSymbolOn = DD006600 +clrChannelSymbolOff = DD858585 +clrChannelRecActive = DDFF0000 +clrReplayBackground = B0000000 +clrReplayBackBlend = DD006600 +clrReplayHead = FFFFCC00 +clrReplayDescription = FFBBBBBB +clrReplayCurrentTotal = FFFFFFFF +clrReplayProgressSeen = EE006600 +clrReplayProgressRest = CC8c8c8c +clrReplayProgressSelected = FF000000 +clrReplayProgressMark = FF000000 +clrReplayProgressCurrent = 90FFFFFF +clrReplayHighlightIcon = B0006600 +clrTracksFontHead = FF858585 +clrTracksFontButtons = FFFFFFFF +clrVolumeFont = FF858585 +clrMenuBack = DD000000 +clrMenuBorder = DD006600 +clrMenuScrollBar = DD006600 +clrMenuScrollBarBack = AA003300 +clrMenuItem = BB000000 +clrMenuItemBlend = EE006600 +clrMenuItemHigh = 22000000 +clrMenuItemHighBlend = EE006600 +clrSeparatorBorder = EE444444 +clrDiskAlert = DDFF0000 +clrMenuFontHeader = FFFFFFFF +clrMenuFontDate = FFFFFFFF +clrMenuFontDiscUsage = FFFFFFFF +clrMenuFontButton = FFFFFFFF +clrMenuFontTimers = FFFFFFFF +clrMenuFontTimersHeader = FFFFFFFF +clrMenuFontMessages = FFFFFFFF +clrMenuFontDetailViewText = FFFFFFFF +clrMenuFontDetailViewHeader = FF858585 +clrMenuFontDetailViewHeaderTitle = FFFFCC00 +clrMenuFontMenuItem = FFFFFFFF +clrMenuFontMenuItemHigh = FFFFCC00 +clrMenuFontMenuItemTitle = FFFFFFFF +clrMenuFontMenuItemSep = FF858585 +clrButtonRed = 99BB0000 +clrButtonRedBorder = FFBB0000 +clrButtonGreen = 9900BB00 +clrButtonGreenBorder = FF00BB00 +clrButtonYellow = FFBBBB00 +clrButtonYellowBorder = FFBBBB00 +clrButtonBlue = 990000BB +clrButtonBlueBorder = FF0000BB +clrMessageFont = FFFFFFFF +clrMessageStatus = 900000FF +clrMessageInfo = 90009900 +clrMessageWarning = 90BBBB00 +clrMessageError = 90BB0000 +clrMessageBlend = DD000000 |