Convert dialog to metric units and default paper to A4. Fixes #112619

2003-06-15  Christian Persch  <chpe@cvs.gnome.org>

* embed/mozilla/MozillaPrivate.cpp: (MozillaCollatePrintSettings):
* embed/ephy-embed.h:
* embed/print-dialog.c: (print_dialog_init), (print_free_info),
(print_get_info):
* data/epiphany.schemas.in:
* data/glade/print.glade:

Convert dialog to metric units and default paper to A4. Fixes #112619

2 files changed, 42 insertions, 41 deletions

diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 196ebff7a..5af667ed2 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -230,44 +230,44 @@
         <key>/schemas/apps/epiphany/dialogs/print_top_margin</key>
         <applyto>/apps/epiphany/dialogs/print_top_margin</applyto>
         <owner>epiphany</owner>
-        <type>float</type>
-        <default>0.5</default>
+        <type>int</type>
+        <default>10</default>
         <locale name="C">
         <short>Printing top margin</short>
-        <long>Printing top margin (in inches).</long>
+        <long>Printing top margin (in mm).</long>
         </locale>
       </schema>
       <schema>
         <key>/schemas/apps/epiphany/dialogs/print_bottom_margin</key>
         <applyto>/apps/epiphany/dialogs/print_bottom_margin</applyto>
         <owner>epiphany</owner>
-        <type>float</type>
-        <default>0.5</default>
+        <type>int</type>
+        <default>10</default>
         <locale name="C">
         <short>Printing bottom margin</short>
-        <long>Printing bottom margin (in inches).</long>
+        <long>Printing bottom margin (in mm).</long>
         </locale>
       </schema>
       <schema>
         <key>/schemas/apps/epiphany/dialogs/print_left_margin</key>
         <applyto>/apps/epiphany/dialogs/print_left_margin</applyto>
         <owner>epiphany</owner>
-        <type>float</type>
-        <default>0.5</default>
+        <type>int</type>
+        <default>10</default>
         <locale name="C">
         <short>Printing left margin</short>
-        <long>Printing left margin (in inches).</long>
+        <long>Printing left margin (in mm).</long>
         </locale>
       </schema>
       <schema>
         <key>/schemas/apps/epiphany/dialogs/print_right_margin</key>
         <applyto>/apps/epiphany/dialogs/print_right_margin</applyto>
         <owner>epiphany</owner>
-        <type>float</type>
-        <default>0.5</default>
+        <type>int</type>
+        <default>10</default>
         <locale name="C">
         <short>Printing right margin</short>
-        <long>Printing right margin (in inches).</long>
+        <long>Printing right margin (in mm).</long>
         </locale>
       </schema>
       <schema>
@@ -339,11 +339,12 @@
         <key>/schemas/apps/epiphany/dialogs/print_paper</key>
         <applyto>/apps/epiphany/dialogs/print_paper</applyto>
         <owner>epiphany</owner>
-        <type>int</type>
-        <default>0</default>
+        <type>string</type>
+        <default>A4</default>
         <locale name="C">
         <short>Paper type</short>
-        <long>Paper type: letter, legal, executive, A4.</long>
+        <long>Paper type. Supported values are "A4", "Letter", "Legal"
+	and "Executive".</long>
         </locale>
       </schema>
      <schema>
diff --git a/data/glade/print.glade b/data/glade/print.glade
index ff2f24a7f..d1ed75ad7 100644
--- a/data/glade/print.glade
+++ b/data/glade/print.glade
@@ -609,13 +609,13 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkRadioButton" id="letter_radiobutton">
+			    <widget class="GtkRadioButton" id="A4_radiobutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Letter (8.5&quot; x 11&quot;)</property>
+			      <property name="label" translatable="yes">A_4</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
+			      <property name="active">True</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
 			    </widget>
@@ -627,16 +627,16 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkRadioButton" id="legal_radiobutton">
+			    <widget class="GtkRadioButton" id="letter_radiobutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">L_egal (8.5&quot; x 14&quot;)</property>
+			      <property name="label" translatable="yes">_Letter</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <property name="group">letter_radiobutton</property>
+			      <property name="group">A4_radiobutton</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -646,16 +646,16 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkRadioButton" id="executive_radiobutton">
+			    <widget class="GtkRadioButton" id="legal_radiobutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">E_xecutive (7.25&quot; x 10.5&quot;)</property>
+			      <property name="label" translatable="yes">L_egal</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <property name="group">letter_radiobutton</property>
+			      <property name="group">A4_radiobutton</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -665,16 +665,16 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkRadioButton" id="A4_radiobutton">
+			    <widget class="GtkRadioButton" id="executive_radiobutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">A_4 (8.27&quot; x 11.69&quot;)</property>
+			      <property name="label" translatable="yes">E_xecutive</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <property name="group">letter_radiobutton</property>
+			      <property name="group">A4_radiobutton</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1056,7 +1056,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label261">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Margins (Inches)&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Margins (in mm)&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1214,13 +1214,13 @@
 			    <widget class="GtkSpinButton" id="bottom_spinbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="climb_rate">0.1</property>
-			      <property name="digits">1</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
 			      <property name="numeric">True</property>
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">0.6 0 100 0.1 10 10</property>
+			      <property name="adjustment">10 0 100 1 10 10</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1235,13 +1235,13 @@
 			    <widget class="GtkSpinButton" id="left_spinbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="climb_rate">0.1</property>
-			      <property name="digits">1</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
 			      <property name="numeric">True</property>
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">0.5 0 100 0.1 10 10</property>
+			      <property name="adjustment">10 0 100 1 10 10</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1256,13 +1256,13 @@
 			    <widget class="GtkSpinButton" id="top_spinbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="climb_rate">0.1</property>
-			      <property name="digits">1</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
 			      <property name="numeric">True</property>
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">0.3 0 100 0.1 10 10</property>
+			      <property name="adjustment">10 0 100 1 10 10</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1277,13 +1277,13 @@
 			    <widget class="GtkSpinButton" id="right_spinbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="climb_rate">0.1</property>
-			      <property name="digits">1</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
 			      <property name="numeric">True</property>
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">0.5 0 100 0.1 10 10</property>
+			      <property name="adjustment">10 0 100 1 10 10</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>