SF.net SVN: geany:[4774] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Thu Mar 18 13:26:49 UTC 2010


Revision: 4774
          http://geany.svn.sourceforge.net/geany/?rev=4774&view=rev
Author:   ntrel
Date:     2010-03-18 13:26:48 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
Add frame for 'Printing' prefs dialog page.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/interface.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-18 13:17:05 UTC (rev 4773)
+++ trunk/ChangeLog	2010-03-18 13:26:48 UTC (rev 4774)
@@ -9,6 +9,8 @@
    Fix 'Date' appearing twice on the date line.
    Don't generate API docs for prefs.h, toolbar.h (unused).
    Move some '@file' doc-comments to the .c file.
+ * src/interface.c, geany.glade:
+   Add frame for 'Printing' prefs dialog page.
 
 
 2010-03-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2010-03-18 13:17:05 UTC (rev 4773)
+++ trunk/geany.glade	2010-03-18 13:26:48 UTC (rev 4774)
@@ -9179,187 +9179,137 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox27">
+	    <widget class="GtkFrame" id="frame41">
 	      <property name="border_width">5</property>
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">10</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame32">
+		<widget class="GtkAlignment" id="alignment49">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment35">
+		    <widget class="GtkVBox" id="vbox27">
+		      <property name="border_width">5</property>
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">10</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox9">
+			<widget class="GtkFrame" id="frame32">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">5</property>
+			  <property name="label_xalign">0</property>
+			  <property name="label_yalign">0.5</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label202">
+			    <widget class="GtkAlignment" id="alignment35">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Command:</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.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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <property name="xscale">1</property>
+			      <property name="yscale">1</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">12</property>
+			      <property name="right_padding">0</property>
 
-			  <child>
-			    <widget class="GtkEntry" id="entry_print_external_cmd">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Path to the command for printing files (use %f for the filename)</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="button_print_external_cmd">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-
 			      <child>
-				<widget class="GtkImage" id="image763">
+				<widget class="GtkHBox" id="hbox9">
 				  <property name="visible">True</property>
-				  <property name="stock">gtk-open</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">5</property>
 
-		  <child>
-		    <widget class="GtkRadioButton" id="radio_print_external">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Use an external command for printing</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
+				  <child>
+				    <widget class="GtkLabel" id="label202">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Command:</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.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="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 
-	      <child>
-		<widget class="GtkFrame" id="frame31">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+				  <child>
+				    <widget class="GtkEntry" id="entry_print_external_cmd">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Path to the command for printing files (use %f for the filename)</property>
+				      <property name="can_focus">True</property>
+				      <property name="editable">True</property>
+				      <property name="visibility">True</property>
+				      <property name="max_length">0</property>
+				      <property name="text" translatable="yes"></property>
+				      <property name="has_frame">True</property>
+				      <property name="invisible_char">*</property>
+				      <property name="activates_default">False</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
-		  <child>
-		    <widget class="GtkAlignment" id="alignment34">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
+				  <child>
+				    <widget class="GtkButton" id="button_print_external_cmd">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
 
-		      <child>
-			<widget class="GtkVBox" id="vbox29">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="check_print_linenumbers">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Add line numbers to the printed page</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Print line numbers</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+				      <child>
+					<widget class="GtkImage" id="image763">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-open</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_print_pagenumbers">
+			    <widget class="GtkRadioButton" id="radio_print_external">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Add page numbers at the bottom of each page. It takes 2 lines of the page.</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Print page numbers</property>
+			      <property name="label" translatable="yes">Use an external command for printing</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -9368,172 +9318,269 @@
 			      <property name="draw_indicator">True</property>
 			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="type">label_item</property>
 			    </packing>
 			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_print_pageheader">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Print page header</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+		      <child>
