[Gnucash-changes] Frederic Leroy's patch (#314512) to add a close box to each notebook

David Hampton hampton at cvs.gnucash.org
Fri Sep 2 19:53:23 EDT 2005


Log Message:
-----------
Frederic Leroy's patch (#314512) to add a close box to each notebook
tab.  Enhanced to make the tab visibility a user preference.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/gnome/schemas:
        apps_gnucash_general.schemas
    gnucash/src/gnome-utils:
        gnc-main-window.c
        preferences.glade

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.276
retrieving revision 1.1487.2.277
diff -LChangeLog -LChangeLog -u -r1.1487.2.276 -r1.1487.2.277
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,11 @@
+2005-09-02  David Hampton  <hampton at employees.org>
+
+	* src/gnome/schemas/apps_gnucash_general.schemas:
+	* src/gnome-utils/gnc-main-window.c: 
+	* src/gnome-utils/preferences.glade: Frederic Leroy's patch
+	(#314512) to add a close box to each notebook tab.  Enhanced to
+	make the tab visibility a user preference.
+
 2005-08-29  Derek Atkins  <derek at ihtfp.com>
 
 	* src/engine/gnc-date.c: fix bug #170444 by making sure we
Index: apps_gnucash_general.schemas
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/schemas/Attic/apps_gnucash_general.schemas,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/gnome/schemas/apps_gnucash_general.schemas -Lsrc/gnome/schemas/apps_gnucash_general.schemas -u -r1.1.2.7 -r1.1.2.8
--- src/gnome/schemas/apps_gnucash_general.schemas
+++ src/gnome/schemas/apps_gnucash_general.schemas
@@ -158,6 +158,23 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/gnucash/general/tab_close_buttons</key>
+      <applyto>/apps/gnucash/general/tab_close_buttons</applyto>
+      <owner>gnucash</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Show close buttons on notebook tabs.</short>
+        <long>
+	  Setting this value to TRUE tells Gnucash to show a "close"
+	  button on any notebook tab that may be closed.  If FALSE,
+	  pages must be closed via the "close" menu item or the
+	  "close" button on toolbar.
+	</long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/gnucash/general/register/use_theme_colors</key>
       <applyto>/apps/gnucash/general/register/use_theme_colors</applyto>
       <owner>gnucash</owner>
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -Lsrc/gnome-utils/gnc-main-window.c -Lsrc/gnome-utils/gnc-main-window.c -u -r1.1.2.17 -r1.1.2.18
--- src/gnome-utils/gnc-main-window.c
+++ src/gnome-utils/gnc-main-window.c
@@ -69,10 +69,12 @@
 };
 
 
-#define PLUGIN_PAGE_IMMUTABLE "page-immutable"
+#define PLUGIN_PAGE_IMMUTABLE    "page-immutable"
+#define PLUGIN_PAGE_CLOSE_BUTTON "close-button"
 
 #define DESKTOP_GNOME_INTERFACE "/desktop/gnome/interface"
 #define KEY_TOOLBAR_STYLE	"toolbar_style"
+#define KEY_SHOW_CLOSE_BUTTON	"tab_close_buttons"
 
 /** Static Globals *******************************************************/
 static short module = MOD_GUI;
@@ -761,6 +763,87 @@
   LEAVE(" ");
 }
 
+
+/** Show/hide the close box on the tab of a notebook page.  This
+ *  function first checks to see if the specified page has a close
+ *  box, and if so, sets its isibility to the requested state.
+ *
+ *  @internal
+ *
+ *  @param page The GncPluginPage whose notebook tab should be updated.
+ *
+ *  @param new_value A pointer to the boolean that indicates whether
+ *  or not the close button should be visible.
+ */
+static void
+gnc_main_window_update_tabs_one_page (GncPluginPage *page,
+				      gboolean *new_value)
+{
+  GtkWidget * close_button;
+
+  ENTER("page %p, visible %d", page, *new_value);
+  close_button = g_object_get_data(G_OBJECT (page), PLUGIN_PAGE_CLOSE_BUTTON);
+  if (!close_button) {
+    LEAVE("no close button");
+    return;
+  }
+
+  if (*new_value)
+    gtk_widget_show (close_button);
+  else
+    gtk_widget_hide (close_button);
+  LEAVE(" ");
+}
+
+
+/** Show/hide the close box on all pages in a given window.  This
+ *  function calls the gnc_main_window_update_tabs_one_page() for each
+ *  page in the window.
+ *
+ *  @internal
+ *
+ *  @param window The GncMainWindow whose notebook tabs should be
+ *  updated.
+ *
+ *  @param new_value A pointer to the boolean that indicates whether
+ *  or not the close button should be visible.
+ */
+static void
+gnc_main_window_update_tabs_one_window (GncMainWindow *window, gboolean *new_value)
+{
+  ENTER("window %p, visible %d", window, *new_value);
+  g_list_foreach(window->priv->installed_pages,
+		 (GFunc)gnc_main_window_update_tabs_one_page,
+		 new_value);
+  LEAVE(" ");
+}
+
+
+/** Show/hide the close box on all pages in all windows.  This
+ *  function calls the gnc_main_window_update_tabs_one_window() for
+ *  each open window in the application.
+ *
+ *  @internal
+ *
+ *  @param entry A pointer to the GConfEntry which describes the new
+ *  state of whether close buttons should be visible on notebook tabs.
+ *
+ *  @param user_data Unused.
+ */
+static void
+gnc_main_window_update_tabs (GConfEntry *entry, gpointer user_data)
+{
+  gboolean new_value;
+
+  ENTER(" ");
+  new_value = gconf_value_get_bool(entry->value);
+  g_list_foreach(active_windows,
+		 (GFunc)gnc_main_window_update_tabs_one_window,
+		 &new_value);
+  LEAVE(" ");
+}
+
+
 /************************************************************
  *                   Widget Implementation                  *
  ************************************************************/
