diff options
| author | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-18 11:35:30 +0300 |
|---|---|---|
| committer | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-18 11:35:30 +0300 |
| commit | 95a7aec22cf2b93a6e8c3483fabc3638f5796719 (patch) | |
| tree | 6a1fb87c6762d79dfb67bf616b993dd6e43927a0 | |
| parent | f48b5b2ac35ee69db0c0ffd3f411ffc21b7d5789 (diff) | |
* Add UI configuration knobs from overclocking, wipeout memhack and per game mcd.
* Clean-up UI from deprecated attributes.
| -rwxr-xr-x | gui/ConfDlg.c | 35 | ||||
| -rwxr-xr-x | gui/MemcardDlg.c | 9 | ||||
| -rw-r--r-- | gui/data/pcsxr.ui | 1528 |
3 files changed, 857 insertions, 715 deletions
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 529e2722..d55234f8 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -877,6 +877,14 @@ static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) { gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } +// When overclock checkbutton is changed, enable/disable the selection spinbutton +static void OnCpu_OverClockClicked(GtkWidget *widget, gpointer user_data){ + GtkWidget *spin; + + spin = GTK_WIDGET(gtk_builder_get_object(builder, "GtkSpinButton_PsxClock")); + gtk_widget_set_sensitive(spin, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); +} + void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { GtkWidget *widget; long unsigned int tmp; @@ -936,6 +944,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { SysClose(); exit(1); } + psxCpu->SetPGXPMode(Config.PGXP_Mode); psxCpu->Reset(); } @@ -947,7 +956,14 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen"))); Config.HackFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix"))); - SaveConfig(); + Config.OverClock = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_OverClock"))); + Config.PsxClock = gtk_spin_button_get_value( + GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "GtkSpinButton_PsxClock"))); + Config.MemHack = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_MemHack"))); + + SaveConfig(); gtk_widget_destroy(CpuDlg); CpuDlg = NULL; @@ -1029,12 +1045,24 @@ void OnConf_Cpu() { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix")), Config.HackFix); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), Config.OverClock); + gtk_spin_button_set_value(GTK_SPIN_BUTTON( + gtk_builder_get_object(builder, "GtkSpinButton_PsxClock")), Config.PsxClock); + OnCpu_OverClockClicked(GTK_WIDGET( + gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), NULL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_MemHack")), Config.MemHack); + + g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), "toggled", + G_CALLBACK(OnCpu_OverClockClicked), builder, NULL, G_CONNECT_AFTER); + // Setup a handler for when Close or Cancel is clicked g_signal_connect_data(G_OBJECT(CpuDlg), "response", - G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); + G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } -//When a different mode is selected, display some informational text +//When a different PGXP mode is selected, display some informational text static void OnPgxp_ModeChanged(GtkWidget *widget, gpointer user_data) { uint8_t mode; @@ -1099,7 +1127,6 @@ void OnConf_Pgxp() { } PgxpDlg = GTK_WIDGET(gtk_builder_get_object(builder, "PgxpDlg")); - gtk_window_set_default_size(GTK_WINDOW(PgxpDlg), 320, 320); gtk_widget_show (PgxpDlg); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index fada33ff..d3949565 100755 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -294,6 +294,9 @@ static void UpdateMcdDlg(GtkWidget *widget) { } static void OnMcd_Close(GtkDialog *dialog, gint arg1, gpointer user_data) { + + Config.PerGameMcd = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd"))); quit = TRUE; SaveConfig(); gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -748,6 +751,12 @@ void OnConf_Mcds() { G_CALLBACK(OnTreeSelectionChanged), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd")), Config.PerGameMcd); + // Disable it because it is not working yet + gtk_widget_set_sensitive(GTK_WIDGET( + gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd")), FALSE); + LoadMcdDlg(dialog); // Setup a handler for when Close or Cancel is clicked diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui index 35937bfb..6f6a9b12 100644 --- a/gui/data/pcsxr.ui +++ b/gui/data/pcsxr.ui @@ -568,7 +568,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Graphics:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -580,7 +579,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Sound:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -592,7 +590,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Controller 1:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -604,7 +601,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Controller 2:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -616,7 +612,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">CD-ROM:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -658,7 +653,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Search in:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -706,7 +700,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Link cable:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -819,7 +812,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">BIOS:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -842,7 +834,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Search in:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -971,356 +962,240 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox54"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkBox" id="hbox54"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="label_xalign">0</property> <child> - <object class="GtkBox" id="vbox31"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="GtkCList_McdList1"> - <property name="width_request">265</property> - <property name="height_request">400</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection3"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="border_width">5</property> + <property name="label_xalign">0</property> <child> - <object class="GtkButtonBox" id="hbuttonbox19"> + <object class="GtkBox" id="vbox31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="spacing">5</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="GtkButton_New1"> + <object class="GtkScrolledWindow" id="scrolledwindow3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_Reload1" swapped="no"/> + <property name="shadow_type">in</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkTreeView" id="GtkCList_McdList1"> + <property name="width_request">265</property> + <property name="height_request">400</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkBox" id="hbox57"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image324"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-new</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">New</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> + <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> </child> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="GtkButton_Format1"> + <object class="GtkButtonBox" id="hbuttonbox19"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_Format" object="1" swapped="yes"/> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="spacing">5</property> <child> - <object class="GtkAlignment" id="alignment50"> + <object class="GtkButton" id="GtkButton_New1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="OnMcd_Reload1" swapped="no"/> <child> - <object class="GtkBox" id="hbox70"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image346"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-clear</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <object class="GtkLabel" id="label111"> + <object class="GtkBox" id="hbox57"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Format</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image324"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-new</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">New</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="GtkButton_Delete1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="OnMcd_Delete1" swapped="no"/> <child> - <object class="GtkAlignment" id="alignment45"> + <object class="GtkButton" id="GtkButton_Format1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="OnMcd_Format" object="1" swapped="yes"/> <child> - <object class="GtkBox" id="hbox63"> + <object class="GtkAlignment" id="alignment50"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <object class="GtkImage" id="image330"> + <object class="GtkBox" id="hbox70"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-delete</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image346"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-clear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label111"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Format</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label105"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Un/Delete</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> </child> </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="Mcd1Button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image30"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-floppy</property> - </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="Mcd1Label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Loading...</property> - <property name="ellipsize">middle</property> - <property name="single_line_mode">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="vseparator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkImage" id="image31"> + <object class="GtkButton" id="GtkButton_Delete1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-open</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="OnMcd_Delete1" swapped="no"/> + <child> + <object class="GtkAlignment" id="alignment45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkBox" id="hbox63"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image330"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-delete</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label105"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Un/Delete</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkBox" id="hbox58"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label100"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Memory Card 1</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">4</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">27</property> - <property name="bottom_padding">132</property> - <child> - <object class="GtkButtonBox" id="vbuttonbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="layout_style">center</property> - <child> - <object class="GtkButton" id="GtkButton_CopyTo2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_CopyTo2" swapped="no"/> <child> - <object class="GtkAlignment" id="alignment41"> + <object class="GtkButton" id="Mcd1Button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <child> - <object class="GtkBox" id="hbox59"> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</property> + <property name="spacing">3</property> <child> - <object class="GtkImage" id="image326"> + <object class="GtkImage" id="image30"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-forward</property> + <property name="stock">gtk-floppy</property> </object> <packing> <property name="expand">False</property> @@ -1329,159 +1204,116 @@ </packing> </child> <child> - <object class="GtkLabel" id="label101"> + <object class="GtkLabel" id="Mcd1Label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Copy</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="label">Loading...</property> + <property name="ellipsize">middle</property> + <property name="single_line_mode">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="GtkButton_CopyTo1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_CopyTo1" swapped="no"/> - <child> - <object class="GtkAlignment" id="alignment42"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkBox" id="hbox60"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> <child> - <object class="GtkImage" id="image327"> + <object class="GtkSeparator" id="vseparator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-back</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label102"> + <object class="GtkImage" id="image31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Copy</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="stock">gtk-open</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="label_xalign">0</property> - <child> - <object class="GtkBox" id="vbox32"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="width_request">265</property> - <property name="height_request">400</property> + <child type="label"> + <object class="GtkBox" id="hbox58"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="shadow_type">in</property> <child> - <object class="GtkTreeView" id="GtkCList_McdList2"> + <object class="GtkLabel" id="label100"> <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection4"/> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Memory Card 1</b></property> + <property name="use_markup">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + <property name="position">0</property> + </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">27</property> + <property name="bottom_padding">132</property> <child> - <object class="GtkButtonBox" id="hbuttonbox20"> + <object class="GtkButtonBox" id="vbuttonbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="spacing">5</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="layout_style">center</property> <child> - <object class="GtkButton" id="GtkButton_New2"> + <object class="GtkButton" id="GtkButton_CopyTo2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_Reload2" swapped="no"/> + <signal name="clicked" handler="OnMcd_CopyTo2" swapped="no"/> <child> - <object class="GtkAlignment" id="alignment48"> + <object class="GtkAlignment" id="alignment41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <object class="GtkBox" id="hbox66"> + <object class="GtkBox" id="hbox59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child> - <object class="GtkImage" id="image333"> + <object class="GtkImage" id="image326"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-new</property> + <property name="stock">gtk-go-forward</property> </object> <packing> <property name="expand">False</property> @@ -1490,12 +1322,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="label108"> + <object class="GtkLabel" id="label101"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">New</property> + <property name="label" translatable="yes">Copy</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -1515,28 +1346,28 @@ </packing> </child> <child> - <object class="GtkButton" id="GtkButton_Format2"> + <object class="GtkButton" id="GtkButton_CopyTo1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <signal name="clicked" handler="OnMcd_Format" object="2" swapped="yes"/> + <signal name="clicked" handler="OnMcd_CopyTo1" swapped="no"/> <child> - <object class="GtkAlignment" id="alignment49"> + <object class="GtkAlignment" id="alignment42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <object class="GtkBox" id="hbox69"> + <object class="GtkBox" id="hbox60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child> - <object class="GtkImage" id="image345"> + <object class="GtkImage" id="image327"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-clear</property> + <property name="stock">gtk-go-back</property> </object> <packing> <property name="expand">False</property> @@ -1545,12 +1376,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="label110"> + <object class="GtkLabel" id="label102"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Format</property> + <property name="label" translatable="yes">Copy</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -1569,83 +1399,104 @@ <property name="position">1</property> </packing> </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkBox" id="vbox32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="GtkButton_Delete2"> + <object class="GtkScrolledWindow" id="scrolledwindow4"> + <property name="width_request">265</property> + <property name="height_request">400</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="OnMcd_Delete2" swapped="no"/> + <property name="shadow_type">in</property> <child> - <object class="GtkAlignment" id="alignment44"> + <object class="GtkTreeView" id="GtkCList_McdList2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkBox" id="hbox62"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image329"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-delete</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label104"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Un/Delete</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> + <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> </child> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="Mcd2Button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> <child> - <object class="GtkBox" id="hbox3"> + <object class="GtkButtonBox" id="hbuttonbox20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">3</property> + <property name="border_width">5</property> + <property name="spacing">5</property> <child> - <object class="GtkImage" id="image32"> + <object class="GtkButton" id="GtkButton_New2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-floppy</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="OnMcd_Reload2" swapped="no"/> + <child> + <object class="GtkAlignment" id="alignment48"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkBox" id="hbox66"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image333"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-new</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label108"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">New</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -1654,85 +1505,244 @@ </packing> </child> <child> - <object class="GtkLabel" id="Mcd2Label"> + <object class="GtkButton" id="GtkButton_Format2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Loading...</property> - <property name="ellipsize">middle</property> - <property name="single_line_mode">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="OnMcd_Format" object="2" swapped="yes"/> + <child> + <object class="GtkAlignment" id="alignment49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkBox" id="hbox69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image345"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-clear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label110"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Format</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="vseparator2"> + <object class="GtkButton" id="GtkButton_Delete2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="OnMcd_Delete2" swapped="no"/> + <child> + <object class="GtkAlignment" id="alignment44"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkBox" id="hbox62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image329"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-delete</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label104"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Un/Delete</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="Mcd2Button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <child> - <object class="GtkImage" id="image33"> + <object class="GtkBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-open</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="image32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-floppy</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="Mcd2Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">Loading...</property> + <property name="ellipsize">middle</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="vseparator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkImage" id="image33"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-open</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - </object> - </child> - <child type="label"> - <object class="GtkBox" id="hbox67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label109"> + <child type="label"> + <object class="GtkBox" id="hbox67"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Memory Card 2</b></property> - <property name="use_markup">True</property> + <child> + <object class="GtkLabel" id="label109"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Memory Card 2</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + <property name="position">0</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">4</property> - <property name="position">0</property> - </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="GtkCheckButton_PerGameMcd"> + <property name="label" translatable="yes">Enable per game memory cards</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">2</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -1800,7 +1810,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Address (Hexadecimal):</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -1953,7 +1962,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Raw Dump...</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -1996,7 +2004,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Patch Memory...</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -2188,6 +2195,275 @@ <placeholder/> </child> </object> + <object class="GtkListStore" id="PGXP_Mode_list"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Disabled</col> + </row> + <row> + <col id="0" translatable="yes">Memory only</col> + </row> + <row> + <col id="0" translatable="yes">Memory + Cpu logic</col> + </row> + </data> + </object> + <object class="GtkDialog" id="PgxpDlg"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Configure PGXP</property> + <property name="resizable">False</property> + <property name="modal">True</property> + <property name="window_position">center-on-parent</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="PgxpDlg_close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkFrame" id="PgxpDlg_Options"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkCheckButton" id="PGXP_GTE"> + <property name="label" translatable="yes">Enable PGXP GTE vertex creation</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="PGXP_Cache"> + <property name="label" translatable="yes">Enable vertex caching.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="PGXP_Texture"> + <property name="label" translatable="yes">Enable perspective correct texturing.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="PgxpDlg_Mode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="baseline_position">top</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">10</property> + <property name="homogeneous">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="PGXP_Mode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">PGXP_Mode_list</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext6"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="PGXP_Mode_title"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_top">4</property> + <property name="margin_bottom">4</property> + <property name="label" translatable="yes">Mode</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="PGXP_Mode_description"> + <property name="height_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">10</property> + <property name="label" translatable="yes">Description</property> + <property name="wrap">True</property> + <property name="width_chars">40</property> + <property name="max_width_chars">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select PGXP Mode</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">PgxpDlg_close</action-widget> + </action-widgets> + <child> + <placeholder/> + </child> + </object> + <object class="GtkAdjustment" id="adjustment_PsxClock"> + <property name="lower">0.5</property> + <property name="upper">5</property> + <property name="step_increment">0.25</property> + <property name="page_increment">10</property> + </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3339,7 +3615,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Search For:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -3351,7 +3626,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Data Type:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -3363,7 +3637,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Value:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -3528,7 +3801,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Freeze</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -3572,7 +3844,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Modify</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -3616,7 +3887,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Copy</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -3652,10 +3922,9 @@ <object class="GtkLabel" id="label_resultsfound"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">label_resultsfound</property> <property name="single_line_mode">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="expand">False</property> @@ -3696,7 +3965,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Search</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -3740,7 +4008,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Restart</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -3873,7 +4140,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3888,7 +4154,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3903,7 +4168,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3918,7 +4182,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3933,7 +4196,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3948,7 +4210,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3963,7 +4224,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3978,7 +4238,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3993,7 +4252,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4008,7 +4266,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4023,7 +4280,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4038,7 +4294,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4053,7 +4308,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4407,7 +4661,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -4451,83 +4704,8 @@ <property name="position">4</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">closebutton1</action-widget> - </action-widgets> - <child> - <placeholder/> - </child> - </object> - <object class="GtkListStore" id="liststore6"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Disabled</col> - </row> - <row> - <col id="0" translatable="yes">Memory only</col> - </row> - <row> - <col id="0" translatable="yes">Memory + Cpu logic</col> - </row> - </data> - </object> - <object class="GtkDialog" id="PgxpDlg"> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Configure PGXP</property> - <property name="resizable">False</property> - <property name="modal">True</property> - <property name="window_position">center-on-parent</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="PgxpDlg_close"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> <child> - <object class="GtkFrame" id="PgxpDlg_Options"> + <object class="GtkFrame" id="frame_oc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -4535,19 +4713,51 @@ <object class="GtkAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">5</property> <property name="orientation">vertical</property> <child> - <object class="GtkCheckButton" id="PGXP_GTE"> - <property name="label" translatable="yes">Enable PGXP GTE vertex creation</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="spacing">5</property> + <child> + <object class="GtkCheckButton" id="GtkCheckButton_OverClock"> + <property name="label" translatable="yes">Overclock</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="GtkSpinButton_PsxClock"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_width_chars">6</property> + <property name="adjustment">adjustment_PsxClock</property> + <property name="digits">2</property> + <property name="numeric">True</property> + <property name="update_policy">if-valid</property> + <property name="value">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -4556,8 +4766,8 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="PGXP_Cache"> - <property name="label" translatable="yes">Enable vertex caching.</property> + <object class="GtkCheckButton" id="GtkCheckButton_MemHack"> + <property name="label" translatable="yes">WipeOut MemHack</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -4569,20 +4779,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="PGXP_Texture"> - <property name="label" translatable="yes">Enable perspective correct texturing.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> @@ -4591,118 +4787,28 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="label" translatable="yes"><b>CPU Overclocking</b></property> + <property name="use_markup">True</property> </object> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="PgxpDlg_Mode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="baseline_position">top</property> - <child> - <object class="GtkComboBox" id="PGXP_Mode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> - <property name="margin_right">40</property> - <property name="model">liststore6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="PGXP_Mode_title"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin_top">4</property> - <property name="margin_bottom">4</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="PGXP_Mode_description"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">10</property> - <property name="wrap">True</property> - <property name="max_width_chars">20</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select PGXP Mode</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="position">5</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> </object> </child> <action-widgets> - <action-widget response="0">PgxpDlg_close</action-widget> + <action-widget response="-6">closebutton1</action-widget> </action-widgets> <child> <placeholder/> |