From de9bc2df7e2418269e86abbf452d212a75cdb201 Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 27 Jan 2013 13:57:07 +0100 Subject: Using theme specific icons, added new theme 'green' with appropriate icons --- HISTORY | 5 +++ icons/default/Administrative Aufgaben.png | Bin 0 -> 23314 bytes icons/default/CAM.png | Bin 0 -> 17598 bytes icons/default/Channels.png | Bin 0 -> 20699 bytes icons/default/Channelseparator.png | Bin 0 -> 15388 bytes icons/default/Commands.png | Bin 0 -> 17893 bytes icons/default/DVB.png | Bin 0 -> 11742 bytes icons/default/DiskUsage.png | Bin 0 -> 24156 bytes icons/default/EPG.png | Bin 0 -> 11190 bytes icons/default/LNB.png | Bin 0 -> 14553 bytes icons/default/Miscellaneous.png | Bin 0 -> 22604 bytes icons/default/OSD.png | Bin 0 -> 9733 bytes icons/default/Plugins.png | Bin 0 -> 15480 bytes icons/default/Recording.png | Bin 0 -> 19676 bytes icons/default/Recordings.png | Bin 0 -> 22050 bytes icons/default/Replay.png | Bin 0 -> 19060 bytes icons/default/Restart.png | Bin 0 -> 15427 bytes icons/default/Schedule.png | Bin 0 -> 21843 bytes icons/default/Setup.png | Bin 0 -> 20218 bytes icons/default/Timers.png | Bin 0 -> 21615 bytes icons/default/Tvguide.png | Bin 0 -> 22966 bytes icons/default/Videotext.png | Bin 0 -> 14735 bytes icons/default/activetimer.png | Bin 0 -> 5553 bytes icons/default/activetimersmall.png | Bin 0 -> 2093 bytes icons/default/channelsymbols.png | Bin 0 -> 4414 bytes icons/default/daydelimiter.png | Bin 0 -> 23206 bytes icons/default/encrypted.png | Bin 0 -> 3543 bytes icons/default/fwd.png | Bin 0 -> 18838 bytes icons/default/hd1080i.png | Bin 0 -> 6268 bytes icons/default/hd720p.png | Bin 0 -> 6105 bytes icons/default/newrecording.png | Bin 0 -> 3071 bytes icons/default/pause.png | Bin 0 -> 15668 bytes icons/default/play.png | Bin 0 -> 17112 bytes icons/default/radio.png | Bin 0 -> 6506 bytes icons/default/recordingcutted.png | Bin 0 -> 4976 bytes icons/default/recordingdatetime.png | Bin 0 -> 9137 bytes icons/default/recordingfolder.png | Bin 0 -> 23322 bytes icons/default/rew.png | Bin 0 -> 18552 bytes icons/default/sd576i.png | Bin 0 -> 6717 bytes icons/default/signal.png | Bin 0 -> 2436 bytes icons/default/tracks.png | Bin 0 -> 29537 bytes icons/default/vdrlogo.png | Bin 0 -> 10150 bytes icons/default/vdrlogo_gen2vdr.png | Bin 0 -> 22710 bytes icons/green/Administrative Aufgaben.png | Bin 0 -> 24309 bytes icons/green/CAM.png | Bin 0 -> 18857 bytes icons/green/Channels.png | Bin 0 -> 21923 bytes icons/green/Commands.png | Bin 0 -> 19176 bytes icons/green/DVB.png | Bin 0 -> 13195 bytes icons/green/DiskUsage.png | Bin 0 -> 24797 bytes icons/green/EPG.png | Bin 0 -> 12566 bytes icons/green/LNB.png | Bin 0 -> 16340 bytes icons/green/Miscellaneous.png | Bin 0 -> 22602 bytes icons/green/OSD.png | Bin 0 -> 11173 bytes icons/green/Plugins.png | Bin 0 -> 17179 bytes icons/green/Recording.png | Bin 0 -> 20196 bytes icons/green/Recordings.png | Bin 0 -> 21341 bytes icons/green/Replay.png | Bin 0 -> 19573 bytes icons/green/Restart.png | Bin 0 -> 17197 bytes icons/green/Schedule.png | Bin 0 -> 23350 bytes icons/green/Setup.png | Bin 0 -> 22272 bytes icons/green/Timers.png | Bin 0 -> 23373 bytes icons/green/Tvguide.png | Bin 0 -> 21895 bytes icons/green/Videotext.png | Bin 0 -> 15387 bytes icons/green/activetimer.png | Bin 0 -> 5477 bytes icons/green/activetimersmall.png | Bin 0 -> 2085 bytes icons/green/daydelimiter.png | Bin 0 -> 24430 bytes icons/green/fwd.png | Bin 0 -> 20142 bytes icons/green/newrecording.png | Bin 0 -> 3115 bytes icons/green/pause.png | Bin 0 -> 17060 bytes icons/green/play.png | Bin 0 -> 18711 bytes icons/green/recordingcutted.png | Bin 0 -> 5008 bytes icons/green/recordingdatetime.png | Bin 0 -> 9158 bytes icons/green/recordingfolder.png | Bin 0 -> 22710 bytes icons/green/rew.png | Bin 0 -> 20000 bytes icons/green/tracks.png | Bin 0 -> 29986 bytes imageloader.c | 24 +++++++++-- menuitem.c | 22 ++++------ nopacity.c | 2 + themes/nOpacity-green.theme | 64 ++++++++++++++++++++++++++++++ 79 files changed, 99 insertions(+), 18 deletions(-) create mode 100644 icons/default/Administrative Aufgaben.png create mode 100644 icons/default/CAM.png create mode 100644 icons/default/Channels.png create mode 100644 icons/default/Channelseparator.png create mode 100644 icons/default/Commands.png create mode 100644 icons/default/DVB.png create mode 100644 icons/default/DiskUsage.png create mode 100644 icons/default/EPG.png create mode 100644 icons/default/LNB.png create mode 100644 icons/default/Miscellaneous.png create mode 100644 icons/default/OSD.png create mode 100644 icons/default/Plugins.png create mode 100644 icons/default/Recording.png create mode 100644 icons/default/Recordings.png create mode 100644 icons/default/Replay.png create mode 100644 icons/default/Restart.png create mode 100644 icons/default/Schedule.png create mode 100644 icons/default/Setup.png create mode 100644 icons/default/Timers.png create mode 100644 icons/default/Tvguide.png create mode 100644 icons/default/Videotext.png create mode 100644 icons/default/activetimer.png create mode 100644 icons/default/activetimersmall.png create mode 100644 icons/default/channelsymbols.png create mode 100644 icons/default/daydelimiter.png create mode 100644 icons/default/encrypted.png create mode 100644 icons/default/fwd.png create mode 100644 icons/default/hd1080i.png create mode 100644 icons/default/hd720p.png create mode 100644 icons/default/newrecording.png create mode 100644 icons/default/pause.png create mode 100644 icons/default/play.png create mode 100644 icons/default/radio.png create mode 100644 icons/default/recordingcutted.png create mode 100644 icons/default/recordingdatetime.png create mode 100644 icons/default/recordingfolder.png create mode 100644 icons/default/rew.png create mode 100644 icons/default/sd576i.png create mode 100644 icons/default/signal.png create mode 100644 icons/default/tracks.png create mode 100644 icons/default/vdrlogo.png create mode 100644 icons/default/vdrlogo_gen2vdr.png create mode 100644 icons/green/Administrative Aufgaben.png create mode 100644 icons/green/CAM.png create mode 100644 icons/green/Channels.png create mode 100644 icons/green/Commands.png create mode 100644 icons/green/DVB.png create mode 100644 icons/green/DiskUsage.png create mode 100644 icons/green/EPG.png create mode 100644 icons/green/LNB.png create mode 100644 icons/green/Miscellaneous.png create mode 100644 icons/green/OSD.png create mode 100644 icons/green/Plugins.png create mode 100644 icons/green/Recording.png create mode 100644 icons/green/Recordings.png create mode 100644 icons/green/Replay.png create mode 100644 icons/green/Restart.png create mode 100644 icons/green/Schedule.png create mode 100644 icons/green/Setup.png create mode 100644 icons/green/Timers.png create mode 100644 icons/green/Tvguide.png create mode 100644 icons/green/Videotext.png create mode 100644 icons/green/activetimer.png create mode 100644 icons/green/activetimersmall.png create mode 100644 icons/green/daydelimiter.png create mode 100644 icons/green/fwd.png create mode 100644 icons/green/newrecording.png create mode 100644 icons/green/pause.png create mode 100644 icons/green/play.png create mode 100644 icons/green/recordingcutted.png create mode 100644 icons/green/recordingdatetime.png create mode 100644 icons/green/recordingfolder.png create mode 100644 icons/green/rew.png create mode 100644 icons/green/tracks.png create mode 100644 themes/nOpacity-green.theme diff --git a/HISTORY b/HISTORY index 2b72b1e..cc8ef35 100644 --- a/HISTORY +++ b/HISTORY @@ -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 new file mode 100644 index 0000000..17f3758 Binary files /dev/null and b/icons/default/Administrative Aufgaben.png differ diff --git a/icons/default/CAM.png b/icons/default/CAM.png new file mode 100644 index 0000000..ef3f66a Binary files /dev/null and b/icons/default/CAM.png differ diff --git a/icons/default/Channels.png b/icons/default/Channels.png new file mode 100644 index 0000000..faf8126 Binary files /dev/null and b/icons/default/Channels.png differ diff --git a/icons/default/Channelseparator.png b/icons/default/Channelseparator.png new file mode 100644 index 0000000..906d35d Binary files /dev/null and b/icons/default/Channelseparator.png differ diff --git a/icons/default/Commands.png b/icons/default/Commands.png new file mode 100644 index 0000000..bebbe49 Binary files /dev/null and b/icons/default/Commands.png differ diff --git a/icons/default/DVB.png b/icons/default/DVB.png new file mode 100644 index 0000000..7c6cb4e Binary files /dev/null and b/icons/default/DVB.png differ diff --git a/icons/default/DiskUsage.png b/icons/default/DiskUsage.png new file mode 100644 index 0000000..f9f8a35 Binary files /dev/null and b/icons/default/DiskUsage.png differ diff --git a/icons/default/EPG.png b/icons/default/EPG.png new file mode 100644 index 0000000..9bfaf90 Binary files /dev/null and b/icons/default/EPG.png differ diff --git a/icons/default/LNB.png b/icons/default/LNB.png new file mode 100644 index 0000000..a275f3a Binary files /dev/null and b/icons/default/LNB.png differ diff --git a/icons/default/Miscellaneous.png b/icons/default/Miscellaneous.png new file mode 100644 index 0000000..e32b6c5 Binary files /dev/null and b/icons/default/Miscellaneous.png differ diff --git a/icons/default/OSD.png b/icons/default/OSD.png new file mode 100644 index 0000000..076e066 Binary files /dev/null and b/icons/default/OSD.png differ diff --git a/icons/default/Plugins.png b/icons/default/Plugins.png new file mode 100644 index 0000000..a7f3437 Binary files /dev/null and b/icons/default/Plugins.png differ diff --git a/icons/default/Recording.png b/icons/default/Recording.png new file mode 100644 index 0000000..4467dfc Binary files /dev/null and b/icons/default/Recording.png differ diff --git a/icons/default/Recordings.png b/icons/default/Recordings.png new file mode 100644 index 0000000..9d23ff4 Binary files /dev/null and b/icons/default/Recordings.png differ diff --git a/icons/default/Replay.png b/icons/default/Replay.png new file mode 100644 index 0000000..450e754 Binary files /dev/null and b/icons/default/Replay.png differ diff --git a/icons/default/Restart.png b/icons/default/Restart.png new file mode 100644 index 0000000..de21eaa Binary files /dev/null and b/icons/default/Restart.png differ diff --git a/icons/default/Schedule.png b/icons/default/Schedule.png new file mode 100644 index 0000000..396bb74 Binary files /dev/null and b/icons/default/Schedule.png differ diff --git a/icons/default/Setup.png b/icons/default/Setup.png new file mode 100644 index 0000000..0746ae7 Binary files /dev/null and b/icons/default/Setup.png differ diff --git a/icons/default/Timers.png b/icons/default/Timers.png new file mode 100644 index 0000000..1d43872 Binary files /dev/null and b/icons/default/Timers.png differ diff --git a/icons/default/Tvguide.png b/icons/default/Tvguide.png new file mode 100644 index 0000000..6c756b2 Binary files /dev/null and b/icons/default/Tvguide.png differ diff --git a/icons/default/Videotext.png b/icons/default/Videotext.png new file mode 100644 index 0000000..0419706 Binary files /dev/null and b/icons/default/Videotext.png differ diff --git a/icons/default/activetimer.png b/icons/default/activetimer.png new file mode 100644 index 0000000..8637ce3 Binary files /dev/null and b/icons/default/activetimer.png differ diff --git a/icons/default/activetimersmall.png b/icons/default/activetimersmall.png new file mode 100644 index 0000000..c6d78b1 Binary files /dev/null and b/icons/default/activetimersmall.png differ diff --git a/icons/default/channelsymbols.png b/icons/default/channelsymbols.png new file mode 100644 index 0000000..5d78bf1 Binary files /dev/null and b/icons/default/channelsymbols.png differ diff --git a/icons/default/daydelimiter.png b/icons/default/daydelimiter.png new file mode 100644 index 0000000..85e2640 Binary files /dev/null and b/icons/default/daydelimiter.png differ diff --git a/icons/default/encrypted.png b/icons/default/encrypted.png new file mode 100644 index 0000000..81b26d9 Binary files /dev/null and b/icons/default/encrypted.png differ diff --git a/icons/default/fwd.png b/icons/default/fwd.png new file mode 100644 index 0000000..13b4751 Binary files /dev/null and b/icons/default/fwd.png differ diff --git a/icons/default/hd1080i.png b/icons/default/hd1080i.png new file mode 100644 index 0000000..21351ce Binary files /dev/null and b/icons/default/hd1080i.png differ diff --git a/icons/default/hd720p.png b/icons/default/hd720p.png new file mode 100644 index 0000000..1d91b7d Binary files /dev/null and b/icons/default/hd720p.png differ diff --git a/icons/default/newrecording.png b/icons/default/newrecording.png new file mode 100644 index 0000000..38f6030 Binary files /dev/null and b/icons/default/newrecording.png differ diff --git a/icons/default/pause.png b/icons/default/pause.png new file mode 100644 index 0000000..e6577cf Binary files /dev/null and b/icons/default/pause.png differ diff --git a/icons/default/play.png b/icons/default/play.png new file mode 100644 index 0000000..b0c8a18 Binary files /dev/null and b/icons/default/play.png differ diff --git a/icons/default/radio.png b/icons/default/radio.png new file mode 100644 index 0000000..3a90a3e Binary files /dev/null and b/icons/default/radio.png differ diff --git a/icons/default/recordingcutted.png b/icons/default/recordingcutted.png new file mode 100644 index 0000000..3000f72 Binary files /dev/null and b/icons/default/recordingcutted.png differ diff --git a/icons/default/recordingdatetime.png b/icons/default/recordingdatetime.png new file mode 100644 index 0000000..9a42a93 Binary files /dev/null and b/icons/default/recordingdatetime.png differ diff --git a/icons/default/recordingfolder.png b/icons/default/recordingfolder.png new file mode 100644 index 0000000..687b149 Binary files /dev/null and b/icons/default/recordingfolder.png differ diff --git a/icons/default/rew.png b/icons/default/rew.png new file mode 100644 index 0000000..7055823 Binary files /dev/null and b/icons/default/rew.png differ diff --git a/icons/default/sd576i.png b/icons/default/sd576i.png new file mode 100644 index 0000000..85c3657 Binary files /dev/null and b/icons/default/sd576i.png differ diff --git a/icons/default/signal.png b/icons/default/signal.png new file mode 100644 index 0000000..4f03c7a Binary files /dev/null and b/icons/default/signal.png differ diff --git a/icons/default/tracks.png b/icons/default/tracks.png new file mode 100644 index 0000000..cf19b7e Binary files /dev/null and b/icons/default/tracks.png differ diff --git a/icons/default/vdrlogo.png b/icons/default/vdrlogo.png new file mode 100644 index 0000000..33294b0 Binary files /dev/null and b/icons/default/vdrlogo.png differ diff --git a/icons/default/vdrlogo_gen2vdr.png b/icons/default/vdrlogo_gen2vdr.png new file mode 100644 index 0000000..3abbd2f Binary files /dev/null and b/icons/default/vdrlogo_gen2vdr.png differ diff --git a/icons/green/Administrative Aufgaben.png b/icons/green/Administrative Aufgaben.png new file mode 100644 index 0000000..6989268 Binary files /dev/null and b/icons/green/Administrative Aufgaben.png differ diff --git a/icons/green/CAM.png b/icons/green/CAM.png new file mode 100644 index 0000000..e41154d Binary files /dev/null and b/icons/green/CAM.png differ diff --git a/icons/green/Channels.png b/icons/green/Channels.png new file mode 100644 index 0000000..c3d9972 Binary files /dev/null and b/icons/green/Channels.png differ diff --git a/icons/green/Commands.png b/icons/green/Commands.png new file mode 100644 index 0000000..86bf018 Binary files /dev/null and b/icons/green/Commands.png differ diff --git a/icons/green/DVB.png b/icons/green/DVB.png new file mode 100644 index 0000000..64df32d Binary files /dev/null and b/icons/green/DVB.png differ diff --git a/icons/green/DiskUsage.png b/icons/green/DiskUsage.png new file mode 100644 index 0000000..5120eaf Binary files /dev/null and b/icons/green/DiskUsage.png differ diff --git a/icons/green/EPG.png b/icons/green/EPG.png new file mode 100644 index 0000000..b3a7b7b Binary files /dev/null and b/icons/green/EPG.png differ diff --git a/icons/green/LNB.png b/icons/green/LNB.png new file mode 100644 index 0000000..ab377e8 Binary files /dev/null and b/icons/green/LNB.png differ diff --git a/icons/green/Miscellaneous.png b/icons/green/Miscellaneous.png new file mode 100644 index 0000000..e070f9e Binary files /dev/null and b/icons/green/Miscellaneous.png differ diff --git a/icons/green/OSD.png b/icons/green/OSD.png new file mode 100644 index 0000000..2a5efe9 Binary files /dev/null and b/icons/green/OSD.png differ diff --git a/icons/green/Plugins.png b/icons/green/Plugins.png new file mode 100644 index 0000000..85e03ef Binary files /dev/null and b/icons/green/Plugins.png differ diff --git a/icons/green/Recording.png b/icons/green/Recording.png new file mode 100644 index 0000000..e1b0707 Binary files /dev/null and b/icons/green/Recording.png differ diff --git a/icons/green/Recordings.png b/icons/green/Recordings.png new file mode 100644 index 0000000..bbc63ef Binary files /dev/null and b/icons/green/Recordings.png differ diff --git a/icons/green/Replay.png b/icons/green/Replay.png new file mode 100644 index 0000000..8994794 Binary files /dev/null and b/icons/green/Replay.png differ diff --git a/icons/green/Restart.png b/icons/green/Restart.png new file mode 100644 index 0000000..598f71a Binary files /dev/null and b/icons/green/Restart.png differ diff --git a/icons/green/Schedule.png b/icons/green/Schedule.png new file mode 100644 index 0000000..c6b97c1 Binary files /dev/null and b/icons/green/Schedule.png differ diff --git a/icons/green/Setup.png b/icons/green/Setup.png new file mode 100644 index 0000000..0abeda0 Binary files /dev/null and b/icons/green/Setup.png differ diff --git a/icons/green/Timers.png b/icons/green/Timers.png new file mode 100644 index 0000000..242f8ee Binary files /dev/null and b/icons/green/Timers.png differ diff --git a/icons/green/Tvguide.png b/icons/green/Tvguide.png new file mode 100644 index 0000000..6ed25dc Binary files /dev/null and b/icons/green/Tvguide.png differ diff --git a/icons/green/Videotext.png b/icons/green/Videotext.png new file mode 100644 index 0000000..1beab83 Binary files /dev/null and b/icons/green/Videotext.png differ diff --git a/icons/green/activetimer.png b/icons/green/activetimer.png new file mode 100644 index 0000000..6958d49 Binary files /dev/null and b/icons/green/activetimer.png differ diff --git a/icons/green/activetimersmall.png b/icons/green/activetimersmall.png new file mode 100644 index 0000000..5ac3afe Binary files /dev/null and b/icons/green/activetimersmall.png differ diff --git a/icons/green/daydelimiter.png b/icons/green/daydelimiter.png new file mode 100644 index 0000000..cd17d09 Binary files /dev/null and b/icons/green/daydelimiter.png differ diff --git a/icons/green/fwd.png b/icons/green/fwd.png new file mode 100644 index 0000000..e54ab87 Binary files /dev/null and b/icons/green/fwd.png differ diff --git a/icons/green/newrecording.png b/icons/green/newrecording.png new file mode 100644 index 0000000..51211ff Binary files /dev/null and b/icons/green/newrecording.png differ diff --git a/icons/green/pause.png b/icons/green/pause.png new file mode 100644 index 0000000..a3d7b8a Binary files /dev/null and b/icons/green/pause.png differ diff --git a/icons/green/play.png b/icons/green/play.png new file mode 100644 index 0000000..fcd91c9 Binary files /dev/null and b/icons/green/play.png differ diff --git a/icons/green/recordingcutted.png b/icons/green/recordingcutted.png new file mode 100644 index 0000000..41c952f Binary files /dev/null and b/icons/green/recordingcutted.png differ diff --git a/icons/green/recordingdatetime.png b/icons/green/recordingdatetime.png new file mode 100644 index 0000000..4a9243a Binary files /dev/null and b/icons/green/recordingdatetime.png differ diff --git a/icons/green/recordingfolder.png b/icons/green/recordingfolder.png new file mode 100644 index 0000000..dd75881 Binary files /dev/null and b/icons/green/recordingfolder.png differ diff --git a/icons/green/rew.png b/icons/green/rew.png new file mode 100644 index 0000000..1983cfe Binary files /dev/null and b/icons/green/rew.png differ diff --git a/icons/green/tracks.png b/icons/green/tracks.png new file mode 100644 index 0000000..7565c0d Binary files /dev/null and b/icons/green/tracks.png differ 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; diff --git a/menuitem.c b/menuitem.c index 89ecc60..b5c1ffd 100644 --- a/menuitem.c +++ b/menuitem.c @@ -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) { diff --git a/nopacity.c b/nopacity.c index 5316570..9ff4236 100644 --- a/nopacity.c +++ b/nopacity.c @@ -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 -- cgit v1.2.3