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

1 files changed, 101 insertions, 7 deletions

diff --git a/data/pcsx.glade2 b/data/pcsx.glade2
index 0dcae465..de66aa7a 100644
--- a/data/pcsx.glade2
+++ b/data/pcsx.glade2
@@ -14,6 +14,7 @@
     <child>
       <widget class="GtkVBox" id="vbox18">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
@@ -381,6 +382,86 @@
                       </widget>
                     </child>
                     <child>
+                      <widget class="GtkImageMenuItem" id="graphics1">
+                        <property name="label" translatable="yes">_Graphics</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image21">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-select-color</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="sound1">
+                        <property name="label" translatable="yes">_Sound</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image22">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-convert</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="cdrom1">
+                        <property name="label" translatable="yes">CD-_ROM</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image23">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cdrom</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="pad1">
+                        <property name="label" translatable="yes">Controller _1</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image24">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-execute</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="pad2">
+                        <property name="label" translatable="yes">Controller _2</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image25">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-execute</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator7">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkImageMenuItem" id="cpu1">
                         <property name="label" translatable="yes">_CPU...</property>
                         <property name="visible">True</property>
@@ -542,10 +623,12 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox28">
             <property name="visible">True</property>
             <property name="border_width">4</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">3</property>
             <child>
               <widget class="GtkFrame" id="frame17">
@@ -1140,9 +1223,11 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox25">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkFrame" id="frame15">
                 <property name="visible">True</property>
@@ -1152,6 +1237,7 @@
                   <widget class="GtkVBox" id="vbox26">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkTable" id="table3">
                         <property name="visible">True</property>
@@ -1440,9 +1526,11 @@ PAL</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox27">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkFrame" id="frame19">
                 <property name="visible">True</property>
@@ -1578,6 +1666,7 @@ PAL</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkHBox" id="hbox54">
             <property name="visible">True</property>
@@ -1590,6 +1679,7 @@ PAL</property>
                   <widget class="GtkVBox" id="vbox31">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow3">
@@ -1985,6 +2075,7 @@ PAL</property>
                   <widget class="GtkVBox" id="vbox32">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow4">
@@ -2238,6 +2329,7 @@ Icon Design:
 Romain Lafourcade</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox6">
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area6"/>
           <packing>
@@ -2309,7 +2401,7 @@ Romain Lafourcade</property>
                 <property name="spacing">10</property>
                 <child>
                   <widget class="GtkButton" id="editbutton1">
-                    <property name="label" translatable="yes">gtk-edit</property>
+                    <property name="label">gtk-edit</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -2323,7 +2415,7 @@ Romain Lafourcade</property>
                 </child>
                 <child>
                   <widget class="GtkButton" id="delbutton1">
-                    <property name="label" translatable="yes">gtk-delete</property>
+                    <property name="label">gtk-delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -2337,7 +2429,7 @@ Romain Lafourcade</property>
                 </child>
                 <child>
                   <widget class="GtkButton" id="addbutton1">
-                    <property name="label" translatable="yes">gtk-add</property>
+                    <property name="label">gtk-add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -2351,7 +2443,7 @@ Romain Lafourcade</property>
                 </child>
                 <child>
                   <widget class="GtkButton" id="loadbutton1">
-                    <property name="label" translatable="yes">gtk-open</property>
+                    <property name="label">gtk-open</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -2366,7 +2458,7 @@ Romain Lafourcade</property>
                 </child>
                 <child>
                   <widget class="GtkButton" id="savebutton1">
-                    <property name="label" translatable="yes">gtk-save-as</property>
+                    <property name="label">gtk-save-as</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -2397,7 +2489,7 @@ Romain Lafourcade</property>
             <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="closbutton1">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2429,6 +2521,7 @@ Romain Lafourcade</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox8">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <widget class="GtkFrame" id="frame4">
@@ -2443,6 +2536,7 @@ Romain Lafourcade</property>
                 <child>
                   <widget class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkTable" id="table1">
@@ -2870,7 +2964,7 @@ Hexadecimal</property>
             <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="closebutton">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>