Added tabs

Author: doZennn

gui-helper-gtk.c

@@ -15,10 +15,10 @@ int ShowMessageBox(const char* title, const char* message)
 	);
 	gtk_window_set_title(GTK_WINDOW(dialog), title);
 
-	g_signal_connect_swapped (
+	g_signal_connect_swapped(
 		dialog,
 		"response",
-		G_CALLBACK (gtk_widget_destroy),
+		G_CALLBACK(gtk_widget_destroy),
 		dialog
 	);
 
@@ -30,120 +30,197 @@ enum {
 	COLUMN_INDEX = 1,
 };
 
-static void button_callback(GtkWidget *widget, gpointer *data)
+typedef struct {
+	GtkWidget* treeview;
+	int selection;
+	int selected_index;
+	int tab_index;
+} TabData;
+
+typedef struct {
+	TabData* tab1;
+	TabData* tab2;
+} TabsContext;
+
+static void button_callback(gpointer data)
 {
-	GtkWidget* treeview = (GtkWidget*)data;
+	TabData* tab_data = (TabData*)data;
+	GtkWidget* treeview = tab_data->treeview;
 
 	GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-
-	GtkTreeModel *model;
+	GtkTreeModel* model;
 	GtkTreeIter iter;
 	if (gtk_tree_selection_get_selected(selection, &model, &iter))
 	{
-		int* selected_index = g_object_get_data(G_OBJECT(treeview), "selected_index");
-		gtk_tree_model_get (model, &iter, COLUMN_INDEX, selected_index, -1);  
+		gtk_tree_model_get(model, &iter, COLUMN_INDEX, &tab_data->selected_index, -1);
 		gtk_main_quit();
 	}
 }
 
-int SelectionDialog(const char* title, int count, const char** list, int selection)
+static void on_tab_switch(GtkNotebook* notebook, GtkWidget* page, guint page_num, gpointer user_data)
 {
-	gtk_init(NULL, NULL);
-
-	int selected_index = -1;
-
-	// Setup a stylesheet to match the original UI
-	const char* stylesheet = " \
-		#box { \
-			padding: 10px; \
-		} \
-	";
+	TabsContext* ctx = (TabsContext*)user_data;
+	GtkButton* btn = GTK_BUTTON(g_object_get_data(G_OBJECT(notebook), "ok_button"));
 
-	GtkCssProvider* provider = gtk_css_provider_new();
-	gtk_css_provider_load_from_data(provider, stylesheet, -1, NULL);
-
-	GdkDisplay* display = gdk_display_get_default();
-	GdkScreen* screen = gdk_display_get_default_screen(display);
-	gtk_style_context_add_provider_for_screen(screen, GTK_STYLE_PROVIDER(provider),  GTK_STYLE_PROVIDER_PRIORITY_USER);
+	if (page_num == 0)
+	{
+		g_object_set_data(G_OBJECT(btn), "tabdata", ctx->tab1);
+	}
+	else
+	{
+		g_object_set_data(G_OBJECT(btn), "tabdata", ctx->tab2);
+	}
+}
 
-	// Put list into a GtkListStore
-	GtkListStore *store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+static void on_ok_button_clicked(GtkButton* button, gpointer user_data)
+{
+	TabData* data = (TabData*)g_object_get_data(G_OBJECT(button), "tabdata");
+	button_callback(data);
+}
 
+GtkWidget* create_treeview(const char** items, int count, int initial_selection, int* selected_index)
+{
+	GtkListStore* store = gtk_list_store_new(
+		2, // 2 tabs
+		G_TYPE_STRING,
+		G_TYPE_INT
+	);
 	GtkTreeIter iter;
 	for (int i = 0; i < count; ++i) {
 		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter,
-			COLUMN_ITEM, list[i],
-			COLUMN_INDEX, i,
-			-1);
+		gtk_list_store_set(store, &iter, COLUMN_ITEM, items[i], COLUMN_INDEX, i, -1);
 	}
 
-	// Dervice a TreeView from the ListStore
-	GtkWidget *treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 	// Attached the selected index to the treeview so we can easily reference it in the button callback
 	g_object_set_data(G_OBJECT(treeview), "selected_index", &selected_index);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
 
-	// Change selection mode to single and set the current selected option if needed
-	{    
-		GtkTreeSelection* treeselection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-		gtk_tree_selection_set_mode(treeselection, GTK_SELECTION_SINGLE);
+	GtkTreeSelection* treeselection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+	gtk_tree_selection_set_mode(treeselection, GTK_SELECTION_SINGLE);
 
-		if (selection < count && selection >= 0) {
-			GtkTreePath *path = gtk_tree_path_new_from_indices(selection, -1);
-			gtk_tree_selection_select_path(treeselection, path);
-			gtk_tree_path_free(path);
-		}
+	if (initial_selection < count && initial_selection >= 0) {
+		GtkTreePath* path = gtk_tree_path_new_from_indices(initial_selection, -1);
+		gtk_tree_selection_select_path(treeselection, path);
+		gtk_tree_path_free(path);
 	}
 
-	// Define TreeView Cell Layout in the UI
-	{    
-		GtkCellRenderer* renderer = gtk_cell_renderer_text_new ();
-		gtk_tree_view_insert_column_with_attributes (
-			GTK_TREE_VIEW(treeview),
-			-1,      
-			"",  
-			renderer,
-			"text", COLUMN_ITEM,
-			NULL
-		);
-	}
+	GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(
+		GTK_TREE_VIEW(treeview),
+		-1,
+		"",
+		renderer,
+		"text",
+		COLUMN_ITEM,
+		NULL
+	);
 
-	// Put the TreeView into a ScrolledWindow
-	GtkWidget* scrollable = gtk_scrolled_window_new(NULL, NULL);
-	gtk_container_add(GTK_CONTAINER(scrollable), treeview);
+	return treeview;
+}
 
-	// Put a nice frame around the window to match the original 
-	GtkWidget* frame = gtk_frame_new(NULL);
-	gtk_container_add(GTK_CONTAINER(frame), scrollable);
+int SelectionDialog(const char* title, int count, const char** list, int modsCount, const char** modsList, int selection)
+{
+	gtk_init(NULL, NULL);
+	int selected_index = -1;
+
+	// Stylesheet
+	const char* stylesheet = "#box { padding: 10px; }";
+	GtkCssProvider* provider = gtk_css_provider_new();
+	gtk_css_provider_load_from_data(provider, stylesheet, -1, NULL);
+	GdkDisplay* display = gdk_display_get_default();
+	GdkScreen* screen = gdk_display_get_default_screen(display);
+	gtk_style_context_add_provider_for_screen(screen, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_USER);
 
+	// Setup main window
 	GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(window), title);
 	gtk_window_set_default_size(GTK_WINDOW(window), 454, 388);
-	g_signal_connect(G_OBJECT(window), "destroy", gtk_main_quit, NULL);
+	g_signal_connect(window, "destroy", gtk_main_quit, NULL);
 
 	GtkWidget* box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_widget_set_name(box, "box");
 	gtk_container_add(GTK_CONTAINER(window), box);
-	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
 
+	// Tabs via GtkNotebook
+	GtkWidget* notebook = gtk_notebook_new();
+	gtk_box_pack_start(GTK_BOX(box), notebook, TRUE, TRUE, 0);
+
+	int selectionTab = 0;
+	if (selection >= count) {
+		selectionTab = 1;
+		selection -= count;
+	}
+
+	// Non-Steam apps tab
+	TabData* nonsteam_data = g_new0(TabData, 1);
+	nonsteam_data->tab_index = 0;
+	nonsteam_data->treeview = create_treeview(list, count, selection, &nonsteam_data->selected_index);
+
+	GtkWidget* scroll1 = gtk_scrolled_window_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(scroll1), nonsteam_data->treeview);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scroll1, gtk_label_new("Non-Steam"));
+
+	// Mods tab
+	TabData* mods_data = g_new0(TabData, 1);
+	mods_data->tab_index = 1;
+	mods_data->treeview = create_treeview(modsList, modsCount, selection, &mods_data->selected_index);
+
+	GtkWidget* scroll2 = gtk_scrolled_window_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(scroll2), mods_data->treeview);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scroll2, gtk_label_new("GoldSrc/Source Mods"));
+
+	TabsContext* context = g_malloc(sizeof(TabsContext));
+	context->tab1 = nonsteam_data;
+	context->tab2 = mods_data;
+	//context->tab3 = steam_data;
+
+	// Button contianer
 	GtkWidget* buttons = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_box_pack_end(GTK_BOX(box), buttons, FALSE, FALSE, 0);
 	gtk_widget_set_halign(buttons, GTK_ALIGN_END);
 	gtk_widget_set_valign(buttons, GTK_ALIGN_START);
 
