rixty/bygfoot
1
1
Fork 0
mirror of https://github.com/tstellar/bygfoot.git synced 2024-12-16 10:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Training camp defaults.

Browse Source
This commit is contained in:
gyboth 2008-05-03 15:03:30 +00:00
parent 13c13850c8
commit 566f247ed3
19 changed files with 853 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

404
bygfoot_options.glade
View File

@ -17,6 +17,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_options_delete_event" last_modification_time="Thu, 14 Jul 2005 15:49:01 GMT"/>
<child>
@ -261,6 +263,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -302,6 +308,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -352,6 +362,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -376,6 +390,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -400,6 +418,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -468,6 +490,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -573,6 +599,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -615,6 +645,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -728,6 +762,8 @@
<child>
<widget class="GtkComboBox" id="combobox_languages">
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
</child>
</widget>
@ -767,6 +803,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@ -845,6 +885,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -869,6 +913,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1065,6 +1113,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@ -1149,6 +1201,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1189,6 +1245,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1318,6 +1378,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@ -1346,6 +1410,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1370,6 +1438,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1394,6 +1466,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1418,6 +1494,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1442,6 +1522,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1466,6 +1550,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1490,6 +1578,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1514,6 +1606,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1538,6 +1634,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1562,6 +1662,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1586,6 +1690,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1610,6 +1718,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1634,6 +1746,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1658,6 +1774,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1682,6 +1802,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1706,6 +1830,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1730,6 +1858,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -1754,6 +1886,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -2602,6 +2738,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -2626,6 +2766,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -2650,6 +2794,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@ -2696,6 +2844,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@ -2792,6 +2944,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@ -2861,6 +3017,254 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkHBox" id="hbox13">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="label" translatable="yes">Default hotel</property>
<property name="use_underline">False</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.10000000149</property>
<property name="yalign">0.5</property>
<property name="xpad">4</property>
<property name="ypad">3</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="combobox_hotel">
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkHSeparator" id="hseparator7">
<property name="height_request">10</property>
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="label" translatable="yes">Default recreation:</property>
<property name="use_underline">False</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.10000000149</property>
<property name="yalign">0.5</property>
<property name="xpad">3</property>
<property name="ypad">3</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="spinbutton_recreation">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
<property name="numeric">False</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 10 1 10 10</property>
<signal name="value_changed" handler="on_spinbutton_recreation_value_changed" last_modification_time="Sat, 03 May 2008 14:10:23 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator8">
<property name="height_request">10</property>
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="label" translatable="yes">Default training:</property>
<property name="use_underline">False</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.10000000149</property>
<property name="yalign">0.5</property>
<property name="xpad">3</property>
<property name="ypad">3</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">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="label_training">
<property name="visible">True</property>
<property name="label" translatable="yes">label48</property>
<property name="use_underline">False</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>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="label" translatable="yes">Training camp</property>
<property name="use_underline">False</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>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>

240
bygfoot_training.glade
View File

@ -45,54 +45,6 @@
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hs_camp1">
<property name="width_request">450</property>
<property name="height_request">16</property>
<property name="visible">True</property>
</widget>
<packing>
<property name="x">25</property>
<property name="y">235</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_cancel">
<property name="width_request">110</property>
<property name="height_request">25</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_b_cancel_clicked" last_modification_time="Sun, 03 Dec 2006 16:09:00 GMT"/>
</widget>
<packing>
<property name="x">376</property>
<property name="y">254</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_ok">
<property name="width_request">110</property>
<property name="height_request">25</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-apply</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_b_ok_clicked" last_modification_time="Sun, 03 Dec 2006 16:09:36 GMT"/>
</widget>
<packing>
<property name="x">256</property>
<property name="y">254</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hs_camp2">
<property name="width_request">450</property>
@ -210,49 +162,6 @@
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="rb_camp2">
<property name="width_request">200</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">First-Class Hotel</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>
<signal name="clicked" handler="on_rb_camp2_clicked" last_modification_time="Sun, 03 Dec 2006 16:50:34 GMT"/>
</widget>
<packing>
<property name="x">24</property>
<property name="y">40</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="rb_camp3">
<property name="width_request">200</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Premium Hotel</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">rb_camp2</property>
<signal name="clicked" handler="on_rb_camp3_clicked" last_modification_time="Sun, 03 Dec 2006 16:50:53 GMT"/>
</widget>
<packing>
<property name="x">24</property>
<property name="y">64</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_dec_training">
<property name="width_request">30</property>
@ -369,24 +278,6 @@
</packing>
</child>
<child>
<widget class="GtkHScale" id="hs_recreation">
<property name="width_request">200</property>
<property name="height_request">36</property>
<property name="visible">True</property>
<property name="draw_value">True</property>
<property name="value_pos">GTK_POS_RIGHT</property>
<property name="digits">1</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
<property name="adjustment">0 1 10 1 0 0</property>
</widget>
<packing>
<property name="x">220</property>
<property name="y">120</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_dec_recreation">
<property name="width_request">30</property>
@ -414,6 +305,24 @@
</packing>
</child>
<child>
<widget class="GtkHScale" id="hs_recreation">
<property name="width_request">200</property>
<property name="height_request">36</property>
<property name="visible">True</property>
<property name="draw_value">True</property>
<property name="value_pos">GTK_POS_RIGHT</property>
<property name="digits">1</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
<property name="adjustment">0 1 10 1 0 0</property>
</widget>
<packing>
<property name="x">220</property>
<property name="y">120</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="rb_camp1">
<property name="width_request">200</property>
@ -428,7 +337,6 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">rb_camp2</property>
<signal name="clicked" handler="on_rb_camp1_clicked" last_modification_time="Sun, 03 Dec 2006 16:50:23 GMT"/>
</widget>
<packing>
@ -436,6 +344,118 @@
<property name="y">16</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="rb_camp2">
<property name="width_request">200</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">First-Class Hotel</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">rb_camp1</property>
<signal name="clicked" handler="on_rb_camp2_clicked" last_modification_time="Sun, 03 Dec 2006 16:50:34 GMT"/>
</widget>
<packing>
<property name="x">24</property>
<property name="y">40</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="rb_camp3">
<property name="width_request">200</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Premium Hotel</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">rb_camp1</property>
<signal name="clicked" handler="on_rb_camp3_clicked" last_modification_time="Sun, 03 Dec 2006 16:50:53 GMT"/>
</widget>
<packing>
<property name="x">24</property>
<property name="y">64</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hs_camp1">
<property name="width_request">450</property>
<property name="height_request">16</property>
<property name="visible">True</property>
</widget>
<packing>
<property name="x">25</property>
<property name="y">232</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_ok">
<property name="width_request">110</property>
<property name="height_request">35</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-apply</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_b_ok_clicked" last_modification_time="Sun, 03 Dec 2006 16:09:36 GMT"/>
</widget>
<packing>
<property name="x">256</property>
<property name="y">254</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b_cancel">
<property name="width_request">110</property>
<property name="height_request">35</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_b_cancel_clicked" last_modification_time="Sun, 03 Dec 2006 16:09:00 GMT"/>
</widget>
<packing>
<property name="x">376</property>
<property name="y">254</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkbutton_save">
<property name="width_request">208</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Save settings as default</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="x">24</property>
<property name="y">264</property>
</packing>
</child>
</widget>
</child>
</widget>

2
src/bygfoot.h
View File

@ -40,7 +40,7 @@
/**
* Program version number and year (copyright).
*/
#define VERS "2.2.1"
#define VERS "2.3.0"
#define YEAR "2005 - 2008"
/** Home dir name */

15
src/callbacks.c
View File

@ -1283,6 +1283,19 @@ on_training_camp_activate (GtkMenuItem *menuitem,
return;
}
window_show_training_camp();
if(current_user.counters[COUNT_USER_TRAININGS_WEEK] ==
const_int("int_training_camps_week"))
{
game_gui_print_message(_("Your team has already had enough training camps this week."));
return;
}
if(current_user.counters[COUNT_USER_TRAININGS_LEFT_SEASON] == 0)
{
game_gui_print_message(_("You've reached the limit of %d training camps for the season."),
const_int("int_training_camps_per_season"));
return;
}
window_show_training_camp();
}

15
src/option_gui.c
View File

