From 1115d0f54c12eb91ed20153ed115653c16f00459 Mon Sep 17 00:00:00 2001 From: gyboth Date: Sat, 6 Dec 2008 17:07:03 +0000 Subject: [PATCH] Newspaper progressing; menu restructured. --- bygfoot.glade | 373 ++++++++++---------- bygfoot_misc3.glade | 93 +++++ src/bygfoot.h | 1 + src/callbacks.c | 9 + src/callbacks.h | 8 +- src/free.c | 1 + src/interface.c | 618 +++++++++++++++++---------------- src/misc3_callbacks.c | 27 ++ src/misc3_callbacks.h | 14 +- src/misc3_interface.c | 70 ++++ src/misc3_interface.h | 1 + src/news.c | 7 +- src/news_struct.h | 2 +- src/support.c | 19 +- src/support.h | 5 - src/treeview.c | 2 +- src/treeview.h | 2 +- src/treeview2.c | 108 ++++++ src/treeview2.h | 9 + src/window.c | 8 + src/window.h | 1 + support_files/bygfoot_app | 6 + support_files/news/news_de.xml | 18 +- support_files/news/news_en.xml | 18 +- 24 files changed, 880 insertions(+), 540 deletions(-) diff --git a/bygfoot.glade b/bygfoot.glade index 7fb418ad..5c708afe 100644 --- a/bygfoot.glade +++ b/bygfoot.glade @@ -72,7 +72,7 @@ - + True gtk-revert-to-saved 1 @@ -140,7 +140,7 @@ - + True gtk-preferences 1 @@ -204,7 +204,7 @@ - + True menu_save_geometry.png 0.5 @@ -238,7 +238,7 @@ - + True menu_fixtures.png 0.5 @@ -259,7 +259,7 @@ - + True menu_fixtures_comp.png 0.5 @@ -280,7 +280,7 @@ - + True menu_table.png 0.5 @@ -301,7 +301,7 @@ - + True menu_league_results.png 0.5 @@ -322,7 +322,7 @@ - + True menu_season_res.png 0.5 @@ -333,54 +333,6 @@ - - - - True - - - - - - True - League stats - True - - - - - - True - menu_league_stats.png - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Season history - True - - - - - - True - menu_history.png - 0.5 - 0.5 - 0 - 0 - - - - @@ -402,7 +354,7 @@ True - + True menu_style.png 0.5 @@ -480,7 +432,7 @@ True - + True menu_scout.png 0.5 @@ -547,7 +499,7 @@ True - + True menu_physio.png 0.5 @@ -614,7 +566,7 @@ True - + True menu_youth_academy.png 0.5 @@ -781,7 +733,7 @@ True - + True menu_boost.png 0.5 @@ -859,7 +811,7 @@ - + True gtk-undo 1 @@ -880,7 +832,7 @@ - + True menu_structure.png 0.5 @@ -902,7 +854,7 @@ - + True menu_rearrange.png 0.5 @@ -928,7 +880,7 @@ - + True menu_browse_tms.png 0.5 @@ -978,7 +930,7 @@ - + True menu_player_info.png 0.5 @@ -998,7 +950,7 @@ - + True menu_player_put_transfer.png 0.5 @@ -1018,7 +970,7 @@ - + True menu_player_remove_transfer.png 0.5 @@ -1038,7 +990,7 @@ - + True menu_player_contract.png 0.5 @@ -1058,7 +1010,7 @@ - + True menu_player_fire.png 0.5 @@ -1078,7 +1030,7 @@ - + True menu_player_shoots.png 0.5 @@ -1098,7 +1050,7 @@ - + True menu_player_move_to_ya.png 0.5 @@ -1124,7 +1076,7 @@ - + True menu_player_browse.png 0.5 @@ -1158,7 +1110,7 @@ - + True menu_last_match.png 0.5 @@ -1179,7 +1131,7 @@ - + True menu_match_stats.png 0.5 @@ -1200,7 +1152,7 @@ - + True gtk-jump-to 1 @@ -1213,103 +1165,6 @@ - - - True - Memorable matches - True - - - - True - menu_mmatches.png - 0.5 - 0.5 - 0 - 0 - - - - - - - - - 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 - Replay, delete or add memorable matches. - Manage matches - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - - - - - - True - Show history - True - - - - - - True - menu_history.png - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -1325,7 +1180,7 @@ - + True gtk-media-forward 1 @@ -1347,7 +1202,7 @@ - + True gtk-go-back 1 @@ -1369,7 +1224,7 @@ - + True gtk-justify-fill 1 @@ -1404,7 +1259,7 @@ - + True menu_finances.png 0.5 @@ -1425,7 +1280,7 @@ - + True menu_stadium.png 0.5 @@ -1468,6 +1323,162 @@ + + + True + St_ats + True + + + + + + + True + News + True + + + + + + + + True + League stats + True + + + + + + True + menu_league_stats.png + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Season history + True + + + + + + True + menu_history.png + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + User history + True + + + + + + True + menu_history.png + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Memorable matches + True + + + + True + menu_mmatches.png + 0.5 + 0.5 + 0 + 0 + + + + + + + + + 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 + Replay, delete or add memorable matches. + Manage matches + True + + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + + + True @@ -1485,7 +1496,7 @@ - + True gtk-dialog-info 1 @@ -1506,7 +1517,7 @@ - + True gtk-add 1 @@ -1527,7 +1538,7 @@ - + True gtk-help 1 diff --git a/bygfoot_misc3.glade b/bygfoot_misc3.glade index 0af27178..09aa1e6f 100644 --- a/bygfoot_misc3.glade +++ b/bygfoot_misc3.glade @@ -20,6 +20,7 @@ GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True + False @@ -223,6 +224,7 @@ GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True + False @@ -1003,6 +1005,7 @@ GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True + False @@ -1620,4 +1623,94 @@ + + True + Bygfoot News + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 500 + 600 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + + + True + False + 0 + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + False + False + False + + + + + 0 + True + True + + + + + + 10 + True + + + 0 + False + False + + + + + + True + Esc + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + False + + + + + + diff --git a/src/bygfoot.h b/src/bygfoot.h index ae365ace..375f65f2 100644 --- a/src/bygfoot.h +++ b/src/bygfoot.h @@ -173,6 +173,7 @@ typedef struct *bets, *splash, *training_camp, + *news, *alr; /** The position of the horizontal divider is stored here. */ diff --git a/src/callbacks.c b/src/callbacks.c index 80e5bc8a..bc3ffe34 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -1652,3 +1652,12 @@ on_automatic_loan_repayment_activate (GtkMenuItem *menuitem, window_show_alr(); } + +void +on_menu_news_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + window_create(WINDOW_NEWS); + treeview2_show_news(); +} + diff --git a/src/callbacks.h b/src/callbacks.h index e65aefdb..477c01f7 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -346,8 +346,6 @@ on_hpaned2_button_release_event (GtkWidget *widget, void on_training_camp_activate (GtkMenuItem *menuitem, gpointer user_data); -#endif - gboolean on_player_list1_key_press_event (GtkWidget *widget, GdkEventKey *event, @@ -356,3 +354,9 @@ on_player_list1_key_press_event (GtkWidget *widget, void on_automatic_loan_repayment_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_menu_news_activate (GtkMenuItem *menuitem, + gpointer user_data); +#endif + diff --git a/src/free.c b/src/free.c index b0da8388..f6ed1834 100644 --- a/src/free.c +++ b/src/free.c @@ -765,6 +765,7 @@ free_newspaper(gboolean reset) for(i = 0; i < newspaper.articles->len; i++) { + g_free(g_array_index(newspaper.articles, NewsPaperArticle, i).title_small); g_free(g_array_index(newspaper.articles, NewsPaperArticle, i).title); g_free(g_array_index(newspaper.articles, NewsPaperArticle, i).subtitle); } diff --git a/src/interface.c b/src/interface.c index 1891e2d8..c7b504f4 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1,15 +1,14 @@ /* * DO NOT EDIT THIS FILE - it is generated by Glade. */ + #ifdef HAVE_CONFIG_H # include #endif #include #include -#ifdef HAVE_UNISTD_H #include -#endif #include #include @@ -39,7 +38,7 @@ create_main_window (void) GtkWidget *menu_new; GtkWidget *menu_open; GtkWidget *menu_load_last_save; - GtkWidget *image2561; + GtkWidget *image2602; GtkWidget *menu_save; GtkWidget *menu_save_as; GtkWidget *trennlinie1; @@ -47,35 +46,30 @@ create_main_window (void) GtkWidget *menu_options; GtkWidget *menu_options_menu; GtkWidget *menu_preferences; - GtkWidget *image2562; + GtkWidget *image2603; GtkWidget *trennlinie7; GtkWidget *menu_job_offers; GtkWidget *menu_live_game; GtkWidget *menu_overwrite; GtkWidget *trennlinie14; GtkWidget *menu_save_window_geometry; - GtkWidget *image2563; + GtkWidget *image2604; GtkWidget *menu_figures; GtkWidget *menu_figures_menu; GtkWidget *menu_fixtures_week; - GtkWidget *image2564; + GtkWidget *image2605; GtkWidget *menu_fixtures; - GtkWidget *image2565; + GtkWidget *image2606; GtkWidget *menu_tables; - GtkWidget *image2566; + GtkWidget *image2607; GtkWidget *menu_my_league_results; - GtkWidget *image2567; + GtkWidget *image2608; GtkWidget *menu_season_results; - GtkWidget *image2568; - GtkWidget *trennlinie13; - GtkWidget *menu_league_stats; - GtkWidget *image2569; - GtkWidget *menu_season_history; - GtkWidget *image2570; + GtkWidget *image2609; GtkWidget *menu_team; GtkWidget *menu_team_menu; GtkWidget *menu_playing_style; - GtkWidget *image2571; + GtkWidget *image2610; GtkWidget *menu_playing_style_menu; GSList *menu_all_out_defend_group = NULL; GtkWidget *menu_all_out_defend; @@ -84,7 +78,7 @@ create_main_window (void) GtkWidget *menu_attack; GtkWidget *menu_all_out_attack; GtkWidget *menu_scout; - GtkWidget *image2572; + GtkWidget *image2611; GtkWidget *menu_scout_menu; GSList *menu_scout_best_group = NULL; GtkWidget *menu_scout_best; @@ -92,7 +86,7 @@ create_main_window (void) GtkWidget *menu_scout_average; GtkWidget *menu_scout_bad; GtkWidget *menu_physio; - GtkWidget *image2573; + GtkWidget *image2612; GtkWidget *menu_physio_menu; GSList *menu_physio_best_group = NULL; GtkWidget *menu_physio_best; @@ -100,7 +94,7 @@ create_main_window (void) GtkWidget *menu_physio_average; GtkWidget *menu_physio_bad; GtkWidget *menu_youth_academy; - GtkWidget *image2574; + GtkWidget *image2613; GtkWidget *menu_youth_academy_menu; GtkWidget *menu_show_youth_academy; GtkWidget *youth_coach1; @@ -120,7 +114,7 @@ create_main_window (void) GtkWidget *menu_recruit4; GtkWidget *menu_set_investment; GtkWidget *menu_boost; - GtkWidget *image2575; + GtkWidget *image2614; GtkWidget *menu_boost_menu; GSList *menu_boost_on_group = NULL; GtkWidget *menu_boost_on; @@ -130,77 +124,83 @@ create_main_window (void) GtkWidget *menu_training_camp; GtkWidget *trennlinie18; GtkWidget *menu_reset_players; - GtkWidget *image2576; + GtkWidget *image2615; GtkWidget *menu_custom_structure; - GtkWidget *image2577; + GtkWidget *image2616; GtkWidget *menu_rearrange_team; - GtkWidget *image2578; + GtkWidget *image2617; GtkWidget *trennlinie8; GtkWidget *menu_browse_teams; - GtkWidget *image2579; + GtkWidget *image2618; GtkWidget *trennlinie16; GtkWidget *menu_show_job_exchange; GtkWidget *menu_player; GtkWidget *menu_player_menu; GtkWidget *menu_show_info; - GtkWidget *image2580; + GtkWidget *image2619; GtkWidget *menu_put_on_transfer_list; - GtkWidget *image2581; + GtkWidget *image2620; GtkWidget *menu_remove_from_transfer_list; - GtkWidget *image2582; + GtkWidget *image2621; GtkWidget *menu_offer_new_contract; - GtkWidget *image2583; + GtkWidget *image2622; GtkWidget *menu_fire; - GtkWidget *image2584; + GtkWidget *image2623; GtkWidget *menu_shoots_penalties; - GtkWidget *image2585; + GtkWidget *image2624; GtkWidget *menu_move_to_youth_academy; - GtkWidget *image2586; + GtkWidget *image2625; GtkWidget *trennlinie10; GtkWidget *menu_browse_players; - GtkWidget *image2587; + GtkWidget *image2626; GtkWidget *menu_user; GtkWidget *menu_user_menu; GtkWidget *menu_user_show_last_match; - GtkWidget *image2588; + GtkWidget *image2627; GtkWidget *menu_user_show_last_stats; - GtkWidget *image2589; + GtkWidget *image2628; GtkWidget *menu_user_show_coming_matches; - GtkWidget *image2590; - GtkWidget *memorable_matches; - GtkWidget *image2591; - GtkWidget *memorable_matches_menu; - GtkWidget *mm_add_last_match; - GtkWidget *image2592; - GtkWidget *mm_manage_matches; - GtkWidget *image2593; - GtkWidget *trennlinie12; - GtkWidget *menu_user_show_history; - GtkWidget *image2594; + GtkWidget *image2629; GtkWidget *trennlinie9; GtkWidget *menu_next_user; - GtkWidget *image2595; + GtkWidget *image2630; GtkWidget *menu_previous_user; - GtkWidget *image2596; + GtkWidget *image2631; GtkWidget *menu_manage_users; - GtkWidget *image2597; + GtkWidget *image2632; GtkWidget *menu_finances_stadium; GtkWidget *menu_finances_stadium_menu; GtkWidget *menu_show_finances; - GtkWidget *image2598; + GtkWidget *image2633; GtkWidget *menu_show_stadium; - GtkWidget *image2599; + GtkWidget *image2634; GtkWidget *automatic_loan_repayment; GtkWidget *trennlinie15; GtkWidget *menu_betting; + GtkWidget *stats1; + GtkWidget *stats1_menu; + GtkWidget *menu_news; + GtkWidget *menu_league_stats; + GtkWidget *image2635; + GtkWidget *menu_season_history; + GtkWidget *image2636; + GtkWidget *menu_user_show_history; + GtkWidget *image2637; + GtkWidget *memorable_matches; + GtkWidget *image2638; + GtkWidget *memorable_matches_menu; + GtkWidget *mm_add_last_match; + GtkWidget *image2639; + GtkWidget *mm_manage_matches; + GtkWidget *image2640; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *menu_about; - GtkWidget *image2600; + GtkWidget *image2641; GtkWidget *menu_contributors; - GtkWidget *image2601; + GtkWidget *image2642; GtkWidget *menu_help; - GtkWidget *image2602; + GtkWidget *image2643; GtkWidget *hbox1; GtkWidget *button_load; GtkWidget *image11; @@ -321,9 +321,9 @@ create_main_window (void) GDK_l, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); - image2561 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2561); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2561); + image2602 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2602); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2602); menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); gtk_widget_show (menu_save); @@ -356,9 +356,9 @@ create_main_window (void) GDK_p, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image2562 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2562); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2562); + image2603 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2603); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2603); trennlinie7 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie7); @@ -389,9 +389,9 @@ create_main_window (void) gtk_container_add (GTK_CONTAINER (menu_options_menu), menu_save_window_geometry); gtk_tooltips_set_tip (tooltips, menu_save_window_geometry, _("Save window size, position and vertical divider"), NULL); - image2563 = create_pixmap (main_window, "menu_save_geometry.png"); - gtk_widget_show (image2563); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2563); + image2604 = create_pixmap (main_window, "menu_save_geometry.png"); + gtk_widget_show (image2604); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2604); menu_figures = gtk_menu_item_new_with_mnemonic (_("F_igures")); gtk_widget_show (menu_figures); @@ -407,9 +407,9 @@ create_main_window (void) GDK_F3, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2564 = create_pixmap (main_window, "menu_fixtures.png"); - gtk_widget_show (image2564); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2564); + image2605 = create_pixmap (main_window, "menu_fixtures.png"); + gtk_widget_show (image2605); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2605); menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)")); gtk_widget_show (menu_fixtures); @@ -418,9 +418,9 @@ create_main_window (void) GDK_F4, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2565 = create_pixmap (main_window, "menu_fixtures_comp.png"); - gtk_widget_show (image2565); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2565); + image2606 = create_pixmap (main_window, "menu_fixtures_comp.png"); + gtk_widget_show (image2606); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2606); menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables")); gtk_widget_show (menu_tables); @@ -429,9 +429,9 @@ create_main_window (void) GDK_F5, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2566 = create_pixmap (main_window, "menu_table.png"); - gtk_widget_show (image2566); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2566); + image2607 = create_pixmap (main_window, "menu_table.png"); + gtk_widget_show (image2607); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2607); menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results")); gtk_widget_show (menu_my_league_results); @@ -440,9 +440,9 @@ create_main_window (void) GDK_F6, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2567 = create_pixmap (main_window, "menu_league_results.png"); - gtk_widget_show (image2567); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2567); + image2608 = create_pixmap (main_window, "menu_league_results.png"); + gtk_widget_show (image2608); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2608); menu_season_results = gtk_image_menu_item_new_with_mnemonic (_("Season results")); gtk_widget_show (menu_season_results); @@ -451,36 +451,9 @@ create_main_window (void) GDK_s, (GdkModifierType) GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); - image2568 = create_pixmap (main_window, "menu_season_res.png"); - gtk_widget_show (image2568); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2568); - - trennlinie13 = gtk_separator_menu_item_new (); - gtk_widget_show (trennlinie13); - gtk_container_add (GTK_CONTAINER (menu_figures_menu), trennlinie13); - gtk_widget_set_sensitive (trennlinie13, FALSE); - - menu_league_stats = gtk_image_menu_item_new_with_mnemonic (_("League stats")); - gtk_widget_show (menu_league_stats); - gtk_container_add (GTK_CONTAINER (menu_figures_menu), menu_league_stats); - gtk_widget_add_accelerator (menu_league_stats, "activate", accel_group, - GDK_s, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - image2569 = create_pixmap (main_window, "menu_league_stats.png"); - gtk_widget_show (image2569); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image2569); - - menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history")); - gtk_widget_show (menu_season_history); - gtk_container_add (GTK_CONTAINER (menu_figures_menu), menu_season_history); - gtk_widget_add_accelerator (menu_season_history, "activate", accel_group, - GDK_h, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - image2570 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image2570); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image2570); + image2609 = create_pixmap (main_window, "menu_season_res.png"); + gtk_widget_show (image2609); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2609); menu_team = gtk_menu_item_new_with_mnemonic (_("_Team")); gtk_widget_show (menu_team); @@ -493,9 +466,9 @@ create_main_window (void) gtk_widget_show (menu_playing_style); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style); - image2571 = create_pixmap (main_window, "menu_style.png"); - gtk_widget_show (image2571); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2571); + image2610 = create_pixmap (main_window, "menu_style.png"); + gtk_widget_show (image2610); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2610); menu_playing_style_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu); @@ -534,9 +507,9 @@ create_main_window (void) gtk_widget_show (menu_scout); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout); - image2572 = create_pixmap (main_window, "menu_scout.png"); - gtk_widget_show (image2572); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2572); + image2611 = create_pixmap (main_window, "menu_scout.png"); + gtk_widget_show (image2611); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2611); menu_scout_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu); @@ -569,9 +542,9 @@ create_main_window (void) gtk_widget_show (menu_physio); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio); - image2573 = create_pixmap (main_window, "menu_physio.png"); - gtk_widget_show (image2573); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2573); + image2612 = create_pixmap (main_window, "menu_physio.png"); + gtk_widget_show (image2612); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2612); menu_physio_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu); @@ -604,9 +577,9 @@ create_main_window (void) gtk_widget_show (menu_youth_academy); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_youth_academy); - image2574 = create_pixmap (main_window, "menu_youth_academy.png"); - gtk_widget_show (image2574); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2574); + image2613 = create_pixmap (main_window, "menu_youth_academy.png"); + gtk_widget_show (image2613); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2613); menu_youth_academy_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_youth_academy), menu_youth_academy_menu); @@ -695,9 +668,9 @@ create_main_window (void) gtk_widget_show (menu_boost); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost); - image2575 = create_pixmap (main_window, "menu_boost.png"); - gtk_widget_show (image2575); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2575); + image2614 = create_pixmap (main_window, "menu_boost.png"); + gtk_widget_show (image2614); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2614); menu_boost_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu); @@ -738,17 +711,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); - image2576 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2576); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2576); + image2615 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2615); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2615); 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); - image2577 = create_pixmap (main_window, "menu_structure.png"); - gtk_widget_show (image2577); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2577); + image2616 = create_pixmap (main_window, "menu_structure.png"); + gtk_widget_show (image2616); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2616); menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team")); gtk_widget_show (menu_rearrange_team); @@ -758,9 +731,9 @@ create_main_window (void) GDK_r, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image2578 = create_pixmap (main_window, "menu_rearrange.png"); - gtk_widget_show (image2578); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2578); + image2617 = create_pixmap (main_window, "menu_rearrange.png"); + gtk_widget_show (image2617); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2617); trennlinie8 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie8); @@ -771,9 +744,9 @@ create_main_window (void) gtk_widget_show (menu_browse_teams); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams); - image2579 = create_pixmap (main_window, "menu_browse_tms.png"); - gtk_widget_show (image2579); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2579); + image2618 = create_pixmap (main_window, "menu_browse_tms.png"); + gtk_widget_show (image2618); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2618); trennlinie16 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie16); @@ -799,57 +772,57 @@ create_main_window (void) gtk_widget_show (menu_show_info); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info); - image2580 = create_pixmap (main_window, "menu_player_info.png"); - gtk_widget_show (image2580); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2580); + image2619 = create_pixmap (main_window, "menu_player_info.png"); + gtk_widget_show (image2619); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2619); 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); - image2581 = create_pixmap (main_window, "menu_player_put_transfer.png"); - gtk_widget_show (image2581); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2581); + image2620 = create_pixmap (main_window, "menu_player_put_transfer.png"); + gtk_widget_show (image2620); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2620); 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); - image2582 = create_pixmap (main_window, "menu_player_remove_transfer.png"); - gtk_widget_show (image2582); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2582); + image2621 = create_pixmap (main_window, "menu_player_remove_transfer.png"); + gtk_widget_show (image2621); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2621); 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); - image2583 = create_pixmap (main_window, "menu_player_contract.png"); - gtk_widget_show (image2583); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2583); + image2622 = create_pixmap (main_window, "menu_player_contract.png"); + gtk_widget_show (image2622); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2622); 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); - image2584 = create_pixmap (main_window, "menu_player_fire.png"); - gtk_widget_show (image2584); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2584); + image2623 = create_pixmap (main_window, "menu_player_fire.png"); + gtk_widget_show (image2623); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2623); 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); - image2585 = create_pixmap (main_window, "menu_player_shoots.png"); - gtk_widget_show (image2585); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2585); + image2624 = create_pixmap (main_window, "menu_player_shoots.png"); + gtk_widget_show (image2624); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2624); menu_move_to_youth_academy = gtk_image_menu_item_new_with_mnemonic (_("Move to youth academy")); gtk_widget_show (menu_move_to_youth_academy); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_move_to_youth_academy); - image2586 = create_pixmap (main_window, "menu_player_move_to_ya.png"); - gtk_widget_show (image2586); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image2586); + image2625 = create_pixmap (main_window, "menu_player_move_to_ya.png"); + gtk_widget_show (image2625); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image2625); trennlinie10 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie10); @@ -860,9 +833,9 @@ create_main_window (void) gtk_widget_show (menu_browse_players); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players); - image2587 = create_pixmap (main_window, "menu_player_browse.png"); - gtk_widget_show (image2587); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image2587); + image2626 = create_pixmap (main_window, "menu_player_browse.png"); + gtk_widget_show (image2626); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image2626); menu_user = gtk_menu_item_new_with_mnemonic (_("_User")); gtk_widget_show (menu_user); @@ -878,9 +851,9 @@ create_main_window (void) GDK_v, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image2588 = create_pixmap (main_window, "menu_last_match.png"); - gtk_widget_show (image2588); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image2588); + image2627 = create_pixmap (main_window, "menu_last_match.png"); + gtk_widget_show (image2627); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image2627); menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats")); gtk_widget_show (menu_user_show_last_stats); @@ -889,9 +862,9 @@ create_main_window (void) GDK_F2, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2589 = create_pixmap (main_window, "menu_match_stats.png"); - gtk_widget_show (image2589); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image2589); + image2628 = create_pixmap (main_window, "menu_match_stats.png"); + gtk_widget_show (image2628); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image2628); menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches")); gtk_widget_show (menu_user_show_coming_matches); @@ -900,60 +873,9 @@ create_main_window (void) GDK_F1, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2590 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2590); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image2590); - - memorable_matches = gtk_image_menu_item_new_with_mnemonic (_("Memorable matches")); - gtk_widget_show (memorable_matches); - gtk_container_add (GTK_CONTAINER (menu_user_menu), memorable_matches); - - image2591 = create_pixmap (main_window, "menu_mmatches.png"); - gtk_widget_show (image2591); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image2591); - - 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); - gtk_widget_add_accelerator (mm_add_last_match, "activate", accel_group, - GDK_a, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - image2592 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2592); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image2592); - - 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, _("Replay, delete or add memorable matches."), NULL); - gtk_widget_add_accelerator (mm_manage_matches, "activate", accel_group, - GDK_m, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - image2593 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2593); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image2593); - - trennlinie12 = gtk_separator_menu_item_new (); - gtk_widget_show (trennlinie12); - gtk_container_add (GTK_CONTAINER (menu_user_menu), trennlinie12); - gtk_widget_set_sensitive (trennlinie12, FALSE); - - menu_user_show_history = gtk_image_menu_item_new_with_mnemonic (_("Show history")); - gtk_widget_show (menu_user_show_history); - gtk_container_add (GTK_CONTAINER (menu_user_menu), menu_user_show_history); - gtk_widget_add_accelerator (menu_user_show_history, "activate", accel_group, - GDK_h, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - image2594 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image2594); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image2594); + image2629 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2629); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image2629); trennlinie9 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie9); @@ -967,9 +889,9 @@ create_main_window (void) GDK_F9, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2595 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2595); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image2595); + image2630 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2630); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image2630); menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user")); gtk_widget_show (menu_previous_user); @@ -978,9 +900,9 @@ create_main_window (void) GDK_F8, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2596 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2596); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image2596); + image2631 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2631); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image2631); menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users")); gtk_widget_show (menu_manage_users); @@ -989,9 +911,9 @@ create_main_window (void) GDK_F12, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2597 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2597); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image2597); + image2632 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2632); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image2632); menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad")); gtk_widget_show (menu_finances_stadium); @@ -1007,9 +929,9 @@ create_main_window (void) GDK_f, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image2598 = create_pixmap (main_window, "menu_finances.png"); - gtk_widget_show (image2598); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image2598); + image2633 = create_pixmap (main_window, "menu_finances.png"); + gtk_widget_show (image2633); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image2633); menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium")); gtk_widget_show (menu_show_stadium); @@ -1018,9 +940,9 @@ create_main_window (void) GDK_f, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image2599 = create_pixmap (main_window, "menu_stadium.png"); - gtk_widget_show (image2599); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image2599); + image2634 = create_pixmap (main_window, "menu_stadium.png"); + gtk_widget_show (image2634); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image2634); automatic_loan_repayment = gtk_menu_item_new_with_mnemonic (_("Automatic loan repayment")); gtk_widget_show (automatic_loan_repayment); @@ -1042,6 +964,88 @@ create_main_window (void) GDK_b, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); + stats1 = gtk_menu_item_new_with_mnemonic (_("St_ats")); + gtk_widget_show (stats1); + gtk_container_add (GTK_CONTAINER (menubar1), stats1); + + stats1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (stats1), stats1_menu); + + menu_news = gtk_menu_item_new_with_mnemonic (_("News")); + gtk_widget_show (menu_news); + gtk_container_add (GTK_CONTAINER (stats1_menu), menu_news); + gtk_widget_add_accelerator (menu_news, "activate", accel_group, + GDK_n, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menu_league_stats = gtk_image_menu_item_new_with_mnemonic (_("League stats")); + gtk_widget_show (menu_league_stats); + gtk_container_add (GTK_CONTAINER (stats1_menu), menu_league_stats); + gtk_widget_add_accelerator (menu_league_stats, "activate", accel_group, + GDK_s, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + image2635 = create_pixmap (main_window, "menu_league_stats.png"); + gtk_widget_show (image2635); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image2635); + + menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history")); + gtk_widget_show (menu_season_history); + gtk_container_add (GTK_CONTAINER (stats1_menu), menu_season_history); + gtk_widget_add_accelerator (menu_season_history, "activate", accel_group, + GDK_h, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + image2636 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image2636); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image2636); + + menu_user_show_history = gtk_image_menu_item_new_with_mnemonic (_("User history")); + gtk_widget_show (menu_user_show_history); + gtk_container_add (GTK_CONTAINER (stats1_menu), menu_user_show_history); + gtk_widget_add_accelerator (menu_user_show_history, "activate", accel_group, + GDK_h, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + image2637 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image2637); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image2637); + + memorable_matches = gtk_image_menu_item_new_with_mnemonic (_("Memorable matches")); + gtk_widget_show (memorable_matches); + gtk_container_add (GTK_CONTAINER (stats1_menu), memorable_matches); + + image2638 = create_pixmap (main_window, "menu_mmatches.png"); + gtk_widget_show (image2638); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image2638); + + 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); + gtk_widget_add_accelerator (mm_add_last_match, "activate", accel_group, + GDK_a, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + image2639 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2639); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image2639); + + 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, _("Replay, delete or add memorable matches."), NULL); + gtk_widget_add_accelerator (mm_manage_matches, "activate", accel_group, + GDK_m, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + image2640 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2640); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image2640); + menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (menu_help1); gtk_container_add (GTK_CONTAINER (menubar1), menu_help1); @@ -1053,25 +1057,25 @@ create_main_window (void) gtk_widget_show (menu_about); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about); - image2600 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2600); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image2600); + image2641 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2641); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image2641); 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); - image2601 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2601); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image2601); + image2642 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2642); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image2642); 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); - image2602 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2602); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image2602); + image2643 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2643); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image2643); hbox1 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox1); @@ -1489,12 +1493,6 @@ create_main_window (void) g_signal_connect ((gpointer) menu_season_results, "activate", G_CALLBACK (on_menu_season_results_activate), NULL); - g_signal_connect ((gpointer) menu_league_stats, "activate", - G_CALLBACK (on_menu_league_stats_activate), - NULL); - g_signal_connect ((gpointer) menu_season_history, "activate", - G_CALLBACK (on_menu_season_history_activate), - NULL); g_signal_connect ((gpointer) menu_all_out_defend, "button_release_event", G_CALLBACK (on_menu_team_button_release_event), NULL); @@ -1627,15 +1625,6 @@ 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); g_signal_connect ((gpointer) menu_next_user, "activate", G_CALLBACK (on_menu_next_user_activate), NULL); @@ -1657,6 +1646,24 @@ create_main_window (void) g_signal_connect ((gpointer) menu_betting, "activate", G_CALLBACK (on_menu_betting_activate), NULL); + g_signal_connect ((gpointer) menu_news, "activate", + G_CALLBACK (on_menu_news_activate), + NULL); + g_signal_connect ((gpointer) menu_league_stats, "activate", + G_CALLBACK (on_menu_league_stats_activate), + NULL); + g_signal_connect ((gpointer) menu_season_history, "activate", + G_CALLBACK (on_menu_season_history_activate), + NULL); + g_signal_connect ((gpointer) menu_user_show_history, "activate", + G_CALLBACK (on_menu_user_show_history_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_about, "activate", G_CALLBACK (on_menu_about_activate), NULL); @@ -1733,7 +1740,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, image2561, "image2561"); + GLADE_HOOKUP_OBJECT (main_window, image2602, "image2602"); 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"); @@ -1741,35 +1748,30 @@ 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, image2562, "image2562"); + GLADE_HOOKUP_OBJECT (main_window, image2603, "image2603"); 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"); GLADE_HOOKUP_OBJECT (main_window, menu_overwrite, "menu_overwrite"); GLADE_HOOKUP_OBJECT (main_window, trennlinie14, "trennlinie14"); GLADE_HOOKUP_OBJECT (main_window, menu_save_window_geometry, "menu_save_window_geometry"); - GLADE_HOOKUP_OBJECT (main_window, image2563, "image2563"); + GLADE_HOOKUP_OBJECT (main_window, image2604, "image2604"); 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, image2564, "image2564"); + GLADE_HOOKUP_OBJECT (main_window, image2605, "image2605"); GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures"); - GLADE_HOOKUP_OBJECT (main_window, image2565, "image2565"); + GLADE_HOOKUP_OBJECT (main_window, image2606, "image2606"); GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables"); - GLADE_HOOKUP_OBJECT (main_window, image2566, "image2566"); + GLADE_HOOKUP_OBJECT (main_window, image2607, "image2607"); GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results"); - GLADE_HOOKUP_OBJECT (main_window, image2567, "image2567"); + GLADE_HOOKUP_OBJECT (main_window, image2608, "image2608"); GLADE_HOOKUP_OBJECT (main_window, menu_season_results, "menu_season_results"); - GLADE_HOOKUP_OBJECT (main_window, image2568, "image2568"); - GLADE_HOOKUP_OBJECT (main_window, trennlinie13, "trennlinie13"); - GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats"); - GLADE_HOOKUP_OBJECT (main_window, image2569, "image2569"); - GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history"); - GLADE_HOOKUP_OBJECT (main_window, image2570, "image2570"); + GLADE_HOOKUP_OBJECT (main_window, image2609, "image2609"); 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, image2571, "image2571"); + GLADE_HOOKUP_OBJECT (main_window, image2610, "image2610"); 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"); @@ -1777,21 +1779,21 @@ 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, image2572, "image2572"); + GLADE_HOOKUP_OBJECT (main_window, image2611, "image2611"); 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, image2573, "image2573"); + GLADE_HOOKUP_OBJECT (main_window, image2612, "image2612"); 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"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_average, "menu_physio_average"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_bad, "menu_physio_bad"); GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy, "menu_youth_academy"); - GLADE_HOOKUP_OBJECT (main_window, image2574, "image2574"); + GLADE_HOOKUP_OBJECT (main_window, image2613, "image2613"); GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy_menu, "menu_youth_academy_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_show_youth_academy, "menu_show_youth_academy"); GLADE_HOOKUP_OBJECT (main_window, youth_coach1, "youth_coach1"); @@ -1809,7 +1811,7 @@ 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, image2575, "image2575"); + GLADE_HOOKUP_OBJECT (main_window, image2614, "image2614"); 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"); @@ -1818,77 +1820,83 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_training_camp, "menu_training_camp"); GLADE_HOOKUP_OBJECT (main_window, trennlinie18, "trennlinie18"); GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players"); - GLADE_HOOKUP_OBJECT (main_window, image2576, "image2576"); + GLADE_HOOKUP_OBJECT (main_window, image2615, "image2615"); GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure"); - GLADE_HOOKUP_OBJECT (main_window, image2577, "image2577"); + GLADE_HOOKUP_OBJECT (main_window, image2616, "image2616"); GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team"); - GLADE_HOOKUP_OBJECT (main_window, image2578, "image2578"); + GLADE_HOOKUP_OBJECT (main_window, image2617, "image2617"); GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams"); - GLADE_HOOKUP_OBJECT (main_window, image2579, "image2579"); + GLADE_HOOKUP_OBJECT (main_window, image2618, "image2618"); GLADE_HOOKUP_OBJECT (main_window, trennlinie16, "trennlinie16"); GLADE_HOOKUP_OBJECT (main_window, menu_show_job_exchange, "menu_show_job_exchange"); 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, image2580, "image2580"); + GLADE_HOOKUP_OBJECT (main_window, image2619, "image2619"); GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image2581, "image2581"); + GLADE_HOOKUP_OBJECT (main_window, image2620, "image2620"); GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image2582, "image2582"); + GLADE_HOOKUP_OBJECT (main_window, image2621, "image2621"); GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract"); - GLADE_HOOKUP_OBJECT (main_window, image2583, "image2583"); + GLADE_HOOKUP_OBJECT (main_window, image2622, "image2622"); GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire"); - GLADE_HOOKUP_OBJECT (main_window, image2584, "image2584"); + GLADE_HOOKUP_OBJECT (main_window, image2623, "image2623"); GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties"); - GLADE_HOOKUP_OBJECT (main_window, image2585, "image2585"); + GLADE_HOOKUP_OBJECT (main_window, image2624, "image2624"); GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy"); - GLADE_HOOKUP_OBJECT (main_window, image2586, "image2586"); + GLADE_HOOKUP_OBJECT (main_window, image2625, "image2625"); GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players"); - GLADE_HOOKUP_OBJECT (main_window, image2587, "image2587"); + GLADE_HOOKUP_OBJECT (main_window, image2626, "image2626"); 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, image2588, "image2588"); + GLADE_HOOKUP_OBJECT (main_window, image2627, "image2627"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats"); - GLADE_HOOKUP_OBJECT (main_window, image2589, "image2589"); + GLADE_HOOKUP_OBJECT (main_window, image2628, "image2628"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches"); - GLADE_HOOKUP_OBJECT (main_window, image2590, "image2590"); - GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches"); - GLADE_HOOKUP_OBJECT (main_window, image2591, "image2591"); - 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, image2592, "image2592"); - GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches"); - GLADE_HOOKUP_OBJECT (main_window, image2593, "image2593"); - 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, image2594, "image2594"); + GLADE_HOOKUP_OBJECT (main_window, image2629, "image2629"); GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9"); GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user"); - GLADE_HOOKUP_OBJECT (main_window, image2595, "image2595"); + GLADE_HOOKUP_OBJECT (main_window, image2630, "image2630"); GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user"); - GLADE_HOOKUP_OBJECT (main_window, image2596, "image2596"); + GLADE_HOOKUP_OBJECT (main_window, image2631, "image2631"); GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users"); - GLADE_HOOKUP_OBJECT (main_window, image2597, "image2597"); + GLADE_HOOKUP_OBJECT (main_window, image2632, "image2632"); 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, image2598, "image2598"); + GLADE_HOOKUP_OBJECT (main_window, image2633, "image2633"); GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium"); - GLADE_HOOKUP_OBJECT (main_window, image2599, "image2599"); + GLADE_HOOKUP_OBJECT (main_window, image2634, "image2634"); GLADE_HOOKUP_OBJECT (main_window, automatic_loan_repayment, "automatic_loan_repayment"); GLADE_HOOKUP_OBJECT (main_window, trennlinie15, "trennlinie15"); GLADE_HOOKUP_OBJECT (main_window, menu_betting, "menu_betting"); + GLADE_HOOKUP_OBJECT (main_window, stats1, "stats1"); + GLADE_HOOKUP_OBJECT (main_window, stats1_menu, "stats1_menu"); + GLADE_HOOKUP_OBJECT (main_window, menu_news, "menu_news"); + GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats"); + GLADE_HOOKUP_OBJECT (main_window, image2635, "image2635"); + GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history"); + GLADE_HOOKUP_OBJECT (main_window, image2636, "image2636"); + GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history"); + GLADE_HOOKUP_OBJECT (main_window, image2637, "image2637"); + GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches"); + GLADE_HOOKUP_OBJECT (main_window, image2638, "image2638"); + 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, image2639, "image2639"); + GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches"); + GLADE_HOOKUP_OBJECT (main_window, image2640, "image2640"); 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, image2600, "image2600"); + GLADE_HOOKUP_OBJECT (main_window, image2641, "image2641"); GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors"); - GLADE_HOOKUP_OBJECT (main_window, image2601, "image2601"); + GLADE_HOOKUP_OBJECT (main_window, image2642, "image2642"); GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help"); - GLADE_HOOKUP_OBJECT (main_window, image2602, "image2602"); + GLADE_HOOKUP_OBJECT (main_window, image2643, "image2643"); 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/misc3_callbacks.c b/src/misc3_callbacks.c index 8b24ad0a..26a7db33 100644 --- a/src/misc3_callbacks.c +++ b/src/misc3_callbacks.c @@ -370,3 +370,30 @@ on_window_alr_delete_event (GtkWidget *widget, return TRUE; } + +gboolean +on_window_news_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + window_destroy(&window.news); + return FALSE; +} + + +gboolean +on_window_news_destroy_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + window_destroy(&window.news); + return FALSE; +} + + +void +on_button_news_close_clicked (GtkButton *button, + gpointer user_data) +{ + window_destroy(&window.news); +} diff --git a/src/misc3_callbacks.h b/src/misc3_callbacks.h index a5e8cfa9..a7bfafc8 100644 --- a/src/misc3_callbacks.h +++ b/src/misc3_callbacks.h @@ -108,5 +108,17 @@ on_window_alr_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data); -#endif +gboolean +on_window_news_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); +gboolean +on_window_news_destroy_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); + +void +on_button_news_close_clicked (GtkButton *button, + gpointer user_data); +#endif diff --git a/src/misc3_interface.c b/src/misc3_interface.c index 5e65939f..cd91fe21 100644 --- a/src/misc3_interface.c +++ b/src/misc3_interface.c @@ -770,3 +770,73 @@ create_window_alr (void) return window_alr; } +GtkWidget* +create_window_news (void) +{ + GtkWidget *window_news; + GtkWidget *vbox6; + GtkWidget *scrolledwindow3; + GtkWidget *treeview_news; + GtkWidget *hseparator8; + GtkWidget *button_news_close; + GtkAccelGroup *accel_group; + GtkTooltips *tooltips; + + tooltips = gtk_tooltips_new (); + + accel_group = gtk_accel_group_new (); + + window_news = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window_news), _("Bygfoot News")); + gtk_window_set_default_size (GTK_WINDOW (window_news), 500, 600); + + vbox6 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox6); + gtk_container_add (GTK_CONTAINER (window_news), vbox6); + + scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow3); + gtk_box_pack_start (GTK_BOX (vbox6), scrolledwindow3, TRUE, TRUE, 0); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_SHADOW_IN); + + treeview_news = gtk_tree_view_new (); + gtk_widget_show (treeview_news); + gtk_container_add (GTK_CONTAINER (scrolledwindow3), treeview_news); + + hseparator8 = gtk_hseparator_new (); + gtk_widget_show (hseparator8); + gtk_box_pack_start (GTK_BOX (vbox6), hseparator8, FALSE, FALSE, 0); + gtk_widget_set_size_request (hseparator8, -1, 10); + + button_news_close = gtk_button_new_from_stock ("gtk-close"); + gtk_widget_show (button_news_close); + gtk_box_pack_start (GTK_BOX (vbox6), button_news_close, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, button_news_close, _("Esc"), NULL); + gtk_widget_add_accelerator (button_news_close, "clicked", accel_group, + GDK_Escape, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + g_signal_connect ((gpointer) window_news, "delete_event", + G_CALLBACK (on_window_news_delete_event), + NULL); + g_signal_connect ((gpointer) window_news, "destroy_event", + G_CALLBACK (on_window_news_destroy_event), + NULL); + g_signal_connect ((gpointer) button_news_close, "clicked", + G_CALLBACK (on_button_news_close_clicked), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (window_news, window_news, "window_news"); + GLADE_HOOKUP_OBJECT (window_news, vbox6, "vbox6"); + GLADE_HOOKUP_OBJECT (window_news, scrolledwindow3, "scrolledwindow3"); + GLADE_HOOKUP_OBJECT (window_news, treeview_news, "treeview_news"); + GLADE_HOOKUP_OBJECT (window_news, hseparator8, "hseparator8"); + GLADE_HOOKUP_OBJECT (window_news, button_news_close, "button_news_close"); + GLADE_HOOKUP_OBJECT_NO_REF (window_news, tooltips, "tooltips"); + + gtk_window_add_accel_group (GTK_WINDOW (window_news), accel_group); + + return window_news; +} + diff --git a/src/misc3_interface.h b/src/misc3_interface.h index 8f7b3cc5..3e66fbd2 100644 --- a/src/misc3_interface.h +++ b/src/misc3_interface.h @@ -5,3 +5,4 @@ GtkWidget* create_window_bets (void); GtkWidget* create_window_splash (void); GtkWidget* create_window_alr (void); +GtkWidget* create_window_news (void); diff --git a/src/news.c b/src/news.c index ebf4ac13..bb20a6ea 100644 --- a/src/news.c +++ b/src/news.c @@ -54,7 +54,8 @@ news_generate_match(const LiveGame *live_game) printf("news_generate_match\n"); #endif - gchar title[SMALL], subtitle[SMALL]; + gchar title_small[SMALL], buf[SMALL], + title[SMALL], subtitle[SMALL]; gint title_id, subtitle_id; NewsPaperArticle new_article; @@ -70,6 +71,10 @@ news_generate_match(const LiveGame *live_game) { new_article.week_number = week; new_article.week_round_number = week_round; + fixture_result_to_buf(live_game->fix, buf, FALSE); + sprintf(title_small, "%s %s %s", + live_game->fix->teams[0]->name, buf, live_game->fix->teams[1]->name); + new_article.title_small = g_strdup(title_small); new_article.title = g_strdup(title); new_article.subtitle = g_strdup(subtitle); new_article.title_id = title_id; diff --git a/src/news_struct.h b/src/news_struct.h index e07f1775..2f419f00 100644 --- a/src/news_struct.h +++ b/src/news_struct.h @@ -74,7 +74,7 @@ typedef struct { gint week_number, week_round_number; gint title_id, subtitle_id; - gchar *title, *subtitle; + gchar *title_small, *title, *subtitle; } NewsPaperArticle; diff --git a/src/support.c b/src/support.c index 98238f87..00aff298 100644 --- a/src/support.c +++ b/src/support.c @@ -1,15 +1,14 @@ /* * DO NOT EDIT THIS FILE - it is generated by Glade. */ + #ifdef HAVE_CONFIG_H # include #endif #include #include -#ifdef HAVE_UNISTD_H #include -#endif #include #include @@ -49,10 +48,6 @@ static GList *pixmaps_directories = NULL; void add_pixmap_directory (const gchar *directory) { -#ifdef DEBUG - printf("add_pixmap_directory\n"); -#endif - pixmaps_directories = g_list_prepend (pixmaps_directories, g_strdup (directory)); } @@ -61,14 +56,6 @@ add_pixmap_directory (const gchar *directory) static gchar* find_pixmap_file (const gchar *filename) { -#ifdef DEBUG - printf("find_pixmap_file\n"); -#endif - -#ifdef DEBUG - printf("find_pixmap_file\n"); -#endif - GList *elem; /* We step through each of the pixmaps directory to find it. */ @@ -145,10 +132,6 @@ glade_set_atk_action_description (AtkAction *action, const gchar *action_name, const gchar *description) { -#ifdef DEBUG - printf("glade_set_atk_action_description\n"); -#endif - gint n_actions, i; n_actions = atk_action_get_n_actions (action); diff --git a/src/support.h b/src/support.h index 426cd8f0..a32649e5 100644 --- a/src/support.h +++ b/src/support.h @@ -67,8 +67,3 @@ void glade_set_atk_action_description (AtkAction *action, const gchar *action_name, const gchar *description); -/* These variables define various paths detected at runtime. */ -extern gchar *package_prefix; -extern gchar *package_data_dir; -extern gchar *package_locale_dir; - diff --git a/src/treeview.c b/src/treeview.c index 0a341807..6bf51900 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -1484,7 +1484,7 @@ treeview_create_stadium_summary(GtkListStore *ls) } GtkTreeModel* -treeview_create_finances(const User* user) +treeview_create_finances(const User *user) { #ifdef DEBUG printf("treeview_create_finances\n"); diff --git a/src/treeview.h b/src/treeview.h index 26662d54..6aae2982 100644 --- a/src/treeview.h +++ b/src/treeview.h @@ -136,7 +136,7 @@ void treeview_set_up_finances(GtkTreeView *treeview); GtkTreeModel* -treeview_create_finances(const User* user); +treeview_create_finances(const User *user); void treeview_show_player_list_team(GtkTreeView *treeview, const Team *tm, gint scout); diff --git a/src/treeview2.c b/src/treeview2.c index 3a505d67..7bee4055 100644 --- a/src/treeview2.c +++ b/src/treeview2.c @@ -579,3 +579,111 @@ treeview2_show_job_exchange(void) gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(model)); g_object_unref(model); } + +void +treeview2_create_news(GtkListStore *ls) +{ +#ifdef DEBUG + printf("treeview2_create_news\n"); +#endif + + gint i; + GtkTreeIter iter; + gchar buf[SMALL], buf2[SMALL]; + + if(newspaper.articles->len == 0) + { + gtk_list_store_append(ls, &iter); + sprintf(buf, "\n%s", + const_app("string_news_window_title_attribute"), + _("No news available.")); + gtk_list_store_set(ls, &iter, 0, buf, -1); + return; + } + + for(i = newspaper.articles->len - 1; i >= 0; i--) + { + if(i == newspaper.articles->len - 1 || + (i < newspaper.articles->len - 1 && + (g_array_index(newspaper.articles, NewsPaperArticle, i).week_number != + g_array_index(newspaper.articles, NewsPaperArticle, i + 1).week_number || + g_array_index(newspaper.articles, NewsPaperArticle, i).week_round_number != + g_array_index(newspaper.articles, NewsPaperArticle, i + 1).week_round_number))) + { + gtk_list_store_append(ls, &iter); + gtk_list_store_set(ls, &iter, 0, "", -1); + + gtk_list_store_append(ls, &iter); + sprintf(buf2, _("Week %d, Week round %d"), + g_array_index(newspaper.articles, NewsPaperArticle, i).week_number, + g_array_index(newspaper.articles, NewsPaperArticle, i).week_round_number); + sprintf(buf, "%s", + const_app("string_news_window_week_number_attribute"), + buf2); + gtk_list_store_set(ls, &iter, 0, buf, -1); + } + + gtk_list_store_append(ls, &iter); + sprintf(buf, "%s", + const_app("string_news_window_title_small_attribute"), + g_array_index(newspaper.articles, NewsPaperArticle, i).title_small); + gtk_list_store_set(ls, &iter, 0, buf, -1); + + gtk_list_store_append(ls, &iter); + sprintf(buf, "%s", + const_app("string_news_window_title_attribute"), + g_array_index(newspaper.articles, NewsPaperArticle, i).title); + gtk_list_store_set(ls, &iter, 0, buf, -1); + + gtk_list_store_append(ls, &iter); + sprintf(buf, "%s\n", + const_app("string_news_window_subtitle_attribute"), + g_array_index(newspaper.articles, NewsPaperArticle, i).subtitle); + gtk_list_store_set(ls, &iter, 0, buf, -1); + } +} + +void +treeview2_set_up_news(GtkTreeView *treeview) +{ +#ifdef DEBUG + printf("treeview2_set_up_news\n"); +#endif + + GtkTreeViewColumn *col; + GtkCellRenderer *renderer; + + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(treeview), + GTK_SELECTION_NONE); + gtk_tree_view_set_headers_visible(treeview, FALSE); + gtk_tree_view_set_rules_hint(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, + "markup", 0); +} + +/** Show the news in the news treeview. */ +void +treeview2_show_news(void) +{ +#ifdef DEBUG + printf("treeview2_show_job_exchange\n"); +#endif + + GtkTreeView *treeview = + GTK_TREE_VIEW(lookup_widget(window.news, "treeview_news")); + GtkListStore *model = + gtk_list_store_new(1, G_TYPE_STRING); + + treeview_helper_clear(treeview); + + treeview2_set_up_news(treeview); + + treeview2_create_news(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 index e8c1c266..2c30817d 100644 --- a/src/treeview2.h +++ b/src/treeview2.h @@ -73,4 +73,13 @@ treeview2_set_up_job_exchange(GtkTreeView *treeview); void treeview2_show_job_exchange(void); +void +treeview2_create_news(GtkListStore *ls); + +void +treeview2_set_up_news(GtkTreeView *treeview); + +void +treeview2_show_news(void); + #endif diff --git a/src/window.c b/src/window.c index 1e5e689c..2788e6ff 100644 --- a/src/window.c +++ b/src/window.c @@ -981,6 +981,14 @@ window_create(gint window_type) wind = window.alr; strcpy(buf, _("Automatic loan repayment")); break; + case WINDOW_NEWS: + if(window.news != NULL) + g_warning("window_create: called on already existing window\n"); + else + window.news = create_window_news(); + wind = window.news; + strcpy(buf, _("Bygfoot news")); + break; } if(window_type != WINDOW_FILE_CHOOSER) diff --git a/src/window.h b/src/window.h index b2496616..95714839 100644 --- a/src/window.h +++ b/src/window.h @@ -55,6 +55,7 @@ enum Windows WINDOW_SPLASH, WINDOW_END, WINDOW_TRAINING_CAMP, + WINDOW_NEWS, WINDOW_ALR }; diff --git a/support_files/bygfoot_app b/support_files/bygfoot_app index 877fab02..5120f9ea 100644 --- a/support_files/bygfoot_app +++ b/support_files/bygfoot_app @@ -234,3 +234,9 @@ string_treeview_helper_color_user_bet_bg lightblue # colours for foreign countries in the job exchange list string_treeview_helper_color_job_international_fg black string_treeview_helper_color_job_international_bg lightblue + +# font attributes for the news window +string_news_window_week_number_attribute weight='bold' size='x-large' +string_news_window_title_small_attribute size='small' +string_news_window_title_attribute weight='bold' size='large' +string_news_window_subtitle_attribute style='oblique' diff --git a/support_files/news/news_de.xml b/support_files/news/news_de.xml index b04120ac..a4daf714 100644 --- a/support_files/news/news_de.xml +++ b/support_files/news/news_de.xml @@ -7,26 +7,20 @@ News Of The Sports World match - _GD_ G 1 + _CUP_ = 0 _GD_ G 1 _TW_ [beats|crushes|kills] _TL_! Result: _RE_ - _TL_ loses to _TW_! - _TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage. + _TL_ loses to _TW_! + _TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage. _TW_ wipes out _TL_! _RE_ is flattering for _TL_. _TL_ loses again! _TW_ just too strong. _TL_ in a world of misery! _TW_: _RE_ against _TL_. - _LEAGUECUPNAME_: _TL_ loses to _TW_! - _TL_ overwhelmed by _SHOTS_TWN__ shots. - _SCORERS_TWN__ ensure victory for _TW_. - - - - match - _CUP_ = 0 - _TW_ victorious! + _LEAGUECUPNAME_: _TL_ loses to _TW_! + _TL_ overwhelmed by _SHOTS_TWN__ shots. + _SCORERS_TWN__ ensure victory for _TW_. _TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_. _TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_. _TW_ on top after defeating _TL_ _RE_. diff --git a/support_files/news/news_en.xml b/support_files/news/news_en.xml index b04120ac..a4daf714 100644 --- a/support_files/news/news_en.xml +++ b/support_files/news/news_en.xml @@ -7,26 +7,20 @@ News Of The Sports World match - _GD_ G 1 + _CUP_ = 0 _GD_ G 1 _TW_ [beats|crushes|kills] _TL_! Result: _RE_ - _TL_ loses to _TW_! - _TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage. + _TL_ loses to _TW_! + _TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage. _TW_ wipes out _TL_! _RE_ is flattering for _TL_. _TL_ loses again! _TW_ just too strong. _TL_ in a world of misery! _TW_: _RE_ against _TL_. - _LEAGUECUPNAME_: _TL_ loses to _TW_! - _TL_ overwhelmed by _SHOTS_TWN__ shots. - _SCORERS_TWN__ ensure victory for _TW_. - - - - match - _CUP_ = 0 - _TW_ victorious! + _LEAGUECUPNAME_: _TL_ loses to _TW_! + _TL_ overwhelmed by _SHOTS_TWN__ shots. + _SCORERS_TWN__ ensure victory for _TW_. _TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_. _TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_. _TW_ on top after defeating _TL_ _RE_.