gedit r6113 - branches/printing/gedit



Author: pborelli
Date: Thu Jan 24 09:42:06 2008
New Revision: 6113
URL: http://svn.gnome.org/viewvc/gedit?rev=6113&view=rev

Log:
save page setup


Modified:
   branches/printing/gedit/gedit-app.c
   branches/printing/gedit/gedit-print-preferences.glade

Modified: branches/printing/gedit/gedit-app.c
==============================================================================
--- branches/printing/gedit/gedit-app.c	(original)
+++ branches/printing/gedit/gedit-app.c	Thu Jan 24 09:42:06 2008
@@ -203,8 +203,13 @@
 							      &error);
 	if (error)
 	{
-		/* TODO: ignore file not found error */
-		g_warning (error->message);
+		/* Ignore file not found error */
+		if (error->domain != G_FILE_ERROR ||
+		    error->code != G_FILE_ERROR_NOENT)
+		{
+			g_warning (error->message);
+		}
+
 		g_error_free (error);
 	}
 
@@ -270,8 +275,13 @@
 								      &error);
 	if (error)
 	{
-		/* TODO: ignore file not found error */
-		g_warning (error->message);
+		/* Ignore file not found error */
+		if (error->domain != G_FILE_ERROR ||
+		    error->code != G_FILE_ERROR_NOENT)
+		{
+			g_warning (error->message);
+		}
+
 		g_error_free (error);
 	}
 
@@ -413,6 +423,7 @@
 
 		save_accels ();
 
+		save_page_setup (app);
 		save_print_settings (app);
 
 		g_object_unref (app);

Modified: branches/printing/gedit/gedit-print-preferences.glade
==============================================================================
--- branches/printing/gedit/gedit-print-preferences.glade	(original)
+++ branches/printing/gedit/gedit-print-preferences.glade	Thu Jan 24 09:42:06 2008
@@ -113,7 +113,7 @@
                           <widget class="GtkCheckButton" id="line_numbers_checkbutton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Print _line numbers</property>
+                            <property name="label" translatable="yes">Print line nu_mbers</property>
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
@@ -309,7 +309,7 @@
                           <widget class="GtkCheckButton" id="page_header_checkbutton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Print page headers</property>
+                            <property name="label" translatable="yes">Print page _headers</property>
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
@@ -388,33 +388,27 @@
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">12</property>
                                 <child>
-                                  <widget class="GtkFontButton" id="headers_fontbutton">
+                                  <widget class="GtkLabel" id="body_font_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="response_id">0</property>
-                                    <property name="use_font">True</property>
-                                    <property name="show_style">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Body:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">body_fontbutton</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFontButton" id="numbers_fontbutton">
+                                  <widget class="GtkLabel" id="numbers_font_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="response_id">0</property>
-                                    <property name="use_font">True</property>
-                                    <property name="show_style">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Line numbers:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">numbers_fontbutton</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
@@ -422,20 +416,6 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFontButton" id="body_fontbutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="response_id">0</property>
-                                    <property name="use_font">True</property>
-                                    <property name="show_style">False</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <widget class="GtkLabel" id="headers_font_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
@@ -451,14 +431,30 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="numbers_font_label">
+                                  <widget class="GtkFontButton" id="body_fontbutton">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Line numbers:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">numbers_fontbutton</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="use_font">True</property>
+                                    <property name="show_style">False</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkFontButton" id="numbers_fontbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="use_font">True</property>
+                                    <property name="show_style">False</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
@@ -466,14 +462,18 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="body_font_label">
+                                  <widget class="GtkFontButton" id="headers_fontbutton">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Body:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">body_fontbutton</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="use_font">True</property>
+                                    <property name="show_style">False</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"></property>
                                   </packing>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]