rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

"League layer"

This commit is contained in:
gyboth 2005-05-24 18:31:07 +00:00
parent f7e80d4063
commit 367feec221
32 changed files with 373 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

File diff suppressed because one or more lines are too long

66
bygfoot.glade
View File

@ -63,15 +63,15 @@
<child>
<widget class="GtkImageMenuItem" id="menu_load_last_save">
<property name="visible">True</property>
<property name="label" translatable="yes">_Load last save</property>
<property name="label" translatable="yes">L_oad last save</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_load_last_save_activate" last_modification_time="Sat, 09 Apr 2005 14:53:26 GMT"/>
<accelerator key="l" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image335">
<widget class="GtkImage" id="image353">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -137,7 +137,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image336">
<widget class="GtkImage" id="image354">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@ -291,7 +291,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">All Out Defend</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:16:56 GMT"/>
</widget>
</child>
@ -301,7 +301,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Defend</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_all_out_defend</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:17:07 GMT"/>
</widget>
@ -312,7 +312,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Balanced</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_all_out_defend</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:17:14 GMT"/>
</widget>
@ -323,7 +323,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Attack</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_all_out_defend</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:17:20 GMT"/>
</widget>
@ -358,7 +358,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Best</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:15:47 GMT"/>
</widget>
</child>
@ -368,7 +368,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Good</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_scout_best</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:15:35 GMT"/>
</widget>
@ -379,7 +379,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Average</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_scout_best</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:15:54 GMT"/>
</widget>
@ -414,7 +414,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Best</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:16:14 GMT"/>
</widget>
</child>
@ -424,7 +424,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Good</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_physio_best</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:16:21 GMT"/>
</widget>
@ -435,7 +435,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Average</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_physio_best</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Mon, 28 Feb 2005 08:16:28 GMT"/>
</widget>
@ -470,7 +470,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">On</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Tue, 08 Mar 2005 16:37:57 GMT"/>
</widget>
</child>
@ -480,7 +480,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Off</property>
<property name="use_underline">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="group">menu_boost_on</property>
<signal name="button_press_event" handler="on_menu_team_button_press_event" last_modification_time="Tue, 08 Mar 2005 16:37:48 GMT"/>
</widget>
@ -696,7 +696,7 @@
<accelerator key="F9" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image337">
<widget class="GtkImage" id="image355">
<property name="visible">True</property>
<property name="stock">gtk-go-forward</property>
<property name="icon_size">1</property>
@ -718,7 +718,7 @@
<accelerator key="F8" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image338">
<widget class="GtkImage" id="image356">
<property name="visible">True</property>
<property name="stock">gtk-go-back</property>
<property name="icon_size">1</property>
@ -740,7 +740,7 @@
<accelerator key="F12" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image339">
<widget class="GtkImage" id="image357">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
@ -802,9 +802,21 @@
<child>
<widget class="GtkImageMenuItem" id="menu_about">
<property name="visible">True</property>
<property name="label">gtk-dialog-info</property>
<property name="use_stock">True</property>
<property name="label" translatable="yes">About</property>
<property name="use_underline">True</property>
<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="image358">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</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>
@ -816,7 +828,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="image340">
<widget class="GtkImage" id="image359">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@ -837,7 +849,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="image341">
<widget class="GtkImage" id="image360">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@ -1166,7 +1178,7 @@
<child>
<widget class="GtkLabel" id="label_user">
<property name="visible">True</property>
<property name="label" translatable="yes">user</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1388,7 +1400,7 @@
<child>
<widget class="GtkLabel" id="label_team">
<property name="visible">True</property>
<property name="label" translatable="yes">Arsenal</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1418,7 +1430,7 @@
<child>
<widget class="GtkLabel" id="label_league">
<property name="visible">True</property>
<property name="label" translatable="yes">Premier Division</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1604,7 +1616,7 @@
<child>
<widget class="GtkLabel" id="label_av_skills">
<property name="visible">True</property>
<property name="label" translatable="yes">label70</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

219
bygfoot_misc.glade
View File

@ -45,7 +45,7 @@
<child>
<widget class="GtkTreeView" id="treeview_users">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Click on a player to remove him</property>
<property name="tooltip" translatable="yes">Click on a user to remove him.</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">False</property>
@ -191,80 +191,71 @@
</child>
<child>
<widget class="GtkEventBox" id="eventbox1">
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Play normal league games and cups</property>
<property name="visible_window">True</property>
<property name="above_child">False</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkHBox" id="hbox2">
<widget class="GtkRadioButton" id="team_selection_radio1">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkRadioButton" id="team_selection_radio1">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Top league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="team_selection_radio2">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Current league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">team_selection_radio1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="team_selection_radio3">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Bottom league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">team_selection_radio1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Top league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="team_selection_radio2">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Current league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">team_selection_radio1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="team_selection_radio3">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Bottom league</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">team_selection_radio1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
@ -381,7 +372,7 @@
<child>
<widget class="GtkLabel" id="label76">
<property name="visible">True</property>
<property name="label" translatable="yes">Add player</property>
<property name="label" translatable="yes">Add user</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -521,70 +512,12 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Esc</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</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_team_selection_cancel_clicked" last_modification_time="Wed, 12 May 2004 15:44:37 GMT"/>
<accelerator key="Escape" modifiers="0" signal="clicked"/>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="stock">gtk-cancel</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Cancel</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -700,7 +633,7 @@
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox68">
<widget class="GtkHBox" id="hbox70">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
@ -708,7 +641,7 @@
<child>
<widget class="GtkImage" id="image61">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -723,7 +656,7 @@
</child>
<child>
<widget class="GtkLabel" id="label108">
<widget class="GtkLabel" id="label114">
<property name="visible">True</property>
<property name="label" translatable="yes">_Resume last game</property>
<property name="use_underline">True</property>
@ -1452,7 +1385,7 @@
<widget class="GtkWindow" id="window_stadium">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@ -1483,7 +1416,7 @@
<child>
<widget class="GtkLabel" id="label106">
<property name="visible">True</property>
<property name="label" translatable="yes">Status: </property>
<property name="label" translatable="yes">Status:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1507,7 +1440,7 @@
<child>
<widget class="GtkLabel" id="label_stadium_status">
<property name="visible">True</property>
<property name="label" translatable="yes">label107</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1531,7 +1464,7 @@
<child>
<widget class="GtkLabel" id="label101">
<property name="visible">True</property>
<property name="label" translatable="yes">Current capacity:</property>
<property name="label" translatable="yes">Current capacity</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1561,7 +1494,7 @@
<child>
<widget class="GtkLabel" id="label_capacity">
<property name="visible">True</property>
<property name="label" translatable="yes">label104</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1613,7 +1546,7 @@
<child>
<widget class="GtkLabel" id="label103">
<property name="visible">True</property>
<property name="label" translatable="yes">Current safety: </property>
<property name="label" translatable="yes">Current safety</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1654,7 +1587,7 @@
<child>
<widget class="GtkLabel" id="label109">
<property name="visible">True</property>
<property name="label" translatable="yes">Average attendance </property>
<property name="label" translatable="yes">Average attendance</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1678,7 +1611,7 @@
<child>
<widget class="GtkLabel" id="label_average_attendance">
<property name="visible">True</property>
<property name="label" translatable="yes">label110</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1702,7 +1635,7 @@
<child>
<widget class="GtkLabel" id="label111">
<property name="visible">True</property>
<property name="label" translatable="yes">Average attendance % </property>
<property name="label" translatable="yes">Average attendance %</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

108
bygfoot_misc2.glade
View File

@ -29,7 +29,7 @@
<child>
<widget class="GtkLabel" id="label_text">
<property name="visible">True</property>
<property name="label" translatable="yes">label20</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -227,7 +227,7 @@
<child>
<widget class="GtkLabel" id="label_name">
<property name="visible">True</property>
<property name="label" translatable="yes">label21</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -248,7 +248,7 @@
<child>
<widget class="GtkLabel" id="label_league">
<property name="visible">True</property>
<property name="label" translatable="yes">label22</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -269,7 +269,7 @@
<child>
<widget class="GtkLabel" id="label_rank">
<property name="visible">True</property>
<property name="label" translatable="yes">label23</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -290,7 +290,7 @@
<child>
<widget class="GtkLabel" id="label_money">
<property name="visible">True</property>
<property name="label" translatable="yes">label24</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -311,7 +311,7 @@
<child>
<widget class="GtkLabel" id="label_cap">
<property name="visible">True</property>
<property name="label" translatable="yes">label25</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -332,7 +332,7 @@
<child>
<widget class="GtkLabel" id="label_saf">
<property name="visible">True</property>
<property name="label" translatable="yes">label26</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -428,7 +428,7 @@
<child>
<widget class="GtkLabel" id="label_average_skill">
<property name="visible">True</property>
<property name="label" translatable="yes">label43</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -497,7 +497,7 @@
<child>
<widget class="GtkLabel" id="label_text2">
<property name="visible">True</property>
<property name="label" translatable="yes">label27</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -602,69 +602,11 @@
<property name="border_width">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</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_offer_cancel_clicked" last_modification_time="Wed, 18 Aug 2004 13:33:15 GMT"/>
<child>
<widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-cancel</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="label" translatable="yes">Cancel</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -685,7 +627,7 @@
<widget class="GtkWindow" id="window_progress">
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_POPUP</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
@ -710,7 +652,7 @@
<widget class="GtkWindow" id="window_warning">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
@ -750,7 +692,7 @@
<child>
<widget class="GtkLabel" id="label_warning">
<property name="visible">True</property>
<property name="label" translatable="yes">label42</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -791,7 +733,7 @@
<widget class="GtkWindow" id="window_digits">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@ -813,7 +755,7 @@
<child>
<widget class="GtkLabel" id="label_main">
<property name="visible">True</property>
<property name="label" translatable="yes">label42</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -846,7 +788,7 @@
<child>
<widget class="GtkLabel" id="label_1">
<property name="visible">True</property>
<property name="label" translatable="yes">label43</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -899,7 +841,7 @@
<child>
<widget class="GtkLabel" id="label_2">
<property name="visible">True</property>
<property name="label" translatable="yes">label44</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1007,7 +949,7 @@
<widget class="GtkWindow" id="window_yesno">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@ -1046,7 +988,7 @@
<child>
<widget class="GtkLabel" id="label_yesno">
<property name="visible">True</property>
<property name="label" translatable="yes">label43</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1117,7 +1059,7 @@
<widget class="GtkWindow" id="window_contract">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
@ -1156,7 +1098,7 @@
<child>
<widget class="GtkLabel" id="label_contract">
<property name="visible">True</property>
<property name="label" translatable="yes">label43</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1472,7 +1414,7 @@
<widget class="GtkWindow" id="window_user_management">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@ -1907,7 +1849,7 @@
<widget class="GtkWindow" id="window_help">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
@ -1966,7 +1908,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">True</property>

