widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

Good fixes, I'll merge this asap

On Mon, Jan 02, 2012 at 05:48:25PM -0000, Angelo Locritani wrote:
> Angelo Locritani has proposed merging lp:~alocritani/widelands/shorter_wincondition_button_text into lp:widelands.
> 
> Requested reviews:
>   Widelands Developers (widelands-dev)
> Related bugs:
>   Bug #899930 in widelands: "Translation overflow in "Start game" window"
>   https://bugs.launchpad.net/widelands/+bug/899930
> 
> For more details, see:
> https://code.launchpad.net/~alocritani/widelands/shorter_wincondition_button_text/+merge/87275
> 
> Moved the text "Type", previously in front of the winning condition, on top of it and changed to "Type of game"
> -- 
> https://code.launchpad.net/~alocritani/widelands/shorter_wincondition_button_text/+merge/87275
> Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/shorter_wincondition_button_text into lp:widelands.

> === modified file 'src/ui_fsmenu/launchMPG.cc'
> --- src/ui_fsmenu/launchMPG.cc	2011-12-17 18:22:31 +0000
> +++ src/ui_fsmenu/launchMPG.cc	2012-01-02 17:47:26 +0000
> @@ -155,8 +155,12 @@
>  		(this,
>  		 get_w() * 8 / 10, get_h() / 10,
>  		 _("Map")),
> +	m_wincondition_type
> +		(this,
> +		 get_w() * 37 / 50 + (m_butw / 2), get_h() * 10 / 20,
> +		 _("Type of game"), UI::Align_HCenter),
>  
> -	m_map_info(this, get_w() * 37 / 50, get_h() * 2 / 10, m_butw, get_h() * 27 / 80),
> +	m_map_info(this, get_w() * 37 / 50, get_h() * 2 / 10, m_butw, get_h() * 23 / 80),
>  	m_client_info(this, get_w() * 37 / 50, get_h() * 13 / 20, m_butw, get_h() * 5 / 20),
>  	m_help(0),
>  
> @@ -186,6 +190,7 @@
>  	m_wincondition.set_font(font_small());
>  	m_help_button.set_font(font_small());
>  	m_change_map_or_save.set_font(font_small());
> +	m_wincondition_type.set_textstyle(ts_small());
>  
>  	m_lua = create_LuaInterface();
>  	m_lua->register_scripts(*g_fs, "win_conditions", "scripting/win_conditions");
> @@ -286,7 +291,7 @@
>  			std::string n = t->get_string("name");
>  			std::string d = t->get_string("description");
>  
> -			m_wincondition.set_title(_("Type: ") + n);
> +			m_wincondition.set_title(n);
>  			m_wincondition.set_tooltip(d.c_str());
>  		} catch (LuaTableKeyError &) {
>  			// might be that this is not a win condition after all.
> 
> === modified file 'src/ui_fsmenu/launchMPG.h'
> --- src/ui_fsmenu/launchMPG.h	2011-11-30 21:38:37 +0000
> +++ src/ui_fsmenu/launchMPG.h	2012-01-02 17:47:26 +0000
> @@ -80,7 +80,7 @@
>  
>  	UI::Button       m_change_map_or_save, m_ok, m_back, m_wincondition;
>  	UI::Button       m_help_button;
> -	UI::Textarea              m_title, m_mapname, m_clients, m_players, m_map;
> +	UI::Textarea              m_title, m_mapname, m_clients, m_players, m_map, m_wincondition_type;
>  	UI::Multiline_Textarea    m_map_info, m_client_info;
>  	UI::HelpWindow          * m_help;
>  	GameSettingsProvider    * m_settings;
> 
> === modified file 'src/ui_fsmenu/launchSPG.cc'
> --- src/ui_fsmenu/launchSPG.cc	2011-12-17 18:19:19 +0000
> +++ src/ui_fsmenu/launchSPG.cc	2012-01-02 17:47:26 +0000
> @@ -98,6 +98,10 @@
>  		(this,
>  		 get_w() * 51 / 100, get_h() * 53 / 200,
>  		 _("Start type"), UI::Align_Left),
> +	m_wincondition_type
> +		(this,
> +		 get_w() * 7 / 10 + (m_butw / 2), get_h() * 7 / 20,
> +		 _("Type of game"), UI::Align_HCenter),
>  
>  // Variables and objects used in the menu
>  	m_settings     (settings),
> @@ -127,6 +131,7 @@
>  
>  	m_title  .set_textstyle(ts_big());
>  	m_mapname.set_textstyle(ts_small());
> +	m_wincondition_type.set_textstyle(ts_small());
>  
>  	UI::TextStyle tsmaller
>  		(UI::TextStyle::makebold
> @@ -235,7 +240,7 @@
>  			std::string n = t->get_string("name");
>  			std::string d = t->get_string("description");
>  
> -			m_wincondition.set_title(_("Type: ") + n);
> +			m_wincondition.set_title(n);
>  			m_wincondition.set_tooltip(d.c_str());
>  		} catch (LuaTableKeyError &) {
>  			// might be that this is not a win condition after all.
> 
> === modified file 'src/ui_fsmenu/launchSPG.h'
> --- src/ui_fsmenu/launchSPG.h	2011-11-30 21:38:37 +0000
> +++ src/ui_fsmenu/launchSPG.h	2012-01-02 17:47:26 +0000
> @@ -78,7 +78,7 @@
>  	UI::Button       m_select_map, m_wincondition, m_back, m_ok;
>  	UI::Button     * m_pos[MAX_PLAYERS];
>  	UI::Textarea              m_title, m_mapname;
> -	UI::Textarea              m_name, m_type, m_team, m_tribe, m_init;
> +	UI::Textarea              m_name, m_type, m_team, m_tribe, m_init, m_wincondition_type;
>  	GameSettingsProvider    * m_settings;
>  	GameController          * m_ctrl; // optional
>  	PlayerDescriptionGroup  * m_players[MAX_PLAYERS];
> 

> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to     : widelands-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help   : https://help.launchpad.net/ListHelp


-- 
https://code.launchpad.net/~alocritani/widelands/shorter_wincondition_button_text/+merge/87275
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/shorter_wincondition_button_text into lp:widelands.