Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More GtkBuilder and other stuff #168

Merged
merged 2 commits into from
Jun 27, 2015
Merged

More GtkBuilder and other stuff #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
777c7d3
More GtkBuilder, ported menus, general cleanup
vorot93 Jun 26, 2015
ef5c56c
Lifted GTK+ dependency in stat.c
vorot93 Jun 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ set (xqf_SOURCES
${CMAKE_SOURCE_DIR}/src/history.c
${CMAKE_SOURCE_DIR}/src/host.c
${CMAKE_SOURCE_DIR}/src/launch.c
${CMAKE_SOURCE_DIR}/src/menus.c
${CMAKE_SOURCE_DIR}/src/pixmaps.c
${CMAKE_SOURCE_DIR}/src/pref.c
${CMAKE_SOURCE_DIR}/src/psearch.c
Expand Down Expand Up @@ -131,7 +130,6 @@ set (xqf_SOURCES
${CMAKE_SOURCE_DIR}/src/history.h
${CMAKE_SOURCE_DIR}/src/host.h
${CMAKE_SOURCE_DIR}/src/launch.h
${CMAKE_SOURCE_DIR}/src/menus.h
${CMAKE_SOURCE_DIR}/src/pixmaps.h
${CMAKE_SOURCE_DIR}/src/pref.h
${CMAKE_SOURCE_DIR}/src/psearch.h
Expand Down
648 changes: 282 additions & 366 deletions src/filter.c
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 9 additions & 17 deletions src/flt-player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ static GtkWidget *player_filter_pattern_editor (void) {

pattern_entry = gtk_entry_new_with_max_length (256);
gtk_table_attach_defaults (GTK_TABLE (table), pattern_entry, 1, 2, 0, 1);
g_signal_connect (GTK_OBJECT (pattern_entry), "activate",
g_signal_connect (pattern_entry, "activate",
G_CALLBACK (sync_pattern_data), NULL);
gtk_widget_show (pattern_entry);

Expand All @@ -677,8 +677,7 @@ static GtkWidget *player_filter_pattern_editor (void) {
mode_buttons[i] = gtk_radio_button_new_with_label (group, _(mode_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (mode_buttons[i]));

g_signal_connect (GTK_OBJECT (mode_buttons[i]), "clicked",
G_CALLBACK (sync_pattern_data), NULL);
g_signal_connect (mode_buttons[i], "clicked", G_CALLBACK (sync_pattern_data), NULL);

gtk_box_pack_start (GTK_BOX (hbox), mode_buttons[i], FALSE, FALSE, 0);
gtk_widget_show (mode_buttons[i]);
Expand Down Expand Up @@ -771,12 +770,9 @@ void player_filter_page (GtkWidget *notebook) {
GTK_SELECTION_BROWSE);
gtk_clist_set_reorderable (GTK_CLIST (pattern_clist), TRUE);

g_signal_connect (GTK_OBJECT (pattern_clist), "event",
G_CALLBACK (pattern_clist_event_callback), NULL);
g_signal_connect (GTK_OBJECT (pattern_clist), "select_row",
G_CALLBACK (pattern_clist_select_row_callback), NULL);
g_signal_connect (GTK_OBJECT (pattern_clist), "row_move",
G_CALLBACK (pattern_clist_row_move_callback), NULL);
g_signal_connect (pattern_clist, "event", G_CALLBACK (pattern_clist_event_callback), NULL);
g_signal_connect (pattern_clist, "select_row", G_CALLBACK (pattern_clist_select_row_callback), NULL);
g_signal_connect (pattern_clist, "row_move", G_CALLBACK (pattern_clist_row_move_callback), NULL);

for (i = 0; i < 3; i++) {
pixmap = aligned_pixmap (group_pix[i].pix, group_pix[i].mask);
Expand Down Expand Up @@ -806,14 +802,12 @@ void player_filter_page (GtkWidget *notebook) {

button = gtk_button_new_with_label (_("New"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked",
G_CALLBACK (new_pattern_callback), NULL);
g_signal_connect (button, "clicked", G_CALLBACK (new_pattern_callback), NULL);
gtk_widget_show (button);

delete_button = gtk_button_new_with_label (_("Delete"));
gtk_box_pack_start (GTK_BOX (vbox), delete_button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (delete_button), "clicked",
G_CALLBACK (delete_pattern_callback), NULL);
g_signal_connect (delete_button, "clicked", G_CALLBACK (delete_pattern_callback), NULL);
gtk_widget_show (delete_button);

alignment = gtk_alignment_new (0, 0.5, 1, 0);
Expand All @@ -824,14 +818,12 @@ void player_filter_page (GtkWidget *notebook) {

up_button = gtk_button_new_with_label (_("Up"));
gtk_box_pack_start (GTK_BOX (vbox2), up_button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (up_button), "clicked",
G_CALLBACK (move_up_down_pattern_callback), (void *) -1);
g_signal_connect (up_button, "clicked", G_CALLBACK (move_up_down_pattern_callback), (void *) -1);
gtk_widget_show (up_button);

down_button = gtk_button_new_with_label (_("Down"));
gtk_box_pack_start (GTK_BOX (vbox2), down_button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (down_button), "clicked",
G_CALLBACK (move_up_down_pattern_callback), (void *) 1);
g_signal_connect (down_button, "clicked", G_CALLBACK (move_up_down_pattern_callback), (void *) 1);
gtk_widget_show (down_button);

gtk_widget_show (vbox2);
Expand Down
172 changes: 0 additions & 172 deletions src/menus.c
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions src/menus.h
View file
Open in desktop

This file was deleted.

29 changes: 16 additions & 13 deletions src/pref.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ static int pref_q2_noskins;
static char *pref_qw_skin;
static char *pref_q2_skin;

GtkBuilder *builder;

static GtkWidget *games_notebook;
static GtkWidget *pref_notebook;

Expand Down Expand Up @@ -1337,11 +1339,11 @@ static void get_new_defaults (void) {
/* These are set from chained calls to "activate" callbacks */

gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (view_hostnames_menu_item),
GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "view_hostnames_menu_item")),
GTK_TOGGLE_BUTTON (show_hostnames_check_button)->active);

gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (view_defport_menu_item),
GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "view_defport_menu_item")),
GTK_TOGGLE_BUTTON (show_defport_check_button)->active);

// i = gtk_notebook_get_current_page (GTK_NOTEBOOK (profile_notebook));
Expand Down Expand Up @@ -3701,6 +3703,16 @@ static void save_srvinfo_toggled_callback (GtkWidget *widget, gpointer data) {
gtk_widget_set_sensitive (save_plrinfo_check_button, val);
}

static void scan_maps_callback (GtkWidget *widget, gpointer data) {
int i;

for (i = 0; i < GAMES_TOTAL; i++) {
scan_maps_for(i);
}

server_clist_set_list (cur_server_list);
}


static GtkWidget *appearance_options_page (void) {
GtkWidget *page_vbox;
Expand Down Expand Up @@ -3867,16 +3879,7 @@ static GtkWidget *appearance_options_page (void) {
return page_vbox;
}

static void scan_maps_callback (GtkWidget *widget, gpointer data) {
int i;

for (i = 0; i < GAMES_TOTAL; i++) {
scan_maps_for(i);
}

server_clist_set_list (cur_server_list);
}

#ifdef GUI_GTK2
static GtkWidget *general_options_page (void) {
GtkWidget *page_vbox;
GtkWidget *frame;
Expand Down Expand Up @@ -4053,7 +4056,7 @@ static GtkWidget *general_options_page (void) {

return page_vbox;
}

#endif

static GtkWidget *qstat_options_page (void) {
GtkWidget *page_vbox;
Expand Down
Loading