From 02dd542ea5bbd658357d74b8eaf3aba8b92f0194 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 12 Aug 2013 01:38:32 +0200 Subject: [PATCH] Renamed section left/right images Since we adopted the circular navigation, there is no more need for separate enabled and disabled images. --- data/skins/320x240/Default/imgs/l_disabled.png | Bin 153 -> 0 bytes data/skins/320x240/Default/imgs/r_disabled.png | Bin 265 -> 0 bytes .../Default/imgs/{l_enabled.png => section-l.png} | Bin .../Default/imgs/{r_enabled.png => section-r.png} | Bin data/skins/800x480/Default/imgs/l_disabled.png | Bin 278 -> 0 bytes data/skins/800x480/Default/imgs/r_disabled.png | Bin 398 -> 0 bytes .../Default/imgs/{l_enabled.png => section-l.png} | Bin .../Default/imgs/{r_enabled.png => section-r.png} | Bin src/menu.cpp | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 data/skins/320x240/Default/imgs/l_disabled.png delete mode 100644 data/skins/320x240/Default/imgs/r_disabled.png rename data/skins/320x240/Default/imgs/{l_enabled.png => section-l.png} (100%) rename data/skins/320x240/Default/imgs/{r_enabled.png => section-r.png} (100%) delete mode 100644 data/skins/800x480/Default/imgs/l_disabled.png delete mode 100644 data/skins/800x480/Default/imgs/r_disabled.png rename data/skins/800x480/Default/imgs/{l_enabled.png => section-l.png} (100%) rename data/skins/800x480/Default/imgs/{r_enabled.png => section-r.png} (100%) diff --git a/data/skins/320x240/Default/imgs/l_disabled.png b/data/skins/320x240/Default/imgs/l_disabled.png deleted file mode 100644 index cb55df3a53f0defe0eac79c3f76ef102c2e76a2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^Ahr<;GmxBa8twt<74`c#K2#66%I|t;m zlmz(&`!Gm3US7_12*@|}ba4!k2u~JZVPtb;Wn*(?Q)FXfQ)5e1IC)0l00WbWN~DKs qY|MsP&dfqWOcO3NwD4F=VYt7D<^73>m&rf_7(8A5T-G@yGywp8ax9ks diff --git a/data/skins/320x240/Default/imgs/r_disabled.png b/data/skins/320x240/Default/imgs/r_disabled.png deleted file mode 100644 index 1a08428e090e645a0857d582fb56de7f82c45c58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rvihP)KJ+$WZ>WcTcv{?{5w3W z+J{=-9xu4Z<`}}PYWtXCiN&eXpIBk^Q|Ws8)$FfLu)fX@+%~~kbgTe~DWM4f9tB~m diff --git a/data/skins/800x480/Default/imgs/r_disabled.png b/data/skins/800x480/Default/imgs/r_disabled.png deleted file mode 100644 index 702ed6aa4419b717f29346275602b8c2819b82c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^Ahrev8v_I5hQMesAcwIy$lZxy-8q?;Kn`1yx4R3& ze-K=-cll(X2xoyuWHAE+w=f7ZGR&GI0Tg5}@$_|Nzs|$ND<#3+ACwFhE)};L{5N&a_jcQz7x?eKGHF>NFXw;x z8v)xq?sVSwY^r5Ce}MPHB;k|K_Ho}~Tr6bx)r$R`*TUld-v?4v>epzcvBfYxzIIvr pUixjzf16L1D1~KPh{itQ_7Cwc`f}r$2r#f1JYD@<);T3K0RYGjlso_c diff --git a/data/skins/800x480/Default/imgs/l_enabled.png b/data/skins/800x480/Default/imgs/section-l.png similarity index 100% rename from data/skins/800x480/Default/imgs/l_enabled.png rename to data/skins/800x480/Default/imgs/section-l.png diff --git a/data/skins/800x480/Default/imgs/r_enabled.png b/data/skins/800x480/Default/imgs/section-r.png similarity index 100% rename from data/skins/800x480/Default/imgs/r_enabled.png rename to data/skins/800x480/Default/imgs/section-r.png diff --git a/src/menu.cpp b/src/menu.cpp index 055d834..0d45d5b 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -229,8 +229,8 @@ void Menu::paint(Surface &s) { s.write(&font, sections[j], x, topBarHeight - sectionLinkPadding, Font::HAlignCenter, Font::VAlignBottom); } - sc.skinRes("imgs/l_enabled.png")->blit(&s, 0, 0); - sc.skinRes("imgs/r_enabled.png")->blit(&s, width - 10, 0); + sc.skinRes("imgs/section-l.png")->blit(&s, 0, 0); + sc.skinRes("imgs/section-r.png")->blit(&s, width - 10, 0); vector §ionLinks = links[iSection]; const uint numLinks = sectionLinks.size();