(Rob Lahaye): sync the appearance of papersize stuff in a number of dialogs.

Has no structural effect as we don't use the strings per-se.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4099 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1c062df87d4e5d868dfaca5ca805a0f22775ecf3..dc142a76436c703a9037cd6cf5ff1d88ebb8fa10 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -13,6 +13,21 @@
        choice using the same approach as used for the language names in the
        Character, Document, Preferences dialogs.
 
+2002-04-30  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormCharacter.C:
+       * FormDocument.C:
+       * FormPreferences.C (findPos): remove this template to xforms_helpers.h.
+
+       * xforms_helpers.h (findPos): new template.
+
+       * FormGraphics.h: store a vector<string> origins_ of the LaTeX names
+       for the rotation origins.
+
+       * FormGraphics.C: internationalise the rotation origin strings in the
+       choice using the same approach as used for the language names in the
+       Character, Document, Preferences dialogs.
+
 2002-04-30  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormCharacter.C:
@@ -26,6 +41,15 @@
        * FormBibtex.C:
        * FormCitation.C: fix two typos
  
+2002-04-30  Rob Lahaye <lahaye@users.sourceforge.net>
+       * FormDocument.C: "USletter" -> "US letter" etc.
+                         "Other" -> "Custom".
+       * FormParagraph.C: "Other" -> "Custom"
+       * FormPreferences.C: "USletter" -> "US letter" etc.
+       * forms/form_document.fd: 'Papersize" -> "Paper size"
+                                 style consistency
+       * forms/form_preferences.fd: style consistency
+
 2002-04-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormCharacter.h:

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 4a8159c5ba732283e04f856973bf8ad99f6c10a5..821c5290d8bcfbb695ffa0880d163e33ba1cdea3 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -107,8 +107,8 @@ void FormDocument::build()
        // the document paper form
        paper_.reset(build_doc_paper());
        fl_addto_choice(paper_->choice_papersize,
-                       _(" Default | Custom | USletter | USlegal "
-                         "| USexecutive | A3 | A4 | A5 | B3 | B4 | B5 "));
+                       _(" Default | Custom | US letter | US legal "
+                         "| US executive | A3 | A4 | A5 | B3 | B4 | B5 "));
        fl_addto_choice(paper_->choice_paperpackage,
                        _(" None "
                          "| Small Margins "
@@ -198,7 +198,7 @@ void FormDocument::build()
        }
 
        fl_addto_choice(class_->choice_doc_spacing,
-                       _(" Single | OneHalf | Double | Other "));
+                       _(" Single | OneHalf | Double | Custom "));
        fl_addto_choice(class_->choice_doc_fontsize, "default|10|11|12");
        for (n=0; tex_fonts[n][0]; ++n) {
                fl_addto_choice(class_->choice_doc_fonts,tex_fonts[n]);

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index fb569d2b08185b3ef1b6fe1db665e03a7fc0491c..610035ba2873910aea8c0b0f09bd3cc85cc376f8 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -126,7 +126,7 @@ void FormParagraph::build()
                          "| Medskip | Bigskip | VFill | Length "));
 
        fl_addto_choice(dialog_->choice_linespacing,
-                       _(" Default | Single | OneHalf | Double | Other "));
+                       _(" Default | Single | OneHalf | Double | Custom "));
 
        fl_set_input_return(dialog_->input_space_above, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_space_below, FL_RETURN_CHANGED);

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index b468715e39e55ae29993dabf3e241cc19de3542f..34dee4f661b24d7e8ddef6e37cd185ca008f8358 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -1981,7 +1981,7 @@ void FormPreferences::OutputsMisc::build()
        fl_set_input_return(dialog_->input_paperoption,  FL_RETURN_CHANGED);
 
        fl_addto_choice(dialog_->choice_default_papersize,
-                       _(" default | US letter | legal | executive | A3 | A4 | A5 | B5 "));
+                       _(" default | US letter | US legal | US executive | A3 | A4 | A5 | B5 "));
 
        // set up the feedback mechanism
        setPrehandler(dialog_->counter_line_len);

diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C
index e9558e9266825c19376db5d0c8f973fc7e40aaab..ba4322ab128d52b960ace3197fdd11ec17b4385c 100644 (file)
--- a/src/frontends/xforms/form_document.C
+++ b/src/frontends/xforms/form_document.C
@@ -91,9 +91,9 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
   fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 225, 120, _("Papersize"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 225, 120, _("Paper size"));
   {
-    char const * const dummy = N_("Papersize:|#P");
+    char const * const dummy = N_("Paper size:|#P");
     fdui->choice_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 25, 115, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
@@ -252,14 +252,8 @@ FD_form_doc_class * FormDocument::build_doc_class()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 245, 400, 85, _("Separation"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 110, 120, 75, _("Page cols"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 20, 120, 75, _("Sides"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Fonts:|#F");
     fdui->choice_doc_fonts = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 90, 160, 30, idex(_(dummy)));
@@ -285,7 +279,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, CHECKCHOICECLASS);
   {
-    char const * const dummy = N_("Pagestyle:|#P");
+    char const * const dummy = N_("Page style:|#P");
     fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 55, 160, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index e4306a90b43d28b4cf339af1e9c88cdffc3b9625..1e7c6c24169dea9f3d77d1dc43b35b3b5eb79c52 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -1141,6 +1141,7 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 10, 435, 165, "");
   {
     char const * const dummy = N_("Ascii line length|#A");
     fdui->counter_line_len = obj = fl_add_counter(FL_NORMAL_COUNTER, 330, 25, 100, 30, idex(_(dummy)));
@@ -1170,7 +1171,6 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 190, 435, 135, _("Outside code interaction"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("ascii roff|#r");
     fdui->input_ascii_roff = obj = fl_add_input(FL_NORMAL_INPUT, 145, 205, 285, 30, idex(_(dummy)));
@@ -1192,7 +1192,6 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 10, 435, 165, "");
   {
     char const * const dummy = N_("Autoreset Class Options on change|#u");
     fdui->check_autoreset_classopt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 30, 30, idex(_(dummy)));

diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd
index ba2619adf737f81e734d2bb0ae2bd38631ff6a6f..0f206dfe8bbe8b87d784343ffd859b6f3169d8ca 100644 (file)
--- a/src/frontends/xforms/forms/form_document.fd
+++ b/src/frontends/xforms/forms/form_document.fd
@@ -209,7 +209,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Papersize
+label: Paper size
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -227,7 +227,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Papersize:|#P
+label: Paper size:|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -339,7 +339,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 
@@ -734,8 +734,8 @@ box: 20 245 400 85
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: Separation
 shortcut: 
@@ -752,8 +752,8 @@ box: 300 110 120 75
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: Page cols
 shortcut: 
@@ -770,8 +770,8 @@ box: 300 20 120 75
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: Sides
 shortcut: 
@@ -845,7 +845,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Pagestyle:|#P
+label: Page style:|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -939,7 +939,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 
@@ -1011,7 +1011,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 
@@ -1083,7 +1083,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 
@@ -1608,7 +1608,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 
@@ -1735,7 +1735,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name:
+name: 
 callback: 
 argument: 
 

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index ade092419b1ad53530363093527b126e0ca10736..f5a00ee0aa546b6800be95511fae2a927acd16cb 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -3172,6 +3172,24 @@ name:
 callback: 
 argument: 
 
+--------------------
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 10 10 435 165
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_COUNTER
 type: NORMAL_COUNTER
@@ -3237,7 +3255,7 @@ box: 10 190 435 135
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
+style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Outside code interaction
@@ -3302,24 +3320,6 @@ name: input_paperoption
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 10 435 165
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON