mirror of https://github.com/PCSX2/pcsx2.git
gsdx-ogl: Remodel the linux dialog box to make it look better.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5056 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42
parent
9de050a51f
commit
27de4b086d
|
|
@ -40,32 +40,11 @@ static void SysMessage(const char *fmt, ...)
|
|||
gtk_widget_destroy (dialog);
|
||||
}
|
||||
|
||||
bool RunLinuxDialog()
|
||||
GtkWidget* CreateRenderComboBox()
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
GtkWidget *main_frame, *main_box;
|
||||
GtkWidget *render_label, *render_combo_box;
|
||||
GtkWidget *interlace_label, *interlace_combo_box;
|
||||
GtkWidget *swthreads_label, *swthreads_text;
|
||||
GtkWidget *filter_check, *logz_check, *paltex_check, *fba_check, *aa_check, *win_check, *msaa_check, *native_res_check;
|
||||
int return_value;
|
||||
|
||||
/* Create the widgets */
|
||||
dialog = gtk_dialog_new_with_buttons (
|
||||
"GSdx Config",
|
||||
NULL, /* parent window*/
|
||||
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
|
||||
GTK_STOCK_OK,
|
||||
GTK_RESPONSE_ACCEPT,
|
||||
GTK_STOCK_CANCEL,
|
||||
GTK_RESPONSE_REJECT,
|
||||
NULL);
|
||||
|
||||
main_box = gtk_vbox_new(false, 5);
|
||||
main_frame = gtk_frame_new ("GSdx Config");
|
||||
gtk_container_add (GTK_CONTAINER(main_frame), main_box);
|
||||
|
||||
render_label = gtk_label_new ("Renderer:");
|
||||
GtkWidget *render_combo_box;
|
||||
int renderer_box_position = 0;
|
||||
|
||||
render_combo_box = gtk_combo_box_new_text ();
|
||||
|
||||
for(size_t i = 6; i < theApp.m_gs_renderers.size(); i++)
|
||||
|
|
@ -84,7 +63,6 @@ bool RunLinuxDialog()
|
|||
gtk_combo_box_append_text(GTK_COMBO_BOX(render_combo_box), label.c_str());
|
||||
}
|
||||
|
||||
int renderer_box_position = 0;
|
||||
switch (theApp.GetConfig("renderer", 0)) {
|
||||
// Note the value are based on m_gs_renderers vector on GSdx.cpp
|
||||
case 7 : renderer_box_position = 0; break;
|
||||
|
|
@ -94,12 +72,13 @@ bool RunLinuxDialog()
|
|||
case 12: renderer_box_position = 4; break;
|
||||
case 13: renderer_box_position = 5; break;
|
||||
}
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(render_combo_box), renderer_box_position );
|
||||
gtk_container_add(GTK_CONTAINER(main_box), render_label);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), render_combo_box);
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(render_combo_box), renderer_box_position);
|
||||
return render_combo_box;
|
||||
}
|
||||
|
||||
|
||||
interlace_label = gtk_label_new ("Interlace:");
|
||||
GtkWidget* CreateInterlaceComboBox()
|
||||
{
|
||||
GtkWidget *interlace_combo_box;
|
||||
interlace_combo_box = gtk_combo_box_new_text ();
|
||||
|
||||
for(size_t i = 0; i < theApp.m_gs_interlace.size(); i++)
|
||||
|
|
@ -114,50 +93,121 @@ bool RunLinuxDialog()
|
|||
}
|
||||
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(interlace_combo_box), theApp.GetConfig("interlace", 0));
|
||||
gtk_container_add(GTK_CONTAINER(main_box), interlace_label);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), interlace_combo_box);
|
||||
return interlace_combo_box;
|
||||
}
|
||||
|
||||
swthreads_label = gtk_label_new("Extra sw renderer threads:");
|
||||
swthreads_text = gtk_entry_new();
|
||||
char buf[5];
|
||||
sprintf(buf, "%d", theApp.GetConfig("extrathreads", 0));
|
||||
bool RunLinuxDialog()
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
|
||||
GtkWidget *main_box, *res_box, *hw_box, *sw_box;
|
||||
GtkWidget *res_frame, *hw_frame, *sw_frame;
|
||||
GtkWidget *render_label, *render_combo_box;
|
||||
GtkWidget *interlace_label, *interlace_combo_box;
|
||||
GtkWidget *threads_label, *threads_spin;
|
||||
GtkWidget *filter_check, *logz_check, *paltex_check, *fba_check, *aa_check, *native_res_check, *native_label, *native_box;
|
||||
GtkWidget *hw_table, *renderer_box, *interlace_box, *threads_box;
|
||||
int return_value;
|
||||
|
||||
gtk_entry_set_text(GTK_ENTRY(swthreads_text), buf);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), swthreads_label);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), swthreads_text);
|
||||
/* Create the widgets */
|
||||
dialog = gtk_dialog_new_with_buttons (
|
||||
"GSdx Config",
|
||||
NULL, /* parent window*/
|
||||
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
|
||||
GTK_STOCK_OK,
|
||||
GTK_RESPONSE_ACCEPT,
|
||||
GTK_STOCK_CANCEL,
|
||||
GTK_RESPONSE_REJECT,
|
||||
NULL);
|
||||
|
||||
// The main area for the whole dialog box.
|
||||
main_box = gtk_vbox_new(false, 5);
|
||||
|
||||
// The Internal resolution frame and container.
|
||||
res_box = gtk_vbox_new(false, 5);
|
||||
res_frame = gtk_frame_new ("OpenGL Internal Resolution (can cause glitches)");
|
||||
gtk_container_add(GTK_CONTAINER(res_frame), res_box);
|
||||
|
||||
// The hardware mode frame, container, and table.
|
||||
hw_box = gtk_vbox_new(false, 5);
|
||||
hw_frame = gtk_frame_new ("Hardware Mode Settings");
|
||||
gtk_container_add(GTK_CONTAINER(hw_frame), hw_box);
|
||||
hw_table = gtk_table_new(2,2, false);
|
||||
gtk_container_add(GTK_CONTAINER(hw_box), hw_table);
|
||||
|
||||
// The software mode frame and container. (It doesn't have enough in it for a table.)
|
||||
sw_box = gtk_vbox_new(false, 5);
|
||||
sw_frame = gtk_frame_new ("Software Mode Settings");
|
||||
gtk_container_add(GTK_CONTAINER(sw_frame), sw_box);
|
||||
|
||||
// Create the renderer combo box and label, and stash them in a box.
|
||||
render_label = gtk_label_new ("Renderer:");
|
||||
render_combo_box = CreateRenderComboBox();
|
||||
renderer_box = gtk_hbox_new(false, 5);
|
||||
// Use gtk_box_pack_start instead of gtk_container_add so it lines up nicely.
|
||||
gtk_box_pack_start(GTK_BOX(renderer_box), render_label, false, false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(renderer_box), render_combo_box, false, false, 5);
|
||||
|
||||
// Create the interlace combo box and label, and stash them in a box.
|
||||
interlace_label = gtk_label_new ("Interlacing (F5):");
|
||||
interlace_combo_box = CreateInterlaceComboBox();
|
||||
interlace_box = gtk_hbox_new(false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(interlace_box), interlace_label, false, false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(interlace_box), interlace_combo_box, false, false, 5);
|
||||
|
||||
// Create the threading spin box and label, and stash them in a box. (Yes, we do a lot of that.)
|
||||
threads_label = gtk_label_new("Extra rendering threads:");
|
||||
threads_spin = gtk_spin_button_new_with_range(0,100,1);
|
||||
gtk_spin_button_set_value(GTK_SPIN_BUTTON(threads_spin), theApp.GetConfig("extrathreads", 0));
|
||||
threads_box = gtk_hbox_new(false, 0);
|
||||
gtk_box_pack_start(GTK_BOX(threads_box), threads_label, false, false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(threads_box), threads_spin, false, false, 5);
|
||||
|
||||
// A bit of funkiness for the resolution box.
|
||||
native_label = gtk_label_new("Original PS2 Resolution: ");
|
||||
native_res_check = gtk_check_button_new_with_label("Native");
|
||||
native_box = gtk_hbox_new(false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(native_box), native_label, false, false, 5);
|
||||
gtk_box_pack_start(GTK_BOX(native_box), native_res_check, false, false, 5);
|
||||
|
||||
// Create our checkboxes.
|
||||
filter_check = gtk_check_button_new_with_label("Texture Filtering");
|
||||
logz_check = gtk_check_button_new_with_label("Logarithmic Z");
|
||||
paltex_check = gtk_check_button_new_with_label("Allow 8 bit textures");
|
||||
fba_check = gtk_check_button_new_with_label("Alpha correction (FBA)");
|
||||
aa_check = gtk_check_button_new_with_label("Edge anti-aliasing");
|
||||
win_check = gtk_check_button_new_with_label("Disable Effects Processing");
|
||||
msaa_check = gtk_check_button_new_with_label("Enable MultiSample AA (not yet implemented)");
|
||||
native_res_check = gtk_check_button_new_with_label("Native Resolution");
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(main_box), filter_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), logz_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), paltex_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), fba_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), aa_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), win_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), msaa_check);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), native_res_check);
|
||||
|
||||
// Filter should be 3 states, not 2.
|
||||
// Set the checkboxes.
|
||||
// Filter should have 3 states, not 2.
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_check), theApp.GetConfig("filter", 1));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(logz_check), theApp.GetConfig("logz", 1));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(paltex_check), theApp.GetConfig("paltex", 0));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fba_check), theApp.GetConfig("fba", 1));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa_check), theApp.GetConfig("aa1", 0));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win_check), theApp.GetConfig("windowed", 1));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(msaa_check), theApp.GetConfig("msaa", 0));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(native_res_check), theApp.GetConfig("nativeres", 0));
|
||||
|
||||
// Populate all those boxes we created earlier with widgets.
|
||||
gtk_container_add(GTK_CONTAINER(res_box), native_box);
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(sw_box), threads_box);
|
||||
gtk_container_add(GTK_CONTAINER(sw_box), aa_check);
|
||||
|
||||
// Tables are strange. The numbers are for their position: left, right, top, bottom.
|
||||
gtk_table_attach_defaults(GTK_TABLE(hw_table), filter_check, 0, 1, 0, 1);
|
||||
gtk_table_attach_defaults(GTK_TABLE(hw_table), logz_check, 1, 2, 0, 1);
|
||||
gtk_table_attach_defaults(GTK_TABLE(hw_table), paltex_check, 0, 1, 1, 2);
|
||||
gtk_table_attach_defaults(GTK_TABLE(hw_table), fba_check, 1, 2, 1, 2);
|
||||
|
||||
// Put everything in the big box.
|
||||
gtk_container_add(GTK_CONTAINER(main_box), renderer_box);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), interlace_box);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), res_frame);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), hw_frame);
|
||||
gtk_container_add(GTK_CONTAINER(main_box), sw_frame);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_frame);
|
||||
// Put the box in the dialog and show it to the world.
|
||||
gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_box);
|
||||
gtk_widget_show_all (dialog);
|
||||
|
||||
return_value = gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
|
||||
if (return_value == GTK_RESPONSE_ACCEPT)
|
||||
|
|
@ -187,17 +237,18 @@ bool RunLinuxDialog()
|
|||
if (gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box)) != -1)
|
||||
theApp.SetConfig( "interlace", (int)gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box)) );
|
||||
|
||||
|
||||
theApp.SetConfig("extrathreads", atoi((char*)gtk_entry_get_text(GTK_ENTRY(swthreads_text))) );
|
||||
theApp.SetConfig("extrathreads", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(threads_spin)));
|
||||
|
||||
theApp.SetConfig("filter", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_check)));
|
||||
theApp.SetConfig("logz", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logz_check)));
|
||||
theApp.SetConfig("paltex", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(paltex_check)));
|
||||
theApp.SetConfig("fba", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fba_check)));
|
||||
theApp.SetConfig("aa1", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(aa_check)));
|
||||
theApp.SetConfig("windowed", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win_check)));
|
||||
theApp.SetConfig("msaa", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(msaa_check)));
|
||||
theApp.SetConfig("nativeres", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(native_res_check)));
|
||||
|
||||
//These aren't actually shown in the windows version, so I'll take them out of the dialog for the moment.
|
||||
theApp.SetConfig("windowed", 1);
|
||||
theApp.SetConfig("msaa", 0);
|
||||
|
||||
gtk_widget_destroy (dialog);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue