diff --git a/desmume/src/frontend/posix/gtk/desmume.gresource.xml b/desmume/src/frontend/posix/gtk/desmume.gresource.xml index c946bb311..d26c2f730 100644 --- a/desmume/src/frontend/posix/gtk/desmume.gresource.xml +++ b/desmume/src/frontend/posix/gtk/desmume.gresource.xml @@ -3,5 +3,6 @@ org.desmume.DeSmuME.svg main.ui + graphics.ui diff --git a/desmume/src/frontend/posix/gtk/graphics.ui b/desmume/src/frontend/posix/gtk/graphics.ui new file mode 100644 index 000000000..fcd678fe7 --- /dev/null +++ b/desmume/src/frontend/posix/gtk/graphics.ui @@ -0,0 +1,105 @@ + + + + + + + 3D Core: + + + 0 + 0 + + + + + + Null + SoftRasterizer + OpenGL + + + + 1 + 0 + + + + + 3D Texture Upscaling: + + + 0 + 1 + + + + + + ×1 + ×2 + ×4 + + + + 1 + 1 + + + + + 3D Texture Deposterization + True + + + 0 + 2 + + + + + 3D Texture Smoothing + True + + + 0 + 3 + + + + + High Resolution Color Interpolation (SoftRasterizer) + True + + + 1 + 3 + + + + + Multisample Antialiasing (OpenGL): + + + 0 + 4 + + + + + + None + 2 + 4 + 8 + 16 + 32 + + + + 1 + 4 + + + + diff --git a/desmume/src/frontend/posix/gtk/main.cpp b/desmume/src/frontend/posix/gtk/main.cpp index 51e6144a9..3c8a25633 100644 --- a/desmume/src/frontend/posix/gtk/main.cpp +++ b/desmume/src/frontend/posix/gtk/main.cpp @@ -1124,113 +1124,6 @@ static const GActionEntry app_entries[] = { { "about", About }, }; -static const char *graphics_settings = -"" -"" -" " -" " -" " -" " -" 3D Core:" -" " -" " -" 0" -" 0" -" " -" " -" " -" " -" " -" Null" -" SoftRasterizer" -" OpenGL" -" " -" " -" " -" 1" -" 0" -" " -" " -" " -" " -" 3D Texture Upscaling:" -" " -" " -" 0" -" 1" -" " -" " -" " -" " -" " -" ×1" -" ×2" -" ×4" -" " -" " -" " -" 1" -" 1" -" " -" " -" " -" " -" 3D Texture Deposterization" -" True" -" " -" " -" 0" -" 2" -" " -" " -" " -" " -" 3D Texture Smoothing" -" True" -" " -" " -" 0" -" 3" -" " -" " -" " -" " -" High Resolution Color Interpolation (SoftRasterizer)" -" True" -" " -" " -" 1" -" 3" -" " -" " -" " -" " -" Multisample Antialiasing (OpenGL):" -" " -" " -" 0" -" 4" -" " -" " -" " -" " -" " -" None" -" 2" -" 4" -" 8" -" 16" -" 32" -" " -" " -" " -" 1" -" 4" -" " -" " -" " -""; - enum winsize_enum { WINSIZE_SCALE = 0, WINSIZE_HALF = 1, @@ -2968,7 +2861,7 @@ static void GraphicsSettingsDialog(GSimpleAction *action, GVariant *parameter, g GTK_RESPONSE_CANCEL, NULL); - GtkBuilder *builder = gtk_builder_new_from_string(graphics_settings, -1); + GtkBuilder *builder = gtk_builder_new_from_resource("/org/desmume/DeSmuME/graphics.ui"); wBox = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(gsDialog))); wGrid = GTK_GRID(gtk_builder_get_object(builder, "graphics_grid")); gtk_box_pack_start(wBox, GTK_WIDGET(wGrid), TRUE, FALSE, 0);