From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 1 May 2011 05:00:33 +0000 (-0700)
Subject: gui: Add ellipsis to menu items that require further input.
X-Git-Tag: v0.7.8~4
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=770a9763c4059adc0fde5f7b169814181ac14158;p=pspp-builds.git

gui: Add ellipsis to menu items that require further input.

The GNOME Human Interface Guidelines say:

    Label the menu item with a trailing ellipsis ("...") only if
    the command requires further input from the user before it
    can be performed. Do not add an ellipsis to items that only
    present a confirmation dialog (such as Delete), or that do
    not require further input (such as Properties, Preferences or
    About).

Most PSPPIRE menu items fit this description, so they should have
trailing ellipses, which this commit adds.

Some GTK+ programs use the Unicode HORIZONTAL ELLIPSIS (U+2026)
character instead of three periods in menu items.  In a quick check
on my own machine, however, three periods were over twice as common.
In an informal survey on pspp-dev, the best argument presented in
favor of one or the other was that three periods may be more familiar
for translators and thus cause less confusion in translation.
---

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 498f3fce..e64334a6 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -45,12 +45,13 @@
           <object class="GtkAction" id="file_open">
             <property name="stock-id">gtk-open</property>
             <property name="name">file_open</property>
+            <property name="label" translatable="yes">_Open...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_import-text">
             <property name="name">file_import-text</property>
-            <property name="label" translatable="yes">_Import Delimited Text Data</property>
+            <property name="label" translatable="yes">_Import Delimited Text Data...</property>
 	    <property name="stock-id">gtk-convert</property>
           </object>
         </child>
@@ -70,6 +71,7 @@
           <object class="GtkAction" id="file_save_as">
             <property name="stock-id">gtk-save-as</property>
             <property name="name">file_save_as</property>
+            <property name="label" translatable="yes">Save _As...</property>
           </object>
         </child>
         <child>
@@ -88,7 +90,7 @@
         <child>
           <object class="GtkAction" id="file_information_external-file">
             <property name="name">file_information_external-file</property>
-            <property name="label" translatable="yes">External File</property>
+            <property name="label" translatable="yes">External File...</property>
           </object>
         </child>
         <child>
@@ -133,7 +135,7 @@
         </child>
         <child>
           <object class="GtkAction" id="edit_goto-case">
-            <property name="label" translatable="yes">Go To Case</property>
+            <property name="label" translatable="yes">Go To Case...</property>
             <property name="name">edit_goto-case</property>
             <property name="tooltip" translatable="yes">Jump to a case in the data sheet</property>
 	    <property name="stock-id">gtk-jump-to</property>
@@ -178,6 +180,7 @@
           <object class="GtkAction" id="edit_find">
             <property name="stock-id">gtk-find</property>
             <property name="name">edit_find</property>
+            <property name="label" translatable="yes">_Find...</property>
           </object>
         </child>
         <child>
@@ -197,6 +200,7 @@
           <object class="GtkAction" id="view_fonts">
             <property name="name">view_fonts</property>
             <property name="stock-id">gtk-select-font</property>
+            <property name="label" translatable="yes">_Font...</property>
           </object>
         </child>
         <child>
@@ -234,7 +238,7 @@
         </child>
         <child>
           <object class="GtkAction" id="data_sort-cases">
-            <property name="label" translatable="yes">_Sort Cases</property>
+            <property name="label" translatable="yes">_Sort Cases...</property>
             <property name="name">data_sort-cases</property>
 	    <property name="stock-id">gtk-sort-ascending</property>
 	    <property name="tooltip" translatable="yes">Sort cases in the active dataset</property>
@@ -244,7 +248,7 @@
           <object class="GtkAction" id="data_transpose">
 	    <property name="stock-id">pspp-transpose</property>
             <property name="name">data_transpose</property>
-            <property name="label" translatable="yes">_Transpose</property>
+            <property name="label" translatable="yes">_Transpose...</property>
 	    <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
           </object>
         </child>
@@ -252,13 +256,13 @@
           <object class="GtkAction" id="data_aggregate">
 	    <property name="stock-id">pspp-aggregate</property>
             <property name="name">data_aggregate</property>
-            <property name="label" translatable="yes">_Aggregate</property>
+            <property name="label" translatable="yes">_Aggregate...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_split-file">
             <property name="name">data_split-file</property>
-            <property name="label" translatable="yes">S_plit File</property>
+            <property name="label" translatable="yes">S_plit File...</property>
 	    <property name="tooltip" translatable="yes">Split the active dataset</property>
 	    <property name="stock-id">pspp-split-file</property>
           </object>
@@ -266,13 +270,13 @@
         <child>
           <object class="GtkAction" id="data_select-cases">
             <property name="name">data_select-cases</property>
-            <property name="label" translatable="yes">Select _Cases</property>
+            <property name="label" translatable="yes">Select _Cases...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_weight-cases">
             <property name="name">data_weight-cases</property>
-            <property name="label" translatable="yes">_Weight Cases</property>
+            <property name="label" translatable="yes">_Weight Cases...</property>
 	    <property name="tooltip" translatable="yes">Weight cases by variable</property>
 	    <property name="stock-id">pspp-weight-cases</property>
           </object>
@@ -286,25 +290,25 @@
         <child>
           <object class="GtkAction" id="transform_compute">
             <property name="name">transform_compute</property>
-            <property name="label" translatable="yes">_Compute</property>
+            <property name="label" translatable="yes">_Compute...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_rank">
             <property name="name">transform_rank</property>
-            <property name="label" translatable="yes">Ran_k Cases</property>
+            <property name="label" translatable="yes">Ran_k Cases...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-same">
             <property name="name">transform_recode-same</property>
