summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-09 06:57:12 +0000
committerSND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-09 06:57:12 +0000
commit8945a7293bd7e260d7e19cae06249244caa1b7ca (patch)
tree471622f4d5558d1afdf62a292c626f6fdbbd4947 /data
parent17913e070197edf24b28757dd116a6932007cb6c (diff)
downloadpcsxr-8945a7293bd7e260d7e19cae06249244caa1b7ca.tar.gz
gtk gui conf: disable rewind conf when dynarec & display memory usage
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89836 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'data')
-rw-r--r--data/pcsxr.ui43
1 files changed, 34 insertions, 9 deletions
diff --git a/data/pcsxr.ui b/data/pcsxr.ui
index 1c9a5c3f..8dc89073 100644
--- a/data/pcsxr.ui
+++ b/data/pcsxr.ui
@@ -1943,7 +1943,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame20">
+ <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 +1952,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="spacing">10</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label70">
<property name="visible">True</property>
@@ -1971,9 +1971,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
- <property name="max-length">5</property>
- <property name="width-chars">5 </property>
- <property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
+ <property name="max-length">3</property>
+ <property name="width-chars">3</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1999,9 +1998,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
- <property name="max-length">5</property>
- <property name="width-chars">5</property>
- <property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
+ <property name="max-length">3</property>
+ <property name="width-chars">3</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2013,13 +2011,40 @@
<object class="GtkLabel" id="label72">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">rewinds</property>
+ <property name="label" translatable="yes">rewinds = </property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="GtkEntry_RewindMem">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="editable">False</property>
+ <property name="max-length">5</property>
+ <property name="width-chars">5</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label73">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">MB</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
</packing>
</child>
</object>