+			<widget class="GtkFrame" id="frame31">
+			  <property name="visible">True</property>
+			  <property name="label_xalign">0</property>
+			  <property name="label_yalign">0.5</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 			  <child>
-			    <widget class="GtkFrame" id="frame33">
+			    <widget class="GtkAlignment" id="alignment34">
 			      <property name="visible">True</property>
-			      <property name="label_xalign">0</property>
-			      <property name="label_yalign">0</property>
-			      <property name="shadow_type">GTK_SHADOW_NONE</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">1</property>
+			      <property name="yscale">1</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">12</property>
+			      <property name="right_padding">0</property>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment36">
+				<widget class="GtkVBox" id="vbox29">
 				  <property name="visible">True</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">0</property>
 
 				  <child>
-				    <widget class="GtkVBox" id="vbox30">
+				    <widget class="GtkCheckButton" id="check_print_linenumbers">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">1</property>
+				      <property name="tooltip" translatable="yes">Add line numbers to the printed page</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Print line numbers</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 
-				      <child>
-					<widget class="GtkCheckButton" id="check_print_basename">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Print only the basename (without the path) of the printed file</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Use the basename of the printed file</property>
-					  <property name="use_underline">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-					  <property name="active">False</property>
-					  <property name="inconsistent">False</property>
-					  <property name="draw_indicator">True</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				  <child>
+				    <widget class="GtkCheckButton" id="check_print_pagenumbers">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Add page numbers at the bottom of each page. It takes 2 lines of the page.</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Print page numbers</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 
+				  <child>
+				    <widget class="GtkCheckButton" id="check_print_pageheader">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page.</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Print page header</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkFrame" id="frame33">
+				      <property name="visible">True</property>
+				      <property name="label_xalign">0</property>
+				      <property name="label_yalign">0</property>
+				      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
 				      <child>
-					<widget class="GtkHBox" id="hbox10">
+					<widget class="GtkAlignment" id="alignment36">
 					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">5</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xscale">1</property>
+					  <property name="yscale">1</property>
+					  <property name="top_padding">0</property>
+					  <property name="bottom_padding">0</property>
+					  <property name="left_padding">12</property>
+					  <property name="right_padding">0</property>
 
 					  <child>
-					    <widget class="GtkLabel" id="label203">
+					    <widget class="GtkVBox" id="vbox30">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Date 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.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="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">1</property>
 
-					  <child>
-					    <widget class="GtkEntry" id="entry_print_dateformat">
-					      <property name="visible">True</property>
-					      <property name="tooltip" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">True</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text" translatable="yes"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">●</property>
-					      <property name="activates_default">False</property>
+					      <child>
+						<widget class="GtkCheckButton" id="check_print_basename">
+						  <property name="visible">True</property>
+						  <property name="tooltip" translatable="yes">Print only the basename (without the path) of the printed file</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Use the basename of the printed file</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkHBox" id="hbox10">
+						  <property name="visible">True</property>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">5</property>
+
+						  <child>
+						    <widget class="GtkLabel" id="label203">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Date 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.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="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkEntry" id="entry_print_dateformat">
+						      <property name="visible">True</property>
+						      <property name="tooltip" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property>
+						      <property name="can_focus">True</property>
+						      <property name="editable">True</property>
+						      <property name="visibility">True</property>
+						      <property name="max_length">0</property>
+						      <property name="text" translatable="yes"></property>
+						      <property name="has_frame">True</property>
+						      <property name="invisible_char">●</property>
+						      <property name="activates_default">False</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">True</property>
+						      <property name="fill">True</property>
+						    </packing>
+						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
+						</packing>
+					      </child>
 					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
 					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
 				      </child>
 				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
 				  </child>
 				</widget>
 			      </child>
 			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="radio_print_gtk">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Use native GTK printing</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">radio_print_external</property>
+			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
+			      <property name="type">label_item</property>
 			    </packing>
 			  </child>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
 		      </child>
 		    </widget>
 		  </child>
+		</widget>
+	      </child>
 