@@ -869,6 +952,10 @@
 			G_TYPE_OBJECT);
 
 	qof_session_add_close_hook(gnc_main_window_shutdown, NULL);
+
+	gnc_gconf_general_register_cb (KEY_SHOW_CLOSE_BUTTON,
+				       gnc_main_window_update_tabs,
+				       NULL);
 }
 
 
@@ -1122,6 +1209,7 @@
 	GtkWidget *label;
 	const gchar *icon;
 	GtkWidget *image;
+	gboolean immutable = FALSE;
 
 	if (window)
 	  g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
@@ -1143,6 +1231,7 @@
 	/* Is this the first page in the first window? */
 	if ((window == active_windows->data) &&
 	    (window->priv->installed_pages == NULL)) {
+	  immutable = TRUE;
 	  g_object_set_data (G_OBJECT (page), PLUGIN_PAGE_IMMUTABLE,
 			     GINT_TO_POINTER(1));
 	}
@@ -1156,16 +1245,37 @@
 	label = gtk_label_new (gnc_plugin_page_get_tab_name(page));
 	gtk_widget_show (label);
 
+	label_box = gtk_hbox_new (FALSE, 6);
+	gtk_widget_show (label_box);
+
 	if (icon != NULL) {
-		/* FIXME */
-		label_box = gtk_hbox_new (FALSE, 6);
-		gtk_widget_show (label_box);
 		image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU);
 		gtk_widget_show (image);
 		gtk_box_pack_start (GTK_BOX (label_box), image, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (label_box), label, TRUE, TRUE, 0);
-	} else {
-		label_box = label;
+	} 
+
+	gtk_box_pack_start (GTK_BOX (label_box), label, TRUE, TRUE, 0);
+  
+	/* Add close button - Not for immutable pages */
+	if (!immutable) {
+	  GtkWidget *close_image, *close_button;
+	  
+	  close_button = gtk_button_new();
+	  gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE);
+	  close_image=gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+	  gtk_widget_show(close_image);
+	  gtk_container_add(GTK_CONTAINER(close_button), close_image);
+	  if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_SHOW_CLOSE_BUTTON, NULL))
+	    gtk_widget_show (close_button);
+	  else
+	    gtk_widget_hide (close_button);
+     
+	  g_signal_connect_swapped (G_OBJECT (close_button), "clicked",
+                      G_CALLBACK(gnc_main_window_close_page), page);
+
+	  gtk_box_pack_start (GTK_BOX (label_box), close_button, FALSE, FALSE, 0);
+
+	  g_object_set_data (G_OBJECT (page), PLUGIN_PAGE_CLOSE_BUTTON, close_button);
 	}
 	
 	gnc_main_window_connect(window, page, label_box);
Index: preferences.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/preferences.glade,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome-utils/preferences.glade -Lsrc/gnome-utils/preferences.glade -u -r1.1.2.6 -r1.1.2.7
--- src/gnome-utils/preferences.glade
+++ src/gnome-utils/preferences.glade
@@ -138,7 +138,6 @@
 </widget>
 
 <widget class="GtkDialog" id="New Gnucash Preferences">
-  <property name="visible">False</property>
   <property name="title" translatable="yes">New Gnucash Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -589,7 +588,7 @@
 	    <widget class="GtkTable" id="table2">
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
-	      <property name="n_rows">13</property>
+	      <property name="n_rows">14</property>
 	      <property name="n_columns">4</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">0</property>
