[Wesnoth-cvs-commits] wesnoth/src playturn.cpp editor/editor.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/12/05 19:54:26

Modified files:
        src            : playturn.cpp 
        src/editor     : editor.cpp 

Log message:
        Don't use hardcoded separators in main menus.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.307&tr2=1.308&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.87&tr2=1.88&r1=text&r2=text

Patches:
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.87 wesnoth/src/editor/editor.cpp:1.88
--- wesnoth/src/editor/editor.cpp:1.87  Mon Nov 22 21:39:14 2004
+++ wesnoth/src/editor/editor.cpp       Sun Dec  5 19:54:26 2004
@@ -1047,7 +1047,7 @@
                const hotkey::hotkey_item hk = hotkey::get_hotkey(*i);
                std::stringstream str;
                // Try to translate it to nicer format.
-               str << hk.get_description() << "," << hk.get_name();
+               str << hk.get_description() << COLUMN_SEPARATOR << 
hk.get_name();
 
                menu.push_back(str.str());
        }
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.307 wesnoth/src/playturn.cpp:1.308
--- wesnoth/src/playturn.cpp:1.307      Sun Dec  5 18:37:36 2004
+++ wesnoth/src/playturn.cpp    Sun Dec  5 19:54:26 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.307 2004/12/05 18:37:36 silene Exp $ */
+/* $Id: playturn.cpp,v 1.308 2004/12/05 19:54:26 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1101,18 +1101,18 @@
                std::string img(get_menu_image(hk.get_id()));
                if(img.empty() == false) {
                        has_image = true;
-                       str << '&' << img << ',';
+                       str << IMAGE_PREFIX << img << COLUMN_SEPARATOR;
                }
                
-               str << hk.get_description() << "," << hk.get_name();
+               str << hk.get_description() << COLUMN_SEPARATOR << 
hk.get_name();
 
                menu.push_back(str.str());
        }
        //If any of the menu items have an image, create an image column
        if(has_image)
                for(std::vector<std::string>::iterator i = menu.begin(); i != 
menu.end(); ++i)
-                       if(*(i->begin()) != '&')
-                               i->insert(i->begin(),',');
+                       if(*(i->begin()) != IMAGE_PREFIX)
+                               i->insert(i->begin(), COLUMN_SEPARATOR);
 
        static const std::string style = "menu2";
        const int res = gui::show_dialog(gui_,NULL,"","",