r15957 - gnucash/branches/2.0 - Remove viewport/hbox from account scrolls in transfer dialog. Fixes #425917.

[Derek Atkins]

Author: warlord
Date: 2007-04-21 15:17:54 -0400 (Sat, 21 Apr 2007)
New Revision: 15957
Trac: http://svn.gnucash.org/trac/changeset/15957

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/dialog-transfer.c
   gnucash/branches/2.0/src/gnome-utils/glade/transfer.glade
Log:
Remove viewport/hbox from account scrolls in transfer dialog.  Fixes #425917.

The scrolled windows for "transfer to" and "transfer from" now take the
treeviews directly and do not pack them into viewports, letting them
actually scroll the scrolled window.

Merge from r15782.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:14578
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:14579
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-04-21 19:17:40 UTC (rev 15956)
+++ gnucash/branches/2.0/ChangeLog	2007-04-21 19:17:54 UTC (rev 15957)
@@ -1,3 +1,12 @@
+2007-04-21  Andreas Köhler  <andi5.py at gmx.net>
+
+	* Remove viewport/hbox from account scrolls in transfer dialog.
+	  Fixes #425917.
+
+	  The scrolled windows for "transfer to" and "transfer from" now
+	  take the treeviews directly and do not pack them into viewports,
+	  letting them actually scroll the scrolled window.
+
 2007-04-21  Joshua Sled  <jsled at asynchronous.org>
 
 	* Bug#343795: Be explicit about number of months so auto-decimal-point

Modified: gnucash/branches/2.0/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/dialog-transfer.c	2007-04-21 19:17:40 UTC (rev 15956)
+++ gnucash/branches/2.0/src/gnome-utils/dialog-transfer.c	2007-04-21 19:17:54 UTC (rev 15957)
@@ -447,7 +447,7 @@
 {
   GtkTreeView *tree_view;
   const char *show_inc_exp_message = _("Show the income and expense accounts");
-  GtkWidget *scroll_win, *box;
+  GtkWidget *scroll_win;
   GtkWidget *button;
   GtkTreeSelection *selection;
   gboolean  use_accounting_labels;
@@ -467,9 +467,6 @@
    * trees when in "accountant" mode. -- Herbert Thoma, 2004-01-18
    */
   if(use_accounting_labels) {
-    box = gnc_glade_lookup_widget (xferData->dialog,
-				   (direction == XFER_DIALOG_TO) ?
-				   "left_tree_box" : "right_tree_box");
     button = gnc_glade_lookup_widget (xferData->dialog,
 				      (direction == XFER_DIALOG_TO) ?
 				      "left_show_button" : "right_show_button");
@@ -478,9 +475,6 @@
 					  "left_trans_window" : "right_trans_window");
   }
   else {
-    box = gnc_glade_lookup_widget (xferData->dialog,
-				   (direction == XFER_DIALOG_TO) ?
-				   "right_tree_box" : "left_tree_box");
     button = gnc_glade_lookup_widget (xferData->dialog,
 				      (direction == XFER_DIALOG_TO) ?
 				      "right_show_button" : "left_show_button");
@@ -490,7 +484,7 @@
   }
 
   tree_view = GTK_TREE_VIEW(gnc_tree_view_account_new(FALSE));
-  gtk_container_add(GTK_CONTAINER(box), GTK_WIDGET(tree_view));
+  gtk_container_add(GTK_CONTAINER(scroll_win), GTK_WIDGET(tree_view));
   gnc_tree_view_account_set_filter (GNC_TREE_VIEW_ACCOUNT (tree_view),
 				    gnc_xfer_dialog_show_inc_exp_visible_cb,
 				    button, /* user data */

Modified: gnucash/branches/2.0/src/gnome-utils/glade/transfer.glade
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/glade/transfer.glade	2007-04-21 19:17:40 UTC (rev 15956)
+++ gnucash/branches/2.0/src/gnome-utils/glade/transfer.glade	2007-04-21 19:17:54 UTC (rev 15957)
@@ -676,22 +676,7 @@
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
-		    <widget class="GtkViewport" id="viewport">
-		      <property name="visible">True</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkHBox" id="right_tree_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
+		    <placeholder/>
 		  </child>
 		</widget>
 		<packing>
@@ -712,22 +697,7 @@
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
-		    <widget class="GtkViewport" id="viewport">
-		      <property name="visible">True</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkHBox" id="left_tree_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
+		    <placeholder/>
 		  </child>
 		</widget>
 		<packing>