rixty/bygfoot
1
1
Fork 0
mirror of https://github.com/tstellar/bygfoot.git synced 2025-03-27 08:00:18 +01:00
Code Issues Projects Releases Wiki Activity

"Transfer improvements."

Browse Source
This commit is contained in:
gyboth 2005-05-28 08:19:56 +00:00
parent 46e15b8da3
commit acd44b96ed
15 changed files with 95 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bygfoot_misc.glade
View File

@ -1093,6 +1093,7 @@
<child>
<widget class="GtkButton" id="button_pause">
<property name="visible">True</property>
<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>
@ -1169,11 +1170,11 @@
<child>
<widget class="GtkButton" id="button_resume">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">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_resume_clicked" last_modification_time="Sat, 08 Jan 2005 11:22:05 GMT"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
<child>
<widget class="GtkAlignment" id="alignment17">
@ -1246,6 +1247,7 @@
<widget class="GtkButton" id="button_live_close">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Return / Space</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>

4
bygfoot_misc2.glade
View File

@ -817,6 +817,7 @@
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 1e+08 10 1000 10</property>
<signal name="activate" handler="on_spinbutton1_activate" last_modification_time="Sat, 28 May 2005 07:51:46 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -870,6 +871,7 @@
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 1e+08 1 100 10</property>
<signal name="activate" handler="on_spinbutton2_activate" last_modification_time="Sat, 28 May 2005 07:51:56 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -901,14 +903,12 @@
<child>
<widget class="GtkButton" id="button_digits_ok">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Return</property>
<property name="can_focus">True</property>
<property name="label">gtk-ok</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_digits_ok_clicked" last_modification_time="Thu, 17 Mar 2005 08:06:17 GMT"/>
<accelerator key="Return" modifiers="0" signal="clicked"/>
</widget>
<packing>
<property name="padding">0</property>

2
src/Makefile.am
View File

@ -32,7 +32,7 @@ bygfoot_SOURCES = \
misc_callback_func.c callbacks.h finance.h game.h game_gui.h gui.h load_save.h maths.h misc_callback_func.h option.h start_end.h support.h treeview.h user.h variables.h window.h xml_country.h xml_name.h \
misc_interface.c misc_interface.h misc_callbacks.h support.h \
misc2_callbacks.c callback_func.h debug.h finance.h game_gui.h load_save.h main.h misc2_callbacks.h misc2_callback_func.h misc2_interface.h player.h support.h transfer.h treeview.h user.h window.h \
misc2_callback_func.c file.h finance.h game_gui.h maths.h misc2_callback_func.h option.h player.h support.h team.h treeview.h transfer.h user.h window.h \
misc2_callback_func.c callbacks.h file.h finance.h game_gui.h maths.h misc2_callback_func.h option.h player.h support.h team.h treeview.h transfer.h user.h window.h \
misc2_interface.c misc2_interface.h misc2_callbacks.h support.h \
option.c option.h variables.h \
option_gui.c file.h game_gui.h callbacks.h option_gui.h option.h support.h user.h variables.h \

2
src/game_gui.c
View File

@ -68,12 +68,14 @@ game_gui_live_game_show_unit(const LiveGameUnit *unit)
gtk_widget_set_sensitive(button_live_close, (stat1 == STATUS_SHOW_LAST_MATCH));
gtk_widget_set_sensitive(button_pause, TRUE);
gtk_widget_set_sensitive(button_resume, FALSE);
gtk_widget_grab_focus(button_pause);
}
else if(unit->event.type == LIVE_GAME_EVENT_END_MATCH)
{
gtk_widget_set_sensitive(button_live_close, TRUE);
gtk_widget_set_sensitive(button_pause, FALSE);
gtk_widget_set_sensitive(button_resume, FALSE);
gtk_widget_grab_focus(button_live_close);
game_gui_set_main_window_sensitivity(FALSE);
}

3
src/misc2_callback_func.c
View File

@ -1,3 +1,4 @@
#include "callbacks.h"
#include "file.h"
#include "finance.h"
#include "game_gui.h"
@ -62,6 +63,7 @@ misc2_callback_transfer_user_player(void)
treeview_show_user_player_list();
game_gui_set_main_window_header();
on_button_transfers_clicked(NULL, NULL);
}
/** Transfer a cpu player to a user team. */
@ -83,6 +85,7 @@ misc2_callback_transfer_cpu_player(void)
treeview_show_user_player_list();
game_gui_set_main_window_header();
on_button_transfers_clicked(NULL, NULL);
}
/** Change the user team's structure to a value he's specified. */