-		  <child>
-		    <widget class="GtkRadioButton" id="radio_print_gtk">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Use native GTK printing</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <property name="group">radio_print_external</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
+	      <child>
+		<widget class="GtkLabel" id="label243">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"><b>Printing</b></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="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="type">label_item</property>
 		</packing>
 	      </child>
 	    </widget>

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2010-03-18 13:17:05 UTC (rev 4773)
+++ trunk/src/interface.c	2010-03-18 13:26:48 UTC (rev 4774)
@@ -2695,6 +2695,8 @@
   GtkWidget *button2;
   GtkWidget *label181;
   GtkWidget *label151;
+  GtkWidget *frame41;
+  GtkWidget *alignment49;
   GtkWidget *vbox27;
   GtkWidget *frame32;
   GtkWidget *alignment35;
@@ -2719,6 +2721,7 @@
   GtkWidget *label203;
   GtkWidget *entry_print_dateformat;
   GtkWidget *radio_print_gtk;
+  GtkWidget *label243;
   GtkWidget *label201;
   GtkWidget *dialog_action_area3;
   GtkWidget *button3;
@@ -4624,9 +4627,20 @@
   gtk_widget_show (label151);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 7), label151);
 
+  frame41 = gtk_frame_new (NULL);
+  gtk_widget_show (frame41);
+  gtk_container_add (GTK_CONTAINER (notebook2), frame41);
+  gtk_container_set_border_width (GTK_CONTAINER (frame41), 5);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame41), GTK_SHADOW_NONE);
+
+  alignment49 = gtk_alignment_new (0.5, 0.5, 1, 1);
+  gtk_widget_show (alignment49);
+  gtk_container_add (GTK_CONTAINER (frame41), alignment49);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment49), 0, 0, 12, 0);
+
   vbox27 = gtk_vbox_new (FALSE, 10);
   gtk_widget_show (vbox27);
-  gtk_container_add (GTK_CONTAINER (notebook2), vbox27);
+  gtk_container_add (GTK_CONTAINER (alignment49), vbox27);
   gtk_container_set_border_width (GTK_CONTAINER (vbox27), 5);
 
   frame32 = gtk_frame_new (NULL);
@@ -4735,6 +4749,11 @@
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_print_gtk), radio_print_external_group);
   radio_print_external_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_print_gtk));
 
+  label243 = gtk_label_new (_("<b>Printing</b>"));
+  gtk_widget_show (label243);
+  gtk_frame_set_label_widget (GTK_FRAME (frame41), label243);
+  gtk_label_set_use_markup (GTK_LABEL (label243), TRUE);
+
   label201 = gtk_label_new (_("Printing"));
   gtk_widget_show (label201);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 8), label201);
@@ -5111,6 +5130,8 @@
   GLADE_HOOKUP_OBJECT (prefs_dialog, button2, "button2");
   GLADE_HOOKUP_OBJECT (prefs_dialog, label181, "label181");
   GLADE_HOOKUP_OBJECT (prefs_dialog, label151, "label151");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, frame41, "frame41");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, alignment49, "alignment49");
   GLADE_HOOKUP_OBJECT (prefs_dialog, vbox27, "vbox27");
   GLADE_HOOKUP_OBJECT (prefs_dialog, frame32, "frame32");
   GLADE_HOOKUP_OBJECT (prefs_dialog, alignment35, "alignment35");
@@ -5134,6 +5155,7 @@
   GLADE_HOOKUP_OBJECT (prefs_dialog, label203, "label203");
   GLADE_HOOKUP_OBJECT (prefs_dialog, entry_print_dateformat, "entry_print_dateformat");
   GLADE_HOOKUP_OBJECT (prefs_dialog, radio_print_gtk, "radio_print_gtk");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, label243, "label243");
   GLADE_HOOKUP_OBJECT (prefs_dialog, label201, "label201");
   GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, dialog_action_area3, "dialog_action_area3");
   GLADE_HOOKUP_OBJECT (prefs_dialog, button3, "button3");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list