@ -31,6 +31,7 @@
#include "option_gui.h"
#include "misc.h"
#include "support.h"
#include "training.h"
#include "treeview.h"
#include "user.h"
#include "variables.h"
@ -350,6 +351,7 @@ enum SpinOptions
SPIN_OPT_LIVE_VERBOSITY,
SPIN_OPT_CONTRACT,
SPIN_OPT_BET_WAGER,
SPIN_OPT_TRAINING_CAMP_RECREATION,
SPIN_OPT_END
};
@ -379,6 +381,10 @@ option_gui_write_spin_widgets(gint **spin_options, GtkSpinButton **spin_widgets)
GTK_SPIN_BUTTON(lookup_widget(window.options, "spinbutton_live_speed"));
spin_options[SPIN_OPT_LIVE_SPEED] = opt_user_intp("int_opt_user_live_game_speed");
spin_widgets[SPIN_OPT_TRAINING_CAMP_RECREATION] =
GTK_SPIN_BUTTON(lookup_widget(window.options, "spinbutton_recreation"));
spin_options[SPIN_OPT_TRAINING_CAMP_RECREATION] = opt_user_intp("int_opt_user_training_camp_recreation");
/** Note the spinbutton value so that it doesn't get lost
when setting the range. */
tmp = gtk_spin_button_get_value_as_int(spin_widgets[SPIN_OPT_LIVE_SPEED]);
@ -437,6 +443,7 @@ void
option_gui_set_up_window(void)
{
gint i;
gchar buf[SMALL];
GtkToggleButton *bool_widgets[BOOL_OPT_END];
gint *bool_options[BOOL_OPT_END];
@ -447,6 +454,7 @@ option_gui_set_up_window(void)
gchar **entry_options[ENTRY_OPT_END];
treeview_show_language_combo();
treeview_show_training_hotels_combo();
option_gui_write_bool_widgets(bool_options, bool_widgets);
option_gui_write_spin_widgets(spin_options, spin_widgets);
@ -460,6 +468,10 @@ option_gui_set_up_window(void)
for(i=0;i<ENTRY_OPT_END;i++)
gtk_entry_set_text(entry_widgets[i], *(entry_options[i]));
sprintf(buf, "%d", CAMP_SCALE_MAX - gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(lookup_widget(window.options, "spinbutton_recreation"))));
gtk_label_set_text(GTK_LABEL(lookup_widget(window.options, "label_training")), buf);
}
/** Read the widget states in the options window and set the
@ -470,6 +482,8 @@ option_gui_write_options(void)
gint i;
gint language_index =
gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(window.options, "combobox_languages")));
gint training_camp_hotel =
gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(window.options, "combobox_hotel"))) + 1;
GtkToggleButton *bool_widgets[BOOL_OPT_END];
gint *bool_options[BOOL_OPT_END];
GtkSpinButton *spin_widgets[SPIN_OPT_END];
@ -478,6 +492,7 @@ option_gui_write_options(void)
gchar **entry_options[ENTRY_OPT_END];
language_set(language_index);
opt_user_set_int("int_opt_user_training_camp_hotel", training_camp_hotel);
option_gui_write_bool_widgets(bool_options, bool_widgets);
option_gui_write_spin_widgets(spin_options, spin_widgets);

14
src/options_callbacks.c
View File

@ -28,6 +28,7 @@
#include "options_interface.h"
#include "option_gui.h"
#include "support.h"
#include "training.h"
#include "user.h"
#include "variables.h"
#include "window.h"
@ -60,6 +61,8 @@ on_button_options_ok_clicked (GtkButton *button,
else
sprintf(buf, "%s%sbygfoot_%s.conf", conf_dir, G_DIR_SEPARATOR_S, current_user.name);
printf("%s\n", buf);
file_save_opt_file(buf, &current_user.options);
}
@ -143,3 +146,14 @@ on_window_options_delete_event (GtkWidget *widget,
return TRUE;
}
void
on_spinbutton_recreation_value_changed (GtkSpinButton *spinbutton,
gpointer user_data)
{
gchar buf[SMALL];
sprintf(buf, "%d", CAMP_SCALE_MAX - gtk_spin_button_get_value_as_int(spinbutton));
gtk_label_set_text(GTK_LABEL(lookup_widget(window.options, "label_training")), buf);
}

4
src/options_callbacks.h
View File

@ -61,3 +61,7 @@ on_window_options_delete_event (GtkWidget *widget,
GdkEvent *event,
gpointer user_data);
#endif
void
on_spinbutton_recreation_value_changed (GtkSpinButton *spinbutton,
gpointer user_data);

101
src/options_interface.c
View File

@ -183,6 +183,21 @@ create_window_options (void)
GtkObject *spinbutton_bet_wager_adj;
GtkWidget *spinbutton_bet_wager;
GtkWidget *label41;
GtkWidget *vbox9;
GtkWidget *hbox13;
GtkWidget *label44;
GtkWidget *combobox_hotel;
GtkWidget *vbox10;
GtkWidget *hseparator7;
GtkWidget *hbox15;
GtkWidget *label45;
GtkObject *spinbutton_recreation_adj;
GtkWidget *spinbutton_recreation;
GtkWidget *hseparator8;
GtkWidget *hbox16;
GtkWidget *label47;
GtkWidget *label_training;
GtkWidget *label43;
GtkWidget *hseparator1;
GtkWidget *hbox1;
GtkWidget *vbox2;
@ -1022,6 +1037,73 @@ create_window_options (void)
gtk_widget_show (label41);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 4), label41);
vbox9 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox9);
gtk_container_add (GTK_CONTAINER (notebook1), vbox9);
gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (notebook1), vbox9,
FALSE, FALSE, GTK_PACK_START);
hbox13 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox13);
gtk_box_pack_start (GTK_BOX (vbox9), hbox13, FALSE, FALSE, 0);
label44 = gtk_label_new (_("Default hotel"));
gtk_widget_show (label44);
gtk_box_pack_start (GTK_BOX (hbox13), label44, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label44), 0.1, 0.5);
gtk_misc_set_padding (GTK_MISC (label44), 4, 3);
combobox_hotel = gtk_combo_box_new_text ();
gtk_widget_show (combobox_hotel);
gtk_box_pack_start (GTK_BOX (hbox13), combobox_hotel, FALSE, FALSE, 0);
vbox10 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox10);
gtk_box_pack_start (GTK_BOX (vbox9), vbox10, FALSE, FALSE, 0);
hseparator7 = gtk_hseparator_new ();
gtk_widget_show (hseparator7);
gtk_box_pack_start (GTK_BOX (vbox10), hseparator7, FALSE, FALSE, 0);
gtk_widget_set_size_request (hseparator7, -1, 10);
hbox15 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox15);
gtk_box_pack_start (GTK_BOX (vbox10), hbox15, FALSE, FALSE, 0);
label45 = gtk_label_new (_("Default recreation:"));
gtk_widget_show (label45);
gtk_box_pack_start (GTK_BOX (hbox15), label45, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label45), 0.1, 0.5);
gtk_misc_set_padding (GTK_MISC (label45), 3, 3);
spinbutton_recreation_adj = gtk_adjustment_new (1, 0, 10, 1, 10, 10);
spinbutton_recreation = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_recreation_adj), 1, 0);
gtk_widget_show (spinbutton_recreation);
gtk_box_pack_start (GTK_BOX (hbox15), spinbutton_recreation, FALSE, FALSE, 0);
hseparator8 = gtk_hseparator_new ();
gtk_widget_show (hseparator8);
gtk_box_pack_start (GTK_BOX (vbox9), hseparator8, FALSE, FALSE, 0);
gtk_widget_set_size_request (hseparator8, -1, 10);
hbox16 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox16);
gtk_box_pack_start (GTK_BOX (vbox9), hbox16, FALSE, FALSE, 0);
label47 = gtk_label_new (_("Default training:"));
gtk_widget_show (label47);
gtk_box_pack_start (GTK_BOX (hbox16), label47, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label47), 0.1, 0.5);
gtk_misc_set_padding (GTK_MISC (label47), 3, 3);
label_training = gtk_label_new (_("label48"));
gtk_widget_show (label_training);
gtk_box_pack_start (GTK_BOX (hbox16), label_training, FALSE, FALSE, 0);
label43 = gtk_label_new (_("Training camp"));
gtk_widget_show (label43);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 5), label43);
hseparator1 = gtk_hseparator_new ();
gtk_widget_show (hseparator1);
gtk_box_pack_start (GTK_BOX (vbox1), hseparator1, FALSE, FALSE, 0);
@ -1054,7 +1136,7 @@ create_window_options (void)
gtk_box_pack_start (GTK_BOX (hbox1), button_cancel, TRUE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, button_cancel, _("Esc"), NULL);
gtk_widget_add_accelerator (button_cancel, "clicked", accel_group,
GDK_Escape, 0,
GDK_Escape, (GdkModifierType) 0,
GTK_ACCEL_VISIBLE);
g_signal_connect ((gpointer) window_options, "delete_event",
@ -1066,6 +1148,9 @@ create_window_options (void)
g_signal_connect ((gpointer) button_reload_constants, "clicked",
G_CALLBACK (on_button_reload_constants_clicked),
NULL);
g_signal_connect ((gpointer) spinbutton_recreation, "value_changed",
G_CALLBACK (on_spinbutton_recreation_value_changed),
NULL);
g_signal_connect ((gpointer) checkbutton_save_global, "button_press_event",
G_CALLBACK (on_checkbutton_save_global_button_press_event),
NULL);
@ -1226,6 +1311,20 @@ create_window_options (void)
GLADE_HOOKUP_OBJECT (window_options, label42, "label42");
GLADE_HOOKUP_OBJECT (window_options, spinbutton_bet_wager, "spinbutton_bet_wager");
GLADE_HOOKUP_OBJECT (window_options, label41, "label41");
GLADE_HOOKUP_OBJECT (window_options, vbox9, "vbox9");
GLADE_HOOKUP_OBJECT (window_options, hbox13, "hbox13");
GLADE_HOOKUP_OBJECT (window_options, label44, "label44");
GLADE_HOOKUP_OBJECT (window_options, combobox_hotel, "combobox_hotel");
GLADE_HOOKUP_OBJECT (window_options, vbox10, "vbox10");
GLADE_HOOKUP_OBJECT (window_options, hseparator7, "hseparator7");
GLADE_HOOKUP_OBJECT (window_options, hbox15, "hbox15");
GLADE_HOOKUP_OBJECT (window_options, label45, "label45");
GLADE_HOOKUP_OBJECT (window_options, spinbutton_recreation, "spinbutton_recreation");
GLADE_HOOKUP_OBJECT (window_options, hseparator8, "hseparator8");
GLADE_HOOKUP_OBJECT (window_options, hbox16, "hbox16");
GLADE_HOOKUP_OBJECT (window_options, label47, "label47");
GLADE_HOOKUP_OBJECT (window_options, label_training, "label_training");
GLADE_HOOKUP_OBJECT (window_options, label43, "label43");
GLADE_HOOKUP_OBJECT (window_options, hseparator1, "hseparator1");
GLADE_HOOKUP_OBJECT (window_options, hbox1, "hbox1");
GLADE_HOOKUP_OBJECT (window_options, vbox2, "vbox2");

3
src/start_end.c
View File

@ -121,6 +121,9 @@ start_new_season(void)
usr(i).tm->name,
league_cup_get_name_string(usr(i).tm->clid),
buf, NULL);
usr(i).counters[COUNT_USER_TRAININGS_LEFT_SEASON] =
const_int("int_training_camps_per_season");
}
start_new_season_league_changes();

23
src/training_callbacks.c
View File

@ -63,18 +63,22 @@ on_b_ok_clicked (GtkButton *button,
gdouble value_training;
gdouble value_recreation;
gint number_camp;
gboolean save;
Team *current_team = current_user.tm;
save = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(lookup_widget(window.training_camp, "checkbutton_save")));
//Get active radio
rb_camp1 = GTK_WIDGET(lookup_widget(window.training_camp, "rb_camp1"));
rb_camp2 = GTK_WIDGET(lookup_widget(window.training_camp, "rb_camp2"));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rb_camp1)))
number_camp = 1;
number_camp = TRAINING_CAMP_HOTEL_GOOD;
else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rb_camp2)))
number_camp = 2;
number_camp = TRAINING_CAMP_HOTEL_FIRST;
else
number_camp = 3;
number_camp = TRAINING_CAMP_HOTEL_PREMIUM;
//Get values for training and recreation
hs_recreation = GTK_HSCALE(lookup_widget(window.training_camp, "hs_recreation"));
@ -96,8 +100,19 @@ on_b_ok_clicked (GtkButton *button,
//Set new av-values -> GUI
game_gui_write_money();
if(save)
{
opt_user_set_int("int_opt_user_training_camp_hotel", number_camp);
opt_user_set_int("int_opt_user_training_camp_recreation", value_recreation);
}
window_destroy(&window.training_camp);
current_user.counters[COUNT_USER_TRAININGS_WEEK]++;
current_user.counters[COUNT_USER_TRAININGS_LEFT_SEASON]--;
game_gui_print_message(_("%d training camps left this season."),
current_user.counters[COUNT_USER_TRAININGS_LEFT_SEASON]);
}
void

129
src/training_interface.c
View File

@ -32,18 +32,12 @@ create_window_training_camp (void)
GtkWidget *window_training_camp;
GtkWidget *panel_camp;
GtkWidget *tf_costs;
GtkWidget *hs_camp1;
GtkWidget *b_cancel;
GtkWidget *b_ok;
GtkWidget *hs_camp2;
GtkWidget *l_camp_points;
GtkWidget *b_inc_recreation;
GtkWidget *image2;
GtkWidget *l_recreation;
GtkWidget *l_costs;
GtkWidget *rb_camp2;
GSList *rb_camp2_group = NULL;
GtkWidget *rb_camp3;
GtkWidget *b_dec_training;
GtkWidget *image3;
GtkWidget *l_training;
@ -53,8 +47,15 @@ create_window_training_camp (void)
GtkWidget *hs_training;
GtkWidget *b_dec_recreation;
GtkWidget *image1;
GtkWidget *rb_camp1;
GtkWidget *hs_recreation;
GtkWidget *rb_camp1;
GSList *rb_camp1_group = NULL;
GtkWidget *rb_camp2;
GtkWidget *rb_camp3;
GtkWidget *hs_camp1;
GtkWidget *b_ok;
GtkWidget *b_cancel;
GtkWidget *checkbutton_save;
window_training_camp = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window_training_camp), _("Training camp"));
@ -76,21 +77,6 @@ create_window_training_camp (void)
gtk_entry_set_has_frame (GTK_ENTRY (tf_costs), FALSE);
gtk_entry_set_invisible_char (GTK_ENTRY (tf_costs), 9679);
hs_camp1 = gtk_hseparator_new ();
gtk_widget_show (hs_camp1);
gtk_fixed_put (GTK_FIXED (panel_camp), hs_camp1, 25, 235);
gtk_widget_set_size_request (hs_camp1, 450, 16);
b_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (b_cancel);
gtk_fixed_put (GTK_FIXED (panel_camp), b_cancel, 376, 254);
gtk_widget_set_size_request (b_cancel, 110, 25);
b_ok = gtk_button_new_from_stock ("gtk-apply");
gtk_widget_show (b_ok);
gtk_fixed_put (GTK_FIXED (panel_camp), b_ok, 256, 254);
gtk_widget_set_size_request (b_ok, 110, 25);
hs_camp2 = gtk_hseparator_new ();
gtk_widget_show (hs_camp2);
gtk_fixed_put (GTK_FIXED (panel_camp), hs_camp2, 25, 90);
@ -120,20 +106,6 @@ create_window_training_camp (void)
gtk_fixed_put (GTK_FIXED (panel_camp), l_costs, 255, 41);
gtk_widget_set_size_request (l_costs, 90, 20);
rb_camp2 = gtk_radio_button_new_with_mnemonic (NULL, _("First-Class Hotel"));
gtk_widget_show (rb_camp2);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp2, 24, 40);
gtk_widget_set_size_request (rb_camp2, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp2), rb_camp2_group);
rb_camp2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp2));
rb_camp3 = gtk_radio_button_new_with_mnemonic (NULL, _("Premium Hotel"));
gtk_widget_show (rb_camp3);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp3, 24, 64);
gtk_widget_set_size_request (rb_camp3, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp3), rb_camp2_group);
rb_camp2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp3));
b_dec_training = gtk_button_new ();
gtk_widget_show (b_dec_training);
gtk_fixed_put (GTK_FIXED (panel_camp), b_dec_training, 176, 157);
@ -180,13 +152,6 @@ create_window_training_camp (void)
gtk_widget_show (image1);
gtk_container_add (GTK_CONTAINER (b_dec_recreation), image1);
rb_camp1 = gtk_radio_button_new_with_mnemonic (NULL, _("Good Hotel"));
gtk_widget_show (rb_camp1);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp1, 24, 16);
gtk_widget_set_size_request (rb_camp1, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp1), rb_camp2_group);
rb_camp2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp1));
hs_recreation = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 1, 10, 1, 0, 0)));
gtk_widget_show (hs_recreation);
gtk_fixed_put (GTK_FIXED (panel_camp), hs_recreation, 220, 120);
@ -194,24 +159,53 @@ create_window_training_camp (void)
GTK_WIDGET_UNSET_FLAGS (hs_recreation, GTK_CAN_FOCUS);
gtk_scale_set_value_pos (GTK_SCALE (hs_recreation), GTK_POS_RIGHT);
rb_camp1 = gtk_radio_button_new_with_mnemonic (NULL, _("Good Hotel"));
gtk_widget_show (rb_camp1);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp1, 24, 16);
gtk_widget_set_size_request (rb_camp1, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp1), rb_camp1_group);
rb_camp1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp1));
rb_camp2 = gtk_radio_button_new_with_mnemonic (NULL, _("First-Class Hotel"));
gtk_widget_show (rb_camp2);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp2, 24, 40);
gtk_widget_set_size_request (rb_camp2, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp2), rb_camp1_group);
rb_camp1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp2));
rb_camp3 = gtk_radio_button_new_with_mnemonic (NULL, _("Premium Hotel"));
gtk_widget_show (rb_camp3);
gtk_fixed_put (GTK_FIXED (panel_camp), rb_camp3, 24, 64);
gtk_widget_set_size_request (rb_camp3, 200, 21);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (rb_camp3), rb_camp1_group);
rb_camp1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_camp3));
hs_camp1 = gtk_hseparator_new ();
gtk_widget_show (hs_camp1);
gtk_fixed_put (GTK_FIXED (panel_camp), hs_camp1, 25, 232);
gtk_widget_set_size_request (hs_camp1, 450, 16);
b_ok = gtk_button_new_from_stock ("gtk-apply");
gtk_widget_show (b_ok);
gtk_fixed_put (GTK_FIXED (panel_camp), b_ok, 256, 254);
gtk_widget_set_size_request (b_ok, 110, 35);
b_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (b_cancel);
gtk_fixed_put (GTK_FIXED (panel_camp), b_cancel, 376, 254);
gtk_widget_set_size_request (b_cancel, 110, 35);
checkbutton_save = gtk_check_button_new_with_mnemonic (_("Save settings as default"));
gtk_widget_show (checkbutton_save);
gtk_fixed_put (GTK_FIXED (panel_camp), checkbutton_save, 24, 264);
gtk_widget_set_size_request (checkbutton_save, 208, 21);
g_signal_connect ((gpointer) window_training_camp, "delete_event",
G_CALLBACK (on_window_training_camp_delete_event),
NULL);
g_signal_connect ((gpointer) b_cancel, "clicked",
G_CALLBACK (on_b_cancel_clicked),
NULL);
g_signal_connect ((gpointer) b_ok, "clicked",
G_CALLBACK (on_b_ok_clicked),
NULL);
g_signal_connect ((gpointer) b_inc_recreation, "clicked",
G_CALLBACK (on_b_inc_recreation_clicked),
NULL);
g_signal_connect ((gpointer) rb_camp2, "clicked",
G_CALLBACK (on_rb_camp2_clicked),
NULL);
g_signal_connect ((gpointer) rb_camp3, "clicked",
G_CALLBACK (on_rb_camp3_clicked),
NULL);
g_signal_connect ((gpointer) b_dec_training, "clicked",
G_CALLBACK (on_b_dec_training_clicked),
NULL);
@ -224,22 +218,29 @@ create_window_training_camp (void)
g_signal_connect ((gpointer) rb_camp1, "clicked",
G_CALLBACK (on_rb_camp1_clicked),
NULL);
g_signal_connect ((gpointer) rb_camp2, "clicked",
G_CALLBACK (on_rb_camp2_clicked),
NULL);
g_signal_connect ((gpointer) rb_camp3, "clicked",
G_CALLBACK (on_rb_camp3_clicked),
NULL);
g_signal_connect ((gpointer) b_ok, "clicked",
G_CALLBACK (on_b_ok_clicked),
NULL);
g_signal_connect ((gpointer) b_cancel, "clicked",
G_CALLBACK (on_b_cancel_clicked),
NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (window_training_camp, window_training_camp, "window_training_camp");
GLADE_HOOKUP_OBJECT (window_training_camp, panel_camp, "panel_camp");
GLADE_HOOKUP_OBJECT (window_training_camp, tf_costs, "tf_costs");
GLADE_HOOKUP_OBJECT (window_training_camp, hs_camp1, "hs_camp1");
GLADE_HOOKUP_OBJECT (window_training_camp, b_cancel, "b_cancel");
GLADE_HOOKUP_OBJECT (window_training_camp, b_ok, "b_ok");
GLADE_HOOKUP_OBJECT (window_training_camp, hs_camp2, "hs_camp2");
GLADE_HOOKUP_OBJECT (window_training_camp, l_camp_points, "l_camp_points");
GLADE_HOOKUP_OBJECT (window_training_camp, b_inc_recreation, "b_inc_recreation");
GLADE_HOOKUP_OBJECT (window_training_camp, image2, "image2");
GLADE_HOOKUP_OBJECT (window_training_camp, l_recreation, "l_recreation");
GLADE_HOOKUP_OBJECT (window_training_camp, l_costs, "l_costs");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp2, "rb_camp2");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp3, "rb_camp3");
GLADE_HOOKUP_OBJECT (window_training_camp, b_dec_training, "b_dec_training");
GLADE_HOOKUP_OBJECT (window_training_camp, image3, "image3");
GLADE_HOOKUP_OBJECT (window_training_camp, l_training, "l_training");
@ -249,8 +250,14 @@ create_window_training_camp (void)
GLADE_HOOKUP_OBJECT (window_training_camp, hs_training, "hs_training");
GLADE_HOOKUP_OBJECT (window_training_camp, b_dec_recreation, "b_dec_recreation");
GLADE_HOOKUP_OBJECT (window_training_camp, image1, "image1");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp1, "rb_camp1");
GLADE_HOOKUP_OBJECT (window_training_camp, hs_recreation, "hs_recreation");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp1, "rb_camp1");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp2, "rb_camp2");
GLADE_HOOKUP_OBJECT (window_training_camp, rb_camp3, "rb_camp3");
GLADE_HOOKUP_OBJECT (window_training_camp, hs_camp1, "hs_camp1");
GLADE_HOOKUP_OBJECT (window_training_camp, b_ok, "b_ok");
GLADE_HOOKUP_OBJECT (window_training_camp, b_cancel, "b_cancel");
GLADE_HOOKUP_OBJECT (window_training_camp, checkbutton_save, "checkbutton_save");
gtk_widget_grab_focus (rb_camp1);
return window_training_camp;

8
src/training_struct.h
View File

@ -32,4 +32,12 @@
#define CAMP_SCALE_MAX 10
#define CAMP_SCALE_STEP 1
enum TrainingCampHotel
{
TRAINING_CAMP_HOTEL_GOOD = 1,
TRAINING_CAMP_HOTEL_FIRST,
TRAINING_CAMP_HOTEL_PREMIUM,
TRAINING_CAMP_HOTEL_END
};
#endif

40
src/treeview.c
View File

@ -2551,6 +2551,46 @@ treeview_show_language_combo(void)
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_languages), idx + 1);
}
GtkTreeModel*
treeview_create_training_hotel_list(void)
{
GtkListStore *ls = gtk_list_store_new(1, G_TYPE_STRING);
GtkTreeIter iter;
gtk_list_store_append(ls, &iter);
gtk_list_store_set(ls, &iter, 0, _("Good Hotel"), -1);
gtk_list_store_append(ls, &iter);
gtk_list_store_set(ls, &iter, 0, _("First-Class Hotel"), -1);
gtk_list_store_append(ls, &iter);
gtk_list_store_set(ls, &iter, 0, _("Premium Hotel"), -1);
return GTK_TREE_MODEL(ls);
}
/** Show the list of training camp hotels. */
void
treeview_show_training_hotels_combo(void)
{
GtkTreeModel *model = treeview_create_training_hotel_list();
GtkComboBox *combo_hotel =
GTK_COMBO_BOX(lookup_widget(window.options, "combobox_hotel"));
GtkCellRenderer *renderer = NULL;
gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo_hotel));
renderer = treeview_helper_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_hotel), renderer, FALSE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_hotel), renderer, "text", 0, NULL);
gtk_combo_box_set_model(combo_hotel, model);
g_object_unref(model);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_hotel),
opt_user_int("int_opt_user_training_camp_hotel") - 1);
}
GtkTreeModel*
treeview_create_sponsors(const GArray *sponsors)
{

6
src/treeview.h
View File

@ -241,4 +241,10 @@ treeview_set_up_sponsors(GtkTreeView *treeview);
void
treeview_show_sponsors(const GArray *sponsors);
GtkTreeModel*
treeview_create_training_hotel_list(void);
void
treeview_show_training_hotels_combo(void);
#endif

4
src/user.c
View File

@ -174,6 +174,8 @@ user_set_up_counters(User *user)
user->counters[COUNT_USER_LOAN] =
user->counters[COUNT_USER_POSITIVE] = -1;
user->counters[COUNT_USER_TRAININGS_LEFT_SEASON] =
const_int("int_training_camps_per_season");
}
/** Set up the user's finances when he's got a new team.
@ -354,6 +356,8 @@ user_weekly_update_counters(User *user)
gint increase_capacity;
gfloat increase_safety;
cnts[COUNT_USER_TRAININGS_WEEK] = 0;
if(cnts[COUNT_USER_STADIUM_CAPACITY] > 0)
{
increase_capacity = math_rndi(const_int("int_stadium_improvement_base_seats") -

2
src/user_struct.h
View File

@ -80,6 +80,8 @@ enum CounterValue
COUNT_USER_SHOW_RES, /**< Whether the latest result is shown when the main window gets refreshed. */
COUNT_USER_TOOK_TURN, /**< Whether the user took his turn in a week round. */
COUNT_USER_NEW_SPONSOR, /**< A new sponsor offer has to be shown. */
COUNT_USER_TRAININGS_WEEK, /**< Whether the user has already had a training camp this week. */
COUNT_USER_TRAININGS_LEFT_SEASON, /**< How many training camps left for the season. */
COUNT_USER_END
};