21
bygfoot_options.glade
View File

@ -6,7 +6,7 @@
<widget class="GtkWindow" id="window_options">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@ -89,6 +89,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_save_overwrite">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether 'Save' overwrites the current save file or pops up a 'Save as' window</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Save overwrites</property>
<property name="use_underline">True</property>
@ -108,6 +109,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_maximize">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether game starts with a maximized main window (doesn't work with all window managers)</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Maximize main window</property>
<property name="use_underline">True</property>
@ -127,6 +129,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_pref_mess">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to show warnings and such in the message area in the main window when possible</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Prefer messages</property>
<property name="use_underline">True</property>
@ -195,6 +198,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_autosave">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to automatically save the game regularly</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Autosave</property>
<property name="use_underline">True</property>
@ -362,6 +366,7 @@
<child>
<widget class="GtkSpinButton" id="spinbutton_precision">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">How many digits after the comma there are for skill etc.</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@ -383,6 +388,7 @@
<child>
<widget class="GtkSpinButton" id="spinbutton_refresh">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">How often the player list gets refreshed during a live game (in live game minutes)</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@ -428,6 +434,7 @@
<child>
<widget class="GtkButton" id="button_font_name">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Font used in treeviews</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@ -506,6 +513,7 @@
<child>
<widget class="GtkEntry" id="entry_font_name">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Font used in treeviews</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@ -829,6 +837,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_auto_sub">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether the subs (e.g. for injured players) are made by the CPU. This is automatically done if the live game is off.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Automatic substitutions</property>
<property name="use_underline">True</property>
@ -874,6 +883,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_pause_injury">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether the live game pauses when a user player is injured</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Pause when injury</property>
<property name="use_underline">True</property>
@ -893,6 +903,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_pause_red">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether the live game pauses when a user player is sent off</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Pause when red card</property>
<property name="use_underline">True</property>
@ -912,6 +923,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_pause_break">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether the live game pauses at half time and extra time</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Pause when break</property>
<property name="use_underline">True</property>
@ -975,6 +987,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_show_job">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to show job offers when a user is successful</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Show job offers</property>
<property name="use_underline">True</property>
@ -1123,6 +1136,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_swap_adapts">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether swapping two players automatically adapts the team structure to the player positions</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Swap adapts structure</property>
<property name="use_underline">True</property>
@ -1142,6 +1156,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_show_overall">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to show the player games/goals value in all competitions</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Show overall games/goals</property>
<property name="use_underline">True</property>
@ -1490,7 +1505,7 @@
<child>
<widget class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="label" translatable="yes">Etal </property>
<property name="label" translatable="yes">ETal </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -2603,6 +2618,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_save_global">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to save the global settings to file (so that they get loaded next time you start a new game)</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Save global settings to file</property>
<property name="use_underline">True</property>
@ -2623,6 +2639,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_save_user">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to save the user settings to file (so that they get loaded next time this user starts a new game)</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Save user settings to file</property>
<property name="use_underline">True</property>

5
src/cup.c
View File

@ -223,6 +223,7 @@ void
cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct)
{
gint i, j, start, end;
gint debug_num = teams->len;
gint number_of_teams = 0;
GPtrArray *cup_teams_sorted = NULL;
League *league = NULL;
@ -355,6 +356,10 @@ cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct)
}
}
}
if(debug > 80)
for(i=debug_num;i<teams->len;i++)
printf("%d %s \n", i, ((Team*)g_ptr_array_index(teams, i))->name->str);
}
/** Load the teams specified in the chooseteam from a non-country league. */

16
src/fixture.c
View File

@ -479,7 +479,7 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
gint i, len = teams->len;
gint first_week = cup_get_first_week_of_cup_round(cup, cup_round);
CupRound *round = &g_array_index(cup->rounds, CupRound, cup_round);
gint bye_len = math_get_bye_len(teams->len);
gint bye_len = math_get_bye_len(len);
teams = misc_randomise_g_pointer_array(teams);
@ -487,19 +487,25 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
{
cup->bye = g_ptr_array_new();
fixture_sort_teams_bye(teams, bye_len);
g_ptr_array_sort_with_data(teams, team_compare_func, GINT_TO_POINTER(TEAM_COMPARE_LEAGUE_LAYER));
for(i=0;i<bye_len;i++)
g_ptr_array_add(cup->bye, g_ptr_array_index(teams, len - bye_len + i));
{
g_ptr_array_add(cup->bye, g_ptr_array_index(teams, 0));
g_ptr_array_remove_index(teams, 0);
}
teams = misc_randomise_g_pointer_array(teams);
}
for(i=0; i<(len - bye_len) / 2; i++)
for(i=0; i<teams->len / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, i),
(Team*)g_ptr_array_index(teams, i + (len - bye_len) / 2), first_week,
fixture_get_free_round(first_week, cup->id), cup->id, cup_round, 0,
!round->neutral, FALSE, (!round->home_away && round->replay == 0));
if(round->home_away)
for(i=0; i<(len - bye_len) / 2; i++)
for(i=0; i<teams->len / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, i + (len - bye_len) / 2),
(Team*)g_ptr_array_index(teams, i), first_week + cup->week_gap,
fixture_get_free_round(first_week + cup->week_gap, cup->id), cup->id,

35
src/game_gui.c
View File

