pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] r2739 - in branches/pingus_sdl: data/images/core/menu src


From: nehalmistry
Subject: [Pingus-CVS] r2739 - in branches/pingus_sdl: data/images/core/menu src
Date: Tue, 17 Jul 2007 01:21:05 +0200

Author: nehalmistry
Date: 2007-07-17 01:20:53 +0200 (Tue, 17 Jul 2007)
New Revision: 2739

Modified:
   branches/pingus_sdl/data/images/core/menu/exit_button_hover.png
   branches/pingus_sdl/data/images/core/menu/exit_button_normal.png
   branches/pingus_sdl/data/images/core/menu/exit_button_pressed.png
   branches/pingus_sdl/src/exit_menu.cpp
   branches/pingus_sdl/src/file_dialog.cpp
Log:
clean up positioning of GUI::SurfaceButton buttons

Modified: branches/pingus_sdl/data/images/core/menu/exit_button_hover.png
===================================================================
--- branches/pingus_sdl/data/images/core/menu/exit_button_hover.png     
2007-07-15 06:06:16 UTC (rev 2738)
+++ branches/pingus_sdl/data/images/core/menu/exit_button_hover.png     
2007-07-16 23:20:53 UTC (rev 2739)
@@ -1,6 +1,9 @@
 �PNG
 
