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

The country combobox in the startup_window shows a layered structure to make it 

easier to navigate.
There are still minor glitches to sort out.
This commit is contained in:
gunnar_g 2008-12-08 13:46:11 +00:00
parent 7f67691125
commit 2e9438a103
9 changed files with 191 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/file.c
View File

@ -36,6 +36,30 @@
#include "support.h"
#include "variables.h"
/**
* Adds a definition directory
*/
void add_definitions_directory(const gchar *directory)
{
#ifdef DEBUG
printf("add_definitions_directory\n");
#endif
gchar **dir_split_up;
dir_split_up = g_strsplit_set (directory, "\\/", -1);
if (strcmp(dir_split_up[g_strv_length(dir_split_up)-1],"definitions")==0)
{
root_definitions_directories = g_list_prepend (root_definitions_directories,
g_strdup(directory));
}
if (query_misc_string_starts_with(directory, root_definitions_directories))
{
definitions_directories = g_list_prepend (definitions_directories,
g_strdup(directory));
}
g_strfreev(dir_split_up);
}
/**
Add the specified directory to the list of directories file_find_support_file()
searches for support files.
@ -66,6 +90,7 @@ file_add_support_directory_recursive (const gchar *directo
return;
}
add_definitions_directory(directory);
add_pixmap_directory(directory);
support_directories = g_list_prepend (support_directories,
g_strdup (directory));
@ -453,7 +478,8 @@ file_dir_get_contents(const gchar *dir_name, const gchar *prefix, const gchar *s
return contents;
}
/** Return the country definition files found in the support dirs. */
/** Return the country definition files found in the support dirs.
* The files are appended with the directories*/
GPtrArray*
file_get_country_files(void)
{
@ -462,26 +488,38 @@ file_get_country_files(void)
#endif
gint i;
GList *elem = support_directories;
GList *elem = definitions_directories;
GPtrArray *country_files = g_ptr_array_new();
GPtrArray *dir_contents = NULL;
GPtrArray *country_files_full_path = g_ptr_array_new();
gchar buf[SMALL];
gchar *country_structure;
while(elem != NULL)
{
dir_contents = file_dir_get_contents((gchar*)elem->data, "country_", ".xml");
country_structure = misc_strip_definitions_root((gchar*)elem->data);
for(i=0;i<dir_contents->len;i++)
{
if(!query_misc_string_in_array((gchar*)g_ptr_array_index(dir_contents, i),
country_files))
{
g_ptr_array_add(country_files,
g_strdup((gchar*)g_ptr_array_index(dir_contents, i)));
sprintf(buf, "%s%s%s", g_strdup(country_structure),
G_DIR_SEPARATOR_S,
g_strdup((gchar*)g_ptr_array_index(dir_contents, i)));
g_ptr_array_add(country_files_full_path,g_strdup(buf));
}
}
free_gchar_array(&dir_contents);
elem = elem->next;
}
free_gchar_array(&country_files);
return country_files;
return country_files_full_path;
}
/** Read the file until the next line that's not a comment or

31
src/misc.c
View File

@ -298,6 +298,37 @@ misc_float_compare(gfloat first, gfloat second)
return 0;
}
const gchar*
misc_strip_definitions_root(gchar *directory)
{
gchar **vector;
GList *list = root_definitions_directories;
while (list!=NULL)
{
if (g_str_has_prefix(directory, (gchar*)list->data))
{
vector = g_strsplit(directory, (gchar*)list->data,-1);
return g_strdup((gchar*)vector[g_strv_length(vector)-1]);
}
list = list->next;
}
g_strfreev(vector);
return "";
}
/** Check whether the string starts with a string in the string array. */
gboolean
query_misc_string_starts_with(const gchar *string, GList *list)
{
while (list!=NULL)
{
return g_str_has_prefix(string, (gchar*)list->data);
list = list->next;
}
return FALSE;
}
/** Check whether the string is in the string array. */
gboolean
query_misc_string_in_array(const gchar *string, const GPtrArray *array)

6
src/misc.h
View File

