[f-spot: 2/2] Printing: print exif date

[Stephane Delcroix <sdelcroix src gnome org>]

commit 06ce9bcbc6b7f3f5bb0c129fbc2f787e064fcee7
Merge: eeabfe2... 0904805...
Author: Vincent Pomey <vpomey free fr>
Date:   Thu Jun 18 15:02:31 2009 +0200

    Printing: print exif date
    
    patch 136672 of bgo544278

 src/PrintOperation.cs            |   18 ++++++-
 src/Widgets/CustomPrintWidget.cs |  107 +++++++++++++++++++++++--------------
 2 files changed, 83 insertions(+), 42 deletions(-)
---
diff --cc src/Widgets/CustomPrintWidget.cs
index 99fc2b0,f1b1b9f..773f903
--- a/src/Widgets/CustomPrintWidget.cs
+++ b/src/Widgets/CustomPrintWidget.cs
@@@ -27,10 -27,11 +27,11 @@@ namespace FSpot.Widget
  		Gtk.Image preview_image;
  		CheckButton fullpage;
  
 -		RadioButton ppp1, ppp2, ppp4, ppp9;
 +		RadioButton ppp1, ppp2, ppp4, ppp9, ppp20, ppp30;
  		RadioButton zoom, fill, scaled;
  
- 		CheckButton repeat, white_border, crop_marks;
+ 		CheckButton repeat, white_border, crop_marks, print_tags,
+ 			print_filename, print_date, print_time, print_comments;
  		Entry custom_text;
  	
  		PrintOperation print_operation;
@@@ -115,35 -132,28 +134,30 @@@
  								Math.Round (print_operation.DefaultPageSetup.GetPaperWidth (Unit.Mm), 1), 
  								Math.Round (print_operation.DefaultPageSetup.GetPaperHeight (Unit.Mm), 1));
  			};
- 			vb.PackStart (page_setup_btn, false, false, 0);
- 
- 			page_size.Add (vb);
- 
- 
- 			VBox right_vb = new VBox ();
- 			right_vb.PackStart (page_size, true, true, 0);
- 
- 			Frame tbl_frame = new Frame (Catalog.GetString ("Photos per page"));
- 			Table tbl = new Table (2, 7, false);
- 
- 			tbl.Attach (ppp1 = new RadioButton ("1"), 0, 1, 1, 2);
- 			tbl.Attach (ppp2 = new RadioButton (ppp1, "2"), 0, 1, 2, 3);
- 			tbl.Attach (ppp4 = new RadioButton (ppp1, "2 x 2"), 0, 1, 3, 4);
- 			tbl.Attach (ppp9 = new RadioButton (ppp1, "3 x 3"), 0, 1, 4, 5);
- 			tbl.Attach (ppp20 = new RadioButton (ppp1, "4 x 5"), 0, 1, 5, 6);
- 			tbl.Attach (ppp30 = new RadioButton (ppp1, "5 x 6"), 0, 1, 6, 7);
- 
- 			tbl.Attach (repeat = new CheckButton (Catalog.GetString ("Repeat")), 1, 2, 0, 1);
- 			tbl.Attach (crop_marks = new CheckButton (Catalog.GetString ("Print cut marks")), 1, 2, 1, 2);
+ 			page_box.PackStart (page_setup_btn, false, false, 0);
+ 			page_frame.Add (page_box);
+ 			Attach (page_frame, 1, 2, 3, 4);
+ 
+ 			Frame ppp_frame = new Frame (Catalog.GetString ("Photos per page"));
+ 			Table ppp_tbl = new Table(2, 7, false);
+ 
+ 			ppp_tbl.Attach (ppp1 = new RadioButton ("1"), 0, 1, 1, 2);
+ 			ppp_tbl.Attach (ppp2 = new RadioButton (ppp1, "2"), 0, 1, 2, 3);
+ 			ppp_tbl.Attach (ppp4 = new RadioButton (ppp1, "2 x 2"), 0, 1, 3, 4);
+ 			ppp_tbl.Attach (ppp9 = new RadioButton (ppp1, "3 x 3"), 0, 1, 4, 5);
++			ppp_tbl.Attach (ppp20 = new RadioButton (ppp1, "4 x 5"), 0, 1, 5, 6);
++			ppp_tbl.Attach (ppp30 = new RadioButton (ppp1, "5 x 6"), 0, 1, 6, 7);
+ 
+ 			ppp_tbl.Attach (repeat = new CheckButton (Catalog.GetString ("Repeat")), 1, 2, 2, 3);
+ 			ppp_tbl.Attach (crop_marks = new CheckButton (Catalog.GetString ("Print cut marks")), 1, 2, 3, 4);
  //			crop_marks.Toggled += TriggerChanged;
  
- 			tbl_frame.Child = tbl;
- 			right_vb.PackStart (tbl_frame, true, true, 0);
- 			upper.PackStart (right_vb, true, true, 0);
+ 			ppp_frame.Child = ppp_tbl;
+ 			Attach (ppp_frame, 0, 1, 1, 2);
  
- 			this.PackStart (upper, true, true, 0);
- 			this.PackStart (fullpage = new CheckButton (Catalog.GetString ("Full Page (no margin)")), false, false, 0);
- 			
+ 			Frame layout_frame = new Frame (Catalog.GetString ("Photos layout"));
+ 			VBox layout_vbox = new VBox();
+ 			layout_vbox.PackStart (fullpage = new CheckButton (Catalog.GetString ("Full Page (no margin)")), false, false, 0);
  			HBox hb = new HBox ();
  			// Note for translators: "Zoom" is a Fit Mode
  			hb.PackStart (zoom = new RadioButton (Catalog.GetString ("Zoom")), false, false, 0);