From 538d53036cb474c70fb6cd908add0ee8ece721e7 Mon Sep 17 00:00:00 2001 From: Syed Khaja Moinuddin Date: Fri, 29 Mar 2013 21:58:17 +0900 Subject: [PATCH] Applied new bitmaps in EditTime control Signed-off-by: Syed Khaja Moinuddin Change-Id: I6957675183e2d1be9d170eea658cde9104abf769 Signed-off-by: Syed Khaja Moinuddin --- ...ker_tail_01.png => 00_time_picker_number_bg.#.png} | Bin 2931 -> 2848 bytes ...00_timepicker_tail.png => 00_time_picker_tail.png} | Bin 2940 -> 2927 bytes .../00_time_picker_tail_01.png} | Bin 2994 -> 2937 bytes .../osp/bitmaps/480x800/00_timepicker_number_bg.#.png | Bin 978 -> 0 bytes ...number_bg.#.png => 00_time_picker_number_bg.#.png} | Bin ...timepicker_tail_01.png => 00_time_picker_tail.png} | Bin 3005 -> 2990 bytes .../osp/bitmaps/720x1280/00_time_picker_tail_01.png | Bin 0 -> 3013 bytes src/ui/inc/FUi_ResourceEditTimeConfig.h | 3 ++- src/ui/resource/FUi_ResourceDateTimeBarConfig.cpp | 8 ++++---- src/ui/resource/FUi_ResourceEditTimeConfig.cpp | 1 + 10 files changed, 7 insertions(+), 5 deletions(-) rename res/common/usr/share/osp/bitmaps/480x800/{00_timepicker_tail_01.png => 00_time_picker_number_bg.#.png} (91%) mode change 100755 => 100644 rename res/common/usr/share/osp/bitmaps/480x800/{00_timepicker_tail.png => 00_time_picker_tail.png} (91%) mode change 100755 => 100644 rename res/common/usr/share/osp/bitmaps/{720x1280/00_timepicker_tail.png => 480x800/00_time_picker_tail_01.png} (89%) mode change 100755 => 100644 delete mode 100755 res/common/usr/share/osp/bitmaps/480x800/00_timepicker_number_bg.#.png rename res/common/usr/share/osp/bitmaps/720x1280/{00_timepicker_number_bg.#.png => 00_time_picker_number_bg.#.png} (100%) mode change 100755 => 100644 rename res/common/usr/share/osp/bitmaps/720x1280/{00_timepicker_tail_01.png => 00_time_picker_tail.png} (89%) mode change 100755 => 100644 create mode 100644 res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_tail_01.png diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_timepicker_tail_01.png b/res/common/usr/share/osp/bitmaps/480x800/00_time_picker_number_bg.#.png old mode 100755 new mode 100644 similarity index 91% rename from res/common/usr/share/osp/bitmaps/480x800/00_timepicker_tail_01.png rename to res/common/usr/share/osp/bitmaps/480x800/00_time_picker_number_bg.#.png index ce2ce538b0f1548343cc597cb2e2f7276ae2d1ff..97ae24d5200d88f3f36e6e5f8d0a3aaa6106378d GIT binary patch delta 139 zcmew?wm?j=Gr-TCmrII^fq{Y7)59eQNb`X(2OE%-_t3q#QE@(3g14uOV@SoVGm{MY z4k++2zYqBTKefEERY^rcW4qPFsW;RXy0d099iFM85TDxQkvLgi?6vYXnc_cg=dJpp m3e)@iU*A*O2Q={ie`bc@Kz^C;%DgTe~DWM4fkGf9w diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_timepicker_tail.png b/res/common/usr/share/osp/bitmaps/480x800/00_time_picker_tail.png old mode 100755 new mode 100644 similarity index 91% rename from res/common/usr/share/osp/bitmaps/480x800/00_timepicker_tail.png rename to res/common/usr/share/osp/bitmaps/480x800/00_time_picker_tail.png index 44fe43a3b006ccbb305f5b0abc71ff75f4e4fb22..8070e22c41041415e9c644b8c7c2e08670f8cbbd GIT binary patch delta 219 zcmV<103`qX7Vj1ziBL{Q4GJ0x0000DNk~Le0000I0000C2nGNE0B;iQys;sl3V)hO zL_t(|+N{wr3c@fLK;hRG3a&z@p24ZBCvo)vo}}RF>KUAzoIHjgIC%iU>A57JqG>87 zyzS=;?*c7P@h0zN3l*piwq>T`7j2}#M=nSu+`RP3V)|b zL_t(|+N{vA3Bo`eM)4PvfFM{|rF8&X!2z^)1Hld4zzqZkZ~$j;0GF`U#!66xXJHOR z^ezeB@w$&+@y}HL`Pu+v$z2b~fpc^vWNHd*0Xv`zOo4k0L?!W8zE+Cs=u(s5>>>_So&x}EzS*x-HwqL000006 zL_t(|+Qid63c@e|#qn1Mp_7v!2!h}Z1VQNPS}0;a(xx`>mL%jC$cqE0icwQVBR}lOlcUCeVMkp_J4u_|7YEEDT*Nstvot;f za>4%BOn?}d3yWFI$^+3W2NpxbGjn0b1>xF-MGJAwuybn<7InnI;6WC);I(1>0>r2o zET-lk1rT>cCm$^ODP>B_DXDC6XftD((&A@_-(}icK*P+l!Yhj?pXc(DVKK3chPffy kzhN;bSf;cbqh)&y0B3I2A%&?iy#N3J07*qoM6N<$f_Rg4O8@`> diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_timepicker_number_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_timepicker_number_bg.#.png deleted file mode 100755 index 41009daad33aa9428f4ea18e12335aa1cb507ba8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmaJ=O=}ZD7+$GJskBNFL_wHtFA8R7Ce3cTOV&2YCMMvPk_4KQbhA52)^=yMyHm3* zc=2SR{tNXa;@yLSJ=CLDPyPY%4+wQOO;Qi03$ydV^E~hKzVpt}=Emdsxw~_cB+b`r zRzu9U(lL8Y{9hm4n-|j^UTO0t>+*pU5vl004gvMR>5&F;yo0@Oq##K%vfpa+w*AC# zS)e#6MoEHDuqCOmmV}PGLpbP=o=;8r_ovS?@I6!BQf*|1WzzR+hY@KWZnWIP9as0{ zwMU?k7(yT*+yP0jOJgH3<)N-2*6A^n!4SfCO!?eY+uj6a77?H-DB~gx11+cE9MW_8 zLy$!nL7asspTWpb^9I6T^vNPx}v%TvSW>QVHu?4pnn`OB-`7 z=I#fC@-f%D;FhLx(^d#V5!oV<|D1T$hy`Gnvf)qnvN~07#Pz0o(Wi2uFay(z{pX^` zN1}Vu<)m%JX43eCif)fYTkpO2btaxfwQdz#$&b#Tv$M6Cr7x$av(1xQ&9ts8&p6E^ z>3IG0WSyXAKVPAn556xvg)0m6_F{AO_}$kf3a-C@^LBCj>MWAx$c_8F@KH-&S-rAh JeJE|e{0rWKEh7K` diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_timepicker_number_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_number_bg.#.png old mode 100755 new mode 100644 similarity index 100% rename from res/common/usr/share/osp/bitmaps/720x1280/00_timepicker_number_bg.#.png rename to res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_number_bg.#.png diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_timepicker_tail_01.png b/res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_tail.png old mode 100755 new mode 100644 similarity index 89% rename from res/common/usr/share/osp/bitmaps/720x1280/00_timepicker_tail_01.png rename to res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_tail.png index 6710de00eb34f98227a9c2af1c970cc507b7c25f..eea39f7cafbbd67a7373d88251558ff4ee8424f5 GIT binary patch delta 282 zcmV+#0pH&I&R&9s2t$KrK6%jo{M60$j zd|T8gHO<`H+~&vG+&?~-dptlzO-TjLZNenqVFCPqc1xbM9Uo}x`=DaiEjhK&yR^3;%M-sWj;)l5gUtNo#esh*i|S(^z1P) zw1ncE5e;)pv@;5km0eO{lAx+#A+i#tWA{R=9YAr$Y1qsm#N#W1PfQFPLvc=s`V$kK goQ25B7UACp0D|&ZpLg{=8vpGf|WNA1i{wIV^|5cwq8Q8-2>QK+t><%;0*-9%2p6Q zi>%e`adCvsKJBm@BgT2n z4@FwE)Mjg7$a`&p}r&MFtIergCOzyHRBKi&3z!%B2 vH+}jGfV`rhilmm%(yQGYoHL60Q(OlCe2Fpr**7m500000NkvXXu0mjfL;id& diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_tail_01.png b/res/common/usr/share/osp/bitmaps/720x1280/00_time_picker_tail_01.png new file mode 100644 index 0000000000000000000000000000000000000000..922ae4f05c788170c98d0664b94c4321b5c9f6e0 GIT binary patch literal 3013 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 Hu0mjf`4p6_ literal 0 HcmV?d00001 diff --git a/src/ui/inc/FUi_ResourceEditTimeConfig.h b/src/ui/inc/FUi_ResourceEditTimeConfig.h index 21d2dd0..9962b6c 100755 --- a/src/ui/inc/FUi_ResourceEditTimeConfig.h +++ b/src/ui/inc/FUi_ResourceEditTimeConfig.h @@ -43,6 +43,7 @@ DECLARE_UI_CONFIG(EDITTIME); DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL,5); DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED,6); DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED,7); + DECLARE_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED,8); DECLARE_SHAPE_CONFIG(WIDTH,1); DECLARE_SHAPE_CONFIG(HEIGHT,2); DECLARE_SHAPE_CONFIG(TIME_WIDTH,3); @@ -63,4 +64,4 @@ DECLARE_UI_CONFIG(EDITTIME); DECLARE_DIMENSION_CONFIG(MIN_SIZE,1); DECLARE_END_UI_CONFIG(EDITTIME); -#endif //_FUI_RESOURCE_EDIT_TIME_CONFIG_H_ \ No newline at end of file +#endif //_FUI_RESOURCE_EDIT_TIME_CONFIG_H_ diff --git a/src/ui/resource/FUi_ResourceDateTimeBarConfig.cpp b/src/ui/resource/FUi_ResourceDateTimeBarConfig.cpp index 485ef55..8f19e75 100755 --- a/src/ui/resource/FUi_ResourceDateTimeBarConfig.cpp +++ b/src/ui/resource/FUi_ResourceDateTimeBarConfig.cpp @@ -28,9 +28,9 @@ START_UI_CONFIG(DATETIMEBAR); ADD_COLOR_CONFIG(TEXT_NORMAL, $W084); ADD_COLOR_CONFIG(TEXT_PRESSED, $W084P); - ADD_IMAGE_CONFIG(TIMEPICKERBAR_BG_NORMAL, #00_timepicker_number_bg.#.png); - ADD_IMAGE_CONFIG(TAIL_DOWN, #00_timepicker_tail.png); - ADD_IMAGE_CONFIG(TAIL_UP, #00_timepicker_tail_01.png); + ADD_IMAGE_CONFIG(TIMEPICKERBAR_BG_NORMAL, #00_time_picker_number_bg.#.png); + ADD_IMAGE_CONFIG(TAIL_DOWN, #00_time_picker_tail.png); + ADD_IMAGE_CONFIG(TAIL_UP, #00_time_picker_tail_01.png); START_UI_CONFIG_MODE(800x480); { @@ -53,7 +53,7 @@ START_UI_CONFIG(DATETIMEBAR); ADD_SHAPE_CONFIG(MONTH_LEFT_RIGHT_MARGIN, 15); ADD_SHAPE_CONFIG(YEAR_LEFT_RIGHT_MARGIN, 16); - ADD_SHAPE_CONFIG(ARROW_WIDTH, 30); + ADD_SHAPE_CONFIG(ARROW_WIDTH, 27); ADD_SHAPE_CONFIG(ARROW_HEIGHT, 18); ADD_SHAPE_CONFIG(DAY_FONT_SIZE, 48); diff --git a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp index aa19a28..6a29b1a 100755 --- a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp +++ b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp @@ -40,6 +40,7 @@ START_UI_CONFIG(EDITTIME); ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_button_01.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_button_01.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_DISABLED, #00_button_01.#.png); + ADD_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, #00_button_01_focus.png); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_button_01_ef.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png); -- 2.7.4