diff --git a/Makefile.am b/Makefile.am index cdb0816c..2b8a6207 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = \ SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/symbols support_files/pixmaps/live_game support_files/definitions support_files/definitions/belgium support_files/definitions/germany support_files/definitions/romania support_files/definitions/france support_files/definitions/scotland support_files/definitions/brazil support_files/definitions/short_leagues_south_america support_files/definitions/italy support_files/definitions/usa support_files/definitions/argentina support_files/definitions/wales support_files/definitions/ireland support_files/definitions/scg support_files/definitions/australia support_files/definitions/england support_files/definitions/europe support_files/definitions/misc support_files/definitions/short_leagues support_files/definitions/poland support_files/definitions/spain support_files/definitions/aus_victoria support_files/definitions/aus_victoria/CVS support_files/lg_commentary -SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.xml support_files/names/player_names_australia.xml support_files/names/player_names_poland.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_nl.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.png support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/argentina/league_argentina1.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/aus_victoria/CVS/Root support_files/definitions/aus_victoria/CVS/Repository support_files/definitions/aus_victoria/CVS/Entries support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot_lg_tokens +SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.xml support_files/names/player_names_australia.xml support_files/names/player_names_poland.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_nl.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/symbols/flag_aus_victoria.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.png support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/argentina/league_argentina1.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/aus_victoria/CVS/Root support_files/definitions/aus_victoria/CVS/Repository support_files/definitions/aus_victoria/CVS/Entries support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/definitions/aus_victoria/league_aus_vic4nw.xml support_files/definitions/aus_victoria/league_aus_vic4se.xml support_files/definitions/aus_victoria/league_aus_vic5nw.xml support_files/definitions/aus_victoria/league_aus_vic5se.xml support_files/definitions/aus_victoria/league_aus_vic6nw.xml support_files/definitions/aus_victoria/league_aus_vic6se.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot_lg_tokens install-data-local: @$(NORMAL_INSTALL) diff --git a/bygfoot.glade b/bygfoot.glade index e3fea327..115c7389 100644 --- a/bygfoot.glade +++ b/bygfoot.glade @@ -68,7 +68,7 @@ - + True gtk-revert-to-saved 1 @@ -136,7 +136,7 @@ - + True gtk-preferences 1 @@ -207,7 +207,7 @@ - + True menu_fixtures.png 0.5 @@ -228,7 +228,7 @@ - + True menu_fixtures_comp.png 0.5 @@ -249,7 +249,7 @@ - + True menu_table.png 0.5 @@ -270,7 +270,7 @@ - + True menu_league_results.png 0.5 @@ -297,7 +297,7 @@ - + True menu_league_stats.png 0.5 @@ -318,7 +318,7 @@ - + True menu_history.png 0.5 @@ -350,7 +350,7 @@ True - + True menu_style.png 0.5 @@ -368,7 +368,7 @@ True All Out Defend True - False + True @@ -378,7 +378,7 @@ True Defend True - False + True menu_all_out_defend @@ -400,7 +400,7 @@ True Attack True - False + True menu_all_out_defend @@ -411,7 +411,7 @@ True All Out Attack True - False + True menu_all_out_defend @@ -428,7 +428,7 @@ True - + True menu_scout.png 0.5 @@ -446,7 +446,7 @@ True Best True - False + True @@ -456,7 +456,7 @@ True Good True - False + True menu_scout_best @@ -478,7 +478,7 @@ True Bad True - False + True menu_scout_best @@ -495,7 +495,7 @@ True - + True menu_physio.png 0.5 @@ -513,7 +513,7 @@ True Best True - False + True @@ -523,7 +523,7 @@ True Good True - False + True menu_physio_best @@ -545,7 +545,7 @@ True Bad True - False + True menu_physio_best @@ -588,7 +588,7 @@ True Best True - False + True @@ -598,7 +598,7 @@ True Good True - False + True menu_yc_best @@ -620,7 +620,7 @@ True Bad True - False + True menu_yc_best @@ -644,7 +644,7 @@ True Goalies True - False + True @@ -654,7 +654,7 @@ True Defenders True - False + True menu_recruit0 @@ -665,7 +665,7 @@ True Midfielders True - False + True menu_recruit0 @@ -676,7 +676,7 @@ True Forwards True - False + True menu_recruit0 @@ -718,7 +718,7 @@ True - + True menu_boost.png 0.5 @@ -736,7 +736,7 @@ True On True - False + True @@ -757,7 +757,7 @@ True Anti True - False + True menu_boost_on @@ -781,7 +781,7 @@ - + True gtk-undo 1 @@ -802,7 +802,7 @@ - + True menu_structure.png 0.5 @@ -824,7 +824,7 @@ - + True menu_rearrange.png 0.5 @@ -850,7 +850,7 @@ - + True menu_browse_tms.png 0.5 @@ -883,7 +883,7 @@ - + True menu_player_info.png 0.5 @@ -903,7 +903,7 @@ - + True menu_player_put_transfer.png 0.5 @@ -923,7 +923,7 @@ - + True menu_player_remove_transfer.png 0.5 @@ -943,7 +943,7 @@ - + True menu_player_contract.png 0.5 @@ -963,7 +963,7 @@ - + True menu_player_fire.png 0.5 @@ -983,7 +983,7 @@ - + True menu_player_shoots.png 0.5 @@ -1018,7 +1018,7 @@ - + True menu_player_browse.png 0.5 @@ -1052,7 +1052,7 @@ - + True menu_last_match.png 0.5 @@ -1073,7 +1073,7 @@ - + True menu_match_stats.png 0.5 @@ -1093,7 +1093,7 @@ - + True gtk-jump-to 1 @@ -1106,6 +1106,63 @@ + + + True + Memorable matches + True + + + + + + + True + Add last recorded match to the current memorable matches file. + Add last match + True + + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Play, delete or add memorable matches. + Manage matches + True + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + True @@ -1121,7 +1178,7 @@ - + True menu_history.png 0.5 @@ -1148,9 +1205,9 @@ - + True - gtk-go-forward + gtk-media-forward 1 0.5 0.5 @@ -1170,7 +1227,7 @@ - + True gtk-go-back 1 @@ -1192,7 +1249,7 @@ - + True gtk-justify-fill 1 @@ -1227,7 +1284,7 @@ - + True menu_finances.png 0.5 @@ -1248,7 +1305,7 @@ - + True menu_stadium.png 0.5 @@ -1281,7 +1338,7 @@ - + True gtk-dialog-info 1 @@ -1302,7 +1359,7 @@ - + True gtk-add 1 @@ -1323,7 +1380,7 @@ - + True gtk-help 1 diff --git a/bygfoot_misc2.glade b/bygfoot_misc2.glade index 46bee843..029ceb31 100644 --- a/bygfoot_misc2.glade +++ b/bygfoot_misc2.glade @@ -81,7 +81,7 @@ GTK_JUSTIFY_LEFT False False - 2.23517e-10 + 2.23516996578e-10 0.5 0 0 @@ -102,7 +102,7 @@ GTK_JUSTIFY_LEFT False False - 2.23517e-10 + 2.23516996578e-10 0.5 0 0 @@ -123,7 +123,7 @@ GTK_JUSTIFY_LEFT False False - 2.23517e-10 + 2.23516996578e-10 0.5 0 0 @@ -144,7 +144,7 @@ GTK_JUSTIFY_LEFT False False - 2.23517e-10 + 2.23516996578e-10 0.5 0 0 @@ -165,7 +165,7 @@ GTK_JUSTIFY_LEFT False False - 2.23517e-10 + 2.23516996578e-10 0.5 0 0 @@ -644,7 +644,7 @@ True GTK_PROGRESS_LEFT_TO_RIGHT 0 - 0.1 + 0.10000000149 @@ -816,7 +816,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 1e+08 10 1000 10 + 1 0 100000000 10 1000 10 @@ -870,7 +870,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 1e+08 1 100 10 + 1 0 100000000 1 100 10 @@ -1625,7 +1625,7 @@ 0 True - * + * False @@ -1809,7 +1809,7 @@ 0 True - * + * False @@ -2322,4 +2322,447 @@ + + 5 + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + 550 + 500 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + + True + False + 3 + + + + True + False + 3 + + + + True + Current file + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + True + Open a memorable matches file + True + gtk-open + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + Reload matches from file + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-refresh + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Reload + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + False + True + + + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + False + + + + + + 0 + True + True + + + + + + True + Add last match to the list; you still have to save to file if you want to store the match permanently + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add last match + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + False + 3 + + + + True + Save changes to file and close + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-close + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Save and close + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + + True + Reload matches from file and close + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-refresh + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Reload and close + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + diff --git a/po/nl.po b/po/nl.po index 5c7cffe9..5cb06af0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,20 +2,21 @@ # License: GPL # This file is distributed under the same license as the Bygfoot package. # Arne Deprez & Tobe Deprez , 2005. +# Vincent van Adrighem , 2005. # # msgid "" msgstr "" -"Project-Id-Version: Bygfoot 1.9.0\n" +"Project-Id-Version: Bygfoot 1.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-08-15 15:12+0200\n" -"PO-Revision-Date: 2005-06-19 10:11+0200\n" -"Last-Translator: Vincent van Adrighem \n" -"Language-Team: Dutch \n" +"POT-Creation-Date: 2005-08-16 14:47+0200\n" +"PO-Revision-Date: 2005-08-17 18:18+0200\n" +"Last-Translator: Arne en Tobe Deprez \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);" #: src/treeview_helper.c:750 #, c-format @@ -24,7 +25,7 @@ msgid "" "Goals/Game %.1f Save %% %.1f" msgstr "" "\n" -"Goals/Match %.1f Reddingen %%%.1f" +"Goals/Match %.1f Reddingen %% %.1f" #: src/treeview_helper.c:757 #, c-format @@ -48,17 +49,17 @@ msgstr "" #. Company short name. Copy the '&'. #: src/user.c:814 msgid " & Co." -msgstr "" +msgstr " & Co." #. Company addition. Copy the '&'. #: src/user.c:823 msgid " & Daughters" -msgstr "" +msgstr " & Dochters" #. Company addition, leading to 'Marshall & Sons Petroleum Co.'. Copy the '&'. #: src/user.c:821 msgid " & Sons" -msgstr "" +msgstr " &, zonen" #. A goal scored with a free kick. #: src/game.c:881 @@ -78,22 +79,22 @@ msgstr " (OG)" msgid " (P)" msgstr " (P)" -#: src/cup.c:841 +#: src/cup.c:849 msgid " -- First leg" msgstr " -- Heenmatch" -#: src/cup.c:844 +#: src/cup.c:852 msgid " -- Replay matches" msgstr " -- Replay matchen" -#: src/cup.c:839 +#: src/cup.c:847 msgid " -- Second leg" msgstr " -- Terugmatch" #. Company short name. #: src/user.c:808 msgid " Assoc." -msgstr "" +msgstr " Assoc." #: src/options_interface.c:267 msgid " Autosave files " @@ -101,64 +102,58 @@ msgstr " Auto-opslaan bestanden " #. Company name. #: src/user.c:789 -#, fuzzy msgid " Bank" -msgstr "Plaats" +msgstr " Bank" #. Company addition. #: src/user.c:825 msgid " Bros." -msgstr "" +msgstr " Bros." #. Company name. #: src/user.c:785 msgid " Chemicals" -msgstr "" +msgstr " Chemie" #. Company short name. #: src/user.c:810 msgid " Co." -msgstr "" +msgstr " Co." #. Company name. #: src/user.c:771 -#, fuzzy msgid " Communications" -msgstr "Ontslagvergoedingen" +msgstr " Communiecaties" #. Company name. #: src/user.c:777 msgid " Company" -msgstr "" +msgstr " Company" #. Company short name. #: src/user.c:816 -#, fuzzy msgid " Corp." -msgstr " P." +msgstr " Corp." #. Company name. #: src/user.c:803 -#, fuzzy msgid " Data Systems" -msgstr "Systeem" +msgstr " Systemen" #. Company name. #: src/user.c:787 msgid " Energy" -msgstr "" +msgstr " Energie" #. Company short name. #: src/user.c:812 -#, fuzzy msgid " Ent." -msgstr "Gebeurtenis" +msgstr " Ent." #. Company name. #: src/user.c:797 -#, fuzzy msgid " Financial" -msgstr "Finale" +msgstr " Financial" #: src/user.c:491 msgid " Fortunately he's got a cousin who can help your team out." @@ -166,47 +161,43 @@ msgstr " Gelukkig heeft hij een neef die je team kan helpen." #. Company short name. #: src/user.c:818 -#, fuzzy msgid " Group" -msgstr "%s Groep %d" +msgstr " Group" #. Company name. #: src/user.c:773 msgid " Holdings" -msgstr "" +msgstr " Holding" #. Company name. #: src/user.c:775 -#, fuzzy msgid " Industries" -msgstr "Blessures" +msgstr " Industries" #. Company name. #: src/user.c:781 msgid " Labs" -msgstr "" +msgstr " Laberatoria" #. Company short name, leading to things like 'Marshall Data Systems Ltd.' #: src/user.c:806 -#, fuzzy msgid " Ltd." -msgstr " n.v." +msgstr " Ltd." #. Company name. #: src/user.c:799 msgid " Petroleum" -msgstr "" +msgstr " Petroleum" #. Company name. #: src/user.c:791 msgid " Products" -msgstr "" +msgstr " Producten" #. Company name. #: src/user.c:801 -#, fuzzy msgid " Restaurants" -msgstr "Doorgaan" +msgstr " Restauranten" #: src/interface.c:1050 msgid " Round " @@ -215,7 +206,7 @@ msgstr " Ronde " #. Company name. #: src/user.c:795 msgid " Scientific" -msgstr "" +msgstr " Wetenschappen" #: src/interface.c:1032 msgid " Season " @@ -224,30 +215,29 @@ msgstr " Seizoen " #. Company name. #: src/user.c:793 msgid " Software" -msgstr "" +msgstr " Software" #. Company name. #: src/user.c:769 -#, fuzzy msgid " Systems" -msgstr "Systeem" +msgstr " Systemen" #. Company name. #: src/user.c:783 msgid " Technologies" -msgstr "" +msgstr " Technologieën" #. Company name. #: src/user.c:779 msgid " Telecommunications" -msgstr "" +msgstr " Telecomunicatie" #: src/interface.c:1041 msgid " Week " msgstr " Week " #. Game was decided in extra time. -#: src/fixture.c:800 +#: src/fixture.c:807 msgid " e.t." msgstr " n.v." @@ -264,19 +254,19 @@ msgid " more" msgstr " meer" #. Game was decided in penalty shoot-out. -#: src/fixture.c:797 +#: src/fixture.c:804 msgid " p." msgstr " P." #: src/misc_interface.c:859 msgid " seats" -msgstr " stoelen" +msgstr " plaatsen" #. Contract time and money a sponsor pays. #: src/treeview.c:1383 -#, fuzzy, c-format +#, c-format msgid "%.1f months / %s" -msgstr " maanden" +msgstr "%.1f maanden / %s" #. a match at home #: src/team.c:981 @@ -486,7 +476,7 @@ msgstr "SUPERVERDEDIGEND" #. Boost value. #: src/lg_commentary.c:559 src/team.c:506 msgid "ANTI" -msgstr "ANTI" +msgstr "MINDER" #: src/lg_commentary.c:553 src/team.c:496 msgid "ATTACK" @@ -497,9 +487,8 @@ msgid "About" msgstr "Over" #: src/misc_interface.c:1210 -#, fuzzy msgid "Accept" -msgstr "Accepteren?" +msgstr "Accepteren" #: src/game_gui.c:609 msgid "Accept?" @@ -519,7 +508,7 @@ msgstr "Leeftijd " #: src/window.c:142 msgid "All Files" -msgstr "" +msgstr "Alle bestanden" #: src/interface.c:477 msgid "All Out Attack" @@ -531,11 +520,11 @@ msgstr "Super verdedigend" #: src/interface.c:648 msgid "Anti" -msgstr "Anti" +msgstr "Minder" #: src/interface.c:615 msgid "Any" -msgstr "" +msgstr "Elke" #: src/callbacks.c:171 msgid "At least one user didn't take his turn this week. Continue?" @@ -677,16 +666,16 @@ msgstr "Twee-wekelijkse balans" #: src/interface.c:626 msgid "Boost" -msgstr "Extra motivatie" +msgstr "Motivatie:" #: src/callbacks.c:758 src/game_gui.c:326 msgid "Boost ON is disabled in this country definition." -msgstr "" +msgstr "Extra Motivatie kan niet gebruikt worden in dit land bestand." #: src/team.c:537 #, c-format msgid "Boost changed to %s." -msgstr "Extra motivatie is veranderd naar %s." +msgstr "Motivatie is veranderd naar %s." #: src/player.c:1159 msgid "Broken ankle" @@ -718,7 +707,7 @@ msgstr "Bekijk teams" #: src/window.c:136 msgid "Bygfoot Save Files" -msgstr "" +msgstr "Bygfoot Opgeslagen bestaden" #: src/misc2_interface.c:926 msgid "" @@ -758,7 +747,7 @@ msgstr "HKwal " #: src/misc_interface.c:924 msgid "Capacity (seats)" -msgstr "Capaciteit (stoelen)" +msgstr "Capaciteit (plaatsen)" #: src/options_interface.c:636 msgid "Cards " @@ -802,9 +791,8 @@ msgid "Commentary" msgstr "Comentaar" #: src/treeview.c:2453 -#, fuzzy msgid "Company" -msgstr "Ontslagvergoedingen" +msgstr "Bedrijf" #. Money paid to players a user fired. #: src/treeview.c:1281 @@ -824,9 +812,8 @@ msgid "Confirm quit when not saved" msgstr "Vraag afsluiten wanneer niet opgeslagen" #: src/options_interface.c:501 -#, fuzzy msgid "Confirm removing youths" -msgstr "Vraag wanneer onfit" +msgstr "Vraag voor verwijderen van jeugtspelers" #: src/options_interface.c:214 msgid "Confirm when unfit" @@ -845,15 +832,16 @@ msgid "Contract " msgstr "Contract " #: src/treeview.c:1385 -#, fuzzy msgid "Contract / Money" -msgstr "Contract aanbod" +msgstr "Contract / Geld" #: src/treeview.c:2454 msgid "" "Contract length\n" "(Months)" msgstr "" +"Contract lengte\n" +"(Maanden)" #: src/window.c:514 msgid "Contract offer" @@ -861,7 +849,7 @@ msgstr "Contract aanbod" #: src/callbacks.c:824 msgid "Contracts are disabled in this country definition." -msgstr "" +msgstr "Je kan geen contracten maken in dit land." #: src/interface.c:906 src/misc2_interface.c:1050 msgid "Contributors" @@ -931,9 +919,8 @@ msgid "Defend" msgstr "Verdedigend" #: src/interface.c:600 -#, fuzzy msgid "Defenders" -msgstr "Verdedigend" +msgstr "Verdedigers" #: src/window.c:53 msgid "Didn't find file 'bygfoot_help'." @@ -941,15 +928,15 @@ msgstr "Kan bestand 'bygfoot_help' niet vinden." #: src/callbacks.c:1049 msgid "Do you really want to kick the poor boy out of your academy?" -msgstr "" +msgstr "Wil je deze speler echt uit de academie zetten?" #: src/misc_interface.c:217 msgid "Don't load definitions" -msgstr "" +msgstr "Laad geen defenieties" #: src/misc_interface.c:220 msgid "Don't load team definitions at all" -msgstr "" +msgstr "Laad geen team defenitions" #: src/load_save.c:123 src/load_save.c:254 msgid "Done." @@ -1048,13 +1035,13 @@ msgstr "" msgid "Fin_Stad" msgstr "_Financiën" -#: src/cup.c:867 +#: src/cup.c:875 msgid "Final" msgstr "Finale" #: src/callbacks.c:780 msgid "Finances are disabled in this country definition." -msgstr "" +msgstr "De financieën kunnen niet gebruikt worden in dit land" #: src/interface.c:738 src/interface.c:1790 msgid "Fire" @@ -1099,7 +1086,7 @@ msgstr "Lettertype gebruikt in lijsten" #: src/interface.c:610 msgid "Forwards" -msgstr "" +msgstr "Aanvallers" #: src/treeview.c:671 msgid "Fouls" @@ -1161,9 +1148,8 @@ msgid "Go/Ga" msgstr "Go/Ma" #: src/interface.c:595 -#, fuzzy msgid "Goalies" -msgstr "Goals" +msgstr "Keepers" #: src/treeview.c:1587 src/treeview.c:2054 src/treeview_helper.c:731 msgid "Goals" @@ -1246,6 +1232,7 @@ msgid "" "If you don't like any of the sponsors, you can go a few weeks without " "sponsor and wait for new offers." msgstr "" +"Als je deze sponsers niet wilt, kan je een aantal weken zonder sponsers spelen en wachten voor nieuwe aanbiedingen" #: src/misc_interface.c:1013 msgid "Improve!" @@ -1259,7 +1246,7 @@ msgid "" "Expected finish: %d weeks." msgstr "" "Verbetering bezig.\n" -"%d stoeltjes en %d%% veiligheid nog te doen.\n" +"%d plaatsen en %d%% veiligheid nog te doen.\n" "Verwacht einde: %d weken." #: src/treeview.c:1410 @@ -1293,7 +1280,7 @@ msgstr "Reis kosten" #: src/interface.c:1856 msgid "Kick out of academy" -msgstr "" +msgstr "Zet buiten de academie" #. Games lost. #: src/treeview.c:1157 @@ -1320,7 +1307,7 @@ msgid "Language" msgstr "Taal" #. A cup stage, e.g. Last 32 when there are only 32 teams left. -#: src/cup.c:864 +#: src/cup.c:872 #, c-format msgid "Last %d" msgstr "Laatste %d" @@ -1398,11 +1385,11 @@ msgstr "Laad spel (Ctrl+O)" #: src/misc_interface.c:213 msgid "Load only the player names in the definition files" -msgstr "" +msgstr "Laad alleen de speler namen in de defenities" #: src/misc_interface.c:203 msgid "Load team definitions" -msgstr "" +msgstr "Laad team defenities" #: src/misc_interface.c:206 msgid "" @@ -1410,12 +1397,13 @@ msgid "" "doesn't contain team definition files, you have to get them from the " "homepage or via the bygfoot-update script)" msgstr "" +"Laad de teams van defenitie bestanden (NOOT: De Officiele bygfoot pakketten bevatten geen defnities van teams, je moet ze van the webpagina halen of via het bygfoot-update-script)" #: src/misc_interface.c:296 msgid "Load the last game that was saved or loaded." msgstr "Laad het spel dat het laatste was opgeslagen of geladen." -#: src/xml.c:140 +#: src/xml.c:143 #, c-format msgid "Loading cup: %s" msgstr "Laden Beker: %s" @@ -1438,9 +1426,8 @@ msgid "Loading miscellaneous..." msgstr "Laden rest" #: src/load_save.c:183 -#, fuzzy msgid "Loading options..." -msgstr "Laden bekers" +msgstr "Laden opties..." #: src/load_save.c:237 msgid "Loading season stats..." @@ -1480,9 +1467,8 @@ msgid "Midfield" msgstr "Middenveld" #: src/interface.c:605 -#, fuzzy msgid "Midfielders" -msgstr "Middenveld" +msgstr "Middenvelders" #: src/options_interface.c:558 msgid "Misc." @@ -1501,17 +1487,16 @@ msgid "Money (approx.)" msgstr "Geld (ongeveer)" #: src/treeview.c:2455 -#, fuzzy msgid "Money / week" -msgstr "Geld" +msgstr "Geld / week" #: src/interface.c:1848 msgid "Move to team" -msgstr "" +msgstr "Zet in team" #: src/interface.c:754 src/interface.c:1798 msgid "Move to youth academy" -msgstr "" +msgstr "Zet in de jeugt academie" #: src/interface.c:400 msgid "My league results" @@ -1540,7 +1525,7 @@ msgstr "" #: src/window.c:39 msgid "News" -msgstr "" +msgstr "Niews" #: src/interface.c:1259 msgid "Next (W)" @@ -1567,9 +1552,8 @@ msgid "No match stored." msgstr "Er is geen match in aantocht." #: src/misc_callbacks.c:353 -#, fuzzy msgid "None" -msgstr "Geld" +msgstr "Geen" #: src/window.c:447 msgid "Numbers..." @@ -1578,7 +1562,7 @@ msgstr "Nummers..." #. Boost value. #: src/lg_commentary.c:562 src/team.c:509 msgid "OFF" -msgstr "AF" +msgstr "NORMAAL" #. Player status: ok. #: src/misc2_interface.c:221 src/player.c:1135 src/treeview_helper.c:1091 @@ -1588,11 +1572,11 @@ msgstr "OK" #. Boost value. #: src/lg_commentary.c:565 src/team.c:512 msgid "ON" -msgstr "AAN" +msgstr "EXTRA" #: src/interface.c:642 msgid "Off" -msgstr "Af" +msgstr "Normaal" #: src/interface.c:730 src/interface.c:1786 msgid "Offer new contract" @@ -1600,12 +1584,11 @@ msgstr "Bied nieuw contract aan" #: src/interface.c:637 msgid "On" -msgstr "Aan" +msgstr "Extra" #: src/misc_interface.c:210 -#, fuzzy msgid "Only names" -msgstr "Naam van het lettertype" +msgstr "Alleen namen" #: src/window.c:491 msgid "Options" @@ -1743,7 +1726,7 @@ msgstr "Verrokken spier" msgid "Put on transfer list" msgstr "Zet speler op de transfelijst" -#: src/cup.c:873 +#: src/cup.c:881 msgid "Quarter-final" msgstr "Kwart-finale" @@ -1765,16 +1748,15 @@ msgstr "Herschik team" #: src/interface.c:588 msgid "Recruiting preference" -msgstr "" +msgstr "Rekruterings voorkeuren" #: src/treeview.c:673 src/treeview_helper.c:734 msgid "Reds" msgstr "Rode kaarten" #: src/misc_interface.c:1231 -#, fuzzy msgid "Reject for now" -msgstr "Selecteer " +msgstr "Niet accepteren" #: src/options_interface.c:349 msgid "Reload" @@ -1830,14 +1812,15 @@ msgid "" "Right click to move players to and from the youth academy; left click for " "context menu." msgstr "" +"Klik met de rechter muisknop om spelers naar en van de jeugt academie te verplaatsen; klik met de linker muisknop om het popup menu te tonen." #: src/misc_interface.c:932 src/misc_interface.c:966 msgid "Right-click to set to 0" msgstr "Klik met de rechtermuisknop om op 0 te zetten" -#: src/cup.c:856 +#: src/cup.c:864 msgid "Round robin" -msgstr "Groepsfaze" +msgstr "Groepsfase" #: src/misc_interface.c:958 msgid "Safety (%)" @@ -1882,9 +1865,8 @@ msgid "Saving miscellaneous..." msgstr "Opslaan rest..." #: src/load_save.c:43 -#, fuzzy msgid "Saving options..." -msgstr "Opslaan bekers..." +msgstr "Opslaan opties..." #: src/load_save.c:98 msgid "Saving season stats..." @@ -1920,18 +1902,19 @@ msgstr "Seizoen geschiedenis" msgid "Select font" msgstr "Selecteer " -#: src/cup.c:870 +#: src/cup.c:878 msgid "Semi-final" msgstr "Halve-finale" #: src/interface.c:621 msgid "Set investment" -msgstr "" +msgstr "Kies investering" #: src/callbacks.c:1020 src/interface.c:624 msgid "" "Set the percentage of your income you want to devote to your youth academy." msgstr "" +"Kies het pecentage van uw incomen dat je in de jeugt academie wilt investeren." #: src/options_interface.c:514 msgid "Set to 0 to switch off warning" @@ -2024,9 +2007,8 @@ msgstr "" "Toon een waarschuwing wanneer het spelerscontract minder lang duurt dan " #: src/interface.c:553 -#, fuzzy msgid "Show youth academy" -msgstr "Toon stadion" +msgstr "Toon jeugt academie" #. Skill of a player. #: src/treeview.c:254 @@ -2055,34 +2037,31 @@ msgstr "Snelheid" #: src/treeview.c:1378 msgid "Sponsor" -msgstr "" +msgstr "Sponser" #: src/treeview.c:1272 msgid "Sponsorship" -msgstr "" +msgstr "Sponsers" #: src/window.c:553 -#, fuzzy msgid "Sponsorship offers" -msgstr "Toon de job aanbiedingen" +msgstr "Aanbiedingen sponsers" #: src/treeview.c:1234 -#, fuzzy msgid "Stadium" -msgstr "Toon stadion" +msgstr "Stadion" #: src/misc2_interface.c:117 src/treeview.c:1240 msgid "Stadium capacity" msgstr "Stadioncapaciteit" #: src/treeview.c:1345 -#, fuzzy msgid "Stadium expenses" -msgstr "Stadion status" +msgstr "Stadion uitgaven" #: src/callbacks.c:799 msgid "Stadium management is disabled in this country definition." -msgstr "" +msgstr "Staduim aanpassingen is uitgeschakeld in dit land." #: src/misc2_interface.c:122 src/treeview.c:1244 msgid "Stadium safety" @@ -2123,7 +2102,7 @@ msgstr "Structuur" #: src/options_interface.c:548 msgid "Swap adapts structure" -msgstr "Verwisseling verandert struktuur" +msgstr "Verwisseling verandert structuur" #. Language is system-set (not user chosen). #: src/treeview.c:2377 @@ -2146,7 +2125,7 @@ msgstr "Team " #: src/treeview.c:1579 msgid "Team structure" -msgstr "Team struktuur" +msgstr "Team structuur" #: src/team.c:533 #, c-format @@ -2232,9 +2211,8 @@ msgid "The player is not on the list." msgstr "De speler staat niet op de transferlijst" #: src/callbacks.c:482 -#, fuzzy msgid "The player is too old for the youth academy." -msgstr "De speler staat niet op de transferlijst" +msgstr "De speler is te oud voor de jeugt academie." #: src/callback_func.c:491 msgid "The player won't negotiate with you anymore." @@ -2243,7 +2221,7 @@ msgstr "De speler wil geen contract meer" #: src/misc2_callback_func.c:115 #, c-format msgid "The structure value %d is invalid." -msgstr "De struktuurwaarde %d is ongeldig." +msgstr "De structuurwaarde %d is ongeldig." #: src/game_gui.c:600 #, c-format @@ -2276,6 +2254,7 @@ msgid "" "There are a few companies interested in sponsoring your team. Please select " "one:" msgstr "" +"Er zijn een aantal teams geinreseerd om uw team te sponseren. Kies er een:" #: src/callbacks.c:177 msgid "There are injured or banned players in one of the user teams. Continue?" @@ -2288,16 +2267,15 @@ msgid "There are no offers for the player." msgstr "Er zijn geen aanbieding gedaan op deze speler." #: src/callback_func.c:349 -#, fuzzy msgid "" "There are some offers for the player which you rejected or will see next " "week." msgstr "" -"Er zijn een aantal offer voor spelers die je de volgende week zal zien." +"Er zijn een aantal offer voor spelers die je hebt afgewezen of de voldende week wou zien" #: src/callbacks.c:487 msgid "There is no room in your youth academy." -msgstr "" +msgstr "Er is geen plaats in uw jeugt academie." #: src/misc_callbacks.c:182 msgid "" @@ -2320,9 +2298,9 @@ msgid "Torn crucial ligament" msgstr "Belangrijk ligament beschadigd" #: src/callbacks.c:151 -#, fuzzy, c-format +#, c-format msgid "Transfer deadline is Week %d" -msgstr "De transfermarkt is gesloten." +msgstr "De transfer deadline is op week %d" #: src/window.c:545 msgid "Transfer offer" @@ -2334,7 +2312,7 @@ msgstr "Transfers" #: src/callbacks.c:146 src/callbacks.c:398 msgid "Transfers are disabled in this country definition." -msgstr "" +msgstr "Transfers zijn uitgeschakeld in dit land." #: src/interface.c:677 msgid "" @@ -2428,13 +2406,11 @@ msgstr "" "als' venster toont" #: src/options_interface.c:504 -#, fuzzy msgid "" "Whether a confirmation popup is shown when you kick out a youth from your " "academy" msgstr "" -"Of er een bevestigingsdialoog moet getoont worden wanneer je afsluit maar " -"niet opgeslagen hebt" +"Of er een bevestigingsdialoog moet getoont worden wanneer een speler uit de jeugtacademie zet" #: src/options_interface.c:227 msgid "" @@ -2457,7 +2433,7 @@ msgid "" "Whether swapping two players automatically adapts the team structure to the " "player positions" msgstr "" -"Of het verwisselen van twee spelers de team struktuur aanpast aan de " +"Of het verwisselen van twee spelers de team structuur aanpast aan de " "spelersposities" #: src/options_interface.c:487 @@ -2564,25 +2540,23 @@ msgid "You are free from debt." msgstr "Je hebt geen schulden." #: src/callback_func.c:465 -#, fuzzy, c-format +#, c-format msgid "" "You are making an offer for %s again. Your previous values for fee and wage " "are preset." msgstr "" -"Je bent bezig met een aanbod te doen op %s. De prijs en het loon dat is " -"aanbevolen door uw scout zijn ingevult" +"Je bent bezig met een aanbod te doen op %s. Uw vorige waarden voor loon en transfersom zijn ingevuld" #: src/callback_func.c:457 -#, fuzzy, c-format +#, c-format msgid "" "You are making an offer for %s. Your scout's recommendations for fee and " "wage are preset." msgstr "" -"Je bent bezig met een aanbod te doen op %s. De prijs en het loon dat is " -"aanbevolen door uw scout zijn ingevult" +"Je bent bezig met een aanbod te doen op %s. Je waarden die zijn aanbevolen door de scout zijn ingevuld" #: src/callback_func.c:505 -#, fuzzy, c-format +#, c-format msgid "" "You are negotiating with %s about a new contract. Pay attention to what " "you're doing; if you don't come to terms with him within %d offers, he's " @@ -2611,13 +2585,13 @@ msgid "You can take out at most %s." msgstr "Je kan maximaal %s lenen." #: src/callbacks.c:1029 -#, fuzzy, c-format +#, c-format msgid "You can't have more than %d players in the team." -msgstr "Je team kan niet minder dan 11 spelers hebben." +msgstr "Je kan niet meer dan %d speler in uw team hebben." #: src/callbacks.c:484 msgid "You can't move the player, there are too few players in your team." -msgstr "" +msgstr "Je kan geen speler verplaatsen, er zijn te wijnig spelers in uw team." #: src/callback_func.c:486 msgid "You can't offer a new contract if the old one is still above 2 years." @@ -2769,6 +2743,7 @@ msgid "" "Your current sponsor is satisfied with your results and would like to renew " "the contract. Currently they're paying you %d a week." msgstr "" +"Uw huidige sponser is blij met uw resultaten en zou graag het contract willen vernieuwen. Nu betalen ze u %d per week." #: src/treeview.c:1519 msgid "Your next opponent" @@ -2825,15 +2800,15 @@ msgstr "Je team kan niet minder dan 11 spelers hebben." #: src/treeview.c:1392 msgid "Youth acad. invest." -msgstr "" +msgstr "Jeugt acad. invest." #: src/interface.c:546 src/treeview.c:1278 msgid "Youth academy" -msgstr "" +msgstr "Jeugt academie" #: src/interface.c:560 src/treeview.c:1277 msgid "Youth coach" -msgstr "" +msgstr "Jeugt coach" #: src/interface.c:280 msgid "_File" @@ -2953,7 +2928,7 @@ msgstr "Gebr_uiker" #~ msgstr "laagste klasse" #~ msgid "Caught well by P2" -#~ msgstr "Goed gepakt van P2" +#~ msgstr "Goed gepakt door P2" #~ msgid "Congratulations! The owners of %s have accepted your offer for %s!" #~ msgstr "Proficiat! De eigenaars van %s hebben uw aanbod voor %s aangenomen!" @@ -3041,7 +3016,7 @@ msgstr "Gebr_uiker" #~ msgstr "Het is rust" #~ msgid "It's still RE: extra time" -#~ msgstr "Het is nog steeds RE: verlengingen" +#~ msgstr "Het is RE: verlengingen" #~ msgid "Loading options/constants..." #~ msgstr "Laden opties/constanten..." @@ -3080,7 +3055,8 @@ msgstr "Gebr_uiker" #~ msgid "" #~ "P1 can't quite get it under control but his miss kick heads toward goal" -#~ msgstr "P1 kan de bal niet controleren maar zijn misschot vliegt naar doel" +#~ msgstr "" +#~ "P1 kan de bal niet controleren maar zijn schot vliegt toch naar doel" #~ msgid "P1 charges towards goal and shoots!" #~ msgstr "P1 gaat naar doel en schiet!" @@ -3114,7 +3090,7 @@ msgstr "Gebr_uiker" #~ "P1 has a large cut above his left eye but it has been patched up and he " #~ "will be able to continue " #~ msgstr "" -#~ "P1 heeft een gat boven zijn linker oog maar het is herstelt en hij kan " +#~ "P1 heeft een gat boven zijn linker oog maar het is hersteld en hij kan " #~ "verder spelen" #~ msgid "P1 has been sent off" @@ -3173,7 +3149,7 @@ msgstr "Gebr_uiker" #~ "P1 spins past two defenders, wrong foots the keeper and back heels the " #~ "ball towards goal" #~ msgstr "" -#~ "P1 gaat voorbij twee verdeigers, zet de keeper op het verkeerde been en " +#~ "P1 gaat voorbij twee verdedigers, zet de keeper op het verkeerde been en " #~ "schiet de bal met een hakje naar doel" #~ msgid "P1 steps up to take the penalty" @@ -3207,7 +3183,7 @@ msgstr "Gebr_uiker" #~ msgstr "P2 lobt naar P1 die de bal naar de goal kopt" #~ msgid "P2 controls it with his chest and passes to P1" -#~ msgstr "P2 controleerd de bal met de borst en past naar P1" +#~ msgstr "P2 controleert de bal met de borst en past naar P1" #~ msgid "P2 cross controlled by P1 who slips past his man" #~ msgstr "P2 past naar P1 die voorbij zijn man gaat" @@ -3279,7 +3255,7 @@ msgstr "Gebr_uiker" #~ "Rode kaart voor P2 omdat hij een speler tackelde die alleen op goal afging" #~ msgid "P2 knocks over P1 with a double footed lunge" -#~ msgstr "P2 velt P1 met bijde voeten vooruit" +#~ msgstr "P2 velt P1 met beide voeten vooruit" #~ msgid "P2 lays the ball off to P1 who sends a rocket of a shot towards goal" #~ msgstr "P2 legt de bal af naar P1 en die zendt een raket naar doel" @@ -3297,7 +3273,7 @@ msgstr "Gebr_uiker" #~ "P2 seemed to be everywhere at once, finally tipping the ball off the " #~ "crossbar" #~ msgstr "" -#~ "P2 lijkt weg overal te zijn, uiteindelijk duwt hij de bal tegen de deklat" +#~ "P2 lijkt wel overal te zijn, uiteindelijk duwt hij de bal tegen de deklat" #~ msgid "P2 threads a great ball to P1 " #~ msgstr "P2 verstuurt een goede pas naar P1" @@ -3356,7 +3332,7 @@ msgstr "Gebr_uiker" #~ msgstr "TT heeft zijn extra motivatie veranderd naar EX" #~ msgid "TT has changed their structure to EX" -#~ msgstr "TT veranderd zijn struktuur in EX" +#~ msgstr "TT veranderd zijn structuur in EX" #~ msgid "TT has changed their style to EX" #~ msgstr "TT heeft zijn stijl veranderd naar EX" diff --git a/src/Makefile.am b/src/Makefile.am index 104c8761..23cb502b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ bygfoot_SOURCES = \ callback_func.c callback_func.h callbacks.h cup.h finance.h fixture.h game_gui.h league.h live_game.h maths.h misc.h option.h player.h start_end.h team.h transfer.h treeview.h treeview_helper.h user.h window.h \ callbacks.c callback_func.h callbacks.h debug.h free.h game_gui.h game.h gui.h load_save.h main.h option.h player.h team.h transfer.h treeview.h treeview_helper.h user.h window.h \ cup.c cup.h fixture.h free.h league.h main.h maths.h misc.h option.h table.h team.h variables.h xml_league.h \ - debug.c debug.h game_gui.h option.h support.h user.h variables.h \ + debug.c callbacks.h debug.h game_gui.h option.h support.h user.h variables.h \ file.c file.h free.h main.h misc.h option.h support.h variables.h \ finance.c callbacks.h finance.h game_gui.h maths.h option.h player.h team.h user.h \ fixture.c cup.h fixture.h free.h league.h main.h maths.h misc.h option.h table.h team.h user.h variables.h \ @@ -24,7 +24,7 @@ bygfoot_SOURCES = \ language.c callbacks.h free.h language.h lg_commentary.h misc.h option.h variables.h window.h \ lg_commentary.c cup.h file.h fixture.h league.h lg_commentary.h live_game.h main.h maths.h misc.h option.h player.h team.h variables.h xml_lg_commentary.h \ league.c cup.h free.h league.h main.h maths.h misc.h option.h player.h stat.h table.h team.h user.h variables.h \ - live_game.c callbacks.h fixture.h free.h game_gui.h game.h lg_commentary.h live_game.h main.h maths.h misc_callback_func.h misc.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \ + live_game.c callbacks.h fixture.h free.h game_gui.h game.h league.h lg_commentary.h live_game.h main.h maths.h misc_callback_func.h misc.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \ load_save.c callbacks.h file.h game_gui.h gui.h language.h load_save.h option.h support.h user.h variables.h xml.h xml_loadsave_cup.h xml_loadsave_league.h xml_loadsave_misc.h xml_loadsave_season_stats.h xml_loadsave_transfers.h xml_loadsave_users.h \ main.c file.h free.h language.h lg_commentary_struct.h live_game.h main.h misc_callbacks.h name_struct.h option.h stat_struct.h transfer_struct.h variables.h window.h \ maths.c maths.h misc.h variables.h \ @@ -48,9 +48,10 @@ bygfoot_SOURCES = \ team.c cup.h file.h fixture.h game_gui.h game.h league.h main.h maths.h misc.h option.h player.h team.h transfer.h user.h xml_team.h \ transfer.c callbacks.h cup.h finance.h free.h game_gui.h main.h maths.h misc.h option.h player.h support.h team.h transfer.h treeview.h user.h \ treeview.c cup.h finance.h fixture.h free.h game.h language.h league.h live_game.h maths.h misc.h option.h player.h support.h team.h transfer.h treeview.h treeview_helper.h user.h \ + treeview2.c treeview2.h treeview_helper.h user.h \ treeview_helper.c cup.h file.h fixture.h free.h league.h misc.h option.h player.h support.h team.h transfer.h treeview.h treeview_helper.h user.h variables.h \ user.c cup.h finance.h fixture.h free.h game_gui.h league.h live_game.h main.h maths.h misc.h name.h option.h player.h support.h team.h transfer.h treeview.h user.h window.h youth_academy.h \ - window.c callbacks.h file.h finance.h free.h game_gui.h gui.h interface.h league.h live_game.h load_save.h main.h misc2_interface.h misc_callback_func.h misc_interface.h option_gui.h option.h options_interface.h support.h transfer.h treeview.h treeview_helper.h user.h window.h \ + window.c callbacks.h file.h finance.h free.h game_gui.h gui.h interface.h league.h live_game.h load_save.h main.h misc2_interface.h misc_callback_func.h misc_interface.h option_gui.h option.h options_interface.h support.h transfer.h treeview2.h treeview.h treeview_helper.h user.h window.h \ xml.c cup.h file.h free.h gui.h league.h misc.h option.h support.h table.h transfer_struct.h user.h variables.h xml.h xml_loadsave_cup.h xml_loadsave_fixtures.h xml_loadsave_league.h xml_loadsave_league_stat.h xml_loadsave_live_game.h xml_loadsave_table.h xml_loadsave_teams.h xml_loadsave_transfers.h xml_loadsave_users.h \ xml_loadsave_cup.c cup.h file.h misc.h table.h team.h xml.h xml_loadsave_cup.h xml_loadsave_fixtures.h xml_loadsave_table.h xml_loadsave_teams.h \ xml_loadsave_fixtures.c file.h fixture.h misc.h team.h xml.h xml_loadsave_fixtures.h \ @@ -61,13 +62,14 @@ bygfoot_SOURCES = \ xml_loadsave_players.c player.h team.h xml.h xml_loadsave_players.h \ xml_loadsave_season_stats.c file.h free.h misc.h stat.h variables.h xml.h xml_loadsave_league_stat.h xml_loadsave_season_stats.h \ xml_loadsave_table.c file.h misc.h team.h xml.h xml_loadsave_table.h \ - xml_loadsave_teams.c file.h misc.h player.h team.h xml.h xml_loadsave_teams.h \ + xml_loadsave_teams.c file.h misc.h player.h team.h xml.h xml_loadsave_players.h xml_loadsave_teams.h \ xml_loadsave_transfers.c file.h misc.h team.h transfer.h xml.h xml_loadsave_transfers.h \ - xml_loadsave_users.c file.h misc.h team.h user.h variables.h xml.h xml_loadsave_live_game.h xml_loadsave_users.h \ + xml_loadsave_users.c file.h misc.h team.h user.h variables.h xml.h xml_loadsave_live_game.h xml_loadsave_players.h xml_loadsave_users.h \ xml_cup.c cup.h file.h main.h misc.h option.h variables.h xml_cup.h \ xml_country.c file.h free.h misc.h option.h variables.h xml_country.h xml_cup.h xml_league.h \ xml_league.c cup_struct.h file.h free.h league.h misc.h table.h team.h variables.h xml_cup.h xml_league.h \ xml_lg_commentary.c free.h lg_commentary.h live_game.h misc.h variables.h xml_lg_commentary.h \ + xml_mmatches.c xml.h xml_mmatches.h \ xml_name.c file.h free.h misc.h name.h variables.h xml_name.h \ xml_team.c file.h free.h main.h misc.h option.h player.h team.h variables.h xml_team.h \ youth_academy.c free.h maths.h name.h option.h player.h team.h user.h youth_academy.h diff --git a/src/bygfoot.h b/src/bygfoot.h index cb595709..60506b8b 100644 --- a/src/bygfoot.h +++ b/src/bygfoot.h @@ -130,6 +130,7 @@ typedef struct *wdebug, *help, *transfer_dialog, - *sponsors; + *sponsors, + *mmatches; } Windows; #endif diff --git a/src/callback_func.c b/src/callback_func.c index 961d07b5..8e88e362 100644 --- a/src/callback_func.c +++ b/src/callback_func.c @@ -125,7 +125,7 @@ callback_player_clicked(gint idx, GdkEventButton *event) /** Show the last match of the current user. @param start Whether we start the replay from the beginning or continue it. */ void -callback_show_last_match(gboolean start) +callback_show_last_match(gboolean start, LiveGame *lg) { gint i; @@ -134,13 +134,11 @@ callback_show_last_match(gboolean start) if(start) { stat2 = cur_user; - statp = ¤t_user.live_game; + statp = lg; window_create(WINDOW_LIVE); - treeview_show_game_stats(GTK_TREE_VIEW(lookup_widget(window.live, "treeview_stats")), - ¤t_user.live_game); - live_game_set_match(¤t_user.live_game); + treeview_show_game_stats(GTK_TREE_VIEW(lookup_widget(window.live, "treeview_stats")), lg); } else { @@ -148,9 +146,9 @@ callback_show_last_match(gboolean start) gtk_widget_set_sensitive(lookup_widget(window.live, "button_resume"), FALSE); } - for(i=stat3;ilen;i++) + for(i=stat3;iunits->len;i++) { - game_gui_live_game_show_unit(&g_array_index(current_user.live_game.units, LiveGameUnit, i)); + game_gui_live_game_show_unit(&g_array_index(lg->units, LiveGameUnit, i)); if(stat4 == STATUS_SHOW_LAST_MATCH_PAUSE || stat4 == STATUS_SHOW_LAST_MATCH_ABORT) @@ -269,7 +267,7 @@ callback_show_tables(gint type) return; } - stat1 = clid; + stat1 = clid; treeview_show_table(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")), clid); } diff --git a/src/callback_func.h b/src/callback_func.h index 4eb52f4d..305f001f 100644 --- a/src/callback_func.h +++ b/src/callback_func.h @@ -2,6 +2,7 @@ #define CALLBACK_FUNC_H #include "bygfoot.h" +#include "live_game_struct.h" void callback_show_next_live_game(void); @@ -10,7 +11,7 @@ void callback_player_clicked(gint idx, GdkEventButton *event); void -callback_show_last_match(gboolean start); +callback_show_last_match(gboolean start, LiveGame *lg); void callback_show_fixtures(gint type); diff --git a/src/callbacks.c b/src/callbacks.c index 26e5348c..72f6f4db 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -44,7 +44,7 @@ void on_menu_open_activate (GtkMenuItem *menuitem, gpointer user_data) { - stat1 = STATUS_LOAD_GAME; + stat5 = STATUS_LOAD_GAME; window_show_file_sel(); } @@ -65,7 +65,7 @@ void on_menu_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) { - stat1 = STATUS_SAVE_GAME; + stat5 = STATUS_SAVE_GAME; window_show_file_sel(); } @@ -667,7 +667,7 @@ on_menu_user_show_last_match_activate (GtkMenuItem *menuitem, stat1 = STATUS_SHOW_LAST_MATCH; stat3 = 0; - callback_show_last_match(TRUE); + callback_show_last_match(TRUE, ¤t_user.live_game); } @@ -1056,3 +1056,36 @@ on_menu_youth_kick_out_of_academy_activate selected_row = -1; } } + +void +on_mm_add_last_match_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + if(current_user.live_game.units->len == 0) + { + game_gui_show_warning(_("No match stored.")); + return; + } + + if(strlen(current_user.mmatches_file->str) == 0) + { + stat5 = STATUS_SELECT_MM_FILE_ADD; + window_show_file_sel(); + } + else + user_mm_add_last_match(FALSE, TRUE); +} + + +void +on_mm_manage_matches_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + if(strlen(current_user.mmatches_file->str) == 0) + { + stat5 = STATUS_SELECT_MM_FILE_LOAD; + window_show_file_sel(); + } + else + window_show_mmatches(); +} diff --git a/src/callbacks.h b/src/callbacks.h index 7a51e166..19423a9d 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -293,3 +293,11 @@ on_menu_youth_kick_out_of_academy_activate (GtkMenuItem *menuitem, gpointer user_data); #endif + +void +on_mm_add_last_match_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_mm_manage_matches_activate (GtkMenuItem *menuitem, + gpointer user_data); diff --git a/src/enums.h b/src/enums.h index d48912bf..c643492f 100644 --- a/src/enums.h +++ b/src/enums.h @@ -105,6 +105,8 @@ enum Status0Value STATUS_SHOW_YA, STATUS_SET_YA_PERCENTAGE, STATUS_QUERY_KICK_YOUTH, + STATUS_SELECT_MM_FILE_LOAD, + STATUS_SELECT_MM_FILE_ADD, STATUS_END }; diff --git a/src/fixture.c b/src/fixture.c index 617244cd..b1aa312a 100644 --- a/src/fixture.c +++ b/src/fixture.c @@ -671,10 +671,8 @@ query_fixture_is_draw(const Fixture *fix) first_leg = fixture_get_first_leg(fix); - return (fix->result[0][0] + first_leg->result[1][0] == - fix->result[1][0] + first_leg->result[0][0] && - fix->result[0][0] == first_leg->result[0][0] && - fix->result[0][1] == fix->result[1][1]); + return (fix->result[0][0] == first_leg->result[0][0] && + fix->result[1][0] + first_leg->result[1][0]); } /** Check whether a user's team participates. diff --git a/src/free.c b/src/free.c index 1b52d106..4a320ed3 100644 --- a/src/free.c +++ b/src/free.c @@ -119,7 +119,6 @@ free_user(User *user) for(i=0;ievents->len;i++) free_event(&g_array_index(user->events, Event, i)); - free_g_array(&user->events); for(i=0;ihistory->len;i++) @@ -127,9 +126,42 @@ free_user(User *user) UserHistory, i).value_string, TRUE); free_g_array(&user->history); + free_user_mmatches(user, FALSE); + free_player_array(&user->youth_academy.players); } +/** Free the memorable matches array of the user and the memorable matches + file name . */ +void +free_user_mmatches(User *user, gboolean reset) +{ + gint i; + + free_g_string(&user->mmatches_file); + + if(reset) + user->mmatches_file = g_string_new(""); + + if(user->mmatches == NULL) + { + if(reset) + user->mmatches = g_array_new(FALSE, FALSE, sizeof(MemMatch)); + return; + } + + for(i=0;immatches->len;i++) + { + free_g_string(&g_array_index(user->mmatches, MemMatch, i).competition_name); + free_g_string(&g_array_index(user->mmatches, MemMatch, i).country_name); + free_live_game(&g_array_index(user->mmatches, MemMatch, i).lg); + } + free_g_array(&user->mmatches); + + if(reset) + user->mmatches = g_array_new(FALSE, FALSE, sizeof(MemMatch)); +} + /** Free a user event. */ void free_event(Event *event) @@ -178,7 +210,7 @@ free_live_game(LiveGame *match) { gint i, j, k; - if(match->units == NULL) + if(match->units == NULL || match->started_game == -1) return; for(i=0;iunits->len;i++) diff --git a/src/free.h b/src/free.h index ffaa193c..dd358594 100644 --- a/src/free.h +++ b/src/free.h @@ -97,4 +97,7 @@ free_name_list(NameList *namelist, gboolean reset); void free_names(gboolean reset); +void +free_user_mmatches(User *user, gboolean reset); + #endif diff --git a/src/interface.c b/src/interface.c index e83f65d8..4229c67a 100644 --- a/src/interface.c +++ b/src/interface.c @@ -38,7 +38,7 @@ create_main_window (void) GtkWidget *menu_new; GtkWidget *menu_open; GtkWidget *menu_load_last_save; - GtkWidget *image1694; + GtkWidget *image1728; GtkWidget *menu_save; GtkWidget *menu_save_as; GtkWidget *trennlinie1; @@ -46,7 +46,7 @@ create_main_window (void) GtkWidget *menu_options; GtkWidget *menu_options_menu; GtkWidget *menu_preferences; - GtkWidget *image1695; + GtkWidget *image1729; GtkWidget *trennlinie7; GtkWidget *menu_job_offers; GtkWidget *menu_live_game; @@ -54,22 +54,22 @@ create_main_window (void) GtkWidget *menu_figures; GtkWidget *menu_figures_menu; GtkWidget *menu_fixtures_week; - GtkWidget *image1696; + GtkWidget *image1730; GtkWidget *menu_fixtures; - GtkWidget *image1697; + GtkWidget *image1731; GtkWidget *menu_tables; - GtkWidget *image1698; + GtkWidget *image1732; GtkWidget *menu_my_league_results; - GtkWidget *image1699; + GtkWidget *image1733; GtkWidget *trennlinie13; GtkWidget *menu_league_stats; - GtkWidget *image1700; + GtkWidget *image1734; GtkWidget *menu_season_history; - GtkWidget *image1701; + GtkWidget *image1735; GtkWidget *menu_team; GtkWidget *menu_team_menu; GtkWidget *menu_playing_style; - GtkWidget *image1702; + GtkWidget *image1736; GtkWidget *menu_playing_style_menu; GSList *menu_all_out_defend_group = NULL; GtkWidget *menu_all_out_defend; @@ -78,7 +78,7 @@ create_main_window (void) GtkWidget *menu_attack; GtkWidget *menu_all_out_attack; GtkWidget *menu_scout; - GtkWidget *image1703; + GtkWidget *image1737; GtkWidget *menu_scout_menu; GSList *menu_scout_best_group = NULL; GtkWidget *menu_scout_best; @@ -86,7 +86,7 @@ create_main_window (void) GtkWidget *menu_scout_average; GtkWidget *menu_scout_bad; GtkWidget *menu_physio; - GtkWidget *image1704; + GtkWidget *image1738; GtkWidget *menu_physio_menu; GSList *menu_physio_best_group = NULL; GtkWidget *menu_physio_best; @@ -113,7 +113,7 @@ create_main_window (void) GtkWidget *menu_recruit4; GtkWidget *menu_set_investment; GtkWidget *menu_boost; - GtkWidget *image1705; + GtkWidget *image1739; GtkWidget *menu_boost_menu; GSList *menu_boost_on_group = NULL; GtkWidget *menu_boost_on; @@ -121,64 +121,70 @@ create_main_window (void) GtkWidget *menu_boost_anti; GtkWidget *trennlinie11; GtkWidget *menu_reset_players; - GtkWidget *image1706; + GtkWidget *image1740; GtkWidget *menu_custom_structure; - GtkWidget *image1707; + GtkWidget *image1741; GtkWidget *menu_rearrange_team; - GtkWidget *image1708; + GtkWidget *image1742; GtkWidget *trennlinie8; GtkWidget *menu_browse_teams; - GtkWidget *image1709; + GtkWidget *image1743; GtkWidget *menu_player; GtkWidget *menu_player_menu; GtkWidget *menu_show_info; - GtkWidget *image1710; + GtkWidget *image1744; GtkWidget *menu_put_on_transfer_list; - GtkWidget *image1711; + GtkWidget *image1745; GtkWidget *menu_remove_from_transfer_list; - GtkWidget *image1712; + GtkWidget *image1746; GtkWidget *menu_offer_new_contract; - GtkWidget *image1713; + GtkWidget *image1747; GtkWidget *menu_fire; - GtkWidget *image1714; + GtkWidget *image1748; GtkWidget *menu_shoots_penalties; - GtkWidget *image1715; + GtkWidget *image1749; GtkWidget *menu_move_to_youth_academy; GtkWidget *trennlinie10; GtkWidget *menu_browse_players; - GtkWidget *image1716; + GtkWidget *image1750; GtkWidget *menu_user; GtkWidget *menu_user_menu; GtkWidget *menu_user_show_last_match; - GtkWidget *image1717; + GtkWidget *image1751; GtkWidget *menu_user_show_last_stats; - GtkWidget *image1718; + GtkWidget *image1752; GtkWidget *menu_user_show_coming_matches; - GtkWidget *image1719; + GtkWidget *image1753; + GtkWidget *memorable_matches; + GtkWidget *memorable_matches_menu; + GtkWidget *mm_add_last_match; + GtkWidget *image1754; + GtkWidget *mm_manage_matches; + GtkWidget *image1755; GtkWidget *trennlinie12; GtkWidget *menu_user_show_history; - GtkWidget *image1720; + GtkWidget *image1756; GtkWidget *trennlinie9; GtkWidget *menu_next_user; - GtkWidget *image1721; + GtkWidget *image1757; GtkWidget *menu_previous_user; - GtkWidget *image1722; + GtkWidget *image1758; GtkWidget *menu_manage_users; - GtkWidget *image1723; + GtkWidget *image1759; GtkWidget *menu_finances_stadium; GtkWidget *menu_finances_stadium_menu; GtkWidget *menu_show_finances; - GtkWidget *image1724; + GtkWidget *image1760; GtkWidget *menu_show_stadium; - GtkWidget *image1725; + GtkWidget *image1761; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *menu_about; - GtkWidget *image1726; + GtkWidget *image1762; GtkWidget *menu_contributors; - GtkWidget *image1727; + GtkWidget *image1763; GtkWidget *menu_help; - GtkWidget *image1728; + GtkWidget *image1764; GtkWidget *hbox1; GtkWidget *button_load; GtkWidget *image11; @@ -299,9 +305,9 @@ create_main_window (void) GDK_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); - image1694 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1694); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1694); + image1728 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1728); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1728); menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); gtk_widget_show (menu_save); @@ -334,9 +340,9 @@ create_main_window (void) GDK_p, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1695 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1695); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1695); + image1729 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1729); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1729); trennlinie7 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie7); @@ -371,9 +377,9 @@ create_main_window (void) GDK_F3, 0, GTK_ACCEL_VISIBLE); - image1696 = create_pixmap (main_window, "menu_fixtures.png"); - gtk_widget_show (image1696); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1696); + image1730 = create_pixmap (main_window, "menu_fixtures.png"); + gtk_widget_show (image1730); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1730); menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)")); gtk_widget_show (menu_fixtures); @@ -382,9 +388,9 @@ create_main_window (void) GDK_F4, 0, GTK_ACCEL_VISIBLE); - image1697 = create_pixmap (main_window, "menu_fixtures_comp.png"); - gtk_widget_show (image1697); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1697); + image1731 = create_pixmap (main_window, "menu_fixtures_comp.png"); + gtk_widget_show (image1731); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1731); menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables")); gtk_widget_show (menu_tables); @@ -393,9 +399,9 @@ create_main_window (void) GDK_F5, 0, GTK_ACCEL_VISIBLE); - image1698 = create_pixmap (main_window, "menu_table.png"); - gtk_widget_show (image1698); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1698); + image1732 = create_pixmap (main_window, "menu_table.png"); + gtk_widget_show (image1732); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1732); menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results")); gtk_widget_show (menu_my_league_results); @@ -404,9 +410,9 @@ create_main_window (void) GDK_F6, 0, GTK_ACCEL_VISIBLE); - image1699 = create_pixmap (main_window, "menu_league_results.png"); - gtk_widget_show (image1699); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1699); + image1733 = create_pixmap (main_window, "menu_league_results.png"); + gtk_widget_show (image1733); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1733); trennlinie13 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie13); @@ -420,9 +426,9 @@ create_main_window (void) GDK_s, 0, GTK_ACCEL_VISIBLE); - image1700 = create_pixmap (main_window, "menu_league_stats.png"); - gtk_widget_show (image1700); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1700); + image1734 = create_pixmap (main_window, "menu_league_stats.png"); + gtk_widget_show (image1734); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1734); menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history")); gtk_widget_show (menu_season_history); @@ -431,9 +437,9 @@ create_main_window (void) GDK_h, 0, GTK_ACCEL_VISIBLE); - image1701 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image1701); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1701); + image1735 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image1735); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1735); menu_team = gtk_menu_item_new_with_mnemonic (_("_Team")); gtk_widget_show (menu_team); @@ -446,9 +452,9 @@ create_main_window (void) gtk_widget_show (menu_playing_style); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style); - image1702 = create_pixmap (main_window, "menu_style.png"); - gtk_widget_show (image1702); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1702); + image1736 = create_pixmap (main_window, "menu_style.png"); + gtk_widget_show (image1736); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1736); menu_playing_style_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu); @@ -457,11 +463,13 @@ create_main_window (void) menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_all_out_defend)); gtk_widget_show (menu_all_out_defend); gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_all_out_defend); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_all_out_defend), TRUE); menu_defend = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("Defend")); menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_defend)); gtk_widget_show (menu_defend); gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_defend); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_defend), TRUE); menu_balanced = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("Balanced")); menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_balanced)); @@ -473,19 +481,21 @@ create_main_window (void) menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_attack)); gtk_widget_show (menu_attack); gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_attack); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_attack), TRUE); menu_all_out_attack = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("All Out Attack")); menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_all_out_attack)); gtk_widget_show (menu_all_out_attack); gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_all_out_attack); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_all_out_attack), TRUE); menu_scout = gtk_image_menu_item_new_with_mnemonic (_("Scout")); gtk_widget_show (menu_scout); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout); - image1703 = create_pixmap (main_window, "menu_scout.png"); - gtk_widget_show (image1703); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1703); + image1737 = create_pixmap (main_window, "menu_scout.png"); + gtk_widget_show (image1737); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1737); menu_scout_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu); @@ -494,11 +504,13 @@ create_main_window (void) menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_best)); gtk_widget_show (menu_scout_best); gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_best); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_best), TRUE); menu_scout_good = gtk_radio_menu_item_new_with_mnemonic (menu_scout_best_group, _("Good")); menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_good)); gtk_widget_show (menu_scout_good); gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_good); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_good), TRUE); menu_scout_average = gtk_radio_menu_item_new_with_mnemonic (menu_scout_best_group, _("Average")); menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_average)); @@ -510,14 +522,15 @@ create_main_window (void) menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_bad)); gtk_widget_show (menu_scout_bad); gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_bad); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_bad), TRUE); menu_physio = gtk_image_menu_item_new_with_mnemonic (_("Physio")); gtk_widget_show (menu_physio); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio); - image1704 = create_pixmap (main_window, "menu_physio.png"); - gtk_widget_show (image1704); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1704); + image1738 = create_pixmap (main_window, "menu_physio.png"); + gtk_widget_show (image1738); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1738); menu_physio_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu); @@ -526,11 +539,13 @@ create_main_window (void) menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_best)); gtk_widget_show (menu_physio_best); gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_best); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_best), TRUE); menu_physio_good = gtk_radio_menu_item_new_with_mnemonic (menu_physio_best_group, _("Good")); menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_good)); gtk_widget_show (menu_physio_good); gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_good); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_good), TRUE); menu_physio_average = gtk_radio_menu_item_new_with_mnemonic (menu_physio_best_group, _("Average")); menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_average)); @@ -542,6 +557,7 @@ create_main_window (void) menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_bad)); gtk_widget_show (menu_physio_bad); gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_bad); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_bad), TRUE); menu_youth_academy = gtk_menu_item_new_with_mnemonic (_("Youth academy")); gtk_widget_show (menu_youth_academy); @@ -568,11 +584,13 @@ create_main_window (void) menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_best)); gtk_widget_show (menu_yc_best); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_best); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_best), TRUE); menu_yc_good = gtk_radio_menu_item_new_with_mnemonic (menu_yc_best_group, _("Good")); menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_good)); gtk_widget_show (menu_yc_good); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_good); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_good), TRUE); menu_yc_average = gtk_radio_menu_item_new_with_mnemonic (menu_yc_best_group, _("Average")); menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_average)); @@ -584,6 +602,7 @@ create_main_window (void) menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_bad)); gtk_widget_show (menu_yc_bad); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_bad); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_bad), TRUE); recruiting_preference1 = gtk_menu_item_new_with_mnemonic (_("Recruiting preference")); gtk_widget_show (recruiting_preference1); @@ -596,21 +615,25 @@ create_main_window (void) menu_recruit0_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_recruit0)); gtk_widget_show (menu_recruit0); gtk_container_add (GTK_CONTAINER (recruiting_preference1_menu), menu_recruit0); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_recruit0), TRUE); menu_recruit1 = gtk_radio_menu_item_new_with_mnemonic (menu_recruit0_group, _("Defenders")); menu_recruit0_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_recruit1)); gtk_widget_show (menu_recruit1); gtk_container_add (GTK_CONTAINER (recruiting_preference1_menu), menu_recruit1); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_recruit1), TRUE); menu_recruit2 = gtk_radio_menu_item_new_with_mnemonic (menu_recruit0_group, _("Midfielders")); menu_recruit0_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_recruit2)); gtk_widget_show (menu_recruit2); gtk_container_add (GTK_CONTAINER (recruiting_preference1_menu), menu_recruit2); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_recruit2), TRUE); menu_recruit3 = gtk_radio_menu_item_new_with_mnemonic (menu_recruit0_group, _("Forwards")); menu_recruit0_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_recruit3)); gtk_widget_show (menu_recruit3); gtk_container_add (GTK_CONTAINER (recruiting_preference1_menu), menu_recruit3); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_recruit3), TRUE); menu_recruit4 = gtk_radio_menu_item_new_with_mnemonic (menu_recruit0_group, _("Any")); menu_recruit0_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_recruit4)); @@ -627,9 +650,9 @@ create_main_window (void) gtk_widget_show (menu_boost); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost); - image1705 = create_pixmap (main_window, "menu_boost.png"); - gtk_widget_show (image1705); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1705); + image1739 = create_pixmap (main_window, "menu_boost.png"); + gtk_widget_show (image1739); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1739); menu_boost_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu); @@ -638,6 +661,7 @@ create_main_window (void) menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_on)); gtk_widget_show (menu_boost_on); gtk_container_add (GTK_CONTAINER (menu_boost_menu), menu_boost_on); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_boost_on), TRUE); menu_boost_off = gtk_radio_menu_item_new_with_mnemonic (menu_boost_on_group, _("Off")); menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_off)); @@ -649,6 +673,7 @@ create_main_window (void) menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_anti)); gtk_widget_show (menu_boost_anti); gtk_container_add (GTK_CONTAINER (menu_boost_menu), menu_boost_anti); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_boost_anti), TRUE); trennlinie11 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie11); @@ -659,17 +684,17 @@ create_main_window (void) gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_reset_players); gtk_tooltips_set_tip (tooltips, menu_reset_players, _("Reset player list to the formation at the beginning of the live game pause (right click on player list)"), NULL); - image1706 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1706); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1706); + image1740 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1740); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1740); menu_custom_structure = gtk_image_menu_item_new_with_mnemonic (_("Enter custom structure")); gtk_widget_show (menu_custom_structure); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_custom_structure); - image1707 = create_pixmap (main_window, "menu_structure.png"); - gtk_widget_show (image1707); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1707); + image1741 = create_pixmap (main_window, "menu_structure.png"); + gtk_widget_show (image1741); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1741); menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team")); gtk_widget_show (menu_rearrange_team); @@ -679,9 +704,9 @@ create_main_window (void) GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1708 = create_pixmap (main_window, "menu_rearrange.png"); - gtk_widget_show (image1708); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1708); + image1742 = create_pixmap (main_window, "menu_rearrange.png"); + gtk_widget_show (image1742); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1742); trennlinie8 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie8); @@ -692,9 +717,9 @@ create_main_window (void) gtk_widget_show (menu_browse_teams); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams); - image1709 = create_pixmap (main_window, "menu_browse_tms.png"); - gtk_widget_show (image1709); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1709); + image1743 = create_pixmap (main_window, "menu_browse_tms.png"); + gtk_widget_show (image1743); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1743); menu_player = gtk_menu_item_new_with_mnemonic (_("_Player")); gtk_widget_show (menu_player); @@ -707,49 +732,49 @@ create_main_window (void) gtk_widget_show (menu_show_info); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info); - image1710 = create_pixmap (main_window, "menu_player_info.png"); - gtk_widget_show (image1710); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1710); + image1744 = create_pixmap (main_window, "menu_player_info.png"); + gtk_widget_show (image1744); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1744); menu_put_on_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Put on transfer list")); gtk_widget_show (menu_put_on_transfer_list); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_put_on_transfer_list); - image1711 = create_pixmap (main_window, "menu_player_put_transfer.png"); - gtk_widget_show (image1711); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1711); + image1745 = create_pixmap (main_window, "menu_player_put_transfer.png"); + gtk_widget_show (image1745); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1745); menu_remove_from_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Remove from transfer list")); gtk_widget_show (menu_remove_from_transfer_list); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_remove_from_transfer_list); - image1712 = create_pixmap (main_window, "menu_player_remove_transfer.png"); - gtk_widget_show (image1712); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1712); + image1746 = create_pixmap (main_window, "menu_player_remove_transfer.png"); + gtk_widget_show (image1746); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1746); menu_offer_new_contract = gtk_image_menu_item_new_with_mnemonic (_("Offer new contract")); gtk_widget_show (menu_offer_new_contract); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_offer_new_contract); - image1713 = create_pixmap (main_window, "menu_player_contract.png"); - gtk_widget_show (image1713); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1713); + image1747 = create_pixmap (main_window, "menu_player_contract.png"); + gtk_widget_show (image1747); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1747); menu_fire = gtk_image_menu_item_new_with_mnemonic (_("Fire")); gtk_widget_show (menu_fire); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_fire); - image1714 = create_pixmap (main_window, "menu_player_fire.png"); - gtk_widget_show (image1714); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1714); + image1748 = create_pixmap (main_window, "menu_player_fire.png"); + gtk_widget_show (image1748); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1748); menu_shoots_penalties = gtk_image_menu_item_new_with_mnemonic (_("Shoots penalties")); gtk_widget_show (menu_shoots_penalties); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_shoots_penalties); - image1715 = create_pixmap (main_window, "menu_player_shoots.png"); - gtk_widget_show (image1715); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1715); + image1749 = create_pixmap (main_window, "menu_player_shoots.png"); + gtk_widget_show (image1749); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1749); menu_move_to_youth_academy = gtk_menu_item_new_with_mnemonic (_("Move to youth academy")); gtk_widget_show (menu_move_to_youth_academy); @@ -764,9 +789,9 @@ create_main_window (void) gtk_widget_show (menu_browse_players); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players); - image1716 = create_pixmap (main_window, "menu_player_browse.png"); - gtk_widget_show (image1716); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1716); + image1750 = create_pixmap (main_window, "menu_player_browse.png"); + gtk_widget_show (image1750); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1750); menu_user = gtk_menu_item_new_with_mnemonic (_("_User")); gtk_widget_show (menu_user); @@ -782,9 +807,9 @@ create_main_window (void) GDK_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1717 = create_pixmap (main_window, "menu_last_match.png"); - gtk_widget_show (image1717); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1717); + image1751 = create_pixmap (main_window, "menu_last_match.png"); + gtk_widget_show (image1751); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1751); menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats")); gtk_widget_show (menu_user_show_last_stats); @@ -793,17 +818,42 @@ create_main_window (void) GDK_F2, 0, GTK_ACCEL_VISIBLE); - image1718 = create_pixmap (main_window, "menu_match_stats.png"); - gtk_widget_show (image1718); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1718); + image1752 = create_pixmap (main_window, "menu_match_stats.png"); + gtk_widget_show (image1752); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1752); menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches")); gtk_widget_show (menu_user_show_coming_matches); gtk_container_add (GTK_CONTAINER (menu_user_menu), menu_user_show_coming_matches); - image1719 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1719); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1719); + image1753 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1753); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1753); + + memorable_matches = gtk_menu_item_new_with_mnemonic (_("Memorable matches")); + gtk_widget_show (memorable_matches); + gtk_container_add (GTK_CONTAINER (menu_user_menu), memorable_matches); + + memorable_matches_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (memorable_matches), memorable_matches_menu); + + mm_add_last_match = gtk_image_menu_item_new_with_mnemonic (_("Add last match")); + gtk_widget_show (mm_add_last_match); + gtk_container_add (GTK_CONTAINER (memorable_matches_menu), mm_add_last_match); + gtk_tooltips_set_tip (tooltips, mm_add_last_match, _("Add last recorded match to the current memorable matches file."), NULL); + + image1754 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1754); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image1754); + + mm_manage_matches = gtk_image_menu_item_new_with_mnemonic (_("Manage matches")); + gtk_widget_show (mm_manage_matches); + gtk_container_add (GTK_CONTAINER (memorable_matches_menu), mm_manage_matches); + gtk_tooltips_set_tip (tooltips, mm_manage_matches, _("Play, delete or add memorable matches."), NULL); + + image1755 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1755); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image1755); trennlinie12 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie12); @@ -817,9 +867,9 @@ create_main_window (void) GDK_h, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1720 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image1720); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1720); + image1756 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image1756); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1756); trennlinie9 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie9); @@ -833,9 +883,9 @@ create_main_window (void) GDK_F9, 0, GTK_ACCEL_VISIBLE); - image1721 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1721); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1721); + image1757 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1757); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1757); menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user")); gtk_widget_show (menu_previous_user); @@ -844,9 +894,9 @@ create_main_window (void) GDK_F8, 0, GTK_ACCEL_VISIBLE); - image1722 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1722); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1722); + image1758 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1758); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1758); menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users")); gtk_widget_show (menu_manage_users); @@ -855,9 +905,9 @@ create_main_window (void) GDK_F12, 0, GTK_ACCEL_VISIBLE); - image1723 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1723); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1723); + image1759 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1759); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1759); menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad")); gtk_widget_show (menu_finances_stadium); @@ -873,9 +923,9 @@ create_main_window (void) GDK_f, 0, GTK_ACCEL_VISIBLE); - image1724 = create_pixmap (main_window, "menu_finances.png"); - gtk_widget_show (image1724); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1724); + image1760 = create_pixmap (main_window, "menu_finances.png"); + gtk_widget_show (image1760); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1760); menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium")); gtk_widget_show (menu_show_stadium); @@ -884,9 +934,9 @@ create_main_window (void) GDK_f, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1725 = create_pixmap (main_window, "menu_stadium.png"); - gtk_widget_show (image1725); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1725); + image1761 = create_pixmap (main_window, "menu_stadium.png"); + gtk_widget_show (image1761); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1761); menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (menu_help1); @@ -899,25 +949,25 @@ create_main_window (void) gtk_widget_show (menu_about); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about); - image1726 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1726); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1726); + image1762 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1762); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1762); menu_contributors = gtk_image_menu_item_new_with_mnemonic (_("Contributors")); gtk_widget_show (menu_contributors); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_contributors); - image1727 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1727); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1727); + image1763 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1763); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1763); menu_help = gtk_image_menu_item_new_with_mnemonic (_("Help")); gtk_widget_show (menu_help); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_help); - image1728 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1728); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1728); + image1764 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1764); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1764); hbox1 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox1); @@ -1454,6 +1504,12 @@ create_main_window (void) g_signal_connect ((gpointer) menu_user_show_coming_matches, "activate", G_CALLBACK (on_menu_user_show_coming_matches_activate), NULL); + g_signal_connect ((gpointer) mm_add_last_match, "activate", + G_CALLBACK (on_mm_add_last_match_activate), + NULL); + g_signal_connect ((gpointer) mm_manage_matches, "activate", + G_CALLBACK (on_mm_manage_matches_activate), + NULL); g_signal_connect ((gpointer) menu_user_show_history, "activate", G_CALLBACK (on_menu_user_show_history_activate), NULL); @@ -1542,7 +1598,7 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_new, "menu_new"); GLADE_HOOKUP_OBJECT (main_window, menu_open, "menu_open"); GLADE_HOOKUP_OBJECT (main_window, menu_load_last_save, "menu_load_last_save"); - GLADE_HOOKUP_OBJECT (main_window, image1694, "image1694"); + GLADE_HOOKUP_OBJECT (main_window, image1728, "image1728"); GLADE_HOOKUP_OBJECT (main_window, menu_save, "menu_save"); GLADE_HOOKUP_OBJECT (main_window, menu_save_as, "menu_save_as"); GLADE_HOOKUP_OBJECT (main_window, trennlinie1, "trennlinie1"); @@ -1550,7 +1606,7 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options"); GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences"); - GLADE_HOOKUP_OBJECT (main_window, image1695, "image1695"); + GLADE_HOOKUP_OBJECT (main_window, image1729, "image1729"); GLADE_HOOKUP_OBJECT (main_window, trennlinie7, "trennlinie7"); GLADE_HOOKUP_OBJECT (main_window, menu_job_offers, "menu_job_offers"); GLADE_HOOKUP_OBJECT (main_window, menu_live_game, "menu_live_game"); @@ -1558,22 +1614,22 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_figures, "menu_figures"); GLADE_HOOKUP_OBJECT (main_window, menu_figures_menu, "menu_figures_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_fixtures_week, "menu_fixtures_week"); - GLADE_HOOKUP_OBJECT (main_window, image1696, "image1696"); + GLADE_HOOKUP_OBJECT (main_window, image1730, "image1730"); GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures"); - GLADE_HOOKUP_OBJECT (main_window, image1697, "image1697"); + GLADE_HOOKUP_OBJECT (main_window, image1731, "image1731"); GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables"); - GLADE_HOOKUP_OBJECT (main_window, image1698, "image1698"); + GLADE_HOOKUP_OBJECT (main_window, image1732, "image1732"); GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results"); - GLADE_HOOKUP_OBJECT (main_window, image1699, "image1699"); + GLADE_HOOKUP_OBJECT (main_window, image1733, "image1733"); GLADE_HOOKUP_OBJECT (main_window, trennlinie13, "trennlinie13"); GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats"); - GLADE_HOOKUP_OBJECT (main_window, image1700, "image1700"); + GLADE_HOOKUP_OBJECT (main_window, image1734, "image1734"); GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history"); - GLADE_HOOKUP_OBJECT (main_window, image1701, "image1701"); + GLADE_HOOKUP_OBJECT (main_window, image1735, "image1735"); GLADE_HOOKUP_OBJECT (main_window, menu_team, "menu_team"); GLADE_HOOKUP_OBJECT (main_window, menu_team_menu, "menu_team_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_playing_style, "menu_playing_style"); - GLADE_HOOKUP_OBJECT (main_window, image1702, "image1702"); + GLADE_HOOKUP_OBJECT (main_window, image1736, "image1736"); GLADE_HOOKUP_OBJECT (main_window, menu_playing_style_menu, "menu_playing_style_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_all_out_defend, "menu_all_out_defend"); GLADE_HOOKUP_OBJECT (main_window, menu_defend, "menu_defend"); @@ -1581,14 +1637,14 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_attack, "menu_attack"); GLADE_HOOKUP_OBJECT (main_window, menu_all_out_attack, "menu_all_out_attack"); GLADE_HOOKUP_OBJECT (main_window, menu_scout, "menu_scout"); - GLADE_HOOKUP_OBJECT (main_window, image1703, "image1703"); + GLADE_HOOKUP_OBJECT (main_window, image1737, "image1737"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_menu, "menu_scout_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_best, "menu_scout_best"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_good, "menu_scout_good"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_average, "menu_scout_average"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_bad, "menu_scout_bad"); GLADE_HOOKUP_OBJECT (main_window, menu_physio, "menu_physio"); - GLADE_HOOKUP_OBJECT (main_window, image1704, "image1704"); + GLADE_HOOKUP_OBJECT (main_window, image1738, "image1738"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_menu, "menu_physio_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_best, "menu_physio_best"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_good, "menu_physio_good"); @@ -1612,71 +1668,77 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_recruit4, "menu_recruit4"); GLADE_HOOKUP_OBJECT (main_window, menu_set_investment, "menu_set_investment"); GLADE_HOOKUP_OBJECT (main_window, menu_boost, "menu_boost"); - GLADE_HOOKUP_OBJECT (main_window, image1705, "image1705"); + GLADE_HOOKUP_OBJECT (main_window, image1739, "image1739"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_menu, "menu_boost_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_on, "menu_boost_on"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_off, "menu_boost_off"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_anti, "menu_boost_anti"); GLADE_HOOKUP_OBJECT (main_window, trennlinie11, "trennlinie11"); GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players"); - GLADE_HOOKUP_OBJECT (main_window, image1706, "image1706"); + GLADE_HOOKUP_OBJECT (main_window, image1740, "image1740"); GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure"); - GLADE_HOOKUP_OBJECT (main_window, image1707, "image1707"); + GLADE_HOOKUP_OBJECT (main_window, image1741, "image1741"); GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team"); - GLADE_HOOKUP_OBJECT (main_window, image1708, "image1708"); + GLADE_HOOKUP_OBJECT (main_window, image1742, "image1742"); GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams"); - GLADE_HOOKUP_OBJECT (main_window, image1709, "image1709"); + GLADE_HOOKUP_OBJECT (main_window, image1743, "image1743"); GLADE_HOOKUP_OBJECT (main_window, menu_player, "menu_player"); GLADE_HOOKUP_OBJECT (main_window, menu_player_menu, "menu_player_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_show_info, "menu_show_info"); - GLADE_HOOKUP_OBJECT (main_window, image1710, "image1710"); + GLADE_HOOKUP_OBJECT (main_window, image1744, "image1744"); GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image1711, "image1711"); + GLADE_HOOKUP_OBJECT (main_window, image1745, "image1745"); GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image1712, "image1712"); + GLADE_HOOKUP_OBJECT (main_window, image1746, "image1746"); GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract"); - GLADE_HOOKUP_OBJECT (main_window, image1713, "image1713"); + GLADE_HOOKUP_OBJECT (main_window, image1747, "image1747"); GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire"); - GLADE_HOOKUP_OBJECT (main_window, image1714, "image1714"); + GLADE_HOOKUP_OBJECT (main_window, image1748, "image1748"); GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties"); - GLADE_HOOKUP_OBJECT (main_window, image1715, "image1715"); + GLADE_HOOKUP_OBJECT (main_window, image1749, "image1749"); GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy"); GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players"); - GLADE_HOOKUP_OBJECT (main_window, image1716, "image1716"); + GLADE_HOOKUP_OBJECT (main_window, image1750, "image1750"); GLADE_HOOKUP_OBJECT (main_window, menu_user, "menu_user"); GLADE_HOOKUP_OBJECT (main_window, menu_user_menu, "menu_user_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_match, "menu_user_show_last_match"); - GLADE_HOOKUP_OBJECT (main_window, image1717, "image1717"); + GLADE_HOOKUP_OBJECT (main_window, image1751, "image1751"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats"); - GLADE_HOOKUP_OBJECT (main_window, image1718, "image1718"); + GLADE_HOOKUP_OBJECT (main_window, image1752, "image1752"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches"); - GLADE_HOOKUP_OBJECT (main_window, image1719, "image1719"); + GLADE_HOOKUP_OBJECT (main_window, image1753, "image1753"); + GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches"); + GLADE_HOOKUP_OBJECT (main_window, memorable_matches_menu, "memorable_matches_menu"); + GLADE_HOOKUP_OBJECT (main_window, mm_add_last_match, "mm_add_last_match"); + GLADE_HOOKUP_OBJECT (main_window, image1754, "image1754"); + GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches"); + GLADE_HOOKUP_OBJECT (main_window, image1755, "image1755"); GLADE_HOOKUP_OBJECT (main_window, trennlinie12, "trennlinie12"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history"); - GLADE_HOOKUP_OBJECT (main_window, image1720, "image1720"); + GLADE_HOOKUP_OBJECT (main_window, image1756, "image1756"); GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9"); GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user"); - GLADE_HOOKUP_OBJECT (main_window, image1721, "image1721"); + GLADE_HOOKUP_OBJECT (main_window, image1757, "image1757"); GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user"); - GLADE_HOOKUP_OBJECT (main_window, image1722, "image1722"); + GLADE_HOOKUP_OBJECT (main_window, image1758, "image1758"); GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users"); - GLADE_HOOKUP_OBJECT (main_window, image1723, "image1723"); + GLADE_HOOKUP_OBJECT (main_window, image1759, "image1759"); GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium, "menu_finances_stadium"); GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium_menu, "menu_finances_stadium_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_show_finances, "menu_show_finances"); - GLADE_HOOKUP_OBJECT (main_window, image1724, "image1724"); + GLADE_HOOKUP_OBJECT (main_window, image1760, "image1760"); GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium"); - GLADE_HOOKUP_OBJECT (main_window, image1725, "image1725"); + GLADE_HOOKUP_OBJECT (main_window, image1761, "image1761"); GLADE_HOOKUP_OBJECT (main_window, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (main_window, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_about, "menu_about"); - GLADE_HOOKUP_OBJECT (main_window, image1726, "image1726"); + GLADE_HOOKUP_OBJECT (main_window, image1762, "image1762"); GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors"); - GLADE_HOOKUP_OBJECT (main_window, image1727, "image1727"); + GLADE_HOOKUP_OBJECT (main_window, image1763, "image1763"); GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help"); - GLADE_HOOKUP_OBJECT (main_window, image1728, "image1728"); + GLADE_HOOKUP_OBJECT (main_window, image1764, "image1764"); GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1"); GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load"); GLADE_HOOKUP_OBJECT (main_window, image11, "image11"); diff --git a/src/live_game.c b/src/live_game.c index 26a74c8a..9608926e 100644 --- a/src/live_game.c +++ b/src/live_game.c @@ -20,7 +20,8 @@ #include "window.h" /** The live game we calculate. */ -LiveGame *match; +#define match ((LiveGame*)statp) + /** Whether the events are actually shown or not. */ gboolean show; @@ -72,14 +73,13 @@ live_game_calculate_fixture(Fixture *fix) void live_game_initialize(Fixture *fix) { - match = (fixture_user_team_involved(fix) != -1) ? + statp= (fixture_user_team_involved(fix) != -1) ? &usr(fixture_user_team_involved(fix)).live_game : &live_game_temp; show = (fixture_user_team_involved(fix) != -1 && option_int("int_opt_user_show_live_game", &usr(fixture_user_team_involved(fix)).options)); stat2 = fixture_user_team_involved(fix); - statp = match; live_game_reset(match, fix, TRUE); @@ -1392,7 +1392,7 @@ live_game_resume(void) gint subs_in[3], subs_out[3]; - match = &usr(stat2).live_game; + statp = &usr(stat2).live_game; for(i=0;i<2;i++) { @@ -1422,14 +1422,6 @@ live_game_resume(void) } -/** Set the match variable to the live game. - @param live_game The live game 'match' will point to. */ -void -live_game_set_match(LiveGame *live_game) -{ - match = live_game; -} - /** Reset the live game variable before we begin a new live game. @param live_game The pointer to the live game. @param fix The fixture we'll show. @@ -1538,3 +1530,21 @@ live_game_event_get_verbosity(gint event_type) return return_value; } + +/** Write a result like '2:3 e.t.' into the buffer. + @param swap Whether to swap the scores. */ +void +live_game_unit_result_to_buf(const LiveGameUnit *unit, gchar *buf, gboolean swap) +{ + gint idx = (swap) ? 1 : 0; + + if(unit->time == LIVE_GAME_UNIT_TIME_PENALTIES) + sprintf(buf, _("%d : %d p."), unit->result[idx], + unit->result[!idx]); + else if(unit->time == LIVE_GAME_UNIT_TIME_EXTRA_TIME) + sprintf(buf, _("%d : %d e.t."), unit->result[idx], + unit->result[!idx]); + else + sprintf(buf, _("%d : %d"), unit->result[idx], + unit->result[!idx]); +} diff --git a/src/live_game.h b/src/live_game.h index a6cf4ae9..03a47891 100644 --- a/src/live_game.h +++ b/src/live_game.h @@ -112,4 +112,7 @@ live_game_set_match(LiveGame *live_game); gint live_game_event_get_verbosity(gint event_type); +void +live_game_unit_result_to_buf(const LiveGameUnit *unit, gchar *buf, gboolean swap); + #endif diff --git a/src/main.c b/src/main.c index 9caffe4c..ce5ce059 100644 --- a/src/main.c +++ b/src/main.c @@ -44,7 +44,8 @@ main_init_variables(void) window.stadium = window.job_offer = window.yesno = window.options = window.font_sel = window.file_chooser = window.contract = - window.menu_player = window.user_management = NULL; + window.menu_player = window.user_management = + window.mmatches = NULL; live_game_reset(&live_game_temp, NULL, FALSE); diff --git a/src/misc2_callbacks.c b/src/misc2_callbacks.c index c897e354..100d2060 100644 --- a/src/misc2_callbacks.c +++ b/src/misc2_callbacks.c @@ -13,6 +13,7 @@ #include "support.h" #include "transfer.h" #include "treeview.h" +#include "treeview2.h" #include "treeview_helper.h" #include "user.h" #include "window.h" @@ -472,3 +473,122 @@ on_button_transfer_later_clicked (GtkButton *button, { window_destroy(&window.transfer_dialog, FALSE); } + +gboolean +on_window_mmatches_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + on_button_mm_reload_close_clicked(NULL, NULL); + + return TRUE; +} + + +gboolean +on_treeview_mmatches_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + GtkTreePath *path = NULL; + GtkTreeViewColumn *col = NULL; + gint col_num = -1, mmidx = -1; + + if(!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), + event->x, event->y, + &path, &col, NULL, NULL)) + return TRUE; + + col_num = treeview_helper_get_col_number_column(col); + mmidx = gtk_tree_path_get_indices(path)[0]; + + gtk_tree_path_free(path); + + if(col_num == -1 || mmidx == -1) + { + g_warning("on_treeview_mmatches_button_press_event: column or row not valid\n"); + return TRUE; + } + + if(col_num == 6) + { + stat1 = STATUS_SHOW_LAST_MATCH; + stat3 = 0; + callback_show_last_match(TRUE, + &g_array_index(current_user.mmatches, MemMatch, mmidx).lg); + } + else if(col_num == 7) + { + gtk_widget_hide(widget); + free_g_string(&g_array_index(current_user.mmatches, MemMatch, mmidx).competition_name); + free_g_string(&g_array_index(current_user.mmatches, MemMatch, mmidx).country_name); + free_live_game(&g_array_index(current_user.mmatches, MemMatch, mmidx).lg); + g_array_remove_index(current_user.mmatches, mmidx); + treeview2_show_mmatches(); + gtk_widget_show(widget); + } + + return TRUE; +} + + +void +on_button_mm_save_close_clicked (GtkButton *button, + gpointer user_data) +{ + const gchar *filename = + gtk_entry_get_text(GTK_ENTRY(lookup_widget(window.mmatches, "entry_mm_file"))); + + user_mm_set_filename(filename); + user_mm_save_file(); + + window_destroy(&window.mmatches, TRUE); +} + + +void +on_button_mm_add_clicked (GtkButton *button, + gpointer user_data) +{ + if(current_user.live_game.units->len == 0) + { + game_gui_show_warning(_("No match stored.")); + return; + } + + user_mm_add_last_match(FALSE, FALSE); + treeview2_show_mmatches(); +} + + +void +on_button_mm_file_clicked (GtkButton *button, + gpointer user_data) +{ + stat5 = STATUS_SELECT_MM_FILE_LOAD; + window_show_file_sel(); +} + + +void +on_button_mm_reload_clicked (GtkButton *button, + gpointer user_data) +{ + GtkWidget *treeview = lookup_widget(window.mmatches, "treeview_mmatches"); + const gchar *filename = + gtk_entry_get_text(GTK_ENTRY(lookup_widget(window.mmatches, "entry_mm_file"))); + + gtk_widget_hide(treeview); + user_mm_load_file(filename); + treeview2_show_mmatches(); + gtk_widget_show(treeview); +} + +void +on_button_mm_reload_close_clicked (GtkButton *button, + gpointer user_data) +{ + on_button_mm_reload_clicked(NULL, NULL); + on_button_mm_save_close_clicked(NULL, NULL); +} + diff --git a/src/misc2_callbacks.h b/src/misc2_callbacks.h index d2eb2a8e..82a8b829 100644 --- a/src/misc2_callbacks.h +++ b/src/misc2_callbacks.h @@ -149,8 +149,39 @@ on_button_transfer_no_clicked (GtkButton *button, void on_button_transfer_later_clicked (GtkButton *button, gpointer user_data); -#endif void on_button_contract_cancel_clicked (GtkButton *button, gpointer user_data); + +gboolean +on_window_mmatches_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); + +gboolean +on_treeview_mmatches_button_press_event + (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); + +void +on_button_mm_save_close_clicked (GtkButton *button, + gpointer user_data); + +void +on_button_mm_add_clicked (GtkButton *button, + gpointer user_data); + +void +on_button_mm_file_clicked (GtkButton *button, + gpointer user_data); + +void +on_button_mm_reload_clicked (GtkButton *button, + gpointer user_data); + +void +on_button_mm_reload_close_clicked (GtkButton *button, + gpointer user_data); +#endif diff --git a/src/misc2_interface.c b/src/misc2_interface.c index cb7dd3bf..73d50de5 100644 --- a/src/misc2_interface.c +++ b/src/misc2_interface.c @@ -400,7 +400,7 @@ create_window_digits (void) gtk_widget_show (label_1); gtk_box_pack_start (GTK_BOX (vbox15), label_1, FALSE, FALSE, 0); - spinbutton1_adj = gtk_adjustment_new (1, 0, 1e+08, 10, 1000, 10); + spinbutton1_adj = gtk_adjustment_new (1, 0, 100000000, 10, 1000, 10); spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0); gtk_widget_show (spinbutton1); gtk_box_pack_start (GTK_BOX (vbox15), spinbutton1, FALSE, FALSE, 0); @@ -414,7 +414,7 @@ create_window_digits (void) gtk_widget_show (label_2); gtk_box_pack_start (GTK_BOX (vbox16), label_2, FALSE, FALSE, 0); - spinbutton2_adj = gtk_adjustment_new (1, 0, 1e+08, 1, 100, 10); + spinbutton2_adj = gtk_adjustment_new (1, 0, 100000000, 1, 100, 10); spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton2_adj), 1, 0); gtk_widget_show (spinbutton2); gtk_box_pack_start (GTK_BOX (vbox16), spinbutton2, FALSE, FALSE, 0); @@ -1229,3 +1229,220 @@ create_window_transfer_dialog (void) return window_transfer_dialog; } +GtkWidget* +create_window_mmatches (void) +{ + GtkWidget *window_mmatches; + GtkWidget *vbox27; + GtkWidget *hbox27; + GtkWidget *label54; + GtkWidget *entry_mm_file; + GtkWidget *button_mm_file; + GtkWidget *button_mm_reload; + GtkWidget *alignment11; + GtkWidget *hbox31; + GtkWidget *image18; + GtkWidget *label58; + GtkWidget *scrolledwindow5; + GtkWidget *treeview_mmatches; + GtkWidget *button_mm_add; + GtkWidget *alignment12; + GtkWidget *hbox32; + GtkWidget *image19; + GtkWidget *label59; + GtkWidget *hbox34; + GtkWidget *button_mm_save_close; + GtkWidget *alignment13; + GtkWidget *hbox33; + GtkWidget *image20; + GtkWidget *label60; + GtkWidget *button_mm_reload_close; + GtkWidget *alignment14; + GtkWidget *hbox35; + GtkWidget *image21; + GtkWidget *label61; + GtkTooltips *tooltips; + + tooltips = gtk_tooltips_new (); + + window_mmatches = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_container_set_border_width (GTK_CONTAINER (window_mmatches), 5); + gtk_window_set_position (GTK_WINDOW (window_mmatches), GTK_WIN_POS_CENTER); + gtk_window_set_default_size (GTK_WINDOW (window_mmatches), 550, 500); + + vbox27 = gtk_vbox_new (FALSE, 3); + gtk_widget_show (vbox27); + gtk_container_add (GTK_CONTAINER (window_mmatches), vbox27); + + hbox27 = gtk_hbox_new (FALSE, 3); + gtk_widget_show (hbox27); + gtk_box_pack_start (GTK_BOX (vbox27), hbox27, FALSE, TRUE, 0); + + label54 = gtk_label_new (_("Current file")); + gtk_widget_show (label54); + gtk_box_pack_start (GTK_BOX (hbox27), label54, FALSE, FALSE, 0); + + entry_mm_file = gtk_entry_new (); + gtk_widget_show (entry_mm_file); + gtk_box_pack_start (GTK_BOX (hbox27), entry_mm_file, TRUE, TRUE, 0); + + button_mm_file = gtk_button_new_from_stock ("gtk-open"); + gtk_widget_show (button_mm_file); + gtk_box_pack_start (GTK_BOX (hbox27), button_mm_file, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, button_mm_file, _("Open a memorable matches file"), NULL); + + button_mm_reload = gtk_button_new (); + gtk_widget_show (button_mm_reload); + gtk_box_pack_start (GTK_BOX (hbox27), button_mm_reload, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, button_mm_reload, _("Reload matches from file"), NULL); + + alignment11 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment11); + gtk_container_add (GTK_CONTAINER (button_mm_reload), alignment11); + + hbox31 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox31); + gtk_container_add (GTK_CONTAINER (alignment11), hbox31); + + image18 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image18); + gtk_box_pack_start (GTK_BOX (hbox31), image18, FALSE, FALSE, 0); + + label58 = gtk_label_new_with_mnemonic (_("Reload")); + gtk_widget_show (label58); + gtk_box_pack_start (GTK_BOX (hbox31), label58, FALSE, FALSE, 0); + + scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow5); + gtk_box_pack_start (GTK_BOX (vbox27), scrolledwindow5, TRUE, TRUE, 0); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow5), GTK_SHADOW_IN); + + treeview_mmatches = gtk_tree_view_new (); + gtk_widget_show (treeview_mmatches); + gtk_container_add (GTK_CONTAINER (scrolledwindow5), treeview_mmatches); + gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview_mmatches), FALSE); + + button_mm_add = gtk_button_new (); + gtk_widget_show (button_mm_add); + gtk_box_pack_start (GTK_BOX (vbox27), button_mm_add, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, button_mm_add, _("Add last match to the list; you still have to save to file if you want to store the match permanently"), NULL); + + alignment12 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment12); + gtk_container_add (GTK_CONTAINER (button_mm_add), alignment12); + + hbox32 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox32); + gtk_container_add (GTK_CONTAINER (alignment12), hbox32); + + image19 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image19); + gtk_box_pack_start (GTK_BOX (hbox32), image19, FALSE, FALSE, 0); + + label59 = gtk_label_new_with_mnemonic (_("Add last match")); + gtk_widget_show (label59); + gtk_box_pack_start (GTK_BOX (hbox32), label59, FALSE, FALSE, 0); + + hbox34 = gtk_hbox_new (FALSE, 3); + gtk_widget_show (hbox34); + gtk_box_pack_start (GTK_BOX (vbox27), hbox34, FALSE, FALSE, 0); + + button_mm_save_close = gtk_button_new (); + gtk_widget_show (button_mm_save_close); + gtk_box_pack_start (GTK_BOX (hbox34), button_mm_save_close, TRUE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, button_mm_save_close, _("Save changes to file and close"), NULL); + + alignment13 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment13); + gtk_container_add (GTK_CONTAINER (button_mm_save_close), alignment13); + + hbox33 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox33); + gtk_container_add (GTK_CONTAINER (alignment13), hbox33); + + image20 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image20); + gtk_box_pack_start (GTK_BOX (hbox33), image20, FALSE, FALSE, 0); + + label60 = gtk_label_new_with_mnemonic (_("Save and close")); + gtk_widget_show (label60); + gtk_box_pack_start (GTK_BOX (hbox33), label60, FALSE, FALSE, 0); + + button_mm_reload_close = gtk_button_new (); + gtk_widget_show (button_mm_reload_close); + gtk_box_pack_start (GTK_BOX (hbox34), button_mm_reload_close, TRUE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, button_mm_reload_close, _("Reload matches from file and close"), NULL); + + alignment14 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment14); + gtk_container_add (GTK_CONTAINER (button_mm_reload_close), alignment14); + + hbox35 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox35); + gtk_container_add (GTK_CONTAINER (alignment14), hbox35); + + image21 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image21); + gtk_box_pack_start (GTK_BOX (hbox35), image21, FALSE, FALSE, 0); + + label61 = gtk_label_new_with_mnemonic (_("Reload and close")); + gtk_widget_show (label61); + gtk_box_pack_start (GTK_BOX (hbox35), label61, FALSE, FALSE, 0); + + g_signal_connect ((gpointer) window_mmatches, "delete_event", + G_CALLBACK (on_window_mmatches_delete_event), + NULL); + g_signal_connect ((gpointer) button_mm_file, "clicked", + G_CALLBACK (on_button_mm_file_clicked), + NULL); + g_signal_connect ((gpointer) button_mm_reload, "clicked", + G_CALLBACK (on_button_mm_reload_clicked), + NULL); + g_signal_connect ((gpointer) treeview_mmatches, "button_press_event", + G_CALLBACK (on_treeview_mmatches_button_press_event), + NULL); + g_signal_connect ((gpointer) button_mm_add, "clicked", + G_CALLBACK (on_button_mm_add_clicked), + NULL); + g_signal_connect ((gpointer) button_mm_save_close, "clicked", + G_CALLBACK (on_button_mm_save_close_clicked), + NULL); + g_signal_connect ((gpointer) button_mm_reload_close, "clicked", + G_CALLBACK (on_button_mm_reload_close_clicked), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (window_mmatches, window_mmatches, "window_mmatches"); + GLADE_HOOKUP_OBJECT (window_mmatches, vbox27, "vbox27"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox27, "hbox27"); + GLADE_HOOKUP_OBJECT (window_mmatches, label54, "label54"); + GLADE_HOOKUP_OBJECT (window_mmatches, entry_mm_file, "entry_mm_file"); + GLADE_HOOKUP_OBJECT (window_mmatches, button_mm_file, "button_mm_file"); + GLADE_HOOKUP_OBJECT (window_mmatches, button_mm_reload, "button_mm_reload"); + GLADE_HOOKUP_OBJECT (window_mmatches, alignment11, "alignment11"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox31, "hbox31"); + GLADE_HOOKUP_OBJECT (window_mmatches, image18, "image18"); + GLADE_HOOKUP_OBJECT (window_mmatches, label58, "label58"); + GLADE_HOOKUP_OBJECT (window_mmatches, scrolledwindow5, "scrolledwindow5"); + GLADE_HOOKUP_OBJECT (window_mmatches, treeview_mmatches, "treeview_mmatches"); + GLADE_HOOKUP_OBJECT (window_mmatches, button_mm_add, "button_mm_add"); + GLADE_HOOKUP_OBJECT (window_mmatches, alignment12, "alignment12"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox32, "hbox32"); + GLADE_HOOKUP_OBJECT (window_mmatches, image19, "image19"); + GLADE_HOOKUP_OBJECT (window_mmatches, label59, "label59"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox34, "hbox34"); + GLADE_HOOKUP_OBJECT (window_mmatches, button_mm_save_close, "button_mm_save_close"); + GLADE_HOOKUP_OBJECT (window_mmatches, alignment13, "alignment13"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox33, "hbox33"); + GLADE_HOOKUP_OBJECT (window_mmatches, image20, "image20"); + GLADE_HOOKUP_OBJECT (window_mmatches, label60, "label60"); + GLADE_HOOKUP_OBJECT (window_mmatches, button_mm_reload_close, "button_mm_reload_close"); + GLADE_HOOKUP_OBJECT (window_mmatches, alignment14, "alignment14"); + GLADE_HOOKUP_OBJECT (window_mmatches, hbox35, "hbox35"); + GLADE_HOOKUP_OBJECT (window_mmatches, image21, "image21"); + GLADE_HOOKUP_OBJECT (window_mmatches, label61, "label61"); + GLADE_HOOKUP_OBJECT_NO_REF (window_mmatches, tooltips, "tooltips"); + + return window_mmatches; +} + diff --git a/src/misc2_interface.h b/src/misc2_interface.h index 134fa9bc..db5bf74b 100644 --- a/src/misc2_interface.h +++ b/src/misc2_interface.h @@ -12,3 +12,4 @@ GtkWidget* create_window_user_management (void); GtkWidget* create_window_debug (void); GtkWidget* create_window_help (void); GtkWidget* create_window_transfer_dialog (void); +GtkWidget* create_window_mmatches (void); diff --git a/src/misc_callbacks.c b/src/misc_callbacks.c index 84a27c07..136f135b 100644 --- a/src/misc_callbacks.c +++ b/src/misc_callbacks.c @@ -162,7 +162,7 @@ on_button_resume_clicked (GtkButton *button, if(stat1 == STATUS_SHOW_LAST_MATCH) { - callback_show_last_match(FALSE); + callback_show_last_match(FALSE, ¤t_user.live_game); return; } else if(game_check_live_game_resume_state()) diff --git a/src/support.c b/src/support.c index 0b79218a..00aff298 100644 --- a/src/support.c +++ b/src/support.c @@ -16,8 +16,6 @@ #include "support.h" -#include "gettext_macros.h" - GtkWidget* lookup_widget (GtkWidget *widget, const gchar *widget_name) diff --git a/src/support.h b/src/support.h index 9a7373a1..a32649e5 100644 --- a/src/support.h +++ b/src/support.h @@ -8,19 +8,10 @@ #include -#ifndef G_OS_UNIX - #define ENABLE_NLS -#endif - /* * Standard gettext macros. */ #ifdef ENABLE_NLS -# ifndef G_OS_UNIX -# define PACKAGE "bygfoot" -# define GETTEXT_PACKAGE "bygfoot" -# define PACKAGE_LOCALE_DIR "./locale" -# endif # include # undef _ # define _(String) dgettext (PACKAGE, String) diff --git a/src/treeview.c b/src/treeview.c index 8e638de5..6cd4b192 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -507,16 +507,18 @@ treeview_live_game_create_result(const LiveGameUnit *unit) { GtkListStore *ls; GtkTreeIter iter; + gchar buf[SMALL]; ls = gtk_list_store_new(3, G_TYPE_STRING, - G_TYPE_POINTER, + G_TYPE_STRING, G_TYPE_STRING); + live_game_unit_result_to_buf(unit, buf, FALSE); gtk_list_store_append(ls, &iter); gtk_list_store_set(ls, &iter, 0, ((LiveGame*)statp)->team_names[0]->str, - 1, (gpointer)unit, + 1, buf, 2, ((LiveGame*)statp)->team_names[1]->str, -1); return GTK_TREE_MODEL(ls); diff --git a/src/treeview2.c b/src/treeview2.c new file mode 100644 index 00000000..132765b2 --- /dev/null +++ b/src/treeview2.c @@ -0,0 +1,107 @@ +#include "live_game.h" +#include "support.h" +#include "treeview2.h" +#include "treeview_helper.h" +#include "user.h" + +void +treeview2_create_mmatches(GtkListStore *ls) +{ + gint i; + GtkTreeIter iter; + gchar result[SMALL]; + + for(i=0;ilen;i++) + { + live_game_unit_result_to_buf( + &g_array_index( + g_array_index(current_user.mmatches, MemMatch, i).lg.units, + LiveGameUnit, + g_array_index(current_user.mmatches, MemMatch, i).lg.units->len - 1), result, + (g_array_index(current_user.mmatches, MemMatch, i).user_team == 1)); + gtk_list_store_append(ls, &iter); + gtk_list_store_set(ls, &iter, 0, i + 1, + 1, &g_array_index(current_user.mmatches, MemMatch, i), + 2, &g_array_index(current_user.mmatches, MemMatch, i), + 3, result, + 4, g_array_index(current_user.mmatches, MemMatch, i). + competition_name->str, + 5, g_array_index(current_user.mmatches, MemMatch, i). + country_name->str, + 6, _("REPLAY"), 7, _("REMOVE"), -1); + } +} + +void +treeview2_set_up_mmatches(GtkTreeView *treeview) +{ + gint i; + GtkTreeViewColumn *col; + GtkCellRenderer *renderer; + gchar *titles[8] = + {"", + _("Your team"), + _("Opponent"), + _("Result"), + _("Competition"), + _("Country"), + "", + ""}; + + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(treeview), + GTK_SELECTION_NONE); + gtk_tree_view_set_headers_visible(treeview, TRUE); + + col = gtk_tree_view_column_new(); + gtk_tree_view_append_column(treeview, col); + renderer = treeview_helper_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(col, renderer, TRUE); + gtk_tree_view_column_add_attribute(col, renderer, + "text", 0); + g_object_set(renderer, "xalign", 0.5, NULL); + + for(i=1;i<3;i++) + { + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, titles[i]); + gtk_tree_view_append_column(treeview, col); + renderer = treeview_helper_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(col, renderer, TRUE); + gtk_tree_view_column_set_cell_data_func(col, renderer, + treeview_helper_mm_teams, + NULL, NULL); + } + + for(i=3;i<8;i++) + { + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, titles[i]); + gtk_tree_view_append_column(treeview, col); + renderer = treeview_helper_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(col, renderer, TRUE); + gtk_tree_view_column_add_attribute(col, renderer, + "text", i); + if(i != 4 && i != 5) + g_object_set(renderer, "xalign", 0.5, NULL); + } +} + +/** Show the list of memorable matches of a user. */ +void +treeview2_show_mmatches(void) +{ + GtkTreeView *treeview = + GTK_TREE_VIEW(lookup_widget(window.mmatches, "treeview_mmatches")); + GtkListStore *model = + gtk_list_store_new(8, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + + treeview_helper_clear(treeview); + + treeview2_set_up_mmatches(treeview); + + treeview2_create_mmatches(model); + gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(model)); + g_object_unref(model); +} diff --git a/src/treeview2.h b/src/treeview2.h new file mode 100644 index 00000000..ee68a896 --- /dev/null +++ b/src/treeview2.h @@ -0,0 +1,16 @@ +#ifndef TREEVIEW2_H +#define TREEVIEW2_H + +#include "bygfoot.h" + +void +treeview2_create_mmatches(GtkListStore *ls); + +void +treeview2_set_up_mmatches(GtkTreeView *treeview); + +void +treeview2_show_mmatches(void); + + +#endif diff --git a/src/treeview_helper.c b/src/treeview_helper.c index 9c72997b..34c7724a 100644 --- a/src/treeview_helper.c +++ b/src/treeview_helper.c @@ -1215,34 +1215,21 @@ treeview_helper_player_cskill_to_cell(GtkCellRenderer *renderer, gchar *buf, con /** Render the result (team names and goals) in the live game view. */ void treeview_helper_live_game_result(GtkTreeViewColumn *col, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ gint column = treeview_helper_get_col_number_column(col); - gchar buf[SMALL]; - gchar *team_name = NULL; - LiveGameUnit *unit = NULL; + gchar buf[SMALL]; + gchar *data = NULL; strcpy(buf, ""); - if(column == 0 || column == 2) - { - gtk_tree_model_get(model, iter, column, &team_name, -1); - sprintf(buf, "%s", - const_app("string_treeview_helper_live_game_result_attributes"), - team_name); - } - else if(column == 1) - { - gtk_tree_model_get(model, iter, column, &unit, -1); - sprintf(buf, "%d : %d", - const_app("string_treeview_helper_live_game_result_attributes"), - unit->result[0], unit->result[1]); - - } + gtk_tree_model_get(model, iter, column, &data, -1); + sprintf(buf, "%s", + const_app("string_treeview_helper_live_game_result_attributes"), + data); g_object_set(renderer, "markup", buf, NULL); } @@ -1261,3 +1248,30 @@ treeview_helper_int_compare(GtkTreeModel *model, return misc_int_compare(value1, value2); } + +void +treeview_helper_mm_teams(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + gint column = treeview_helper_get_col_number_column(col); + const MemMatch *mm = NULL; + + gtk_tree_model_get(model, iter, column, &mm, -1); + + if(column == 1) + g_object_set(renderer, "text", mm->lg.team_names[mm->user_team]->str, NULL); + else + g_object_set(renderer, "text", mm->lg.team_names[!mm->user_team]->str, NULL); + + if(!mm->neutral && + ((column == 1 && mm->user_team == 1) || + (column == 2 && mm->user_team == 0))) + g_object_set(renderer, "background", + const_app("string_treeview_live_game_commentary_away_bg"), NULL); + else + g_object_set(renderer, "background", + const_app("string_treeview_helper_color_default_background"), NULL); +} diff --git a/src/treeview_helper.h b/src/treeview_helper.h index 35ab5e51..bc447ec5 100644 --- a/src/treeview_helper.h +++ b/src/treeview_helper.h @@ -3,6 +3,11 @@ #include "bygfoot.h" +#include "league_struct.h" +#include "player_struct.h" +#include "table_struct.h" +#include "team_struct.h" + gint treeview_helper_iter_get_row(GtkTreeModel *model, GtkTreeIter *iter); @@ -147,4 +152,11 @@ treeview_helper_int_compare(GtkTreeModel *model, GtkTreeIter *b, gpointer user_data); +void +treeview_helper_mm_teams(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data); + #endif diff --git a/src/user.c b/src/user.c index dcbe02fc..9a3052da 100644 --- a/src/user.c +++ b/src/user.c @@ -1,4 +1,5 @@ #include "cup.h" +#include "file.h" #include "finance.h" #include "fixture.h" #include "free.h" @@ -17,6 +18,7 @@ #include "treeview.h" #include "user.h" #include "window.h" +#include "xml_mmatches.h" #include "youth_academy.h" /** Create a new user with default values. */ @@ -43,6 +45,9 @@ user_new(void) new.youth_academy.pos_pref = PLAYER_POS_ANY; new.youth_academy.coach = QUALITY_AVERAGE; + new.mmatches_file = g_string_new(""); + new.mmatches = g_array_new(FALSE, FALSE, sizeof(MemMatch)); + return new; } @@ -912,3 +917,104 @@ user_show_sponsor_continue(void) stat1 = STATUS_SPONSOR_CONTINUE; } + +/** Load a MM file. */ +void +user_mm_load_file(const gchar *filename) +{ + gchar prefix[SMALL], filename_local[SMALL], + matches_file[SMALL]; + + strcpy(filename_local, filename); + strncpy(prefix, filename_local, strlen(filename_local) - 8); + prefix[strlen(filename_local) - 8] = '\0'; + + sprintf(matches_file, "%s___mmatches", prefix); + + file_decompress(filename_local); + xml_mmatches_read(matches_file); + + strcat(prefix, "___*"); + file_remove_files(prefix); + + g_string_printf(current_user.mmatches_file, "%s", filename_local); +} + +/** Add the last match to the MM file. + @param load_file Whether to load the matches from the file first. + @param save_file Whether to save the MM array + to file afterwards. */ +void +user_mm_add_last_match(gboolean load_file, gboolean save_file) +{ + MemMatch new; + const Fixture *fix = current_user.live_game.fix; + gchar buf[SMALL]; + + if(fix->clid < ID_CUP_START) + new.competition_name = g_string_new(league_cup_get_name_string(fix->clid)); + else + { + cup_round_name(fix, buf); + new.competition_name = g_string_new(""); + g_string_printf(new.competition_name, "%s %s", + league_cup_get_name_string(fix->clid), buf); + } + + new.country_name = g_string_new(country.name->str); + new.neutral = !(fix->home_advantage); + new.user_team = (fix->team_ids[0] != current_user.team_id); + new.lg = current_user.live_game; + + /** This will tell the free function NOT + to free the user live game. */ + current_user.live_game.started_game = -1; + + if(load_file) + user_mm_load_file(current_user.mmatches_file->str); + + g_array_append_val(current_user.mmatches, new); + game_gui_print_message("Memorable match added."); + + if(save_file) + user_mm_save_file(); +} + +/** Save an MM file. */ +void +user_mm_save_file(void) +{ + gchar prefix[SMALL]; + + strncpy(prefix, current_user.mmatches_file->str, + strlen(current_user.mmatches_file->str) - 8); + prefix[strlen(current_user.mmatches_file->str) - 8] = '\0'; + + strcat(prefix, "___"); + + xml_mmatches_write(prefix); + + file_compress_files(current_user.mmatches_file->str, prefix); +} + +/** Set an appropriate filename for the memorable + matches file. */ +void +user_mm_set_filename(const gchar *filename) +{ + gchar buf[SMALL]; + + if(g_str_has_suffix(filename, ".bmm.zip")) + { + g_string_printf(current_user.mmatches_file, "%s", filename); + return; + } + + strcpy(buf, filename); + + while(g_str_has_suffix(buf, ".bmm") || + g_str_has_suffix(buf, ".zip")) + buf[strlen(buf) - 4] = '\0'; + + g_string_printf(current_user.mmatches_file, "%s.bmm.zip", buf); +} diff --git a/src/user.h b/src/user.h index 753aaa73..80d573bf 100644 --- a/src/user.h +++ b/src/user.h @@ -88,5 +88,16 @@ user_get_sponsor(const User *user); void user_show_sponsor_continue(void); +void +user_mm_set_filename(const gchar *filename); + +void +user_mm_save_file(void); + +void +user_mm_add_last_match(gboolean load_file, gboolean save_file); + +void +user_mm_load_file(const gchar *filename); #endif diff --git a/src/user_struct.h b/src/user_struct.h index 69e77a8c..189629a3 100644 --- a/src/user_struct.h +++ b/src/user_struct.h @@ -71,6 +71,23 @@ enum UserHistoryType USER_HISTORY_END }; +/** A memorable match (a recording of a live game) of a user. */ +typedef struct +{ + /** Name of the country the user was playing with. */ + GString *country_name; + /** The name of the competition, including + the cup round name. */ + GString *competition_name; + /** Whether the match was on neutral ground. Only + relevant for MM list display. */ + gboolean neutral; + /** 0 or 1, indicating which team was the user's. */ + gint user_team; + /** The recording. */ + LiveGame lg; +} MemMatch; + /** A structure holding an element of a user's history, e.g. the event of being fired. */ typedef struct @@ -128,6 +145,10 @@ typedef struct UserSponsor sponsor; /** Youth academy of the user. */ YouthAcademy youth_academy; + /** The currently used MM file. */ + GString *mmatches_file; + /** The array of MMs. */ + GArray *mmatches; } User; enum EventType diff --git a/src/window.c b/src/window.c index 47d375b7..1c24ba36 100644 --- a/src/window.c +++ b/src/window.c @@ -18,6 +18,7 @@ #include "support.h" #include "transfer.h" #include "treeview.h" +#include "treeview2.h" #include "treeview_helper.h" #include "user.h" #include "window.h" @@ -122,10 +123,13 @@ window_show_file_sel(void) const gchar *home = g_get_home_dir(); gchar *filename = NULL; GtkFileFilter *filter; + gboolean mm_file_exists = FALSE; window_create(WINDOW_FILE_CHOOSER); - if(stat1 == STATUS_SAVE_GAME) + if(stat5 == STATUS_SAVE_GAME || + stat5 == STATUS_SELECT_MM_FILE_LOAD || + stat5 == STATUS_SELECT_MM_FILE_ADD) gtk_file_chooser_set_action(GTK_FILE_CHOOSER(window.file_chooser), GTK_FILE_CHOOSER_ACTION_SAVE); else @@ -133,9 +137,18 @@ window_show_file_sel(void) GTK_FILE_CHOOSER_ACTION_OPEN); filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter, _("Bygfoot Save Files")); - gtk_file_filter_add_pattern(filter, "*.zip"); - gtk_file_filter_add_pattern(filter, "last_save"); + if(stat5 != STATUS_SELECT_MM_FILE_ADD && + stat5 != STATUS_SELECT_MM_FILE_LOAD) + { + gtk_file_filter_set_name(filter, _("Bygfoot Save Files")); + gtk_file_filter_add_pattern(filter, "*.zip"); + gtk_file_filter_add_pattern(filter, "last_save"); + } + else + { + gtk_file_filter_set_name(filter, _("Bygfoot Memorable Matches")); + gtk_file_filter_add_pattern(filter, "*.bmm.zip"); + } gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(window.file_chooser), filter); filter = gtk_file_filter_new (); @@ -143,9 +156,13 @@ window_show_file_sel(void) gtk_file_filter_add_pattern(filter, "*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(window.file_chooser), filter); - if(strlen(save_file->str) > 0) + if((stat5 != STATUS_SELECT_MM_FILE_LOAD && + stat5 != STATUS_SELECT_MM_FILE_ADD && strlen(save_file->str) > 0) || + strlen(current_user.mmatches_file->str) > 0) gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(window.file_chooser), - save_file->str); + (stat5 != STATUS_SELECT_MM_FILE_ADD && + stat5 != STATUS_SELECT_MM_FILE_LOAD) ? + save_file->str : current_user.mmatches_file->str); else { if(os_is_unix) @@ -165,15 +182,37 @@ window_show_file_sel(void) { filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(window.file_chooser)); - if(stat1 == STATUS_LOAD_GAME) + if(stat5 == STATUS_LOAD_GAME) load_save_load_game(filename); - else if(stat1 == STATUS_LOAD_GAME_TEAM_SELECTION) + else if(stat5 == STATUS_LOAD_GAME_TEAM_SELECTION) misc_callback_startup_load(filename); - else if(stat1 == STATUS_SAVE_GAME) + else if(stat5 == STATUS_SAVE_GAME) load_save_save_game(filename); + else if(stat5 == STATUS_SELECT_MM_FILE_LOAD) + { + mm_file_exists = g_file_test(filename, G_FILE_TEST_EXISTS); + if((mm_file_exists && g_str_has_suffix(filename, ".bmm.zip")) || + !mm_file_exists) + { + if(mm_file_exists) + user_mm_load_file(filename); + else + user_mm_set_filename(filename); + window_show_mmatches(); + } + else + game_gui_show_warning("Not a valid Bygfoot Memorable Matches filename."); + } + else if(stat5 == STATUS_SELECT_MM_FILE_ADD) + { + user_mm_set_filename(filename); + mm_file_exists = g_file_test(current_user.mmatches_file->str, + G_FILE_TEST_EXISTS); + user_mm_add_last_match(mm_file_exists, TRUE); + } - if(stat1 == STATUS_LOAD_GAME || - stat1 == STATUS_LOAD_GAME_TEAM_SELECTION) + if(stat5 == STATUS_LOAD_GAME || + stat5 == STATUS_LOAD_GAME_TEAM_SELECTION) { cur_user = 0; on_button_back_to_main_clicked(NULL, NULL); @@ -186,6 +225,18 @@ window_show_file_sel(void) window_destroy(&window.file_chooser, FALSE); } +/** Show window with memorable matches list. */ +void +window_show_mmatches(void) +{ + if(window.mmatches == NULL) + window_create(WINDOW_MMATCHES); + treeview2_show_mmatches(); + + gtk_entry_set_text(GTK_ENTRY(lookup_widget(window.mmatches, "entry_mm_file")), + current_user.mmatches_file->str); +} + /** Show the options window. */ void window_show_options(void) @@ -552,6 +603,17 @@ window_create(gint window_type) wind = window.sponsors; strcpy(buf, _("Sponsorship offers")); break; + case WINDOW_MMATCHES: + if(window.mmatches != NULL) + g_warning("window_create: called on already existing window\n"); + else + { + window.mmatches = create_window_mmatches(); + popups_active++; + } + wind = window.mmatches; + strcpy(buf, _("Memorable matches")); + break; } if(window_type != WINDOW_FILE_CHOOSER) diff --git a/src/window.h b/src/window.h index a917096e..1be206d6 100644 --- a/src/window.h +++ b/src/window.h @@ -25,6 +25,7 @@ enum Windows WINDOW_HELP, WINDOW_TRANSFER_DIALOG, WINDOW_SPONSORS, + WINDOW_MMATCHES, WINDOW_END }; @@ -71,4 +72,7 @@ window_show_transfer_dialog(const gchar *text); void window_show_news(void); +void +window_show_mmatches(void); + #endif diff --git a/src/xml.h b/src/xml.h index d8ebe2f3..a3f5c687 100644 --- a/src/xml.h +++ b/src/xml.h @@ -3,6 +3,7 @@ #include "bygfoot.h" #include "maths.h" +#include "cup_struct.h" /** Indentations for xml files. */ #define I0 "" diff --git a/src/xml_mmatches.c b/src/xml_mmatches.c new file mode 100644 index 00000000..85c61e32 --- /dev/null +++ b/src/xml_mmatches.c @@ -0,0 +1,192 @@ +#include "file.h" +#include "free.h" +#include "live_game.h" +#include "misc.h" +#include "user.h" +#include "xml.h" +#include "xml_mmatches.h" +#include "xml_loadsave_live_game.h" + +enum +{ + TAG_MMATCHES = 0, + TAG_MMATCH, + TAG_MMATCHES_COUNTRY_NAME, + TAG_MMATCHES_COMP_NAME, + TAG_MMATCHES_NEUTRAL, + TAG_MMATCHES_USER_TEAM, + TAG_MMATCHES_LG_FILE, + TAG_END +}; + +/** + * The state variable used in the XML parsing functions. + */ +gint state; +MemMatch new_match; +gchar *dirname; + +void +xml_mmatches_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error) +{ + gint i; + gint tag = xml_get_tag_from_name(element_name); + gboolean valid_tag = FALSE; + + for(i=TAG_MMATCHES;i\n", TAG_MMATCHES); + + for(i=0;ilen;i++) + { + fprintf(fil, "<_%d>\n", TAG_MMATCH); + + xml_write_g_string(fil, + g_array_index(current_user.mmatches, MemMatch, i).competition_name, + TAG_MMATCHES_COMP_NAME, I1); + xml_write_g_string(fil, + g_array_index(current_user.mmatches, MemMatch, i).country_name, + TAG_MMATCHES_COUNTRY_NAME, I1); + xml_write_int(fil, + g_array_index(current_user.mmatches, MemMatch, i).neutral, + TAG_MMATCHES_NEUTRAL, I1); + xml_write_int(fil, + g_array_index(current_user.mmatches, MemMatch, i).user_team, + TAG_MMATCHES_USER_TEAM, I1); + + sprintf(buf, "%slg%03d", basename, i); + xml_write_string(fil, buf, TAG_MMATCHES_LG_FILE, I1); + sprintf(buf, "%slg%03d", prefix, i); + xml_loadsave_live_game_write(buf, + &g_array_index(current_user.mmatches, MemMatch, i).lg); + + fprintf(fil, "\n", TAG_MMATCH); + } + + fprintf(fil, "\n", TAG_MMATCHES); + + fclose(fil); + + g_free(basename); +} diff --git a/src/xml_mmatches.h b/src/xml_mmatches.h new file mode 100644 index 00000000..feddc1eb --- /dev/null +++ b/src/xml_mmatches.h @@ -0,0 +1,31 @@ +#ifndef XML_MMATCHES_H +#define XML_MMATCHES_H + +void +xml_mmatches_write(const gchar *prefix); + +void +xml_mmatches_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error); + +void +xml_mmatches_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error); + +void +xml_mmatches_text (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error); + +void +xml_mmatches_read(const gchar *filename); + +#endif