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

"Minor fixes."

This commit is contained in:
gyboth 2005-09-12 21:01:35 +00:00
parent f0300ff1b3
commit d020d33c51
11 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,15 +1,19 @@
10/10/2005: v1.9.2
- fixed some minor bugs
- updated the Bulgarian translation
09/10/2005: v1.9.1
- updated German and Dutch translations
- added Polish (complete), French (almost complete), Romanian
(a.c.) and Bulgarian (a.c.) translations
(a.c.) and Bulgarian (a.c.) translations
- added i18n support for the binary package
- transfer offers are remembered
- added sponsorship money
- fixed some minor bugs
- improved live game commentary (moved to XML files, added
conditions etc.)
conditions etc.)
- added country definitions for Australia, Bulgaria, Victoria
(Australia), Spain and Serbia&Montenegro
(Australia), Spain and Serbia&Montenegro
- added youth academy
- added experimental Windows port (thanks to Simon Binns)
- improved definition system

4
Makefile.am
View File

File diff suppressed because one or more lines are too long

62
bygfoot-update
View File

@ -10,7 +10,7 @@
# using wget to retrieve patches from the homepage
# version number
version="1.9.1"
version="1.9.1.1"
# the bygfoot release version the script is shipped with
relversion=UNKNOWN_VERSION
# the current release version on the server
@ -337,16 +337,16 @@ function read_input()
# get team definitions
function get_team_defs()
{
if [ ! -d definitions/teams ]; then
mkdir definitions/teams
if [ ! -d teams ]; then
mkdir teams
fi
pushd definitions/teams &> /dev/null
pushd teams &> /dev/null
rm -vf team_defs 2>> $log_file | tee -a $log_file
my_wget http://bygfoot.sourceforge.net/revisions/team_defs
while read key value; do
while read key value; do
if [ ! -z $key ]; then
if [ $key = "end_section" ]; then
file_name=$(echo $uri | sed "s/.*\(team_.*bz2\)/\1/g" | sed "s/\.bz2//g")
@ -361,12 +361,6 @@ function get_team_defs()
my_wget $uri
tar xfj $file_name.bz2
# echo "+++ uri +$uri+ file +$file_name+"
# echo
# echo "uri $uri file $file_name nam +$team_name1+ +$team_name2+ cou $country def $def_name"
# echo
# read a
if [ -d ../$country ]; then
pushd ../$country &> /dev/null
@ -406,21 +400,13 @@ function get_team_defs()
# get country files with official team names
function get_country_files()
{
if [ $use_zenity -eq 1 ]; then
my_zenity --title="Bygfoot Online Update" --info \
--info-text="If you use the binary version of Bygfoot, the team names and definitions won't work unless you remove the 'support_files/definitons' directory from the Bygfoot directory (containing the executable)."
else
dialog --title "Bygfoot Online Update" --msgbox "If you use the binary version of Bygfoot, the team names and definitions won't work unless you remove the 'support_files/definitons' directory from the Bygfoot directory (containing the executable)." \
22 80 2> $input_file
fi
my_echo
my_echo "** b-u: Fetching official team names and"
my_echo "** b-u: team definitions files."
pushd $countrydir &>/dev/null
my_wget http://bygfoot.sourceforge.net/revisions/official_names
my_wget http://bygfoot.sourceforge.net/revisions/official_names
while read -d : oldname && read newname
do
@ -430,7 +416,7 @@ function get_country_files()
else
oldname="${oldname## }"
newname="${newname%% }"
sed -i -e "s/>$oldname</>$newname</" definitions/$DIRNAME/league*.xml
sed -i -e "s/>$oldname</>$newname</" $DIRNAME/league*.xml
fi
done < official_names
@ -503,15 +489,23 @@ function get_paths()
fi
if [ $mode -eq $mode_country ]; then
if [ $use_zenity -eq 1 ]; then
my_zenity --title="Bygfoot Online Update" --info \
--info-text="If you use the binary version of Bygfoot, you should specify './support_files/definitions' as country dir. If you use an installed version, you should specify '$HOME/.bygfoot-X/definitions' (X being the version number you use)."
else
dialog --title "Bygfoot Online Update" --msgbox "If you use the binary version of Bygfoot, you should specify './support_files/definitons' as country dir. If you use an installed version, you should specify '$HOME/.bygfoot-X/definitions' (X being the version number you use)." \
22 80 2> $input_file
fi
if [ -z $countrydir ]; then
if [ $auto -eq 0 ]; then
if [ $use_zenity -eq 1 ]; then
my_zenity --title="Definitions dir ($HOME/.bygfoot-1.9 should be ok; right click to show hidden)" \
my_zenity --title="Definitions dir (right click to show hidden)" \
--file-selection --directory
else
dialog --title "Bygfoot Online Update" \
--inputbox "Directory containing definitions directory\n(default destination should be ok)" \
22 80 $HOME/.bygfoot-1.9/ 2> $input_file
--inputbox "Directory containing definitions directory" \
22 80 $HOME/.bygfoot-1.9/definitions 2> $input_file
fi
read_input
@ -519,10 +513,10 @@ function get_paths()
if [ ! -z $tempvar ]; then
pushd $tempvar &> /dev/null; countrydir=$PWD; popd &> /dev/null
else
countrydir=$HOME/.bygfoot/text_files
countrydir=$HOME/.bygfoot-1.9/definitions
fi
else
countrydir=$HOME/.bygfoot/text_files
countrydir=$HOME/.bygfoot-1.9/definitions
fi
my_echo
my_echo "** b-u: Country dir set to"
@ -572,14 +566,14 @@ function apply_rev()
$newrevdir/postpatch 2>> $log_file | tee -a $log_file
fi
cd $tmpdir/bygfoot-update
cd $tmpdir/bygfoot-update-tmp
}
# fetch a revision archive from the homepage and
# patch the src package
function get_revision()
{
local newrevdir=$tmpdir/bygfoot-update/revision_$type$newrevnr
local newrevdir=$tmpdir/bygfoot-update-tmp/revision_$type$newrevnr
my_echo
my_echo "** b-u: Retrieving revision_$type$newrevnr.tar.bz2."
@ -634,9 +628,9 @@ function get_revs()
my_echo
cd $tmpdir
my_echo "** b-u: Cleaning up old update directories and creating a new one..."
rm -rfv bygfoot-update 2>> $log_file | tee -a $log_file
mkdir -v bygfoot-update 2>> $log_file | tee -a $log_file
cd bygfoot-update
rm -rfv bygfoot-update-tmp 2>> $log_file | tee -a $log_file
mkdir -v bygfoot-update-tmp 2>> $log_file | tee -a $log_file
cd bygfoot-update-tmp
my_echo
my_echo "** b-u: Fetching revision list..."
my_wget http://bygfoot.sourceforge.net/revisions/$type/revisions_$type
@ -742,9 +736,9 @@ function get_type()
function get_latest_versions()
{
pushd $tmpdir &> /dev/null
rm -rfv bygfoot-update 2>> $log_file | tee -a $log_file
mkdir bygfoot-update
cd bygfoot-update
rm -rfv bygfoot-update-tmp 2>> $log_file | tee -a $log_file
mkdir -v bygfoot-update-tmp
cd bygfoot-update-tmp
my_wget http://bygfoot.sourceforge.net/packages/$type/versions
packlist=`cat versions`

8
bygfoot_options.glade
View File

@ -460,7 +460,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@ -659,7 +659,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@ -675,12 +675,12 @@
<child>
<widget class="GtkEventBox" id="eventbox2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Setting the language only works for installed packages (not for the binary package)</property>
<property name="tooltip" translatable="yes">Choose game language (might not work in Windows versions)</property>
<property name="visible_window">True</property>
<property name="above_child">False</property>
<child>
<widget class="GtkComboBoxEntry" id="comboboxentry_languages">
<widget class="GtkComboBox" id="combobox_languages">
<property name="visible">True</property>
</widget>
</child>

2
src/misc_callbacks.c
View File

@ -59,7 +59,7 @@ void
on_team_selection_load_clicked (GtkButton *button,
gpointer user_data)
{
stat1 = STATUS_LOAD_GAME_TEAM_SELECTION;
stat5 = STATUS_LOAD_GAME_TEAM_SELECTION;
window_show_file_sel();
}

2
src/option_gui.c
View File

@ -402,7 +402,7 @@ option_gui_write_options(void)
{
gint i;
gint language_index =
gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(window.options, "comboboxentry_languages")));
gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(window.options, "combobox_languages")));
GtkToggleButton *bool_widgets[BOOL_OPT_END];
gint *bool_options[BOOL_OPT_END];
GtkSpinButton *spin_widgets[SPIN_OPT_END];