@ -461,9 +461,13 @@ game_gui_set_main_window_sensitivity(gboolean value)
void
game_gui_show_warning(gchar *text)
{
window_create(WINDOW_WARNING);
gtk_label_set_text(GTK_LABEL(lookup_widget(window.warning, "label_warning")), text);
if(opt_int("int_opt_prefer_messages"))
game_gui_print_message(text);
else
{
window_create(WINDOW_WARNING);
gtk_label_set_text(GTK_LABEL(lookup_widget(window.warning, "label_warning")), text);
}
}
/** Show the job offer window.
@ -579,28 +583,19 @@ game_gui_read_check_items(GtkWidget *widget)
/** Set the appropriate text into the labels in the help window.
@param help_list The stuff loaded from the bygfoot_help file. */
void
game_gui_set_help_labels(const OptionList *help_list)
game_gui_set_help_labels(void)
{
gint i;
GtkLabel *label_help_text1 = GTK_LABEL(lookup_widget(window.help, "label_help_text1")),
*label_help_text2 = GTK_LABEL(lookup_widget(window.help, "label_help_text2"));
GString *text = g_string_new("");
for(i=0;i<help_list->list->len;i++)
{
if(g_str_has_prefix(g_array_index(help_list->list, Option, i).name->str,
"string_help_text1"))
gtk_label_set_text(label_help_text1,
g_array_index(help_list->list, Option, i).string_value->str);
else if(g_str_has_prefix(g_array_index(help_list->list, Option, i).name->str,
"string_help_desc"))
g_string_append_printf(text, "\n%s\n",
g_array_index(help_list->list, Option, i).string_value->str);
else if(g_str_has_prefix(g_array_index(help_list->list, Option, i).name->str,
"string_help_url"))
g_string_append_printf(text, "%s\n",
g_array_index(help_list->list, Option, i).string_value->str);
}
gtk_label_set_text(label_help_text1,
_("Bygfoot is a very intuitive and simple game, so there isn't a full-grown documentation. However, if you have trouble, there are a few places to go.\n"));
g_string_append_printf(text, _("At the Bygfoot forums you can report bugs, ask for help and discuss the game (you don't have to register):\n"));
g_string_append_printf(text, "http://bygfoot.sourceforge.net/forum\n");
g_string_append_printf(text, _("\nIf you feel you've found out something about the game that has to be shared, you can add it to the Bygfoot Wiki:\n"));
g_string_append_printf(text, "http://mec-symonds.eng.monash.edu.au/cgi-bin/twiki/view/Bygfoot/WebHome");
gtk_label_set_text(label_help_text2, text->str);
g_string_free(text, TRUE);

2
src/game_gui.h
View File

@ -59,6 +59,6 @@ void
game_gui_read_check_items(GtkWidget *widget);
void
game_gui_set_help_labels(const OptionList *help_list);
game_gui_set_help_labels(void);
#endif

100
src/interface.c
View File

@ -38,7 +38,7 @@ create_main_window (void)
GtkWidget *menu_new;
GtkWidget *menu_open;
GtkWidget *menu_load_last_save;
GtkWidget *image335;
GtkWidget *image353;
GtkWidget *menu_save;
GtkWidget *menu_save_as;
GtkWidget *trennlinie1;
@ -46,7 +46,7 @@ create_main_window (void)
GtkWidget *menu_options;
GtkWidget *menu_options_menu;
GtkWidget *menu_preferences;
GtkWidget *image336;
GtkWidget *image354;
GtkWidget *trennlinie7;
GtkWidget *menu_job_offers;
GtkWidget *menu_live_game;
@ -114,11 +114,11 @@ create_main_window (void)
GtkWidget *menu_user_show_history;
GtkWidget *trennlinie9;
GtkWidget *menu_next_user;
GtkWidget *image337;
GtkWidget *image355;
GtkWidget *menu_previous_user;
GtkWidget *image338;
GtkWidget *image356;
GtkWidget *menu_manage_users;
GtkWidget *image339;
GtkWidget *image357;
GtkWidget *menu_finances_stadium;
GtkWidget *menu_finances_stadium_menu;
GtkWidget *menu_show_finances;
@ -126,10 +126,11 @@ create_main_window (void)
GtkWidget *menu_help1;
GtkWidget *menu_help1_menu;
GtkWidget *menu_about;
GtkWidget *image358;
GtkWidget *menu_contributors;
GtkWidget *image340;
GtkWidget *image359;
GtkWidget *menu_help;
GtkWidget *image341;
GtkWidget *image360;
GtkWidget *hbox1;
GtkWidget *button_load;
GtkWidget *image11;
@ -245,16 +246,16 @@ create_main_window (void)
gtk_widget_show (menu_open);
gtk_container_add (GTK_CONTAINER (menu_file_menu), menu_open);
menu_load_last_save = gtk_image_menu_item_new_with_mnemonic (_("_Load last save"));
menu_load_last_save = gtk_image_menu_item_new_with_mnemonic (_("L_oad last save"));
gtk_widget_show (menu_load_last_save);
gtk_container_add (GTK_CONTAINER (menu_file_menu), menu_load_last_save);
gtk_widget_add_accelerator (menu_load_last_save, "activate", accel_group,
GDK_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
GTK_ACCEL_VISIBLE);
image335 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
gtk_widget_show (image335);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image335);
image353 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
gtk_widget_show (image353);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image353);
menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group);
gtk_widget_show (menu_save);
@ -287,9 +288,9 @@ create_main_window (void)
GDK_p, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image336 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image336);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image336);
image354 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image354);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image354);
trennlinie7 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie7);
@ -379,21 +380,25 @@ create_main_window (void)
menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_all_out_defend));
gtk_widget_show (menu_all_out_defend);
gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_all_out_defend);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_all_out_defend), TRUE);
menu_defend = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("Defend"));
menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_defend));
gtk_widget_show (menu_defend);
gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_defend);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_defend), TRUE);
menu_balanced = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("Balanced"));
menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_balanced));
gtk_widget_show (menu_balanced);
gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_balanced);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_balanced), TRUE);
menu_attack = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("Attack"));
menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_attack));
gtk_widget_show (menu_attack);
gtk_container_add (GTK_CONTAINER (menu_playing_style_menu), menu_attack);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_attack), TRUE);
menu_all_out_attack = gtk_radio_menu_item_new_with_mnemonic (menu_all_out_defend_group, _("All Out Attack"));
menu_all_out_defend_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_all_out_attack));
@ -412,16 +417,19 @@ create_main_window (void)
menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_best));
gtk_widget_show (menu_scout_best);
gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_best);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_best), TRUE);
menu_scout_good = gtk_radio_menu_item_new_with_mnemonic (menu_scout_best_group, _("Good"));
menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_good));
gtk_widget_show (menu_scout_good);
gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_good);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_good), TRUE);
menu_scout_average = gtk_radio_menu_item_new_with_mnemonic (menu_scout_best_group, _("Average"));
menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_average));
gtk_widget_show (menu_scout_average);
gtk_container_add (GTK_CONTAINER (menu_scout_menu), menu_scout_average);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_scout_average), TRUE);
menu_scout_bad = gtk_radio_menu_item_new_with_mnemonic (menu_scout_best_group, _("Bad"));
menu_scout_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_scout_bad));
@ -440,16 +448,19 @@ create_main_window (void)
menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_best));
gtk_widget_show (menu_physio_best);
gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_best);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_best), TRUE);
menu_physio_good = gtk_radio_menu_item_new_with_mnemonic (menu_physio_best_group, _("Good"));
menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_good));
gtk_widget_show (menu_physio_good);
gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_good);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_good), TRUE);
menu_physio_average = gtk_radio_menu_item_new_with_mnemonic (menu_physio_best_group, _("Average"));
menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_average));
gtk_widget_show (menu_physio_average);
gtk_container_add (GTK_CONTAINER (menu_physio_menu), menu_physio_average);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_physio_average), TRUE);
menu_physio_bad = gtk_radio_menu_item_new_with_mnemonic (menu_physio_best_group, _("Bad"));
menu_physio_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_physio_bad));
@ -468,11 +479,13 @@ create_main_window (void)
menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_on));
gtk_widget_show (menu_boost_on);
gtk_container_add (GTK_CONTAINER (menu_boost_menu), menu_boost_on);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_boost_on), TRUE);
menu_boost_off = gtk_radio_menu_item_new_with_mnemonic (menu_boost_on_group, _("Off"));
menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_off));
gtk_widget_show (menu_boost_off);
gtk_container_add (GTK_CONTAINER (menu_boost_menu), menu_boost_off);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_boost_off), TRUE);
menu_boost_anti = gtk_radio_menu_item_new_with_mnemonic (menu_boost_on_group, _("Anti"));
menu_boost_on_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_boost_anti));
@ -592,9 +605,9 @@ create_main_window (void)
GDK_F9, 0,
GTK_ACCEL_VISIBLE);
image337 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU);
gtk_widget_show (image337);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image337);
image355 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU);
gtk_widget_show (image355);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image355);
menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user"));
gtk_widget_show (menu_previous_user);
@ -603,9 +616,9 @@ create_main_window (void)
GDK_F8, 0,
GTK_ACCEL_VISIBLE);
image338 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
gtk_widget_show (image338);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image338);
image356 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
gtk_widget_show (image356);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image356);
menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users"));
gtk_widget_show (menu_manage_users);
@ -614,9 +627,9 @@ create_main_window (void)
GDK_F12, 0,
GTK_ACCEL_VISIBLE);
image339 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
gtk_widget_show (image339);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image339);
image357 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
gtk_widget_show (image357);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image357);
menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad"));
gtk_widget_show (menu_finances_stadium);
@ -646,25 +659,29 @@ create_main_window (void)
menu_help1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_help1), menu_help1_menu);
menu_about = gtk_image_menu_item_new_from_stock ("gtk-dialog-info", accel_group);
menu_about = gtk_image_menu_item_new_with_mnemonic (_("About"));
gtk_widget_show (menu_about);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about);
image358 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
gtk_widget_show (image358);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image358);
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);
image340 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image340);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image340);
image359 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image359);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image359);
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);
image341 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
gtk_widget_show (image341);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image341);
image360 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
gtk_widget_show (image360);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image360);
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
@ -785,7 +802,7 @@ create_main_window (void)
gtk_widget_show (hbox18);
gtk_container_add (GTK_CONTAINER (eventbox_main_info), hbox18);
label_user = gtk_label_new (_("user"));
label_user = gtk_label_new ("");
gtk_widget_show (label_user);
gtk_box_pack_start (GTK_BOX (hbox18), label_user, FALSE, FALSE, 0);
@ -848,12 +865,12 @@ create_main_window (void)
gtk_widget_show (eventbox_team_name);
gtk_box_pack_start (GTK_BOX (hbox48), eventbox_team_name, FALSE, FALSE, 0);
label_team = gtk_label_new (_("Arsenal"));
label_team = gtk_label_new ("");
gtk_widget_show (label_team);
gtk_container_add (GTK_CONTAINER (eventbox_team_name), label_team);
gtk_misc_set_padding (GTK_MISC (label_team), 5, 0);
label_league = gtk_label_new (_("Premier Division"));
label_league = gtk_label_new ("");
gtk_widget_show (label_league);
gtk_box_pack_start (GTK_BOX (hbox18), label_league, FALSE, FALSE, 0);
gtk_misc_set_padding (GTK_MISC (label_league), 5, 0);
@ -907,7 +924,7 @@ create_main_window (void)
gtk_widget_show (label69);
gtk_box_pack_start (GTK_BOX (hbox50), label69, FALSE, FALSE, 0);
label_av_skills = gtk_label_new (_("label70"));
label_av_skills = gtk_label_new ("");
gtk_widget_show (label_av_skills);
gtk_box_pack_start (GTK_BOX (hbox50), label_av_skills, FALSE, FALSE, 0);
gtk_misc_set_padding (GTK_MISC (label_av_skills), 5, 0);
@ -1269,7 +1286,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, image335, "image335");
GLADE_HOOKUP_OBJECT (main_window, image353, "image353");
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");
@ -1277,7 +1294,7 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options");
GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences");
GLADE_HOOKUP_OBJECT (main_window, image336, "image336");
GLADE_HOOKUP_OBJECT (main_window, image354, "image354");
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");
@ -1341,11 +1358,11 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history");
GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9");
GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user");
GLADE_HOOKUP_OBJECT (main_window, image337, "image337");
GLADE_HOOKUP_OBJECT (main_window, image355, "image355");
GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user");
GLADE_HOOKUP_OBJECT (main_window, image338, "image338");
GLADE_HOOKUP_OBJECT (main_window, image356, "image356");
GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users");
GLADE_HOOKUP_OBJECT (main_window, image339, "image339");
GLADE_HOOKUP_OBJECT (main_window, image357, "image357");
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");
@ -1353,10 +1370,11 @@ create_main_window (void)
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, image358, "image358");
GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors");
GLADE_HOOKUP_OBJECT (main_window, image340, "image340");
GLADE_HOOKUP_OBJECT (main_window, image359, "image359");
GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help");
GLADE_HOOKUP_OBJECT (main_window, image341, "image341");
GLADE_HOOKUP_OBJECT (main_window, image360, "image360");
GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1");
GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load");
GLADE_HOOKUP_OBJECT (main_window, image11, "image11");