-
-���c�/��݉IֲE���P��B���>e��]��ݺ�3҆��b�_,�;"��/�
-V��hZc�i�e_T�e}��"address@hidden,rk��#���c�HY���t���v�ǂsɂu۰��(o��quuqe0X�L���=�tu>�yr�&������RiFW�g!��F�_�+>o����kgU���
     �$k*'!,Af��#�C'���)�`���_3��������ZS;\9�t
-kϸ5����^��x[H���
�t�$Ϥ$R�J�*U�T�7�Y��
�
\ No newline at end of file
+
+*h=��D����C9)i�{g��YUt��x�|K���%�2���s�z�^�Ps��>Z|���^��3����^�n�l��^
 �"�������UPGQ�r+p���$<'5$r2������*��X4_�"z��� �'I���4��^+��:�RtJ��� 
�UK� k���9~i����f�Rx�x�:��ZlB�݁*�Fʍ�U����   
�z���Z��B�L�+�M���F��~W|ų���gY^O�][x<Ѭ�L�+7�Z��.�4>#k�m��%=!�����l���L#]<�_;?�TՒ�9�*�h\╀+�R����I���gn%$m٢hhI$^�?$�'Y�
+
+���(#)��l�N�4̠V����R�M
���Ά�'��3t,�
�p���b"�o���A�{���&(�2o      \Q      �hc������D%;
+�Mh��{��۪n�A�S�sCىT����Ɇ�X��r��)/me1^"�Z�T�۪��XS�����]�Wӆ0���w�
+��LE��&Q3ƉpV2�"�͉��z�AS+kC
+�-����֊��k�Y�P���&�/?*q{�������E�x�J�T�Aϒ�ya��x*>88��N���*F�ٖ%�!�En
��l�(��٪n�����Hxfz�M��~����F~eay0��M��9�[�:��,9e�SZR�'�T����Y��џ��i��x}+�#�VO�n��c&I�T4N"X��vG���/RN�!$�b|㕳�S��^���+�ۿ���\2/��n$d؂�7.��ݷգ�ΔޱB��M��Du�Y����'���7MfLKҏ<�9L�~J;Џ5�6���u�
\ No newline at end of file

Modified: branches/pingus_sdl/data/images/core/menu/exit_button_normal.png
===================================================================
--- branches/pingus_sdl/data/images/core/menu/exit_button_normal.png    
2007-07-15 06:06:16 UTC (rev 2738)
+++ branches/pingus_sdl/data/images/core/menu/exit_button_normal.png    
2007-07-16 23:20:53 UTC (rev 2739)
@@ -1,6 +1,4 @@
 �PNG
 
-
-kf�ˌ��������F�$+Q����l��Cؘ���{�?Yj��9�������(Nvy��}�ԩHjK��)��zƵ�t�K6˗௵��|���6,'G��p��,ڥ�i�6���l�UA~"��
��PT�p/��� ��Y�*4���C7E2��C�!���d�����f��~�*�T�g-g�I]ro���
-��![Y��b��I���TjQ���Dv^e�6���㐠�†O�b笛�ysk���d�����>A��r��P��UƚY�e��RO����&���X#s)��ۈX�w\���Y�`�:yx�c5.�\ɛ�a1km�����2�Jܥ�d��A����ϧO�-t�e�*hA!c/address@hidden
-���D�RH��J&��b��ԅ�Hn"ˣ'38�I���^v�������)6�"�M�7�!�3�C;��/�/�=��ԮX��?�.|��V�2�EK���A�~�����[��DyJ�b��Ivڱ�����aXr��t�=�K�4,�:ݤL������Cѫ�/�_���j�c��d���܃_O�
 ��$���h�|t���aQ_H�<�j���z�f�~�r�|r��23p�c([��{����e-��K[� "sO 
9���p8��?�'�
\ No newline at end of file
+
+~m,Ƃ����2��G����l؂[�"�K�X=
\ No newline at end of file

Modified: branches/pingus_sdl/data/images/core/menu/exit_button_pressed.png
===================================================================
--- branches/pingus_sdl/data/images/core/menu/exit_button_pressed.png   
2007-07-15 06:06:16 UTC (rev 2738)
+++ branches/pingus_sdl/data/images/core/menu/exit_button_pressed.png   
2007-07-16 23:20:53 UTC (rev 2739)
@@ -1,12 +1,10 @@
 �PNG
 
-
-����S�k=      
тi���(���0���G���w�N?�R���ћa�Y(address@hidden'�]٩���`}*���[�f�J��~�}���:B�w����=�=~����i*

6n��kh3"�g�W<�.گ�D�<R>�K=m��28���XK�/zUc;��t{<��YeA�C���]�N~^{׽���T��p;k����1�7do�8��:$�����?�a��,���&D��U��>tf����`��b��yx�#@
 
�A53Z�Ҝ��I?6t$kq,�r��A�)�'ܺH�U/��|h��ڰ�}�9-T���>������H��w�S�rVUF���=��%p
-
-9U��l�
address@hidden;��/��FM�:�7�볓��T      t+O���L4r<��/y*

-�r��U��`Ae�1���֗y7�Z�T����ǐ$$]o�y�8$�ޒ'��!����'�wu>�u2j����y��       
!�6b�#����Fy���K������*Yl�볞�����F�W_�.��0a�Q�
-a�4Nc�;�a��)�uD��rViU���qa���‡D
-����jWuN�1Y兢��K��ߨowCe������/U��΁�m�t��¬��2�J3�������)#��=���&|�.�
޵ݾ{��hլ��#rQ��eۅ�
-*`0ᘵ�YS�cV��O8|e��h�Zo�J���kgFiY�4|8�lo�m5�w��f:�O�m�O��ʛ�^�������aFa�����F6����
-:<��/k����-�E�38查��A*jϏ��Ł�=���BT��*?��
-Bŋ5�VX��0kR�<J�?���(5��Da=�-[    
!u���fVB�����g����B<Z�,�>[Z>ɗ�r�"���կ��f���R�p��Cx�/address@hidden
z�Z�+�eI���S��W�:k�I�Uu�{�2����-�����eե7�%0���7x��`�Hg��ۡ0��bRldP��t�zoa'ZUc�c��e%�f��w1111111�?�
    address@hidden
\ No newline at end of file
+
+�����`=��}t�ԨՂv0����%�����~TّTt���GTh�a�N0ܬ�O2��^��~��.5�
+�Ԥ���n~��K�?�������Mlku=�^�� +�14Dp)���~����K�T� 
~��%���7l��6�4�?��˵o�����y���J��W���:4�fPV��|�YM�˟�Pխ���<�6)�]���_�7���3�����Qz���#�nϐ�qu�p:�h�D|��~m�R(tC}|i�PH����miLx�S?�Lj���l�2�j��xЋ�l�n}߭�U,[KlLN�!�
ђ�5�����w����N���QQ����z_���T�|address@hidden>�cS�7��Q�Q�)�����ˆB
sZ�)������X���g���t���#2�&���#/��*�v�ީ�D�D�U
+�H?�;$Ȥf،�0����&�B�j]�+F¯��v�1�=�
+�=�~fv��l�h����8
+I,ʊ�e�w�       �!s��o%�Z��Ы��G�V��c|�!���[_��0�
+<��>�Sko���(r,@   
xl�*���ж(EEu���f��tl���6�������eK��;�fg���X:Ԣ)jP]��sӯf��v�Z�����ˆ��nۧy4-�<Q�u��߈2#�
 �D
+L�ч��v������tD� I��\��ꑐ�����|�'��!
v��߹y3���܁����ʇQ��aJ����,˲,��O��}s�C
\ No newline at end of file

Modified: branches/pingus_sdl/src/exit_menu.cpp
===================================================================
--- branches/pingus_sdl/src/exit_menu.cpp       2007-07-15 06:06:16 UTC (rev 
2738)
+++ branches/pingus_sdl/src/exit_menu.cpp       2007-07-16 23:20:53 UTC (rev 
2739)
@@ -31,7 +31,7 @@
   PingusMenuManager* manager;
 public:
   ExitMenuYesButton (PingusMenuManager* m)
-    : GUI::SurfaceButton(Display::get_width()/2 - 170,
+    : GUI::SurfaceButton(Display::get_width()/2 - 80,
                          Display::get_height()/2 + 15,
                          ResDescriptor("core/menu/exit_button_normal"),
                          ResDescriptor("core/menu/exit_button_pressed"),
@@ -43,7 +43,7 @@
   void draw (DrawingContext& gc) {
     SurfaceButton::draw(gc);
     gc.print_right(Fonts::chalk_large, (float)Display::get_width()/2 - 80,
-                   (float)Display::get_height()/2 + 25, _("Yes"));
+                   (float)Display::get_height()/2 + 15, _("Yes"));
   }
 
   void on_click()
@@ -65,7 +65,7 @@
   PingusMenuManager* manager;
 public:
   ExitMenuNoButton (PingusMenuManager* m)
-    : GUI::SurfaceButton(Display::get_width()/2, Display::get_height()/2 + 15,
+    : GUI::SurfaceButton(Display::get_width()/2 + 80, Display::get_height()/2 
+ 15,
                          ResDescriptor("core/menu/exit_button_normal"),
                          ResDescriptor("core/menu/exit_button_pressed"),
                          ResDescriptor("core/menu/exit_button_hover")),
@@ -76,7 +76,7 @@
   void draw (DrawingContext& gc) {
     SurfaceButton::draw(gc);
     gc.print_right(Fonts::chalk_large, (float)Display::get_width()/2 + 80,
-                   (float)Display::get_height()/2 + 25, _("No"));
+                   (float)Display::get_height()/2 + 15, _("No"));
   }
 
   void on_click() {

Modified: branches/pingus_sdl/src/file_dialog.cpp
===================================================================
--- branches/pingus_sdl/src/file_dialog.cpp     2007-07-15 06:06:16 UTC (rev 
2738)
+++ branches/pingus_sdl/src/file_dialog.cpp     2007-07-16 23:20:53 UTC (rev 
2739)
@@ -31,6 +31,7 @@
 #include "file_dialog_item.hpp"
 #include "file_dialog_listener.hpp"
 
+#define CANCEL_TEXT _("Cancel")
 
        const int DIR_UP = 0;
        const int DIR_DOWN = 1;
@@ -44,7 +45,7 @@
 
        public:
                FileDialogOkButton (FileDialog *f, std::string l)
-                       : GUI::SurfaceButton(Display::get_width()/2 + 170,
+                       : GUI::SurfaceButton(Display::get_width()/2 + 230,
                        Display::get_height()/2 + 160,
                        ResDescriptor("core/menu/exit_button_normal"),
                        ResDescriptor("core/menu/exit_button_pressed"),
@@ -59,7 +60,7 @@
                        if (!is_hidden)
                        {
                                SurfaceButton::draw(gc);
-                               gc.print_right(Fonts::chalk_large, 
(float)Display::get_width()/2 + 200,
+                               gc.print_right(Fonts::chalk_large, 
(float)Display::get_width()/2 + 230,
                                        (float)Display::get_height()/2 + 160, 
label);
                        }
                }
@@ -94,7 +95,7 @@
 
        public:
                FileDialogCancelButton (FileDialog* f)
-                       : GUI::SurfaceButton(Display::get_width()/2 - 280,
+                       : GUI::SurfaceButton(Display::get_width()/2 - 280 + 
Fonts::chalk_large.get_width(CANCEL_TEXT),
                        Display::get_height()/2 + 160,
                        ResDescriptor("core/menu/exit_button_normal"),
                        ResDescriptor("core/menu/exit_button_pressed"),
@@ -105,8 +106,8 @@
 
                void draw (DrawingContext& gc) {
                        SurfaceButton::draw(gc);
-                       gc.print_right(Fonts::chalk_large, 
(float)Display::get_width()/2 - 200,
-                               (float)Display::get_height()/2 + 160, 
_("Cancel"));
+                       gc.print_left(Fonts::chalk_large, 
(float)Display::get_width()/2 - 280,
+                               (float)Display::get_height()/2 + 160, 
CANCEL_TEXT);
                }
 
                void on_click()





reply via email to

[Prev in Thread] Current Thread [Next in Thread]