diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-11-20 21:01:10 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-11-20 21:01:10 +0000 |
| commit | 5883ee6487832da502dd004bf6a06085d50c30ed (patch) | |
| tree | cc2dbb4bdeeab95122d625d15c33a3a93f5f9851 | |
| parent | aae41a8f9e07d449dc3bce6f9b8d1e7ad54025d1 (diff) | |
| download | pcsxr-5883ee6487832da502dd004bf6a06085d50c30ed.tar.gz | |
gtk3 (thanks to Rafał Mużyło);
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81326 e17a0e51-4ae3-4d35-97c3-1a29b211df97
33 files changed, 1152 insertions, 1015 deletions
diff --git a/configure.ac b/configure.ac index ea70d10d..c28c195c 100644 --- a/configure.ac +++ b/configure.ac @@ -24,14 +24,14 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain]) PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.20, [], AC_MSG_ERROR([*** glib2 >= 2.20 not found!])) -PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.16, [], AC_MSG_ERROR([*** libgtk2 >= 2.16 not found!])) +PKG_CHECK_MODULES(GTK3, gtk+-3.0 , [], AC_MSG_ERROR([*** libgtk3 >= 3.0 not found!])) PKG_CHECK_MODULES(SDL, sdl >= 1.2.12, [], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!])) AC_SUBST(GLIB2_CFLAGS) AC_SUBST(GLIB2_LIBS) -AC_SUBST(GTK2_CFLAGS) -AC_SUBST(GTK2_LIBS) +AC_SUBST(GTK3_CFLAGS) +AC_SUBST(GTK3_LIBS) AC_CONFIG_FILES([Makefile data/Makefile diff --git a/data/pcsxr.ui b/data/pcsxr.ui index fd948d1e..32aadc70 100644 --- a/data/pcsxr.ui +++ b/data/pcsxr.ui @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.24"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkIconFactory" id="iconfactory1"> <sources> <source stock-id="generated-icon-iso-open-png" filename="iso-open.png"/> @@ -23,18 +22,18 @@ <property name="window_position">center</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox7"> + <object class="GtkBox" id="dialog-vbox7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area7"> + <object class="GtkButtonBox" id="dialog-action_area7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="closbutton1"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -66,19 +65,20 @@ <property name="label_xalign">0</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="width_request">500</property> + <property name="height_request">255</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">5</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="window_placement_set">True</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="GtkCList_Cheat"> - <property name="width_request">500</property> - <property name="height_request">255</property> <property name="visible">True</property> <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -102,11 +102,10 @@ <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> + <property name="spacing">5</property> <child> <object class="GtkButton" id="savebutton1"> <property name="label">gtk-save-as</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -122,7 +121,6 @@ <child> <object class="GtkButton" id="loadbutton1"> <property name="label">gtk-open</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -138,7 +136,6 @@ <child> <object class="GtkButton" id="editbutton1"> <property name="label">gtk-edit</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -153,7 +150,6 @@ <child> <object class="GtkButton" id="delbutton1"> <property name="label">gtk-delete</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -168,7 +164,6 @@ <child> <object class="GtkButton" id="addbutton1"> <property name="label">gtk-add</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -210,19 +205,19 @@ <property name="window_position">center</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox8"> + <object class="GtkBox" id="dialog-vbox8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area8"> + <object class="GtkButtonBox" id="dialog-action_area8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="closebutton"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -251,22 +246,22 @@ <object class="GtkAlignment" id="alignment23"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="bottom_padding">12</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">5</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">10</property> - <property name="row_spacing">10</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> <child> <object class="GtkComboBox" id="combo_datatype"> <property name="visible">True</property> @@ -291,37 +286,32 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Search For:</property> </object> - <packing> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> </child> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Data Type:</property> </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> </packing> </child> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Value:</property> </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> </packing> </child> <child> @@ -335,8 +325,6 @@ <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> </packing> </child> <child> @@ -363,8 +351,6 @@ <property name="can_focus">True</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> </object> <packing> <property name="left_attach">1</property> @@ -416,8 +402,6 @@ <property name="can_focus">True</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> </object> <packing> <property name="left_attach">3</property> @@ -432,7 +416,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -442,19 +426,22 @@ <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="width_request">450</property> + <property name="height_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="GtkCList_Result"> - <property name="width_request">450</property> - <property name="height_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_clickable">False</property> <property name="show_expanders">False</property> <property name="enable_grid_lines">vertical</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> </object> </child> </object> @@ -468,11 +455,10 @@ <object class="GtkVButtonBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">20</property> + <property name="spacing">10</property> <property name="layout_style">start</property> <child> <object class="GtkButton" id="btn_freeze"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -497,6 +483,7 @@ <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Freeze</property> </object> <packing> @@ -516,7 +503,6 @@ </child> <child> <object class="GtkButton" id="btn_modify"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -541,6 +527,7 @@ <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Modify</property> </object> <packing> @@ -560,7 +547,6 @@ </child> <child> <object class="GtkButton" id="btn_copy"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -585,6 +571,7 @@ <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Copy</property> </object> <packing> @@ -640,7 +627,6 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="btn_start"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -665,6 +651,7 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Search</property> </object> <packing> @@ -684,7 +671,6 @@ </child> <child> <object class="GtkButton" id="btn_restart"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -709,6 +695,7 @@ <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Restart</property> </object> <packing> @@ -765,18 +752,18 @@ <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox4"> + <object class="GtkBox" id="dialog-vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area4"> + <object class="GtkButtonBox" id="dialog-action_area4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="btn_ConfClose"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -800,7 +787,7 @@ <object class="GtkVBox" id="vbox28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">4</property> + <property name="border_width">5</property> <property name="spacing">3</property> <child> <object class="GtkFrame" id="frame17"> @@ -811,15 +798,15 @@ <object class="GtkAlignment" id="alignment38"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">7</property> + <property name="border_width">5</property> <child> <object class="GtkTable" id="table4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">6</property> <property name="n_columns">5</property> - <property name="column_spacing">3</property> - <property name="row_spacing">3</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> <child> <object class="GtkImage" id="image337"> <property name="visible">True</property> @@ -832,19 +819,6 @@ </packing> </child> <child> - <object class="GtkImage" id="image342"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-find</property> - </object> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkImage" id="image341"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -897,41 +871,7 @@ </packing> </child> <child> - <object class="GtkFileChooserButton" id="GtkFileChooser_Plugin"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action">select-folder</property> - <property name="title" translatable="yes">Select Folder to Search</property> - <signal name="current-folder-changed" handler="OnConfConf_PluginPath" swapped="no"/> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">5</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label89"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Search in:</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <object class="GtkButton" id="btn_ConfGpu"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1020,7 +960,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutSpu"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1044,7 +983,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutPad1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1068,7 +1006,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutPad2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1092,7 +1029,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutCdr"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1116,7 +1052,6 @@ </child> <child> <object class="GtkButton" id="btn_ConfCdr"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1140,7 +1075,6 @@ </child> <child> <object class="GtkButton" id="btn_ConfPad2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1164,7 +1098,6 @@ </child> <child> <object class="GtkButton" id="btn_ConfPad1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1188,7 +1121,6 @@ </child> <child> <object class="GtkButton" id="btn_ConfSpu"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1245,7 +1177,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Controller 1: </property> + <property name="label" translatable="yes">Controller 1:</property> </object> <packing> <property name="left_attach">1</property> @@ -1290,7 +1222,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutGpu"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1310,6 +1241,62 @@ <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkImage" id="image342"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-find</property> + </object> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label89"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Search in:</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkFileChooserButton" id="GtkFileChooser_Plugin"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action">select-folder</property> + <property name="show_hidden">True</property> + <property name="title" translatable="yes">Select Folder to Search</property> + <signal name="current-folder-changed" handler="OnConfConf_PluginPath" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + </packing> + </child> </object> </child> </object> @@ -1338,12 +1325,14 @@ <object class="GtkAlignment" id="alignment39"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">7</property> + <property name="border_width">5</property> <child> - <object class="GtkHBox" id="hbox53"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">3</property> + <property name="hexpand">True</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> <object class="GtkImage" id="image343"> <property name="visible">True</property> @@ -1351,32 +1340,99 @@ <property name="stock">gtk-execute</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="GtkCombo_Bios"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">BIOS:</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkFileChooserButton" id="GtkFileChooser_Bios"> + <object class="GtkImage" id="image38"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action">select-folder</property> + <property name="icon_name">gtk-find</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Search in:</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkComboBox" id="GtkCombo_Bios"> + <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">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkFileChooserButton" id="GtkFileChooser_Bios"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action">select-folder</property> + <property name="show_hidden">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> @@ -1393,7 +1449,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -1402,7 +1458,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="padding">6</property> + <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -1419,18 +1475,18 @@ <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="closebutton1"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1454,11 +1510,12 @@ <object class="GtkVBox" id="vbox25"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="spacing">5</property> <child> <object class="GtkFrame" id="frame15"> <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="GtkTable" id="table3"> @@ -1469,11 +1526,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_SpuIrq"> <property name="label" translatable="yes">SPU IRQ Always Enabled</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1486,11 +1543,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Mdec"> <property name="label" translatable="yes">Black & White Movies</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1503,11 +1560,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Sio"> <property name="label" translatable="yes">SIO IRQ Always Enabled</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1520,11 +1577,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Xa"> <property name="label" translatable="yes">Disable XA Decoding</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1535,11 +1592,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_CDDA"> <property name="label" translatable="yes">Disable CD Audio</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1552,11 +1609,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_SlowBoot"> <property name="label" translatable="yes">Slow Boot</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1569,11 +1626,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Cpu"> <property name="label" translatable="yes">Enable Interpreter CPU</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1586,11 +1643,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_PsxOut"> <property name="label" translatable="yes">Enable Console Output</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1603,11 +1660,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Dbg"> <property name="label" translatable="yes">Enable Debugger</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1620,11 +1677,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_RCntFix"> <property name="label" translatable="yes">Parasite Eve 2, Vandal Hearts 1/2 Fix</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1637,11 +1694,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_VSyncWA"> <property name="label" translatable="yes">InuYasha Sengoku Battle Fix</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1654,11 +1711,11 @@ <child> <object class="GtkCheckButton" id="GtkCheckButton_Widescreen"> <property name="label" translatable="yes">Widescreen (GTE Hack)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> @@ -1689,24 +1746,22 @@ <object class="GtkFrame" id="frame16"> <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="GtkHBox" id="hbox49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="spacing">83</property> + <property name="spacing">10</property> <child> <object class="GtkCheckButton" id="GtkCheckButton_PsxAuto"> <property name="label" translatable="yes">Autodetect</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <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> - <signal name="OnCPU-PSXAutoToggled" handler="on_GtkCheckButton_PsxAuto_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -1779,7 +1834,6 @@ <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="item1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_File</property> @@ -1790,7 +1844,6 @@ <child> <object class="GtkImageMenuItem" id="RunCd"> <property name="label" translatable="yes">Run _CD</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1803,7 +1856,6 @@ <child> <object class="GtkImageMenuItem" id="RunImage"> <property name="label" translatable="yes">Run _ISO...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1816,7 +1868,6 @@ <child> <object class="GtkImageMenuItem" id="RunBios"> <property name="label" translatable="yes">Run _BIOS</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1829,7 +1880,6 @@ <child> <object class="GtkImageMenuItem" id="RunExe"> <property name="label" translatable="yes">Run _EXE...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1848,7 +1898,6 @@ <child> <object class="GtkImageMenuItem" id="exit2"> <property name="label" translatable="yes">E_xit</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1864,7 +1913,6 @@ </child> <child> <object class="GtkMenuItem" id="emulator1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Emulator</property> @@ -1875,7 +1923,6 @@ <child> <object class="GtkImageMenuItem" id="run1"> <property name="label" translatable="yes">_Continue</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1888,7 +1935,6 @@ <child> <object class="GtkImageMenuItem" id="reset1"> <property name="label" translatable="yes">_Reset</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1901,7 +1947,6 @@ <child> <object class="GtkImageMenuItem" id="shutdown1"> <property name="label" translatable="yes">_Shutdown</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1920,7 +1965,6 @@ <child> <object class="GtkImageMenuItem" id="SwitchImage"> <property name="label" translatable="yes">S_witch ISO...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1939,7 +1983,6 @@ <child> <object class="GtkImageMenuItem" id="save1"> <property name="label" translatable="yes">_Save State</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -1950,7 +1993,6 @@ <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _1</property> @@ -1961,7 +2003,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _2</property> @@ -1972,7 +2013,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot3"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _3</property> @@ -1983,7 +2023,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot4"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _4</property> @@ -1994,7 +2033,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot5"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _5</property> @@ -2005,7 +2043,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot6"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _6</property> @@ -2015,7 +2052,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot7"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _7</property> @@ -2025,7 +2061,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot8"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _8</property> @@ -2035,7 +2070,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot9"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _9</property> @@ -2046,7 +2080,6 @@ <child> <object class="GtkImageMenuItem" id="other2"> <property name="label" translatable="yes">_Other...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2063,7 +2096,6 @@ <child> <object class="GtkImageMenuItem" id="load1"> <property name="label" translatable="yes">_Load State</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2074,7 +2106,6 @@ <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _1</property> @@ -2085,7 +2116,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _2</property> @@ -2096,7 +2126,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot3"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _3</property> @@ -2107,7 +2136,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot4"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _4</property> @@ -2118,7 +2146,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot5"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _5</property> @@ -2129,7 +2156,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot6"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _6</property> @@ -2139,7 +2165,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot7"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _7</property> @@ -2149,7 +2174,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot8"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _8</property> @@ -2159,7 +2183,6 @@ </child> <child> <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot9"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slot _9</property> @@ -2170,7 +2193,6 @@ <child> <object class="GtkImageMenuItem" id="other1"> <property name="label" translatable="yes">_Other...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2190,7 +2212,6 @@ </child> <child> <object class="GtkMenuItem" id="configuration1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Configuration</property> @@ -2201,7 +2222,6 @@ <child> <object class="GtkImageMenuItem" id="plugins_bios"> <property name="label" translatable="yes">_Plugins & BIOS...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2220,7 +2240,6 @@ <child> <object class="GtkImageMenuItem" id="graphics1"> <property name="label" translatable="yes">_Graphics...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2231,7 +2250,6 @@ <child> <object class="GtkImageMenuItem" id="sound1"> <property name="label" translatable="yes">_Sound...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2242,7 +2260,6 @@ <child> <object class="GtkImageMenuItem" id="cdrom1"> <property name="label" translatable="yes">CD-_ROM...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2253,7 +2270,6 @@ <child> <object class="GtkImageMenuItem" id="pad1"> <property name="label" translatable="yes">C_ontrollers...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2270,7 +2286,6 @@ <child> <object class="GtkImageMenuItem" id="cpu1"> <property name="label" translatable="yes">_CPU...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2282,7 +2297,6 @@ <child> <object class="GtkImageMenuItem" id="memory_cards1"> <property name="label" translatable="yes">_Memory Cards...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2295,7 +2309,6 @@ <child> <object class="GtkImageMenuItem" id="net1"> <property name="label" translatable="yes">_Netplay...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2313,7 +2326,6 @@ <child> <object class="GtkImageMenuItem" id="cheat1"> <property name="label" translatable="yes">Chea_t</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2326,7 +2338,6 @@ <child> <object class="GtkImageMenuItem" id="browse1"> <property name="label" translatable="yes">_Browse...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2337,7 +2348,6 @@ <child> <object class="GtkImageMenuItem" id="search1"> <property name="label" translatable="yes">_Search...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2352,7 +2362,6 @@ <child> <object class="GtkImageMenuItem" id="memorydump1"> <property name="label" translatable="yes">Memory _Dump</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2366,7 +2375,6 @@ </child> <child> <object class="GtkMenuItem" id="help1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Help</property> @@ -2377,7 +2385,6 @@ <child> <object class="GtkImageMenuItem" id="about_pcsxr1"> <property name="label" translatable="yes">_About PCSXR...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -2405,7 +2412,6 @@ <property name="n_columns">11</property> <child> <object class="GtkToolButton" id="toolbutton_runcd"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2416,7 +2422,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_runimage"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2441,7 +2446,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_run"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2456,7 +2460,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_switchimage"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2481,7 +2484,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_memcards"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2496,7 +2498,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_graphics"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2511,7 +2512,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_sound"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2526,7 +2526,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_cdrom"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2541,7 +2540,6 @@ </child> <child> <object class="GtkToolButton" id="toolbutton_controllers"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -2578,7 +2576,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> - <property name="has_resize_grip">False</property> </object> <packing> <property name="expand">False</property> @@ -2597,18 +2594,17 @@ <property name="default_height">400</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> + <object class="GtkBox" id="dialog-vbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> + <object class="GtkButtonBox" id="dialog-action_area3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="McdClose"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -2649,8 +2645,6 @@ <object class="GtkScrolledWindow" id="scrolledwindow3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="GtkCList_McdList1"> @@ -2658,6 +2652,9 @@ <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> @@ -2675,7 +2672,6 @@ <property name="spacing">5</property> <child> <object class="GtkButton" id="GtkButton_New1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -2708,6 +2704,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">New</property> <property name="use_underline">True</property> </object> @@ -2730,7 +2727,6 @@ </child> <child> <object class="GtkButton" id="GtkButton_Format1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -2763,6 +2759,7 @@ <object class="GtkLabel" id="label111"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Format</property> <property name="use_underline">True</property> </object> @@ -2785,7 +2782,6 @@ </child> <child> <object class="GtkButton" id="GtkButton_Delete1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -2818,6 +2814,7 @@ <object class="GtkLabel" id="label105"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Un/Delete</property> <property name="use_underline">True</property> </object> @@ -2847,7 +2844,6 @@ </child> <child> <object class="GtkButton" id="Mcd1Button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -2957,7 +2953,6 @@ <property name="layout_style">spread</property> <child> <object class="GtkButton" id="GtkButton_CopyTo2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -2990,6 +2985,7 @@ <object class="GtkLabel" id="label101"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Copy</property> <property name="use_underline">True</property> </object> @@ -3012,7 +3008,6 @@ </child> <child> <object class="GtkButton" id="GtkButton_CopyTo1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -3045,6 +3040,7 @@ <object class="GtkLabel" id="label102"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Copy</property> <property name="use_underline">True</property> </object> @@ -3088,17 +3084,18 @@ <property name="spacing">6</property> <child> <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">False</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="GtkCList_McdList2"> - <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-selection4"/> + </child> </object> </child> </object> @@ -3116,7 +3113,6 @@ <property name="spacing">5</property> <child> <object class="GtkButton" id="GtkButton_New2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -3149,6 +3145,7 @@ <object class="GtkLabel" id="label108"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">New</property> <property name="use_underline">True</property> </object> @@ -3171,7 +3168,6 @@ </child> <child> <object class="GtkButton" id="GtkButton_Format2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -3204,6 +3200,7 @@ <object class="GtkLabel" id="label110"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Format</property> <property name="use_underline">True</property> </object> @@ -3226,7 +3223,6 @@ </child> <child> <object class="GtkButton" id="GtkButton_Delete2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -3259,6 +3255,7 @@ <object class="GtkLabel" id="label104"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Un/Delete</property> <property name="use_underline">True</property> </object> @@ -3288,7 +3285,6 @@ </child> <child> <object class="GtkButton" id="Mcd2Button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3406,19 +3402,19 @@ <property name="window_position">center</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox9"> + <object class="GtkBox" id="dialog-vbox9"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area9"> + <object class="GtkButtonBox" id="dialog-action_area9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="memview_close"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3452,6 +3448,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Address (Hexadecimal):</property> </object> <packing> @@ -3467,8 +3464,6 @@ <property name="invisible_char">•</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> </object> <packing> <property name="expand">True</property> @@ -3487,7 +3482,6 @@ <child> <object class="GtkButton" id="btn_go"> <property name="label">gtk-jump-to</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3509,18 +3503,21 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="width_request">580</property> + <property name="height_request">380</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="GtkCList_MemView"> - <property name="width_request">580</property> - <property name="height_request">380</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hover_selection">True</property> <property name="enable_grid_lines">horizontal</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection5"/> + </child> </object> </child> </object> @@ -3538,7 +3535,6 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="btn_dump"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3562,6 +3558,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Raw Dump...</property> </object> <packing> @@ -3581,7 +3578,6 @@ </child> <child> <object class="GtkButton" id="btn_patch"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3605,6 +3601,7 @@ <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Patch Memory...</property> </object> <packing> @@ -3643,18 +3640,18 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="OnNet_Cancel" swapped="no"/> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> + <object class="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> + <object class="GtkButtonBox" id="dialog-action_area2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="closebutton2"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3693,7 +3690,7 @@ <object class="GtkHBox" id="hbox68"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">3</property> + <property name="spacing">5</property> <child> <object class="GtkImage" id="image344"> <property name="visible">True</property> @@ -3701,7 +3698,7 @@ <property name="stock">gtk-network</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -3719,7 +3716,6 @@ </child> <child> <object class="GtkButton" id="btn_ConfNet"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -3740,7 +3736,6 @@ </child> <child> <object class="GtkButton" id="btn_AboutNet"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -3780,7 +3775,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> </packing> diff --git a/debian-upstream/control b/debian-upstream/control index ede4fe1f..715efa19 100644 --- a/debian-upstream/control +++ b/debian-upstream/control @@ -2,7 +2,7 @@ Source: pcsxr Section: otherosfs Priority: extra Maintainer: Wei Mingzhi <whistler_wmz@users.sf.net> -Build-Depends: debhelper (>= 5), libgtk2.0-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev, intltool +Build-Depends: debhelper (>= 5), libgtk-3-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev, intltool Standards-Version: 3.7.3 Package: pcsxr @@ -11,10 +11,10 @@ Depends: ${shlibs:Depends} Replaces: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11, pcsx-df Conflicts: pcsx (<= 1:1.699df-rc3-1), pcsx-bin (<= 1:1.699df-rc3-1), pcsx-i18n (<= 1:1.699df-rc3-1), pcsx-df (<= 1:1.999) Description: Sony PlayStation emulator -- binary - PCSX is an advanced PlayStation (PSX) emulator, which uses a plugin + PCSXR is an advanced PlayStation (PSX) emulator, which uses a plugin architecture to provide full support for all components of the PSX. It has full emulation support for gamepads, videos, sound, memory cards, and other important PSX components, and is able to play many games without problems. . - This package provides the main PCSX binary, library, and support files. + This package provides the main PCSXR binary, library, and support files. diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index 43c9851c..d01dd291 100755 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -88,6 +88,7 @@ void RunAboutDialog(void) { "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."); AboutDlg = gtk_about_dialog_new(); + gtk_window_set_resizable(GTK_WINDOW(AboutDlg), TRUE); gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(AboutDlg), "PCSX-Reloaded"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(AboutDlg), ABOUT_VERSION); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(AboutDlg), "http://pcsxr.codeplex.com/"); diff --git a/gui/Cheat.c b/gui/Cheat.c index 037192df..01aab2b1 100644 --- a/gui/Cheat.c +++ b/gui/Cheat.c @@ -413,27 +413,27 @@ void RunCheatListDialog() { NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "addbutton1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatListDlg_AddClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "editbutton1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatListDlg_EditClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "delbutton1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatListDlg_DelClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "loadbutton1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatListDlg_OpenClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "savebutton1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatListDlg_SaveClicked), builder, NULL, G_CONNECT_AFTER); // Setup a handler for when Close or Cancel is clicked - g_signal_connect_data(GTK_OBJECT(CheatListDlg), "response", + g_signal_connect_data(G_OBJECT(CheatListDlg), "response", G_CALLBACK(OnCheatListDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats); @@ -1116,33 +1116,33 @@ void RunCheatSearchDialog() { UpdateCheatSearchDialog(); widget = gtk_builder_get_object(builder, "btn_freeze"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatSearchDlg_FreezeClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_modify"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatSearchDlg_ModifyClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_copy"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatSearchDlg_CopyClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_start"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatSearchDlg_SearchClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_restart"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCheatSearchDlg_RestartClicked), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "combo_searchfor"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnCheatSearchDlg_SearchForChanged), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "combo_database"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), builder, NULL, G_CONNECT_AFTER); - g_signal_connect_data(GTK_OBJECT(CheatSearchDlg), "response", + g_signal_connect_data(G_OBJECT(CheatSearchDlg), "response", G_CALLBACK(OnCheatSearchDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index b732f693..d71d829e 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -125,55 +125,55 @@ void ConfigurePlugins() { } widget = gtk_builder_get_object(builder, "btn_ConfGpu"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_ConfSpu"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER); /* ADB TODO Does pad 1 and 2 need to be different? */ widget = gtk_builder_get_object(builder, "btn_ConfPad1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfConf_Pad1Conf), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_ConfPad2"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfConf_Pad2Conf), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_ConfCdr"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutGpu"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutSpu"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutPad1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfConf_Pad1About), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutPad2"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfConf_Pad2About), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutCdr"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkFileChooser_Bios"); - g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed", + g_signal_connect_data(G_OBJECT(widget), "current_folder_changed", G_CALLBACK(OnBiosPath_Changed), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkFileChooser_Plugin"); - g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed", + g_signal_connect_data(G_OBJECT(widget), "current_folder_changed", G_CALLBACK(OnPluginPath_Changed), builder, NULL, G_CONNECT_AFTER); - g_signal_connect_data(GTK_OBJECT(ConfDlg), "response", + g_signal_connect_data(G_OBJECT(ConfDlg), "response", G_CALLBACK(OnConf_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } @@ -205,15 +205,15 @@ void OnConf_Net() { FindNetPlugin(builder); /* Setup a handler for when Close or Cancel is clicked */ - g_signal_connect_data(GTK_OBJECT(NetDlg), "response", + g_signal_connect_data(G_OBJECT(NetDlg), "response", G_CALLBACK(OnNet_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_ConfNet"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnNet_Conf), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_AboutNet"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnNet_About), builder, NULL, G_CONNECT_AFTER); } @@ -861,13 +861,13 @@ void OnConf_Cpu() { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")), Config.SlowBoot); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), Config.PsxAuto); - g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled", + g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled", G_CALLBACK(OnCpu_PsxAutoClicked), builder, NULL, G_CONNECT_AFTER); #ifdef PSXREC gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), Config.Cpu); - g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled", + g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled", G_CALLBACK(OnCpu_CpuClicked), builder, NULL, G_CONNECT_AFTER); #else Config.Cpu = CPU_INTERPRETER; @@ -886,6 +886,6 @@ void OnConf_Cpu() { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen); // Setup a handler for when Close or Cancel is clicked - g_signal_connect_data(GTK_OBJECT(CpuDlg), "response", + g_signal_connect_data(G_OBJECT(CpuDlg), "response", G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c index a40f3cbb..27dcf8bd 100755 --- a/gui/DebugMemory.c +++ b/gui/DebugMemory.c @@ -108,7 +108,8 @@ static void MemView_Dump() { gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); gtk_widget_show(label); - start_edit = gtk_entry_new_with_max_length(8); + start_edit = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(start_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(start_edit), buf); gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5); @@ -185,7 +186,8 @@ static void MemView_Patch() { gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); gtk_widget_show(label); - addr_edit = gtk_entry_new_with_max_length(8); + addr_edit = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(addr_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(addr_edit), buf); gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5); @@ -298,17 +300,17 @@ void RunDebugMemoryDialog() { UpdateMemViewDlg(); widget = gtk_builder_get_object(builder, "btn_dump"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(MemView_Dump), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_patch"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(MemView_Patch), builder, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "btn_go"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(MemView_Go), builder, NULL, G_CONNECT_AFTER); - g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response", + g_signal_connect_data(G_OBJECT(MemViewDlg), "response", G_CALLBACK(MemView_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c index a0d3b3fc..15913b68 100755 --- a/gui/Gtk2Gui.c +++ b/gui/Gtk2Gui.c @@ -253,184 +253,184 @@ void StartGui() { ResetMenuSlots(); // Set up callbacks - g_signal_connect_data(GTK_OBJECT(Window), "delete-event", + g_signal_connect_data(G_OBJECT(Window), "delete-event", G_CALLBACK(OnDestroy), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); // File menu widget = gtk_builder_get_object(builder, "RunCd"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "RunBios"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "RunExe"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "RunImage"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "exit2"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER); // States widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot2"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot3"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot4"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot5"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot6"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot7"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot8"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot9"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "other1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_load_other), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot2"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot3"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot4"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot5"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot6"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot7"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot8"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot9"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "other2"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(on_states_save_other), NULL, NULL, G_CONNECT_AFTER); // Emulation menu widget = gtk_builder_get_object(builder, "run1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "reset1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "shutdown1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnEmu_Shutdown), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "SwitchImage"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER); // Configuration menu widget = gtk_builder_get_object(builder, "plugins_bios"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "graphics1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "sound1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cdrom1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "pad1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cpu1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "memory_cards1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "net1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Net), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "memorydump1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER); // Cheat menu widget = gtk_builder_get_object(builder, "browse1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "search1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER); // Help menu widget = gtk_builder_get_object(builder, "about_pcsxr1"); - g_signal_connect_data(GTK_OBJECT(widget), "activate", + g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER); // Toolbar widget = gtk_builder_get_object(builder, "toolbutton_runcd"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_runimage"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_run"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_switchimage"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_memcards"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_graphics"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_sound"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_cdrom"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "toolbutton_controllers"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER); gtk_main(); @@ -816,10 +816,7 @@ void OnFile_Exit() { if (UseGui) gtk_main_quit(); SysClose(); - if (UseGui) - gtk_exit (0); - else - exit(0); + exit(0); } void state_load(gchar *state_filename) { diff --git a/gui/Makefile.am b/gui/Makefile.am index ce7c16c4..07823a5b 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \ -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \ -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\" @@ -29,4 +29,4 @@ pcsxr_SOURCES = \ pcsxr_LDADD = \ ../libpcsxcore/libpcsxcore.a \ - $(GTK2_LIBS) -lpthread -lz -lm -lXext -lXtst + $(GTK3_LIBS) -lpthread -lz -lm -lXext -lXtst diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index eecb29fc..3fcceb50 100755 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -717,50 +717,50 @@ void OnConf_Mcds() { LoadMcdDlg(dialog); // Setup a handler for when Close or Cancel is clicked - g_signal_connect_data(GTK_OBJECT(dialog), "response", + g_signal_connect_data(G_OBJECT(dialog), "response", G_CALLBACK(OnMcd_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkButton_Format1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkButton_Format2"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "Mcd1Button"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "Mcd2Button"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkButton_New1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkButton_New2"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "GtkButton_CopyTo1"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER); gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE); widget = gtk_builder_get_object(builder, "GtkButton_CopyTo2"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER); gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE); widget = gtk_builder_get_object(builder, "GtkButton_Delete1"); - g_signal_connect_data (GTK_OBJECT (widget), "clicked", + g_signal_connect_data (G_OBJECT (widget), "clicked", G_CALLBACK(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER); gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE); widget = gtk_builder_get_object(builder, "GtkButton_Delete2"); - g_signal_connect_data (GTK_OBJECT (widget), "clicked", + g_signal_connect_data (G_OBJECT (widget), "clicked", G_CALLBACK(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER); gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE); diff --git a/gui/Plugin.c b/gui/Plugin.c index fa685d82..2677677b 100755 --- a/gui/Plugin.c +++ b/gui/Plugin.c @@ -31,7 +31,7 @@ #include "nopic.h" -#define MAX_SLOTS 9 /* ADB TODO Same as Gtk2Gui.c */ +#define MAX_SLOTS 9 /* ADB TODO Same as GtkGui.c */ void OnFile_Exit(); diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am index 0a51c332..b8ac8aa7 100644 --- a/plugins/bladesio1/Makefile.am +++ b/plugins/bladesio1/Makefile.am @@ -8,12 +8,12 @@ libBladeSio1_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgBladeSio1 cfgBladeSio1_SOURCES = gui.c -cfgBladeSio1_LDADD = $(GTK2_LIBS) +cfgBladeSio1_LDADD = $(GTK3_LIBS) glade_DATA = sio1.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c index 9bd1e852..d08d308f 100644 --- a/plugins/bladesio1/gui.c +++ b/plugins/bladesio1/gui.c @@ -73,7 +73,6 @@ int main( int argc, char *argv[] ) textdomain( GETTEXT_PACKAGE ); #endif - gtk_set_locale(); gtk_init( &argc, &argv ); if( argc > 1 ) diff --git a/plugins/bladesio1/sio1.ui b/plugins/bladesio1/sio1.ui index 957c449c..bdad3a1d 100644 --- a/plugins/bladesio1/sio1.ui +++ b/plugins/bladesio1/sio1.ui @@ -1,27 +1,127 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires gtk+ 2.16 --> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="dlgStart"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="btnStart"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-network</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="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Start Game</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</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> + <child> + <object class="GtkButton" id="btnOffline"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-no</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="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Play Offline</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2). If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it. @@ -30,12 +130,15 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">8</property> @@ -48,9 +151,11 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-copy</property> </object> <packing> @@ -62,9 +167,13 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Copy PC IP to Clipboard</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -81,8 +190,8 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">15</property> - <property name="invisible_char">●</property> - <signal name="activate" handler="on_tbServerIP_activate"/> + <property name="invisible_char">●</property> + <signal name="activate" handler="on_tbServerIP_activate" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -97,6 +206,7 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -107,6 +217,7 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">rbServer</property> @@ -118,6 +229,8 @@ If you selected Client please enter the IP address the Server gave to you in the </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="padding">2</property> <property name="position">1</property> </packing> @@ -125,27 +238,35 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property> <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Port Number</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -154,110 +275,33 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">5</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> </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">1</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="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="btnStart"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-network</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="label5"> - <property name="visible">True</property> - <property name="label" translatable="yes">Start Game</property> - </object> - <packing> - <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> - <child> - <object class="GtkButton" id="btnOffline"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-no</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="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes">Play Offline</property> - </object> - <packing> - <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> - </object> - <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index b001ab0f..b4c729f9 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -23,12 +23,12 @@ endif AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFCdrom cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c -cfgDFCdrom_LDADD = $(GTK2_LIBS) +cfgDFCdrom_LDADD = $(GTK3_LIBS) glade_DATA = cdrcfg-0.1df/dfcdrom.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui index 50f6fef9..8a1d4bc1 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui +++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="CfgWnd"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">CDR configuration</property> + <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center</property> <property name="type_hint">normal</property> <signal name="show" handler="on_cfg_dialog_show" swapped="no"/> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="cfg_dialog-action_area"> + <object class="GtkButtonBox" id="cfg_dialog-action_area"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="cfg_closebutton"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -60,17 +60,14 @@ <property name="can_focus">False</property> <property name="border_width">5</property> <child> - <object class="GtkComboBoxEntry" id="cddev_comboboxentry"> + <object class="GtkComboBox" id="cddev_comboboxentry"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property> + <property name="has_entry">True</property> <child internal-child="entry"> - <object class="GtkEntry" id="comboboxentry-entry2"> + <object class="GtkEntry" id="combobox-entry2"> <property name="can_focus">False</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> </object> </child> </object> @@ -84,7 +81,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -103,10 +100,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">5</property> + <property name="spacing">5</property> <child> <object class="GtkLabel" id="readmode_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Select read mode:</property> </object> <packing> @@ -141,17 +140,6 @@ </packing> </child> <child> - <object class="GtkHSeparator" id="hseparator1"> - <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">1</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -161,6 +149,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Cache Size (Def. 64):</property> </object> <packing> @@ -175,8 +164,6 @@ <property name="can_focus">True</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="numeric">True</property> </object> @@ -191,18 +178,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkHSeparator" id="hseparator2"> - <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">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -215,6 +191,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Spindown Time:</property> </object> <packing> @@ -244,20 +221,9 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkHSeparator" id="hseparator3"> - <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">5</property> + <property name="position">2</property> </packing> </child> <child> @@ -270,6 +236,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property> </object> <packing> @@ -284,8 +251,6 @@ <property name="can_focus">True</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="numeric">True</property> </object> @@ -300,35 +265,24 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkHSeparator" id="cfg_hseparator"> - <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">7</property> + <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="subQ_button"> <property name="label" translatable="yes">Enable subchannel read</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="border_width">5</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">8</property> + <property name="position">4</property> </packing> </child> </object> diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c index a35466d2..c07bf1f8 100755 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -170,7 +170,7 @@ void fill_drives_list(GtkWidget *widget) { } gtk_combo_box_set_model(GTK_COMBO_BOX(widget), GTK_TREE_MODEL(store)); - gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(widget), 0); + gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(widget), 0); } static void OnConfigExit(GtkWidget *widget, gpointer user_data) { @@ -196,7 +196,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { SaveConf(); gtk_widget_destroy(widget); - gtk_exit(0); + exit(0); } long CDRconfigure() { @@ -206,11 +206,11 @@ long CDRconfigure() { gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration")); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "delete_event", + g_signal_connect_data(G_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cfg_closebutton"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); @@ -245,7 +245,7 @@ void CDRabout() { "Wei Mingzhi <whistler_wmz@users.sf.net>", NULL}; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.0"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/"); @@ -262,7 +262,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (argc != 2) return 0; diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index f4926905..55016cb0 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -9,12 +9,12 @@ libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS) AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../include -I../../libpcsxcore $(SDL_CFLAGS) bin_PROGRAMS = cfgDFInput cfgDFInput_SOURCES = cfg-gtk2.c pad.h -cfgDFInput_LDADD = $(GTK2_LIBS) $(SDL_LIBS) -lX11 +cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11 glade_DATA = dfinput.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c index 18f746d3..941d7848 100755 --- a/plugins/dfinput/cfg-gtk2.c +++ b/plugins/dfinput/cfg-gtk2.c @@ -261,7 +261,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { SDL_Quit(); XCloseDisplay(g.Disp); - gtk_exit(0); + exit(0); } static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) { @@ -663,11 +663,11 @@ long PADconfigure() { G_CALLBACK(TreeSelectionChanged), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "delete_event", + g_signal_connect_data(G_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnclose"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); PopulateDevList(); @@ -675,7 +675,7 @@ long PADconfigure() { widget = gtk_builder_get_object(xml, "checkmt"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER); /* @@ -685,11 +685,11 @@ long PADconfigure() { G_CALLBACK(OnHideCursorToggled), NULL, NULL, G_CONNECT_AFTER); */ widget = gtk_builder_get_object(xml, "combodev1"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "combodev2"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER); int padTypeList[] = { @@ -706,43 +706,43 @@ long PADconfigure() { widget = gtk_builder_get_object(xml, "combotype1"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), padTypeList[g.cfg.PadDef[0].Type]); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "combotype2"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), padTypeList[g.cfg.PadDef[1].Type]); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "checkvv1"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[0].VisualVibration); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnVisualVibration1Toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "checkvv2"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[1].VisualVibration); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnVisualVibration2Toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnchange1"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnreset1"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnchange2"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnreset2"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER); gtk_widget_show(MainWindow); @@ -756,7 +756,7 @@ void PADabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.1"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/"); @@ -773,7 +773,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (argc > 1 && !strcmp(argv[1], "-about")) { @@ -782,6 +781,5 @@ int main(int argc, char *argv[]) { PADconfigure(); } - gtk_exit(0); return 0; } diff --git a/plugins/dfinput/dfinput.ui b/plugins/dfinput/dfinput.ui index 8151622a..7adb6277 100644 --- a/plugins/dfinput/dfinput.ui +++ b/plugins/dfinput/dfinput.ui @@ -1,41 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Digital Pad</col> - </row> - <row> - <col id="0" translatable="yes">Analog Pad</col> - </row> - <row> - <col id="0" translatable="yes">Mouse</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Digital Pad</col> - </row> - <row> - <col id="0" translatable="yes">Analog Pad</col> - </row> - <row> - <col id="0" translatable="yes">Mouse</col> - </row> - </data> - </object> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkWindow" id="CfgWnd"> <property name="can_focus">False</property> <child> @@ -52,104 +17,87 @@ <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">5</property> <property name="spacing">2</property> <child> - <object class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Device:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="combodev1"> - <property name="width_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Device:</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkComboBox" id="combodev1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Type:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="combotype1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore2</property> <child> - <object class="GtkComboBox" id="combotype1"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore2</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <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> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <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> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="checkvv1"> <property name="label" translatable="yes">Visual vibration</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -160,19 +108,20 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="width_request">500</property> + <property name="height_request">275</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">5</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="window_placement_set">True</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="treeview1"> - <property name="width_request">500</property> - <property name="height_request">275</property> <property name="visible">True</property> <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -190,7 +139,6 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="btnchange1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -234,7 +182,6 @@ </child> <child> <object class="GtkButton" id="btnreset1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -278,7 +225,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">3</property> </packing> @@ -299,104 +246,87 @@ <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">5</property> <property name="spacing">2</property> <child> - <object class="GtkHButtonBox" id="hbuttonbox4"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Device:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="combodev2"> - <property name="width_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Device:</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkComboBox" id="combodev2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Type:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="combotype2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> <child> - <object class="GtkComboBox" id="combotype2"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <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> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <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> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="checkvv2"> <property name="label" translatable="yes">Visual vibration</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -407,19 +337,20 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="width_request">500</property> + <property name="height_request">275</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">5</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="window_placement_set">True</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="treeview2"> - <property name="width_request">500</property> - <property name="height_request">275</property> <property name="visible">True</property> <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> </object> </child> </object> @@ -437,7 +368,6 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="btnchange2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -481,7 +411,6 @@ </child> <child> <object class="GtkButton" id="btnreset2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -555,10 +484,10 @@ <child> <object class="GtkCheckButton" id="checkmt"> <property name="label" translatable="yes">Multi-Threaded (Recommended)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -593,7 +522,6 @@ <child> <object class="GtkButton" id="btnclose"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -609,9 +537,44 @@ <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </object> </child> </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Digital Pad</col> + </row> + <row> + <col id="0" translatable="yes">Analog Pad</col> + </row> + <row> + <col id="0" translatable="yes">Mouse</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Digital Pad</col> + </row> + <row> + <col id="0" translatable="yes">Analog Pad</col> + </row> + <row> + <col id="0" translatable="yes">Mouse</col> + </row> + </data> + </object> </interface> diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am index 835e82a3..004df634 100755 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -8,12 +8,12 @@ libDFNet_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFNet cfgDFNet_SOURCES = gui.c -cfgDFNet_LDADD = $(GTK2_LIBS) +cfgDFNet_LDADD = $(GTK3_LIBS) glade_DATA = dfnet.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfnet/dfnet.ui b/plugins/dfnet/dfnet.ui index 957c449c..bdad3a1d 100755 --- a/plugins/dfnet/dfnet.ui +++ b/plugins/dfnet/dfnet.ui @@ -1,27 +1,127 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires gtk+ 2.16 --> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="dlgStart"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="btnStart"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-network</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="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Start Game</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</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> + <child> + <object class="GtkButton" id="btnOffline"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-no</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="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Play Offline</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2). If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it. @@ -30,12 +130,15 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">8</property> @@ -48,9 +151,11 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-copy</property> </object> <packing> @@ -62,9 +167,13 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Copy PC IP to Clipboard</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -81,8 +190,8 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">15</property> - <property name="invisible_char">●</property> - <signal name="activate" handler="on_tbServerIP_activate"/> + <property name="invisible_char">●</property> + <signal name="activate" handler="on_tbServerIP_activate" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -97,6 +206,7 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -107,6 +217,7 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">rbServer</property> @@ -118,6 +229,8 @@ If you selected Client please enter the IP address the Server gave to you in the </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="padding">2</property> <property name="position">1</property> </packing> @@ -125,27 +238,35 @@ If you selected Client please enter the IP address the Server gave to you in the <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property> <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Port Number</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -154,110 +275,33 @@ If you selected Client please enter the IP address the Server gave to you in the <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">5</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> </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">1</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="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="btnStart"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-network</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="label5"> - <property name="visible">True</property> - <property name="label" translatable="yes">Start Game</property> - </object> - <packing> - <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> - <child> - <object class="GtkButton" id="btnOffline"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-no</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="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes">Play Offline</property> - </object> - <packing> - <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> - </object> - <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c index b1438995..7dbb5642 100755 --- a/plugins/dfnet/gui.c +++ b/plugins/dfnet/gui.c @@ -112,7 +112,7 @@ long CFGopen() { gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay")); widget = gtk_builder_get_object(builder, "btnCopyIP"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "tbServerIP"); @@ -182,7 +182,7 @@ void CFGabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "0.21"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/"); @@ -212,7 +212,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (!strcmp(argv[1], "configure")) { diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 7f50844e..2cbd3552 100755 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -48,9 +48,9 @@ endif bin_PROGRAMS = cfgDFSound cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(AM_CPPFLAGS) + $(GTK3_CFLAGS) $(AM_CPPFLAGS) cfgDFSound_SOURCES = spucfg-0.1df/main.c -cfgDFSound_LDADD = $(GTK2_LIBS) +cfgDFSound_LDADD = $(GTK3_LIBS) glade_DATA = spucfg-0.1df/dfsound.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui index 7c27b275..9714f0a7 100755 --- a/plugins/dfsound/spucfg-0.1df/dfsound.ui +++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkWindow" id="CfgWnd"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -167,12 +166,12 @@ <child> <object class="GtkCheckButton" id="chkXASpeed"> <property name="label" translatable="yes">Adjust XA speed</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -210,12 +209,12 @@ <child> <object class="GtkCheckButton" id="chkHiCompat"> <property name="label" translatable="yes">High compatibility mode</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -227,12 +226,12 @@ <child> <object class="GtkCheckButton" id="chkIRQWait"> <property name="label" translatable="yes">SPU IRQ Wait</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -244,12 +243,12 @@ <child> <object class="GtkCheckButton" id="chkDisStereo"> <property name="label" translatable="yes">Single channel sound</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -261,10 +260,10 @@ <child> <object class="GtkCheckButton" id="chkFreqResponse"> <property name="label" translatable="yes">Frequency Response - Output Filter</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -293,7 +292,6 @@ <child> <object class="GtkButton" id="btn_close"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c index 1a677a25..c18fc724 100755 --- a/plugins/dfsound/spucfg-0.1df/main.c +++ b/plugins/dfsound/spucfg-0.1df/main.c @@ -48,7 +48,7 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); - gtk_exit(0); + exit(0); } int main(int argc, char *argv[]) @@ -76,18 +76,17 @@ int main(int argc, char *argv[]) return 0; } - gtk_set_locale(); gtk_init(&argc, &argv); if (strcmp(argv[1], "ABOUT") == 0) { const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL}; widget = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin"); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin"); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/"); - g_signal_connect_data(GTK_OBJECT(widget), "response", + g_signal_connect_data(G_OBJECT(widget), "response", G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER); gtk_widget_show (widget); @@ -223,11 +222,11 @@ int main(int argc, char *argv[]) free(pB); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "destroy", + g_signal_connect_data(G_OBJECT(widget), "destroy", G_CALLBACK(SaveConfig), builder, NULL, 0); widget = gtk_builder_get_object(builder, "btn_close"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER); gtk_main(); @@ -242,7 +241,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) fp = fopen(CONFIG_FILENAME, WRITEBINARY); if (fp == NULL) { fprintf(stderr, "Unable to write to configuration file %s!\n", CONFIG_FILENAME); - gtk_exit(0); + exit(0); } val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2"))); @@ -270,5 +269,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) fprintf(fp, "\nUseReverb = %d\n", val); fclose(fp); - gtk_exit(0); + exit(0); } diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index bc487db4..2af76fde 100755 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -8,7 +8,7 @@ SUFFIXES = .asm AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS)\ + $(GTK3_CFLAGS)\ -I../../libpcsxcore \ -I../../include @@ -27,7 +27,7 @@ libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c -cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext +cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext glade_DATA = gpucfg-0.1df/dfxvideo.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui index b60c02d3..2530f076 100755 --- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui +++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui @@ -1,39 +1,42 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkWindow" id="CfgWnd"> <property name="visible">True</property> - <property name="border_width">10</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> <property name="title" translatable="yes">Configure X11 Video</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_CfgWnd_destroy"/> + <signal name="destroy" handler="on_CfgWnd_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <child> <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="can_focus">False</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">30</property> @@ -41,6 +44,7 @@ <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Initial Window Size:</property> </object> @@ -52,6 +56,7 @@ <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Stretching:</property> </object> @@ -65,6 +70,7 @@ <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Dithering:</property> </object> @@ -78,6 +84,7 @@ <child> <object class="GtkComboBox" id="stretchCombo2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststoreStretching</property> <property name="active">0</property> <child> @@ -99,6 +106,7 @@ <child> <object class="GtkComboBox" id="ditherCombo2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststoreDither</property> <property name="active">1</property> <child> @@ -120,10 +128,12 @@ <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">10</property> <child> <object class="GtkComboBox" id="resCombo2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststoreRes</property> <property name="active">2</property> <child> @@ -134,6 +144,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -146,6 +158,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Toggle windowed/fullscreen mode.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -162,12 +175,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="maintain43"> <property name="label" translatable="yes">Maintain 4:3 Aspect Ratio</property> @@ -175,6 +191,7 @@ <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> @@ -185,6 +202,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -194,24 +213,28 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="can_focus">False</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="checkShowFPS"> <property name="label" translatable="yes">Show FPS</property> @@ -220,6 +243,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Toggle whether the FPS will be shown.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -236,6 +260,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Skip frames when rendering.</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -247,6 +272,7 @@ <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <child> @@ -257,6 +283,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Enable this if games display too quickly.</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -286,6 +313,7 @@ <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -307,24 +335,28 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="can_focus">False</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="checkUseFixes"> <property name="label" translatable="yes">Use game fixes</property> @@ -332,6 +364,7 @@ <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> @@ -343,14 +376,19 @@ <child> <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">19</property> <child> <object class="GtkTable" id="table_fixes"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">6</property> <property name="n_columns">2</property> <property name="column_spacing">16</property> <child> + <placeholder/> + </child> + <child> <object class="GtkCheckButton" id="checkFix5"> <property name="label" translatable="yes">Disable CPU Saving</property> <property name="visible">True</property> @@ -358,6 +396,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">For precise framerate</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -375,6 +414,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Chrono Cross</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -390,6 +430,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Better FPS limit in some</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -407,6 +448,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Capcom fighting games</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -424,6 +466,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Black screens in Lunar</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -441,6 +484,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Compatibility mode</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -459,6 +503,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Pandemonium 2</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -477,6 +522,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Skip every second frame</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -497,6 +543,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Needed by Dark Forces</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -517,6 +564,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">better g-colors, worse textures</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -537,6 +585,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Toggle busy flags after drawing</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -548,13 +597,12 @@ <property name="y_options"></property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -564,12 +612,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> @@ -589,87 +640,89 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> </object> </child> </object> - <object class="GtkListStore" id="liststoreStretching"> + <object class="GtkListStore" id="liststoreDither"> <columns> <!-- column-name Item --> <column type="gchararray"/> </columns> <data> <row> - <col id="0" translatable="yes">0: None</col> - </row> - <row> - <col id="0" translatable="yes">1: 2xSai</col> + <col id="0" translatable="yes">0: Off (fastest)</col> </row> <row> - <col id="0" translatable="yes">2: 2xSuperSai</col> + <col id="0" translatable="yes">1: Game dependant</col> </row> <row> - <col id="0" translatable="yes">3: SuperEagle</col> + <col id="0" translatable="yes">2: Always</col> </row> + </data> + </object> + <object class="GtkListStore" id="liststoreRes"> + <columns> + <!-- column-name Item --> + <column type="gchararray"/> + </columns> + <data> <row> - <col id="0" translatable="yes">4: Scale2x</col> + <col id="0" translatable="yes">320x240</col> </row> <row> - <col id="0" translatable="yes">5: Scale3x</col> + <col id="0" translatable="yes">640x480</col> </row> <row> - <col id="0" translatable="yes">6: HQ2X</col> + <col id="0" translatable="yes">800x600</col> </row> <row> - <col id="0" translatable="yes">7: HQ3X</col> + <col id="0" translatable="yes">1024x768</col> </row> - </data> - </object> - <object class="GtkListStore" id="liststoreDither"> - <columns> - <!-- column-name Item --> - <column type="gchararray"/> - </columns> - <data> <row> - <col id="0" translatable="yes">0: Off (fastest)</col> + <col id="0" translatable="yes">1152x864</col> </row> <row> - <col id="0" translatable="yes">1: Game dependant</col> + <col id="0" translatable="yes">1280x1024</col> </row> <row> - <col id="0" translatable="yes">2: Always</col> + <col id="0" translatable="yes">1600x1200</col> </row> </data> </object> - <object class="GtkListStore" id="liststoreRes"> + <object class="GtkListStore" id="liststoreStretching"> <columns> <!-- column-name Item --> <column type="gchararray"/> </columns> <data> <row> - <col id="0" translatable="yes">320x240</col> + <col id="0" translatable="yes">0: None</col> </row> <row> - <col id="0" translatable="yes">640x480</col> + <col id="0" translatable="yes">1: 2xSai</col> </row> <row> - <col id="0" translatable="yes">800x600</col> + <col id="0" translatable="yes">2: 2xSuperSai</col> </row> <row> - <col id="0" translatable="yes">1024x768</col> + <col id="0" translatable="yes">3: SuperEagle</col> </row> <row> - <col id="0" translatable="yes">1152x864</col> + <col id="0" translatable="yes">4: Scale2x</col> </row> <row> - <col id="0" translatable="yes">1280x1024</col> + <col id="0" translatable="yes">5: Scale3x</col> </row> <row> - <col id="0" translatable="yes">1600x1200</col> + <col id="0" translatable="yes">6: HQ2X</col> + </row> + <row> + <col id="0" translatable="yes">7: HQ3X</col> </row> </data> </object> diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c index b7639c6a..1eb550af 100755 --- a/plugins/dfxvideo/gpucfg-0.1df/main.c +++ b/plugins/dfxvideo/gpucfg-0.1df/main.c @@ -96,7 +96,7 @@ void on_fps_toggled(GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); - gtk_exit(0); + exit(0); } int @@ -126,19 +126,18 @@ main (int argc, char *argv[]) return 0; } - gtk_set_locale (); gtk_init (&argc, &argv); if (strcmp(argv[1], "ABOUT") == 0) { const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL}; widget = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin"); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin"); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/"); - g_signal_connect_data(GTK_OBJECT(widget), "response", + g_signal_connect_data(G_OBJECT(widget), "response", G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER); gtk_widget_show (widget); @@ -301,27 +300,27 @@ main (int argc, char *argv[]) if(pB) free(pB); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "destroy", + g_signal_connect_data(G_OBJECT(widget), "destroy", G_CALLBACK(SaveConfig), NULL, NULL, 0); widget = gtk_builder_get_object(builder, "btn_close"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkFullscreen"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkUseFixes"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkSetFPS"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkAutoFPSLimit"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); on_fullscreen_toggled(widget, NULL); @@ -448,5 +447,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) free(pB); // Close the window and exit control from the plugin - gtk_exit (0); + exit (0); } diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index 2017472a..99c9554c 100755 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bindir = @libdir@/games/psemu/ @@ -16,7 +16,7 @@ libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgpeopsxgl cfgpeopsxgl_SOURCES = gpucfg/main.c -cfgpeopsxgl_LDADD = $(GTK2_LIBS) +cfgpeopsxgl_LDADD = $(GTK3_LIBS) glade_DATA = gpucfg/peopsxgl.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c index 48495b74..1a812d81 100755 --- a/plugins/peopsxgl/gpucfg/main.c +++ b/plugins/peopsxgl/gpucfg/main.c @@ -68,7 +68,7 @@ GtkWidget *window, *btnBeautiful; // Save values to the config file -void on_btnSave_clicked( GtkObject *object, gpointer user_data ) { +void on_btnSave_clicked( GObject *object, gpointer user_data ) { FILE *out; out = fopen( "gpuPeopsMesaGL.cfg", "w+" ); @@ -136,7 +136,7 @@ void on_btnSave_clicked( GtkObject *object, gpointer user_data ) { // Autoconfiguration callbacks -void on_btnFast_clicked( GtkObject *object, gpointer user_data ) { +void on_btnFast_clicked( GObject *object, gpointer user_data ) { gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 ); gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 ); @@ -168,7 +168,7 @@ void on_btnFast_clicked( GtkObject *object, gpointer user_data ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ), 0 ); } -void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) { +void on_btnBeautiful_clicked( GObject *object, gpointer user_data ) { gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 ); gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 ); @@ -202,19 +202,19 @@ void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) { // Callbacks used to toggle the sensitivity of some parts of the GUI -void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) { +void on_chkUseGameFixes_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) ); } -void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) { +void on_chkUseFPSLimit_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) ); } -void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) { +void on_radFPSLimitManual_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) ); } -void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) { +void on_chkScanLines_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) ); } @@ -237,7 +237,6 @@ int main( int argc, char **argv ) { textdomain (GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init( &argc, &argv ); builder = gtk_builder_new(); @@ -255,7 +254,7 @@ int main( int argc, char **argv ) { const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL}; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/"); @@ -728,21 +727,21 @@ int main( int argc, char **argv ) { g_object_unref( G_OBJECT( builder ) ); // Connect callbacks to signals - gtk_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_main_quit ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnCancel ), "clicked", G_CALLBACK( gtk_main_quit ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnSave ), "clicked", G_CALLBACK( on_btnSave_clicked ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ), "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ), "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkScanLines ), "toggled", G_CALLBACK( on_chkScanLines_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnFast ), "clicked", G_CALLBACK( on_btnFast_clicked ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnBeautiful ), "clicked", G_CALLBACK( on_btnBeautiful_clicked ), NULL ); + g_signal_connect(G_OBJECT( window ), "destroy", G_CALLBACK( gtk_main_quit ), NULL ); + g_signal_connect(G_OBJECT( btnCancel ), "clicked", G_CALLBACK( gtk_main_quit ), NULL ); + g_signal_connect(G_OBJECT( btnSave ), "clicked", G_CALLBACK( on_btnSave_clicked ), NULL ); + g_signal_connect(G_OBJECT( chkUseGameFixes ), "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ), NULL ); + g_signal_connect(G_OBJECT( chkUseFPSLimit ), "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ), NULL ); + g_signal_connect(G_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL ); + g_signal_connect(G_OBJECT( chkScanLines ), "toggled", G_CALLBACK( on_chkScanLines_toggled ), NULL ); + g_signal_connect(G_OBJECT( btnFast ), "clicked", G_CALLBACK( on_btnFast_clicked ), NULL ); + g_signal_connect(G_OBJECT( btnBeautiful ), "clicked", G_CALLBACK( on_btnBeautiful_clicked ), NULL ); // Call some callbacks to ensure widget state consistency - on_chkUseGameFixes_toggled( GTK_OBJECT( chkUseGameFixes ), NULL ); - on_chkUseFPSLimit_toggled( GTK_OBJECT( chkUseFPSLimit ), NULL ); - on_radFPSLimitManual_toggled( GTK_OBJECT( radFPSLimitManual ), NULL ); - on_chkScanLines_toggled( GTK_OBJECT( chkScanLines ), NULL ); + on_chkUseGameFixes_toggled( G_OBJECT( chkUseGameFixes ), NULL ); + on_chkUseFPSLimit_toggled( G_OBJECT( chkUseFPSLimit ), NULL ); + on_radFPSLimitManual_toggled( G_OBJECT( radFPSLimitManual ), NULL ); + on_chkScanLines_toggled( G_OBJECT( chkScanLines ), NULL ); gtk_widget_show( window ); diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui index 5d90a1fa..6019ba46 100755 --- a/plugins/peopsxgl/gpucfg/peopsxgl.ui +++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui @@ -1,16 +1,17 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.14"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="MainDialog"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">OpenGL Driver configuration</property> <property name="resizable">False</property> <property name="window_position">center</property> <property name="type_hint">normal</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> + <object class="GtkBox" id="dialog-vbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child> @@ -20,12 +21,13 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> @@ -34,7 +36,7 @@ <object class="GtkSpinButton" id="spinXSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="adjustment">x</property> <property name="numeric">True</property> </object> @@ -49,7 +51,7 @@ <object class="GtkSpinButton" id="spinYSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="adjustment">y</property> <property name="numeric">True</property> </object> @@ -65,6 +67,7 @@ <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Width:</property> </object> @@ -76,6 +79,7 @@ <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Height:</property> </object> @@ -99,6 +103,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -113,6 +118,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -127,6 +133,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -140,6 +147,7 @@ <child type="tab"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Window options</property> </object> <packing> @@ -149,12 +157,13 @@ <child> <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkTable" id="table3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> @@ -162,6 +171,7 @@ <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Quality:</property> </object> @@ -169,6 +179,7 @@ <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Filtering:</property> </object> @@ -180,6 +191,7 @@ <child> <object class="GtkLabel" id="label11"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">HiRes Tex:</property> </object> @@ -191,6 +203,7 @@ <child> <object class="GtkComboBox" id="cbxTexQuality"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore6</property> <child> <object class="GtkCellRendererText" id="cellrenderertext6"/> @@ -207,6 +220,7 @@ <child> <object class="GtkComboBox" id="cbxTexFiltering"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore5</property> <child> <object class="GtkCellRendererText" id="cellrenderertext5"/> @@ -225,6 +239,7 @@ <child> <object class="GtkComboBox" id="cbxHiResTex"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore4</property> <child> <object class="GtkCellRendererText" id="cellrenderertext4"/> @@ -250,10 +265,12 @@ <child> <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="label12"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">VRam size in MBytes (0..1024, 0=auto):</property> </object> @@ -267,7 +284,7 @@ <object class="GtkSpinButton" id="spinVRam"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="adjustment">v</property> </object> <packing> @@ -292,6 +309,7 @@ <child type="tab"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Textures</property> </object> <packing> @@ -302,8 +320,8 @@ <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkCheckButton" id="chkShowFPS"> @@ -311,6 +329,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -325,21 +344,24 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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="GtkAlignment" id="alignment3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">20</property> <child> <object class="GtkVBox" id="vboxFPSLimit"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">5</property> <child> <object class="GtkRadioButton" id="radFPSLimitAuto"> @@ -347,18 +369,21 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">radFPSLimitManual</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">5</property> <child> <object class="GtkRadioButton" id="radFPSLimitManual"> @@ -366,6 +391,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -380,7 +406,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="adjustment">f</property> </object> <packing> @@ -392,6 +418,7 @@ <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">FPS</property> </object> <packing> @@ -403,6 +430,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -411,6 +439,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -420,6 +449,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -436,6 +466,7 @@ <child type="tab"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Framerate</property> </object> <packing> @@ -446,12 +477,13 @@ <child> <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkTable" id="table4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> @@ -459,6 +491,7 @@ <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Offscreen drawing:</property> </object> @@ -466,6 +499,7 @@ <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Framebuffer textures:</property> </object> @@ -477,6 +511,7 @@ <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Framebuffer access:</property> </object> @@ -488,6 +523,7 @@ <child> <object class="GtkComboBox" id="cbxOffscreen"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore3</property> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> @@ -504,6 +540,7 @@ <child> <object class="GtkComboBox" id="cbxFBTex"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore2</property> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> @@ -522,6 +559,7 @@ <child> <object class="GtkComboBox" id="cbxFBAccess"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore1</property> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> @@ -550,10 +588,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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> @@ -563,10 +603,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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> @@ -576,10 +618,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -591,6 +635,7 @@ <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Compatibility</property> </object> <packing> @@ -601,12 +646,13 @@ <child> <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">5</property> <child> <object class="GtkCheckButton" id="chkScanLines"> @@ -614,10 +660,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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> @@ -625,17 +673,19 @@ <object class="GtkSpinButton" id="spinScanLinesBlend"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="adjustment">s</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">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -645,10 +695,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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> @@ -658,10 +710,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</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> @@ -671,10 +725,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -684,10 +740,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> @@ -697,10 +755,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> @@ -710,10 +770,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -723,10 +785,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">7</property> </packing> </child> @@ -738,6 +802,7 @@ <child type="tab"> <object class="GtkLabel" id="label5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Misc</property> </object> <packing> @@ -748,8 +813,8 @@ <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> - <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkCheckButton" id="chkUseGameFixes"> @@ -757,20 +822,24 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">20</property> <child> <object class="GtkTable" id="tblGameFixes"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">9</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> @@ -781,6 +850,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -793,6 +863,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -807,6 +878,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -821,6 +893,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -835,6 +908,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -849,6 +923,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -863,6 +938,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -877,6 +953,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -891,6 +968,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -905,6 +983,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -919,6 +998,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -935,6 +1015,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -951,6 +1032,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -967,6 +1049,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -983,6 +1066,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -999,6 +1083,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1016,6 +1101,7 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1032,6 +1118,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1046,6 +1133,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1057,6 +1146,7 @@ <child type="tab"> <object class="GtkLabel" id="label6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Special game fixes</property> </object> <packing> @@ -1066,12 +1156,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> + <object class="GtkButtonBox" id="dialog-action_area3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="btnFast"> @@ -1134,6 +1227,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> @@ -1147,66 +1241,13 @@ <action-widget response="0">btnCancel</action-widget> </action-widgets> </object> - <object class="GtkAdjustment" id="x"> - <property name="upper">9999</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="y"> - <property name="upper">9999</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> <object class="GtkAdjustment" id="f"> - <property name="value">60</property> <property name="lower">20</property> <property name="upper">200</property> + <property name="value">60</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Emulated VRam - Ok most times</col> - </row> - <row> - <col id="0" translatable="yes">Gfx card buffer reads</col> - </row> - <row> - <col id="0" translatable="yes">Gfx card buffer moves</col> - </row> - <row> - <col id="0" translatable="yes">Gfx card buffer reads and moves</col> - </row> - <row> - <col id="0" translatable="yes">Full Software (FVP)</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Emulated VRam - Needs FVP</col> - </row> - <row> - <col id="0" translatable="yes">Black - Fast, no effects</col> - </row> - <row> - <col id="0" translatable="yes">Gfx card buffer - Can be slow</col> - </row> - <row> - <col id="0" translatable="yes">Gfx card and soft - Slow</col> - </row> - </data> - </object> <object class="GtkListStore" id="liststore3"> <columns> <!-- column-name item --> @@ -1299,14 +1340,67 @@ </row> </data> </object> + <object class="GtkAdjustment" id="s"> + <property name="lower">-1</property> + <property name="upper">255</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Emulated VRam - Ok most times</col> + </row> + <row> + <col id="0" translatable="yes">Gfx card buffer reads</col> + </row> + <row> + <col id="0" translatable="yes">Gfx card buffer moves</col> + </row> + <row> + <col id="0" translatable="yes">Gfx card buffer reads and moves</col> + </row> + <row> + <col id="0" translatable="yes">Full Software (FVP)</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Emulated VRam - Needs FVP</col> + </row> + <row> + <col id="0" translatable="yes">Black - Fast, no effects</col> + </row> + <row> + <col id="0" translatable="yes">Gfx card buffer - Can be slow</col> + </row> + <row> + <col id="0" translatable="yes">Gfx card and soft - Slow</col> + </row> + </data> + </object> <object class="GtkAdjustment" id="v"> <property name="upper">1024</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkAdjustment" id="s"> - <property name="lower">-1</property> - <property name="upper">255</property> + <object class="GtkAdjustment" id="x"> + <property name="upper">9999</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="y"> + <property name="upper">9999</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> diff --git a/po/ru_RU.po b/po/ru_RU.po index 6ebd7eaa..279c3816 100755 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -89,7 +89,7 @@ msgstr "Выберите каталог для поиска" #: ../data/pcsxr.ui.h:18 msgid "Search in:" -msgstr "Каталог с плагинами:" +msgstr "Искать в:" #: ../data/pcsxr.ui.h:19 msgid "Graphics:" |