1
1
mirror of https://github.com/tstellar/bygfoot.git synced 2025-01-31 07:54:50 +01:00

Newspaper progressing; menu restructured.

This commit is contained in:
gyboth 2008-12-06 17:07:03 +00:00
parent b6d7bddd74
commit 1115d0f54c
24 changed files with 880 additions and 540 deletions

View File

@ -72,7 +72,7 @@
<accelerator key="l" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2561">
<widget class="GtkImage" id="image2602">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@ -140,7 +140,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2562">
<widget class="GtkImage" id="image2603">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@ -204,7 +204,7 @@
<signal name="activate" handler="on_menu_save_window_geometry_activate" last_modification_time="Tue, 27 Sep 2005 10:09:53 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2563">
<widget class="GtkImage" id="image2604">
<property name="visible">True</property>
<property name="pixbuf">menu_save_geometry.png</property>
<property name="xalign">0.5</property>
@ -238,7 +238,7 @@
<accelerator key="F3" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2564">
<widget class="GtkImage" id="image2605">
<property name="visible">True</property>
<property name="pixbuf">menu_fixtures.png</property>
<property name="xalign">0.5</property>
@ -259,7 +259,7 @@
<accelerator key="F4" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2565">
<widget class="GtkImage" id="image2606">
<property name="visible">True</property>
<property name="pixbuf">menu_fixtures_comp.png</property>
<property name="xalign">0.5</property>
@ -280,7 +280,7 @@
<accelerator key="F5" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2566">
<widget class="GtkImage" id="image2607">
<property name="visible">True</property>
<property name="pixbuf">menu_table.png</property>
<property name="xalign">0.5</property>
@ -301,7 +301,7 @@
<accelerator key="F6" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2567">
<widget class="GtkImage" id="image2608">
<property name="visible">True</property>
<property name="pixbuf">menu_league_results.png</property>
<property name="xalign">0.5</property>
@ -322,7 +322,7 @@
<accelerator key="s" modifiers="GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2568">
<widget class="GtkImage" id="image2609">
<property name="visible">True</property>
<property name="pixbuf">menu_season_res.png</property>
<property name="xalign">0.5</property>
@ -333,54 +333,6 @@
</child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="trennlinie13">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_league_stats">
<property name="visible">True</property>
<property name="label" translatable="yes">League stats</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_league_stats_activate" last_modification_time="Thu, 28 Apr 2005 17:31:46 GMT"/>
<accelerator key="s" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2569">
<property name="visible">True</property>
<property name="pixbuf">menu_league_stats.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_season_history">
<property name="visible">True</property>
<property name="label" translatable="yes">Season history</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_season_history_activate" last_modification_time="Sun, 02 Jan 2005 15:39:45 GMT"/>
<accelerator key="h" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2570">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
@ -402,7 +354,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2571">
<widget class="GtkImage" id="image2610">
<property name="visible">True</property>
<property name="pixbuf">menu_style.png</property>
<property name="xalign">0.5</property>
@ -480,7 +432,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2572">
<widget class="GtkImage" id="image2611">
<property name="visible">True</property>
<property name="pixbuf">menu_scout.png</property>
<property name="xalign">0.5</property>
@ -547,7 +499,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2573">
<widget class="GtkImage" id="image2612">
<property name="visible">True</property>
<property name="pixbuf">menu_physio.png</property>
<property name="xalign">0.5</property>
@ -614,7 +566,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2574">
<widget class="GtkImage" id="image2613">
<property name="visible">True</property>
<property name="pixbuf">menu_youth_academy.png</property>
<property name="xalign">0.5</property>
@ -781,7 +733,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2575">
<widget class="GtkImage" id="image2614">
<property name="visible">True</property>
<property name="pixbuf">menu_boost.png</property>
<property name="xalign">0.5</property>
@ -859,7 +811,7 @@
<signal name="activate" handler="on_menu_reset_players_activate" last_modification_time="Tue, 26 Apr 2005 13:16:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2576">
<widget class="GtkImage" id="image2615">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon_size">1</property>
@ -880,7 +832,7 @@
<signal name="activate" handler="on_menu_custom_structure_activate" last_modification_time="Sat, 26 Feb 2005 12:46:30 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2577">
<widget class="GtkImage" id="image2616">
<property name="visible">True</property>
<property name="pixbuf">menu_structure.png</property>
<property name="xalign">0.5</property>
@ -902,7 +854,7 @@
<accelerator key="r" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2578">
<widget class="GtkImage" id="image2617">
<property name="visible">True</property>
<property name="pixbuf">menu_rearrange.png</property>
<property name="xalign">0.5</property>
@ -928,7 +880,7 @@
<signal name="activate" handler="on_menu_browse_teams_activate" last_modification_time="Mon, 03 Jan 2005 16:58:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2579">
<widget class="GtkImage" id="image2618">
<property name="visible">True</property>
<property name="pixbuf">menu_browse_tms.png</property>
<property name="xalign">0.5</property>
@ -978,7 +930,7 @@
<signal name="activate" handler="on_menu_show_info_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2580">
<widget class="GtkImage" id="image2619">
<property name="visible">True</property>
<property name="pixbuf">menu_player_info.png</property>
<property name="xalign">0.5</property>
@ -998,7 +950,7 @@
<signal name="activate" handler="on_menu_put_on_transfer_list_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2581">
<widget class="GtkImage" id="image2620">
<property name="visible">True</property>
<property name="pixbuf">menu_player_put_transfer.png</property>
<property name="xalign">0.5</property>
@ -1018,7 +970,7 @@
<signal name="activate" handler="on_menu_remove_from_transfer_list_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2582">
<widget class="GtkImage" id="image2621">
<property name="visible">True</property>
<property name="pixbuf">menu_player_remove_transfer.png</property>
<property name="xalign">0.5</property>
@ -1038,7 +990,7 @@
<signal name="activate" handler="on_menu_offer_new_contract_activate" last_modification_time="Fri, 25 Mar 2005 09:23:28 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2583">
<widget class="GtkImage" id="image2622">
<property name="visible">True</property>
<property name="pixbuf">menu_player_contract.png</property>
<property name="xalign">0.5</property>
@ -1058,7 +1010,7 @@
<signal name="activate" handler="on_menu_fire_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2584">
<widget class="GtkImage" id="image2623">
<property name="visible">True</property>
<property name="pixbuf">menu_player_fire.png</property>
<property name="xalign">0.5</property>
@ -1078,7 +1030,7 @@
<signal name="activate" handler="on_menu_shoots_penalties_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2585">
<widget class="GtkImage" id="image2624">
<property name="visible">True</property>
<property name="pixbuf">menu_player_shoots.png</property>
<property name="xalign">0.5</property>
@ -1098,7 +1050,7 @@
<signal name="activate" handler="on_menu_move_to_youth_academy_activate" last_modification_time="Thu, 07 Jul 2005 21:12:26 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2586">
<widget class="GtkImage" id="image2625">
<property name="visible">True</property>
<property name="pixbuf">menu_player_move_to_ya.png</property>
<property name="xalign">0.5</property>
@ -1124,7 +1076,7 @@
<signal name="activate" handler="on_menu_browse_players_activate" last_modification_time="Sat, 26 Mar 2005 09:42:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2587">
<widget class="GtkImage" id="image2626">
<property name="visible">True</property>
<property name="pixbuf">menu_player_browse.png</property>
<property name="xalign">0.5</property>
@ -1158,7 +1110,7 @@
<accelerator key="v" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2588">
<widget class="GtkImage" id="image2627">
<property name="visible">True</property>
<property name="pixbuf">menu_last_match.png</property>
<property name="xalign">0.5</property>
@ -1179,7 +1131,7 @@
<accelerator key="F2" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2589">
<widget class="GtkImage" id="image2628">
<property name="visible">True</property>
<property name="pixbuf">menu_match_stats.png</property>
<property name="xalign">0.5</property>
@ -1200,7 +1152,7 @@
<accelerator key="F1" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2590">
<widget class="GtkImage" id="image2629">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@ -1213,103 +1165,6 @@
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="memorable_matches">
<property name="visible">True</property>
<property name="label" translatable="yes">Memorable matches</property>
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2591">
<property name="visible">True</property>
<property name="pixbuf">menu_mmatches.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
<child>
<widget class="GtkMenu" id="memorable_matches_menu">
<child>
<widget class="GtkImageMenuItem" id="mm_add_last_match">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Add last recorded match to the current memorable matches file.</property>
<property name="label" translatable="yes">Add last match</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_mm_add_last_match_activate" last_modification_time="Fri, 19 Aug 2005 10:25:28 GMT"/>
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2592">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="mm_manage_matches">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Replay, delete or add memorable matches.</property>
<property name="label" translatable="yes">Manage matches</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_mm_manage_matches_activate" last_modification_time="Fri, 19 Aug 2005 10:25:28 GMT"/>
<accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2593">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="trennlinie12">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_user_show_history">
<property name="visible">True</property>
<property name="label" translatable="yes">Show history</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_user_show_history_activate" last_modification_time="Fri, 15 Apr 2005 15:08:24 GMT"/>
<accelerator key="h" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2594">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="trennlinie9">
<property name="visible">True</property>
@ -1325,7 +1180,7 @@
<accelerator key="F9" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2595">
<widget class="GtkImage" id="image2630">
<property name="visible">True</property>
<property name="stock">gtk-media-forward</property>
<property name="icon_size">1</property>
@ -1347,7 +1202,7 @@
<accelerator key="F8" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2596">
<widget class="GtkImage" id="image2631">
<property name="visible">True</property>
<property name="stock">gtk-go-back</property>
<property name="icon_size">1</property>
@ -1369,7 +1224,7 @@
<accelerator key="F12" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2597">
<widget class="GtkImage" id="image2632">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
@ -1404,7 +1259,7 @@
<accelerator key="f" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2598">
<widget class="GtkImage" id="image2633">
<property name="visible">True</property>
<property name="pixbuf">menu_finances.png</property>
<property name="xalign">0.5</property>
@ -1425,7 +1280,7 @@
<accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2599">
<widget class="GtkImage" id="image2634">
<property name="visible">True</property>
<property name="pixbuf">menu_stadium.png</property>
<property name="xalign">0.5</property>
@ -1468,6 +1323,162 @@
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="stats1">
<property name="visible">True</property>
<property name="label" translatable="yes">St_ats</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="stats1_menu">
<child>
<widget class="GtkMenuItem" id="menu_news">
<property name="visible">True</property>
<property name="label" translatable="yes">News</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_news_activate" last_modification_time="Sat, 06 Dec 2008 15:56:16 GMT"/>
<accelerator key="n" modifiers="0" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_league_stats">
<property name="visible">True</property>
<property name="label" translatable="yes">League stats</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_league_stats_activate" last_modification_time="Thu, 28 Apr 2005 17:31:46 GMT"/>
<accelerator key="s" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2635">
<property name="visible">True</property>
<property name="pixbuf">menu_league_stats.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_season_history">
<property name="visible">True</property>
<property name="label" translatable="yes">Season history</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_season_history_activate" last_modification_time="Sun, 02 Jan 2005 15:39:45 GMT"/>
<accelerator key="h" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2636">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_user_show_history">
<property name="visible">True</property>
<property name="label" translatable="yes">User history</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_user_show_history_activate" last_modification_time="Fri, 15 Apr 2005 15:08:24 GMT"/>
<accelerator key="h" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2637">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="memorable_matches">
<property name="visible">True</property>
<property name="label" translatable="yes">Memorable matches</property>
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image2638">
<property name="visible">True</property>
<property name="pixbuf">menu_mmatches.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
<child>
<widget class="GtkMenu" id="memorable_matches_menu">
<child>
<widget class="GtkImageMenuItem" id="mm_add_last_match">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Add last recorded match to the current memorable matches file.</property>
<property name="label" translatable="yes">Add last match</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_mm_add_last_match_activate" last_modification_time="Fri, 19 Aug 2005 10:25:28 GMT"/>
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2639">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="mm_manage_matches">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Replay, delete or add memorable matches.</property>
<property name="label" translatable="yes">Manage matches</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_mm_manage_matches_activate" last_modification_time="Fri, 19 Aug 2005 10:25:28 GMT"/>
<accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image2640">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menu_help1">
<property name="visible">True</property>
@ -1485,7 +1496,7 @@
<signal name="activate" handler="on_menu_about_activate" last_modification_time="Sun, 18 Jan 2004 15:58:22 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2600">
<widget class="GtkImage" id="image2641">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
@ -1506,7 +1517,7 @@
<signal name="activate" handler="on_menu_contributors_activate" last_modification_time="Sun, 22 May 2005 06:42:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2601">
<widget class="GtkImage" id="image2642">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@ -1527,7 +1538,7 @@
<signal name="activate" handler="on_menu_help_activate" last_modification_time="Sun, 22 May 2005 06:42:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2602">
<widget class="GtkImage" id="image2643">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>