-            <property name="label" translatable="yes">Recode into _Same Variables</property>
+            <property name="label" translatable="yes">Recode into _Same Variables...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-different">
             <property name="name">transform_recode-different</property>
-            <property name="label" translatable="yes">Recode into _Different Variables</property>
+            <property name="label" translatable="yes">Recode into _Different Variables...</property>
           </object>
         </child>
         <child>
@@ -329,25 +333,25 @@
         <child>
           <object class="GtkAction" id="analyze_frequencies">
             <property name="name">analyze_frequencies</property>
-            <property name="label" translatable="yes">_Frequencies</property>
+            <property name="label" translatable="yes">_Frequencies...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="analyze_descriptives">
             <property name="name">analyze_descriptives</property>
-            <property name="label" translatable="yes">_Descriptives</property>
+            <property name="label" translatable="yes">_Descriptives...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="analyze_explore">
             <property name="name">analyze_explore</property>
-            <property name="label" translatable="yes">_Explore</property>
+            <property name="label" translatable="yes">_Explore...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="crosstabs">
             <property name="name">crosstabs</property>
-            <property name="label" translatable="yes">_Crosstabs</property>
+            <property name="label" translatable="yes">_Crosstabs...</property>
           </object>
         </child>
         <child>
@@ -359,25 +363,25 @@
         <child>
           <object class="GtkAction" id="one-sample-t-test">
             <property name="name">one-sample-t-test</property>
-            <property name="label" translatable="yes">_One Sample T Test</property>
+            <property name="label" translatable="yes">_One Sample T Test...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="indep-t-test">
             <property name="name">indep-t-test</property>
-            <property name="label" translatable="yes">_Independent Samples T Test</property>
+            <property name="label" translatable="yes">_Independent Samples T Test...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="paired-t-test">
             <property name="name">paired-t-test</property>
-            <property name="label" translatable="yes">_Paired Samples T Test</property>
+            <property name="label" translatable="yes">_Paired Samples T Test...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="oneway-anova">
             <property name="name">oneway-anova</property>
-            <property name="label" translatable="yes">One Way _ANOVA</property>
+            <property name="label" translatable="yes">One Way _ANOVA...</property>
           </object>
         </child>
         <child>
@@ -389,19 +393,19 @@
         <child>
           <object class="GtkAction" id="factor-analysis">
             <property name="name">factor-analysis</property>
-            <property name="label" translatable="yes">Factor _Analysis</property>
+            <property name="label" translatable="yes">Factor _Analysis...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="reliability">
             <property name="name">reliability</property>
-            <property name="label" translatable="yes">Re_liability</property>
+            <property name="label" translatable="yes">Re_liability...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="linear-regression">
             <property name="name">linear-regression</property>
-            <property name="label" translatable="yes">Linear _Regression</property>
+            <property name="label" translatable="yes">Linear _Regression...</property>
           </object>
         </child>
         <child>
@@ -413,19 +417,19 @@
         <child>
           <object class="GtkAction" id="chi-square">
             <property name="name">chi-square</property>
-            <property name="label" translatable="yes">_Chi-Square</property>
+            <property name="label" translatable="yes">_Chi-Square...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="binomial">
             <property name="name">binomial</property>
-            <property name="label" translatable="yes">_Binomial</property>
+            <property name="label" translatable="yes">_Binomial...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="k-related-samples">
             <property name="name">"k-related-samples"></property>
-            <property name="label" translatable="yes">K Related _Samples</property>
+            <property name="label" translatable="yes">K Related _Samples...</property>
           </object>
         </child>
         <child>
@@ -443,7 +447,7 @@
         <child>
           <object class="GtkAction" id="utilities_variables">
             <property name="name">utilities_variables</property>
-            <property name="label" translatable="yes">_Variables</property>
+            <property name="label" translatable="yes">_Variables...</property>
 	    <property name="tooltip" translatable="yes">Jump to variable</property>
 	    <property name="stock-id">pspp-goto-variable</property>
           </object>
@@ -451,7 +455,7 @@
         <child>
           <object class="GtkAction" id="utilities_comments">
             <property name="name">utilities_comments</property>
-            <property name="label" translatable="yes">Data File _Comments</property>
+            <property name="label" translatable="yes">Data File _Comments...</property>
           </object>
         </child>
         <child>
diff --git a/src/ui/gui/output-viewer.ui b/src/ui/gui/output-viewer.ui
index 579a5bed..d3baad71 100644
--- a/src/ui/gui/output-viewer.ui
+++ b/src/ui/gui/output-viewer.ui
@@ -13,13 +13,14 @@
           <object class="GtkAction" id="file_print">
             <property name="name">file_print</property>
             <property name="stock-id">gtk-print</property>
+            <property name="label" translatable="yes">_Print...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_export">
             <property name="name">file_export</property>
             <property name="stock-id">gtk-convert</property>
-            <property name="label" translatable="yes">_Export</property>
+            <property name="label" translatable="yes">_Export...</property>
           </object>
         </child>
         <child>
diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index e65eef66..91fdec49 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -32,6 +32,7 @@
           <object class="GtkAction" id="file_open">
             <property name="stock-id">gtk-open</property>
             <property name="name">file_open</property>
+            <property name="label" translatable="yes">_Open...</property>
           </object>
         </child>
         <child>
@@ -44,6 +45,7 @@
           <object class="GtkAction" id="file_save_as">
             <property name="stock-id">gtk-save-as</property>
             <property name="name">file_save_as</property>
+            <property name="label" translatable="yes">Save _As...</property>
           </object>
         </child>
         <child>