Only show the title string in OPEN/SELECT_FOLDER mode as it's

Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>

	* gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
	the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
	Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
	so we'll fix it for 2.4.1 as #137272.

	* gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
	space_available correctly for RTL mode.  w/o this, you can't
	scroll down again.  Fixes #137021.

2004-03-15  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
	(gtk_path_bar_scroll_down): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e31fb3d648d2616fd9b4f36258fc649beb9422b8..6c28769ccb2b6743b5c448dbaf0e7f99b70a7f79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
+       the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
+       Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
+       so we'll fix it for 2.4.1 as #137272.
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
+       space_available correctly for RTL mode.  w/o this, you can't
+       scroll down again.  Fixes #137021.
+
+2004-03-15  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
+       (gtk_path_bar_scroll_down): Likewise.
+
 Mon Mar 15 11:40:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserentry.c: Store the position of the 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e31fb3d648d2616fd9b4f36258fc649beb9422b8..6c28769ccb2b6743b5c448dbaf0e7f99b70a7f79 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
+       the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
+       Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
+       so we'll fix it for 2.4.1 as #137272.
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
+       space_available correctly for RTL mode.  w/o this, you can't
+       scroll down again.  Fixes #137021.
+
+2004-03-15  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
+       (gtk_path_bar_scroll_down): Likewise.
+
 Mon Mar 15 11:40:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserentry.c: Store the position of the 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e31fb3d648d2616fd9b4f36258fc649beb9422b8..6c28769ccb2b6743b5c448dbaf0e7f99b70a7f79 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
+       the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
+       Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
+       so we'll fix it for 2.4.1 as #137272.
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
+       space_available correctly for RTL mode.  w/o this, you can't
+       scroll down again.  Fixes #137021.
+
+2004-03-15  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
+       (gtk_path_bar_scroll_down): Likewise.
+
 Mon Mar 15 11:40:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserentry.c: Store the position of the 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e31fb3d648d2616fd9b4f36258fc649beb9422b8..6c28769ccb2b6743b5c448dbaf0e7f99b70a7f79 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
+       the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
+       Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
+       so we'll fix it for 2.4.1 as #137272.
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
+       space_available correctly for RTL mode.  w/o this, you can't
+       scroll down again.  Fixes #137021.
+
+2004-03-15  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
+       (gtk_path_bar_scroll_down): Likewise.
+
 Mon Mar 15 11:40:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserentry.c: Store the position of the 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e31fb3d648d2616fd9b4f36258fc649beb9422b8..6c28769ccb2b6743b5c448dbaf0e7f99b70a7f79 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+Mon Mar 15 12:51:17 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Only show
+       the title string in OPEN/SELECT_FOLDER mode as it's open-specific.
+       Put a blank title for SAVE/CREATE_FOLDER; we are in string freeze,
+       so we'll fix it for 2.4.1 as #137272.
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): calculate
+       space_available correctly for RTL mode.  w/o this, you can't
+       scroll down again.  Fixes #137021.
+
+2004-03-15  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_scroll_up): Queue a resize.
+       (gtk_path_bar_scroll_down): Likewise.
+
 Mon Mar 15 11:40:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserentry.c: Store the position of the 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index f7d5525c46e2317635773725d3af3324dda52a3c..f5860d5df16ca3eb116b25372caf3c77e7385a2e 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4998,6 +4998,7 @@ location_popup_handler (GtkFileChooserDefault *impl)
   GtkWidget *label;
   GtkWidget *entry;
   gboolean refocus;
+  char *title;
 
   /* Create dialog */
 
@@ -5005,7 +5006,19 @@ location_popup_handler (GtkFileChooserDefault *impl)
   if (!GTK_WIDGET_TOPLEVEL (toplevel))
     toplevel = NULL;
 
-  dialog = gtk_dialog_new_with_buttons (_("Open Location"),
+  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+    {
+      title = _("Open Location");
+    }
+  else 
+    {
+      g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+               || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
+      title = ""; /* FIXME: #137272, fix for 2.4.1 */
+    }
+
+  dialog = gtk_dialog_new_with_buttons (title,
                                        GTK_WINDOW (toplevel),
                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -5044,8 +5057,8 @@ location_popup_handler (GtkFileChooserDefault *impl)
            }
          else 
            {
-             g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-                       || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE);
+             g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+                       || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
              gtk_widget_grab_focus (impl->save_file_name_entry);
            }
          refocus = FALSE;

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 9bf2f7a19e0bd4848c0e5a84555c4354e243640e..0f1aab9eac1c117087d4470f3fd698a39872ec4c 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -565,6 +565,8 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
   gint border_width;
   GtkTextDirection direction;
   
+  gtk_widget_queue_resize (GTK_WIDGET (path_bar));
+
   border_width = GTK_CONTAINER (path_bar)->border_width;
   direction = gtk_widget_get_direction (GTK_WIDGET (path_bar));
   
@@ -592,7 +594,7 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
 
   space_needed = BUTTON_DATA (down_button->data)->button->allocation.width + path_bar->spacing;
   if (direction == GTK_TEXT_DIR_RTL)
-    space_available = GTK_WIDGET (path_bar)->allocation.x + GTK_WIDGET (path_bar)->allocation.width;
+    space_available = path_bar->down_slider_button->allocation.x - GTK_WIDGET (path_bar)->allocation.x;
   else
     space_available = (GTK_WIDGET (path_bar)->allocation.x + GTK_WIDGET (path_bar)->allocation.width - border_width) -
       (path_bar->down_slider_button->allocation.x + path_bar->down_slider_button->allocation.width);
@@ -614,6 +616,8 @@ gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar)
 {
   GList *list;
 
+  gtk_widget_queue_resize (GTK_WIDGET (path_bar));
+
   for (list = g_list_last (path_bar->button_list); list; list = list->prev)
     {
       if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button))