15
src/window.c
View File

@ -952,7 +952,13 @@ window_show_training_camp(void)
rb_camp1 = GTK_WIDGET(lookup_widget(window.training_camp, "rb_camp1"));
rb_camp2 = GTK_WIDGET(lookup_widget(window.training_camp, "rb_camp2"));
rb_camp3 = GTK_WIDGET(lookup_widget(window.training_camp, "rb_camp3"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb_camp1), TRUE);
if(opt_user_int("int_opt_user_training_camp_hotel") == TRAINING_CAMP_HOTEL_GOOD)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb_camp1), TRUE);
else if(opt_user_int("int_opt_user_training_camp_hotel") == TRAINING_CAMP_HOTEL_FIRST)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb_camp2), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb_camp3), TRUE);
//Initialize labels
l_costs = GTK_LABEL(lookup_widget(window.training_camp, "l_costs"));
@ -971,9 +977,10 @@ window_show_training_camp(void)
gtk_range_set_range (GTK_RANGE(hs_recreation), CAMP_SCALE_MIN, CAMP_SCALE_MAX);
gtk_range_set_range (GTK_RANGE(hs_training), CAMP_SCALE_MIN, CAMP_SCALE_MAX);
gtk_range_set_range (GTK_RANGE(hs_camp_points), CAMP_SCALE_MIN, CAMP_SCALE_MAX);
gtk_range_set_value (GTK_RANGE(hs_recreation), CAMP_SCALE_MIN);
gtk_range_set_value (GTK_RANGE(hs_training), CAMP_SCALE_MIN);
gtk_range_set_value (GTK_RANGE(hs_camp_points), CAMP_SCALE_MAX);
gtk_range_set_value (GTK_RANGE(hs_recreation), opt_user_int("int_opt_user_training_camp_recreation"));
gtk_range_set_value (GTK_RANGE(hs_training),
CAMP_SCALE_MAX - opt_user_int("int_opt_user_training_camp_recreation"));
gtk_range_set_value (GTK_RANGE(hs_camp_points), CAMP_SCALE_MIN);
gtk_scale_set_digits (GTK_SCALE(hs_recreation), 0);
gtk_scale_set_digits (GTK_SCALE(hs_training), 0);
gtk_scale_set_digits (GTK_SCALE(hs_camp_points), 0);

7
support_files/bygfoot_constants
View File

@ -229,7 +229,6 @@ int_treeview_max_pipes 50
float_player_pos_bound1 37550
float_player_pos_bound2 75100
# minimum number of players in a user team.
int_team_min_players 11
# maximum number of players in a user team.
@ -981,3 +980,9 @@ float_transfer_star_goalie_accepts 12000
float_training_camp_factor1 500000
float_training_camp_factor2 1000000
float_training_camp_factor3 1500000
# number of training camps allowed for one season
int_training_camps_per_season 12
# number of training camps allowed per week
int_training_camps_week 2

4
support_files/bygfoot_user.conf
View File

@ -27,6 +27,10 @@ int_opt_user_bet_show_cups 1
int_opt_user_bet_show_my_recent 1
int_opt_user_bet_default_wager 5000
# default training camp hotel
int_opt_user_training_camp_hotel 1
int_opt_user_training_camp_recreation 5
# the order of these attributes is important
# don't change it, only the values
int_opt_user_pl1_att_name 1