+	// COnfirm button
 	GtkWidget* ok_button = gtk_button_new_with_label("OK");
 	gtk_widget_set_size_request(ok_button, 75, 40);
-	g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(button_callback), treeview);
 	gtk_container_add(GTK_CONTAINER(buttons), ok_button);
+	g_object_set_data(G_OBJECT(notebook), "ok_button", ok_button);
 
+	// Cancel button
 	GtkWidget* cancel_button = gtk_button_new_with_label("Cancel");
 	gtk_widget_set_size_request(cancel_button, 75, 40);
-	g_signal_connect(G_OBJECT(cancel_button), "clicked", gtk_main_quit, NULL);
+	g_signal_connect(cancel_button, "clicked", gtk_main_quit, NULL);
 	gtk_container_add(GTK_CONTAINER(buttons), cancel_button);
 
+	// Switch callback to update which tab is active
+	g_signal_connect(notebook, "switch-page", G_CALLBACK(on_tab_switch), context);
+
+	// Update button callback to extract correct data
+	g_signal_connect(ok_button, "clicked", G_CALLBACK(on_ok_button_clicked), NULL);
+
 	gtk_widget_show_all(window);
+
+	// initial tab data
+	if (selectionTab == 0) {
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+		g_object_set_data(G_OBJECT(ok_button), "tabdata", context->tab1);
+	}
+	else {
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 1);
+		g_object_set_data(G_OBJECT(ok_button), "tabdata", context->tab2);
+	}
+
 	gtk_main();
 
-	return selected_index;
-}
+	// Clean up and return
+	TabData* final_tabdata = (TabData*)g_object_get_data(G_OBJECT(ok_button), "tabdata");
+	int final_selection = final_tabdata->selected_index;
+	g_free(nonsteam_data);
+	g_free(mods_data);
+
+	if (final_tabdata->tab_index > 0) {
+		final_selection += count;
+	}
+	return final_selection;
+}