xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@33750 e17a0e51-4ae3-4d35-97c3-1a29b211df97

Browse Source
This commit is contained in:
SND\weimingzhi_cp 2009-10-29 09:53:03 +00:00
parent 8f670bd1cb
commit 26144025a4
9 changed files with 177 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
October 29, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* data/pcsx.glade2: Replaced the "Close" button on many dialog boxes to
"OK/Cancel" buttons.
* gui/Gtk2Gui.c: Likewise.
* plugins/dfsound/spucfg-0.1df/dfsound.glade2: Likewise.
* plugins/dfsound/spucfg-0.1df/main.c: Likewise.
* plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
* plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
* plugins/dfinput/dfinput.glade2: Likewise.
* plugins/dfinput/cfg-gtk2.c: Likewise.
October 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* plugins/dfinput/xkb.c: Use XkbSetDetectableAutoRepeat() instead of

108
data/pcsx.glade2
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<glade-interface>
<!-- interface-requires gtk+ 2.16 -->
<!-- interface-naming-policy toplevel-contextual -->
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="MainWindow">
<property name="width_request">350</property>
<property name="height_request">195</property>
@ -34,7 +34,7 @@
<signal name="activate" handler="OnFile_RunCd"/>
<accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
<widget class="GtkImage" id="image1">
<widget class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="xalign">0.49000000953674316</property>
<property name="stock">gtk-cdrom</property>
@ -52,7 +52,7 @@
<signal name="activate" handler="OnFile_RunImage"/>
<accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
<widget class="GtkImage" id="image2">
<widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon-size">1</property>
@ -69,7 +69,7 @@
<signal name="activate" handler="OnFile_RunBios"/>
<accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
<widget class="GtkImage" id="image3">
<widget class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon-size">1</property>
@ -86,7 +86,7 @@
<signal name="activate" handler="OnFile_RunExe"/>
<accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
<widget class="GtkImage" id="image4">
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon-size">1</property>
@ -108,7 +108,7 @@
<signal name="activate" handler="OnFile_Exit"/>
<accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
<widget class="GtkImage" id="image5">
<widget class="GtkImage" id="image25">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon-size">1</property>
@ -1173,9 +1173,24 @@
<widget class="GtkHButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="btn_ConfCancel">
<property name="label">gtk-cancel</property>
<property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="btn_ConfOk">
<property name="label">gtk-close</property>
<property name="label">gtk-ok</property>
<property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -1187,7 +1202,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>
@ -1476,10 +1491,25 @@ PAL</property>
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="okbutton1">
<property name="label">gtk-close</property>
<property name="response_id">-7</property>
<property name="label">gtk-ok</property>
<property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -1489,7 +1519,7 @@ PAL</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>
@ -1614,10 +1644,25 @@ PAL</property>
<widget class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancelbutton2">
<property name="label">gtk-cancel</property>
<property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="okbutton2">
<property name="label">gtk-close</property>
<property name="response_id">-7</property>
<property name="label">gtk-ok</property>
<property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -1628,7 +1673,7 @@ PAL</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>
@ -2239,9 +2284,24 @@ PAL</property>
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="closebutton1">
<property name="label">gtk-close</property>
<property name="response_id">-7</property>
<widget class="GtkButton" id="cancelbutton3">
<property name="label">gtk-cancel</property>
<property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="okbutton3">
<property name="label">gtk-ok</property>
<property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -2251,7 +2311,7 @@ PAL</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>
@ -2714,7 +2774,7 @@ Hexadecimal</property>
<widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image7">
<widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
<property name="icon-size">1</property>
@ -2750,7 +2810,7 @@ Hexadecimal</property>
<widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image8">
<widget class="GtkImage" id="image26">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon-size">1</property>
@ -2786,7 +2846,7 @@ Hexadecimal</property>
<widget class="GtkHBox" id="hbox9">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image9">
<widget class="GtkImage" id="image27">
<property name="visible">True</property>
<property name="stock">gtk-paste</property>
<property name="icon-size">1</property>
@ -2854,7 +2914,7 @@ Hexadecimal</property>
<widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image5">
<widget class="GtkImage" id="image28">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
<property name="icon-size">1</property>
@ -2890,7 +2950,7 @@ Hexadecimal</property>
<widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image6">
<widget class="GtkImage" id="image29">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon-size">1</property>

4
gui/Gtk2Gui.c
View File

@ -1194,7 +1194,7 @@ void UpdateMcdDlg(GtkWidget *widget) {
void OnMcd_Clicked (GtkDialog *dialog, gint arg1, gpointer user_data) {
GladeXML *xml = user_data;
if (arg1 == GTK_RESPONSE_CLOSE) {
if (arg1 == GTK_RESPONSE_OK) {
gchar *tmp;
GtkWidget *widget;
@ -1731,7 +1731,7 @@ static void OnCpu_CpuClicked (GtkWidget *widget, gpointer user_data) {
}
void OnCpu_Clicked (GtkDialog *dialog, gint arg1, gpointer user_data) {
if (arg1 == GTK_RESPONSE_CLOSE) {
if (arg1 == GTK_RESPONSE_OK) {
GtkWidget *widget;
GladeXML *xml = user_data;
int tmp;

15
plugins/dfinput/cfg-gtk2.c
View File

@ -213,6 +213,13 @@ static void UpdateKey() {
}
static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
gtk_widget_destroy(widget);
SDL_Quit();
gtk_exit(0);
}
static void OnConfigOk(GtkWidget *widget, gpointer user_data) {
SaveConfig();
gtk_widget_destroy(widget);
@ -560,9 +567,13 @@ long PADconfigure() {
g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btnclose");
widget = glade_xml_get_widget(xml, "btncancel");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(OnConfigExit), xml, NULL, G_CONNECT_AFTER);
GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btnok");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(OnConfigOk), xml, NULL, G_CONNECT_AFTER);
PopulateDevList();
UpdateKeyList();

18
plugins/dfinput/dfinput.glade2
View File

@ -463,8 +463,8 @@ Analog Pad</property>
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="btnclose">
<property name="label">gtk-close</property>
<widget class="GtkButton" id="btncancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@ -476,6 +476,20 @@ Analog Pad</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="btnok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>

25
plugins/dfsound/spucfg-0.1df/dfsound.glade2
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
<!-- interface-requires gtk+ 2.8 -->
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">10</property>
@ -279,10 +279,25 @@ Cubic</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="btn_close">
<property name="label">gtk-close</property>
<widget class="GtkButton" id="btn_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="btn_ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -292,7 +307,7 @@ Cubic</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>

6
plugins/dfsound/spucfg-0.1df/main.c
View File

@ -213,7 +213,11 @@ int main(int argc, char *argv[])
g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btn_close");
widget = glade_xml_get_widget(xml, "btn_cancel");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btn_ok");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, G_CONNECT_AFTER);

25
plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
<!-- interface-requires gtk+ 2.8 -->
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">10</property>
@ -693,10 +693,25 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="btn_close">
<property name="label">gtk-close</property>
<widget class="GtkButton" id="btn_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="btn_ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -706,7 +721,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</widget>

6
plugins/dfxvideo/gpucfg-0.1df/main.c
View File

@ -285,7 +285,11 @@ main (int argc, char *argv[])
g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btn_close");
widget = glade_xml_get_widget(xml, "btn_cancel");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "btn_ok");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, G_CONNECT_AFTER);