View File

@ -20,6 +20,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_bets_delete_event" last_modification_time="Thu, 27 Oct 2005 17:10:03 GMT"/>
<child>
@ -223,6 +224,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_splash_delete_event" last_modification_time="Fri, 10 Feb 2006 14:27:35 GMT"/>
<child>
@ -1003,6 +1005,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_alr_delete_event" last_modification_time="Fri, 10 Feb 2006 14:27:35 GMT"/>
<child>
@ -1620,4 +1623,94 @@
</child>
</widget>
<widget class="GtkWindow" id="window_news">
<property name="visible">True</property>
<property name="title" translatable="yes">Bygfoot News</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_news_delete_event" last_modification_time="Sat, 06 Dec 2008 15:33:30 GMT"/>
<signal name="destroy_event" handler="on_window_news_destroy_event" last_modification_time="Sat, 06 Dec 2008 15:33:36 GMT"/>
<child>
<widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="treeview_news">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
<property name="hover_selection">False</property>
<property name="hover_expand">False</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator8">
<property name="height_request">10</property>
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_news_close">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Esc</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_news_close_clicked" last_modification_time="Sat, 06 Dec 2008 15:33:20 GMT"/>
<accelerator key="Escape" modifiers="0" signal="clicked"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface>

View File

@ -173,6 +173,7 @@ typedef struct
*bets,
*splash,
*training_camp,
*news,
*alr;
/** The position of the horizontal divider is stored here. */

View File

@ -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();
}

View File

@ -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

View File

@ -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);
}

File diff suppressed because it is too large Load Diff

View File

@ -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);
}

View File

@ -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

View File

@ -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;
}

View File

@ -5,3 +5,4 @@
GtkWidget* create_window_bets (void);
GtkWidget* create_window_splash (void);
GtkWidget* create_window_alr (void);
GtkWidget* create_window_news (void);

View File

@ -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;

View File

@ -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;

View File

@ -1,15 +1,14 @@
/*
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#include <stdio.h>
@ -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);

View File

@ -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;

View File

@ -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");

View File

@ -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);

View File

@ -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<span %s>%s</span>",
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, "<span %s>%s</span>",
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, "<span %s>%s</span>",
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, "<span %s>%s</span>",
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, "<span %s>%s</span>\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);
}

View File

@ -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

View File

@ -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)

View File

@ -55,6 +55,7 @@ enum Windows
WINDOW_SPLASH,
WINDOW_END,
WINDOW_TRAINING_CAMP,
WINDOW_NEWS,
WINDOW_ALR
};

View File

@ -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'

View File

@ -7,26 +7,20 @@
<paper_name>News Of The Sports World</paper_name>
<news_article>
<type>match</type>
<condition>_GD_ G 1</condition>
<condition>_CUP_ = 0 _GD_ G 1</condition>
<title>_TW_ [beats|crushes|kills] _TL_!</title>
<subtitle>Result: _RE_</subtitle>
<title priority="5">_TL_ loses to _TW_!</title>
<subtitle priority="5">_TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage.</subtitle>
<title>_TL_ loses to _TW_!</title>
<subtitle>_TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage.</subtitle>
<title>_TW_ wipes out _TL_!</title>
<subtitle>_RE_ is flattering for _TL_.</subtitle>
<title>_TL_ loses again!</title>
<subtitle>_TW_ just too strong.</subtitle>
<title>_TL_ in a world of misery!</title>
<subtitle>_TW_: _RE_ against _TL_.</subtitle>
<title priority="15">_LEAGUECUPNAME_: _TL_ loses to _TW_!</title>
<subtitle priority="15">_TL_ overwhelmed by _SHOTS_TWN__ shots.</subtitle>
<subtitle priority="25" condition="_MULTIPLESCORERS_ = 1">_SCORERS_TWN__ ensure victory for _TW_.</subtitle>
</news_article>
<news_article>
<type>match</type>
<condition>_CUP_ = 0</condition>
<title>_TW_ victorious!</title>
<title>_LEAGUECUPNAME_: _TL_ loses to _TW_!</title>
<subtitle>_TL_ overwhelmed by _SHOTS_TWN__ shots.</subtitle>
<subtitle condition="_MULTIPLESCORERS_ = 1">_SCORERS_TWN__ ensure victory for _TW_.</subtitle>
<subtitle>_TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_.</subtitle>
<subtitle condition="_RANK_TWN__ > _OLDRANK_TWN__">_TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_.</subtitle>
<subtitle condition="_RANK_TWN__ = 1 and _OLDRANK_TWN__ != 1">_TW_ on top after defeating _TL_ _RE_.</subtitle>

View File

@ -7,26 +7,20 @@
<paper_name>News Of The Sports World</paper_name>
<news_article>
<type>match</type>
<condition>_GD_ G 1</condition>
<condition>_CUP_ = 0 _GD_ G 1</condition>
<title>_TW_ [beats|crushes|kills] _TL_!</title>
<subtitle>Result: _RE_</subtitle>
<title priority="5">_TL_ loses to _TW_!</title>
<subtitle priority="5">_TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage.</subtitle>
<title>_TL_ loses to _TW_!</title>
<subtitle>_TL_ doesn't stand a chance against a _GOALS_TWN__ goal barrage.</subtitle>
<title>_TW_ wipes out _TL_!</title>
<subtitle>_RE_ is flattering for _TL_.</subtitle>
<title>_TL_ loses again!</title>
<subtitle>_TW_ just too strong.</subtitle>
<title>_TL_ in a world of misery!</title>
<subtitle>_TW_: _RE_ against _TL_.</subtitle>
<title priority="15">_LEAGUECUPNAME_: _TL_ loses to _TW_!</title>
<subtitle priority="15">_TL_ overwhelmed by _SHOTS_TWN__ shots.</subtitle>
<subtitle priority="25" condition="_MULTIPLESCORERS_ = 1">_SCORERS_TWN__ ensure victory for _TW_.</subtitle>
</news_article>
<news_article>
<type>match</type>
<condition>_CUP_ = 0</condition>
<title>_TW_ victorious!</title>
<title>_LEAGUECUPNAME_: _TL_ loses to _TW_!</title>
<subtitle>_TL_ overwhelmed by _SHOTS_TWN__ shots.</subtitle>
<subtitle condition="_MULTIPLESCORERS_ = 1">_SCORERS_TWN__ ensure victory for _TW_.</subtitle>
<subtitle>_TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_.</subtitle>
<subtitle condition="_RANK_TWN__ > _OLDRANK_TWN__">_TW_ moves to rank _RANK_TWN__ in _LEAGUECUPNAME_.</subtitle>
<subtitle condition="_RANK_TWN__ = 1 and _OLDRANK_TWN__ != 1">_TW_ on top after defeating _TL_ _RE_.</subtitle>