summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-16 18:04:29 +0000
committerSND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-16 18:04:29 +0000
commitb3f5eecbcd660065b8d1c92029e5e6fa0a74ecdb (patch)
tree57c3edede233016ba0464665e1af127794fa1e29 /data
parente09dfb4e415fa52df9aaeed4b8c1d3ea06d880ce (diff)
downloadpcsxr-b3f5eecbcd660065b8d1c92029e5e6fa0a74ecdb.tar.gz
Big endian CDDA support. Uses Config.Cdda (previously bool). Now enum. Gtk gui was modified for new enum, but compatibility was kept so that other guis don't go nuts.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90008 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'data')
-rw-r--r--data/pcsxr.ui97
1 files changed, 74 insertions, 23 deletions
diff --git a/data/pcsxr.ui b/data/pcsxr.ui
index 2a7ed4c3..573f07fb 100644
--- a/data/pcsxr.ui
+++ b/data/pcsxr.ui
@@ -1711,23 +1711,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="GtkCheckButton_CDDA">
- <property name="label" translatable="yes">Disable CD Audio</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>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="GtkCheckButton_SlowBoot">
<property name="label" translatable="yes">Slow Boot</property>
<property name="visible">True</property>
@@ -1881,6 +1864,57 @@
</packing>
</child>
<child>
+ <object class="GtkFrame" id="frame_pref">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="label_cdda">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CD Audio</property>
+ <property name="use_markup">True</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="GtkCombo_CDDA">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore5</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkFrame" id="frame16">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1939,11 +1973,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame_rew">
+ <object class="GtkFrame" id="frame_rew">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -1952,7 +1986,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="spacing">4</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label70">
<property name="visible">True</property>
@@ -2018,7 +2052,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
- </packing>
+ </packing>
</child>
<child>
<object class="GtkEntry" id="GtkEntry_RewindMem">
@@ -2061,7 +2095,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -2453,7 +2487,7 @@
<object class="GtkMenuItem" id="GtkMenuItem_LoadSlotRecent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Most _Recent</property>
+ <property name="label" translatable="yes">Slot _Recent</property>
<property name="use_underline">True</property>
<accelerator key="R" signal="activate" modifiers="GDK_MOD1_MASK"/>
</object>
@@ -4355,4 +4389,21 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="liststore5">
+ <columns>
+ <!-- ITEMS HERE MUST MATCH psxcommon.h ENUM !-->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Enabled (Little endian)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Disabled</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Enabled (Big endian)</col>
+ </row>
+ </data>
+ </object>
</interface>