1
src/league.c
View File

@ -26,6 +26,7 @@ league_new(gboolean new_id)
new.symbol = g_string_new("");
new.id = (new_id) ? league_id_new : -1;
new.layer = -1;
new.average_skill = 7000;

3
src/league_struct.h
View File

@ -65,6 +65,9 @@ typedef struct
PromRel prom_rel;
/** Numerical id, as opposed to the string id 'sid'. */
gint id;
/** Layer of the league; this specifies which leagues are
parallel. */
gint layer;
/** The first week games are played. Default 1. */
gint first_week;
/** Weeks between two matchdays. Default 1. */

4
src/lg_commentary.c
View File

@ -236,8 +236,8 @@ lg_commentary_get_commentaries(gint event_type)
g_ptr_array_add(commentaries, g_string_new(_("P1 drives free kick low and hard")));
g_ptr_array_add(commentaries, g_string_new(_("P1 takes free-kick quickly and curls around wall")));
g_ptr_array_add(commentaries, g_string_new(_("P1 curls the free kick over the wall")));
g_ptr_array_add(commentaries, g_string_new(_("P1 plays the ball out wide")));
g_ptr_array_add(commentaries, g_string_new(_("P1 hits a long ball up the pitch")));
g_ptr_array_add(commentaries, g_string_new(_("Free kick: P1 plays the ball out wide")));
g_ptr_array_add(commentaries, g_string_new(_("Free kick: P1 hits a long ball up the pitch")));
g_ptr_array_add(commentaries, g_string_new(_("Free kick whipped across the face of goal by P1")));
break;
case LIVE_GAME_EVENT_FOUL:

64
src/misc2_interface.c
View File

