X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Ffactor.ui;h=fc7813dc3fee9bf82c83acfe0070c256fa7d585d;hb=14125d13946c1b2c3b7efe6cb88e35aa4623210b;hp=4d2c612d7b69cbcc062ccf4a633162d4d92b93a3;hpb=7cf4046da1b88ea12d5934c625c28fade7d5e924;p=pspp

diff --git a/src/ui/gui/factor.ui b/src/ui/gui/factor.ui
index 4d2c612d7b..fc7813dc3f 100644
--- a/src/ui/gui/factor.ui
+++ b/src/ui/gui/factor.ui
@@ -17,11 +17,19 @@
       </row>
     </data>
   </object>
+  <object class="GtkLabel" id="bug-workaround1">
+    <property name="sensitive">False</property>
+    <property name="label" translatable="yes">Principal Components Analysis</property>
+  </object>
+  <object class="GtkLabel" id="bug-workaround2">
+    <property name="sensitive">False</property>
+    <property name="label" translatable="yes">Principal Axis Factoring</property>
+  </object>
   <object class="PsppireDialog" id="factor-dialog">
     <property name="title" translatable="yes">Factor Analysis</property>
     <property name="modal">True</property>
-    <property name="orientation">Tabular</property>
-    <child internal-child="hbox">
+    <property name="help-page">FACTOR</property>
+    <child>
       <object class="GtkTable" id="dialog-hbox1">
         <property name="visible">True</property>
         <property name="n_rows">2</property>
@@ -135,6 +143,8 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -170,8 +180,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Variables:</property>
+                    <property name="label" translatable="yes">_Variables:</property>
                     <property name="use_markup">True</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">psppire-var-view1</property>
                   </object>
                 </child>
               </object>
@@ -191,7 +203,7 @@
   <object class="PsppireDialog" id="extractions-dialog">
     <property name="title" translatable="yes">Factor Analysis: Extraction</property>
     <property name="modal">True</property>
-    <child internal-child="hbox">
+    <child>
       <object class="GtkHBox" id="dialog-hbox4">
         <property name="visible">True</property>
         <property name="spacing">2</property>
@@ -213,7 +225,9 @@
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Method: </property>
+                        <property name="label" translatable="yes">_Method: </property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">combobox1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -263,10 +277,11 @@
                                 <property name="layout_style">spread</property>
                                 <child>
                                   <object class="GtkRadioButton" id="correlations-radiobutton">
-                                    <property name="label" translatable="yes">Correlation matrix</property>
+                                    <property name="label" translatable="yes">Co_rrelation matrix</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="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -277,10 +292,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="covariance-radiobutton">
-                                    <property name="label" translatable="yes">Covariance matrix</property>
+                                    <property name="label" translatable="yes">Co_variance matrix</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="draw_indicator">True</property>
                                     <property name="group">correlations-radiobutton</property>
                                   </object>
@@ -297,7 +313,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Analyse</property>
+                            <property name="label" translatable="yes">Analyze</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -321,10 +337,11 @@
                                 <property name="layout_style">spread</property>
                                 <child>
                                   <object class="GtkCheckButton" id="unrotated-button">
-                                    <property name="label" translatable="yes">Unrotatated factor solution</property>
+                                    <property name="label" translatable="yes">_Unrotated factor solution</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="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -335,10 +352,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="scree-button">
-                                    <property name="label" translatable="yes">Scree plot</property>
+                                    <property name="label" translatable="yes">_Scree plot</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="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -427,7 +445,9 @@
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Number of factors:</property>
+                                    <property name="label" translatable="yes">_Number of factors:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">nfactors-radiobutton</property>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -472,7 +492,9 @@
                     <child>
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Maximum iterations for convergence:</property>
+                        <property name="label" translatable="yes">Ma_ximum iterations for convergence:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton-extract-iterations</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
@@ -537,7 +559,7 @@
   <object class="PsppireDialog" id="rotations-dialog">
     <property name="title" translatable="yes">Factor Analysis: Rotation</property>
     <property name="modal">True</property>
-    <child internal-child="hbox">
+    <child>
       <object class="GtkHBox" id="dialog-hbox8">
         <property name="visible">True</property>
         <property name="spacing">2</property>
@@ -662,7 +684,9 @@
                     <child>
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Maximum iterations for convergence:</property>
+                        <property name="label" translatable="yes">Ma_ximum iterations for convergence:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton-rot-iterations</property>
                       </object>
                       <packing>
                         <property name="position">0</property>