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

Live game appearance.

This commit is contained in:
gyboth 2005-01-24 21:49:14 +00:00
parent 343d720a56
commit 3b8dc0e572
3 changed files with 130 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
bygfoot_misc.glade
View File

@ -14,6 +14,11 @@
<property name="default_height">600</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<signal name="delete_event" handler="on_team_selection_cancel_clicked" last_modification_time="Wed, 12 May 2004 15:48:03 GMT"/>
<child>
@ -91,6 +96,8 @@
<widget class="GtkEventBox" id="eventbox1">
<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>
<child>
<widget class="GtkHBox" id="hbox2">
@ -106,6 +113,7 @@
<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>
@ -125,6 +133,7 @@
<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>
@ -145,6 +154,7 @@
<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>
@ -269,6 +279,7 @@
<property name="tooltip" translatable="yes">Choose a custom country file (see Help)</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_select_country_file_clicked" last_modification_time="Mon, 05 Apr 2004 12:58:12 GMT"/>
<child>
@ -278,6 +289,10 @@
<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="hbox45">
@ -382,6 +397,7 @@
<property name="label" translatable="yes">Don't load team definitions</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>
@ -403,6 +419,7 @@
<property name="label" translatable="yes">Load only names from team definition file</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>
@ -424,6 +441,7 @@
<property name="label" translatable="yes">Load my team from definitions file</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>
@ -462,6 +480,7 @@
<property name="tooltip" translatable="yes">You can start the editor from the commandline with 'bygfoot -e' or '--editor'</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_start_editor_clicked" last_modification_time="Fri, 14 May 2004 12:55:57 GMT"/>
<child>
@ -471,6 +490,10 @@
<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="hbox47">
@ -547,6 +570,7 @@
<property name="tooltip" translatable="yes">Return</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_team_selection_ok_clicked" last_modification_time="Tue, 27 Jan 2004 17:27:11 GMT"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
@ -557,6 +581,10 @@
<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="hbox4">
@ -620,6 +648,7 @@
<property name="tooltip" translatable="yes">Esc</property>
<property name="can_focus">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"/>
@ -630,6 +659,10 @@
<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">
@ -693,6 +726,7 @@
<property name="tooltip" translatable="yes">L</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_team_selection_load_clicked" last_modification_time="Fri, 06 Feb 2004 17:05:28 GMT"/>
<accelerator key="l" modifiers="0" signal="clicked"/>
@ -703,6 +737,10 @@
<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="hbox6">
@ -778,6 +816,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<signal name="delete_event" handler="on_popup_window_delete_event" last_modification_time="Fri, 06 Feb 2004 17:57:53 GMT"/>
<child>
@ -959,6 +1002,7 @@
<property name="label" translatable="yes">radiobutton0</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>
@ -976,6 +1020,7 @@
<property name="label" translatable="yes">radiobutton1</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>
@ -995,6 +1040,7 @@
<property name="label" translatable="yes">Don't bother me with this next time</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>
@ -1019,6 +1065,7 @@
<property name="tooltip" translatable="yes">Return</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_popup_ok_clicked" last_modification_time="Sun, 01 Feb 2004 16:27:19 GMT"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
@ -1029,6 +1076,10 @@
<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="hbox30">
@ -1091,6 +1142,7 @@
<property name="tooltip" translatable="yes">Esc</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_popup_cancel_clicked" last_modification_time="Sun, 01 Feb 2004 16:27:28 GMT"/>
<accelerator key="Escape" modifiers="0" signal="clicked"/>
@ -1101,6 +1153,10 @@
<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="hbox31">
@ -1162,6 +1218,7 @@
<property name="border_width">2</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_popup_close_clicked" last_modification_time="Thu, 05 Feb 2004 10:18:34 GMT"/>
<child>
@ -1171,6 +1228,10 @@
<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="hbox32">
@ -1234,6 +1295,7 @@
<property name="label" translatable="yes">button8</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1249,6 +1311,7 @@
<property name="label" translatable="yes">button9</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1264,6 +1327,7 @@
<property name="label" translatable="yes">button10</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1291,6 +1355,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="show_fileops">True</property>
<signal name="delete_event" handler="on_fsel_window_delete_event" last_modification_time="Fri, 06 Feb 2004 17:57:00 GMT"/>
@ -1301,6 +1370,7 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_fsel_cancel_clicked" last_modification_time="Fri, 06 Feb 2004 11:59:21 GMT"/>
<accelerator key="Escape" modifiers="0" signal="clicked"/>
</widget>
@ -1313,6 +1383,7 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_fsel_ok_clicked" last_modification_time="Fri, 06 Feb 2004 11:59:35 GMT"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
</widget>
@ -1328,6 +1399,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<signal name="delete_event" handler="on_button_font_sel_cancel_clicked" last_modification_time="Sat, 07 Feb 2004 16:24:38 GMT"/>
<child internal-child="cancel_button">
@ -1336,6 +1412,7 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_font_sel_cancel_clicked" last_modification_time="Sat, 07 Feb 2004 16:23:50 GMT"/>
</widget>
</child>
@ -1346,6 +1423,7 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_font_sel_apply_clicked" last_modification_time="Sat, 07 Feb 2004 16:22:16 GMT"/>
</widget>
</child>
@ -1356,6 +1434,7 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_font_sel_ok_clicked" last_modification_time="Sat, 07 Feb 2004 16:22:11 GMT"/>
</widget>
</child>
@ -1385,6 +1464,11 @@
<property name="default_height">550</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<signal name="delete_event" handler="on_live_window_delete_event" last_modification_time="Fri, 18 Jun 2004 16:46:46 GMT"/>
<child>
@ -1407,23 +1491,6 @@
</packing>
</child>
<child>
<widget class="GtkHRuler" id="hruler_live">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="metric">GTK_PIXELS</property>
<property name="lower">0</property>
<property name="upper">120</property>
<property name="position">66.5753</property>
<property name="max_size">120</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox50">
<property name="visible">True</property>
@ -1463,6 +1530,24 @@
</packing>
</child>
<child>
<widget class="GtkHScale" id="hscale_area">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_value">False</property>
<property name="value_pos">GTK_POS_TOP</property>
<property name="digits">1</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
<property name="adjustment">5 0 10 0 0 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
@ -1515,6 +1600,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_pause_clicked" last_modification_time="Fri, 07 Jan 2005 13:35:11 GMT"/>
<accelerator key="space" modifiers="0" signal="clicked"/>
@ -1525,6 +1611,10 @@
<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="hbox51">
@ -1585,6 +1675,7 @@
<widget class="GtkButton" id="button_resume">
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_resume_clicked" last_modification_time="Sat, 08 Jan 2005 11:22:05 GMT"/>
<child>
@ -1594,6 +1685,10 @@
<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="hbox52">
@ -1658,6 +1753,7 @@
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_live_close_clicked" last_modification_time="Sat, 08 Jan 2005 11:24:05 GMT"/>
</widget>
<packing>
@ -1709,6 +1805,11 @@
<property name="default_height">650</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
<widget class="GtkVBox" id="vbox27">
@ -1730,6 +1831,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="overwrite">False</property>
<property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">True</property>
@ -1757,6 +1860,7 @@
<property name="tooltip" translatable="yes">Esc / Return / Space</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_help_close_clicked" last_modification_time="Wed, 11 Feb 2004 12:37:17 GMT"/>
<accelerator key="Escape" modifiers="0" signal="clicked"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
@ -1769,6 +1873,10 @@
<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="hbox40">

