rixty/bygfoot
1
1
Fork 0
mirror of https://github.com/tstellar/bygfoot.git synced 2024-12-17 02:39:14 +01:00
Code Issues Projects Releases Wiki Activity

Country selection convenience stuff.

Browse Source
This commit is contained in:
gyboth 2008-12-17 15:31:07 +00:00
parent bdd9d97e54
commit 17f1d581a5
5 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/language.c
View File

@ -138,9 +138,12 @@ language_pick_country(GPtrArray *country_files)
GPtrArray *defs =
misc_separate_strings(const_str("string_language_defs"));
gpointer prefdef = NULL;
const gchar *lang = g_getenv("LANG");
const gchar *lang = g_getenv("LANGUAGE");
if(lang == NULL)
if(lang == NULL || strcmp(lang, "") == 0)
lang = g_getenv("LANG");
if(lang == NULL || strcmp(lang, "") == 0)
lang = g_getenv("LC_ALL");
if(lang != NULL)

44
src/main.c
View File

@ -76,27 +76,30 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
gboolean testcom = FALSE, calodds = FALSE;
gchar *support_dir = NULL, *lang = NULL,
*testcom_file = NULL, *token_file = NULL,
*event_name = NULL, *debug_text = NULL;
*event_name = NULL, *debug_text = NULL,
*country_sid = NULL;
gint deb_level = -1, number_of_passes = 1,
deb_writer = -1,
num_matches = 100, skilldiffmax = 20;
GError *error = NULL;
GOptionContext *context = NULL;
GOptionEntry entries[] =
{{ "support-dir", 's', 0, G_OPTION_ARG_STRING, &support_dir,
{{ "last-save", 'l', 0, G_OPTION_ARG_NONE, &load_last_save, _("Load last savegame"), NULL },
{ "support-dir", 's', 0, G_OPTION_ARG_STRING, &support_dir,
_("Specify additional support directory (takes priority over default ones)"), "DIR" },
{ "country", 'c', 0, G_OPTION_ARG_STRING, &country_sid, _("String id of the country to load"), "SID" },
{ "lang", 'L', 0, G_OPTION_ARG_STRING, &lang, _("Language to use (a code like 'de')"), "CODE" },
{ "debug-level", 'd', 0, G_OPTION_ARG_INT, &deb_level, "[developer] Debug level to use", "N" },
{ "debug-writer", 'w', 0, G_OPTION_ARG_INT, &deb_writer, "[developer] Debug writer level to use", "N" },
{ "lang", 'L', 0, G_OPTION_ARG_STRING, &lang, _("Language to use (a code like 'de')"), "CODE" },
{ "last-save", 'l', 0, G_OPTION_ARG_NONE, &load_last_save, _("Load last savegame"), NULL },
{ "testcom", 't', 0, G_OPTION_ARG_NONE, &testcom, _("Test an XML commentary file"), NULL },
{ "commentary-file", 'c', 0, G_OPTION_ARG_STRING, &testcom_file,
{ "commentary-file", 'C', 0, G_OPTION_ARG_STRING, &testcom_file,
_("Commentary file name (may be in a support dir)"), "FILE" },
{ "token-file", 'T', 0, G_OPTION_ARG_STRING, &token_file,
@ -172,10 +175,17 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
{
language_set(language_get_code_index(lang) + 1);
file_load_hints_file();
g_free(lang);
}
if(debug_text != NULL)
statp = debug_text;
if(country_sid != NULL)
{
country.sid = g_strdup(country_sid);
g_free(country_sid);
}
}
/**
@ -195,7 +205,7 @@ main_init_variables(void)
acps = g_ptr_array_new();
country.name = NULL;
country.symbol = NULL;
country.sid = g_strdup("NONAME");
country.sid = NULL;
season = week = week_round = 1;
@ -345,11 +355,19 @@ main (gint argc, gchar *argv[])
(!load_last_save && (argc == 1 ||
(argc > 1 && !load_game_from_command_line(argv[1])))))
{
stat0 = STATUS_SPLASH;
window_show_splash();
if(os_is_unix)
file_check_home_dir();
if(country.sid == NULL)
{
stat0 = STATUS_SPLASH;
window_show_splash();
if(os_is_unix)
file_check_home_dir();
}
else
{
window_show_startup();
stat0 = STATUS_TEAM_SELECTION;
}
}
gtk_main ();

2
src/misc_callback_func.c
View File

@ -64,6 +64,8 @@ misc_callback_show_team_list(GtkWidget *widget, const gchar *country_file)
treeview_show_team_list(GTK_TREE_VIEW(treeview_startup), FALSE, FALSE);
treeview_show_leagues_combo();
gtk_widget_set_sensitive(lookup_widget(widget, "button_add_player"), TRUE);
}
/** Start a new game after users and teams are selected. */

4
src/misc_callbacks.c
View File

@ -372,12 +372,10 @@ on_combo_country_changed (GtkComboBox *combobox,
{
gtk_tree_model_get(gtk_combo_box_get_model(combobox), &iter, 1, &buf, -1);
misc_callback_show_team_list(GTK_WIDGET(combobox), buf);
gtk_widget_set_sensitive(lookup_widget(window.startup, "button_add_player"), TRUE);
} else {
gtk_widget_set_sensitive(lookup_widget(window.startup, "button_add_player"), FALSE);
}
g_free(buf);
}

11
src/window.c
View File

@ -337,13 +337,16 @@ window_show_startup(void)
g_object_unref(model);
if(last_country != NULL)
{
if(country.sid != NULL)
misc_callback_show_team_list(combo_country, country.sid);
else if(last_country != NULL)
misc_callback_show_team_list(combo_country, last_country);
g_free(last_country);
}
else
misc_callback_show_team_list(combo_country, (const gchar*)g_ptr_array_index(country_files, country_files->len - 1));
if(last_country != NULL)
g_free(last_country);
//gtk_combo_box_set_active(GTK_COMBO_BOX(combo_country), country_index);
free_gchar_array(&country_files);