2007-09-16 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

* src/ReportBase/_ReportDialog.py:
        * src/glade/paper_settings.glade:
        Enable paper margin entries on report dialog. Still not saved.



svn: r8983

ChangeLog

@@ -1,3 +1,8 @@
+2007-09-16  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
+	* src/ReportBase/_ReportDialog.py:
+	* src/glade/paper_settings.glade:
+	Enable paper margin entries on report dialog. Still not saved.
+
 2007-09-16  Don Allingham  <don@gramps-project.org>
 	* src/DataViews/_EventView.py: connect column editor
 	* src/ViewManager.py: pylint

src/ReportBase/_ReportDialog.py

@@ -167,14 +167,15 @@ class ReportDialog(BareReportDialog):
         return None
 
     def make_document(self):
-        """Create a document of the type requested by the user."""
+        """Create a document of the type requested by the user.
-
+        """
-        self.doc = self.format(self.selected_style,
+        pstyle = PaperStyle(self.paper, self.orien, *self.paper_margins)
-                               PaperStyle(self.paper,self.orien),
+        self.doc = self.format(self.selected_style, pstyle, self.template_name)
-                               self.template_name )
+        
         self.options.set_document(self.doc)
-        if self.print_report.get_active ():
+
-            self.doc.print_requested ()
+        if self.print_report.get_active():
+            self.doc.print_requested()
 
     def doc_type_changed(self, obj):
         """This routine is called when the user selects a new file
@@ -559,6 +560,22 @@ class ReportDialog(BareReportDialog):
         
         self.orien = self.orientation_menu.get_value()
         self.options.handler.set_orientation(self.orien)
+        
+        # get the margin values and do some basic verification
+        self.paper_margins = []
+        self.paper_margins.append(unicode(self.lmargin.get_text()))
+        self.paper_margins.append(unicode(self.rmargin.get_text()))
+        self.paper_margins.append(unicode(self.tmargin.get_text()))
+        self.paper_margins.append(unicode(self.bmargin.get_text()))
+        for i, margin in enumerate(self.paper_margins):
+            try:
+                self.paper_margins[i] = float(margin)
+                self.paper_margins[i] = self.paper_margins[i] * multiplier
+            except:
+                self.paper_margins[i] = 2.54
+                
+            if self.paper_margins[i] < 0:
+                self.paper_margins[i] = 0
 
     def parse_html_frame(self):
         """Parse the html frame of the dialog.  Save the user selected

src/glade/paper_settings.glade

@@ -563,7 +563,6 @@
 		  <child>
 		    <widget class="GtkEntry" id="lmargin">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
@@ -585,7 +584,6 @@
 		  <child>
 		    <widget class="GtkEntry" id="rmargin">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
@@ -607,7 +605,6 @@
 		  <child>
 		    <widget class="GtkEntry" id="tmargin">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
@@ -629,7 +626,6 @@
 		  <child>
 		    <widget class="GtkEntry" id="bmargin">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>