@ -65,10 +65,6 @@ create_window_job_offer (void)
GtkWidget *image5;
GtkWidget *label31;
GtkWidget *button_cancel;
GtkWidget *alignment4;
GtkWidget *hbox8;
GtkWidget *image4;
GtkWidget *label30;
window_job_offer = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_job_offer), 6);
@ -80,7 +76,7 @@ create_window_job_offer (void)
gtk_widget_show (vbox5);
gtk_container_add (GTK_CONTAINER (window_job_offer), vbox5);
label_text = gtk_label_new (_("label20"));
label_text = gtk_label_new ("");
gtk_widget_show (label_text);
gtk_box_pack_start (GTK_BOX (vbox5), label_text, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_text), TRUE);
@ -137,27 +133,27 @@ create_window_job_offer (void)
gtk_widget_show (vbox7);
gtk_box_pack_start (GTK_BOX (hbox5), vbox7, TRUE, TRUE, 0);
label_name = gtk_label_new (_("label21"));
label_name = gtk_label_new ("");
gtk_widget_show (label_name);
gtk_box_pack_start (GTK_BOX (vbox7), label_name, FALSE, FALSE, 0);
label_league = gtk_label_new (_("label22"));
label_league = gtk_label_new ("");
gtk_widget_show (label_league);
gtk_box_pack_start (GTK_BOX (vbox7), label_league, FALSE, FALSE, 0);
label_rank = gtk_label_new (_("label23"));
label_rank = gtk_label_new ("");
gtk_widget_show (label_rank);
gtk_box_pack_start (GTK_BOX (vbox7), label_rank, FALSE, FALSE, 0);
label_money = gtk_label_new (_("label24"));
label_money = gtk_label_new ("");
gtk_widget_show (label_money);
gtk_box_pack_start (GTK_BOX (vbox7), label_money, FALSE, FALSE, 0);
label_cap = gtk_label_new (_("label25"));
label_cap = gtk_label_new ("");
gtk_widget_show (label_cap);
gtk_box_pack_start (GTK_BOX (vbox7), label_cap, FALSE, FALSE, 0);
label_saf = gtk_label_new (_("label26"));
label_saf = gtk_label_new ("");
gtk_widget_show (label_saf);
gtk_box_pack_start (GTK_BOX (vbox7), label_saf, FALSE, FALSE, 0);
@ -178,7 +174,7 @@ create_window_job_offer (void)
gtk_widget_show (label42);
gtk_box_pack_start (GTK_BOX (hbox17), label42, FALSE, FALSE, 0);
label_average_skill = gtk_label_new (_("label43"));
label_average_skill = gtk_label_new ("");
gtk_widget_show (label_average_skill);
gtk_box_pack_start (GTK_BOX (hbox17), label_average_skill, FALSE, FALSE, 0);
@ -196,7 +192,7 @@ create_window_job_offer (void)
gtk_box_pack_start (GTK_BOX (vbox5), hseparator7, FALSE, TRUE, 0);
gtk_widget_set_size_request (hseparator7, 1, 10);
label_text2 = gtk_label_new (_("label27"));
label_text2 = gtk_label_new ("");
gtk_widget_show (label_text2);
gtk_box_pack_start (GTK_BOX (vbox5), label_text2, FALSE, FALSE, 0);
gtk_misc_set_padding (GTK_MISC (label_text2), 0, 5);
@ -226,27 +222,11 @@ create_window_job_offer (void)
gtk_widget_show (label31);
gtk_box_pack_start (GTK_BOX (hbox9), label31, FALSE, FALSE, 0);
button_cancel = gtk_button_new ();
button_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (button_cancel);
gtk_box_pack_start (GTK_BOX (hbox6), button_cancel, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (button_cancel), 2);
alignment4 = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_widget_show (alignment4);
gtk_container_add (GTK_CONTAINER (button_cancel), alignment4);
hbox8 = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox8);
gtk_container_add (GTK_CONTAINER (alignment4), hbox8);
image4 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (image4);
gtk_box_pack_start (GTK_BOX (hbox8), image4, FALSE, FALSE, 0);
label30 = gtk_label_new_with_mnemonic (_("Cancel"));
gtk_widget_show (label30);
gtk_box_pack_start (GTK_BOX (hbox8), label30, FALSE, FALSE, 0);
g_signal_connect ((gpointer) window_job_offer, "delete_event",
G_CALLBACK (on_window_job_offer_delete_event),
NULL);
@ -294,10 +274,6 @@ create_window_job_offer (void)
GLADE_HOOKUP_OBJECT (window_job_offer, image5, "image5");
GLADE_HOOKUP_OBJECT (window_job_offer, label31, "label31");
GLADE_HOOKUP_OBJECT (window_job_offer, button_cancel, "button_cancel");
GLADE_HOOKUP_OBJECT (window_job_offer, alignment4, "alignment4");
GLADE_HOOKUP_OBJECT (window_job_offer, hbox8, "hbox8");
GLADE_HOOKUP_OBJECT (window_job_offer, image4, "image4");
GLADE_HOOKUP_OBJECT (window_job_offer, label30, "label30");
return window_job_offer;
}
@ -309,7 +285,6 @@ create_window_progress (void)
GtkWidget *progressbar;
window_progress = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_title (GTK_WINDOW (window_progress), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_progress), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window_progress), TRUE);
@ -335,7 +310,6 @@ create_window_warning (void)
window_warning = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_warning), 10);
gtk_window_set_title (GTK_WINDOW (window_warning), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_warning), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window_warning), TRUE);
@ -347,7 +321,7 @@ create_window_warning (void)
gtk_widget_show (image7);
gtk_box_pack_start (GTK_BOX (vbox13), image7, FALSE, TRUE, 0);
label_warning = gtk_label_new (_("label42"));
label_warning = gtk_label_new ("");
gtk_widget_show (label_warning);
gtk_box_pack_start (GTK_BOX (vbox13), label_warning, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_warning), TRUE);
@ -403,14 +377,13 @@ create_window_digits (void)
window_digits = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_digits), 5);
gtk_window_set_title (GTK_WINDOW (window_digits), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_digits), GTK_WIN_POS_CENTER);
vbox14 = gtk_vbox_new (FALSE, 10);
gtk_widget_show (vbox14);
gtk_container_add (GTK_CONTAINER (window_digits), vbox14);
label_main = gtk_label_new (_("label42"));
label_main = gtk_label_new ("");
gtk_widget_show (label_main);
gtk_box_pack_start (GTK_BOX (vbox14), label_main, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_main), TRUE);
@ -423,7 +396,7 @@ create_window_digits (void)
gtk_widget_show (vbox15);
gtk_box_pack_start (GTK_BOX (hbox15), vbox15, TRUE, TRUE, 0);
label_1 = gtk_label_new (_("label43"));
label_1 = gtk_label_new ("");
gtk_widget_show (label_1);
gtk_box_pack_start (GTK_BOX (vbox15), label_1, FALSE, FALSE, 0);
@ -437,7 +410,7 @@ create_window_digits (void)
gtk_widget_show (vbox16);
gtk_box_pack_start (GTK_BOX (hbox15), vbox16, TRUE, TRUE, 0);
label_2 = gtk_label_new (_("label44"));
label_2 = gtk_label_new ("");
gtk_widget_show (label_2);
gtk_box_pack_start (GTK_BOX (vbox16), label_2, FALSE, FALSE, 0);
@ -511,7 +484,6 @@ create_window_yesno (void)
window_yesno = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_yesno), 5);
gtk_window_set_title (GTK_WINDOW (window_yesno), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_yesno), GTK_WIN_POS_CENTER);
vbox17 = gtk_vbox_new (FALSE, 5);
@ -522,7 +494,7 @@ create_window_yesno (void)
gtk_widget_show (image8);
gtk_box_pack_start (GTK_BOX (vbox17), image8, FALSE, FALSE, 0);
label_yesno = gtk_label_new (_("label43"));
label_yesno = gtk_label_new ("");
gtk_widget_show (label_yesno);
gtk_box_pack_start (GTK_BOX (vbox17), label_yesno, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_yesno), TRUE);
@ -592,7 +564,6 @@ create_window_contract (void)
window_contract = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_contract), 5);
gtk_window_set_title (GTK_WINDOW (window_contract), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_contract), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window_contract), TRUE);
@ -604,7 +575,7 @@ create_window_contract (void)
gtk_widget_show (image9);
gtk_box_pack_start (GTK_BOX (vbox18), image9, FALSE, FALSE, 0);
label_contract = gtk_label_new (_("label43"));
label_contract = gtk_label_new ("");
gtk_widget_show (label_contract);
gtk_box_pack_start (GTK_BOX (vbox18), label_contract, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_contract), TRUE);
@ -768,7 +739,6 @@ create_window_user_management (void)
window_user_management = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_user_management), 5);
gtk_window_set_title (GTK_WINDOW (window_user_management), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_user_management), GTK_WIN_POS_CENTER);
gtk_window_set_default_size (GTK_WINDOW (window_user_management), 600, 550);
@ -1008,7 +978,6 @@ create_window_help (void)
window_help = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_help), 5);
gtk_window_set_title (GTK_WINDOW (window_help), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_help), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window_help), TRUE);
gtk_window_set_default_size (GTK_WINDOW (window_help), 400, 400);
@ -1036,6 +1005,7 @@ create_window_help (void)
gtk_widget_show (label_about);
gtk_box_pack_start (GTK_BOX (vbox24), label_about, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS (label_about, GTK_CAN_FOCUS);
gtk_label_set_use_markup (GTK_LABEL (label_about), TRUE);
gtk_label_set_justify (GTK_LABEL (label_about), GTK_JUSTIFY_CENTER);
gtk_label_set_selectable (GTK_LABEL (label_about), TRUE);

80
src/misc_interface.c
View File

@ -42,7 +42,6 @@ create_window_startup (void)
GtkWidget *combo_country;
GtkWidget *hseparator11;
GtkWidget *label4;
GtkWidget *eventbox1;
GtkWidget *hbox2;
GtkWidget *team_selection_radio1;
GSList *team_selection_radio1_group = NULL;
@ -65,10 +64,6 @@ create_window_startup (void)
GtkWidget *image58;
GtkWidget *label74;
GtkWidget *team_selection_cancel;
GtkWidget *alignment2;
GtkWidget *hbox5;
GtkWidget *image3;
GtkWidget *label2;
GtkWidget *team_selection_load;
GtkWidget *alignment3;
GtkWidget *hbox6;
@ -76,9 +71,9 @@ create_window_startup (void)
GtkWidget *label5;
GtkWidget *button_startup_resume;
GtkWidget *alignment21;
GtkWidget *hbox68;
GtkWidget *hbox70;
GtkWidget *image61;
GtkWidget *label108;
GtkWidget *label114;
GtkAccelGroup *accel_group;
GtkTooltips *tooltips;
@ -109,7 +104,7 @@ create_window_startup (void)
treeview_users = gtk_tree_view_new ();
gtk_widget_show (treeview_users);
gtk_container_add (GTK_CONTAINER (scrolledwindow10), treeview_users);
gtk_tooltips_set_tip (tooltips, treeview_users, _("Click on a player to remove him"), NULL);
gtk_tooltips_set_tip (tooltips, treeview_users, _("Click on a user to remove him."), NULL);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwindow1);
@ -152,14 +147,9 @@ create_window_startup (void)
gtk_box_pack_start (GTK_BOX (vbox2), label4, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label4), 0.05, 0.5);
eventbox1 = gtk_event_box_new ();
gtk_widget_show (eventbox1);
gtk_box_pack_start (GTK_BOX (vbox2), eventbox1, FALSE, TRUE, 5);
gtk_tooltips_set_tip (tooltips, eventbox1, _("Play normal league games and cups"), NULL);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox2);
gtk_container_add (GTK_CONTAINER (eventbox1), hbox2);
gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 5);
team_selection_radio1 = gtk_radio_button_new_with_mnemonic (NULL, _("Top league"));
gtk_widget_show (team_selection_radio1);
@ -218,7 +208,7 @@ create_window_startup (void)
gtk_widget_show (image59);
gtk_box_pack_start (GTK_BOX (hbox55), image59, FALSE, FALSE, 0);
label76 = gtk_label_new_with_mnemonic (_("Add player"));
label76 = gtk_label_new_with_mnemonic (_("Add user"));
gtk_widget_show (label76);
gtk_box_pack_start (GTK_BOX (hbox55), label76, FALSE, FALSE, 0);
@ -257,7 +247,7 @@ create_window_startup (void)
gtk_widget_show (label74);
gtk_box_pack_start (GTK_BOX (hbox53), label74, FALSE, FALSE, 0);
team_selection_cancel = gtk_button_new ();
team_selection_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (team_selection_cancel);
gtk_box_pack_start (GTK_BOX (hbox3), team_selection_cancel, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (team_selection_cancel), 2);
@ -266,22 +256,6 @@ create_window_startup (void)
GDK_Escape, 0,
GTK_ACCEL_VISIBLE);
alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_widget_show (alignment2);
gtk_container_add (GTK_CONTAINER (team_selection_cancel), alignment2);
hbox5 = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox5);
gtk_container_add (GTK_CONTAINER (alignment2), hbox5);
image3 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (image3);
gtk_box_pack_start (GTK_BOX (hbox5), image3, FALSE, FALSE, 0);
label2 = gtk_label_new_with_mnemonic (_("Cancel"));
gtk_widget_show (label2);
gtk_box_pack_start (GTK_BOX (hbox5), label2, FALSE, FALSE, 0);
team_selection_load = gtk_button_new ();
gtk_widget_show (team_selection_load);
gtk_box_pack_start (GTK_BOX (hbox3), team_selection_load, TRUE, TRUE, 0);
@ -316,17 +290,17 @@ create_window_startup (void)
gtk_widget_show (alignment21);
gtk_container_add (GTK_CONTAINER (button_startup_resume), alignment21);
hbox68 = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox68);
gtk_container_add (GTK_CONTAINER (alignment21), hbox68);
hbox70 = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox70);
gtk_container_add (GTK_CONTAINER (alignment21), hbox70);
image61 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_BUTTON);
image61 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (image61);
gtk_box_pack_start (GTK_BOX (hbox68), image61, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox70), image61, FALSE, FALSE, 0);
label108 = gtk_label_new_with_mnemonic (_("_Resume last game"));
gtk_widget_show (label108);
gtk_box_pack_start (GTK_BOX (hbox68), label108, FALSE, FALSE, 0);
label114 = gtk_label_new_with_mnemonic (_("_Resume last game"));
gtk_widget_show (label114);
gtk_box_pack_start (GTK_BOX (hbox70), label114, FALSE, FALSE, 0);
g_signal_connect ((gpointer) window_startup, "delete_event",
G_CALLBACK (on_team_selection_cancel_clicked),
@ -373,7 +347,6 @@ create_window_startup (void)
GLADE_HOOKUP_OBJECT (window_startup, combo_country, "combo_country");
GLADE_HOOKUP_OBJECT (window_startup, hseparator11, "hseparator11");
GLADE_HOOKUP_OBJECT (window_startup, label4, "label4");
GLADE_HOOKUP_OBJECT (window_startup, eventbox1, "eventbox1");
GLADE_HOOKUP_OBJECT (window_startup, hbox2, "hbox2");
GLADE_HOOKUP_OBJECT (window_startup, team_selection_radio1, "team_selection_radio1");
GLADE_HOOKUP_OBJECT (window_startup, team_selection_radio2, "team_selection_radio2");
@ -395,10 +368,6 @@ create_window_startup (void)
GLADE_HOOKUP_OBJECT (window_startup, image58, "image58");
GLADE_HOOKUP_OBJECT (window_startup, label74, "label74");
GLADE_HOOKUP_OBJECT (window_startup, team_selection_cancel, "team_selection_cancel");
GLADE_HOOKUP_OBJECT (window_startup, alignment2, "alignment2");
GLADE_HOOKUP_OBJECT (window_startup, hbox5, "hbox5");
GLADE_HOOKUP_OBJECT (window_startup, image3, "image3");
GLADE_HOOKUP_OBJECT (window_startup, label2, "label2");
GLADE_HOOKUP_OBJECT (window_startup, team_selection_load, "team_selection_load");
GLADE_HOOKUP_OBJECT (window_startup, alignment3, "alignment3");
GLADE_HOOKUP_OBJECT (window_startup, hbox6, "hbox6");
@ -406,9 +375,9 @@ create_window_startup (void)
GLADE_HOOKUP_OBJECT (window_startup, label5, "label5");
GLADE_HOOKUP_OBJECT (window_startup, button_startup_resume, "button_startup_resume");
GLADE_HOOKUP_OBJECT (window_startup, alignment21, "alignment21");
GLADE_HOOKUP_OBJECT (window_startup, hbox68, "hbox68");
GLADE_HOOKUP_OBJECT (window_startup, hbox70, "hbox70");
GLADE_HOOKUP_OBJECT (window_startup, image61, "image61");
GLADE_HOOKUP_OBJECT (window_startup, label108, "label108");
GLADE_HOOKUP_OBJECT (window_startup, label114, "label114");
GLADE_HOOKUP_OBJECT_NO_REF (window_startup, tooltips, "tooltips");
gtk_widget_grab_focus (treeview_startup);
@ -881,7 +850,6 @@ create_window_stadium (void)
window_stadium = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_stadium), 5);
gtk_window_set_title (GTK_WINDOW (window_stadium), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_stadium), GTK_WIN_POS_CENTER);
vbox39 = gtk_vbox_new (FALSE, 5);
@ -894,21 +862,21 @@ create_window_stadium (void)
gtk_table_set_row_spacings (GTK_TABLE (table1), 3);
gtk_table_set_col_spacings (GTK_TABLE (table1), 3);
label106 = gtk_label_new (_("Status: "));
label106 = gtk_label_new (_("Status:"));
gtk_widget_show (label106);
gtk_table_attach (GTK_TABLE (table1), label106, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label106), 0, 0.5);
label_stadium_status = gtk_label_new (_("label107"));
label_stadium_status = gtk_label_new ("");
gtk_widget_show (label_stadium_status);
gtk_table_attach (GTK_TABLE (table1), label_stadium_status, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label_stadium_status), 0, 0.5);
label101 = gtk_label_new (_("Current capacity:"));
label101 = gtk_label_new (_("Current capacity"));
gtk_widget_show (label101);
gtk_table_attach (GTK_TABLE (table1), label101, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
@ -921,7 +889,7 @@ create_window_stadium (void)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
label_capacity = gtk_label_new (_("label104"));
label_capacity = gtk_label_new ("");
gtk_widget_show (label_capacity);
gtk_box_pack_start (GTK_BOX (hbox69), label_capacity, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label_capacity), 0, 0.5);
@ -930,7 +898,7 @@ create_window_stadium (void)
gtk_widget_show (label102);
gtk_box_pack_start (GTK_BOX (hbox69), label102, FALSE, FALSE, 0);
label103 = gtk_label_new (_("Current safety: "));
label103 = gtk_label_new (_("Current safety"));
gtk_widget_show (label103);
gtk_table_attach (GTK_TABLE (table1), label103, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
@ -943,21 +911,21 @@ create_window_stadium (void)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
label109 = gtk_label_new (_("Average attendance "));
label109 = gtk_label_new (_("Average attendance"));
gtk_widget_show (label109);
gtk_table_attach (GTK_TABLE (table1), label109, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label109), 0, 0.5);
label_average_attendance = gtk_label_new (_("label110"));
label_average_attendance = gtk_label_new ("");
gtk_widget_show (label_average_attendance);
gtk_table_attach (GTK_TABLE (table1), label_average_attendance, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label_average_attendance), 0, 0.5);
label111 = gtk_label_new (_("Average attendance % "));
label111 = gtk_label_new (_("Average attendance %"));
gtk_widget_show (label111);
gtk_table_attach (GTK_TABLE (table1), label111, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_FILL),

20
src/options_interface.c
View File

@ -182,7 +182,6 @@ create_window_options (void)
window_options = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window_options), 5);
gtk_window_set_title (GTK_WINDOW (window_options), _("window1"));
gtk_window_set_position (GTK_WINDOW (window_options), GTK_WIN_POS_CENTER);
vbox1 = gtk_vbox_new (FALSE, 2);
@ -216,14 +215,17 @@ create_window_options (void)
checkbutton_save_overwrite = gtk_check_button_new_with_mnemonic (_("Save overwrites"));
gtk_widget_show (checkbutton_save_overwrite);
gtk_box_pack_start (GTK_BOX (vbox3), checkbutton_save_overwrite, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_save_overwrite, _("Whether 'Save' overwrites the current save file or pops up a 'Save as' window"), NULL);
checkbutton_maximize = gtk_check_button_new_with_mnemonic (_("Maximize main window"));
gtk_widget_show (checkbutton_maximize);
gtk_box_pack_start (GTK_BOX (vbox3), checkbutton_maximize, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_maximize, _("Whether game starts with a maximized main window (doesn't work with all window managers)"), NULL);
checkbutton_pref_mess = gtk_check_button_new_with_mnemonic (_("Prefer messages"));
gtk_widget_show (checkbutton_pref_mess);
gtk_box_pack_start (GTK_BOX (vbox3), checkbutton_pref_mess, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_pref_mess, _("Whether to show warnings and such in the message area in the main window when possible"), NULL);
checkbutton_skip = gtk_check_button_new_with_mnemonic (_("Skip weeks without user matches"));
gtk_widget_show (checkbutton_skip);
@ -244,6 +246,7 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), checkbutton_autosave, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_autosave, _("Whether to automatically save the game regularly"), NULL);
hbox3 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox3);
@ -292,6 +295,7 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), spinbutton_precision, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, spinbutton_precision, _("How many digits after the comma there are for skill etc."), NULL);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_precision), TRUE);
spinbutton_refresh_adj = gtk_adjustment_new (1, 1, 100, 1, 10, 10);
@ -300,6 +304,7 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), spinbutton_refresh, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, spinbutton_refresh, _("How often the player list gets refreshed during a live game (in live game minutes)"), NULL);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_refresh), TRUE);
label10 = gtk_label_new (_("Constants file "));
@ -314,6 +319,7 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), button_font_name, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, button_font_name, _("Font used in treeviews"), NULL);
alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_widget_show (alignment1);
@ -336,6 +342,7 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), entry_font_name, 1, 2, 4, 5,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, entry_font_name, _("Font used in treeviews"), NULL);
hbox8 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox8);
@ -429,6 +436,7 @@ create_window_options (void)
checkbutton_auto_sub = gtk_check_button_new_with_mnemonic (_("Automatic substitutions"));
gtk_widget_show (checkbutton_auto_sub);
gtk_box_pack_start (GTK_BOX (vbox4), checkbutton_auto_sub, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_auto_sub, _("Whether the subs (e.g. for injured players) are made by the CPU. This is automatically done if the live game is off."), NULL);
vseparator2 = gtk_vseparator_new ();
gtk_widget_show (vseparator2);
@ -442,14 +450,17 @@ create_window_options (void)
checkbutton_pause_injury = gtk_check_button_new_with_mnemonic (_("Pause when injury"));
gtk_widget_show (checkbutton_pause_injury);
gtk_box_pack_start (GTK_BOX (vbox5), checkbutton_pause_injury, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_pause_injury, _("Whether the live game pauses when a user player is injured"), NULL);
checkbutton_pause_red = gtk_check_button_new_with_mnemonic (_("Pause when red card"));
gtk_widget_show (checkbutton_pause_red);
gtk_box_pack_start (GTK_BOX (vbox5), checkbutton_pause_red, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_pause_red, _("Whether the live game pauses when a user player is sent off"), NULL);
checkbutton_pause_break = gtk_check_button_new_with_mnemonic (_("Pause when break"));
gtk_widget_show (checkbutton_pause_break);
gtk_box_pack_start (GTK_BOX (vbox5), checkbutton_pause_break, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_pause_break, _("Whether the live game pauses at half time and extra time"), NULL);
label2 = gtk_label_new (_("Live game"));
gtk_widget_show (label2);
@ -466,6 +477,7 @@ create_window_options (void)
checkbutton_show_job = gtk_check_button_new_with_mnemonic (_("Show job offers"));
gtk_widget_show (checkbutton_show_job);
gtk_box_pack_start (GTK_BOX (vbox6), checkbutton_show_job, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_show_job, _("Whether to show job offers when a user is successful"), NULL);
eventbox1 = gtk_event_box_new ();
gtk_widget_show (eventbox1);
@ -507,10 +519,12 @@ create_window_options (void)
checkbutton_swap_adapts = gtk_check_button_new_with_mnemonic (_("Swap adapts structure"));
gtk_widget_show (checkbutton_swap_adapts);
gtk_box_pack_start (GTK_BOX (vbox7), checkbutton_swap_adapts, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_swap_adapts, _("Whether swapping two players automatically adapts the team structure to the player positions"), NULL);
checkbutton_show_overall = gtk_check_button_new_with_mnemonic (_("Show overall games/goals"));
gtk_widget_show (checkbutton_show_overall);
gtk_box_pack_start (GTK_BOX (vbox7), checkbutton_show_overall, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_show_overall, _("Whether to show the player games/goals value in all competitions"), NULL);
label3 = gtk_label_new (_("Misc."));
gtk_widget_show (label3);
@ -604,7 +618,7 @@ create_window_options (void)
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label24), 0, 0.5);
label25 = gtk_label_new (_("Etal "));
label25 = gtk_label_new (_("ETal "));
gtk_widget_show (label25);
gtk_table_attach (GTK_TABLE (table2), label25, 0, 1, 14, 15,
(GtkAttachOptions) (GTK_FILL),
@ -924,10 +938,12 @@ create_window_options (void)
checkbutton_save_global = gtk_check_button_new_with_mnemonic (_("Save global settings to file"));
gtk_widget_show (checkbutton_save_global);
gtk_box_pack_start (GTK_BOX (vbox2), checkbutton_save_global, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_save_global, _("Whether to save the global settings to file (so that they get loaded next time you start a new game)"), NULL);
checkbutton_save_user = gtk_check_button_new_with_mnemonic (_("Save user settings to file"));
gtk_widget_show (checkbutton_save_user);
gtk_box_pack_start (GTK_BOX (vbox2), checkbutton_save_user, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_save_user, _("Whether to save the user settings to file (so that they get loaded next time this user starts a new game)"), NULL);
button_ok = gtk_button_new_from_stock ("gtk-apply");
gtk_widget_show (button_ok);

8
src/team.c
View File

@ -790,10 +790,12 @@ team_compare_func(gconstpointer a, gconstpointer b, gpointer data)
if(tm1->clid == tm2->clid)
return_value = misc_int_compare(team_get_league_rank(tm2), team_get_league_rank(tm1));
else
return_value = misc_int_compare(
league_cup_get_index_from_clid(tm2->clid),
league_cup_get_index_from_clid(tm1->clid));
return_value = misc_int_compare(league_from_clid(tm2->clid)->layer,
league_from_clid(tm1->clid)->layer);
}
else if(type == TEAM_COMPARE_LEAGUE_LAYER)
return_value = misc_int_compare(league_from_clid(tm2->clid)->layer,
league_from_clid(tm1->clid)->layer);
else if(type == TEAM_COMPARE_OFFENSIVE)
{
gint gf1 = team_get_table_value(tm1, TABLE_GF),

1
src/team.h
View File

@ -10,6 +10,7 @@
enum TeamCompare
{
TEAM_COMPARE_LEAGUE_RANK = 0,
TEAM_COMPARE_LEAGUE_LAYER,
TEAM_COMPARE_UNSORTED,
TEAM_COMPARE_AV_SKILL,
TEAM_COMPARE_OFFENSIVE,

2
src/treeview.c
View File

@ -887,7 +887,7 @@ treeview_create_fixture(const Fixture *fix, GtkListStore *ls)
query_cup_is_national(fix->clid))
sprintf(buf[i], "<span background='%s' foreground='%s'>%s (%d)</span>",
colour_bg, colour_fg, fix->teams[i]->name->str,
league_cup_get_index_from_clid(fix->teams[i]->clid) + 1);
league_from_clid(fix->teams[i]->clid)->layer);
else
sprintf(buf[i], "<span background='%s' foreground='%s'>%s</span>",
colour_bg, colour_fg, fix->teams[i]->name->str);

16
src/treeview_helper.c
View File

@ -734,14 +734,14 @@ treeview_helper_player_info_career_to_cell(GtkCellRenderer *renderer, const Play
if(pl->pos == PLAYER_POS_GOALIE)
{
strcpy(format, "\nGoals/Game %.1f Save %% %.1f");
strcpy(format, _("\nGoals/Game %.1f Save %% %.1f"));
if(pl->career[PLAYER_VALUE_SHOTS] > 0)
shot_perc = 100 - ((gfloat)pl->career[PLAYER_VALUE_GOALS] * 100 /
(gfloat)pl->career[PLAYER_VALUE_SHOTS]);
}
else
{
strcpy(format, "\nGoals/Game %.1f Shot %% %.1f");
strcpy(format, _("\nGoals/Game %.1f Shot %% %.1f"));
if(pl->career[PLAYER_VALUE_SHOTS] > 0)
shot_perc = (gfloat)pl->career[PLAYER_VALUE_GOALS] * 100 /
(gfloat)pl->career[PLAYER_VALUE_SHOTS];
@ -764,7 +764,7 @@ treeview_helper_player_info_banned_to_cell(GtkCellRenderer *renderer, const GArr
for(i=0;i<cards->len;i++)
if(g_array_index(cards, PlayerCard, i).red > 0)
{
sprintf(buf2, "%s: %d weeks\n",
sprintf(buf2, _("%s: %d weeks\n"),
league_cup_get_name_string(g_array_index(cards, PlayerCard, i).clid),
g_array_index(cards, PlayerCard, i).red);
strcat(buf, buf2);
@ -799,7 +799,7 @@ treeview_helper_player_info_yellow_to_cell(GtkCellRenderer *renderer, const GArr
g_array_index(cards, PlayerCard, i).yellow, yellow_red);
}
else
sprintf(buf2, "%s: %d (no limit)\n",
sprintf(buf2, _("%s: %d (no limit)\n"),
league_cup_get_name_string(g_array_index(cards, PlayerCard, i).clid),
g_array_index(cards, PlayerCard, i).yellow);
@ -1096,28 +1096,28 @@ treeview_helper_player_pos_to_cell(GtkCellRenderer *renderer, gchar *buf, gint p
switch(pos)
{
default:
strcpy(buf, "G");
strcpy(buf, _("G"));
g_object_set(renderer, "background",
const_app("string_treeview_helper_color_player_pos_goalie_bg"),
"foreground",
const_app("string_treeview_helper_color_player_pos_goalie_fg"), NULL);
break;
case PLAYER_POS_DEFENDER:
strcpy(buf, "D");
strcpy(buf, _("D"));
g_object_set(renderer, "background",
const_app("string_treeview_helper_color_player_pos_defender_bg"),
"foreground",
const_app("string_treeview_helper_color_player_pos_defender_fg"), NULL);
break;
case PLAYER_POS_MIDFIELDER:
strcpy(buf, "M");
strcpy(buf, _("M"));
g_object_set(renderer, "background",
const_app("string_treeview_helper_color_player_pos_midfielder_bg"),
"foreground",
const_app("string_treeview_helper_color_player_pos_midfielder_fg"), NULL);
break;
case PLAYER_POS_FORWARD:
strcpy(buf, "F");
strcpy(buf, _("F"));
g_object_set(renderer, "background",
const_app("string_treeview_helper_color_player_pos_forward_bg"),
"foreground",

28
src/user.c
View File

@ -244,7 +244,7 @@ user_job_offer(User *user)
if(user->counters[COUNT_USER_SUCCESS] < -(gfloat)const_int("int_user_success_offer_limit") * 0.9 &&
!user->counters[COUNT_USER_WARNING])
{
sprintf(buf, "The owners of %s are not satisfied with the recent performance of the team. There are rumours they're looking for a new manager.", user->tm->name->str);
sprintf(buf, _("The owners of %s are not satisfied with the recent performance of the team. There are rumours they're looking for a new manager."), user->tm->name->str);
user_event_add(user, EVENT_TYPE_WARNING, -1, -1, NULL, buf);
user->counters[COUNT_USER_WARNING] = 1;
return;
@ -470,9 +470,9 @@ user_event_show_next(void)
player_of_id_team(event->user->tm, trans(temp_int).id)->value), buf3, FALSE);
if(transoff(temp_int, 0).fee -
player_of_id_team(event->user->tm, trans(temp_int).id)->value > 0)
strcat(buf3, " more");
strcat(buf3, _(" more"));
else
strcat(buf3, " less");
strcat(buf3, _(" less"));
sprintf(buf, _("%s would like to buy %s. They offer %s for him, which is %s than the player's value. Do you accept?"), transoff(temp_int, 0).tm->name->str,
player_of_id_team(event->user->tm, trans(temp_int).id)->name->str,
@ -687,59 +687,59 @@ user_history_to_string(const UserHistory *history, gchar *buf)
g_warning("user_history_to_string: unknown history type %d.\n", history->type);
strcpy(buf, "FIXME!!!");
case USER_HISTORY_START_GAME:
sprintf(buf, "You start the game with %s in the %s.",
sprintf(buf, _("You start the game with %s in the %s."),
team_of_id(history->team_id)->name->str,
league_cup_get_name_string(history->value1));
break;
case USER_HISTORY_FIRE_FINANCES:
sprintf(buf, "%s fires you because of financial mismanagement.\nYou find a new job with %s in the %s.",
sprintf(buf, _("%s fires you because of financial mismanagement.\nYou find a new job with %s in the %s."),
team_of_id(history->team_id)->name->str,
team_of_id(history->value1)->name->str,
league_cup_get_name_string(history->value2));
break;
case USER_HISTORY_FIRE_FAILURE:
sprintf(buf, "%s fires you because of unsuccessfulness.\nYou find a new job with %s in the %s.",
sprintf(buf, _("%s fires you because of unsuccessfulness.\nYou find a new job with %s in the %s."),
team_of_id(history->team_id)->name->str,
team_of_id(history->value1)->name->str,
league_cup_get_name_string(history->value2));
break;
case USER_HISTORY_JOB_OFFER_ACCEPTED:
sprintf(buf, "%s offer you a job in the %s.\nYou accept the challenge and leave %s.",
sprintf(buf, _("%s offer you a job in the %s.\nYou accept the challenge and leave %s."),
team_of_id(history->value1)->name->str,
league_cup_get_name_string(history->value2),
team_of_id(history->team_id)->name->str);
break;
case USER_HISTORY_END_SEASON:
sprintf(buf, "You finish the season in the %s on rank %d.",
sprintf(buf, _("You finish the season in the %s on rank %d."),
league_cup_get_name_string(history->value1),
history->value2);
break;
case USER_HISTORY_PROMOTED:
sprintf(buf, "You get promoted to the %s.",
sprintf(buf, _("You get promoted to the %s."),
league_cup_get_name_string(history->value1));
break;
case USER_HISTORY_RELEGATED:
sprintf(buf, "You get relegated to the %s.",
sprintf(buf, _("You get relegated to the %s."),
league_cup_get_name_string(history->value1));
break;
case USER_HISTORY_WIN_FINAL:
sprintf(buf, "You win the %s final against %s.",
sprintf(buf, _("You win the %s final against %s."),
league_cup_get_name_string(history->value1),
history->value_string->str);
break;
case USER_HISTORY_LOSE_FINAL:
sprintf(buf, "You lose in the %s final against %s.",
sprintf(buf, _("You lose in the %s final against %s."),
league_cup_get_name_string(history->value1),
history->value_string->str);
break;
case USER_HISTORY_REACH_CUP_ROUND:
cup_get_round_name(cup_from_clid(history->value1), history->value2, buf2);
sprintf(buf, "You reach the %s (round %d) of the %s.", buf2,
sprintf(buf, _("You reach the %s (round %d) of the %s."), buf2,
history->value2 + 1,
league_cup_get_name_string(history->value1));
break;
case USER_HISTORY_CHAMPION:
sprintf(buf, "You are champion of the %s!",
sprintf(buf, _("You are champion of the %s!"),
league_cup_get_name_string(history->value1));
break;
}

6
src/window.c
View File

@ -37,12 +37,12 @@ window_show_help(gint page)
window_create(WINDOW_HELP);
sprintf(buf, "Bygfoot Football Manager\n%s\n(c) 2005 Győző Both (gyboth@bygfoot.com)\nhttp://bygfoot.sourceforge.net", VERS);
gtk_label_set_text(GTK_LABEL(lookup_widget(window.help, "label_about")), buf);
sprintf(buf, "<span %s>Bygfoot Football Manager %s</span>\n(c) 2005 Győző Both (gyboth@bygfoot.com)\nhttp://bygfoot.sourceforge.net", const_app("string_help_window_program_name_attribute"), VERS);
gtk_label_set_markup(GTK_LABEL(lookup_widget(window.help, "label_about")), buf);
treeview_show_contributors(&help_list);
game_gui_set_help_labels(&help_list);
game_gui_set_help_labels();
gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(window.help, "notebook1")), page);

5
src/xml_country.c
View File

@ -158,6 +158,7 @@ xml_country_read(const gchar *country_name)
gint length;
GError *error = NULL;
gchar buf[SMALL];
gint i;
context =
g_markup_parse_context_new(&parser, 0, NULL, NULL);
@ -192,4 +193,8 @@ xml_country_read(const gchar *country_name)
g_critical("xml_country_read: error parsing file %s\n", buf);
misc_print_error(&error, TRUE);
}
for(i=0;i<ligs->len;i++)
if(lig(i).layer == -1)
lig(i).layer = i + 1;
}

7
src/xml_league.c
View File

@ -17,6 +17,7 @@
#define TAG_SHORT_NAME "short_name"
#define TAG_SID "sid"
#define TAG_SYMBOL "symbol"
#define TAG_LAYER "layer"
#define TAG_FIRST_WEEK "first_week"
#define TAG_WEEK_GAP "week_gap"
#define TAG_ROUND_ROBINS "round_robins"
@ -47,6 +48,7 @@ enum XmlLeagueStates
STATE_NAME,
STATE_SHORT_NAME,
STATE_SYMBOL,
STATE_LAYER,
STATE_FIRST_WEEK,
STATE_WEEK_GAP,
STATE_ROUND_ROBINS,
@ -109,6 +111,8 @@ xml_league_read_start_element (GMarkupParseContext *context,
state = STATE_SYMBOL;
else if(strcmp(element_name, TAG_FIRST_WEEK) == 0)
state = STATE_FIRST_WEEK;
else if(strcmp(element_name, TAG_LAYER) == 0)
state = STATE_LAYER;
else if(strcmp(element_name, TAG_WEEK_GAP) == 0)
state = STATE_WEEK_GAP;
else if(strcmp(element_name, TAG_ROUND_ROBINS) == 0)
@ -176,6 +180,7 @@ xml_league_read_end_element (GMarkupParseContext *context,
strcmp(element_name, TAG_SHORT_NAME) == 0 ||
strcmp(element_name, TAG_SID) == 0 ||
strcmp(element_name, TAG_SYMBOL) == 0 ||
strcmp(element_name, TAG_LAYER) == 0 ||
strcmp(element_name, TAG_FIRST_WEEK) == 0 ||
strcmp(element_name, TAG_WEEK_GAP) == 0 ||
strcmp(element_name, TAG_ROUND_ROBINS) == 0 ||
@ -238,6 +243,8 @@ xml_league_read_text (GMarkupParseContext *context,
g_string_printf(new_league.sid, "%s", buf);
else if(state == STATE_SYMBOL)
g_string_printf(new_league.symbol, "%s", buf);
else if(state == STATE_LAYER)
new_league.layer = value;
else if(state == STATE_FIRST_WEEK)
new_league.first_week = value;
else if(state == STATE_WEEK_GAP)

5
src/xml_loadsave_league.c
View File

@ -12,6 +12,7 @@
enum
{
TAG_LEAGUE = TAG_START_LEAGUE,
TAG_LEAGUE_LAYER,
TAG_LEAGUE_FIRST_WEEK,
TAG_LEAGUE_ROUND_ROBINS,
TAG_LEAGUE_AVERAGE_SKILL,
@ -79,6 +80,7 @@ xml_loadsave_league_end_element (GMarkupParseContext *context,
gint tag = xml_get_tag_from_name(element_name);
if(tag == TAG_LEAGUE_FIRST_WEEK ||
tag == TAG_LEAGUE_LAYER ||
tag == TAG_LEAGUE_AVERAGE_SKILL ||
tag == TAG_LEAGUE_ROUND_ROBINS ||
tag == TAG_NAME ||
@ -140,6 +142,8 @@ xml_loadsave_league_text (GMarkupParseContext *context,
g_string_printf(new_league->sid, "%s", buf);
else if(state == TAG_ID)
new_league->id = int_value;
else if(state == TAG_LEAGUE_LAYER)
new_league->layer = int_value;
else if(state == TAG_LEAGUE_FIRST_WEEK)
new_league->first_week = int_value;
else if(state == TAG_LEAGUE_ROUND_ROBINS)
@ -231,6 +235,7 @@ xml_loadsave_league_write(const gchar *prefix, const League *league)
xml_write_g_string(fil, league->symbol, TAG_SYMBOL, I0);
xml_write_int(fil, league->id, TAG_ID, I0);
xml_write_int(fil, league->layer, TAG_LEAGUE_LAYER, I0);
xml_write_int(fil, league->first_week, TAG_LEAGUE_FIRST_WEEK, I0);
xml_write_int(fil, league->round_robins, TAG_LEAGUE_ROUND_ROBINS, I0);
xml_write_int(fil, league->week_gap, TAG_WEEK_GAP, I0);

1
support_files/bygfoot_app
View File

@ -8,6 +8,7 @@
# font attributes for the help window
string_help_window_title_attribute size='large'
string_help_window_program_name_attribute weight='bold' size='large'
# colours of the live game commentary for the away team
string_treeview_live_game_commentary_away_fg black

1
support_files/definitions/belgium/league_belgium3a.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>6000</average_skill>
<yellow_red>3</yellow_red>
<layer>3</layer>
<prom_rel>
<prom_rel_element>

1
support_files/definitions/belgium/league_belgium3b.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>6000</average_skill>
<yellow_red>3</yellow_red>
<layer>3</layer>
<prom_rel>
<prom_rel_element>

1
support_files/definitions/belgium/league_belgium4a.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>5000</average_skill>
<yellow_red>3</yellow_red>
<layer>4</layer>
<prom_rel>

1
support_files/definitions/belgium/league_belgium4b.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>5000</average_skill>
<yellow_red>3</yellow_red>
<layer>4</layer>
<prom_rel>

1
support_files/definitions/belgium/league_belgium4c.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>5000</average_skill>
<yellow_red>3</yellow_red>
<layer>4</layer>
<prom_rel>

1
support_files/definitions/belgium/league_belgium4d.xml
View File

@ -7,6 +7,7 @@
<week_gap>1</week_gap>
<average_skill>5000</average_skill>
<yellow_red>3</yellow_red>
<layer>4</layer>
<prom_rel>