From b5d073c25c9056cf29e4b2394f532db342f38a9f Mon Sep 17 00:00:00 2001
From: Zsolt Foldvari <zfoldvar@users.sourceforge.net>
Date: Sun, 16 Sep 2007 09:20:23 +0000
Subject: [PATCH] 2007-09-16  Zsolt Foldvari  <zfoldvar@users.sourceforge.net> 
 * src/ReportBase/_ReportDialog.py: Cleanup. 	*
 src/glade/paper_settings.glade: Remove frames.

svn: r8979
---
 ChangeLog                       |   4 ++
 src/ReportBase/_ReportDialog.py |  53 ---------------
 src/glade/paper_settings.glade  | 112 ++++++++++++++++++--------------
 3 files changed, 66 insertions(+), 103 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 879bd801b..0da97e45e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-16  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
+	* src/ReportBase/_ReportDialog.py: Cleanup.
+	* src/glade/paper_settings.glade: Remove frames.
+
 2007-09-15  Douglas S. Blank <dblank@cs.brynmawr.edu>
 	* src/ReportBase/__init__.py:
 	* src/ReportBase/_MenuOptions.py:
diff --git a/src/ReportBase/_ReportDialog.py b/src/ReportBase/_ReportDialog.py
index 25ec51492..cc76fb576 100644
--- a/src/ReportBase/_ReportDialog.py
+++ b/src/ReportBase/_ReportDialog.py
@@ -390,59 +390,6 @@ class ReportDialog(BareReportDialog):
                                 self.options.handler.get_paper_name())
         self.orientation_menu.set(self.options.handler.get_orientation())
 
-        ##self.paper_table = gtk.Table(4,6)
-        ##self.paper_table.set_col_spacings(12)
-        ##self.paper_table.set_row_spacings(6)
-        ##self.paper_table.set_border_width(6)
-            
-        ##self.papersize_menu = PaperComboBox()
-        ##self.papersize_menu.connect('changed',self.size_changed)
-        
-        ##self.orientation_menu = OrientationComboBox()
-        ##l = gtk.Label("%s:" % _("Size"))
-        ##l.set_alignment(0.0,0.5)
-        
-        ##self.paper_table.attach(l,1,2,0,1,gtk.SHRINK|gtk.FILL)
-        ##self.paper_table.attach(self.papersize_menu,2,3,0,1,
-                                ##yoptions=gtk.SHRINK)
-        ##l = gtk.Label("%s:" % _("Height"))
-        ##l.set_alignment(0.0,0.5)
-        ##self.paper_table.attach(l,3,4,0,1,gtk.SHRINK|gtk.FILL)
-
-        ##self.pheight = gtk.Entry()
-        ##self.pheight.set_sensitive(0)
-        ##self.paper_table.attach(self.pheight,4,5,0,1)
-        
-        ##self.lunits1 = gtk.Label(_("cm"))
-        ##self.lunits1.set_alignment(0.0,0.5)
-        ##self.paper_table.attach(self.lunits1,5,6,0,1,gtk.SHRINK|gtk.FILL)
-        
-        ##self.metric = gtk.CheckButton (_("Metric"))
-        ##self.paper_table.attach(self.metric,2,3,1,2,gtk.SHRINK|gtk.FILL)
-        ##self.metric.connect('toggled',self.units_changed)
-
-        ##l = gtk.Label("%s:" % _("Orientation"))
-        ##l.set_alignment(0.0,0.5)
-        ##self.paper_table.attach(l,1,2,2,3,gtk.SHRINK|gtk.FILL)
-        ##self.paper_table.attach(self.orientation_menu,2,3,2,3,
-                                ##yoptions=gtk.SHRINK)
-        ##l = gtk.Label("%s:" % _("Width"))
-        ##l.set_alignment(0.0,0.5)
-        ##self.paper_table.attach(l,3,4,1,2,gtk.SHRINK|gtk.FILL)
-
-        ##self.pwidth = gtk.Entry()
-        ##self.pwidth.set_sensitive(0)
-        ##self.paper_table.attach(self.pwidth,4,5,1,2)
-
-        ##self.lunits2 = gtk.Label(_("cm"))
-        ##self.lunits2.set_alignment(0.0,0.5)
-        ##self.paper_table.attach(self.lunits2,5,6,1,2,gtk.SHRINK|gtk.FILL)
-
-        ##self.papersize_menu.set(paper_sizes,
-                                ##self.options.handler.get_paper_name())
-        ##self.orientation_menu.set(self.options.handler.get_orientation())
-        ##self.metric.set_active(1)
-
     def html_file_enable(self,obj):
         active = obj.get_active()
         text = unicode(obj.get_model()[active][0])
diff --git a/src/glade/paper_settings.glade b/src/glade/paper_settings.glade
index a4a67796f..c9beb9fab 100644
--- a/src/glade/paper_settings.glade
+++ b/src/glade/paper_settings.glade
@@ -31,11 +31,35 @@
       </child>
 
       <child>
-	<widget class="GtkFrame" id="frame1">
+	<widget class="GtkVBox" id="vbox4">
 	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label14">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Paper format</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
 
 	  <child>
 	    <widget class="GtkAlignment" id="alignment1">
@@ -273,28 +297,10 @@
 		</widget>
 	      </child>
 	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label7">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Paper format&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
 	    <packing>
-	      <property name="type">label_item</property>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 	</widget>
@@ -306,11 +312,35 @@
       </child>
 
       <child>
-	<widget class="GtkFrame" id="frame2">
+	<widget class="GtkVBox" id="vbox3">
 	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label13">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Margins</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
 
 	  <child>
 	    <widget class="GtkAlignment" id="alignment2">
@@ -648,28 +678,10 @@
 		</widget>
 	      </child>
 	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label8">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Margins&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
 	    <packing>
-	      <property name="type">label_item</property>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 	</widget>