@@ -620,54 +619,111 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label49">
+		<widget class="GtkCheckButton" id="gconf/dialogs/new_hierarchy/show_on_new_file">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Numbers&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</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
+		  <property name="tooltip" translatable="yes">Present the new account list dialog when you choose &quot;New File&quot; from the &quot;File&quot; menu</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Perform account list _setup on new 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="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
+		  <property name="right_attach">4</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label51">
+		<widget class="GtkCheckButton" id="gconf/dialogs/tip_of_the_day/show_at_startup">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></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="tooltip" translatable="yes">Display hints for using GnuCash at startup</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Display &quot;_Tip of the Day&quot; dialog</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="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
+		  <property name="right_attach">4</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
+		<widget class="GtkHBox" id="hbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkSpinButton" id="gconf/general/retain_days">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Delete old log/backup files after this many days (0 = never).</property>
+		      <property name="can_focus">True</property>
+		      <property name="climb_rate">1</property>
+		      <property name="digits">0</property>
+		      <property name="numeric">False</property>
+		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		      <property name="snap_to_ticks">False</property>
+		      <property name="wrap">False</property>
+		      <property name="adjustment">30 0 99999 1 10 10</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label58">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">days</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>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">3</property>
+		  <property name="top_attach">12</property>
+		  <property name="bottom_attach">13</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options">fill</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkLabel" id="label18">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">_Retain log files:</property>
@@ -685,8 +741,8 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">11</property>
-		  <property name="bottom_attach">12</property>
+		  <property name="top_attach">12</property>
+		  <property name="bottom_attach">13</property>
 		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
@@ -694,35 +750,35 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label48">
+		<widget class="GtkCheckButton" id="gconf/general/compress_files">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Files&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</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
+		  <property name="tooltip" translatable="yes">Compress the data file.</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Com_press files</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="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">9</property>
-		  <property name="bottom_attach">10</property>
+		  <property name="right_attach">4</property>
+		  <property name="top_attach">11</property>
+		  <property name="bottom_attach">12</property>
+		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label60">
+		<widget class="GtkLabel" id="label48">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;Files&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">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>
@@ -734,18 +790,18 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">8</property>
-		  <property name="bottom_attach">9</property>
+		  <property name="top_attach">10</property>
+		  <property name="bottom_attach">11</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label17">
+		<widget class="GtkLabel" id="label60">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Decimal places:</property>
-		  <property name="use_underline">True</property>
+		  <property name="label" translatable="yes"></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>
@@ -754,77 +810,18 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">gconf/general/auto_decimal_places</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">8</property>
-		  <property name="x_padding">12</property>
+		  <property name="top_attach">9</property>
+		  <property name="bottom_attach">10</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="gconf/general/retain_days">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Delete old log/backup files after this many days (0 = never).</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">30 0 99999 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label58">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">days</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>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">11</property>
-		  <property name="bottom_attach">12</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkSpinButton" id="gconf/general/auto_decimal_places">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">How many automatic decimal places will be filled in.</property>
@@ -840,31 +837,33 @@
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">8</property>
+		  <property name="top_attach">8</property>
+		  <property name="bottom_attach">9</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkCheckButton" id="gconf/dialogs/new_hierarchy/show_on_new_file">
+		<widget class="GtkLabel" id="label17">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Present the new account list dialog when you choose &quot;New File&quot; from the &quot;File&quot; menu</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Perform account list _setup on new file</property>
+		  <property name="label" translatable="yes">_Decimal places:</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="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="mnemonic_widget">gconf/general/auto_decimal_places</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">8</property>
+		  <property name="bottom_attach">9</property>
 		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
@@ -872,11 +871,11 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCheckButton" id="gconf/dialogs/tip_of_the_day/show_at_startup">
+		<widget class="GtkCheckButton" id="gconf/general/auto_decimal_point">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Display hints for using GnuCash at startup</property>
+		  <property name="tooltip" translatable="yes">Automatically insert a decimal point into values that are entered without one.</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Display &quot;_Tip of the Day&quot; dialog</property>
+		  <property name="label" translatable="yes">_Automatic Decimal Point</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -887,8 +886,8 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">4</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
+		  <property name="top_attach">7</property>
+		  <property name="bottom_attach">8</property>
 		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
@@ -911,44 +910,67 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">4</property>
+		  <property name="top_attach">6</property>
+		  <property name="bottom_attach">7</property>
+		  <property name="x_padding">12</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label49">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Numbers&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</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
 		  <property name="top_attach">5</property>
 		  <property name="bottom_attach">6</property>
-		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkCheckButton" id="gconf/general/auto_decimal_point">
+		<widget class="GtkLabel" id="label51">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Automatically insert a decimal point into values that are entered without one.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Automatic Decimal Point</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="label" translatable="yes"></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>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">6</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="x_padding">12</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">4</property>
+		  <property name="bottom_attach">5</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkCheckButton" id="gconf/general/compress_files">
+		<widget class="GtkCheckButton" id="gconf/general/tab_close_buttons">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Compress the data file.</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Com_press files</property>
+		  <property name="label" translatable="yes">Show close button on _notebook tabs</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -959,8 +981,8 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">4</property>
-		  <property name="top_attach">10</property>
-		  <property name="bottom_attach">11</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
 		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>


More information about the gnucash-changes mailing list