@ -58,6 +58,12 @@ misc_int_compare(gint first, gint second);
gint
misc_float_compare(gfloat first, gfloat second);
const gchar*
misc_strip_definitions_root(gchar *directory);
gboolean
query_misc_string_starts_with(const gchar *string, GList *list);
gboolean
query_misc_string_in_array(const gchar *string, const GPtrArray *array);

96
src/treeview.c
View File

@ -79,7 +79,7 @@ treeview_create_team_selection_list(gboolean show_cup_teams, gboolean show_user_
if(team_is_user(&g_array_index(lig(i).teams, Team, j)) == -1)
{
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 1, g_array_index(lig(i).teams, Team, j).symbol);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 1, g_array_index(lig(i).teams, Team, j).symbol);
gtk_list_store_set(ls, &iter,
0, cnt++,
2, (gpointer)&g_array_index(lig(i).teams, Team, j),
@ -98,7 +98,7 @@ treeview_create_team_selection_list(gboolean show_cup_teams, gboolean show_user_
for(j=0;j<cp(i).teams->len;j++)
{
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 1,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 1,
((Team*)g_ptr_array_index(cp(i).teams, j))->symbol);
gtk_list_store_set(ls, &iter,
0, cnt++,
@ -514,7 +514,8 @@ treeview_live_game_show_commentary(const LiveGameUnit *unit)
unit->event.commentary);
gtk_list_store_prepend(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 1, treeview_helper_live_game_icon(unit->event.type));
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 1,
treeview_helper_live_game_icon(unit->event.type));
gtk_list_store_set(ls, &iter, 0, buf, 2, buf2, -1);
adjustment->value = adjustment->lower - adjustment->page_size;
@ -549,7 +550,8 @@ treeview_live_game_create_init_commentary(const LiveGameUnit *unit)
sprintf(buf, "%3d.", unit->minute);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 1, treeview_helper_live_game_icon(unit->event.type));
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 1,
treeview_helper_live_game_icon(unit->event.type));
gtk_list_store_set(ls, &iter, 0, buf, 2, unit->event.commentary, -1);
return GTK_TREE_MODEL(ls);
@ -1024,8 +1026,8 @@ treeview_create_fixtures_header(const Fixture *fix, GtkListStore *ls, gboolean b
const_app("string_treeview_fixture_header_fg"), buf3);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, symbol);
treeview_helper_insert_icon(ls, &iter, 4, symbol);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, symbol);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 4, symbol);
gtk_list_store_set(ls, &iter, 1, buf, 2, "", 3, buf2, -1);
if(blank_line)
@ -1091,8 +1093,8 @@ treeview_create_fixture(const Fixture *fix, GtkListStore *ls)
colour_bg, colour_fg, buf_result);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, symbol[0]);
treeview_helper_insert_icon(ls, &iter, 4, symbol[1]);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, symbol[0]);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 4, symbol[1]);
gtk_list_store_set(ls, &iter,
1, buf[0], 2, buf[2], 3, buf[1], -1);
}
@ -1235,7 +1237,7 @@ treeview_table_write_header(GtkListStore *ls, const Table *table, gint table_ind
}
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, symbol);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, symbol);
gtk_list_store_set(ls, &iter, 1, "", 2, NULL, 3, buf, -1);
for(i=4;i<12;i++)
@ -1267,16 +1269,16 @@ treeview_create_single_table(GtkListStore *ls, const Table *table, gint table_in
elem = &g_array_index(table->elements, TableElement, i);
if(table->clid >= ID_CUP_START)
treeview_helper_insert_icon(ls, &iter, 0, elem->team->symbol);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, elem->team->symbol);
if(elem->old_rank > i)
treeview_helper_insert_icon(ls, &iter, 2,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 2,
const_app("string_treeview_table_up_icon"));
else if(elem->old_rank < i)
treeview_helper_insert_icon(ls, &iter, 2,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 2,
const_app("string_treeview_table_down_icon"));
else
treeview_helper_insert_icon(ls, &iter, 2,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 2,
const_app("string_treeview_table_stay_icon"));
treeview_helper_get_table_element_colours(table, table_index, i,
@ -2293,7 +2295,7 @@ treeview_create_user_history(void)
user_history_to_string(&g_array_index(current_user.history, UserHistory, i), buf);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 3,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 3,
treeview_helper_get_user_history_icon(
g_array_index(current_user.history, UserHistory, i).type));
gtk_list_store_set(ls, &iter,
@ -2400,7 +2402,7 @@ treeview_create_league_stats(GtkListStore *ls, const LeagueStat *league_stat)
gchar *colour_fg = NULL, *colour_bg = NULL;
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0,
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0,
league_stat->league_symbol);
gtk_list_store_set(ls, &iter, 1, const_int("int_treeview_helper_int_empty"),
2, league_stat->league_name, 3, "", 4, "", 5, "", -1);
@ -2413,7 +2415,7 @@ treeview_create_league_stats(GtkListStore *ls, const LeagueStat *league_stat)
2, "", 3, "", 4, "", 5, "", -1);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, team_icons[i]);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, team_icons[i]);
gtk_list_store_set(ls, &iter, 1, const_int("int_treeview_helper_int_empty"),
2, team_titles[i], 4, _("Goals"), -1);
@ -2446,7 +2448,7 @@ treeview_create_league_stats(GtkListStore *ls, const LeagueStat *league_stat)
2, "", 3, "", 4, "", 5, "", -1);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, player_icons[i]);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, player_icons[i]);
gtk_list_store_set(ls, &iter, 1, const_int("int_treeview_helper_int_empty"),
/* Goals. */
2, player_titles[i][0], 3, _("Go"),
@ -2567,7 +2569,7 @@ treeview_create_season_history_champions(GtkListStore *ls, const GArray* league_
for(i=0;i<2;i++)
{
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, icons[i]);
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, icons[i]);
gtk_list_store_set(ls, &iter, 1, const_int("int_treeview_helper_int_empty"),
2, titles[i], 3, "", 4, "", 5, "", -1);
@ -2637,20 +2639,62 @@ treeview_create_country_list(const GPtrArray *country_list)
#endif
gint i;
GtkListStore *ls = gtk_list_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
GtkTreeIter iter;
guint j;
GtkTreeStore *ls = gtk_tree_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
gchar buf[SMALL], buf2[SMALL], trash[SMALL];
gchar **dir_split_up;
// This will keep the iterators for each level of the TreeStore
GPtrArray *iterators;
iterators = g_ptr_array_new ();
gboolean create_new_line;
// This variable will be used to lookup
gchar* previous_element;
for(i=0;i<country_list->len;i++)
{
sscanf((gchar*)g_ptr_array_index(country_list, i), "country_%[^.]%[.xml]",
// We get countries as <Continent>/<...>/<country>
// We then try to build a tree using "/ or \" as a separator
// The list is already sorted, so we don't need to verify
dir_split_up = g_strsplit_set ((gchar*)g_ptr_array_index(country_list, i), "\\/", -1);
for (j=0; j<g_strv_length(dir_split_up); j++)
{
create_new_line = FALSE;
// j is an element index. As indexes start from 0 we always
// need to add 1 to j before comparing
if (iterators->len<j+1){
g_ptr_array_add(iterators,g_malloc(sizeof(GtkTreeIter)));
create_new_line=TRUE;
} else
{
gtk_tree_model_get (ls,(GtkTreeIter*)g_ptr_array_index(iterators,j), 1, &previous_element, -1);
if (strcmp(previous_element,dir_split_up[j])!=0)
{
create_new_line=TRUE;
}
}
// Do we need to create a new element or not
if (create_new_line)
{
// Is it a toplevel item or not
// If not parent is NULL else the parent is the previous iterator in the
// pointer list
if (j==0)
{
gtk_tree_store_append(ls, (GtkTreeIter*)g_ptr_array_index(iterators,j), NULL);
} else
{
gtk_tree_store_append(ls, (GtkTreeIter*)g_ptr_array_index(iterators,j), (GtkTreeIter*)g_ptr_array_index(iterators,j-1));
}
sscanf((gchar*)dir_split_up[j], "country_%[^.]%[.xml]",
buf2, trash);
sprintf(buf, "flag_%s.png", buf2);
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, buf);
gtk_list_store_set(ls, &iter, 1,
(gchar*)g_ptr_array_index(country_list, i), -1);
treeview_helper_insert_icon((GtkTreeModel*)ls, (GtkTreeIter*)g_ptr_array_index(iterators,j), 0, buf);
gtk_tree_store_set(ls, (GtkTreeIter*)g_ptr_array_index(iterators,j), 1,
(gchar*)dir_split_up[j], -1);
}
}
g_strfreev(dir_split_up);
}
return GTK_TREE_MODEL(ls);
@ -2795,7 +2839,7 @@ treeview_create_language_list(void)
for(i=0;i<names->len;i++)
{
gtk_list_store_append(ls, &iter);
treeview_helper_insert_icon(ls, &iter, 0, (gchar*)g_ptr_array_index(symbols, i));
treeview_helper_insert_icon((GtkTreeModel*)ls, &iter, 0, (gchar*)g_ptr_array_index(symbols, i));
gtk_list_store_set(ls, &iter, 1,
(gchar*)g_ptr_array_index(names, i), -1);
}

7
src/treeview_helper.c
View File

@ -380,7 +380,7 @@ treeview_helper_unref(GObject *object)
column.
@param icon_name The filename of the icon. */
void
treeview_helper_insert_icon(GtkListStore *ls, GtkTreeIter *iter, gint column_nr,
treeview_helper_insert_icon(GtkTreeModel *ls, GtkTreeIter *iter, gint column_nr,
gchar *icon_name)
{
#ifdef DEBUG
@ -388,8 +388,11 @@ treeview_helper_insert_icon(GtkListStore *ls, GtkTreeIter *iter, gint column_nr,
#endif
GdkPixbuf *symbol = treeview_helper_pixbuf_from_filename(icon_name);
if (GTK_IS_LIST_STORE (ls)){
gtk_list_store_set(ls, iter, column_nr, symbol, -1);
} else if (GTK_IS_TREE_STORE(ls)){
gtk_tree_store_set(ls, iter, column_nr, symbol, -1);
}
treeview_helper_unref(G_OBJECT(symbol));
}

2
src/treeview_helper.h
View File

@ -46,7 +46,7 @@ void
treeview_helper_unref(GObject *object);
void
treeview_helper_insert_icon(GtkListStore *ls, GtkTreeIter *iter, gint column_nr,
treeview_helper_insert_icon(GtkTreeModel *ls, GtkTreeIter *iter, gint column_nr,
gchar *icon_name);
GtkCellRenderer*

10
src/variables.h
View File

@ -122,6 +122,16 @@ GRand *rand_generator;
*/
GList *support_directories;
/**
* The list of root defintions directories found (ending in definitions)
*/
GList *root_definitions_directories;
/**
* The list of defintions directories found
*/
GList *definitions_directories;
/** The name of the current save file (gets updated when a game is
saved or loaded). */
gchar *save_file;

20
src/window.c
View File

@ -277,6 +277,20 @@ window_show_help(gint page)
gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(window.help, "notebook1")), page);
}
static void
is_capital_sensitive (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
GtkTreeModel *tree_model,
GtkTreeIter *iter,
gpointer data)
{
gboolean sensitive;
sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
g_object_set (cell, "sensitive", sensitive, NULL);
}
/**
Show the country selection window. All files with prefix
'country_' from $HOME/.bygfoot/definitions are appended to a combo box.
@ -315,6 +329,11 @@ window_show_startup(void)
language_pick_country(country_files);
model = treeview_create_country_list(country_files);
gtk_combo_box_set_model(GTK_COMBO_BOX(combo_country), model);
gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_country),
renderer,
is_capital_sensitive,
NULL, NULL);
g_object_unref(model);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_country), 0);
@ -1140,3 +1159,4 @@ window_show_alr(void)
gtk_spin_button_set_range(GTK_SPIN_BUTTON(lookup_widget(window.alr, "spinbutton_weekly_installment")),
0, -current_user.debt * powf(1 + current_user.debt_interest, const_int("int_finance_payback_weeks")) + 1);
}