18
src/misc2_callbacks.c
View File

@ -377,3 +377,21 @@ on_button_help_close_clicked (GtkButton *button,
{
window_destroy(&window.help, FALSE);
}
void
on_spinbutton1_activate (GtkEntry *entry,
gpointer user_data)
{
gtk_spin_button_update(GTK_SPIN_BUTTON(lookup_widget(window.digits, "spinbutton1")));
on_button_digits_ok_clicked(NULL, NULL);
}
void
on_spinbutton2_activate (GtkEntry *entry,
gpointer user_data)
{
gtk_spin_button_update(GTK_SPIN_BUTTON(lookup_widget(window.digits, "spinbutton2")));
on_button_digits_ok_clicked(NULL, NULL);
}

8
src/misc2_callbacks.h
View File

@ -125,3 +125,11 @@ void
on_button_help_close_clicked (GtkButton *button,
gpointer user_data);
#endif
void
on_spinbutton1_activate (GtkEntry *entry,
gpointer user_data);
void
on_spinbutton2_activate (GtkEntry *entry,
gpointer user_data);

10
src/misc2_interface.c
View File

@ -427,10 +427,6 @@ create_window_digits (void)
button_digits_ok = gtk_button_new_from_stock ("gtk-ok");
gtk_widget_show (button_digits_ok);
gtk_box_pack_start (GTK_BOX (hbox16), button_digits_ok, TRUE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, button_digits_ok, _("Return"), NULL);
gtk_widget_add_accelerator (button_digits_ok, "clicked", accel_group,
GDK_Return, 0,
GTK_ACCEL_VISIBLE);
button_digits_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (button_digits_cancel);
@ -443,6 +439,12 @@ create_window_digits (void)
g_signal_connect ((gpointer) window_digits, "delete_event",
G_CALLBACK (on_window_digits_delete_event),
NULL);
g_signal_connect ((gpointer) spinbutton1, "activate",
G_CALLBACK (on_spinbutton1_activate),
NULL);
g_signal_connect ((gpointer) spinbutton2, "activate",
G_CALLBACK (on_spinbutton2_activate),
NULL);
g_signal_connect ((gpointer) button_digits_ok, "clicked",
G_CALLBACK (on_button_digits_ok_clicked),
NULL);

6
src/misc_callback_func.c
View File

@ -125,6 +125,9 @@ misc_callback_remove_user(GdkEventButton *event)
void
misc_callback_pause_live_game(void)
{
GtkWidget *button_resume =
lookup_widget(window.live, "button_resume");
if(stat1 == STATUS_SHOW_LAST_MATCH)
{
stat4 = STATUS_SHOW_LAST_MATCH_PAUSE;
@ -137,7 +140,8 @@ misc_callback_pause_live_game(void)
return;
gtk_widget_set_sensitive(lookup_widget(window.live, "button_pause"), FALSE);
gtk_widget_set_sensitive(lookup_widget(window.live, "button_resume"), TRUE);
gtk_widget_set_sensitive(button_resume, TRUE);
gtk_widget_grab_focus(button_resume);
game_gui_set_main_window_sensitivity(TRUE);
game_save_team_states();

8
src/misc_callbacks.c
View File

@ -193,6 +193,9 @@ void
on_button_resume_clicked (GtkButton *button,
gpointer user_data)
{
GtkWidget *button_pause =
lookup_widget(window.live, "button_pause");
if(stat1 == STATUS_SHOW_LAST_MATCH)
{
callback_show_last_match(FALSE);
@ -204,7 +207,10 @@ on_button_resume_clicked (GtkButton *button,
if(g_array_index(usr(stat2).live_game.units, LiveGameUnit,
usr(stat2).live_game.units->len - 1).event.type !=
LIVE_GAME_EVENT_PENALTIES)
gtk_widget_set_sensitive(lookup_widget(window.live, "button_pause"), TRUE);
{
gtk_widget_set_sensitive(button_pause, TRUE);
gtk_widget_grab_focus(button_pause);
}
game_gui_set_main_window_sensitivity(FALSE);
live_game_resume();
}

6
src/misc_interface.c
View File

@ -642,6 +642,7 @@ create_window_live (void)
button_pause = gtk_button_new ();
gtk_widget_show (button_pause);
gtk_box_pack_start (GTK_BOX (hbox48), button_pause, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, button_pause, _("Esc / Return / Space"), NULL);
gtk_widget_add_accelerator (button_pause, "clicked", accel_group,
GDK_Escape, 0,
GTK_ACCEL_VISIBLE);
@ -665,9 +666,7 @@ create_window_live (void)
button_resume = gtk_button_new ();
gtk_widget_show (button_resume);
gtk_box_pack_start (GTK_BOX (hbox48), button_resume, FALSE, FALSE, 0);
gtk_widget_add_accelerator (button_resume, "clicked", accel_group,
GDK_Return, 0,
GTK_ACCEL_VISIBLE);
gtk_tooltips_set_tip (tooltips, button_resume, _("Return / Space"), NULL);
alignment17 = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_widget_show (alignment17);
@ -689,6 +688,7 @@ create_window_live (void)
gtk_widget_show (button_live_close);
gtk_box_pack_start (GTK_BOX (hbox48), button_live_close, FALSE, FALSE, 0);
gtk_widget_set_sensitive (button_live_close, FALSE);
gtk_tooltips_set_tip (tooltips, button_live_close, _("Return / Space"), NULL);
table2 = gtk_table_new (2, 2, FALSE);
gtk_widget_show (table2);

19
src/transfer.c
View File

@ -331,6 +331,25 @@ query_transfer_player_is_on_list(const Player *pl)
return FALSE;
}
/** Check whether there is an offer by the current
user for the player. */
gboolean
query_transfer_current_team_offer(const Player *pl)
{
gint i, j;
for(i=0;i<transfer_list->len;i++)
if(trans(i).tm == pl->team &&
trans(i).id == pl->id)
{
for(j=0;j<trans(i).offers->len;j++)
if(transoff(i, j).tm == current_user.tm)
return TRUE;
}
return FALSE;
}
/** Find out whether a player is on the list
and there are offers to buy him. */
const TransferOffer*

3
src/transfer.h
View File

@ -65,4 +65,7 @@ transfer_offers_notify(Transfer *trans);
const TransferOffer*
transfer_player_has_offer(const Player *pl);
gboolean
query_transfer_current_team_offer(const Player *pl);
#endif

8
src/treeview_helper.c
View File

@ -951,7 +951,6 @@ treeview_helper_player_name_to_cell(GtkCellRenderer *renderer, gchar *buf, const
if(pl->team == current_user.tm &&
opt_user_int("int_opt_user_penalty_shooter") == pl->id)
strcat(buf, _(" (P)"));
if(off != NULL)
{
@ -962,9 +961,14 @@ treeview_helper_player_name_to_cell(GtkCellRenderer *renderer, gchar *buf, const
}
else if(off->tm == current_user.tm)
{
colour_bg = const_app("string_treeview_helper_color_transfer_offer_locked_cpu_bg");
colour_fg = const_app("string_treeview_helper_color_transfer_offer_locked_cpu_fg");
}
}
else if(query_transfer_current_team_offer(pl))
{
colour_bg = const_app("string_treeview_helper_color_transfer_offer_cpu_bg");
colour_fg = const_app("string_treeview_helper_color_transfer_offer_cpu_fg");
}
}
g_object_set(renderer, "background", colour_bg, NULL);

12
support_files/bygfoot_app
View File

@ -28,9 +28,15 @@ string_treeview_helper_color_default_foreground black
string_treeview_helper_color_transfer_offer_user_fg white
string_treeview_helper_color_transfer_offer_user_bg darkgreen
# colours for cpu players on the list that have a valid offer
string_treeview_helper_color_transfer_offer_cpu_fg white
string_treeview_helper_color_transfer_offer_cpu_bg darkorange
# colours for cpu players on the list that have
# a valid (locked) offer
string_treeview_helper_color_transfer_offer_locked_cpu_fg white
string_treeview_helper_color_transfer_offer_locked_cpu_bg darkorange
# colours for cpu players for which the user just
# placed an offer
string_treeview_helper_color_transfer_offer_cpu_fg black
string_treeview_helper_color_transfer_offer_cpu_bg lightblue
string_treeview_helper_color_player_pos_goalie_bg black
string_treeview_helper_color_player_pos_goalie_fg white