6
src/game_gui.c
View File

@ -19,6 +19,8 @@
void
game_gui_live_game_show_unit(const LiveGameUnit *unit)
{
gchar buf[SMALL];
gfloat fraction = (gfloat)live_game_unit_get_minute(unit) / 90;
GtkProgressBar *progress_bar;
if(live_game.window == NULL)
@ -38,8 +40,10 @@ game_gui_live_game_show_unit(const LiveGameUnit *unit)
game_gui_live_game_set_hscale(unit,
GTK_HSCALE(lookup_widget(live_game.window, "hscale_area")));
sprintf(buf, "%d.", live_game_unit_get_minute(unit));
progress_bar = GTK_PROGRESS_BAR(lookup_widget(live_game.window, "progressbar_live"));
gtk_progress_bar_set_fraction(progress_bar, (gfloat)live_game_unit_get_minute(unit) / 120);
gtk_progress_bar_set_fraction(progress_bar, (fraction > 1) ? 1 : fraction);
gtk_progress_bar_set_text(progress_bar, buf);
usleep(500500 + options[OPT_LIVE_SPEED] * 50000);
while(gtk_events_pending())
gtk_main_iteration();

8
src/misc_interface.c
View File

@ -804,7 +804,6 @@ create_window_live (void)
GtkWidget *window_live;
GtkWidget *vbox36;
GtkWidget *progressbar_live;
GtkWidget *hruler_live;
GtkWidget *hbox50;
GtkWidget *vbox38;
GtkWidget *scrolledwindow8;
@ -844,12 +843,6 @@ create_window_live (void)
gtk_widget_show (progressbar_live);
gtk_box_pack_start (GTK_BOX (vbox36), progressbar_live, FALSE, FALSE, 0);
hruler_live = gtk_hruler_new ();
gtk_widget_show (hruler_live);
gtk_box_pack_start (GTK_BOX (vbox36), hruler_live, FALSE, TRUE, 0);
gtk_widget_set_sensitive (hruler_live, FALSE);
gtk_ruler_set_range (GTK_RULER (hruler_live), 0, 120, 41.3699, 120);
hbox50 = gtk_hbox_new (FALSE, 3);
gtk_widget_show (hbox50);
gtk_box_pack_start (GTK_BOX (vbox36), hbox50, TRUE, TRUE, 0);
@ -961,7 +954,6 @@ create_window_live (void)
GLADE_HOOKUP_OBJECT_NO_REF (window_live, window_live, "window_live");
GLADE_HOOKUP_OBJECT (window_live, vbox36, "vbox36");
GLADE_HOOKUP_OBJECT (window_live, progressbar_live, "progressbar_live");
GLADE_HOOKUP_OBJECT (window_live, hruler_live, "hruler_live");
GLADE_HOOKUP_OBJECT (window_live, hbox50, "hbox50");
GLADE_HOOKUP_OBJECT (window_live, vbox38, "vbox38");
GLADE_HOOKUP_OBJECT (window_live, scrolledwindow8, "scrolledwindow8");