12
src/options_interface.c
View File

@ -72,7 +72,7 @@ create_window_options (void)
GtkWidget *spinbutton_refresh;
GtkWidget *entry_font_name;
GtkWidget *eventbox2;
GtkWidget *comboboxentry_languages;
GtkWidget *combobox_languages;
GtkWidget *label1;
GtkWidget *hbox4;
GtkWidget *vbox4;
@ -394,11 +394,11 @@ create_window_options (void)
gtk_table_attach (GTK_TABLE (table1), eventbox2, 1, 2, 5, 6,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
gtk_tooltips_set_tip (tooltips, eventbox2, _("Setting the language only works for installed packages (not for the binary package)"), NULL);
gtk_tooltips_set_tip (tooltips, eventbox2, _("Choose game language (might not work in Windows versions)"), NULL);
comboboxentry_languages = gtk_combo_box_entry_new ();
gtk_widget_show (comboboxentry_languages);
gtk_container_add (GTK_CONTAINER (eventbox2), comboboxentry_languages);
combobox_languages = gtk_combo_box_new_text ();
gtk_widget_show (combobox_languages);
gtk_container_add (GTK_CONTAINER (eventbox2), combobox_languages);
label1 = gtk_label_new (_("Global"));
gtk_widget_show (label1);
@ -1048,7 +1048,7 @@ create_window_options (void)
GLADE_HOOKUP_OBJECT (window_options, spinbutton_refresh, "spinbutton_refresh");
GLADE_HOOKUP_OBJECT (window_options, entry_font_name, "entry_font_name");
GLADE_HOOKUP_OBJECT (window_options, eventbox2, "eventbox2");
GLADE_HOOKUP_OBJECT (window_options, comboboxentry_languages, "comboboxentry_languages");
GLADE_HOOKUP_OBJECT (window_options, combobox_languages, "combobox_languages");
GLADE_HOOKUP_OBJECT (window_options, label1, "label1");
GLADE_HOOKUP_OBJECT (window_options, hbox4, "hbox4");
GLADE_HOOKUP_OBJECT (window_options, vbox4, "vbox4");

10
src/treeview.c
View File

@ -2397,15 +2397,10 @@ treeview_show_language_combo(void)
{
GtkTreeModel *model = treeview_create_language_list();
GtkComboBox *combo_languages =
GTK_COMBO_BOX(lookup_widget(window.options, "comboboxentry_languages"));
GTK_COMBO_BOX(lookup_widget(window.options, "combobox_languages"));
GtkCellRenderer *renderer = NULL;
gint idx = language_get_current_index();
gtk_combo_box_set_model(combo_languages, model);
g_object_unref(model);
if(gtk_combo_box_entry_get_text_column(GTK_COMBO_BOX_ENTRY(combo_languages)) == -1)
gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo_languages), 1);
gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo_languages));
renderer = gtk_cell_renderer_pixbuf_new();
@ -2416,6 +2411,9 @@ treeview_show_language_combo(void)
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_languages), renderer, FALSE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_languages), renderer, "text", 1, NULL);
gtk_combo_box_set_model(combo_languages, model);
g_object_unref(model);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_languages), idx + 1);
}

2
src/window.c
View File

@ -160,7 +160,7 @@ window_show_file_sel(void)
strlen(save_file->str) > 0)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(window.file_chooser),
save_file->str);
else if(strlen(current_user.mmatches_file->str) > 0)
else if(users->len > 0 && strlen(current_user.mmatches_file->str) > 0)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(window.file_chooser),
current_user.mmatches_file->str);
else

2
support_files/bygfoot_help
View File

@ -30,3 +30,5 @@ string_contrib_entry Tobe &amp; Arne Deprez (Dutch)
string_contrib_entry Michal Rudolf (Polish)
string_contrib_entry Cristian Spoiala (Romanian)
string_contrib_entry Rostislav "zbrox" Raykov (Bulgarian)
string_contrib_title Forgotten anyone? Write me! (gyboth@bygfoot.com)

2
support_files/bygfoot_user.conf
View File

@ -6,7 +6,7 @@
int_opt_user_confirm_youth 1
int_opt_user_show_live_game 1
int_opt_user_show_live_game 0
int_opt_user_live_game_speed 20
int_opt_user_live_game_verbosity 5
int_opt_user_show_tendency_bar 1